This updates gpgme to a current version, it also switches to using gnupg2 rather than gnupg - it can use either, but the build infrastructure no longer has an easy way to turn off gpgsm so this seemed the path of least resistance.
Any comments or anyone want to test with their favourite gpgme-using apps? Index: Makefile =================================================================== RCS file: /cvs/ports/security/gpgme/Makefile,v retrieving revision 1.30 diff -u -p -r1.30 Makefile --- Makefile 12 Sep 2014 13:24:30 -0000 1.30 +++ Makefile 29 Oct 2014 21:21:52 -0000 @@ -2,12 +2,11 @@ COMMENT= GnuPG Made Easy -DISTNAME= gpgme-1.3.1 -CATEGORIES= security devel -REVISION= 1 +DISTNAME= gpgme-1.5.1 +CATEGORIES= security devel -SHARED_LIBS += gpgme 18.0 # 19.0 -SHARED_LIBS += gpgme-pthread 18.0 # 19.0 +SHARED_LIBS += gpgme 19.0 # 24.0 +SHARED_LIBS += gpgme-pthread 19.0 # 24.0 HOMEPAGE= http://www.gnupg.org/gpgme.html @@ -20,16 +19,10 @@ MASTER_SITES= ${MASTER_SITES_GNUPG:=gpg EXTRACT_SUFX= .tar.bz2 CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-gpg=${LOCALBASE}/bin/gpg \ - --with-gpgsm=no \ - --with-gpgconf=no \ - --with-g13=no \ - --without-pth \ - --without-pth-test +CONFIGURE_ARGS= ${CONFIGURE_SHARED} MODULES= devel/gettext -RUN_DEPENDS= security/gnupg +RUN_DEPENDS= security/gnupg2 BUILD_DEPENDS= ${RUN_DEPENDS} LIB_DEPENDS= security/libgpg-error>=1.4 \ security/libassuan Index: distinfo =================================================================== RCS file: /cvs/ports/security/gpgme/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 30 Aug 2011 06:43:07 -0000 1.10 +++ distinfo 29 Oct 2014 21:21:52 -0000 @@ -1,5 +1,2 @@ -MD5 (gpgme-1.3.1.tar.bz2) = kK+oQ2zismg8AByCS9ImAQ== -RMD160 (gpgme-1.3.1.tar.bz2) = lTVAabUV75qoDpciZF6QixDqbco= -SHA1 (gpgme-1.3.1.tar.bz2) = fRmpWiI52hN2Ta1/l1Qb6ITsWjc= -SHA256 (gpgme-1.3.1.tar.bz2) = Fe8nqHWuDXnXRG/ZMd7aEUOOck/76sdESe0Zy6I99NQ= -SIZE (gpgme-1.3.1.tar.bz2) = 841093 +SHA256 (gpgme-1.5.1.tar.bz2) = bC86+M7rMDJ31E7AIW2aEnFwH2W5HVlCJkz3zvtKEeM= +SIZE (gpgme-1.5.1.tar.bz2) = 964623 Index: patches/patch-src_engine-gpgsm_c =================================================================== RCS file: patches/patch-src_engine-gpgsm_c diff -N patches/patch-src_engine-gpgsm_c --- patches/patch-src_engine-gpgsm_c 12 Sep 2014 13:26:57 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_engine-gpgsm_c,v 1.2 2014/09/12 13:26:57 jasper Exp $ - -Security fix for CVE-2014-3564 -http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=2cbd76f7911fc215845e89b50d6af5ff4a83dd77 - ---- src/engine-gpgsm.c.orig Fri Sep 12 14:54:15 2014 -+++ src/engine-gpgsm.c Fri Sep 12 14:54:59 2014 -@@ -859,7 +859,7 @@ status_handler (void *opaque, int fd) - else - { - *aline = newline; -- gpgsm->colon.attic.linesize += linelen + 1; -+ gpgsm->colon.attic.linesize = *alinelen + linelen + 1; - } - } - if (!err) Index: patches/patch-src_engine-uiserver_c =================================================================== RCS file: patches/patch-src_engine-uiserver_c diff -N patches/patch-src_engine-uiserver_c --- patches/patch-src_engine-uiserver_c 12 Sep 2014 13:26:57 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_engine-uiserver_c,v 1.2 2014/09/12 13:26:57 jasper Exp $ - -Security fix for CVE-2014-3564 -http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=2cbd76f7911fc215845e89b50d6af5ff4a83dd77 - ---- src/engine-uiserver.c.orig Fri Sep 12 14:57:56 2014 -+++ src/engine-uiserver.c Fri Sep 12 14:58:10 2014 -@@ -723,7 +723,7 @@ status_handler (void *opaque, int fd) - else - { - *aline = newline; -- uiserver->colon.attic.linesize += linelen + 1; -+ uiserver->colon.attic.linesize = *alinelen + linelen + 1; - } - } - if (!err) Index: pkg/PFRAG.shared =================================================================== RCS file: pkg/PFRAG.shared diff -N pkg/PFRAG.shared --- pkg/PFRAG.shared 24 Dec 2005 22:32:53 -0000 1.10 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.10 2005/12/24 22:32:53 sturm Exp $ -@lib lib/libgpgme-pthread.so.${LIBgpgme-pthread_VERSION} -@lib lib/libgpgme.so.${LIBgpgme_VERSION} Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/security/gpgme/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- pkg/PLIST 16 Dec 2007 22:20:52 -0000 1.6 +++ pkg/PLIST 29 Oct 2014 21:21:52 -0000 @@ -4,10 +4,11 @@ include/gpgme.h @info info/gpgme.info lib/libgpgme-pthread.a lib/libgpgme-pthread.la +@lib lib/libgpgme-pthread.so.${LIBgpgme-pthread_VERSION} lib/libgpgme.a lib/libgpgme.la +@lib lib/libgpgme.so.${LIBgpgme_VERSION} share/aclocal/gpgme.m4 -%%SHARED%% @comment share/common-lisp/ @comment share/common-lisp/source/ @comment share/common-lisp/source/gpgme/
pgpjxjkKB7OHA.pgp
Description: PGP signature
