[libcgi-simple-perl] 06/12: Refresh patches (offset).

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libcgi-simple-perl.

commit 08eae8785815de6a15d5cf4182c7dbdb41e09b12
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Oct 24 22:15:14 2014 +0200

    Refresh patches (offset).
---
 debian/patches/cve-2010-4411.patch    | 10 +++++-----
 debian/patches/no-shellwords-pl.patch |  4 +---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/patches/cve-2010-4411.patch b/debian/patches/cve-2010-4411.patch
index bd7ebf4..3f732ed 100644
--- a/debian/patches/cve-2010-4411.patch
+++ b/debian/patches/cve-2010-4411.patch
@@ -5,9 +5,9 @@ Subject: [CVE-2010-4411] Port latest header-injection refinement from CGI.pm
 
 See also http://www.openwall.com/lists/oss-security/2011/01/04/9
 
---- libcgi-simple-perl.orig/lib/CGI/Simple.pm
-+++ libcgi-simple-perl/lib/CGI/Simple.pm
-@@ -1007,7 +1007,7 @@
+--- a/lib/CGI/Simple.pm
++++ b/lib/CGI/Simple.pm
+@@ -1008,7 +1008,7 @@
        $header =~ s/$CRLF(\s)/$1/g;
  
        # All other uses of newlines are invalid input.
@@ -16,8 +16,8 @@ See also http://www.openwall.com/lists/oss-security/2011/01/04/9
          # shorten very long values in the diagnostic
          $header = substr( $header, 0, 72 ) . '...'
           if ( length $header > 72 );
---- libcgi-simple-perl.orig/t/headers.t
-+++ libcgi-simple-perl/t/headers.t
+--- a/t/headers.t
++++ b/t/headers.t
 @@ -76,3 +76,9 @@
    'redirect with leading newlines blows up'
  );
diff --git a/debian/patches/no-shellwords-pl.patch b/debian/patches/no-shellwords-pl.patch
index f3c8183..90d5308 100644
--- a/debian/patches/no-shellwords-pl.patch
+++ b/debian/patches/no-shellwords-pl.patch
@@ -7,11 +7,9 @@ used by shellwords.pl already.
 
 Adapted from <https://github.com/markstos/CGI.pm/commit/0cf175dbfbeaa46d71343412c715096da5bd0eaf>
 
-diff --git a/lib/CGI/Simple.pm b/lib/CGI/Simple.pm
-index 230606f..85b02fb 100644
 --- a/lib/CGI/Simple.pm
 +++ b/lib/CGI/Simple.pm
-@@ -1185,10 +1185,10 @@ sub read_from_cmdline {
+@@ -1186,10 +1186,10 @@
      @words = @ARGV;
    }
    elsif ( $_[0]->{'.globals'}->{'DEBUG'} == 2 ) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcgi-simple-perl.git