svn commit: r437834 - in head/security: gpgme gpgme-cpp gpgme-qt5 gpgme/files py-gpgme
Jason E. Hale
jhale at FreeBSD.org
Wed Apr 5 20:13:03 UTC 2017
Author: jhale
Date: Wed Apr 5 20:13:00 2017
New Revision: 437834
URL: https://svnweb.freebsd.org/changeset/ports/437834
Log:
Update security/gpgme and friends to 1.9.0 [1]
Fix LICENSE
Add regression test support for master port. Slave port tests are not working
properly and need further investigation.
PR: 218316 (based on) [1]
Submitted by: gahr [1]
Changes: https://lists.gnupg.org/pipermail/gnupg-users/2017-March/057963.html
Added:
head/security/gpgme/files/patch-git_5056598 (contents, props changed)
head/security/gpgme/files/patch-git_5d4f977 (contents, props changed)
head/security/gpgme/files/patch-tests_gpg_Makefile.in (contents, props changed)
Deleted:
head/security/gpgme/files/patch-configure
head/security/gpgme/files/patch-git_572c1aa
Modified:
head/security/gpgme-cpp/pkg-plist
head/security/gpgme-qt5/Makefile
head/security/gpgme-qt5/pkg-plist
head/security/gpgme/Makefile
head/security/gpgme/distinfo
head/security/gpgme/files/patch-lang_python_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 Wed Apr 5 19:59:22 2017 (r437833)
+++ head/security/gpgme-cpp/pkg-plist Wed Apr 5 20:13:00 2017 (r437834)
@@ -12,6 +12,7 @@ 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
@@ -39,4 +40,4 @@ lib/cmake/Gpgmepp/GpgmeppConfig.cmake
lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake
lib/libgpgmepp.so
lib/libgpgmepp.so.6
-lib/libgpgmepp.so.6.3.0
+lib/libgpgmepp.so.6.4.0
Modified: head/security/gpgme-qt5/Makefile
==============================================================================
--- head/security/gpgme-qt5/Makefile Wed Apr 5 19:59:22 2017 (r437833)
+++ head/security/gpgme-qt5/Makefile Wed Apr 5 20:13:00 2017 (r437834)
@@ -6,7 +6,7 @@ PKGNAMESUFFIX= -${SLAVEPORT}
MAINTAINER= jhale at FreeBSD.org
COMMENT= Gpgme Qt5 bindings
-LICENSE= GPLv2
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
MASTERDIR= ${.CURDIR}/../../security/gpgme
Modified: head/security/gpgme-qt5/pkg-plist
==============================================================================
--- head/security/gpgme-qt5/pkg-plist Wed Apr 5 19:59:22 2017 (r437833)
+++ head/security/gpgme-qt5/pkg-plist Wed Apr 5 20:13:00 2017 (r437834)
@@ -74,4 +74,4 @@ lib/cmake/QGpgme/QGpgmeConfig.cmake
lib/cmake/QGpgme/QGpgmeConfigVersion.cmake
lib/libqgpgme.so
lib/libqgpgme.so.7
-lib/libqgpgme.so.7.1.0
+lib/libqgpgme.so.7.2.0
Modified: head/security/gpgme/Makefile
==============================================================================
--- head/security/gpgme/Makefile Wed Apr 5 19:59:22 2017 (r437833)
+++ head/security/gpgme/Makefile Wed Apr 5 20:13:00 2017 (r437834)
@@ -2,15 +2,15 @@
# $FreeBSD$
PORTNAME= gpgme
-PORTVERSION= 1.8.0
-PORTREVISION?= 1
+PORTVERSION= 1.9.0
+PORTREVISION?= 0
CATEGORIES?= security
MASTER_SITES= GNUPG/gpgme
MAINTAINER= jhale at FreeBSD.org
COMMENT?= Library to make access to GnuPG easier
-LICENSE?= LGPL21
+LICENSE?= LGPL21+
LICENSE_FILE?= ${WRKSRC}/COPYING.LESSER
LIB_DEPENDS= libassuan.so:security/libassuan \
@@ -21,6 +21,7 @@ USES= cpe gmake libtool localbase:ldfla
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
+TEST_TARGET= check
CPE_VENDOR= gnu
@@ -57,6 +58,7 @@ CONFIGURE_ARGS+= --disable-gpgsm-test
LIB_DEPENDS+= libgpgme.so:security/gpgme
BUILD_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME}
INSTALL_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME}
+NO_TEST= yes
. if ${SLAVEPORT} == "cpp"
CONFIGURE_ARGS+=--enable-languages="cpp"
Modified: head/security/gpgme/distinfo
==============================================================================
--- head/security/gpgme/distinfo Wed Apr 5 19:59:22 2017 (r437833)
+++ head/security/gpgme/distinfo Wed Apr 5 20:13:00 2017 (r437834)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480065717
-SHA256 (gpgme-1.8.0.tar.bz2) = 596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33
-SIZE (gpgme-1.8.0.tar.bz2) = 1298407
+TIMESTAMP = 1491207510
+SHA256 (gpgme-1.9.0.tar.bz2) = 1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
+SIZE (gpgme-1.9.0.tar.bz2) = 1344222
Added: head/security/gpgme/files/patch-git_5056598
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/gpgme/files/patch-git_5056598 Wed Apr 5 20:13:00 2017 (r437834)
@@ -0,0 +1,30 @@
+From: Pietro Cerutti <gahr at gahr.ch>
+Date: Mon, 3 Apr 2017 08:31:40 +0000 (+0000)
+Subject: FreeBSD's closefrom(2) does not return errors
+X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=50565982cdd502c3852fcc6f598932bd32b5cdc3
+
+FreeBSD's closefrom(2) does not return errors
+---
+
+diff --git a/src/posix-io.c b/src/posix-io.c
+index a351806..14856df 100644
+--- src/posix-io.c
++++ src/posix-io.c
+@@ -473,7 +473,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
+ * have closefrom(2) we first figure out the highest fd we
+ * do not want to close, then call closefrom, and on success
+ * use the regular code to close all fds up to the start
+- * point of closefrom. Note that Solaris' closefrom does
++ * point of closefrom. Note that Solaris' and FreeBSD's closefrom do
+ * not return errors. */
+ #ifdef HAVE_CLOSEFROM
+ {
+@@ -482,7 +482,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags,
+ if (fd_list[i].fd > fd)
+ fd = fd_list[i].fd;
+ fd++;
+-#ifdef __sun
++#if defined(__sun) || defined(__FreeBSD__)
+ closefrom (fd);
+ max_fds = fd;
+ #else /*!__sun */
Added: head/security/gpgme/files/patch-git_5d4f977
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/gpgme/files/patch-git_5d4f977 Wed Apr 5 20:13:00 2017 (r437834)
@@ -0,0 +1,28 @@
+From: Igor Gnatenko <ignatenkobrain at fedoraproject.org>
+Date: Wed, 29 Mar 2017 05:20:51 +0000 (+0200)
+Subject: qt: pass fmt to gpgrt_asprintf()
+X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=5d4f977dac542340c877fdd4b1304fa8f6e058e6
+
+qt: pass fmt to gpgrt_asprintf()
+
+* lang/qt/src/dn.cpp (parse_dn_part): Add fmt argument instead of
+using name directly.
+
+GnuPG-Bug-Id: 3023
+Signed-off-by: Igor Gnatenko <ignatenkobrain at fedoraproject.org>
+Signed-off-by: Andre Heinecke <aheinecke at intevation.de>
+---
+
+diff --git a/lang/qt/src/dn.cpp b/lang/qt/src/dn.cpp
+index f9fb2f6..4310ad6 100644
+--- lang/qt/src/dn.cpp
++++ lang/qt/src/dn.cpp
+@@ -167,7 +167,7 @@ parse_dn_part(DnPair *array, const unsigned char *string)
+ for (unsigned int i = 0; i < numOidMaps; ++i)
+ if (!strcasecmp((char *)p, oidmap[i].oid)) {
+ free(p);
+- gpgrt_asprintf(&p, oidmap[i].name);
++ gpgrt_asprintf(&p, "%s", oidmap[i].name);
+ break;
+ }
+ array->key = p;
Modified: head/security/gpgme/files/patch-lang_python_Makefile.in
==============================================================================
--- head/security/gpgme/files/patch-lang_python_Makefile.in Wed Apr 5 19:59:22 2017 (r437833)
+++ head/security/gpgme/files/patch-lang_python_Makefile.in Wed Apr 5 20:13:00 2017 (r437834)
@@ -1,21 +1,21 @@
---- lang/python/Makefile.in.orig 2016-11-16 12:46:35 UTC
+--- lang/python/Makefile.in.orig 2017-03-28 14:25:45 UTC
+++ lang/python/Makefile.in
-@@ -756,7 +756,7 @@ config.h:
- all-local: copystamp
- for PYTHON in $(PYTHONS); do \
+@@ -755,7 +755,7 @@ all-local: copystamp
+ PYTHON="$$1" ; shift ; \
+ cd python$${VERSION}-gpg && \
CFLAGS="$(CFLAGS)" \
- $$PYTHON setup.py build --verbose ; \
+ $$PYTHON setup.py build --verbose build_ext --swig=$(SWIG) ; \
+ cd .. ; \
done
- dist/gpg-$(VERSION).tar.gz dist/gpg-$(VERSION).tar.gz.asc: copystamp
-@@ -792,7 +792,8 @@ install-exec-local:
- rm -f install_files.txt
- for PYTHON in $(PYTHONS); do \
+@@ -795,7 +795,8 @@ install-exec-local:
+ PYTHON="$$1" ; shift ; \
+ cd python$${VERSION}-gpg ; \
$$PYTHON setup.py install \
- --prefix $(DESTDIR)$(prefix) \
+ -c -O1 --prefix=$(prefix) \
+ --root=$(DESTDIR) \
--record files.txt \
--verbose ; \
- cat files.txt >> install_files.txt ; \
+ cat files.txt >> ../install_files.txt ; \
Added: head/security/gpgme/files/patch-tests_gpg_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/gpgme/files/patch-tests_gpg_Makefile.in Wed Apr 5 20:13:00 2017 (r437834)
@@ -0,0 +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
+@@ -1115,6 +1115,8 @@ export GPG_AGENT_INFO :=
+ ./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:
+ # This is required for gpg2, which does not support command fd.
Modified: head/security/gpgme/pkg-plist
==============================================================================
--- head/security/gpgme/pkg-plist Wed Apr 5 19:59:22 2017 (r437833)
+++ head/security/gpgme/pkg-plist Wed Apr 5 20:13:00 2017 (r437834)
@@ -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.17.0
+lib/libgpgme.so.11.18.0
share/aclocal/gpgme.m4
Modified: head/security/py-gpgme/pkg-plist
==============================================================================
--- head/security/py-gpgme/pkg-plist Wed Apr 5 19:59:22 2017 (r437833)
+++ head/security/py-gpgme/pkg-plist Wed Apr 5 20:13:00 2017 (r437834)
@@ -9,6 +9,9 @@
%%PYTHON_SITELIBDIR%%/gpg/constants/__init__.py
%%PYTHON_SITELIBDIR%%/gpg/constants/__init__.pyc
%%PYTHON_SITELIBDIR%%/gpg/constants/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gpg/constants/create.py
+%%PYTHON_SITELIBDIR%%/gpg/constants/create.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/create.pyo
%%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.py
%%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.pyc
%%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.pyo
@@ -27,6 +30,9 @@
%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.py
%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.pyc
%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.pyo
+%%PYTHON_SITELIBDIR%%/gpg/constants/keysign.py
+%%PYTHON_SITELIBDIR%%/gpg/constants/keysign.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/keysign.pyo
%%PYTHON_SITELIBDIR%%/gpg/constants/md.py
%%PYTHON_SITELIBDIR%%/gpg/constants/md.pyc
%%PYTHON_SITELIBDIR%%/gpg/constants/md.pyo
@@ -51,6 +57,12 @@
%%PYTHON_SITELIBDIR%%/gpg/constants/status.py
%%PYTHON_SITELIBDIR%%/gpg/constants/status.pyc
%%PYTHON_SITELIBDIR%%/gpg/constants/status.pyo
+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__init__.py
+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/policy.py
+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/policy.pyc
+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/policy.pyo
%%PYTHON_SITELIBDIR%%/gpg/constants/validity.py
%%PYTHON_SITELIBDIR%%/gpg/constants/validity.pyc
%%PYTHON_SITELIBDIR%%/gpg/constants/validity.pyo
More information about the svn-ports-all
mailing list