On Mon, Oct 12, 2015 at 02:54:08PM +0100, Nigel Taylor wrote:
> On 10/12/15 14:30, Pierre-Emmanuel André wrote:
> > Hi,
> >
> > Small diff to upgrade GnuPG2 to it's latest version.
> > Tested on @amd64.
> >
> > Comments / ok ?
> > Regards,
> >
> Who's been updating your port
>
> revision 1.40
> date: 2015/09/29 20:51:42; author: edd; state: Exp; lines: +2 -1;
> commitid: A09qWOZHk3pLIruW;
> Fix a crash in security/gnupg2.
>
> Makes HKP pools work again in gpg2.
>
>
>
> Need to update / merge your ports tree from CVS it's not current and
> resend diff.
>
My bad :(
Updated diff. Thanks.
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 Makefile
--- Makefile 29 Sep 2015 20:51:42 -0000 1.40
+++ Makefile 12 Oct 2015 14:08:52 -0000
@@ -2,9 +2,8 @@
COMMENT = GNU privacy guard - a free PGP replacement
-DISTNAME = gnupg-2.1.8
+DISTNAME = gnupg-2.1.9
CATEGORIES = security
-REVISION = 0
MASTER_SITES = ${MASTER_SITES_GNUPG:=gnupg/}
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 distinfo
--- distinfo 11 Sep 2015 10:02:03 -0000 1.17
+++ distinfo 12 Oct 2015 14:08:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.1.8.tar.bz2) = o7jQHkaQcV1C6PKJSTyFQTdm8/qTXk/n5f9bD24ngaM=
-SIZE (gnupg-2.1.8.tar.bz2) = 4900705
+SHA256 (gnupg-2.1.9.tar.bz2) = HLdjOlcZC+tm+SSct0RmAyKbJz1NiTMbdcZS+kop97Y=
+SIZE (gnupg-2.1.9.tar.bz2) = 4925167
Index: patches/patch-dirmngr_ks-engine-hkp_c
===================================================================
RCS file: patches/patch-dirmngr_ks-engine-hkp_c
diff -N patches/patch-dirmngr_ks-engine-hkp_c
--- patches/patch-dirmngr_ks-engine-hkp_c 29 Sep 2015 20:51:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-dirmngr_ks-engine-hkp_c,v 1.1 2015/09/29 20:51:42 edd Exp $
-
-Fix use of pointer which may have moved due to realloc().
-https://bugs.gnupg.org/gnupg/issue2107
-
---- dirmngr/ks-engine-hkp.c.orig Tue Sep 29 15:05:02 2015
-+++ dirmngr/ks-engine-hkp.c Tue Sep 29 15:05:26 2015
-@@ -512,7 +512,7 @@ map_host (ctrl_t ctrl, const char *name, int force_res
- xfree (reftbl);
- return err;
- }
-- qsort (reftbl, refidx, sizeof *reftbl, sort_hostpool);
-+ qsort (hi->pool, refidx, sizeof *reftbl, sort_hostpool);
- }
- else
- xfree (reftbl);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/gnupg2/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST
--- pkg/PLIST 6 Sep 2015 18:43:46 -0000 1.12
+++ pkg/PLIST 12 Oct 2015 14:08:52 -0000
@@ -57,6 +57,7 @@ share/doc/gnupg2/examples/trustlist.txt
share/doc/pkg-readmes/${FULLPKGNAME}
share/gnupg/
share/gnupg/com-certs.pem
+share/gnupg/dirmngr-conf.skel
share/gnupg/distsigkey.gpg
share/gnupg/gpg-conf.skel
share/gnupg/help.be.txt
