diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2022-04-27 07:57:15 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2022-04-27 07:57:15 +0000 |
| commit | 421f76c27c18017d5a8a2f8bd2fc546d8e649ba8 (patch) | |
| tree | 53229cc3c8056f62b04cc100433f317c4dc02f18 | |
| parent | 50528ec8b310ee2e13749bc08fbecee056913f6c (diff) | |
| download | ports-421f76c27c18017d5a8a2f8bd2fc546d8e649ba8.tar.gz ports-421f76c27c18017d5a8a2f8bd2fc546d8e649ba8.zip | |
security/keepassxc: Update to 2.7.1
- Convert to minizip USES
- Fix MASTER_SITES [1]
- Remove patches already present upstream
PR: 263183, 262953 [1]
Approved by: lwhsu (maintainer)
| -rw-r--r-- | security/keepassxc/Makefile | 8 | ||||
| -rw-r--r-- | security/keepassxc/distinfo | 6 | ||||
| -rw-r--r-- | security/keepassxc/files/patch-src_keeshare_ShareExport.cpp | 11 | ||||
| -rw-r--r-- | security/keepassxc/files/patch-src_keeshare_ShareImport.cpp | 11 |
4 files changed, 8 insertions, 28 deletions
diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile index 8726c3b7b3a3..e1d4ff16a0a7 100644 --- a/security/keepassxc/Makefile +++ b/security/keepassxc/Makefile @@ -1,7 +1,8 @@ PORTNAME= keepassxc -DISTVERSION= 2.7.0 +DISTVERSION= 2.7.1 CATEGORIES= security -MASTER_SITES= https://github.com/keepassxreboot/keepassxc/releases/download/${DISTVERSION}/${PORTNAME}-${DISTVERSION}-src.tar.xz?dummy=/ +MASTER_SITES= https://github.com/keepassxreboot/keepassxc/releases/download/${DISTVERSION}/ +DISTNAME= ${PORTNAME}-${DISTVERSION}-src MAINTAINER= lwhsu@FreeBSD.org COMMENT= KeePass Cross-platform Community Edition @@ -24,6 +25,7 @@ USE_QT= concurrent core dbus gui network svg widgets buildtools_build \ linguisttools_build qmake_build testlib_build x11extras USE_XORG= x11 +WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} CMAKE_OFF= WITH_XC_UPDATECHECK CONFLICTS_INSTALL= keepassx-0.* keepassx2 keepassx @@ -44,7 +46,7 @@ FDOSECRETS_DESC= freedesktop.org secrets service support KEESHARE_CMAKE_BOOL= WITH_XC_KEESHARE KEESHARE_DESC= Sharing integration with KeeShare -KEESHARE_LIB_DEPENDS= libminizip.so:archivers/minizip +KEESHARE_USES= minizip # Legacy/Deprecated. NETWORKING_CMAKE_BOOL= WITH_XC_NETWORKING diff --git a/security/keepassxc/distinfo b/security/keepassxc/distinfo index 64bb201fd9ab..b1b1cb1951e4 100644 --- a/security/keepassxc/distinfo +++ b/security/keepassxc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648564382 -SHA256 (keepassxc-2.7.0.tar.xz) = 83be76890904cd6703343fa097d68bcfdd99bb525cf518fa62a7df9293026aa7 -SIZE (keepassxc-2.7.0.tar.xz) = 8846780 +TIMESTAMP = 1650895642 +SHA256 (keepassxc-2.7.1-src.tar.xz) = 6001ba626c35c316dbda6de35736f012a2264f95139fcb4a094b8eb49b15d3e7 +SIZE (keepassxc-2.7.1-src.tar.xz) = 8804436 diff --git a/security/keepassxc/files/patch-src_keeshare_ShareExport.cpp b/security/keepassxc/files/patch-src_keeshare_ShareExport.cpp deleted file mode 100644 index 0ad8a72f54aa..000000000000 --- a/security/keepassxc/files/patch-src_keeshare_ShareExport.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/keeshare/ShareExport.cpp.orig 2022-03-21 22:47:20 UTC -+++ src/keeshare/ShareExport.cpp -@@ -27,7 +27,7 @@ -
- #include <QBuffer>
- #include <botan/pubkey.h>
--#include <zip.h>
-+#include <minizip/zip.h>
-
- namespace
- {
diff --git a/security/keepassxc/files/patch-src_keeshare_ShareImport.cpp b/security/keepassxc/files/patch-src_keeshare_ShareImport.cpp deleted file mode 100644 index bb3eb2211610..000000000000 --- a/security/keepassxc/files/patch-src_keeshare_ShareImport.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/keeshare/ShareImport.cpp.orig 2022-03-21 22:47:20 UTC -+++ src/keeshare/ShareImport.cpp -@@ -21,7 +21,7 @@ - #include "keys/PasswordKey.h"
-
- #include <QBuffer>
--#include <unzip.h>
-+#include <minizip/unzip.h>
-
- namespace
- {
|