From nobody Mon Jul 10 18:46:57 2023 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 4R0Cf94WhGz4gq3p; Mon, 10 Jul 2023 18:46:57 +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 4R0Cf9463jz42c6; Mon, 10 Jul 2023 18:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689014817; 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=JGA+BwusdSm8390F4zZTBtLLhMMqvBCHgfiU5tFwzC0=; b=CVl43tAkNbo+pp5B2/ZPkinmCqTvx8FW05USsf0EmssfqcnQ2/WYhM2uOeHiWdmnSXxxDE U56UPBYrkbdFFKV2BX6zCaDFUNn1Daue/ua3+7r5fNvCT5YDTLzAKENPCwG0eFG1ZA4+VD 1C6lc4ACUw3GXrK2mZsqTVrBAwvn6mRZQKVqqqBMay+hyDu0BbinVTn52MArnSM42Zh1Gg 6tH7n8M1LsJLrm26HaLS/UZERBtM3DWK2Z+VYOCFfToCMJGI9tW4Cy2vTHzkLvCABbqT7z MTteEbhGo/D8MwIZBNS9H89NJCyu0tsjSVJkMIlGoTcfdYYrP1B6DvMeG31hMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689014817; 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=JGA+BwusdSm8390F4zZTBtLLhMMqvBCHgfiU5tFwzC0=; b=LhiI65khDyBZRCn686C/Y69BwL2g1ySTOSgGiInh/K++jZnjIohGrMdZp4Lqj0QdFsqf8a /h4lSg5Bp6Xo1vip/cJiVDDnyPc/cPG4Kb/BhWyH9OhjDDMJIo3rlpYCC5JClCbVu16mhK NiCrxvg1mBP1YIEmYqLg+IDEESaqmJ85+ces7K4voPppAZyv2O/Wcxqylet3zcH+rKVXdD +7bnmxqLCVFrcdyVoBwinwSBE6rDdorvNqMakqeMBkeja5IdxsBzjBuyvSHurFpkgELfXT DRpyJ7rmlzwwNmNniwFDECbh/LmrE42jSLq6NLdsccz0HximRquc68LdBSls7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689014817; a=rsa-sha256; cv=none; b=FLQLycK2B9NfEYIz/CPqfYWtyILm2w1NC1FWZh+IQan5ByRsmjdFwH1xq15PsOoSOBBQOQ AmXdKTPgmF46NB6mPOVU1HjAKmqVqsBrn5/4Zm1wsruea8eiH7IZbf30ZWiGYzz5T+g04N pJQgxAPOChNaAPKTxO2sxh2Dc0HKr5pSmjKgxQbgqqfVQvPBTLkJFxCV8RqE/jeCcz5N1U gO5Mg9SUkyNUtvA+A9YVBzhPAsa1NifBqB6qUZ52jaKyfjmGh/SRI9RxlvBnMmG5sqjenu 9yoZdFjf8FCXEuraMIIOw4yNAHKeMZ+kxrCaR9MKSYwchjHHoomf/BKgeYU6zA== 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 4R0Cf934qKzw2S; Mon, 10 Jul 2023 18:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AIkvkh085524; Mon, 10 Jul 2023 18:46:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AIkvkT085523; Mon, 10 Jul 2023 18:46:57 GMT (envelope-from git) Date: Mon, 10 Jul 2023 18:46:57 GMT Message-Id: <202307101846.36AIkvkT085523@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 143072ff128f - main - security/*gpgme*: Update to 1.21.0 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: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 143072ff128f78f0c63639d6bc28f5d0081a5618 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=143072ff128f78f0c63639d6bc28f5d0081a5618 commit 143072ff128f78f0c63639d6bc28f5d0081a5618 Author: Jason E. Hale AuthorDate: 2023-07-10 17:04:45 +0000 Commit: Jason E. Hale CommitDate: 2023-07-10 18:46:33 +0000 security/*gpgme*: Update to 1.21.0 Split out the headers shared between the qt5 and qt6 flavors of security/gpgme-qt to security/gpgme-qt-headers so that they no longer conflict. https://dev.gnupg.org/T6585 --- security/Makefile | 1 + security/gpgme-cpp/pkg-plist | 2 +- security/gpgme-qt-headers/Makefile | 14 +++ .../pkg-plist.qt5 => gpgme-qt-headers/pkg-plist} | 5 - security/gpgme-qt/Makefile | 1 + security/gpgme-qt/pkg-plist | 5 + security/gpgme-qt/pkg-plist.qt6 | 105 --------------------- security/gpgme/Makefile | 31 ++++-- security/gpgme/distinfo | 6 +- security/gpgme/pkg-plist | 2 +- 10 files changed, 47 insertions(+), 125 deletions(-) diff --git a/security/Makefile b/security/Makefile index 8a4b7983dcae..1ca071f87b2e 100644 --- a/security/Makefile +++ b/security/Makefile @@ -197,6 +197,7 @@ SUBDIR += gpgme SUBDIR += gpgme-cpp SUBDIR += gpgme-qt + SUBDIR += gpgme-qt-headers SUBDIR += gsa SUBDIR += gsad SUBDIR += gsasl diff --git a/security/gpgme-cpp/pkg-plist b/security/gpgme-cpp/pkg-plist index afa01a90a173..c5eb9f270964 100644 --- a/security/gpgme-cpp/pkg-plist +++ b/security/gpgme-cpp/pkg-plist @@ -44,4 +44,4 @@ lib/cmake/Gpgmepp/GpgmeppConfig.cmake lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake lib/libgpgmepp.so lib/libgpgmepp.so.6 -lib/libgpgmepp.so.6.17.0 +lib/libgpgmepp.so.6.18.0 diff --git a/security/gpgme-qt-headers/Makefile b/security/gpgme-qt-headers/Makefile new file mode 100644 index 000000000000..76fbf8376bd0 --- /dev/null +++ b/security/gpgme-qt-headers/Makefile @@ -0,0 +1,14 @@ +PORTREVISION= 0 +PKGNAMESUFFIX= -${SLAVEPORT} + +COMMENT= Shared headers for the Gpgme Qt bindings + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + +MASTERDIR= ${.CURDIR}/../../security/gpgme +SLAVEPORT= qt-headers +BINDING_NAME= qt +PLIST= ${.CURDIR}/pkg-plist + +.include "${MASTERDIR}/Makefile" diff --git a/security/gpgme-qt/pkg-plist.qt5 b/security/gpgme-qt-headers/pkg-plist similarity index 95% rename from security/gpgme-qt/pkg-plist.qt5 rename to security/gpgme-qt-headers/pkg-plist index d10663f13c7f..5f86f21d9979 100644 --- a/security/gpgme-qt/pkg-plist.qt5 +++ b/security/gpgme-qt-headers/pkg-plist @@ -98,8 +98,3 @@ include/qgpgme/verifyopaquejob.h include/qgpgme/wkdlookupjob.h include/qgpgme/wkdlookupresult.h include/qgpgme/wkspublishjob.h -lib/cmake/QGpgme/QGpgmeConfig.cmake -lib/cmake/QGpgme/QGpgmeConfigVersion.cmake -lib/libqgpgme.so -lib/libqgpgme.so.15 -lib/libqgpgme.so.15.2.1 diff --git a/security/gpgme-qt/Makefile b/security/gpgme-qt/Makefile index 017cf7dda006..354fd2ccc31a 100644 --- a/security/gpgme-qt/Makefile +++ b/security/gpgme-qt/Makefile @@ -14,5 +14,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING MASTERDIR= ${.CURDIR}/../../security/gpgme SLAVEPORT= qt BINDING_NAME= qt +PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/security/gpgme-qt/pkg-plist b/security/gpgme-qt/pkg-plist new file mode 100644 index 000000000000..4d404382a6cb --- /dev/null +++ b/security/gpgme-qt/pkg-plist @@ -0,0 +1,5 @@ +lib/cmake/QGpgme%%QT_SUFFIX%%/QGpgme%%QT_SUFFIX%%Config.cmake +lib/cmake/QGpgme%%QT_SUFFIX%%/QGpgme%%QT_SUFFIX%%ConfigVersion.cmake +lib/libqgpgme%%qt_SUFFIX%%.so +lib/libqgpgme%%qt_SUFFIX%%.so.15 +lib/libqgpgme%%qt_SUFFIX%%.so.15.3.0 diff --git a/security/gpgme-qt/pkg-plist.qt6 b/security/gpgme-qt/pkg-plist.qt6 deleted file mode 100644 index 77f12008e497..000000000000 --- a/security/gpgme-qt/pkg-plist.qt6 +++ /dev/null @@ -1,105 +0,0 @@ -include/QGpgME/AbstractImportJob -include/QGpgME/AddExistingSubkeyJob -include/QGpgME/AddUserIDJob -include/QGpgME/ChangeExpiryJob -include/QGpgME/ChangeOwnerTrustJob -include/QGpgME/ChangePasswdJob -include/QGpgME/CryptoConfig -include/QGpgME/DN -include/QGpgME/DataProvider -include/QGpgME/Debug -include/QGpgME/DecryptJob -include/QGpgME/DecryptVerifyArchiveJob -include/QGpgME/DecryptVerifyJob -include/QGpgME/DefaultKeyGenerationJob -include/QGpgME/DeleteJob -include/QGpgME/DownloadJob -include/QGpgME/EncryptArchiveJob -include/QGpgME/EncryptJob -include/QGpgME/ExportJob -include/QGpgME/FileListDataProvider -include/QGpgME/GpgCardJob -include/QGpgME/HierarchicalKeyKistJob -include/QGpgME/ImportFromKeyserverJob -include/QGpgME/ImportJob -include/QGpgME/Job -include/QGpgME/KeyForMailboxJob -include/QGpgME/KeyGenerationJob -include/QGpgME/KeyListJob -include/QGpgME/ListAllKeysJob -include/QGpgME/MultiDeleteJob -include/QGpgME/Protocol -include/QGpgME/QGpgMENewCryptoConfig -include/QGpgME/QuickJob -include/QGpgME/ReceiveKeysJob -include/QGpgME/RefreshKeysJob -include/QGpgME/RevokeKeyJob -include/QGpgME/SetPrimaryUserIDJob -include/QGpgME/SignArchiveJob -include/QGpgME/SignEncryptArchiveJob -include/QGpgME/SignEncryptJob -include/QGpgME/SignJob -include/QGpgME/SignKeyJob -include/QGpgME/SpecialJob -include/QGpgME/TofuPolicyJob -include/QGpgME/VerifyDetachedJob -include/QGpgME/VerifyOpaqueJob -include/QGpgME/WKDLookupJob -include/QGpgME/WKDLookupResult -include/QGpgME/WKSPublishJob -include/qgpgme/abstractimportjob.h -include/qgpgme/addexistingsubkeyjob.h -include/qgpgme/adduseridjob.h -include/qgpgme/changeexpiryjob.h -include/qgpgme/changeownertrustjob.h -include/qgpgme/changepasswdjob.h -include/qgpgme/cryptoconfig.h -include/qgpgme/dataprovider.h -include/qgpgme/debug.h -include/qgpgme/decryptjob.h -include/qgpgme/decryptverifyarchivejob.h -include/qgpgme/decryptverifyjob.h -include/qgpgme/defaultkeygenerationjob.h -include/qgpgme/deletejob.h -include/qgpgme/dn.h -include/qgpgme/downloadjob.h -include/qgpgme/encryptarchivejob.h -include/qgpgme/encryptjob.h -include/qgpgme/exportjob.h -include/qgpgme/filelistdataprovider.h -include/qgpgme/gpgcardjob.h -include/qgpgme/hierarchicalkeylistjob.h -include/qgpgme/importfromkeyserverjob.h -include/qgpgme/importjob.h -include/qgpgme/job.h -include/qgpgme/keyformailboxjob.h -include/qgpgme/keygenerationjob.h -include/qgpgme/keylistjob.h -include/qgpgme/listallkeysjob.h -include/qgpgme/multideletejob.h -include/qgpgme/protocol.h -include/qgpgme/qgpgme_export.h -include/qgpgme/qgpgme_version.h -include/qgpgme/qgpgmenewcryptoconfig.h -include/qgpgme/quickjob.h -include/qgpgme/receivekeysjob.h -include/qgpgme/refreshkeysjob.h -include/qgpgme/revokekeyjob.h -include/qgpgme/setprimaryuseridjob.h -include/qgpgme/signarchivejob.h -include/qgpgme/signencryptarchivejob.h -include/qgpgme/signencryptjob.h -include/qgpgme/signjob.h -include/qgpgme/signkeyjob.h -include/qgpgme/specialjob.h -include/qgpgme/tofupolicyjob.h -include/qgpgme/verifydetachedjob.h -include/qgpgme/verifyopaquejob.h -include/qgpgme/wkdlookupjob.h -include/qgpgme/wkdlookupresult.h -include/qgpgme/wkspublishjob.h -lib/cmake/QGpgmeQt6/QGpgmeQt6Config.cmake -lib/cmake/QGpgmeQt6/QGpgmeQt6ConfigVersion.cmake -lib/libqgpgmeqt6.so -lib/libqgpgmeqt6.so.15 -lib/libqgpgmeqt6.so.15.2.1 diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index 7169cfc03799..fd7b18ee07d2 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -1,5 +1,5 @@ PORTNAME= gpgme -PORTVERSION= 1.20.0 +PORTVERSION= 1.21.0 PORTREVISION?= 0 CATEGORIES?= security MASTER_SITES= GNUPG/gpgme @@ -18,7 +18,8 @@ USES= compiler:c11 cpe gmake libtool localbase:ldflags tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip +CFLAGS+= -Wno-suggest-override -Wno-unknown-warning-option +INSTALL_TARGET?=install-strip TEST_TARGET= check CPE_VENDOR= gnu @@ -54,7 +55,7 @@ BUILD_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME} INSTALL_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME} TEST_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME}/tests -. if ${SLAVEPORT} != "cpp" +. if ${SLAVEPORT} != "cpp" && ${SLAVEPORT} != "qt-headers" OPTIONS_DEFINE+= TEST . endif @@ -64,26 +65,32 @@ CONFIGURE_ARGS+=--enable-languages="cpp" NO_TEST= yes . endif +. if ${SLAVEPORT} == "qt-headers" +CONFIGURE_ARGS+=--enable-languages="" +ALL_TARGET= all-am +INSTALL_TARGET= install-data +NO_TEST= yes +. endif + . if ${SLAVEPORT} == "qt" LIB_DEPENDS+= libgpgmepp.so:security/gpgme-cpp +RUN_DEPENDS+= ${LOCALBASE}/include/qgpgme/qgpgme_version.h:security/gpgme-qt-headers FLAVORS= qt5 qt6 FLAVOR?= ${FLAVORS:[1]} qt5_PKGNAMESUFFIX= -qt5 qt6_PKGNAMESUFFIX= -qt6 -qt5_PLIST= ${.CURDIR}/pkg-plist.qt5 -qt6_PLIST= ${.CURDIR}/pkg-plist.qt6 -qt5_CONFLICTS_INSTALL= gpgme-qt6 -qt6_CONFLICTS_INSTALL= gpgme-qt5 . if ${FLAVOR:U} == "qt5" USES+= compiler:c++11-lib pkgconfig qt:5 USE_QT= buildtools:build core TEST_USE= QT=testlib:build +PLIST_SUB= QT_SUFFIX="" qt_SUFFIX="" . else USES+= compiler:c++17-lang pkgconfig qt:6 USE_QT= base USE_CXXSTD= c++17 +PLIST_SUB= QT_SUFFIX="Qt6" qt_SUFFIX="qt6" . endif CONFIGURE_ARGS+=--enable-languages="cpp ${FLAVOR}" @@ -115,13 +122,17 @@ post-patch: . if ${SLAVEPORT} == "qt" @${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \ ${REINPLACE_CMD} -e 's|../../cpp/src/libgpgmepp.la|-lgpgmepp|g' + @${REINPLACE_CMD} -e 's|install-exec-am install-data-am|install-exec-am install-data-local|' \ + ${WRKSRC}/lang/qt/src/Makefile.in +. endif +. if ${SLAVEPORT} == "qt-headers" + @${REINPLACE_CMD} -e '/^all-am/s|$$(LTLIBRARIES)||' \ + -e '/^install-data-am/s|install-data-local||' \ + ${WRKSRC}/lang/qt/src/Makefile.in . endif .endif @${REINPLACE_CMD} -e 's|^clfilesdir.*|clfilesdir=$$\(libdir\)/common-lisp/gpgme|g' \ ${WRKSRC}/lang/cl/Makefile.in - @${REINPLACE_CMD} -e 's|-Wsuggest-override||g' \ - ${WRKSRC}/lang/cpp/src/Makefile.in \ - ${WRKSRC}/lang/qt/src/Makefile.in post-patch-DOXYGEN-off: @${REINPLACE_CMD} -e '/SUBDIRS/s|doc||' \ diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo index 527c32d38147..6a1ca470392a 100644 --- a/security/gpgme/distinfo +++ b/security/gpgme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683032158 -SHA256 (gpgme-1.20.0.tar.bz2) = 25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750 -SIZE (gpgme-1.20.0.tar.bz2) = 1817377 +TIMESTAMP = 1688831601 +SHA256 (gpgme-1.21.0.tar.bz2) = 416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88 +SIZE (gpgme-1.21.0.tar.bz2) = 1830113 diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist index 848a524b7fda..7477164b34fb 100644 --- a/security/gpgme/pkg-plist +++ b/security/gpgme/pkg-plist @@ -8,7 +8,7 @@ lib/common-lisp/gpgme/gpgme.asd lib/common-lisp/gpgme/gpgme.lisp lib/libgpgme.so lib/libgpgme.so.11 -lib/libgpgme.so.11.29.0 +lib/libgpgme.so.11.30.0 libdata/pkgconfig/gpgme-glib.pc libdata/pkgconfig/gpgme.pc share/aclocal/gpgme.m4