Index: head/security/gpgme/Makefile =================================================================== --- head/security/gpgme/Makefile (revision 560901) +++ head/security/gpgme/Makefile (revision 560902) @@ -1,162 +1,162 @@ # Created by: teramoto@comm.eng.osaka-u.ac.jp # $FreeBSD$ PORTNAME= gpgme -PORTVERSION= 1.15.0 +PORTVERSION= 1.15.1 PORTREVISION?= 0 CATEGORIES?= security MASTER_SITES= GNUPG/gpgme MAINTAINER= jhale@FreeBSD.org COMMENT?= Library to make access to GnuPG easier 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 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" OPTIONS_DEFINE+= TEST . endif . if ${SLAVEPORT} == "cpp" USES+= compiler:c++11-lib CONFIGURE_ARGS+=--enable-languages="cpp" NO_TEST= yes . endif . if ${SLAVEPORT} == "qt5" LIB_DEPENDS+= libgpgmepp.so:security/gpgme-cpp USES+= compiler:c++11-lib pkgconfig qt:5 USE_QT= buildtools_build core CONFIGURE_ARGS+=--enable-languages="cpp qt" DOCSDIR= ${PORTNAME}${PKGNAMESUFFIX} OPTIONS_DEFINE+= DOXYGEN DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ dot:graphics/graphviz TEST_USE= QT=testlib_build . endif . if ${SLAVEPORT} == "python" BUILD_DEPENDS+= swig:devel/swig \ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} USES+= python:3.6+ USE_PYTHON= py3kplist 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} == "qt5" @${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \ ${REINPLACE_CMD} -e 's|../../cpp/src/libgpgmepp.la|-lgpgmepp|g' . 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||' \ ${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 Index: head/security/gpgme/distinfo =================================================================== --- head/security/gpgme/distinfo (revision 560901) +++ head/security/gpgme/distinfo (revision 560902) @@ -1,3 +1,3 @@ -TIMESTAMP = 1609111779 -SHA256 (gpgme-1.15.0.tar.bz2) = 0b472bc12c7d455906c8a539ec56da0a6480ef1c3a87aa5b74d7125df68d0e5b -SIZE (gpgme-1.15.0.tar.bz2) = 1692019 +TIMESTAMP = 1610205903 +SHA256 (gpgme-1.15.1.tar.bz2) = eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad +SIZE (gpgme-1.15.1.tar.bz2) = 1699349 Index: head/security/gpgme/files/patch-git-key.h =================================================================== --- head/security/gpgme/files/patch-git-key.h (revision 560901) +++ head/security/gpgme/files/patch-git-key.h (nonexistent) @@ -1,29 +0,0 @@ -The operator< should be const, so it can be applied to const Signatures. -This fixes a build failure in security/libkleo. - -diff --git lang/cpp/src/key.cpp lang/cpp/src/key.cpp -index e536d080..7411e9e4 100644 ---- lang/cpp/src/key.cpp -+++ lang/cpp/src/key.cpp -@@ -865,7 +865,7 @@ UserID::Signature::Signature(const shared_gpgme_key_t &k, gpgme_user_id_t u, gpg - { - } - --bool UserID::Signature::operator<(const Signature &other) -+bool UserID::Signature::operator<(const Signature &other) const - { - // based on cmp_signodes() in g10/keylist.c - -diff --git lang/cpp/src/key.h lang/cpp/src/key.h -index a7931672..57001a03 100644 ---- lang/cpp/src/key.h -+++ lang/cpp/src/key.h -@@ -468,7 +468,7 @@ public: - } - - /*! Defines a canonical sort order for signatures of the same user ID. */ -- bool operator<(const Signature &other); -+ bool operator<(const Signature &other) const; - - bool isNull() const - { Property changes on: head/security/gpgme/files/patch-git-key.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/gpgme/pkg-plist =================================================================== --- head/security/gpgme/pkg-plist (revision 560901) +++ head/security/gpgme/pkg-plist (revision 560902) @@ -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.24.0 +lib/libgpgme.so.11.24.1 libdata/pkgconfig/gpgme-glib.pc libdata/pkgconfig/gpgme.pc share/aclocal/gpgme.m4 Index: head/security/gpgme-cpp/Makefile =================================================================== --- head/security/gpgme-cpp/Makefile (revision 560901) +++ head/security/gpgme-cpp/Makefile (revision 560902) @@ -1,14 +1,14 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -${SLAVEPORT} MAINTAINER= jhale@FreeBSD.org COMMENT= Gpgme C++ bindings MASTERDIR= ${.CURDIR}/../../security/gpgme SLAVEPORT= cpp BINDING_NAME= cpp PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" Index: head/security/gpgme-cpp/pkg-plist =================================================================== --- head/security/gpgme-cpp/pkg-plist (revision 560901) +++ head/security/gpgme-cpp/pkg-plist (revision 560902) @@ -1,45 +1,45 @@ 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++/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++/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.12.0 +lib/libgpgmepp.so.6.12.1 Index: head/security/gpgme-qt5/pkg-plist =================================================================== --- head/security/gpgme-qt5/pkg-plist (revision 560901) +++ head/security/gpgme-qt5/pkg-plist (revision 560902) @@ -1,83 +1,83 @@ include/QGpgME/AbstractImportJob 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/DecryptVerifyJob include/QGpgME/DefaultKeyGenerationJob include/QGpgME/DeleteJob include/QGpgME/DownloadJob include/QGpgME/EncryptJob include/QGpgME/ExportJob 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/RefreshKeysJob include/QGpgME/SignEncryptJob include/QGpgME/SignJob include/QGpgME/SignKeyJob include/QGpgME/SpecialJob include/QGpgME/TofuPolicyJob include/QGpgME/VerifyDetachedJob include/QGpgME/VerifyOpaqueJob include/QGpgME/WKSPublishJob include/qgpgme/abstractimportjob.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/decryptverifyjob.h include/qgpgme/defaultkeygenerationjob.h include/qgpgme/deletejob.h include/qgpgme/dn.h include/qgpgme/downloadjob.h include/qgpgme/encryptjob.h include/qgpgme/exportjob.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/refreshkeysjob.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/wkspublishjob.h lib/cmake/QGpgme/QGpgmeConfig.cmake lib/cmake/QGpgme/QGpgmeConfigVersion.cmake lib/libqgpgme.so lib/libqgpgme.so.7 -lib/libqgpgme.so.7.5.0 +lib/libqgpgme.so.7.5.1