From 6b07ff134c66f1bb6a0086c94507dab3a5b77c68 Mon Sep 17 00:00:00 2001
From: sibel <lesibel@free.fr>
Date: Wed, 8 Sep 2010 08:08:44 +0200
Subject: maj de gnupg#2.0.16-1

---
 extra/gnupg/.md5sum                      |  4 ++--
 extra/gnupg/Pkgfile                      | 11 ++++++-----
 extra/gnupg/gnupg2-2.0.16-security.patch | 11 +++++++++++
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 extra/gnupg/gnupg2-2.0.16-security.patch

(limited to 'extra')

diff --git a/extra/gnupg/.md5sum b/extra/gnupg/.md5sum
index c1f9500cf..7d4c8064f 100644
--- a/extra/gnupg/.md5sum
+++ b/extra/gnupg/.md5sum
@@ -1,2 +1,2 @@
-54732a0a76d59646b7e0b682fb357c22  gnupg-2.0.14.tar.bz2
-9f05561bf1338f343a0e1b1b23ba8024  gnupg.diff
+88a4d46deca63d2eca29b2b611304afb  gnupg-2.0.16.tar.bz2
+a2c570dcc439283dcad76539a7d6e5a2  gnupg2-2.0.16-security.patch
diff --git a/extra/gnupg/Pkgfile b/extra/gnupg/Pkgfile
index 501d95779..0cc476379 100644
--- a/extra/gnupg/Pkgfile
+++ b/extra/gnupg/Pkgfile
@@ -2,17 +2,18 @@
 # URL: 	http://www.gnupg.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libgcrypt, libassuan, libksba, pinentry, libldap
+# Depends on: pth, libgpg-error libgcrypt, libassuan, libksba, libldap, pinentry, readline, texinfo, zlib, libusb, curl
 
 name=gnupg
-version=2.0.14
+version=2.0.16
 release=1
-source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$version.tar.bz2\
-	$name.diff)
+source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$version.tar.bz2
+	gnupg2-2.0.16-security.patch)
 
 build() {
 	cd gnupg-$version
-#	patch -Np1 -i $SRC/$name.diff
+	 patch -Np0 -i ../gnupg2-2.0.16-security.patch
+
 	./configure --prefix=/usr \
 	--libexecdir=/usr/lib/gnupg2
 	make
diff --git a/extra/gnupg/gnupg2-2.0.16-security.patch b/extra/gnupg/gnupg2-2.0.16-security.patch
new file mode 100644
index 000000000..b265c1532
--- /dev/null
+++ b/extra/gnupg/gnupg2-2.0.16-security.patch
@@ -0,0 +1,11 @@
+--- kbx/keybox-blob.c   (revision 5367)
++++ kbx/keybox-blob.c   (working copy)
+@@ -898,6 +898,7 @@
+               rc = gpg_error_from_syserror ();
+               goto leave;
+             }
++          names = tmp;
+         }
+       names[blob->nuids++] = p;
+       if (!i && (p=x509_email_kludge (p)))
+
-- 
cgit v1.2.3-54-g00ecf