r74282 - in /trunk/pperl/debian: changelog patches/pass_PPERL_TMP_PATH.patch patches/safe-socket-path.patch patches/series patches/spelling.patch

[dom at users.alioth.debian.org]

Author: dom
Date: Thu May 12 20:39:50 2011
New Revision: 74282

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=74282
Log:
  * Split spelling fixes into spelling.patch; merge patch
    pass_PPERL_TMP_PATH into safe-socket-path as they are related

Added:
    trunk/pperl/debian/patches/spelling.patch
Removed:
    trunk/pperl/debian/patches/pass_PPERL_TMP_PATH.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=74282&op=diff
==============================================================================
--- trunk/pperl/debian/changelog (original)
+++ trunk/pperl/debian/changelog Thu May 12 20:39:50 2011
@@ -52,8 +52,10 @@
 
   [ 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
 
- -- Dominic Hargreaves <dom at earth.li>  Thu, 12 May 2011 21:22:10 +0100
+ -- Dominic Hargreaves <dom at earth.li>  Thu, 12 May 2011 21:36:24 +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=74282&op=diff
==============================================================================
--- trunk/pperl/debian/patches/safe-socket-path.patch (original)
+++ trunk/pperl/debian/patches/safe-socket-path.patch Thu May 12 20:39:50 2011
@@ -120,3 +120,41 @@
          tmp_fd = mkstemp(temp_file);
          if (tmp_fd == -1) {
              perror("pperl: Cannot create temporary file");
+--- a/t/env.plx
++++ b/t/env.plx
+@@ -1,3 +1,3 @@
+ #!perl -w
+ use strict;
+-print map { "'$_' => '$ENV{$_}'\n" } sort keys %ENV;
+\ No newline at end of file
++print map { "'$_' => '$ENV{$_}'\n" } sort grep { $_ ne 'PPERL_TMP_PATH' } keys %ENV;
+--- a/PPerl.pm
++++ b/PPerl.pm
+@@ -75,6 +75,13 @@ You need to make sure the path to the sc
+ Alternatively look for a .pid file for the script in your tmp directory, and
+ kill (with SIGINT) the process with that PID.
+ 
++=head1 ENVIRONMENT
++
++B<pperl> uses the B<PPERL_TMP_PATH> environment variable to determine
++the directory where to store the files used for inter-process
++communication.  By default, the subdirectory I<.pperl> of the user's
++home directory is used.
++
+ =head1 BUGS
+ 
+ The process does not reload when the script or modules change.
+--- a/t/04args.t
++++ b/t/04args.t
+@@ -17,9 +17,11 @@ ok(capture('./pperl', 't/args.plx', "foo
+ 
+ `./pperl t/env.plx`; # run it once so there's a $ENV{PATH} about
+ 
++my $tmp_path = $ENV{PPERL_TMP_PATH};
+ %ENV = ( foo       => "bar\nbaz",
+          "quu\nx"  => "wobble",
+          null      => '');
++$ENV{PPERL_TMP_PATH} = $tmp_path if $tmp_path;
+ 
+ ok(capture($^X, 't/env.plx'),
+   qq{'foo' => 'bar\nbaz'\n'null' => ''\n'quu\nx' => 'wobble'\n});

Modified: trunk/pperl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/pperl/debian/patches/series?rev=74282&op=diff
==============================================================================
--- trunk/pperl/debian/patches/series (original)
+++ trunk/pperl/debian/patches/series Thu May 12 20:39:50 2011
@@ -1,7 +1,7 @@
 287119_no-umask0.patch
 no-extra-libs.patch
 pass_fd.c.patch
-pass_PPERL_TMP_PATH.patch
+spelling.patch
 pperl-man.patch
 safe-socket-path.patch
 unclean-name-checks.patch

Added: trunk/pperl/debian/patches/spelling.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/pperl/debian/patches/spelling.patch?rev=74282&op=file
==============================================================================
--- trunk/pperl/debian/patches/spelling.patch (added)
+++ trunk/pperl/debian/patches/spelling.patch Thu May 12 20:39:50 2011
@@ -1,0 +1,11 @@
+--- a/PPerl.pm
++++ b/PPerl.pm
+@@ -30,7 +30,7 @@ PPerl - Make perl scripts persistent in 
+ 
+ This program turns ordinary perl scripts into long running daemons, making
+ subsequent executions extremely fast. It forks several processes for each
+-script, allowing many proceses to call the script at once.
++script, allowing many processes to call the script at once.
+ 
+ It works a lot like SpeedyCGI, but is written a little differently. I didn't
+ use the SpeedyCGI codebase, because I couldn't get it to compile, and needed