[pkgsrc/pkgsrc-2006Q3]: pkgsrc/security/gnupg-devel Pullup ticket 1939 - requ...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/749fc2c8bdc1
branches:  pkgsrc-2006Q3
changeset: 519231:749fc2c8bdc1
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Wed Dec 06 18:35:02 2006 +0000

description:
Pullup ticket 1939 - requested by wiz
security fix for gnupg-devel

- pkgsrc/security/gnupg-devel/Makefile          patch
- pkgsrc/security/gnupg-devel/distinfo          patch
- pkgsrc/security/gnupg-devel/patches/patch-ab  patch

   Apply GnuPG security patch from
   http://lists.gnupg.org/pipermail/gnupg-announce/2006q4/000241.html

diffstat:

 security/gnupg-devel/Makefile         |   3 ++-
 security/gnupg-devel/distinfo         |   3 ++-
 security/gnupg-devel/patches/patch-ab |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (47 lines):

diff -r 8383d923f006 -r 749fc2c8bdc1 security/gnupg-devel/Makefile
--- a/security/gnupg-devel/Makefile     Wed Dec 06 13:00:18 2006 +0000
+++ b/security/gnupg-devel/Makefile     Wed Dec 06 18:35:02 2006 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2006/08/29 10:23:10 shannonjr Exp $
+# $NetBSD: Makefile,v 1.18.2.1 2006/12/06 18:35:02 ghen Exp $
 #
 
 DISTNAME=              gnupg-1.9.22
 PKGNAME=               ${DISTNAME:S/gnupg/gnupg-devel/}
+PKGREVISION=           1
 CATEGORIES=            security
 MASTER_SITES=          ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/
 EXTRACT_SUFX=          .tar.bz2
diff -r 8383d923f006 -r 749fc2c8bdc1 security/gnupg-devel/distinfo
--- a/security/gnupg-devel/distinfo     Wed Dec 06 13:00:18 2006 +0000
+++ b/security/gnupg-devel/distinfo     Wed Dec 06 18:35:02 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2006/08/29 10:23:10 shannonjr Exp $
+$NetBSD: distinfo,v 1.13.2.1 2006/12/06 18:35:02 ghen Exp $
 
 SHA1 (gnupg-1.9.22.tar.bz2) = 10b2a5c256598d9ed25c84d55ea111710b3f8906
 RMD160 (gnupg-1.9.22.tar.bz2) = 43b3e8a17d5e116f5fa0c34bc3beaf68250ec3c3
@@ -7,3 +7,4 @@
 RMD160 (pth-2.0.4.tar.gz) = ba78260cb8860433cd240e24e2e90dc6997943d8
 Size (pth-2.0.4.tar.gz) = 641851 bytes
 SHA1 (patch-aa) = 4fdedc1f98dbe717fd5a1229944703f19c3c10e5
+SHA1 (patch-ab) = 8768d556e63b31086d176a8a56bad74acb019b29
diff -r 8383d923f006 -r 749fc2c8bdc1 security/gnupg-devel/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnupg-devel/patches/patch-ab     Wed Dec 06 18:35:02 2006 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.6.6.1 2006/12/06 18:35:02 ghen Exp $
+
+# http://lists.gnupg.org/pipermail/gnupg-announce/2006q4/000241.html
+
+--- g10/openfile.c.orig        2006-06-20 18:33:00.000000000 +0200
++++ g10/openfile.c
+@@ -145,7 +145,7 @@ ask_outfile_name( const char *name, size
+ 
+     s = _("Enter new filename");
+ 
+-    n = strlen(s) + namelen + 10;
++    n = strlen(s) + (defname?strlen (defname):0) + 10;
+     defname = name && namelen? make_printable_string( name, namelen, 0): NULL;
+     prompt = xmalloc(n);
+     if( defname )