r30187 - in /trunk/libgnupg-perl/debian: changelog patches/import_ok.patch patches/series

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Tue Jan 27 17:05:14 2009
New Revision: 30187

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=30187
Log:
Add new patch import_ok.patch, gnupg now responds with IMPORT_OK instead
of IMPORT_RES.

Added:
    trunk/libgnupg-perl/debian/patches/import_ok.patch
Modified:
    trunk/libgnupg-perl/debian/changelog
    trunk/libgnupg-perl/debian/patches/series

Modified: trunk/libgnupg-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgnupg-perl/debian/changelog?rev=30187&op=diff
==============================================================================
--- trunk/libgnupg-perl/debian/changelog (original)
+++ trunk/libgnupg-perl/debian/changelog Tue Jan 27 17:05:14 2009
@@ -16,6 +16,8 @@
   * debian/copyright: switch to new format.
   * debian/changelog: set version number to 0.09 (instead of 0.9) to match
     upstream's version.
+  * Add new patch import_ok.patch, gnupg now responds with IMPORT_OK instead
+    of IMPORT_RES.
 
  -- gregor herrmann <gregoa at debian.org>  Tue, 27 Jan 2009 16:41:51 +0100
 

Added: trunk/libgnupg-perl/debian/patches/import_ok.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgnupg-perl/debian/patches/import_ok.patch?rev=30187&op=file
==============================================================================
--- trunk/libgnupg-perl/debian/patches/import_ok.patch (added)
+++ trunk/libgnupg-perl/debian/patches/import_ok.patch Tue Jan 27 17:05:14 2009
@@ -1,0 +1,20 @@
+Author: Malcolm Heath
+Description: see comment below
+Bugs: CPAN RT#4957
+
+--- a/GnuPG.pm
++++ b/GnuPG.pm
+@@ -478,8 +478,11 @@
+     }
+ 
+     # We will see one IMPORT_RES for all files processed
+-    $self->abort_gnupg ( "protocol error expected IMPORT_RES got $cmd\n" )
+-      unless $cmd =~ /IMPORT_RES/;
++    # If we are using gpg version 1.0.7 or earlier, IMPORT_RES will
++    # be the next thing we see. If we're using version 1.2.0 or later
++    # we'll see IMPORT_OK
++    $self->abort_gnupg ( "protocol error expected IMPORT_RES or IMPORT_OK, got $cmd\n" )
++      unless $cmd =~ /IMPORT_(OK|RES)/;
+     $self->end_gnupg;
+ 
+     # We return the number of imported keys

Modified: trunk/libgnupg-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgnupg-perl/debian/patches/series?rev=30187&op=diff
==============================================================================
--- trunk/libgnupg-perl/debian/patches/series (original)
+++ trunk/libgnupg-perl/debian/patches/series Tue Jan 27 17:05:14 2009
@@ -3,3 +3,4 @@
 pod.patch
 policy_url.patch
 strict_subs.patch
+import_ok.patch