Attachment 192035 Details for Bug 227159 – Updating to version 2.3.1.

[patch] Updating to version 2.3.1.

security_keepassxc_update_2.3.1.patch (text/plain), 14.40 KB, created by Alexandre C. Guimarães on 2018-04-01 08:18:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexandre C. Guimarães

Created: 2018-04-01 08:18:12 UTC

Size: 14.40 KB

patch

obsolete

>Index: security/keepassxc/Makefile
>===================================================================
>--- security/keepassxc/Makefile	(revision 466033)
>+++ security/keepassxc/Makefile	(working copy)
>@@ -1,40 +1,42 @@
> # $FreeBSD$
> 
> PORTNAME=	keepassxc
>-PORTVERSION=	2.2.4
>+DISTVERSION=	2.3.1
> CATEGORIES=	security
>+MASTER_SITES=	https://github.com/keepassxreboot/keepassxc/releases/download/2.3.1/${PORTNAME}-${DISTVERSION}-src.tar.xz?dummy=/
> 
> MAINTAINER=	melanhit@gmail.com
> COMMENT=	KeePass Cross-platform Community Edition
> 
>-LICENSE=	APACHE20 BOOST-1.0 BSD3CLAUSE CC0-1.0 GPLv2 GPLv3 LGPL21 LGPL3 NOKIA-LGPL-EXCEPTION
>+LICENSE=	APACHE20 BOOST-1.0 BSD3CLAUSE CC0-1.0 GPLv2 GPLv3 LGPL21 \
>+		LGPL3 NOKIA-LGPL-EXCEPTION
> LICENSE_COMB=	multi
>-LICENSE_NAME_BOOST-1.0=	Boost Software License version 1.0
>+LICENSE_NAME_BOOST-1.0=			Boost Software License version 1.0
> LICENSE_NAME_NOKIA-LGPL-EXCEPTION=	Nokia Qt LGPL Exception version 1.1
>-LICENSE_FILE_BOOST-1.0=	${WRKSRC}/LICENSE.BOOST-1.0
>+LICENSE_FILE_BOOST-1.0=			${WRKSRC}/LICENSE.BOOST-1.0
> LICENSE_FILE_NOKIA-LGPL-EXCEPTION=	${WRKSRC}/LICENSE.NOKIA-LGPL-EXCEPTION
>-LICENSE_PERMS_BOOST-1.0=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
>+LICENSE_PERMS_BOOST-1.0=		dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> LICENSE_PERMS_NOKIA-LGPL-EXCEPTION=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
>-LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
>+LIB_DEPENDS=	libargon2.so:security/libargon2 \
>+		libcurl.so:ftp/curl \
>+		libgcrypt.so:security/libgcrypt \
> 		libgpg-error.so:security/libgpg-error
> 
>-CONFLICTS_INSTALL=	keepassx-0.* keepassx2-* keepassx-*
>-
>-USES=		cmake:outsource compiler:c++11-lib desktop-file-utils shared-mime-info
>-USE_LDCONFIG=	yes
>-INSTALLS_ICONS=	yes
>+USES=		cmake:outsource desktop-file-utils shared-mime-info tar:xz
> USE_QT5=	buildtools_build concurrent core dbus gui linguisttools network \
> 		qmake_build testlib widgets
>-USE_XORG=	ice inputproto sm x11 xcursor xext xfixes xrandr xrender xt
>+USE_XORG=	x11
>+USE_LDCONFIG=	yes
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	keepassxreboot
>+# patching CMakeLists.txt does not help because that is being overided by
>+# cmake/GNUInstallDirs.cmake
>+CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/man
> 
>-CMAKE_ARGS+=	-DZLIB_SUPPORTS_GZIP:BOOL=ON
>+CONFLICTS_INSTALL=	keepassx-0.* keepassx2-* keepassx-*
> 
>-OPTIONS_DEFINE=		AUTOTYPE HTTP YUBIKEY TEST
>-OPTIONS_DEFAULT=	AUTOTYPE HTTP
>+OPTIONS_DEFINE=		AUTOTYPE BROWSER HTTP NETWORKING YUBIKEY SSHAGENT TEST
>+OPTIONS_DEFAULT=	AUTOTYPE BROWSER HTTP NETWORKING SSHAGENT
> OPTIONS_SUB=		yes
> 
> AUTOTYPE_CMAKE_BOOL=	WITH_XC_AUTOTYPE
>@@ -41,13 +43,24 @@
> AUTOTYPE_DESC=		Auto-type passwords in input fields
> AUTOTYPE_USE=		QT5=x11extras XORG=xi,xtst
> 
>+BROWSER_CMAKE_BOOL=	WITH_XC_BROWSER
>+BROWSER_DESC=		Browser integration with KeePassXC-Browser
>+BROWSER_LIB_DEPENDS=	libsodium.so:security/libsodium
>+
>+# Legacy/Deprecated.
> HTTP_CMAKE_BOOL=	WITH_XC_HTTP
> HTTP_DESC=		KeePassHTTP support for ChromeIPass and PassIFox
> 
>+NETWORKING_CMAKE_BOOL=	WITH_XC_NETWORKING
>+NETWORKING_DESC=	Networking support (e.g. for downloading website icons)
>+
>+SSHAGENT_CMAKE_BOOL=	WITH_XC_SSHAGENT
>+SSHAGENT_DESC=		SSH agent support
>+
> YUBIKEY_CMAKE_BOOL=	WITH_XC_YUBIKEY
>-YUBIKEY_DESC=		Include YubiKey support
>-YUBIKEY_LIB_DEPENDS=	libyubikey.so:security/libyubikey \
>-			libykpers-1.so:security/ykpers
>+YUBIKEY_DESC=		YubiKey support
>+YUBIKEY_LIB_DEPENDS=	libykpers-1.so:security/ykpers \
>+			libyubikey.so:security/libyubikey
> 
> TEST_CMAKE_BOOL=	WITH_TESTS WITH_GUI_TESTS
> TEST_TEST_TARGET=	test
>@@ -54,8 +67,9 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|Q_OS_LINUX|Q_OS_UNIX|g' \
>-		${WRKSRC}/src/core/ScreenLockListenerPrivate.cpp \
>-		${WRKSRC}/src/gui/MainWindow.cpp \
>-		${WRKSRC}/src/main.cpp
>+		${WRKSRC}/src/browser/HostInstaller.cpp
> 
>+	@${REINPLACE_CMD} -e 's|u_int|__uint|g' \
>+		${WRKSRC}/src/sshagent/blf.h
>+
> .include <bsd.port.mk>
>Index: security/keepassxc/distinfo
>===================================================================
>--- security/keepassxc/distinfo	(revision 466033)
>+++ security/keepassxc/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1513195459
>-SHA256 (keepassxreboot-keepassxc-2.2.4_GH0.tar.gz) = e884439ed3ad461e426a25f0492f5fa78ab8ba06fb718977b3867d8f098ccd0a
>-SIZE (keepassxreboot-keepassxc-2.2.4_GH0.tar.gz) = 3895421
>+TIMESTAMP = 1522556038
>+SHA256 (keepassxc-2.3.1.tar.xz) = ce7d8251d4d5b35f602ff521764910964da6d8a67397399855a6e8c5ff5db9bd
>+SIZE (keepassxc-2.3.1.tar.xz) = 4085284
>Index: security/keepassxc/files/patch-CMakeLists.txt
>===================================================================
>--- security/keepassxc/files/patch-CMakeLists.txt	(revision 466033)
>+++ security/keepassxc/files/patch-CMakeLists.txt	(working copy)
>@@ -1,8 +1,8 @@
>---- CMakeLists.txt.orig	2017-06-25 21:52:43 UTC
>+--- CMakeLists.txt.orig	2018-04-01 08:03:48 UTC
> +++ CMakeLists.txt
>-@@ -89,7 +89,7 @@ add_gcc_compiler_flags("-Wformat=2 -Wmis
>- add_gcc_compiler_flags("-fvisibility=hidden")
>- add_gcc_compiler_cxxflags("-fvisibility-inlines-hidden")
>+@@ -166,7 +166,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
>+   add_gcc_compiler_flags("-Werror")
>+ endif()
>  
> -if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8.999) OR CMAKE_COMPILER_IS_CLANGXX)
> +if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8.999) OR (CMAKE_COMPILER_IS_CLANGXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.8))
>Index: security/keepassxc/files/patch-src_CMakeLists.txt
>===================================================================
>--- security/keepassxc/files/patch-src_CMakeLists.txt	(revision 466033)
>+++ security/keepassxc/files/patch-src_CMakeLists.txt	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/CMakeLists.txt.orig	2017-07-12 02:16:55 UTC
>-+++ src/CMakeLists.txt
>-@@ -149,7 +149,7 @@ if(APPLE)
>-         core/ScreenLockListenerMac.cpp
>-         )
>- endif()
>--if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
>-+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
>-     set(keepassx_SOURCES ${keepassx_SOURCES}
>-         core/ScreenLockListenerDBus.h
>-         core/ScreenLockListenerDBus.cpp
>
>Property changes on: security/keepassxc/files/patch-src_CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: security/keepassxc/pkg-plist
>===================================================================
>--- security/keepassxc/pkg-plist	(revision 466033)
>+++ security/keepassxc/pkg-plist	(working copy)
>@@ -1,6 +1,8 @@
> bin/keepassxc
> bin/keepassxc-cli
>-%%AUTOTYPE%%lib/keepassxc/libkeepassx-autotype-xcb.so
>+bin/keepassxc-proxy
>+lib/keepassxc/libkeepassx-autotype-xcb.so
>+man/man1/keepassxc-cli.1.gz
> share/applications/org.keepassxc.KeePassXC.desktop
> share/icons/hicolor/128x128/apps/keepassxc-dark.png
> share/icons/hicolor/128x128/apps/keepassxc-locked.png
>@@ -40,8 +42,6 @@
> share/icons/hicolor/scalable/apps/keepassxc-unlocked.svgz
> share/icons/hicolor/scalable/apps/keepassxc.svgz
> share/icons/hicolor/scalable/mimetypes/application-x-keepassxc.svgz
>-share/metainfo/org.keepassxc.KeePassXC.appdata.xml
>-share/mime/packages/keepassxc.xml
> %%DATADIR%%/icons/application/128x128/apps/keepassxc-dark.png
> %%DATADIR%%/icons/application/128x128/apps/keepassxc-locked.png
> %%DATADIR%%/icons/application/128x128/apps/keepassxc-unlocked.png
>@@ -70,6 +70,7 @@
> %%DATADIR%%/icons/application/16x16/actions/group-new.png
> %%DATADIR%%/icons/application/16x16/actions/help-about.png
> %%DATADIR%%/icons/application/16x16/actions/message-close.png
>+%%DATADIR%%/icons/application/16x16/actions/paperclip.png
> %%DATADIR%%/icons/application/16x16/actions/password-copy.png
> %%DATADIR%%/icons/application/16x16/actions/password-generate.png
> %%DATADIR%%/icons/application/16x16/actions/password-generator.png
>@@ -76,6 +77,7 @@
> %%DATADIR%%/icons/application/16x16/actions/password-show-off.png
> %%DATADIR%%/icons/application/16x16/actions/password-show-on.png
> %%DATADIR%%/icons/application/16x16/actions/system-search.png
>+%%DATADIR%%/icons/application/16x16/actions/url-copy.png
> %%DATADIR%%/icons/application/16x16/actions/username-copy.png
> %%DATADIR%%/icons/application/16x16/apps/keepassxc-dark.png
> %%DATADIR%%/icons/application/16x16/apps/keepassxc-locked.png
>@@ -82,6 +84,9 @@
> %%DATADIR%%/icons/application/16x16/apps/keepassxc-unlocked.png
> %%DATADIR%%/icons/application/16x16/apps/keepassxc.png
> %%DATADIR%%/icons/application/16x16/mimetypes/application-x-keepassxc.png
>+%%DATADIR%%/icons/application/22x22/actions/auto-type.png
>+%%DATADIR%%/icons/application/22x22/actions/chronometer.png
>+%%DATADIR%%/icons/application/22x22/actions/database-change-key.png
> %%DATADIR%%/icons/application/22x22/actions/dialog-close.png
> %%DATADIR%%/icons/application/22x22/actions/dialog-ok.png
> %%DATADIR%%/icons/application/22x22/actions/document-encrypt.png
>@@ -88,13 +93,19 @@
> %%DATADIR%%/icons/application/22x22/actions/document-new.png
> %%DATADIR%%/icons/application/22x22/actions/document-open.png
> %%DATADIR%%/icons/application/22x22/actions/document-save.png
>+%%DATADIR%%/icons/application/22x22/actions/entry-clone.png
> %%DATADIR%%/icons/application/22x22/actions/entry-delete.png
> %%DATADIR%%/icons/application/22x22/actions/entry-edit.png
> %%DATADIR%%/icons/application/22x22/actions/entry-new.png
>+%%DATADIR%%/icons/application/22x22/actions/group-empty-trash.png
>+%%DATADIR%%/icons/application/22x22/actions/help-about.png
> %%DATADIR%%/icons/application/22x22/actions/message-close.png
>+%%DATADIR%%/icons/application/22x22/actions/paperclip.png
> %%DATADIR%%/icons/application/22x22/actions/password-copy.png
>+%%DATADIR%%/icons/application/22x22/actions/password-generate.png
> %%DATADIR%%/icons/application/22x22/actions/password-generator.png
> %%DATADIR%%/icons/application/22x22/actions/system-search.png
>+%%DATADIR%%/icons/application/22x22/actions/url-copy.png
> %%DATADIR%%/icons/application/22x22/actions/username-copy.png
> %%DATADIR%%/icons/application/22x22/mimetypes/application-x-keepassxc.png
> %%DATADIR%%/icons/application/22x22/status/dialog-error.png
>@@ -108,9 +119,38 @@
> %%DATADIR%%/icons/application/256x256/apps/keepassxc-locked.png
> %%DATADIR%%/icons/application/256x256/apps/keepassxc-unlocked.png
> %%DATADIR%%/icons/application/256x256/apps/keepassxc.png
>+%%DATADIR%%/icons/application/32x32/actions/application-exit.png
>+%%DATADIR%%/icons/application/32x32/actions/auto-type.png
>+%%DATADIR%%/icons/application/32x32/actions/chronometer.png
>+%%DATADIR%%/icons/application/32x32/actions/configure.png
>+%%DATADIR%%/icons/application/32x32/actions/database-change-key.png
>+%%DATADIR%%/icons/application/32x32/actions/dialog-close.png
>+%%DATADIR%%/icons/application/32x32/actions/dialog-ok.png
>+%%DATADIR%%/icons/application/32x32/actions/document-close.png
> %%DATADIR%%/icons/application/32x32/actions/document-edit.png
>+%%DATADIR%%/icons/application/32x32/actions/document-encrypt.png
>+%%DATADIR%%/icons/application/32x32/actions/document-new.png
>+%%DATADIR%%/icons/application/32x32/actions/document-open.png
> %%DATADIR%%/icons/application/32x32/actions/document-properties.png
>+%%DATADIR%%/icons/application/32x32/actions/document-save.png
>+%%DATADIR%%/icons/application/32x32/actions/edit-clear-locationbar-ltr.png
>+%%DATADIR%%/icons/application/32x32/actions/edit-clear-locationbar-rtl.png
>+%%DATADIR%%/icons/application/32x32/actions/entry-clone.png
>+%%DATADIR%%/icons/application/32x32/actions/entry-delete.png
>+%%DATADIR%%/icons/application/32x32/actions/entry-edit.png
>+%%DATADIR%%/icons/application/32x32/actions/entry-new.png
>+%%DATADIR%%/icons/application/32x32/actions/group-empty-trash.png
>+%%DATADIR%%/icons/application/32x32/actions/help-about.png
> %%DATADIR%%/icons/application/32x32/actions/key-enter.png
>+%%DATADIR%%/icons/application/32x32/actions/paperclip.png
>+%%DATADIR%%/icons/application/32x32/actions/password-copy.png
>+%%DATADIR%%/icons/application/32x32/actions/password-generate.png
>+%%DATADIR%%/icons/application/32x32/actions/password-generator.png
>+%%DATADIR%%/icons/application/32x32/actions/password-show-off.png
>+%%DATADIR%%/icons/application/32x32/actions/password-show-on.png
>+%%DATADIR%%/icons/application/32x32/actions/system-search.png
>+%%DATADIR%%/icons/application/32x32/actions/url-copy.png
>+%%DATADIR%%/icons/application/32x32/actions/username-copy.png
> %%DATADIR%%/icons/application/32x32/actions/view-history.png
> %%DATADIR%%/icons/application/32x32/apps/internet-web-browser.png
> %%DATADIR%%/icons/application/32x32/apps/keepassxc-dark.png
>@@ -118,6 +158,7 @@
> %%DATADIR%%/icons/application/32x32/apps/keepassxc-unlocked.png
> %%DATADIR%%/icons/application/32x32/apps/keepassxc.png
> %%DATADIR%%/icons/application/32x32/apps/preferences-desktop-icons.png
>+%%DATADIR%%/icons/application/32x32/apps/utilities-terminal.png
> %%DATADIR%%/icons/application/32x32/categories/preferences-other.png
> %%DATADIR%%/icons/application/32x32/mimetypes/application-x-keepassxc.png
> %%DATADIR%%/icons/application/32x32/status/security-high.png
>@@ -204,12 +245,13 @@
> %%DATADIR%%/icons/database/C66_Money.png
> %%DATADIR%%/icons/database/C67_Certificate.png
> %%DATADIR%%/icons/database/C68_BlackBerry.png
>+%%DATADIR%%/translations/keepassx_ar.qm
> %%DATADIR%%/translations/keepassx_ca.qm
> %%DATADIR%%/translations/keepassx_cs.qm
> %%DATADIR%%/translations/keepassx_da.qm
> %%DATADIR%%/translations/keepassx_de.qm
> %%DATADIR%%/translations/keepassx_el.qm
>-%%DATADIR%%/translations/keepassx_en_plurals.qm
>+%%DATADIR%%/translations/keepassx_en_US.qm
> %%DATADIR%%/translations/keepassx_es.qm
> %%DATADIR%%/translations/keepassx_eu.qm
> %%DATADIR%%/translations/keepassx_fi.qm
>@@ -221,15 +263,21 @@
> %%DATADIR%%/translations/keepassx_kk.qm
> %%DATADIR%%/translations/keepassx_ko.qm
> %%DATADIR%%/translations/keepassx_lt.qm
>+%%DATADIR%%/translations/keepassx_nb.qm
> %%DATADIR%%/translations/keepassx_nl_NL.qm
> %%DATADIR%%/translations/keepassx_pl.qm
> %%DATADIR%%/translations/keepassx_pt_BR.qm
> %%DATADIR%%/translations/keepassx_pt_PT.qm
>+%%DATADIR%%/translations/keepassx_ro.qm
> %%DATADIR%%/translations/keepassx_ru.qm
> %%DATADIR%%/translations/keepassx_sl_SI.qm
>+%%DATADIR%%/translations/keepassx_sr.qm
> %%DATADIR%%/translations/keepassx_sv.qm
>+%%DATADIR%%/translations/keepassx_th.qm
> %%DATADIR%%/translations/keepassx_tr.qm
> %%DATADIR%%/translations/keepassx_uk.qm
> %%DATADIR%%/translations/keepassx_zh_CN.qm
> %%DATADIR%%/translations/keepassx_zh_TW.qm
> %%DATADIR%%/wordlists/eff_large.wordlist
>+share/metainfo/org.keepassxc.KeePassXC.appdata.xml
>+share/mime/packages/keepassxc.xml

Actions: View | Diff

Attachments on bug 227159: 192035 | 192076