The diff below brings lastpass-cli to 1.1.1. This version fixes a bug that
made lastpass-cli crash:

https://github.com/lastpass/lastpass-cli/releases/tag/v1.1.1

Also, some of our patches got accepted upstream.

-- 
Björn Ketelaars
GPG key: 0x4F0E5F21


diff --git security/lastpass-cli/Makefile security/lastpass-cli/Makefile
index f8a35d8d0d8..67ff21b9726 100644
--- security/lastpass-cli/Makefile
+++ security/lastpass-cli/Makefile
@@ -4,7 +4,7 @@ COMMENT =       LastPass command line interface tool
 
 GH_ACCOUNT =   lastpass
 GH_PROJECT =   lastpass-cli
-GH_TAGNAME =   v1.1.0
+GH_TAGNAME =   v1.1.1
 CATEGORIES =   security
 
 MAINTAINER =   Bjorn Ketelaars <bjorn.ketela...@hydroxide.nl>
diff --git security/lastpass-cli/distinfo security/lastpass-cli/distinfo
index 85a2bf276b5..10250ff1201 100644
--- security/lastpass-cli/distinfo
+++ security/lastpass-cli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lastpass-cli-1.1.0.tar.gz) = 
ZhbcfuMh0Hj6/WUDWc0KuKkKvUHRClRSfJm2gtIY8L4=
-SIZE (lastpass-cli-1.1.0.tar.gz) = 102006
+SHA256 (lastpass-cli-1.1.1.tar.gz) = 
GqyA2lMFpz1ldIksmUgHj8v7D6JcDhspcSZZ3mQnMkM=
+SIZE (lastpass-cli-1.1.1.tar.gz) = 102108
diff --git security/lastpass-cli/patches/patch-CMakeLists_txt 
security/lastpass-cli/patches/patch-CMakeLists_txt
index eaf9a07b301..63dfaaf4cb2 100644
--- security/lastpass-cli/patches/patch-CMakeLists_txt
+++ security/lastpass-cli/patches/patch-CMakeLists_txt
@@ -10,12 +10,3 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1 2017/01/07 12:58:53 
jasper Exp $
  if(APPLE)
    set(PROJECT_FLAGS "${PROJECT_FLAGS} -Wno-deprecated-declarations")
  endif()
-@@ -56,7 +56,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
-   COMPILE_FLAGS ${PROJECT_FLAGS}
-   COMPILE_DEFINITIONS ${PROJECT_DEFINITIONS}
- )
--target_link_libraries(${PROJECT_NAME} ${LIBXML2_LIBRARIES} 
${OPENSSL_LIBRARIES} ${CURL_LIBRARIES})
-+target_link_libraries(${PROJECT_NAME} ${LIBXML2_LIBRARIES} 
${OPENSSL_LIBRARIES} ${CURL_LIBRARIES} "-lkvm")
- 
- add_custom_command(OUTPUT lpass.1 DEPENDS ${CMAKE_SOURCE_DIR}/lpass.1.txt
-         COMMAND a2x -D ./ --no-xmllint -f manpage 
${CMAKE_SOURCE_DIR}/lpass.1.txt)
diff --git security/lastpass-cli/patches/patch-pbkdf2_c 
security/lastpass-cli/patches/patch-pbkdf2_c
deleted file mode 100644
index 53f55d0a9dd..00000000000
--- security/lastpass-cli/patches/patch-pbkdf2_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-pbkdf2_c,v 1.1 2017/01/07 12:58:53 jasper Exp $
---- pbkdf2.c.orig      Tue Jan  3 22:19:00 2017
-+++ pbkdf2.c   Wed Jan  4 12:41:22 2017
-@@ -53,7 +53,7 @@ int fallback_pkcs5_pbkdf2_hmac(const char *pass, size_
- 
-       unsigned char tmp_md[md_len];
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-       HMAC_CTX real_ctx;
-       ctx = &real_ctx;
-       HMAC_CTX_init(ctx);
-@@ -97,7 +97,7 @@ int fallback_pkcs5_pbkdf2_hmac(const char *pass, size_
-       ret = 1;
- 
- ERR_LABEL
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-       HMAC_CTX_cleanup(ctx);
- #else
-       HMAC_CTX_free(ctx);

Reply via email to