Date: Thu, 4 Aug 2011 21:20:42 GMT From: Doug Barton <dougb@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/159520: Upgrade security/gnupg to 2.0.18, minor port improvements Message-ID: <201108042120.p74LKguf087545@freefall.freebsd.org> Resent-Message-ID: <201108042130.p74LU6IS091952@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159520
>Category: ports
>Synopsis: Upgrade security/gnupg to 2.0.18, minor port improvements
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 04 21:30:06 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Doug Barton
>Release: FreeBSD 8.2-STABLE i386
>Organization:
AAAG
>Environment:
DNA
>Description:
Upgrade to version 2.0.18 which has the following new features:
* Support the SSH confirm flag and show SSH fingerprints in ssh
related pinentries.
* Improved dirmngr/gpgsm interaction for OCSP.
* Allow generation of card keys up to 4096 bit.
For the port:
* Remove patch that was incorporated into this release
* Remove redundant BUILD_DEPENDS
* Patching should be done in a -patch target. Silence the REINPLACE
>How-To-Repeat:
DNA
>Fix:
Apply the following patch:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/security/gnupg/Makefile,v
retrieving revision 1.140
diff -u -r1.140 Makefile
--- Makefile 14 Jul 2011 08:18:59 -0000 1.140
+++ Makefile 4 Aug 2011 21:04:01 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= gnupg
-PORTVERSION= 2.0.17
-PORTREVISION= 3
+PORTVERSION= 2.0.18
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gnupg
@@ -17,7 +16,6 @@
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= The GNU Privacy Guard
-BUILD_DEPENDS= libksba>=1.2.0:${PORTSDIR}/security/libksba
LIB_DEPENDS= assuan.0:${PORTSDIR}/security/libassuan \
gcrypt.18:${PORTSDIR}/security/libgcrypt \
gpg-error:${PORTSDIR}/security/libgpg-error \
@@ -115,10 +113,10 @@
verify: checksum
gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
-pre-configure:
- ${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" ${CONFIGURE_SUB} \
+post-patch:
+ @${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" ${CONFIGURE_SUB} \
${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure
- ${REINPLACE_CMD} -e "/#include <utmp.h>/d" \
+ @${REINPLACE_CMD} -e "/#include <utmp.h>/d" \
${WRKSRC}/tools/symcryptrun.c
post-install:
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/security/gnupg/distinfo,v
retrieving revision 1.53
diff -u -r1.53 distinfo
--- distinfo 8 Feb 2011 03:40:15 -0000 1.53
+++ distinfo 4 Aug 2011 21:04:01 -0000
@@ -1,4 +1,4 @@
-SHA256 (gnupg-2.0.17.tar.bz2) = ea649d5ecb2f97cc8d81c5796c6ad8d7d8581f9554241c39d2b11ab12139eea6
-SIZE (gnupg-2.0.17.tar.bz2) = 3997356
-SHA256 (gnupg-2.0.17.tar.bz2.sig) = 27918acebd48f93e3042c3b6f6396182bee2c9a5f0448d2063ce73986bb748ff
-SIZE (gnupg-2.0.17.tar.bz2.sig) = 287
+SHA256 (gnupg-2.0.18.tar.bz2) = 48aedd762ca443fb952a9e859efe3c66706d7c2c9c77c32dbdbac4fe962dae5b
+SIZE (gnupg-2.0.18.tar.bz2) = 4016606
+SHA256 (gnupg-2.0.18.tar.bz2.sig) = 9238f90e17589a421e6ba5c5d7bd9f68fbd1f1553198a3448fbdc887a38b975d
+SIZE (gnupg-2.0.18.tar.bz2.sig) = 287
Index: files/patch-g10__pkglue.c
===================================================================
RCS file: files/patch-g10__pkglue.c
diff -N files/patch-g10__pkglue.c
--- files/patch-g10__pkglue.c 14 Jul 2011 08:19:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
---- g10/pkglue.c.orig 2011-01-09 14:06:16.000000000 -0800
-+++ g10/pkglue.c 2011-07-12 21:32:41.000000000 -0700
-@@ -34,10 +34,10 @@
- {
- gcry_sexp_t list;
- gcry_mpi_t data;
--
-+
- list = gcry_sexp_find_token (sexp, item, 0);
- assert (list);
-- data = gcry_sexp_nth_mpi (list, 1, 0);
-+ data = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
- assert (data);
- gcry_sexp_release (list);
- return data;
-@@ -293,7 +293,7 @@
- if (rc)
- return rc;
-
-- *result = gcry_sexp_nth_mpi (s_plain, 0, 0);
-+ *result = gcry_sexp_nth_mpi (s_plain, 0, GCRYMPI_FMT_USG);
- gcry_sexp_release (s_plain);
- if (!*result)
- return -1; /* oops */
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108042120.p74LKguf087545>