CVS commit: pkgsrc/security/keepassxc

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Mar 22 15:56:41 UTC 2019

Modified Files:
        pkgsrc/security/keepassxc: Makefile PLIST distinfo
Added Files:
        pkgsrc/security/keepassxc/patches: patch-src_gui_DatabaseWidget.cpp
Removed Files:
        pkgsrc/security/keepassxc/patches:
            patch-src_gui_entry_EditEntryWidget.cpp

Log Message:
Update to 2.4.0

* Disable PaX MPROTECT to enable autotype

Changelog:
    New Database Wizard [#1952]
    Advanced Search [#1797]
    Automatic update checker [#2648]
    KeeShare database synchronization [#2109, #1992, #2738, #2742, #2746, #2739]
    Improve favicon fetching; transition to Duck-Duck-Go [#2795, #2011, #2439]
    Remove KeePassHttp support [#1752]
    CLI: output info to stderr for easier scripting [#2558]
    CLI: Add --quiet option [#2507]
    CLI: Add create command [#2540]
    CLI: Add recursive listing of entries [#2345]
    CLI: Fix stdin/stdout encoding on Windows [#2425]
    SSH Agent: Support OpenSSH for Windows [#1994]
    macOS: TouchID Quick Unlock [#1851]
    macOS: Multiple improvements; include CLI in DMG [#2165, #2331, #2583]
    Linux: Prevent Klipper from storing secrets in clipboard [#1969]
    Linux: Use polling based file watching for NFS [#2171]
    Linux: Enable use of browser plugin in Snap build [#2802]
    TOTP QR Code Generator [#1167]
    High-DPI Scaling for 4k screens [#2404]
    Make keyboard shortcuts more consistent [#2431]
    Warn user if deleting referenced entries [#1744]
    Allow toolbar to be hidden and repositioned [#1819, #2357]
    Increase max allowed database timeout to 12 hours [#2173]
    Password generator uses existing password length by default [#2318]
    Improve alert message box button labels [#2376]
    Show message when a database merge makes no changes [#2551]
    Browser Integration Enhancements [#1497, #2253, #1904, #2232, #1850, #2218, #2391, #2396, #2542, #2622, #2637, #2790]
    Overall Code Improvements [#2316, #2284, #2351, #2402, #2410, #2419, #2422, #2443, #2491, #2506, #2610, #2667, #2709, #2731]


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/keepassxc/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/keepassxc/PLIST \
    pkgsrc/security/keepassxc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/keepassxc/patches/patch-src_gui_DatabaseWidget.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/security/keepassxc/patches/patch-src_gui_entry_EditEntryWidget.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/keepassxc/Makefile
diff -u pkgsrc/security/keepassxc/Makefile:1.9 pkgsrc/security/keepassxc/Makefile:1.10
--- pkgsrc/security/keepassxc/Makefile:1.9      Tue Jan  8 16:27:16 2019
+++ pkgsrc/security/keepassxc/Makefile  Fri Mar 22 15:56:41 2019
@@ -1,20 +1,28 @@
-# $NetBSD: Makefile,v 1.9 2019/01/08 16:27:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2019/03/22 15:56:41 ryoon Exp $
 
-DISTNAME=      keepassxc-2.3.4
+DISTNAME=      keepassxc-2.4.0-src
+PKGNAME=       ${DISTNAME:S/-src//}
 CATEGORIES=    security x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=keepassxreboot/}
+GITHUB_RELEASE=        2.4.0
+GITHUB_PROJECT=        keepassxc
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://keepassxc.org/
 COMMENT=       Password generator and manager
 LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-lgpl-v2 AND gnu-lgpl-v3 AND mit AND cc0-1.0-universal
 
+WRKSRC=                ${WRKDIR}/${DISTNAME:S/-src//}
+
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 CMAKE_ARG_PATH=        ..
 CMAKE_ARGS+=   -DKEEPASSXC_BUILD_TYPE=Release
 CONFIGURE_DIRS=        build
 
+NOT_PAX_MPROTECT_SAFE+=        bin/keepassxc
+
 .PHONY: qmake-bin-add
 pre-configure: qmake-bin-add
 
@@ -24,12 +32,14 @@ qmake-bin-add:
 pre-configure:
        ${MKDIR} ${WRKSRC}/build
 
+.include "../../converters/qrencode/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/argon2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/keepassxc/PLIST
diff -u pkgsrc/security/keepassxc/PLIST:1.3 pkgsrc/security/keepassxc/PLIST:1.4
--- pkgsrc/security/keepassxc/PLIST:1.3 Tue Jan  8 16:27:16 2019
+++ pkgsrc/security/keepassxc/PLIST     Fri Mar 22 15:56:41 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/01/08 16:27:16 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/03/22 15:56:41 ryoon Exp $
 bin/keepassxc
 bin/keepassxc-cli
 lib/keepassxc/libkeepassx-autotype-xcb.so
@@ -37,15 +37,16 @@ share/icons/hicolor/64x64/apps/keepassxc
 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
+share/icons/hicolor/scalable/apps/keepassxc-dark.svg
+share/icons/hicolor/scalable/apps/keepassxc-locked.svg
+share/icons/hicolor/scalable/apps/keepassxc-unlocked.svg
+share/icons/hicolor/scalable/apps/keepassxc.svg
+share/icons/hicolor/scalable/mimetypes/application-x-keepassxc.svg
 share/keepassxc/icons/application/128x128/apps/keepassxc-dark.png
 share/keepassxc/icons/application/128x128/apps/keepassxc-locked.png
 share/keepassxc/icons/application/128x128/apps/keepassxc-unlocked.png
 share/keepassxc/icons/application/128x128/apps/keepassxc.png
+share/keepassxc/icons/application/128x128/apps/preferences-system-network-sharing.png
 share/keepassxc/icons/application/128x128/mimetypes/application-x-keepassxc.png
 share/keepassxc/icons/application/16x16/actions/application-exit.png
 share/keepassxc/icons/application/16x16/actions/auto-type.png
@@ -64,6 +65,7 @@ share/keepassxc/icons/application/16x16/
 share/keepassxc/icons/application/16x16/actions/entry-delete.png
 share/keepassxc/icons/application/16x16/actions/entry-edit.png
 share/keepassxc/icons/application/16x16/actions/entry-new.png
+share/keepassxc/icons/application/16x16/actions/favicon-download.png
 share/keepassxc/icons/application/16x16/actions/group-delete.png
 share/keepassxc/icons/application/16x16/actions/group-edit.png
 share/keepassxc/icons/application/16x16/actions/group-empty-trash.png
@@ -76,6 +78,7 @@ share/keepassxc/icons/application/16x16/
 share/keepassxc/icons/application/16x16/actions/password-generator.png
 share/keepassxc/icons/application/16x16/actions/password-show-off.png
 share/keepassxc/icons/application/16x16/actions/password-show-on.png
+share/keepassxc/icons/application/16x16/actions/system-help.png
 share/keepassxc/icons/application/16x16/actions/system-search.png
 share/keepassxc/icons/application/16x16/actions/url-copy.png
 share/keepassxc/icons/application/16x16/actions/username-copy.png
@@ -97,6 +100,7 @@ share/keepassxc/icons/application/22x22/
 share/keepassxc/icons/application/22x22/actions/entry-delete.png
 share/keepassxc/icons/application/22x22/actions/entry-edit.png
 share/keepassxc/icons/application/22x22/actions/entry-new.png
+share/keepassxc/icons/application/22x22/actions/favicon-download.png
 share/keepassxc/icons/application/22x22/actions/group-empty-trash.png
 share/keepassxc/icons/application/22x22/actions/help-about.png
 share/keepassxc/icons/application/22x22/actions/message-close.png
@@ -104,6 +108,7 @@ share/keepassxc/icons/application/22x22/
 share/keepassxc/icons/application/22x22/actions/password-copy.png
 share/keepassxc/icons/application/22x22/actions/password-generate.png
 share/keepassxc/icons/application/22x22/actions/password-generator.png
+share/keepassxc/icons/application/22x22/actions/system-help.png
 share/keepassxc/icons/application/22x22/actions/system-search.png
 share/keepassxc/icons/application/22x22/actions/url-copy.png
 share/keepassxc/icons/application/22x22/actions/username-copy.png
@@ -139,6 +144,7 @@ share/keepassxc/icons/application/32x32/
 share/keepassxc/icons/application/32x32/actions/entry-delete.png
 share/keepassxc/icons/application/32x32/actions/entry-edit.png
 share/keepassxc/icons/application/32x32/actions/entry-new.png
+share/keepassxc/icons/application/32x32/actions/favicon-download.png
 share/keepassxc/icons/application/32x32/actions/group-empty-trash.png
 share/keepassxc/icons/application/32x32/actions/help-about.png
 share/keepassxc/icons/application/32x32/actions/key-enter.png
@@ -148,6 +154,7 @@ share/keepassxc/icons/application/32x32/
 share/keepassxc/icons/application/32x32/actions/password-generator.png
 share/keepassxc/icons/application/32x32/actions/password-show-off.png
 share/keepassxc/icons/application/32x32/actions/password-show-on.png
+share/keepassxc/icons/application/32x32/actions/system-help.png
 share/keepassxc/icons/application/32x32/actions/system-search.png
 share/keepassxc/icons/application/32x32/actions/url-copy.png
 share/keepassxc/icons/application/32x32/actions/username-copy.png
@@ -171,11 +178,11 @@ share/keepassxc/icons/application/64x64/
 share/keepassxc/icons/application/64x64/apps/keepassxc-unlocked.png
 share/keepassxc/icons/application/64x64/apps/keepassxc.png
 share/keepassxc/icons/application/64x64/mimetypes/application-x-keepassxc.png
-share/keepassxc/icons/application/scalable/apps/keepassxc-dark.svgz
-share/keepassxc/icons/application/scalable/apps/keepassxc-locked.svgz
-share/keepassxc/icons/application/scalable/apps/keepassxc-unlocked.svgz
-share/keepassxc/icons/application/scalable/apps/keepassxc.svgz
-share/keepassxc/icons/application/scalable/mimetypes/application-x-keepassxc.svgz
+share/keepassxc/icons/application/scalable/apps/keepassxc-dark.svg
+share/keepassxc/icons/application/scalable/apps/keepassxc-locked.svg
+share/keepassxc/icons/application/scalable/apps/keepassxc-unlocked.svg
+share/keepassxc/icons/application/scalable/apps/keepassxc.svg
+share/keepassxc/icons/application/scalable/mimetypes/application-x-keepassxc.svg
 share/keepassxc/icons/database/C00_Password.png
 share/keepassxc/icons/database/C01_Package_Network.png
 share/keepassxc/icons/database/C02_MessageBox_Warning.png
@@ -258,22 +265,28 @@ share/keepassxc/translations/keepassx_es
 share/keepassxc/translations/keepassx_eu.qm
 share/keepassxc/translations/keepassx_fi.qm
 share/keepassxc/translations/keepassx_fr.qm
+share/keepassxc/translations/keepassx_he.qm
+share/keepassxc/translations/keepassx_hr_HR.qm
 share/keepassxc/translations/keepassx_hu.qm
 share/keepassxc/translations/keepassx_id.qm
+share/keepassxc/translations/keepassx_is_IS.qm
 share/keepassxc/translations/keepassx_it.qm
 share/keepassxc/translations/keepassx_ja.qm
 share/keepassxc/translations/keepassx_kk.qm
 share/keepassxc/translations/keepassx_ko.qm
+share/keepassxc/translations/keepassx_la.qm
 share/keepassxc/translations/keepassx_lt.qm
+share/keepassxc/translations/keepassx_lv.qm
 share/keepassxc/translations/keepassx_nb.qm
 share/keepassxc/translations/keepassx_nl_NL.qm
 share/keepassxc/translations/keepassx_pl.qm
+share/keepassxc/translations/keepassx_pt.qm
 share/keepassxc/translations/keepassx_pt_BR.qm
 share/keepassxc/translations/keepassx_pt_PT.qm
 share/keepassxc/translations/keepassx_ro.qm
 share/keepassxc/translations/keepassx_ru.qm
-share/keepassxc/translations/keepassx_sl_SI.qm
 share/keepassxc/translations/keepassx_sk.qm
+share/keepassxc/translations/keepassx_sl_SI.qm
 share/keepassxc/translations/keepassx_sr.qm
 share/keepassxc/translations/keepassx_sv.qm
 share/keepassxc/translations/keepassx_th.qm
@@ -281,6 +294,7 @@ share/keepassxc/translations/keepassx_tr
 share/keepassxc/translations/keepassx_uk.qm
 share/keepassxc/translations/keepassx_zh_CN.qm
 share/keepassxc/translations/keepassx_zh_TW.qm
+share/keepassxc/wizard/background-pixmap.png
 share/keepassxc/wordlists/eff_large.wordlist
 share/metainfo/org.keepassxc.KeePassXC.appdata.xml
 share/mime/packages/keepassxc.xml
Index: pkgsrc/security/keepassxc/distinfo
diff -u pkgsrc/security/keepassxc/distinfo:1.3 pkgsrc/security/keepassxc/distinfo:1.4
--- pkgsrc/security/keepassxc/distinfo:1.3      Tue Jan  8 16:27:16 2019
+++ pkgsrc/security/keepassxc/distinfo  Fri Mar 22 15:56:41 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2019/01/08 16:27:16 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2019/03/22 15:56:41 ryoon Exp $
 
-SHA1 (keepassxc-2.3.4.tar.gz) = 78cf952407fb8fcffb738291b7e08d94a3e0c9a7
-RMD160 (keepassxc-2.3.4.tar.gz) = dfc9f40dd7d233c9e91ebac6a653d92b5797f6c4
-SHA512 (keepassxc-2.3.4.tar.gz) = 630d4d1f77c44c27f3d27a1908c80a94265af9aae8774d80726f86f635eee6a10d8a426b0157ad03efe9f5111d7d67f5c785962ec3715c8374b9f38788fab863
-Size (keepassxc-2.3.4.tar.gz) = 5154621 bytes
-SHA1 (patch-src_gui_entry_EditEntryWidget.cpp) = 02970a3499a1041f60455886155539827f3427e2
+SHA1 (keepassxc-2.4.0-src.tar.xz) = 61242176a727b0c51ffcfa61ede2c2cfecc8801c
+RMD160 (keepassxc-2.4.0-src.tar.xz) = 46e4485aaef4823b80b92f4d708fa131a3fe1673
+SHA512 (keepassxc-2.4.0-src.tar.xz) = b7295f5983237606efd236955dc73d477992d944e547eeb2c3a267d846e70ce6f83e489f58e3bd9b5bb21decabd9052a4ea7b98bd98e8283abbb678ae19e5559
+Size (keepassxc-2.4.0-src.tar.xz) = 3252104 bytes
+SHA1 (patch-src_gui_DatabaseWidget.cpp) = 9bbd72c77cda0c3cbd1e0be2ea781b9d78a32481

Added files:

Index: pkgsrc/security/keepassxc/patches/patch-src_gui_DatabaseWidget.cpp
diff -u /dev/null pkgsrc/security/keepassxc/patches/patch-src_gui_DatabaseWidget.cpp:1.1
--- /dev/null   Fri Mar 22 15:56:41 2019
+++ pkgsrc/security/keepassxc/patches/patch-src_gui_DatabaseWidget.cpp  Fri Mar 22 15:56:41 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_gui_DatabaseWidget.cpp,v 1.1 2019/03/22 15:56:41 ryoon Exp $
+
+* Fix build without WITH_XC_KEESHARE
+
+--- src/gui/DatabaseWidget.cpp.orig    2019-03-19 22:59:14.000000000 +0000
++++ src/gui/DatabaseWidget.cpp
+@@ -1112,7 +1112,9 @@ void DatabaseWidget::search(const QStrin
+     }
+ 
+     m_searchingLabel->setVisible(true);
++#ifdef WITH_XC_KEESHARE
+     m_shareLabel->setVisible(false);
++#endif
+ 
+     emit searchModeActivated();
+ }