r59905 - in /trunk/libpar-packer-perl: ./ debian/ inc/IPC/ inc/Module/ inc/Module/Install/ lib/PAR/ myldr/ t/

Mon Jun 28 16:13:33 UTC 2010

Author: gregoa
Date: Mon Jun 28 16:13:09 2010
New Revision: 59905

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=59905
Log:
New upstream release.

Removed:
    trunk/libpar-packer-perl/inc/IPC/
Modified:
    trunk/libpar-packer-perl/ChangeLog
    trunk/libpar-packer-perl/MANIFEST
    trunk/libpar-packer-perl/MANIFEST.SKIP
    trunk/libpar-packer-perl/META.yml
    trunk/libpar-packer-perl/Makefile.PL
    trunk/libpar-packer-perl/debian/changelog
    trunk/libpar-packer-perl/inc/Module/Install.pm
    trunk/libpar-packer-perl/inc/Module/Install/Base.pm
    trunk/libpar-packer-perl/inc/Module/Install/Can.pm
    trunk/libpar-packer-perl/inc/Module/Install/Fetch.pm
    trunk/libpar-packer-perl/inc/Module/Install/Include.pm
    trunk/libpar-packer-perl/inc/Module/Install/Makefile.pm
    trunk/libpar-packer-perl/inc/Module/Install/Metadata.pm
    trunk/libpar-packer-perl/inc/Module/Install/PAR.pm
    trunk/libpar-packer-perl/inc/Module/Install/Win32.pm
    trunk/libpar-packer-perl/inc/Module/Install/WriteAll.pm
    trunk/libpar-packer-perl/lib/PAR/Packer.pm
    trunk/libpar-packer-perl/myldr/Makefile.PL
    trunk/libpar-packer-perl/myldr/run_with_inc.pl
    trunk/libpar-packer-perl/t/30-current_exec.t

Modified: trunk/libpar-packer-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/ChangeLog?rev=59905&op=diff
==============================================================================

--- trunk/libpar-packer-perl/ChangeLog (original)
+++ trunk/libpar-packer-perl/ChangeLog Mon Jun 28 16:13:09 2010
@@ -1,3 +1,18 @@
+[Changes for 1.006 - Jun 26, 2010]
+* Bug fixes, etc.
+    - RT #58266: fix "install PAR::Packer failed for strawberry perl 5.12.0.1
+      (parldyn.exe not found)"
+      Apparently exec() on Windows spawns the new process, but then exits
+      immediately without wait()ing for the new process (observed at least
+      on ActiveState Perl 5.10.1 and Straberry Perl 5.12.0.1). That causes
+      myldr/run_with_inc.pl to return control to myldr/Makefile prematurely,
+      causing (depending on timing) the build to fail. Work around this by
+      using system() instead.
+    - While we're at it, clean up some dubious dependencies in
+      myldr/Makefile.PL.
+    - Drop test_requires IPC::Run3 introduced in 1.005, simply skip all tests
+      in t/30-current_exec.t when run in a path that contains spaces.
+
 [Changes for 1.005 - Jun 05, 2010]
 * Bug fixes, etc.
     - RT #57494: add attributes.pm to list of always required modules

Modified: trunk/libpar-packer-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/MANIFEST?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/MANIFEST (original)
+++ trunk/libpar-packer-perl/MANIFEST Mon Jun 28 16:13:09 2010
@@ -17,7 +17,6 @@
 contrib/procedural_pp/pp_old
 contrib/stdio/Stdio.pm
 contrib/stdio/Stdio_readme.txt
-inc/IPC/Run3.pm
 inc/Module/Install.pm
 inc/Module/Install/Base.pm
 inc/Module/Install/Can.pm

Modified: trunk/libpar-packer-perl/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/MANIFEST.SKIP?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/MANIFEST.SKIP (original)
+++ trunk/libpar-packer-perl/MANIFEST.SKIP Mon Jun 28 16:13:09 2010
@@ -1,6 +1,5 @@
 #defaults
 ^\..*\.sw.$
-^inc/IPC/Run3/
 ^myldr/Makefile$
 ^myldr/Makefile\.old$
 ^myldr/main.[^c].*$

Modified: trunk/libpar-packer-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/META.yml?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/META.yml (original)
+++ trunk/libpar-packer-perl/META.yml Mon Jun 28 16:13:09 2010
@@ -7,7 +7,7 @@
 configure_requires:
   ExtUtils::MakeMaker: 6.42
 distribution_type: module
-generated_by: 'Module::Install version 0.99'
+generated_by: 'Module::Install version 1.00'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -18,38 +18,6 @@
     - contrib
     - inc
     - t
-provides:
-  App::Packer::PAR:
-    file: lib/App/Packer/PAR.pm
-    version: 0.91
-  PAR::Filter:
-    file: lib/PAR/Filter.pm
-    version: 0.03
-  PAR::Filter::Bleach:
-    file: lib/PAR/Filter/Bleach.pm
-  PAR::Filter::Bytecode:
-    file: lib/PAR/Filter/Bytecode.pm
-  PAR::Filter::Obfuscate:
-    file: lib/PAR/Filter/Obfuscate.pm
-  PAR::Filter::PatchContent:
-    file: lib/PAR/Filter/PatchContent.pm
-  PAR::Filter::PodStrip:
-    file: lib/PAR/Filter/PodStrip.pm
-  PAR::Packer:
-    file: lib/PAR/Packer.pm
-    version: 1.005
-  PAR::StrippedPARL::Base:
-    file: lib/PAR/StrippedPARL/Base.pm
-    version: 0.975
-  PAR::StrippedPARL::Dynamic:
-    file: lib/PAR/StrippedPARL/Dynamic.pm
-    version: 0.958
-  PAR::StrippedPARL::Static:
-    file: lib/PAR/StrippedPARL/Static.pm
-    version: 0.958
-  pp:
-    file: lib/pp.pm
-    version: 0.992
 recommends:
   Digest: Module::Signature
 requires:
@@ -64,4 +32,4 @@
 resources:
   license: http://dev.perl.org/licenses/
   repository: http://svn.openfoundry.org/par/PAR-Packer/trunk
-version: 1.005
+version: 1.006

Modified: trunk/libpar-packer-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/Makefile.PL?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/Makefile.PL (original)
+++ trunk/libpar-packer-perl/Makefile.PL Mon Jun 28 16:13:09 2010
@@ -37,9 +37,7 @@
             'Module::Signature';
 }
 
-test_requires       'IPC::Run3';
 include_deps        'Test::More';
-include_deps        'IPC::Run3';
 no_index            directory => 'contrib';
 auto_provides;
 

Modified: trunk/libpar-packer-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/debian/changelog?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/debian/changelog (original)
+++ trunk/libpar-packer-perl/debian/changelog Mon Jun 28 16:13:09 2010
@@ -1,3 +1,9 @@
+libpar-packer-perl (1.006-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- gregor herrmann <gregoa at debian.org>  Mon, 28 Jun 2010 18:11:26 +0200
+
 libpar-packer-perl (1.005-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libpar-packer-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/inc/Module/Install.pm?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/inc/Module/Install.pm (original)
+++ trunk/libpar-packer-perl/inc/Module/Install.pm Mon Jun 28 16:13:09 2010
@@ -31,7 +31,7 @@
 	# This is not enforced yet, but will be some time in the next few
 	# releases once we can make sure it won't clash with custom
 	# Module::Install extensions.
-	$VERSION = '0.99';
+	$VERSION = '1.00';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -230,8 +230,12 @@
 sub new {
 	my ($class, %args) = @_;
 
-    delete $INC{'FindBin.pm'};
-    require FindBin;
+	delete $INC{'FindBin.pm'};
+	{
+		# to suppress the redefine warning
+		local $SIG{__WARN__} = sub {};
+		require FindBin;
+	}
 
 	# ignore the prefix on extension modules built from top level.
 	my $base_path = Cwd::abs_path($FindBin::Bin);

Modified: trunk/libpar-packer-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/inc/Module/Install/Base.pm?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libpar-packer-perl/inc/Module/Install/Base.pm Mon Jun 28 16:13:09 2010
@@ -4,7 +4,7 @@
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '0.99';
+	$VERSION = '1.00';
 }
 
 # Suspend handler for "redefined" warnings

Modified: trunk/libpar-packer-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/inc/Module/Install/Can.pm?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libpar-packer-perl/inc/Module/Install/Can.pm Mon Jun 28 16:13:09 2010
@@ -9,7 +9,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.99';
+	$VERSION = '1.00';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: trunk/libpar-packer-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/inc/Module/Install/Fetch.pm?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libpar-packer-perl/inc/Module/Install/Fetch.pm Mon Jun 28 16:13:09 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.99';
+	$VERSION = '1.00';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: trunk/libpar-packer-perl/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/inc/Module/Install/Include.pm?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/inc/Module/Install/Include.pm (original)
+++ trunk/libpar-packer-perl/inc/Module/Install/Include.pm Mon Jun 28 16:13:09 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.99';
+	$VERSION = '1.00';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: trunk/libpar-packer-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/inc/Module/Install/Makefile.pm?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libpar-packer-perl/inc/Module/Install/Makefile.pm Mon Jun 28 16:13:09 2010
@@ -8,7 +8,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.99';
+	$VERSION = '1.00';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: trunk/libpar-packer-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/inc/Module/Install/Metadata.pm?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libpar-packer-perl/inc/Module/Install/Metadata.pm Mon Jun 28 16:13:09 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.99';
+	$VERSION = '1.00';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: trunk/libpar-packer-perl/inc/Module/Install/PAR.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/inc/Module/Install/PAR.pm?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/inc/Module/Install/PAR.pm (original)
+++ trunk/libpar-packer-perl/inc/Module/Install/PAR.pm Mon Jun 28 16:13:09 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.99';
+	$VERSION = '1.00';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: trunk/libpar-packer-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/inc/Module/Install/Win32.pm?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libpar-packer-perl/inc/Module/Install/Win32.pm Mon Jun 28 16:13:09 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.99';
+	$VERSION = '1.00';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: trunk/libpar-packer-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/inc/Module/Install/WriteAll.pm?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libpar-packer-perl/inc/Module/Install/WriteAll.pm Mon Jun 28 16:13:09 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.99';
+	$VERSION = '1.00';
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }

Modified: trunk/libpar-packer-perl/lib/PAR/Packer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/lib/PAR/Packer.pm?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/lib/PAR/Packer.pm (original)
+++ trunk/libpar-packer-perl/lib/PAR/Packer.pm Mon Jun 28 16:13:09 2010
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '1.005';
+our $VERSION = '1.006';
 
 =head1 NAME
 

Modified: trunk/libpar-packer-perl/myldr/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/myldr/Makefile.PL?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/myldr/Makefile.PL (original)
+++ trunk/libpar-packer-perl/myldr/Makefile.PL Mon Jun 28 16:13:09 2010
@@ -242,24 +242,19 @@
 NOOP=\$(PERL) -e1
 
 OBJECTS=main$o my_par_pl$o $res
+MKTMP_STUFF=mktmpdir.c mktmpdir.h utils.c sha1.c
 
 .c$o:
 	\$(CC) -c \$(CFLAGS) \$(OPTIMIZE) \$<
 
 all: $all
 
-main$o: main.c perlxsi.c mktmpdir.c internals.c mktmpdir.h utils.c sha1.c
-
-main.c: perlxsi.c mktmpdir.c internals.c
-
-mktmpdir.c: mktmpdir.h
-
-mktmpdir.h: utils.c sha1.c
+main$o: main.c perlxsi.c internals.c \$(MKTMP_STUFF)
 
 clean:
 	-\$(RM) my_*.c
 	-\$(RM) main$o my_par_pl$o static$o
-	-\$(RM) sha1$o sha1.c
+	-\$(RM) sha1.c
 	-\$(RM) *.opt *.pdb perlxsi.c
 	-\$(RM) usernamefrompwuid.h
 	\$(MV) Makefile Makefile.old
@@ -276,7 +271,7 @@
 	-\$(RM) $static_exe
 	-\$(RM) Makefile Makefile.old
 
-$par_exe: sha1$o \$(OBJECTS) my_par_pl$o
+$par_exe: \$(OBJECTS) my_par_pl$o
 	\$(LD) \$(OBJECTS) \$(PERL_LDFLAGS) $out$par_exe_link
 	$mt_cmd
 
@@ -312,9 +307,9 @@
 $parldyn_exe: $par_exe
 	\$(PERL) run_with_inc.pl $par_exe -I../blib/lib -q -B -O\$@
 
-static$o: mktmpdir.c $my_stuff
-
-$static_exe: sha1$o static$o
+static$o: \$(MKTMP_STUFF) $my_stuff
+
+$static_exe: static$o
 	\$(LD) static$o \$(STATIC_LDFLAGS) $res $out$static_exe_link
 	$mt_cmd
 	\$(PERL) parlsig.pl $static_exe $par_exe $dynperl $chunk_size

Modified: trunk/libpar-packer-perl/myldr/run_with_inc.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/myldr/run_with_inc.pl?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/myldr/run_with_inc.pl (original)
+++ trunk/libpar-packer-perl/myldr/run_with_inc.pl Mon Jun 28 16:13:09 2010
@@ -2,4 +2,4 @@
 # add -I options corresponding to @INC after the first element of @ARGV,
 # then execute it
 splice @ARGV, 1, 0, map { "-I$_" } @INC; 
-exec @ARGV;
+exit(system(@ARGV) == 0 ? 0 : 1);

Modified: trunk/libpar-packer-perl/t/30-current_exec.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpar-packer-perl/t/30-current_exec.t?rev=59905&op=diff
==============================================================================
--- trunk/libpar-packer-perl/t/30-current_exec.t (original)
+++ trunk/libpar-packer-perl/t/30-current_exec.t Mon Jun 28 16:13:09 2010
@@ -6,9 +6,11 @@
 use File::Path;
 use File::Basename;
 use FindBin;
-use IPC::Run3;  # to run a command that may have blanks etc in its path and catch its output
 
-use Test::More ( tests => 4 );
+use Test::More;
+plan skip_all => "Fails if run in a path that contains spaces" 
+    if $FindBin::Bin =~ / /;
+plan tests => 4;
 
 my $has_inline_c = eval "use Inline; 1;";
 # warn $@ if $@;
@@ -42,15 +44,13 @@
 
 ####
 $ENV{PAR_GLOBAL_TMPDIR} = $TEMP;
-my $out_full;
-run3 [ $EXEC ], undef, \$out_full;
+my $out_full = qx($EXEC);
 
 ok( ($out_full =~ /PAR_TEMP = \Q$TEMP\E/), "Respected PAR_GLOBAL_TMPDIR" );
 
 my( $file, $path ) = fileparse( $EXEC );
 
-my $out_path;
-{ local $ENV{PATH} = $path; run3 [ $file ], undef, \$out_path; }
+my $out_path = do { local $ENV{PATH} = $path; qx($file); };
 
 is( $out_path, $out_full, "Found the same file via PATH and full path" );
 
@@ -98,6 +98,7 @@
 rmtree( [$TEMP] );
 #mkpath( [$TEMP], 0, 0700 );
 
+
 1;
 
 __END__


