summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorghen <ghen@pkgsrc.org>2006-12-06 18:35:02 +0000
committerghen <ghen@pkgsrc.org>2006-12-06 18:35:02 +0000
commit43cec5096cdc0993050531d991d74e5bfd51e799 (patch)
tree23843b2ffbdc2607277c36d3a16e8c7d78cdd05c
parentaa37be03c193dace5e031eb7ff88da192e50ff3e (diff)
downloadpkgsrc-43cec5096cdc0993050531d991d74e5bfd51e799.tar.gz
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
-rw-r--r--security/gnupg-devel/Makefile3
-rw-r--r--security/gnupg-devel/distinfo3
-rw-r--r--security/gnupg-devel/patches/patch-ab15
3 files changed, 19 insertions, 2 deletions
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index 35151b688c8..2c2118cf612 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -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 --git a/security/gnupg-devel/distinfo b/security/gnupg-devel/distinfo
index d4c78f09561..bfa34568c8d 100644
--- a/security/gnupg-devel/distinfo
+++ b/security/gnupg-devel/distinfo
@@ -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 @@ SHA1 (pth-2.0.4.tar.gz) = c5ee066185a042a5cf1341a0ec10bcb94a1d4c53
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 --git a/security/gnupg-devel/patches/patch-ab b/security/gnupg-devel/patches/patch-ab
new file mode 100644
index 00000000000..9bf74182ffc
--- /dev/null
+++ b/security/gnupg-devel/patches/patch-ab
@@ -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 )