From cde4967ee18dda373ecc63714019440a223e9daa Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Apr 16 2008 22:16:39 +0000
Subject: - belatedly apply patch from David Shaw to not erroneously fail when asked

    to decrypt multiple files (#234087)

---

diff --git a/gnupg-1.4.7-multifile-fix.patch b/gnupg-1.4.7-multifile-fix.patch
new file mode 100644
index 0000000..c3aa4b8
--- /dev/null
+++ b/gnupg-1.4.7-multifile-fix.patch
@@ -0,0 +1,53 @@
+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);  
diff --git a/gnupg.spec b/gnupg.spec
index de0c932..4ef9a99 100644
--- a/gnupg.spec
+++ b/gnupg.spec
@@ -1,7 +1,7 @@
 Summary: A GNU utility for secure communication and data storage
 Name: gnupg
 Version: 1.4.7
-Release: 7
+Release: 9
 License: GPLv2+
 Group: Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
@@ -11,6 +11,7 @@ Patch0: gnupg-1.4.1-gcc.patch
 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 @@ only IDEA for symmetric-key encryption, which is patented worldwide).
 %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,10 @@ exit 0
 %{_mandir}/man7/*
 
 %changelog
+* Wed Apr 16 2008 Nalin Dahyabhai <nalin@redhat.com> - 1.4.7-9
+- belatedly apply patch from David Shaw to not erroneously fail when asked to
+  decrypt multiple files (#234087)
+
 * Thu Aug 16 2007 Nalin Dahyabhai <nalin@redhat.com> - 1.4.7-7
 - clarify license