rpms/gnupg2/F-12 gnupg-2.0.16-gpgsm_realloc.patch, NONE, 1.1 gnupg2.spec, 1.94, 1.95

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/gnupg2/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19884

Modified Files:
	gnupg2.spec 
Added Files:
	gnupg-2.0.16-gpgsm_realloc.patch 
Log Message:
* Fri Jul 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.0.13-2
- gpgsm realloc patch


gnupg-2.0.16-gpgsm_realloc.patch:
 keybox-blob.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE gnupg-2.0.16-gpgsm_realloc.patch ---
diff -up gnupg-2.0.16/kbx/keybox-blob.c.gpgsm_realloc gnupg-2.0.16/kbx/keybox-blob.c
--- gnupg-2.0.16/kbx/keybox-blob.c.gpgsm_realloc	2009-09-21 11:53:44.000000000 -0500
+++ gnupg-2.0.16/kbx/keybox-blob.c	2010-07-23 12:29:54.222718366 -0500
@@ -898,6 +898,7 @@ _keybox_create_x509_blob (KEYBOXBLOB *r_
               rc = gpg_error_from_syserror ();
               goto leave;
             }
+          names = tmp;
         }
       names[blob->nuids++] = p;
       if (!i && (p=x509_email_kludge (p)))


Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-12/gnupg2.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- gnupg2.spec	4 Sep 2009 21:33:45 -0000	1.94
+++ gnupg2.spec	23 Jul 2010 18:36:48 -0000	1.95
@@ -2,7 +2,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
@@ -13,16 +13,18 @@ Source1: ftp://ftp.gnupg.org/gcrypt/%{?p
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+# Security Alert for GnuPG 2.0 - Realloc bug in GPGSM
+# http://lists.gnupg.org/pipermail/gnupg-announce/2010q3/000302.html
+Patch100: gnupg-2.0.16-gpgsm_realloc.patch
+
 #BuildRequires: automake libtool texinfo transfig
 BuildRequires: bzip2-devel
 BuildRequires: curl-devel
 BuildRequires: docbook-utils
 BuildRequires: gettext
 BuildRequires: libassuan-devel >= 1.0.4
-# libgcrypt-devel >= 1.4.0 is preferred, see http://bugzilla.redhat.com/435320
-BuildRequires:  libgcrypt-devel >= 1.4
-#Requires(hint): libgcrypt >= 1.4
-#BuildRequires: libgcrypt-devel => 1.2.2
+BuildRequires: libgcrypt-devel >= 1.4
 BuildRequires: libgpg-error-devel => 1.4
 BuildRequires: libksba-devel >= 1.0.2
 BuildRequires: openldap-devel
@@ -71,6 +73,8 @@ dependency on other modules at run and b
 %prep
 %setup -q -n gnupg-%{version}
 
+%patch100 -p1 -b .gpgsm_realloc
+
 # pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
 # Note: this is just the name of the default shared lib to load in scdaemon,
 # it can use other implementations too (including non-pcsc ones).
@@ -80,10 +84,6 @@ dependency on other modules at run and b
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
-# fix temp broken docs
-#sed -i -e 's/^@include version.texi//' doc/gnupg.texi
-#./autogen.sh
-
 
 %build
 
@@ -174,6 +174,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.0.13-2
+- gpgsm realloc patch
+
 * Fri Sep 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.0.13-1
 - gnupg-2.0.13
 - Unable to use gpg-agent + input methods (#228953)