Date: Fri, 26 Jan 2018 04:02:18 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459975 - in head/security: gpgme gpgme-cpp gpgme-qt5 gpgme/files py-gpgme Message-ID: <201801260402.w0Q42Ipe092640@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Fri Jan 26 04:02:18 2018 New Revision: 459975 URL: https://svnweb.freebsd.org/changeset/ports/459975 Log: Update to 1.10.0 Simplify python version detection Changes: https://lists.gnupg.org/pipermail/gnupg-users/2017-December/059592.html Deleted: head/security/gpgme/files/patch-git_5056598 head/security/gpgme/files/patch-git_5d4f977 Modified: head/security/gpgme-cpp/pkg-plist head/security/gpgme-qt5/pkg-plist head/security/gpgme/Makefile head/security/gpgme/distinfo head/security/gpgme/files/patch-lang_cpp_src_engineinfo.h head/security/gpgme/files/patch-lang_python_Makefile.in head/security/gpgme/files/patch-lang_qt_src_qgpgmeencryptjob.cpp head/security/gpgme/files/patch-tests_gpg_Makefile.in head/security/gpgme/pkg-plist head/security/py-gpgme/pkg-plist Modified: head/security/gpgme-cpp/pkg-plist ============================================================================== --- head/security/gpgme-cpp/pkg-plist Fri Jan 26 03:25:39 2018 (r459974) +++ head/security/gpgme-cpp/pkg-plist Fri Jan 26 04:02:18 2018 (r459975) @@ -40,4 +40,4 @@ lib/cmake/Gpgmepp/GpgmeppConfig.cmake lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake lib/libgpgmepp.so lib/libgpgmepp.so.6 -lib/libgpgmepp.so.6.4.0 +lib/libgpgmepp.so.6.5.0 Modified: head/security/gpgme-qt5/pkg-plist ============================================================================== --- head/security/gpgme-qt5/pkg-plist Fri Jan 26 03:25:39 2018 (r459974) +++ head/security/gpgme-qt5/pkg-plist Fri Jan 26 04:02:18 2018 (r459975) @@ -24,6 +24,7 @@ include/QGpgME/ListAllKeysJob include/QGpgME/MultiDeleteJob include/QGpgME/Protocol include/QGpgME/QGpgMENewCryptoConfig +include/QGpgME/QuickJob include/QGpgME/RefreshKeysJob include/QGpgME/SignEncryptJob include/QGpgME/SignJob @@ -61,6 +62,7 @@ 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 @@ -74,4 +76,4 @@ lib/cmake/QGpgme/QGpgmeConfig.cmake lib/cmake/QGpgme/QGpgmeConfigVersion.cmake lib/libqgpgme.so lib/libqgpgme.so.7 -lib/libqgpgme.so.7.2.0 +lib/libqgpgme.so.7.3.0 Modified: head/security/gpgme/Makefile ============================================================================== --- head/security/gpgme/Makefile Fri Jan 26 03:25:39 2018 (r459974) +++ head/security/gpgme/Makefile Fri Jan 26 04:02:18 2018 (r459975) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= gpgme -PORTVERSION= 1.9.0 -PORTREVISION?= 1 +PORTVERSION= 1.10.0 +PORTREVISION?= 0 CATEGORIES?= security MASTER_SITES= GNUPG/gpgme @@ -82,17 +82,10 @@ USES+= python USE_PYTHON= py3kplist flavors CONFIGURE_ENV+= SWIG=${LOCALBASE}/bin/swig3.0 PLIST_SUB+= VERSION=${PORTVERSION} -. endif -.endif - -.include <bsd.port.pre.mk> - -.if defined(SLAVEPORT) -. if ${SLAVEPORT} == "python" -. if ${PYTHON_REL} >= 3000 -CONFIGURE_ARGS+=--enable-languages="python3" -. else +. if ${FLAVOR:Upy27:Mpy2*} CONFIGURE_ARGS+=--enable-languages="python2" +. else +CONFIGURE_ARGS+=--enable-languages="python3" . endif . endif .endif @@ -114,4 +107,4 @@ post-install-DOCS-on: ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/security/gpgme/distinfo ============================================================================== --- head/security/gpgme/distinfo Fri Jan 26 03:25:39 2018 (r459974) +++ head/security/gpgme/distinfo Fri Jan 26 04:02:18 2018 (r459975) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491207510 -SHA256 (gpgme-1.9.0.tar.bz2) = 1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb -SIZE (gpgme-1.9.0.tar.bz2) = 1344222 +TIMESTAMP = 1516928495 +SHA256 (gpgme-1.10.0.tar.bz2) = 1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693 +SIZE (gpgme-1.10.0.tar.bz2) = 1370162 Modified: head/security/gpgme/files/patch-lang_cpp_src_engineinfo.h ============================================================================== --- head/security/gpgme/files/patch-lang_cpp_src_engineinfo.h Fri Jan 26 03:25:39 2018 (r459974) +++ head/security/gpgme/files/patch-lang_cpp_src_engineinfo.h Fri Jan 26 04:02:18 2018 (r459975) @@ -5,9 +5,9 @@ In file included from qgpgmebackend.cpp:42:0: ^ ---- lang/cpp/src/engineinfo.h.orig 2016-11-20 11:59:52 UTC +--- lang/cpp/src/engineinfo.h.orig 2017-10-04 15:17:16 UTC +++ lang/cpp/src/engineinfo.h -@@ -30,6 +30,7 @@ +@@ -32,6 +32,7 @@ #include <algorithm> #include <string> #include <iostream> Modified: head/security/gpgme/files/patch-lang_python_Makefile.in ============================================================================== --- head/security/gpgme/files/patch-lang_python_Makefile.in Fri Jan 26 03:25:39 2018 (r459974) +++ head/security/gpgme/files/patch-lang_python_Makefile.in Fri Jan 26 04:02:18 2018 (r459975) @@ -1,21 +1,29 @@ ---- lang/python/Makefile.in.orig 2017-03-28 14:25:45 UTC +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 -@@ -755,7 +755,7 @@ all-local: copystamp - PYTHON="$$1" ; shift ; \ - cd python$${VERSION}-gpg && \ +@@ -740,7 +740,7 @@ all-local: copystamp CFLAGS="$(CFLAGS)" \ -- $$PYTHON setup.py build --verbose ; \ -+ $$PYTHON setup.py build --verbose build_ext --swig=$(SWIG) ; \ - cd .. ; \ + 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 -@@ -795,7 +795,8 @@ install-exec-local: - PYTHON="$$1" ; shift ; \ - cd python$${VERSION}-gpg ; \ - $$PYTHON setup.py install \ -- --prefix $(DESTDIR)$(prefix) \ + python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc: copystamp +@@ -782,7 +782,8 @@ install-exec-local: + build \ + --build-base="$$(basename "$${PYTHON}")-gpg" \ + install \ +- --prefix "$(DESTDIR)$(prefix)" \ + -c -O1 --prefix=$(prefix) \ + --root=$(DESTDIR) \ - --record files.txt \ --verbose ; \ - cat files.txt >> ../install_files.txt ; \ + done + Modified: head/security/gpgme/files/patch-lang_qt_src_qgpgmeencryptjob.cpp ============================================================================== --- head/security/gpgme/files/patch-lang_qt_src_qgpgmeencryptjob.cpp Fri Jan 26 03:25:39 2018 (r459974) +++ head/security/gpgme/files/patch-lang_qt_src_qgpgmeencryptjob.cpp Fri Jan 26 04:02:18 2018 (r459975) @@ -1,22 +1,22 @@ -Rename encrypt() so that the code builds with FreeBSD 10.2/10.3's libc++, which +Rename encrypt() so that the code builds with FreeBSD 10.4's libc++, which has a bug that causes std::bind() to fail with the original function name: -qgpgmeencryptjob.cpp:133:9: error: no matching function for call to 'bind' +qgpgmeencryptjob.cpp:134:9: error: no matching function for call to 'bind' run(std::bind(&encrypt, ^~~~~~~~~ -/usr/include/c++/v1/functional:2184:1: note: candidate template ignored: +/usr/include/c++/v1/functional:2185:1: note: candidate template ignored: couldn't infer template argument '_Fp' bind(_Fp&& __f, _BoundArgs&&... __bound_args) ^ -/usr/include/c++/v1/functional:2193:1: note: candidate template ignored: +/usr/include/c++/v1/functional:2194:1: note: candidate template ignored: couldn't infer template argument '_Rp' bind(_Fp&& __f, _BoundArgs&&... __bound_args) ^ 1 error generated. ---- lang/qt/src/qgpgmeencryptjob.cpp.orig 2016-10-18 17:22:02 UTC +--- lang/qt/src/qgpgmeencryptjob.cpp.orig 2017-07-12 12:35:02 UTC +++ lang/qt/src/qgpgmeencryptjob.cpp -@@ -65,7 +65,7 @@ void QGpgMEEncryptJob::setOutputIsBase64 +@@ -66,7 +66,7 @@ void QGpgMEEncryptJob::setOutputIsBase64Encoded(bool o mOutputIsBase64Encoded = on; } @@ -25,7 +25,7 @@ bind(_Fp&& __f, _BoundArgs&&... __bound_args) const std::vector<Key> &recipients, const std::weak_ptr<QIODevice> &plainText_, const std::weak_ptr<QIODevice> &cipherText_, -@@ -117,7 +117,7 @@ static QGpgMEEncryptJob::result_type enc +@@ -118,7 +118,7 @@ static QGpgMEEncryptJob::result_type encrypt_qba(Conte if (!buffer->open(QIODevice::ReadOnly)) { assert(!"This should never happen: QBuffer::open() failed"); } @@ -34,7 +34,7 @@ bind(_Fp&& __f, _BoundArgs&&... __bound_args) } Error QGpgMEEncryptJob::start(const std::vector<Key> &recipients, const QByteArray &plainText, bool alwaysTrust) -@@ -130,7 +130,7 @@ Error QGpgMEEncryptJob::start(const std: +@@ -131,7 +131,7 @@ Error QGpgMEEncryptJob::start(const std::vector<Key> & void QGpgMEEncryptJob::start(const std::vector<Key> &recipients, const std::shared_ptr<QIODevice> &plainText, const std::shared_ptr<QIODevice> &cipherText, const Context::EncryptionFlags eflags) { Modified: head/security/gpgme/files/patch-tests_gpg_Makefile.in ============================================================================== --- head/security/gpgme/files/patch-tests_gpg_Makefile.in Fri Jan 26 03:25:39 2018 (r459974) +++ head/security/gpgme/files/patch-tests_gpg_Makefile.in Fri Jan 26 04:02:18 2018 (r459975) @@ -1,14 +1,14 @@ gpg 2.1.x needs pinentry loopback mode enabled for the passphase callback supplied by the tests to work ---- tests/gpg/Makefile.in.orig 2017-04-05 12:22:44 UTC +--- tests/gpg/Makefile.in.orig 2017-12-12 11:56:08 UTC +++ tests/gpg/Makefile.in -@@ -1115,6 +1115,8 @@ export GPG_AGENT_INFO := - ./gpg.conf: +@@ -1116,6 +1116,8 @@ pubring-stamp: $(srcdir)/pubdemo.asc ./private-keys-v1 + gpg.conf: # This is required for t-sig-notations. echo no-force-v3-sigs > ./gpg.conf + echo "ignore-invalid-option pinentry-mode" >> ./gpg.conf + echo "pinentry-mode loopback" >> ./gpg.conf - ./gpg-agent.conf: + gpg-agent.conf: # This is required for gpg2, which does not support command fd. Modified: head/security/gpgme/pkg-plist ============================================================================== --- head/security/gpgme/pkg-plist Fri Jan 26 03:25:39 2018 (r459974) +++ head/security/gpgme/pkg-plist Fri Jan 26 04:02:18 2018 (r459975) @@ -6,5 +6,5 @@ lib/common-lisp/gpgme/gpgme.asd lib/common-lisp/gpgme/gpgme.lisp lib/libgpgme.so lib/libgpgme.so.11 -lib/libgpgme.so.11.18.0 +lib/libgpgme.so.11.19.0 share/aclocal/gpgme.m4 Modified: head/security/py-gpgme/pkg-plist ============================================================================== --- head/security/py-gpgme/pkg-plist Fri Jan 26 03:25:39 2018 (r459974) +++ head/security/py-gpgme/pkg-plist Fri Jan 26 04:02:18 2018 (r459975) @@ -75,7 +75,6 @@ %%PYTHON_SITELIBDIR%%/gpg/gpgme.py %%PYTHON_SITELIBDIR%%/gpg/gpgme.pyc %%PYTHON_SITELIBDIR%%/gpg/gpgme.pyo -%%PYTHON_SITELIBDIR%%/gpg/install_files.txt %%PYTHON_SITELIBDIR%%/gpg/results.py %%PYTHON_SITELIBDIR%%/gpg/results.pyc %%PYTHON_SITELIBDIR%%/gpg/results.pyo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801260402.w0Q42Ipe092640>