Attachment 184292 Details for Bug 220585 – patch-keepassxc-2.2.0.diff

[patch] patch-keepassxc-2.2.0.diff

patch-keepassxc-2.2.0.diff (text/plain), 13.52 KB, created by Carlos J. Puga Medina on 2017-07-12 02:35:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J. Puga Medina

Created: 2017-07-12 02:35:04 UTC

Size: 13.52 KB

patch

obsolete

>Index: security/keepassxc/Makefile
>===================================================================
>--- security/keepassxc/Makefile	(revision 445555)
>+++ security/keepassxc/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	keepassxc
>-PORTVERSION=	2.1.4
>+PORTVERSION=	2.2.0
> CATEGORIES=	security
> 
> MAINTAINER=	melanhit@gmail.com
>@@ -33,7 +33,7 @@
> 
> CMAKE_ARGS+=	-DZLIB_SUPPORTS_GZIP:BOOL=ON
> 
>-OPTIONS_DEFINE=		AUTOTYPE HTTP TEST
>+OPTIONS_DEFINE=		AUTOTYPE HTTP YUBIKEY TEST
> OPTIONS_DEFAULT=	AUTOTYPE HTTP
> OPTIONS_SUB=		yes
> 
>@@ -44,7 +44,18 @@
> HTTP_CMAKE_BOOL=	WITH_XC_HTTP
> HTTP_DESC=		KeePassHTTP support for ChromeIPass and PassIFox
> 
>+YUBIKEY_CMAKE_BOOL=	WITH_XC_YUBIKEY
>+YUBIKEY_DESC=		Include YubiKey support
>+YUBIKEY_LIB_DEPENDS=	libyubikey.so:security/libyubikey \
>+			libykpers-1.so:security/ykpers
>+
> TEST_CMAKE_BOOL=	WITH_TESTS WITH_GUI_TESTS
> TEST_TEST_TARGET=	test
> 
>+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
>+
> .include <bsd.port.mk>
>Index: security/keepassxc/distinfo
>===================================================================
>--- security/keepassxc/distinfo	(revision 445555)
>+++ security/keepassxc/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1491852798
>-SHA256 (keepassxreboot-keepassxc-2.1.4_GH0.tar.gz) = 40a990dbcf442eb3cad99452b58ffd36e5855b39e78f213ea20e99fbc7876701
>-SIZE (keepassxreboot-keepassxc-2.1.4_GH0.tar.gz) = 3345520
>+TIMESTAMP = 1499196985
>+SHA256 (keepassxreboot-keepassxc-2.2.0_GH0.tar.gz) = 9d9d39b9c056955fe5d7a5212efe1703be02fa4731c36e2b1e06a78174b0a7b8
>+SIZE (keepassxreboot-keepassxc-2.2.0_GH0.tar.gz) = 3814252
>Index: security/keepassxc/files/patch-CMakeLists.txt
>===================================================================
>--- security/keepassxc/files/patch-CMakeLists.txt	(nonexistent)
>+++ security/keepassxc/files/patch-CMakeLists.txt	(working copy)
>@@ -0,0 +1,11 @@
>+--- CMakeLists.txt.orig	2017-06-25 21:52:43 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")
>+ 
>+-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))
>+     add_gcc_compiler_flags("-fstack-protector-strong")
>+ else()
>+     add_gcc_compiler_flags("-fstack-protector --param=ssp-buffer-size=4")
>
>Property changes on: security/keepassxc/files/patch-CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/keepassxc/files/patch-src_CMakeLists.txt
>===================================================================
>--- security/keepassxc/files/patch-src_CMakeLists.txt	(nonexistent)
>+++ security/keepassxc/files/patch-src_CMakeLists.txt	(working copy)
>@@ -0,0 +1,11 @@
>+--- 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
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/keepassxc/pkg-descr
>===================================================================
>--- security/keepassxc/pkg-descr	(revision 445555)
>+++ security/keepassxc/pkg-descr	(working copy)
>@@ -6,11 +6,16 @@
>   * Auto-Type on all three major platforms (Linux, Windows, OS X)
>   * Stand-alone password generator
>   * Password strength meter
>+  * A generator for time-based one-time passwords
>   * Using website favicons as entry icons
>   * Merging of databases
>   * Automatic reload when the database changed on disk
>   * KeePassHTTP support for use with PassIFox in Mozilla Firefox and
>     chromeIPass in Google Chrome or Chromium.
>+  * YubiKey challenge-response support for strengthening 
>+    your database encryption key
>+  * Support for Twofish encryption
>+  * Command line interface
>   * Many bug fixes
> 
>-WWW: https://keepassxc.org/
>+WWW: https://keepassxc.org
>Index: security/keepassxc/pkg-plist
>===================================================================
>--- security/keepassxc/pkg-plist	(revision 445555)
>+++ security/keepassxc/pkg-plist	(working copy)
>@@ -1,38 +1,48 @@
> bin/keepassxc
>+bin/keepassxc-cli
> %%AUTOTYPE%%lib/keepassxc/libkeepassx-autotype-xcb.so
> share/applications/keepassxc.desktop
> share/icons/hicolor/128x128/apps/keepassxc-dark.png
> share/icons/hicolor/128x128/apps/keepassxc-locked.png
>+share/icons/hicolor/128x128/apps/keepassxc-unlocked.png
> share/icons/hicolor/128x128/apps/keepassxc.png
> share/icons/hicolor/128x128/mimetypes/application-x-keepassxc.png
> share/icons/hicolor/16x16/apps/keepassxc-dark.png
> share/icons/hicolor/16x16/apps/keepassxc-locked.png
>+share/icons/hicolor/16x16/apps/keepassxc-unlocked.png
> share/icons/hicolor/16x16/apps/keepassxc.png
> share/icons/hicolor/16x16/mimetypes/application-x-keepassxc.png
> share/icons/hicolor/22x22/mimetypes/application-x-keepassxc.png
> share/icons/hicolor/24x24/apps/keepassxc-dark.png
> share/icons/hicolor/24x24/apps/keepassxc-locked.png
>+share/icons/hicolor/24x24/apps/keepassxc-unlocked.png
> share/icons/hicolor/24x24/apps/keepassxc.png
> share/icons/hicolor/256x256/apps/keepassxc-dark.png
> share/icons/hicolor/256x256/apps/keepassxc-locked.png
>+share/icons/hicolor/256x256/apps/keepassxc-unlocked.png
> share/icons/hicolor/256x256/apps/keepassxc.png
> share/icons/hicolor/32x32/apps/keepassxc-dark.png
> share/icons/hicolor/32x32/apps/keepassxc-locked.png
>+share/icons/hicolor/32x32/apps/keepassxc-unlocked.png
> share/icons/hicolor/32x32/apps/keepassxc.png
> share/icons/hicolor/32x32/mimetypes/application-x-keepassxc.png
> share/icons/hicolor/48x48/apps/keepassxc-dark.png
> share/icons/hicolor/48x48/apps/keepassxc-locked.png
>+share/icons/hicolor/48x48/apps/keepassxc-unlocked.png
> share/icons/hicolor/48x48/apps/keepassxc.png
> share/icons/hicolor/64x64/apps/keepassxc-dark.png
> share/icons/hicolor/64x64/apps/keepassxc-locked.png
>+share/icons/hicolor/64x64/apps/keepassxc-unlocked.png
> share/icons/hicolor/64x64/apps/keepassxc.png
> share/icons/hicolor/64x64/mimetypes/application-x-keepassxc.png
> share/icons/hicolor/scalable/apps/keepassxc-dark.svgz
> share/icons/hicolor/scalable/apps/keepassxc-locked.svgz
>+share/icons/hicolor/scalable/apps/keepassxc-unlocked.svgz
> share/icons/hicolor/scalable/apps/keepassxc.svgz
> share/icons/hicolor/scalable/mimetypes/application-x-keepassxc.svgz
> %%DATADIR%%/icons/application/128x128/apps/keepassxc-dark.png
> %%DATADIR%%/icons/application/128x128/apps/keepassxc-locked.png
>+%%DATADIR%%/icons/application/128x128/apps/keepassxc-unlocked.png
> %%DATADIR%%/icons/application/128x128/apps/keepassxc.png
> %%DATADIR%%/icons/application/128x128/mimetypes/application-x-keepassxc.png
> %%DATADIR%%/icons/application/16x16/actions/application-exit.png
>@@ -54,8 +64,10 @@
> %%DATADIR%%/icons/application/16x16/actions/entry-new.png
> %%DATADIR%%/icons/application/16x16/actions/group-delete.png
> %%DATADIR%%/icons/application/16x16/actions/group-edit.png
>+%%DATADIR%%/icons/application/16x16/actions/group-empty-trash.png
> %%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/password-copy.png
> %%DATADIR%%/icons/application/16x16/actions/password-generate.png
> %%DATADIR%%/icons/application/16x16/actions/password-generator.png
>@@ -65,16 +77,19 @@
> %%DATADIR%%/icons/application/16x16/actions/username-copy.png
> %%DATADIR%%/icons/application/16x16/apps/keepassxc-dark.png
> %%DATADIR%%/icons/application/16x16/apps/keepassxc-locked.png
>+%%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/dialog-close.png
> %%DATADIR%%/icons/application/22x22/actions/dialog-ok.png
> %%DATADIR%%/icons/application/22x22/actions/document-encrypt.png
>+%%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-delete.png
> %%DATADIR%%/icons/application/22x22/actions/entry-edit.png
> %%DATADIR%%/icons/application/22x22/actions/entry-new.png
>+%%DATADIR%%/icons/application/22x22/actions/message-close.png
> %%DATADIR%%/icons/application/22x22/actions/password-copy.png
> %%DATADIR%%/icons/application/22x22/actions/password-generator.png
> %%DATADIR%%/icons/application/22x22/actions/system-search.png
>@@ -85,23 +100,37 @@
> %%DATADIR%%/icons/application/22x22/status/dialog-warning.png
> %%DATADIR%%/icons/application/24x24/apps/keepassxc-dark.png
> %%DATADIR%%/icons/application/24x24/apps/keepassxc-locked.png
>+%%DATADIR%%/icons/application/24x24/apps/keepassxc-unlocked.png
> %%DATADIR%%/icons/application/24x24/apps/keepassxc.png
> %%DATADIR%%/icons/application/256x256/apps/keepassxc-dark.png
> %%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/document-edit.png
>+%%DATADIR%%/icons/application/32x32/actions/document-properties.png
>+%%DATADIR%%/icons/application/32x32/actions/key-enter.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
> %%DATADIR%%/icons/application/32x32/apps/keepassxc-locked.png
>+%%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/categories/preferences-other.png
> %%DATADIR%%/icons/application/32x32/mimetypes/application-x-keepassxc.png
>+%%DATADIR%%/icons/application/32x32/status/security-high.png
> %%DATADIR%%/icons/application/48x48/apps/keepassxc-dark.png
> %%DATADIR%%/icons/application/48x48/apps/keepassxc-locked.png
>+%%DATADIR%%/icons/application/48x48/apps/keepassxc-unlocked.png
> %%DATADIR%%/icons/application/48x48/apps/keepassxc.png
> %%DATADIR%%/icons/application/64x64/apps/keepassxc-dark.png
> %%DATADIR%%/icons/application/64x64/apps/keepassxc-locked.png
>+%%DATADIR%%/icons/application/64x64/apps/keepassxc-unlocked.png
> %%DATADIR%%/icons/application/64x64/apps/keepassxc.png
> %%DATADIR%%/icons/application/64x64/mimetypes/application-x-keepassxc.png
> %%DATADIR%%/icons/application/scalable/apps/keepassxc-dark.svgz
> %%DATADIR%%/icons/application/scalable/apps/keepassxc-locked.svgz
>+%%DATADIR%%/icons/application/scalable/apps/keepassxc-unlocked.svgz
> %%DATADIR%%/icons/application/scalable/apps/keepassxc.svgz
> %%DATADIR%%/icons/application/scalable/mimetypes/application-x-keepassxc.svgz
> %%DATADIR%%/icons/database/C00_Password.png
>@@ -179,10 +208,12 @@
> %%DATADIR%%/translations/keepassx_el.qm
> %%DATADIR%%/translations/keepassx_en_plurals.qm
> %%DATADIR%%/translations/keepassx_es.qm
>+%%DATADIR%%/translations/keepassx_fi.qm
> %%DATADIR%%/translations/keepassx_fr.qm
> %%DATADIR%%/translations/keepassx_id.qm
> %%DATADIR%%/translations/keepassx_it.qm
> %%DATADIR%%/translations/keepassx_ja.qm
>+%%DATADIR%%/translations/keepassx_kk.qm
> %%DATADIR%%/translations/keepassx_ko.qm
> %%DATADIR%%/translations/keepassx_lt.qm
> %%DATADIR%%/translations/keepassx_nl_NL.qm
>@@ -195,6 +226,7 @@
> %%DATADIR%%/translations/keepassx_uk.qm
> %%DATADIR%%/translations/keepassx_zh_CN.qm
> %%DATADIR%%/translations/keepassx_zh_TW.qm
>+%%DATADIR%%/wordlists/eff_large.wordlist
> share/mime/packages/keepassxc.xml
> @dir share/icons/hicolor/scalable/apps
> @dir share/icons/hicolor/scalable
>@@ -218,8 +250,10 @@
> @dir share/icons/hicolor/128x128/mimetypes
> @dir share/icons/hicolor/128x128/apps
> @dir share/icons/hicolor/128x128
>+@dir %%DATADIR%%/wordlists
> @dir %%DATADIR%%/translations
> @dir %%DATADIR%%/icons/database
>+@dir %%DATADIR%%/icons/application/scalable/mimetypes
> @dir %%DATADIR%%/icons/application/scalable/apps
> @dir %%DATADIR%%/icons/application/scalable
> @dir %%DATADIR%%/icons/application/64x64/mimetypes
>@@ -227,8 +261,11 @@
> @dir %%DATADIR%%/icons/application/64x64
> @dir %%DATADIR%%/icons/application/48x48/apps
> @dir %%DATADIR%%/icons/application/48x48
>+@dir %%DATADIR%%/icons/application/32x32/status
> @dir %%DATADIR%%/icons/application/32x32/mimetypes
>+@dir %%DATADIR%%/icons/application/32x32/categories
> @dir %%DATADIR%%/icons/application/32x32/apps
>+@dir %%DATADIR%%/icons/application/32x32/actions
> @dir %%DATADIR%%/icons/application/32x32
> @dir %%DATADIR%%/icons/application/256x256/apps
> @dir %%DATADIR%%/icons/application/256x256

Flags:

melanhit: maintainer-approval+

Actions: View | Diff

Attachments on bug 220585: 184206 | 184289 | 184292