diff --git a/security/gpgme-cpp/pkg-plist b/security/gpgme-cpp/pkg-plist index c5eb9f270964..bfc7b2f3befe 100644 --- a/security/gpgme-cpp/pkg-plist +++ b/security/gpgme-cpp/pkg-plist @@ -1,47 +1,47 @@ include/gpgme++/configuration.h include/gpgme++/context.h include/gpgme++/data.h include/gpgme++/decryptionresult.h include/gpgme++/defaultassuantransaction.h include/gpgme++/editinteractor.h include/gpgme++/encryptionresult.h include/gpgme++/engineinfo.h include/gpgme++/error.h include/gpgme++/eventloopinteractor.h include/gpgme++/exception.h include/gpgme++/global.h include/gpgme++/gpgaddexistingsubkeyeditinteractor.h include/gpgme++/gpgadduserideditinteractor.h include/gpgme++/gpgagentgetinfoassuantransaction.h include/gpgme++/gpggencardkeyinteractor.h include/gpgme++/gpgmefw.h include/gpgme++/gpgmepp_export.h include/gpgme++/gpgmepp_version.h include/gpgme++/gpgrevokekeyeditinteractor.h include/gpgme++/gpgsetexpirytimeeditinteractor.h include/gpgme++/gpgsetownertrusteditinteractor.h include/gpgme++/gpgsignkeyeditinteractor.h include/gpgme++/importresult.h include/gpgme++/interfaces/assuantransaction.h include/gpgme++/interfaces/dataprovider.h include/gpgme++/interfaces/passphraseprovider.h include/gpgme++/interfaces/progressprovider.h include/gpgme++/interfaces/statusconsumer.h include/gpgme++/key.h include/gpgme++/keygenerationresult.h include/gpgme++/keylistresult.h include/gpgme++/notation.h include/gpgme++/result.h include/gpgme++/scdgetinfoassuantransaction.h include/gpgme++/signingresult.h include/gpgme++/statusconsumerassuantransaction.h include/gpgme++/swdbresult.h include/gpgme++/tofuinfo.h include/gpgme++/trustitem.h include/gpgme++/verificationresult.h include/gpgme++/vfsmountresult.h lib/cmake/Gpgmepp/GpgmeppConfig.cmake lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake lib/libgpgmepp.so lib/libgpgmepp.so.6 -lib/libgpgmepp.so.6.18.0 +lib/libgpgmepp.so.6.19.0 diff --git a/security/gpgme-qt/Makefile b/security/gpgme-qt/Makefile index 354fd2ccc31a..961e7768dfbd 100644 --- a/security/gpgme-qt/Makefile +++ b/security/gpgme-qt/Makefile @@ -1,19 +1,13 @@ -.if ${FLAVOR:U} == qt5 PORTREVISION= 0 -COMMENT= Gpgme Qt5 bindings -.else -PORTREVISION= 0 - -COMMENT= Gpgme Qt6 bindings -.endif +COMMENT= Gpgme ${QT_STR} bindings LICENSE= GPLv2+ 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 index 4d404382a6cb..b783f7213e81 100644 --- a/security/gpgme-qt/pkg-plist +++ b/security/gpgme-qt/pkg-plist @@ -1,5 +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 +lib/libqgpgme%%qt_SUFFIX%%.so.15.4.0 diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index 4096220f0cb3..fc91141527f7 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -1,189 +1,191 @@ PORTNAME= gpgme -PORTVERSION= 1.21.0 -PORTREVISION?= 1 +PORTVERSION= 1.22.0 +PORTREVISION?= 0 CATEGORIES?= security MASTER_SITES= GNUPG/gpgme MAINTAINER= jhale@FreeBSD.org COMMENT?= Library to make access to GnuPG easier WWW= https://www.gnupg.org/related_software/gpgme/ LICENSE?= LGPL21+ LICENSE_FILE?= ${WRKSRC}/COPYING.LESSER LIB_DEPENDS= libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error USES= compiler:c11 cpe gmake libtool localbase:ldflags tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes CFLAGS+= -Wno-suggest-override -Wno-unknown-warning-option INSTALL_TARGET?=install-strip TEST_TARGET= check CPE_VENDOR= gnu .if !defined(SLAVEPORT) CONFIGURE_ARGS+=--enable-languages="cl" INFO= gpgme PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README THANKS TODO OPTIONS_DEFINE= DOCS TEST UISERVER OPTIONS_SINGLE= GNUPG OPTIONS_SINGLE_GNUPG= GNUPG1 GNUPG2 OPTIONS_DEFAULT= GNUPG2 UISERVER GNUPG1_DESC= Build gpgme library for GnuPG 1.x GNUPG1_BUILD_DEPENDS= gpgv:security/gnupg1 GNUPG1_RUN_DEPENDS= gpgv:security/gnupg1 GNUPG2_DESC= Build gpgme library for GnuPG 2.x GNUPG2_BUILD_DEPENDS= gpg2:security/gnupg GNUPG2_RUN_DEPENDS= gpg2:security/gnupg TEST_CONFIGURE_ENABLE= g13-test gpg-test gpgconf-test gpgsm-test TEST_PREVENTS= GNUPG1 TEST_PREVENTS_MSG= TEST option is mainly designed for use with the GNUPG2 option UISERVER_DESC= GnuPG UI server support UISERVER_CONFIGURE_ENABLE= fd-passing .else LIB_DEPENDS+= libgpgme.so:security/gpgme BUILD_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME} INSTALL_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME} TEST_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME}/tests . if ${SLAVEPORT} != "cpp" && ${SLAVEPORT} != "qt-headers" OPTIONS_DEFINE+= TEST . endif . if ${SLAVEPORT} == "cpp" USES+= compiler:c++11-lib 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_ARCH= yes 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 +QT_STR= Qt${FLAVOR:S/qt//} + . 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" +PLIST_SUB= QT_SUFFIX="${QT_STR}" qt_SUFFIX="${FLAVOR}" . endif CONFIGURE_ARGS+=--enable-languages="cpp ${FLAVOR}" DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} OPTIONS_DEFINE+= DOXYGEN DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ dot:graphics/graphviz . endif . if ${SLAVEPORT} == "python" BUILD_DEPENDS+= swig:devel/swig \ ${PY_SETUPTOOLS} RUN_DEPENDS+= ${PY_SETUPTOOLS} USES+= python USE_PYTHON= flavors CONFIGURE_ARGS+=--enable-languages="python" CONFIGURE_ENV+= BSD_PYTHON="${PYTHON_CMD}" \ BSD_PYTHON_VERSION="${PYTHON_VER}" \ SWIG="${LOCALBASE}/bin/swig" PLIST_SUB+= VERSION=${PORTVERSION} . endif .endif post-patch: .if defined(SLAVEPORT) @${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \ ${REINPLACE_CMD} -e 's|../../../src/libgpgme.la|-lgpgme|g' . 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 post-patch-DOXYGEN-off: @${REINPLACE_CMD} -e '/SUBDIRS/s|doc||' \ ${WRKSRC}/lang/qt/Makefile.in post-patch-TEST-off: @${REINPLACE_CMD} -e '/SUBDIRS/s|tests||' \ ${WRKSRC}/lang/python/Makefile.in \ ${WRKSRC}/lang/qt/Makefile.in # The gnupg programs will create sockets for the tests in a temporary directory # under /var/run/user/${UID} if it exists. Otherwise, they will try to create # them in the test build directories. To prevent errors in cases where the test # build directory path length exceeds the socket path length limitation of 104 # characters, the sockets are redirected to a temporary directory. pre-build-TEST-on: @if [ ! -d "/var/run/user/${UID}" ]; then \ SOCKETS="dirmngr gpg-agent gpg-agent.browser gpg-agent.extra gpg-agent.ssh scdaemon uiserver"; \ TESTSUBDIRS="lang/python/tests lang/qt/tests tests/gpg tests/gpgsm"; \ TMPSOCKETDIR=$$(${MKTEMP} -d -t gpgmetest); \ ${ECHO_CMD} "$${TMPSOCKETDIR}" > ${WRKDIR}/.tmpsocketdir; \ trap "${RM} -r $${TMPSOCKETDIR}; exit 1" 1 2 3 5 10 13 15; \ for sock in $${SOCKETS}; do \ for subdir in $${TESTSUBDIRS}; do \ ${PRINTF} "%%Assuan%%\nsocket=$${TMPSOCKETDIR}/S.$${sock}\n" > ${WRKSRC}/$${subdir}/S.$${sock}; \ done; \ done; \ fi post-build-TEST-on: @if [ -f "${WRKDIR}/.tmpsocketdir" ]; then \ ${XARGS} ${RM} -rf < ${WRKDIR}/.tmpsocketdir; \ ${RM} ${WRKDIR}/.tmpsocketdir; \ fi pre-test: pre-build-TEST-on post-test: post-build-TEST-on .if !defined(SLAVEPORT) post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .endif post-install-DOXYGEN-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/html cd ${WRKSRC}/lang/qt/doc/generated/html && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html @${FIND} -P ${STAGEDIR}${DOCSDIR} -type f 2>/dev/null | \ ${SED} -ne 's|^${STAGEDIR}${PREFIX}/||p' >> ${TMPPLIST} .include diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo index 6a1ca470392a..58bf10398d2a 100644 --- a/security/gpgme/distinfo +++ b/security/gpgme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688831601 -SHA256 (gpgme-1.21.0.tar.bz2) = 416e174e165734d84806253f8c96bda2993fd07f258c3aad5f053a6efd463e88 -SIZE (gpgme-1.21.0.tar.bz2) = 1830113 +TIMESTAMP = 1692699022 +SHA256 (gpgme-1.22.0.tar.bz2) = 9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71 +SIZE (gpgme-1.22.0.tar.bz2) = 1717836 diff --git a/security/gpgme/files/patch-configure b/security/gpgme/files/patch-configure index d54dc9867a9c..c459227ace77 100644 --- a/security/gpgme/files/patch-configure +++ b/security/gpgme/files/patch-configure @@ -1,19 +1,19 @@ The configure script automatically detects all versions of Python and builds the bindings for each found version. This is a problem when building outside of a clean environment since the ports system can only build a package for one Python flavor at a time. The found versions of Python are overridden by environment variables set in the port Makefile. ---- configure.orig 2019-03-26 17:29:46 UTC +--- configure.orig 2023-08-21 07:46:33 UTC +++ configure -@@ -23851,6 +23851,10 @@ $as_echo "$as_me: WARNING: +@@ -31342,6 +31342,10 @@ printf "%s\n" "$as_me: WARNING: fi + # Override the automatically found Pythons with the selected version from ports. + PYTHONS=$BSD_PYTHON + PYTHON_VERSIONS=$BSD_PYTHON_VERSION + # Recover some values lost in the second attempt to find Python. PYTHON="$(echo $PYTHONS | cut -d ' ' -f 1)" PYTHON_VERSION="$(echo $PYTHON_VERSIONS | cut -d ' ' -f 1)" diff --git a/security/gpgme/files/patch-lang_python_Makefile.in b/security/gpgme/files/patch-lang_python_Makefile.in index 227ab2c55e59..e78760200c2a 100644 --- a/security/gpgme/files/patch-lang_python_Makefile.in +++ b/security/gpgme/files/patch-lang_python_Makefile.in @@ -1,29 +1,29 @@ First hunk: The swig executable from devel/swig30 is named 'swig3.0' and the build system only looks for an executable named 'swig': unable to execute 'swig': No such file or directory Second hunk: Fix staging and build the *.pyc and *.pyo files ---- lang/python/Makefile.in.orig 2017-12-12 11:56:08 UTC +--- lang/python/Makefile.in.orig 2023-08-21 07:46:32 UTC +++ lang/python/Makefile.in -@@ -740,7 +740,7 @@ all-local: copystamp +@@ -768,7 +768,7 @@ all-local: copystamp CFLAGS="$(CFLAGS)" \ srcdir="$(srcdir)" \ top_builddir="$(top_builddir)" \ - $$PYTHON setup.py build --verbose --build-base="$$(basename "$${PYTHON}")-gpg" ; \ + $$PYTHON setup.py build --verbose --build-base="$$(basename "$${PYTHON}")-gpg" build_ext --swig=$(SWIG) ; \ done python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc: copystamp -@@ -782,7 +782,8 @@ install-exec-local: +@@ -811,7 +811,8 @@ install-exec-local: build \ --build-base="$$(basename "$${PYTHON}")-gpg" \ install \ - --prefix "$(DESTDIR)$(prefix)" \ + -c -O1 --prefix=$(prefix) \ + --root=$(DESTDIR) \ --verbose ; \ done diff --git a/security/gpgme/files/patch-lang_qt_tests_Makefile.in b/security/gpgme/files/patch-lang_qt_tests_Makefile.in new file mode 100644 index 000000000000..ffc5f0ef5c55 --- /dev/null +++ b/security/gpgme/files/patch-lang_qt_tests_Makefile.in @@ -0,0 +1,32 @@ +Fix build of Qt tests. + +This fixes the problem that the debug.h in the C sources was found +before the one in the Qt bindings. + +Based on upstream commits: +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=d23528cadf4284f508bc4ba05e1b5c14b46bd354 +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=aee18a2ab2498bc6092bef518c532796bbe5b502 + +--- lang/qt/tests/Makefile.in.orig 2023-08-21 07:46:32 UTC ++++ lang/qt/tests/Makefile.in +@@ -796,16 +796,16 @@ AM_LDFLAGS = -no-install + @WANT_QT6_TRUE@ ../../../src/libgpgme.la @GPGME_QT6_LIBS@ @GPG_ERROR_LIBS@ \ + @WANT_QT6_TRUE@ @GPGME_QT6TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++ + +-@WANT_QT5_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ ++@WANT_QT5_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \ ++@WANT_QT5_TRUE@ -I$(top_builddir)/src \ + @WANT_QT5_TRUE@ @GPG_ERROR_CFLAGS@ @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ \ + @WANT_QT5_TRUE@ @LIBASSUAN_CFLAGS@ @GPGME_QT5TEST_CFLAGS@ -DBUILDING_QGPGME \ +-@WANT_QT5_TRUE@ -I$(top_srcdir)/lang/qt/src \ + @WANT_QT5_TRUE@ -DTOP_SRCDIR="$(top_srcdir)" + +-@WANT_QT6_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \ ++@WANT_QT6_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \ ++@WANT_QT6_TRUE@ -I$(top_builddir)/src \ + @WANT_QT6_TRUE@ @GPG_ERROR_CFLAGS@ @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ \ + @WANT_QT6_TRUE@ @LIBASSUAN_CFLAGS@ @GPGME_QT6TEST_CFLAGS@ -DBUILDING_QGPGME \ +-@WANT_QT6_TRUE@ -I$(top_srcdir)/lang/qt/src \ + @WANT_QT6_TRUE@ -DTOP_SRCDIR="$(top_srcdir)" + + support_src = t-support.h t-support.cpp diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist index 7477164b34fb..808091e29330 100644 --- a/security/gpgme/pkg-plist +++ b/security/gpgme/pkg-plist @@ -1,14 +1,14 @@ bin/gpgme-config bin/gpgme-json bin/gpgme-tool include/gpgme.h lib/common-lisp/gpgme/gpgme-grovel.lisp lib/common-lisp/gpgme/gpgme-package.lisp lib/common-lisp/gpgme/gpgme.asd lib/common-lisp/gpgme/gpgme.lisp lib/libgpgme.so lib/libgpgme.so.11 -lib/libgpgme.so.11.30.0 +lib/libgpgme.so.11.31.0 libdata/pkgconfig/gpgme-glib.pc libdata/pkgconfig/gpgme.pc share/aclocal/gpgme.m4