diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile index 9ff9e56ae1be..77ecb6ff7b4d 100644 --- a/security/keepassxc/Makefile +++ b/security/keepassxc/Makefile @@ -1,63 +1,63 @@ PORTNAME= keepassxc -DISTVERSION= 2.6.4 +DISTVERSION= 2.6.6 CATEGORIES= security MASTER_SITES= https://github.com/keepassxreboot/keepassxc/releases/download/${DISTVERSION}/${PORTNAME}-${DISTVERSION}-src.tar.xz?dummy=/ MAINTAINER= melanhit@gmail.com COMMENT= KeePass Cross-platform Community Edition LICENSE= APACHE20 BSD3CLAUSE CC0-1.0 GPLv2 GPLv3 LGPL21 LGPL3 MIT \ NOKIA-LGPL-EXCEPTION LICENSE_COMB= multi LICENSE_NAME_NOKIA-LGPL-EXCEPTION= Nokia Qt LGPL Exception version 1.1 LICENSE_FILE_NOKIA-LGPL-EXCEPTION= ${WRKSRC}/LICENSE.NOKIA-LGPL-EXCEPTION LICENSE_PERMS_NOKIA-LGPL-EXCEPTION= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor LIB_DEPENDS= libargon2.so:security/libargon2 \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libqrencode.so:graphics/libqrencode \ libsodium.so:security/libsodium -USES= cmake compiler:c++11-lang desktop-file-utils qt:5 readline \ - shared-mime-info tar:xz xorg +USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig qt:5 \ + readline shared-mime-info tar:xz xorg USE_QT= concurrent core dbus gui network svg widgets buildtools_build \ linguisttools_build qmake_build testlib_build USE_XORG= x11 CMAKE_OFF= WITH_XC_UPDATECHECK CONFLICTS_INSTALL= keepassx-0.* keepassx2-* keepassx-* -OPTIONS_DEFINE= AUTOTYPE BROWSER KEESHARE NETWORKING YUBIKEY SSHAGENT TEST +OPTIONS_DEFINE= AUTOTYPE BROWSER KEESHARE NETWORKING SSHAGENT YUBIKEY TEST OPTIONS_DEFAULT= AUTOTYPE BROWSER KEESHARE NETWORKING SSHAGENT YUBIKEY OPTIONS_SUB= yes AUTOTYPE_CMAKE_BOOL= WITH_XC_AUTOTYPE AUTOTYPE_DESC= Auto-type passwords in input fields AUTOTYPE_USE= QT=x11extras XORG=xi,xtst BROWSER_CMAKE_BOOL= WITH_XC_BROWSER BROWSER_DESC= Browser integration with KeePassXC-Browser KEESHARE_CMAKE_BOOL= WITH_XC_KEESHARE WITH_XC_KEESHARE_SECURE KEESHARE_DESC= Sharing integration with KeeShare KEESHARE_LIB_DEPENDS= libquazip1-qt5.so:archivers/quazip # Legacy/Deprecated. 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= 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 .include diff --git a/security/keepassxc/distinfo b/security/keepassxc/distinfo index effe129ed4e2..d1cfef98386e 100644 --- a/security/keepassxc/distinfo +++ b/security/keepassxc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612416166 -SHA256 (keepassxc-2.6.4.tar.xz) = e536e2a71c90fcf264eb831fb1a8b518ee1b03829828f862eeea748d3310f82b -SIZE (keepassxc-2.6.4.tar.xz) = 7575164 +TIMESTAMP = 1624333502 +SHA256 (keepassxc-2.6.6.tar.xz) = 3603b11ac39b289c47fac77fa150e05fd64b393d8cfdf5732dc3ef106650a4e2 +SIZE (keepassxc-2.6.6.tar.xz) = 7640532 diff --git a/security/keepassxc/files/patch-src_keeshare_CMakeLists.txt b/security/keepassxc/files/patch-src_keeshare_CMakeLists.txt new file mode 100644 index 000000000000..003158ed74e0 --- /dev/null +++ b/security/keepassxc/files/patch-src_keeshare_CMakeLists.txt @@ -0,0 +1,10 @@ +--- src/keeshare/CMakeLists.txt.orig 2021-06-22 18:07:30 UTC ++++ src/keeshare/CMakeLists.txt +@@ -25,6 +25,7 @@ if(WITH_XC_KEESHARE) + find_package(QuaZip) + if(QUAZIP_FOUND) + set(WITH_XC_KEESHARE_SECURE ON PARENT_SCOPE) ++ target_link_directories(keeshare BEFORE PUBLIC ${QUAZIP_LIBRARY_DIRS}) + target_include_directories(keeshare SYSTEM PRIVATE ${QUAZIP_INCLUDE_DIRS}) + target_link_libraries(keeshare PRIVATE ${QUAZIP_LIBRARIES}) + else() diff --git a/security/keepassxc/pkg-plist b/security/keepassxc/pkg-plist index c666c209502b..9baa6481fdfd 100644 --- a/security/keepassxc/pkg-plist +++ b/security/keepassxc/pkg-plist @@ -1,58 +1,61 @@ bin/keepassxc bin/keepassxc-cli %%BROWSER%%bin/keepassxc-proxy %%AUTOTYPE%%lib/keepassxc/libkeepassx-autotype-xcb.so man/man1/keepassxc-cli.1.gz man/man1/keepassxc.1.gz share/applications/org.keepassxc.KeePassXC.desktop share/icons/hicolor/256x256/apps/keepassxc.png share/icons/hicolor/scalable/apps/keepassxc-locked.svg share/icons/hicolor/scalable/apps/keepassxc-monochrome-dark-locked.svg share/icons/hicolor/scalable/apps/keepassxc-monochrome-dark.svg share/icons/hicolor/scalable/apps/keepassxc-monochrome-light-locked.svg share/icons/hicolor/scalable/apps/keepassxc-monochrome-light.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 %%DATADIR%%/docs/KeePassXC_GettingStarted.html %%DATADIR%%/docs/KeePassXC_KeyboardShortcuts.html %%DATADIR%%/docs/KeePassXC_UserGuide.html %%DATADIR%%/icons/application/256x256/apps/keepassxc.png %%DATADIR%%/translations/keepassx_ar.qm %%DATADIR%%/translations/keepassx_bg.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.qm %%DATADIR%%/translations/keepassx_en_GB.qm %%DATADIR%%/translations/keepassx_en_US.qm %%DATADIR%%/translations/keepassx_es.qm %%DATADIR%%/translations/keepassx_et.qm %%DATADIR%%/translations/keepassx_fi.qm %%DATADIR%%/translations/keepassx_fr.qm +%%DATADIR%%/translations/keepassx_fr_CA.qm %%DATADIR%%/translations/keepassx_hr_HR.qm %%DATADIR%%/translations/keepassx_hu.qm %%DATADIR%%/translations/keepassx_id.qm %%DATADIR%%/translations/keepassx_it.qm %%DATADIR%%/translations/keepassx_ja.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_sk.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