r74284 - in /trunk/pperl/debian: changelog patches/safe-socket-path.patch patches/series patches/unclean-name-checks.patch

[dom at users.alioth.debian.org]

Author: dom
Date: Thu May 12 20:45:28 2011
New Revision: 74284

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=74284
Log:
unclean-name-checks also part of safe-socket-path

Removed:
    trunk/pperl/debian/patches/unclean-name-checks.patch
Modified:
    trunk/pperl/debian/changelog
    trunk/pperl/debian/patches/safe-socket-path.patch
    trunk/pperl/debian/patches/series

Modified: trunk/pperl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/pperl/debian/changelog?rev=74284&op=diff
==============================================================================
--- trunk/pperl/debian/changelog (original)
+++ trunk/pperl/debian/changelog Thu May 12 20:45:28 2011
@@ -52,10 +52,11 @@
 
   [ Dominic Hargreaves ]
   * Switch to dpkg-source 3.0 (quilt) format
-  * Split spelling fixes into spelling.patch; merge patch
-    pass_PPERL_TMP_PATH into safe-socket-path as they are related
+  * Split spelling fixes into spelling.patch
+  * Merge patch pass_PPERL_TMP_PATH and unclean-name-checks into
+    safe-socket-path, as they are related
 
- -- Dominic Hargreaves <dom at earth.li>  Thu, 12 May 2011 21:36:24 +0100
+ -- Dominic Hargreaves <dom at earth.li>  Thu, 12 May 2011 21:45:05 +0100
 
 pperl (0.25-5.1) unstable; urgency=low
 

Modified: trunk/pperl/debian/patches/safe-socket-path.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/pperl/debian/patches/safe-socket-path.patch?rev=74284&op=diff
==============================================================================
--- trunk/pperl/debian/patches/safe-socket-path.patch (original)
+++ trunk/pperl/debian/patches/safe-socket-path.patch Thu May 12 20:45:28 2011
@@ -158,3 +158,18 @@
  
  ok(capture($^X, 't/env.plx'),
    qq{'foo' => 'bar\nbaz'\n'null' => ''\n'quu\nx' => 'wobble'\n});
+--- a/pperl.h.header
++++ b/pperl.h.header
+@@ -260,9 +260,11 @@ my $DONE        = 0;   # set flag to tru
+ 
+ # $SIG{INT} = $SIG{TERM} = sub { $DONE++ };
+ 
+-$PPERL::SOCKET_NAME =~ m~^([a-z0-9/_-]+)$~i
++$PPERL::SOCKET_NAME =~ m~^(/.*)$~
+   or die "unclean socket name '$PPERL::SOCKET_NAME'";
+ $PPERL::SOCKET_NAME = $1;
++$PPERL::SOCKET_NAME =~ m~/\.\.(?:/|$)~
++  and die "unclean socket name '$PPERL::SOCKET_NAME'";
+ if (-e $PPERL::SOCKET_NAME) {
+   if (-e "${PPERL::SOCKET_NAME}.pid") {
+     die "socket and pid file both exist - possible error state. Delete both and retry";

Modified: trunk/pperl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/pperl/debian/patches/series?rev=74284&op=diff
==============================================================================
--- trunk/pperl/debian/patches/series (original)
+++ trunk/pperl/debian/patches/series Thu May 12 20:45:28 2011
@@ -4,5 +4,4 @@
 spelling.patch
 pperl-man.patch
 safe-socket-path.patch
-unclean-name-checks.patch
 disable_deprecation_warnings.patch