rpms/gnupg/F-7 gnupg-1.4.7-multifile-fix.patch, NONE, 1.1 gnupg.spec, 1.66, 1.67

Nalin Somabhai Dahyabhai (nalin) fedora-extras-commits at redhat.com
Wed Apr 16 22:17:09 UTC 2008


Author: nalin

Update of /cvs/pkgs/rpms/gnupg/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25930/F-7

Modified Files:
	gnupg.spec 
Added Files:
	gnupg-1.4.7-multifile-fix.patch 
Log Message:
- belatedly apply patch from David Shaw to not erroneously fail when asked to
  decrypt multiple files (#234087)


gnupg-1.4.7-multifile-fix.patch:

--- NEW FILE gnupg-1.4.7-multifile-fix.patch ---
Index: mainproc.c
===================================================================
--- mainproc.c	(revision 4484)
+++ mainproc.c	(working copy)
@@ -88,6 +88,12 @@
 static void proc_tree( CTX c, KBNODE node );
 static int literals_seen;
 
+void
+reset_literals_seen(void)
+{
+  literals_seen=0;
+}
+
 static void
 release_list( CTX c )
 {
Index: packet.h
===================================================================
--- packet.h	(revision 4484)
+++ packet.h	(working copy)
@@ -423,6 +423,7 @@
 };
 
 /*-- mainproc.c --*/
+void reset_literals_seen(void);
 int proc_packets( void *ctx, IOBUF a );
 int proc_signature_packets( void *ctx, IOBUF a,
 			    STRLIST signedfiles, const char *sigfile );
Index: verify.c
===================================================================
--- verify.c	(revision 4484)
+++ verify.c	(working copy)
@@ -169,6 +169,7 @@
     rc = proc_signature_packets( NULL, fp, NULL, name );
     iobuf_close(fp);
     write_status( STATUS_FILE_DONE );
+    reset_literals_seen();
     return rc;
 }
 
Index: decrypt.c
===================================================================
--- decrypt.c	(revision 4484)
+++ decrypt.c	(working copy)
@@ -185,6 +185,7 @@
       write_status( STATUS_FILE_DONE );
       iobuf_ioctl( NULL, 2, 0, NULL); /* Invalidate entire cache. */
       xfree(output);
+      reset_literals_seen();
     }
 
   set_next_passphrase(NULL);  


Index: gnupg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg/F-7/gnupg.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gnupg.spec	12 Mar 2007 19:43:04 -0000	1.66
+++ gnupg.spec	16 Apr 2008 22:16:24 -0000	1.67
@@ -1,8 +1,8 @@
 Summary: A GNU utility for secure communication and data storage
 Name: gnupg
 Version: 1.4.7
-Release: 6
-License: GPL
+Release: 8
+License: GPLv2+
 Group: Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
@@ -11,6 +11,7 @@
 Patch1: gnupg-1.4.2-curl.patch
 Patch2: gnupg-1.4.5-termlib.patch
 Patch3: gnupg-1.4.6-dir.patch
+Patch4: gnupg-1.4.7-multifile-fix.patch
 URL: http://www.gnupg.org/
 # Requires autoconf >= 2.60 because earlier autoconf didn't define $localedir.
 BuildRequires: autoconf >= 2.60
@@ -40,6 +41,9 @@
 %patch1 -p0 -b .curl
 %patch2 -p1 -b .termlib
 %patch3 -p1 -b .dir
+pushd g10
+%patch4 -p0 -b .multifile-fix
+popd
 autoreconf
 
 %build
@@ -109,6 +113,11 @@
 %{_mandir}/man7/*
 
 %changelog
+* Wed Apr 16 2008 Nalin Dahyabhai <nalin at redhat.com> - 1.4.7-8
+- belatedly apply patch from David Shaw to not erroneously fail when asked to
+  decrypt multiple files (#234087)
+- clarify license: tag (GPLv2+)
+
 * Fri Mar  9 2007 Nalin Dahyabhai <nalin at redhat.com> - 1.4.7-6
 - require autoconf >= 2.60, noting that we need it to define $localedir, to
   avoid cases where using older versions causes gnupg to not be able to find




More information about the fedora-extras-commits mailing list