[SCM] Debian packaging of libcgi-simple-perl branch, master, updated. 03eea3f5b4d74d41f0d8a209d3945df6cf8d8507

Dominic Hargreaves dom at earth.li
Mon Feb 6 19:55:04 UTC 2012


The following commit has been merged in the master branch:
commit 06feff8a5ade5a72fa5142d4b95dee3034d5f151
Author: Dominic Hargreaves <dom at earth.li>
Date:   Mon Feb 6 19:39:32 2012 +0000

    Use Text::Parsewords rather than shellwords.pl

diff --git a/debian/changelog b/debian/changelog
index a53faf1..cb4a4e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ libcgi-simple-perl (1.113-2) UNRELEASED; urgency=low
   * debian/copyright: Replace DEP5 Format-Specification URL from
     svn.debian.org to anonscm.debian.org URL.
 
+  [ Dominic Hargreaves ]
+  * Fix lintian warning perl-module-uses-perl4-libs-without-dep by
+    replacing use of shellwords.pl with Text::ParseWords
+
  -- Ansgar Burchardt <ansgar at debian.org>  Wed, 27 Jul 2011 18:41:46 +0200
 
 libcgi-simple-perl (1.113-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index cae00c1..414032a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Uploaders: Jose Luis Rivas <ghostbar at debian.org>,
  gregor herrmann <gregoa at debian.org>,
  Ansgar Burchardt <ansgar at debian.org>,
  Ryan Niebur <ryan at debian.org>,
- Niko Tyni <ntyni at debian.org>
+ Niko Tyni <ntyni at debian.org>,
+ Dominic Hargreaves <dom at earth.li>
 Standards-Version: 3.9.1
 Homepage: http://search.cpan.org/dist/CGI-Simple/
 Vcs-Git: git://git.debian.org/pkg-perl/packages/libcgi-simple-perl.git
diff --git a/debian/patches/no-shellwords-pl.patch b/debian/patches/no-shellwords-pl.patch
new file mode 100644
index 0000000..f3c8183
--- /dev/null
+++ b/debian/patches/no-shellwords-pl.patch
@@ -0,0 +1,26 @@
+From: Dominic Hargreaves <dom at earth.li>
+Subject: Use Text::ParseWords instead of shellwords.pl
+
+The shellwords.pl library is deprecated and will be removed in a future
+version of perl. Text::ParseWords has been in core since 5.0.0 and it is
+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 {
+     @words = @ARGV;
+   }
+   elsif ( $_[0]->{'.globals'}->{'DEBUG'} == 2 ) {
+-    require "shellwords.pl";
++    require Text::ParseWords;
+     print "(offline mode: enter name=value pairs on standard input)\n";
+     chomp( my @lines = <STDIN> );
+-    @words = &shellwords( join " ", @lines );
++    @words = &Text::ParseWords::old_shellwords( join " ", @lines );
+   }
+   else {
+     return '';
diff --git a/debian/patches/series b/debian/patches/series
index 978ace5..819ad48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 cve-2010-4410.patch
 cve-2010-4411.patch
+no-shellwords-pl.patch

-- 
Debian packaging of libcgi-simple-perl



More information about the Pkg-perl-cvs-commits mailing list