[arch-commits] Commit in gnupg2/trunk (PKGBUILD gnupg2-2.0.16-security.patch)

[Tobias Powalowski]

    Date: Wednesday, August 11, 2010 @ 11:51:08
  Author: tpowa
Revision: 87262

upgpkg: gnupg2 2.0.16-2
fixed security issue

Added:
  gnupg2/trunk/gnupg2-2.0.16-security.patch
Modified:
  gnupg2/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   13 ++++++++-----
 gnupg2-2.0.16-security.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-11 14:26:27 UTC (rev 87261)
+++ PKGBUILD	2010-08-11 15:51:08 UTC (rev 87262)
@@ -4,7 +4,7 @@
 
 pkgname=gnupg2
 pkgver=2.0.16
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool"
 arch=('i686' 'x86_64')
 depends=('libldap' 'curl' 'bzip2' 'zlib' 'libksba' 'libgcrypt'
@@ -12,19 +12,22 @@
 license=('GPL')
 url="http://www.gnupg.org/"
 install=${pkgname}.install
-source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2)
+source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2
+       gnupg2-2.0.16-security.patch)
 
 build() {
   cd ${srcdir}/gnupg-$pkgver
+  patch -Np0 -i ../gnupg2-2.0.16-security.patch
   ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg2 #$EXTRAOPTS
-  make || return 1
+  make
 }
 
 package() {
   cd ${srcdir}/gnupg-$pkgver
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
   # move conflicting files
   mv ${pkgdir}/usr/share/gnupg{,2}
   rm -f ${pkgdir}/usr/share/info/dir
 }
-md5sums=('88a4d46deca63d2eca29b2b611304afb')
+md5sums=('88a4d46deca63d2eca29b2b611304afb'
+         'a2c570dcc439283dcad76539a7d6e5a2')

Added: gnupg2-2.0.16-security.patch
===================================================================
--- gnupg2-2.0.16-security.patch	                        (rev 0)
+++ gnupg2-2.0.16-security.patch	2010-08-11 15:51:08 UTC (rev 87262)
@@ -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)))
+