Please find enclosed a diff for bringing security/lastpass-cli to the latest version (1.1.0). Changelog can be found at https://github.com/lastpass/lastpass-cli/releases/tag/v1.1.0
Compiling lastpass-cli now requires cmake. OK? -- Björn Ketelaars GPG key: 0x4F0E5F21 diff --git security/lastpass-cli/Makefile security/lastpass-cli/Makefile index 693358d6c32..8affeabd13a 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.0.0 +GH_TAGNAME = v1.1.0 CATEGORIES = security MAINTAINER = Bjorn Ketelaars <bjorn.ketela...@hydroxide.nl> @@ -14,17 +14,17 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB = c curl crypto kvm ssl xml2 +MODULES = devel/cmake + BUILD_DEPENDS= textproc/asciidoc LIB_DEPENDS = net/curl \ textproc/libxml -USE_GMAKE = yes - NO_TEST = Yes ALL_TARGET = all doc-man do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/lpass ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/lpass.1 ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKBUILD}/lpass ${PREFIX}/bin + ${INSTALL_MAN} ${WRKBUILD}/lpass.1 ${PREFIX}/man/man1 .include <bsd.port.mk> diff --git security/lastpass-cli/distinfo security/lastpass-cli/distinfo index d80a8fa19f4..85a2bf276b5 100644 --- security/lastpass-cli/distinfo +++ security/lastpass-cli/distinfo @@ -1,2 +1,2 @@ -SHA256 (lastpass-cli-1.0.0.tar.gz) = QglsC9OXKw6cyc7zL78UHkewS54jh/s6vosQXhNftB4= -SIZE (lastpass-cli-1.0.0.tar.gz) = 92311 +SHA256 (lastpass-cli-1.1.0.tar.gz) = ZhbcfuMh0Hj6/WUDWc0KuKkKvUHRClRSfJm2gtIY8L4= +SIZE (lastpass-cli-1.1.0.tar.gz) = 102006 diff --git security/lastpass-cli/patches/patch-CMakeLists_txt security/lastpass-cli/patches/patch-CMakeLists_txt new file mode 100644 index 00000000000..042bc417451 --- /dev/null +++ security/lastpass-cli/patches/patch-CMakeLists_txt @@ -0,0 +1,21 @@ +$OpenBSD$ +--- CMakeLists.txt.orig Tue Jan 3 22:19:00 2017 ++++ CMakeLists.txt Wed Jan 4 09:07:14 2017 +@@ -45,7 +45,7 @@ file(GLOB PROJECT_SOURCES *.c) + + set(PROJECT_DEFINITIONS "_GNU_SOURCE") + +-set(PROJECT_FLAGS "-std=gnu99 -pedantic -Wall -Wextra -Wno-language-extension-token") ++set(PROJECT_FLAGS "-std=gnu99 -pedantic -Wall -Wextra") + 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-Makefile security/lastpass-cli/patches/patch-Makefile deleted file mode 100644 index 6113761e254..00000000000 --- security/lastpass-cli/patches/patch-Makefile +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Makefile,v 1.2 2016/08/27 09:06:12 danj Exp $ ---- Makefile.orig Wed Jul 20 14:46:49 2016 -+++ Makefile Tue Aug 2 11:45:58 2016 -@@ -7,7 +7,7 @@ COMPDIR ?= $(shell pkg-config --variable=completionsdi - - CFLAGS ?= -O3 -march=native -fomit-frame-pointer -pipe - CFLAGS += -std=gnu99 -D_GNU_SOURCE --CFLAGS += -pedantic -Wall -Wextra -Wno-language-extension-token -+CFLAGS += -pedantic -Wall -Wextra - CFLAGS += -MMD - - UNAME_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') diff --git security/lastpass-cli/patches/patch-pbkdf2_c security/lastpass-cli/patches/patch-pbkdf2_c new file mode 100644 index 00000000000..742295319f5 --- /dev/null +++ security/lastpass-cli/patches/patch-pbkdf2_c @@ -0,0 +1,21 @@ +$OpenBSD$ +--- 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);