From nobody Wed Apr 27 07:58:06 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id ED69F1AAD5C0; Wed, 27 Apr 2022 07:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KpB266P5zz3C7Q; Wed, 27 Apr 2022 07:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651046286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cp7QbL0zEmurCVVK0b05XRGRt2zRep6CuVMA5GLQtmU=; b=rhUU0d5uIWjXfklltNnzVQZrkTtv4/GLVAe+aeBjJgkQSvI2tLIgU1ygpMw+JEgJmr0uD0 kHdHDQMGv2BFpDQFi4b2nM7kiyi5L79ExMsxlJMz7X1qp5zrSn6rEeHoaLxRUT6vKFs2f0 tLDMGJWAsVFvcqKi1AqEwi/jvXdkzrdodyZiv3lWUMxyiKe0TRhAGxnNYZ8NwckJ9pE3cB v7bkZuxXIROBD9SM8Yq84s44KD7B342Imyi2aF4ef+vUONzXVrFiOijWp4nVjj+3eOBtkk 9wqAVvhu2VJj4vRFsK1l0rkUHazUhLIubSi1xm5mXM1cHQQlbjzcX2u1uTGKIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B2BCF2020E; Wed, 27 Apr 2022 07:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23R7w6WT012182; Wed, 27 Apr 2022 07:58:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23R7w6Fj012181; Wed, 27 Apr 2022 07:58:06 GMT (envelope-from git) Date: Wed, 27 Apr 2022 07:58:06 GMT Message-Id: <202204270758.23R7w6Fj012181@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 421f76c27c18 - main - security/keepassxc: Update to 2.7.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 421f76c27c18017d5a8a2f8bd2fc546d8e649ba8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651046286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cp7QbL0zEmurCVVK0b05XRGRt2zRep6CuVMA5GLQtmU=; b=NZk5p6N4+m5t4zsfWiPziIwcUo1lBAd5D2PaUvRE0Z/XyDGsf3JbEw8QJDrbY7Kx2k7wLJ 10EhZ7WwfVfA0mgT+AE9xVPXavsf4GDgwVqHtRYjsZy1AscmhDh0jUraWSKmmKdwfZ8rhD vEgarfB1aur2nWHCxWcf2O8hHRPu8t72v8Q14YVsmPX5kJi+ZWllQqMiichBJ0kJnDebWJ JIEkc6ackXroBu2p7xOibvMshoV5lHcAOLBLMYqUXkJzjYPjtov6gsB97uL6DwnsVh4e7n azxIGpsuwT5C/tbdDn0leB2V5MZEr9a9bi/chP2dECfa4/NyjXVnhXN4PkeWLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651046286; a=rsa-sha256; cv=none; b=Tyu/to+hCWRA5sVO4XDudddhpbnFwiOtEOdHKpm5QQ8+QOxTtvZYA9c5MHvuIRQwabnHJT qXC8ddAFdqZFZjZNF2JJ6P5aRNVnPf5AvQd9RkFIyPh2Gj6cmqV5lR5dNfLeVYaYXnDvx6 31OLwHNFZoWlIMZgQcNO/hOgTrHpIICpri6WzQ6vS8PhWtFrKvbWm02rOo6WIPyscPI+pI G8BHv+H8udDA6VjsOZAoO/cgCbFt7afM8WvPkyqtNnwT5g6mk74WnsoEkMaRlUqDab2UWC BHdvQYhkcyxbBqf4C764qB0XDzlmAFiPojfVLwhY35GzSwerhSKlwHVvNstynQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=421f76c27c18017d5a8a2f8bd2fc546d8e649ba8 commit 421f76c27c18017d5a8a2f8bd2fc546d8e649ba8 Author: Guido Falsi AuthorDate: 2022-04-27 07:57:15 +0000 Commit: Guido Falsi CommitDate: 2022-04-27 07:57:15 +0000 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) --- security/keepassxc/Makefile | 8 +++++--- security/keepassxc/distinfo | 6 +++--- security/keepassxc/files/patch-src_keeshare_ShareExport.cpp | 11 ----------- 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 - #include --#include -+#include - - 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 --#include -+#include - - namespace - {