diff --git a/perl-update-Archive-Extract.patch b/perl-update-Archive-Extract.patch
deleted file mode 100644
index fae8ed9..0000000
--- a/perl-update-Archive-Extract.patch
+++ /dev/null
@@ -1,978 +0,0 @@
-Archive-Extract-0.30
-
-diff -urN perl-5.10.0.orig/lib/Archive/Extract/t/01_Archive-Extract.t perl-5.10.0/lib/Archive/Extract/t/01_Archive-Extract.t
---- perl-5.10.0.orig/lib/Archive/Extract/t/01_Archive-Extract.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Extract/t/01_Archive-Extract.t	2009-03-10 12:31:09.000000000 +0100
-@@ -58,6 +58,7 @@
- $Archive::Extract::VERBOSE  = $Archive::Extract::VERBOSE = $Debug;
- $Archive::Extract::WARN     = $Archive::Extract::WARN    = $Debug ? 1 : 0;
- 
-+
- my $tmpl = {
-     ### plain files
-     'x.bz2' => {    programs    => [qw[bunzip2]],
-@@ -105,6 +106,11 @@
-                     method      => 'is_zip',
-                     outfile     => 'a',
-                 },                
-+    'x.lzma' => {   programs    => [qw[unlzma]],
-+                    modules     => [qw[Compress::unLZMA]],
-+                    method      => 'is_lzma',
-+                    outfile     => 'a',
-+                },
-     ### with a directory
-     'y.tbz'     => {    programs    => [qw[bunzip2 tar]],
-                         modules     => [qw[Archive::Tar 
-@@ -201,8 +207,53 @@
-         ok( $obj,               "   Object created based on '$type'" );
-         ok( !$obj->error,       "       No error logged" );
-     }
-+    
-+    ### test unknown type
-+    {   ### must turn on warnings to catch error here
-+        local $Archive::Extract::WARN = 1;
-+        
-+        my $warnings;
-+        local $SIG{__WARN__} = sub { $warnings .= "@_" };
-+        
-+        my $ae = $Class->new( archive => $Me );
-+        ok( !$ae,               "   No archive created based on '$Me'" );
-+        ok( !$Class->error,     "       Error not captured in class method" );
-+        ok( $warnings,          "       Error captured as warning" );
-+        like( $warnings, qr/Cannot determine file type for/,
-+                                "           Error is: unknown file type" );
-+    }                                
- }    
- 
-+### test multiple errors
-+### XXX whitebox test
-+{   ### grab a random file from the template, so we can make an object
-+    my $ae = Archive::Extract->new( 
-+                archive =>  File::Spec->catfile($SrcDir,[keys %$tmpl]->[0]) 
-+             );
-+    ok( $ae,                    "Archive created" );
-+    ok( not($ae->error),        "   No errors yet" );
-+
-+    ### log a few errors
-+    {   local $Archive::Extract::WARN = 0;
-+        $ae->_error( $_ ) for 1..5;
-+    }
-+
-+    my $err = $ae->error;
-+    ok( $err,                   "   Errors retrieved" );
-+    
-+    my $expect = join $/, 1..5;
-+    is( $err, $expect,          "       As expected" );
-+
-+    ### this resets the errors
-+    ### override the 'check' routine to return false, so we bail out of 
-+    ### extract() early and just run the error reset code;
-+    {   no warnings qw[once redefine];
-+        local *Archive::Extract::check = sub { return }; 
-+        $ae->extract;
-+    }
-+    ok( not($ae->error),        "   Errors erased after ->extract() call" );
-+}
-+
- ### XXX whitebox test
- ### test __get_extract_dir 
- SKIP: {   my $meth = '__get_extract_dir';
-@@ -237,15 +288,18 @@
-     }        
- }
- 
--for my $switch (0,1) {
-+### configuration to run in: allow perl or allow binaries
-+for my $switch ( [0,1], [1,0] ) {
-+    my $cfg = "PP: $switch->[0] Bin: $switch->[1]";
- 
--    local $Archive::Extract::PREFER_BIN = $switch;
--    diag("Running extract with PREFER_BIN = $Archive::Extract::PREFER_BIN")
--        if $Debug;
-+    local $Archive::Extract::_ALLOW_PURE_PERL   = $switch->[0];
-+    local $Archive::Extract::_ALLOW_BIN         = $switch->[1];
-+    
-+    diag("Running extract with configuration: $cfg") if $Debug;
- 
-     for my $archive (keys %$tmpl) {
- 
--        diag("Extracting $archive") if $Debug;
-+        diag("Extracting $archive in config $cfg") if $Debug;
- 
-         ### check first if we can do the proper
- 
-@@ -291,12 +345,14 @@
-         ### where to extract to -- try both dir and file for gz files
-         ### XXX test me!
-         #my @outs = $ae->is_gz ? ($abs_path, $OutDir) : ($OutDir);
--        my @outs = $ae->is_gz || $ae->is_bz2 || $ae->is_Z 
-+        my @outs = $ae->is_gz || $ae->is_bz2 || $ae->is_Z || $ae->is_lzma
-                         ? ($abs_path) 
-                         : ($OutDir);
- 
-         skip "No binaries or modules to extract ".$archive, 
--            (10 * scalar @outs) if $mod_fail && $pgm_fail;
-+            (10 * scalar @outs) if
-+            	($mod_fail && ($pgm_fail || !$Archive::Extract::_ALLOW_BIN)) ||
-+		($pgm_fail && ($mod_fail || !$Archive::Extract::_ALLOW_PURE_PERL));
- 
-         ### we dont warnings spewed about missing modules, that might
-         ### be a problem...
-@@ -307,7 +363,7 @@
- 
-             ### test buffers ###
-             my $turn_off = !$use_buffer && !$pgm_fail &&
--                            $Archive::Extract::PREFER_BIN;
-+                            $Archive::Extract::_ALLOW_BIN;
- 
-             ### whitebox test ###
-             ### stupid warnings ###
-@@ -325,20 +381,24 @@
-   
-                 my $rv = $ae->extract( to => $to );
-     
--                ok( $rv, "extract() for '$archive' reports success");
--    
--                diag("Extractor was: " . $ae->_extractor)   if $Debug;
--    
-                 SKIP: {
-                     my $re  = qr/^No buffer captured/;
-                     my $err = $ae->error || '';
-               
-                     ### skip buffer tests if we dont have buffers or
-                     ### explicitly turned them off
--                    skip "No buffers available", 7,
-+                    skip "No buffers available", 8
-                         if ( $turn_off || !IPC::Cmd->can_capture_buffer)
-                             && $err =~ $re;
- 
-+                    ### skip tests if we dont have an extractor
-+                    skip "No extractor available", 8 
-+                        if $err =~ /Extract failed; no extractors available/;
-+    
-+                    ok( $rv, "extract() for '$archive' reports success ($cfg)");
-+    
-+                    diag("Extractor was: " . $ae->_extractor)   if $Debug;
-+    
-                     ### if we /should/ have buffers, there should be
-                     ### no errors complaining we dont have them...
-                     unlike( $err, $re,
-@@ -346,10 +406,16 @@
-     
-                     ### might be 1 or 2, depending wether we extracted 
-                     ### a dir too
-+                    my $files    = $ae->files || [];
-                     my $file_cnt = grep { defined } $file, $dir;
--                    is( scalar @{ $ae->files || []}, $file_cnt,
-+                    is( scalar @$files, $file_cnt,
-                                     "Found correct number of output files" );
--                    is( $ae->files->[-1], $nix_path,
-+                    
-+                    ### due to prototypes on is(), if there's no -1 index on
-+                    ### the array ref, it'll give a fatal exception:
-+                    ### "Modification of non-creatable array value attempted,
-+                    ### subscript -1 at -e line 1." So wrap it in do { }
-+                    is( do { $files->[-1] }, $nix_path,
-                                     "Found correct output file '$nix_path'" );
-     
-                     ok( -e $abs_path,
-diff -urN perl-5.10.0.orig/lib/Archive/Extract/t/src/x.lzma.packed perl-5.10.0/lib/Archive/Extract/t/src/x.lzma.packed
---- perl-5.10.0.orig/lib/Archive/Extract/t/src/x.lzma.packed	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Extract/t/src/x.lzma.packed	2009-03-10 12:34:10.000000000 +0100
-@@ -0,0 +1,16 @@
-+#########################################################################
-+This is a binary file that was packed with the 'uupacktool.pl' which
-+is included in the Perl distribution.
-+
-+To unpack this file use the following command:
-+
-+     uupacktool.pl -u lib/Archive/Extract/t/src/x.lzma.packed lib/Archive/Extract/t/src/x.lzma
-+
-+To recreate it use the following command:
-+
-+     uupacktool.pl -p lib/Archive/Extract/t/src/x.lzma lib/Archive/Extract/t/src/x.lzma.packed
-+
-+Created at Tue Mar 10 12:34:10 2009
-+#########################################################################
-+__UU__
-+270``@```````````````````
-diff -urN perl-5.10.0.orig/lib/Archive/Extract.pm perl-5.10.0/lib/Archive/Extract.pm
---- perl-5.10.0.orig/lib/Archive/Extract.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Extract.pm	2009-03-10 12:30:20.000000000 +0100
-@@ -20,6 +20,10 @@
- ### VMS may require quoting upper case command options
- use constant ON_VMS         => $^O eq 'VMS' ? 1 : 0;
- 
-+### we can't use this extraction method, because of missing
-+### modules/binaries:
-+use constant METHOD_NA      => []; 
-+
- ### If these are changed, update @TYPES and the new() POD
- use constant TGZ            => 'tgz';
- use constant TAR            => 'tar';
-@@ -28,14 +32,21 @@
- use constant BZ2            => 'bz2';
- use constant TBZ            => 'tbz';
- use constant Z              => 'Z';
-+use constant LZMA           => 'lzma';
- 
--use vars qw[$VERSION $PREFER_BIN $PROGRAMS $WARN $DEBUG];
-+use vars qw[$VERSION $PREFER_BIN $PROGRAMS $WARN $DEBUG 
-+            $_ALLOW_BIN $_ALLOW_PURE_PERL
-+         ];
-+
-+$VERSION            = '0.30';
-+$PREFER_BIN         = 0;
-+$WARN               = 1;
-+$DEBUG              = 0;
-+$_ALLOW_PURE_PERL   = 1;    # allow pure perl extractors
-+$_ALLOW_BIN         = 1;    # allow binary extractors
- 
--$VERSION        = '0.24';
--$PREFER_BIN     = 0;
--$WARN           = 1;
--$DEBUG          = 0;
--my @Types       = ( TGZ, TAR, GZ, ZIP, BZ2, TBZ, Z ); # same as all constants
-+# same as all constants
-+my @Types           = ( TGZ, TAR, GZ, ZIP, BZ2, TBZ, Z, LZMA ); 
- 
- local $Params::Check::VERBOSE = $Params::Check::VERBOSE = 1;
- 
-@@ -75,6 +86,7 @@
-     $ae->is_zip;    # is it a .zip file?
-     $ae->is_bz2;    # is it a .bz2 file?
-     $ae->is_tbz;    # is it a .tar.bz2 or .tbz file?
-+    $ae->is_lzma;   # is it a .lzma file?
- 
-     ### absolute path to the archive you provided ###
-     $ae->archive;
-@@ -84,13 +96,14 @@
-     $ae->bin_gzip    # path to /bin/gzip, if found
-     $ae->bin_unzip   # path to /bin/unzip, if found
-     $ae->bin_bunzip2 # path to /bin/bunzip2 if found
-+    $ae->bin_unlzma  # path to /bin/unlzma if found
- 
- =head1 DESCRIPTION
- 
- Archive::Extract is a generic archive extraction mechanism.
- 
- It allows you to extract any archive file of the type .tar, .tar.gz,
--.gz, .Z, tar.bz2, .tbz, .bz2 or .zip without having to worry how it 
-+.gz, .Z, tar.bz2, .tbz, .bz2, .zip or .lzma without having to worry how it 
- does so, or use different interfaces for each type by using either 
- perl modules, or commandline tools on your system.
- 
-@@ -101,31 +114,35 @@
- 
- ### see what /bin/programs are available ###
- $PROGRAMS = {};
--for my $pgm (qw[tar unzip gzip bunzip2 uncompress]) {
-+for my $pgm (qw[tar unzip gzip bunzip2 uncompress unlzma]) {
-     $PROGRAMS->{$pgm} = can_run($pgm);
- }
- 
- ### mapping from types to extractor methods ###
--my $Mapping = {
--    is_tgz  => '_untar',
--    is_tar  => '_untar',
--    is_gz   => '_gunzip',
--    is_zip  => '_unzip',
--    is_tbz  => '_untar',
--    is_bz2  => '_bunzip2',
--    is_Z    => '_uncompress',
-+my $Mapping = {  # binary program           # pure perl module
-+    is_tgz  => { bin => '_untar_bin',       pp => '_untar_at'   },
-+    is_tar  => { bin => '_untar_bin',       pp => '_untar_at'   },
-+    is_gz   => { bin => '_gunzip_bin',      pp => '_gunzip_cz'  },
-+    is_zip  => { bin => '_unzip_bin',       pp => '_unzip_az'   },
-+    is_tbz  => { bin => '_untar_bin',       pp => '_untar_at'   },
-+    is_bz2  => { bin => '_bunzip2_bin',     pp => '_bunzip2_bz2'},
-+    is_Z    => { bin => '_uncompress_bin',  pp => '_gunzip_cz'  },
-+    is_lzma => { bin => '_unlzma_bin',      pp => '_unlzma_cz'  },
- };
- 
--{
-+{   ### use subs so we re-generate array refs etc for the no-overide flags
-+    ### if we don't, then we reuse the same arrayref, meaning objects store
-+    ### previous errors
-     my $tmpl = {
--        archive => { required => 1, allow => FILE_EXISTS },
--        type    => { default => '', allow => [ @Types ] },
-+        archive         => sub { { required => 1, allow => FILE_EXISTS }    },
-+        type            => sub { { default => '', allow => [ @Types ] }     },
-+        _error_msg      => sub { { no_override => 1, default => [] }        },
-+        _error_msg_long => sub { { no_override => 1, default => [] }        },
-     };
- 
-     ### build accesssors ###
-     for my $method( keys %$tmpl, 
-                     qw[_extractor _gunzip_to files extract_path],
--                    qw[_error_msg _error_msg_long]
-     ) {
-         no strict 'refs';
-         *$method = sub {
-@@ -183,6 +200,11 @@
- Bzip2 compressed tar file, as produced by, for exmample C</bin/tar -j>.
- Corresponds to a C<.tbz> or C<.tar.bz2> suffix.
- 
-+=item lzma
-+
-+Lzma compressed file, as produced by C</bin/lzma>.
-+Corresponds to a C<.lzma> suffix.
-+
- =back
- 
- Returns a C<Archive::Extract> object on success, or false on failure.
-@@ -193,8 +215,12 @@
-     sub new {
-         my $class   = shift;
-         my %hash    = @_;
-+        
-+        ### see above why we use subs here and generate the template;
-+        ### it's basically to not re-use arrayrefs
-+        my %utmpl   = map { $_ => $tmpl->{$_}->() } keys %$tmpl;
- 
--        my $parsed = check( $tmpl, \%hash ) or return;
-+        my $parsed = check( \%utmpl, \%hash ) or return;
- 
-         ### make sure we have an absolute path ###
-         my $ar = $parsed->{archive} = File::Spec->rel2abs( $parsed->{archive} );
-@@ -209,15 +235,18 @@
-                 $ar =~ /.+?\.(?:tbz2?|tar\.bz2?)$/i ? TBZ   :
-                 $ar =~ /.+?\.bz2$/i                 ? BZ2   :
-                 $ar =~ /.+?\.Z$/                    ? Z     :
-+                $ar =~ /.+?\.lzma$/                 ? LZMA  :
-                 '';
- 
-         }
- 
--        ### don't know what type of file it is ###
--        return __PACKAGE__->_error(loc("Cannot determine file type for '%1'",
--                                $parsed->{archive} )) unless $parsed->{type};
-+        bless $parsed, $class;
- 
--        return bless $parsed, $class;
-+        ### don't know what type of file it is 
-+        ### XXX this *has* to be an object call, not a package call
-+        return $parsed->_error(loc("Cannot determine file type for '%1'",
-+                                $parsed->{archive} )) unless $parsed->{type};
-+        return $parsed;
-     }
- }
- 
-@@ -229,11 +258,11 @@
- 
- Since C<.gz> files never hold a directory, but only a single file; if 
- the C<to> argument is an existing directory, the file is extracted 
--there, with it's C<.gz> suffix stripped. 
-+there, with its C<.gz> suffix stripped. 
- If the C<to> argument is not an existing directory, the C<to> argument 
- is understood to be a filename, if the archive type is C<gz>. 
- In the case that you did not specify a C<to> argument, the output
--file will be the name of the archive file, stripped from it's C<.gz>
-+file will be the name of the archive file, stripped from its C<.gz>
- suffix, in the current working directory.
- 
- C<extract> will try a pure perl solution first, and then fall back to
-@@ -269,6 +298,10 @@
-     my $self = shift;
-     my %hash = @_;
- 
-+    ### reset error messages
-+    $self->_error_msg( [] );
-+    $self->_error_msg_long( [] );
-+
-     my $to;
-     my $tmpl = {
-         to  => { default => '.', store => \$to }
-@@ -283,9 +316,9 @@
-     ### to.
-     my $dir;
-     {   ### a foo.gz file
--        if( $self->is_gz or $self->is_bz2 or $self->is_Z) {
-+        if( $self->is_gz or $self->is_bz2 or $self->is_Z or $self->is_lzma ) {
-     
--            my $cp = $self->archive; $cp =~ s/\.(?:gz|bz2?|Z)$//i;
-+            my $cp = $self->archive; $cp =~ s/\.(?:gz|bz2?|Z|lzma)$//i;
-         
-             ### to is a dir?
-             if ( -d $to ) {
-@@ -330,19 +363,50 @@
-         ### ../lib/Archive/Extract.pm line 742. (rt #19815)
-         $self->files( [] );
- 
--        ### find what extractor method to use ###
--        while( my($type,$method) = each %$Mapping ) {
-+        ### find out the dispatch methods needed for this type of 
-+        ### archive. Do a $self->is_XXX to figure out the type, then
-+        ### get the hashref with bin + pure perl dispatchers.
-+        my ($map) = map { $Mapping->{$_} } grep { $self->$_ } keys %$Mapping;
-+
-+        ### add pure perl extractor if allowed & add bin extractor if allowed
-+        my @methods;
-+        push @methods, $map->{'pp'}  if $_ALLOW_PURE_PERL;
-+        push @methods, $map->{'bin'} if $_ALLOW_BIN;
-+        
-+        ### reverse it if we prefer bin extractors
-+        @methods = reverse @methods if $PREFER_BIN;
- 
--            ### call the corresponding method if the type is OK ###
--            if( $self->$type) {
--                $ok = $self->$method();
--            }
-+        my($na, $fail);
-+        for my $method (@methods) {
-+            print "# Extracting with ->$method\n" if $DEBUG;
-+        
-+            my $rv = $self->$method;
-+            
-+            ### a positive extraction
-+            if( $rv and $rv ne METHOD_NA ) {
-+                print "# Extraction succeeded\n" if $DEBUG;
-+                $self->_extractor($method);
-+                last;
-+            
-+            ### method is not available
-+            } elsif ( $rv and $rv eq METHOD_NA ) {               
-+                print "# Extraction method not available\n" if $DEBUG;
-+                $na++;                
-+            } else {
-+                print "# Extraction method failed\n" if $DEBUG;
-+                $fail++;
-+            }                
-         }
- 
--        ### warn something went wrong if we didn't get an OK ###
--        $self->_error(loc("Extract failed, no extractor found"))
--            unless $ok;
--
-+        ### warn something went wrong if we didn't get an extractor
-+        unless( $self->_extractor ) {
-+            my $diag = $fail ? loc("Extract failed due to errors") :
-+                       $na   ? loc("Extract failed; no extractors available") :
-+                       '';
-+                       
-+            $self->_error($diag);
-+            $ok = 0;
-+        }                   
-     }
- 
-     ### and chdir back ###
-@@ -418,6 +482,11 @@
- Returns true if the file is of type C<.zip>.
- See the C<new()> method for details.
- 
-+=head2 $ae->is_lzma
-+
-+Returns true if the file is of type C<.lzma>.
-+See the C<new()> method for details.
-+
- =cut
- 
- ### quick check methods ###
-@@ -428,6 +497,7 @@
- sub is_tbz  { return $_[0]->type eq TBZ }
- sub is_bz2  { return $_[0]->type eq BZ2 }
- sub is_Z    { return $_[0]->type eq Z   }
-+sub is_lzma { return $_[0]->type eq LZMA }
- 
- =pod
- 
-@@ -443,6 +513,10 @@
- 
- Returns the full path to your unzip binary, if found
- 
-+=head2 $ae->bin_unlzma
-+
-+Returns the full path to your unlzma binary, if found
-+
- =cut
- 
- ### paths to commandline tools ###
-@@ -452,6 +526,8 @@
- sub bin_bunzip2     { return $PROGRAMS->{'bunzip2'} if $PROGRAMS->{'bunzip2'} }
- sub bin_uncompress  { return $PROGRAMS->{'uncompress'} 
-                                                  if $PROGRAMS->{'uncompress'} }
-+sub bin_unlzma      { return $PROGRAMS->{'unlzma'}  if $PROGRAMS->{'unlzma'} }
-+
- =head2 $bool = $ae->have_old_bunzip2
- 
- Older versions of C</bin/bunzip2>, from before the C<bunzip2 1.0> release,
-@@ -478,8 +554,16 @@
-     ### $ echo $?
-     ### 1
-     ### HATEFUL!
-+    
-+    ### double hateful: bunzip2 --version also hangs if input is a pipe
-+    ### See #32370: Archive::Extract will hang if stdin is a pipe [+PATCH]
-+    ### So, we have to provide *another* argument which is a fake filename,
-+    ### just so it wont try to read from stdin to print its version..
-+    ### *sigh*
-+    ### Even if the file exists, it won't clobber or change it.
-     my $buffer;
--    scalar run( command => [$self->bin_bunzip2, '--version'],
-+    scalar run( 
-+         command => [$self->bin_bunzip2, '--version', 'NoSuchFile'],
-          verbose => 0,
-          buffer  => \$buffer
-     );
-@@ -500,43 +584,31 @@
- #################################
- 
- 
--### untar wrapper... goes to either Archive::Tar or /bin/tar
--### depending on $PREFER_BIN
--sub _untar {
--    my $self = shift;
--
--    ### bzip2 support in A::T via IO::Uncompress::Bzip2
--    my   @methods = qw[_untar_at _untar_bin];
--         @methods = reverse @methods if $PREFER_BIN;
--
--    for my $method (@methods) {
--        $self->_extractor($method) && return 1 if $self->$method();
--    }
--
--    return $self->_error(loc("Unable to untar file '%1'", $self->archive));
--}
--
- ### use /bin/tar to extract ###
- sub _untar_bin {
-     my $self = shift;
- 
-     ### check for /bin/tar ###
--    return $self->_error(loc("No '%1' program found", '/bin/tar'))
--        unless $self->bin_tar;
--
-     ### check for /bin/gzip if we need it ###
--    return $self->_error(loc("No '%1' program found", '/bin/gzip'))
--        if $self->is_tgz && !$self->bin_gzip;
--
--    return $self->_error(loc("No '%1' program found", '/bin/bunzip2'))
--        if $self->is_tbz && !$self->bin_bunzip2;
-+    ### if any of the binaries are not available, return NA
-+    {   my $diag =  not $self->bin_tar ? 
-+                        loc("No '%1' program found", '/bin/tar') :
-+                    $self->is_tgz && !$self->bin_gzip ? 
-+                        loc("No '%1' program found", '/bin/gzip') :
-+                    $self->is_tbz && !$self->bin_bunzip2 ?
-+                        loc("No '%1' program found", '/bin/bunzip2') :
-+                    '';
-+                    
-+        if( $diag ) {
-+            $self->_error( $diag );
-+            return METHOD_NA;
-+        }
-+    }        
- 
-     ### XXX figure out how to make IPC::Run do this in one call --
-     ### currently i don't know how to get output of a command after a pipe
-     ### trapped in a scalar. Mailed barries about this 5th of june 2004.
- 
--
--
-     ### see what command we should run, based on whether
-     ### it's a .tgz or .tar
- 
-@@ -620,14 +692,25 @@
- sub _untar_at {
-     my $self = shift;
- 
--    ### we definitely need A::T, so load that first
-+    ### Loading Archive::Tar is going to set it to 1, so make it local
-+    ### within this block, starting with its initial value. Whatever
-+    ### Achive::Tar does will be undone when we return.
-+    ###
-+    ### Also, later, set $Archive::Tar::WARN to $Archive::Extract::WARN
-+    ### so users don't have to even think about this variable. If they
-+    ### do, they still get their set value outside of this call.
-+    local $Archive::Tar::WARN = $Archive::Tar::WARN;
-+   
-+    ### we definitely need Archive::Tar, so load that first
-     {   my $use_list = { 'Archive::Tar' => '0.0' };
- 
-         unless( can_load( modules => $use_list ) ) {
- 
--            return $self->_error(loc("You do not have '%1' installed - " .
--                                 "Please install it as soon as possible.",
--                                 'Archive::Tar'));
-+            $self->_error(loc("You do not have '%1' installed - " .
-+                              "Please install it as soon as possible.",
-+                              'Archive::Tar'));
-+    
-+            return METHOD_NA;
-         }
-     }
- 
-@@ -644,18 +727,24 @@
-         unless( can_load( modules => $use_list ) ) {
-             my $which = join '/', sort keys %$use_list;
- 
--            return $self->_error(loc(
--                                "You do not have '%1' installed - Please ".
--                                "install it as soon as possible.", $which));
--
-+            $self->_error(loc(
-+                "You do not have '%1' installed - Please ".
-+                "install it as soon as possible.", $which)
-+            );
-+            
-+            return METHOD_NA;
-         }
-+
-     } elsif ( $self->is_tbz ) {
-         my $use_list = { 'IO::Uncompress::Bunzip2' => '0.0' };
-         unless( can_load( modules => $use_list ) ) {
--            return $self->_error(loc(
--                    "You do not have '%1' installed - Please " .
--                    "install it as soon as possible.", 
--                     'IO::Uncompress::Bunzip2'));
-+            $self->_error(loc(
-+                "You do not have '%1' installed - Please " .
-+                "install it as soon as possible.", 
-+                'IO::Uncompress::Bunzip2')
-+            );
-+            
-+            return METHOD_NA;
-         }
- 
-         my $bz = IO::Uncompress::Bunzip2->new( $self->archive ) or
-@@ -666,6 +755,10 @@
-         $fh_to_read = $bz;
-     }
- 
-+    ### $Archive::Tar::WARN is 1 by default in Archive::Tar, but we've
-+    ### localized $Archive::Tar::WARN already.
-+    $Archive::Tar::WARN = $Archive::Extract::WARN;
-+
-     my $tar = Archive::Tar->new();
- 
-     ### only tell it it's compressed if it's a .tgz, as we give it a file
-@@ -684,8 +777,8 @@
-         *Archive::Tar::chown = sub {};
-     }
- 
--    ### for version of archive::tar > 1.04
--    local $Archive::Tar::Constant::CHOWN = 0;
-+    ### for version of Archive::Tar > 1.04
-+    local $Archive::Tar::CHOWN = 0;
- 
-     {   local $^W;  # quell 'splice() offset past end of array' warnings
-                     # on older versions of A::T
-@@ -720,28 +813,14 @@
- #
- #################################
- 
--### gunzip wrapper... goes to either Compress::Zlib or /bin/gzip
--### depending on $PREFER_BIN
--sub _gunzip {
--    my $self = shift;
--
--    my @methods = qw[_gunzip_cz _gunzip_bin];
--       @methods = reverse @methods if $PREFER_BIN;
--
--    for my $method (@methods) {
--        $self->_extractor($method) && return 1 if $self->$method();
--    }
--
--    return $self->_error(loc("Unable to gunzip file '%1'", $self->archive));
--}
--
- sub _gunzip_bin {
-     my $self = shift;
- 
-     ### check for /bin/gzip -- we need it ###
--    return $self->_error(loc("No '%1' program found", '/bin/gzip'))
--        unless $self->bin_gzip;
--
-+    unless( $self->bin_gzip ) {
-+        $self->_error(loc("No '%1' program found", '/bin/gzip'));
-+        return METHOD_NA;
-+    }
- 
-     my $fh = FileHandle->new('>'. $self->_gunzip_to) or
-         return $self->_error(loc("Could not open '%1' for writing: %2",
-@@ -779,8 +858,9 @@
- 
-     my $use_list = { 'Compress::Zlib' => '0.0' };
-     unless( can_load( modules => $use_list ) ) {
--        return $self->_error(loc("You do not have '%1' installed - Please " .
--                        "install it as soon as possible.", 'Compress::Zlib'));
-+        $self->_error(loc("You do not have '%1' installed - Please " .
-+                    "install it as soon as possible.", 'Compress::Zlib'));
-+        return METHOD_NA;
-     }
- 
-     my $gz = Compress::Zlib::gzopen( $self->archive, "rb" ) or
-@@ -808,29 +888,14 @@
- #
- #################################
- 
--
--### untar wrapper... goes to either Archive::Tar or /bin/tar
--### depending on $PREFER_BIN
--sub _uncompress {
--    my $self = shift;
--
--    my   @methods = qw[_gunzip_cz _uncompress_bin];
--         @methods = reverse @methods if $PREFER_BIN;
--
--    for my $method (@methods) {
--        $self->_extractor($method) && return 1 if $self->$method();
--    }
--
--    return $self->_error(loc("Unable to untar file '%1'", $self->archive));
--}
--
- sub _uncompress_bin {
-     my $self = shift;
- 
-     ### check for /bin/gzip -- we need it ###
--    return $self->_error(loc("No '%1' program found", '/bin/uncompress'))
--        unless $self->bin_uncompress;
--
-+    unless( $self->bin_uncompress ) {
-+        $self->_error(loc("No '%1' program found", '/bin/uncompress'));
-+        return METHOD_NA;
-+    }
- 
-     my $fh = FileHandle->new('>'. $self->_gunzip_to) or
-         return $self->_error(loc("Could not open '%1' for writing: %2",
-@@ -870,28 +935,15 @@
- #
- #################################
- 
--### unzip wrapper... goes to either Archive::Zip or /bin/unzip
--### depending on $PREFER_BIN
--sub _unzip {
--    my $self = shift;
--
--    my @methods = qw[_unzip_az _unzip_bin];
--       @methods = reverse @methods if $PREFER_BIN;
--
--    for my $method (@methods) {
--        $self->_extractor($method) && return 1 if $self->$method();
--    }
--
--    return $self->_error(loc("Unable to gunzip file '%1'", $self->archive));
--}
- 
- sub _unzip_bin {
-     my $self = shift;
- 
-     ### check for /bin/gzip if we need it ###
--    return $self->_error(loc("No '%1' program found", '/bin/unzip'))
--        unless $self->bin_unzip;
--
-+    unless( $self->bin_unzip ) {
-+        $self->_error(loc("No '%1' program found", '/bin/unzip'));
-+        return METHOD_NA;
-+    }        
- 
-     ### first, get the files.. it must be 2 different commands with 'unzip' :(
-     {   ### on VMS, capital letter options have to be quoted. This is
-@@ -946,8 +998,9 @@
- 
-     my $use_list = { 'Archive::Zip' => '0.0' };
-     unless( can_load( modules => $use_list ) ) {
--        return $self->_error(loc("You do not have '%1' installed - Please " .
--                        "install it as soon as possible.", 'Archive::Zip'));
-+        $self->_error(loc("You do not have '%1' installed - Please " .
-+                      "install it as soon as possible.", 'Archive::Zip'));
-+        return METHOD_NA;                      
-     }
- 
-     my $zip = Archive::Zip->new();
-@@ -1023,27 +1076,14 @@
- #
- #################################
- 
--### bunzip2 wrapper... 
--sub _bunzip2 {
--    my $self = shift;
--
--    my @methods = qw[_bunzip2_cz2 _bunzip2_bin];
--       @methods = reverse @methods if $PREFER_BIN;
--
--    for my $method (@methods) {
--        $self->_extractor($method) && return 1 if $self->$method();
--    }
--
--    return $self->_error(loc("Unable to bunzip2 file '%1'", $self->archive));
--}
--
- sub _bunzip2_bin {
-     my $self = shift;
- 
-     ### check for /bin/gzip -- we need it ###
--    return $self->_error(loc("No '%1' program found", '/bin/bunzip2'))
--        unless $self->bin_bunzip2;
--
-+    unless( $self->bin_bunzip2 ) {
-+        $self->_error(loc("No '%1' program found", '/bin/bunzip2'));
-+        return METHOD_NA;
-+    }        
- 
-     my $fh = FileHandle->new('>'. $self->_gunzip_to) or
-         return $self->_error(loc("Could not open '%1' for writing: %2",
-@@ -1116,14 +1156,15 @@
- #     return 1;
- # }
- 
--sub _bunzip2_cz2 {
-+sub _bunzip2_bz2 {
-     my $self = shift;
- 
-     my $use_list = { 'IO::Uncompress::Bunzip2' => '0.0' };
-     unless( can_load( modules => $use_list ) ) {
--        return $self->_error(loc("You do not have '%1' installed - Please " .
--                        "install it as soon as possible.",
--                        'IO::Uncompress::Bunzip2'));
-+        $self->_error(loc("You do not have '%1' installed - Please " .
-+                          "install it as soon as possible.",
-+                          'IO::Uncompress::Bunzip2'));
-+        return METHOD_NA;                          
-     }
- 
-     IO::Uncompress::Bunzip2::bunzip2($self->archive => $self->_gunzip_to)
-@@ -1141,6 +1182,84 @@
- 
- #################################
- #
-+# unlzma code
-+#
-+#################################
-+
-+sub _unlzma_bin {
-+    my $self = shift;
-+
-+    ### check for /bin/unlzma -- we need it ###
-+    unless( $self->bin_unlzma ) {
-+        $self->_error(loc("No '%1' program found", '/bin/unlzma'));
-+        return METHOD_NA;
-+    }        
-+
-+    my $fh = FileHandle->new('>'. $self->_gunzip_to) or
-+        return $self->_error(loc("Could not open '%1' for writing: %2",
-+                            $self->_gunzip_to, $! ));
-+
-+    my $cmd = [ $self->bin_unlzma, '-c', $self->archive ];
-+
-+    my $buffer;
-+    unless( scalar run( command => $cmd,
-+                        verbose => $DEBUG,
-+                        buffer  => \$buffer )
-+    ) {
-+        return $self->_error(loc("Unable to unlzma '%1': %2",
-+                                    $self->archive, $buffer));
-+    }
-+
-+    ### no buffers available?
-+    if( !IPC::Cmd->can_capture_buffer and !$buffer ) {
-+        $self->_error( $self->_no_buffer_content( $self->archive ) );
-+    }
-+
-+    print $fh $buffer if defined $buffer;
-+
-+    close $fh;
-+
-+    ### set what files where extract, and where they went ###
-+    $self->files( [$self->_gunzip_to] );
-+    $self->extract_path( File::Spec->rel2abs(cwd()) );
-+
-+    return 1;
-+}
-+
-+sub _unlzma_cz {
-+    my $self = shift;
-+
-+    my $use_list = { 'Compress::unLZMA' => '0.0' };
-+    unless( can_load( modules => $use_list ) ) {
-+        $self->_error(loc("You do not have '%1' installed - Please " .
-+                    "install it as soon as possible.", 'Compress::unLZMA'));
-+        return METHOD_NA;                    
-+    }
-+
-+    my $fh = FileHandle->new('>'. $self->_gunzip_to) or
-+        return $self->_error(loc("Could not open '%1' for writing: %2",
-+                            $self->_gunzip_to, $! ));
-+
-+    my $buffer;
-+    $buffer = Compress::unLZMA::uncompressfile( $self->archive );
-+    unless ( defined $buffer ) {
-+        return $self->_error(loc("Could not unlzma '%1': %2",
-+                                    $self->archive, $@));
-+    }
-+
-+    print $fh $buffer if defined $buffer;
-+
-+    close $fh;
-+
-+    ### set what files where extract, and where they went ###
-+    $self->files( [$self->_gunzip_to] );
-+    $self->extract_path( File::Spec->rel2abs(cwd()) );
-+
-+    return 1;
-+}
-+
-+#################################
-+#
- # Error code
- #
- #################################
-@@ -1148,14 +1267,15 @@
- sub _error {
-     my $self    = shift;
-     my $error   = shift;
--    
--    $self->_error_msg( $error );
--    $self->_error_msg_long( Carp::longmess($error) );
-+    my $lerror  = Carp::longmess($error);
-+
-+    push @{$self->_error_msg},      $error;
-+    push @{$self->_error_msg_long}, $lerror;
-     
-     ### set $Archive::Extract::WARN to 0 to disable printing
-     ### of errors
-     if( $WARN ) {
--        carp $DEBUG ? $self->_error_msg_long : $self->_error_msg;
-+        carp $DEBUG ? $lerror : $error;
-     }
- 
-     return;
-@@ -1163,7 +1283,15 @@
- 
- sub error {
-     my $self = shift;
--    return shift() ? $self->_error_msg_long : $self->_error_msg;
-+
-+    ### make sure we have a fallback aref
-+    my $aref = do { 
-+        shift() 
-+            ? $self->_error_msg_long 
-+            : $self->_error_msg 
-+    } || [];
-+   
-+    return join $/, @$aref;
- }
- 
- sub _no_buffer_files {
-@@ -1208,7 +1336,7 @@
- 
- C<Archive::Extract> can use either pure perl modules or command line
- programs under the hood. Some of the pure perl modules (like 
--C<Archive::Tar> take the entire contents of the archive into memory,
-+C<Archive::Tar> and Compress::unLZMA) take the entire contents of the archive into memory,
- which may not be feasible on your system. Consider setting the global
- variable C<$Archive::Extract::PREFER_BIN> to C<1>, which will prefer
- the use of command line programs and won't consume so much memory.
---- perl-5.10.0.orig/MANIFEST	2009-02-20 18:22:32.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-03-10 15:16:45.000000000 +0100
-@@ -1390,6 +1390,7 @@
- lib/Archive/Extract/t/src/x.bz2.packed	Archive::Extract tests
- lib/Archive/Extract/t/src/x.gz.packed	Archive::Extract tests
- lib/Archive/Extract/t/src/x.jar.packed	Archive::Extract tests
-+lib/Archive/Extract/t/src/x.lzma.packed	Archive::Extract tests
- lib/Archive/Extract/t/src/x.par.packed	Archive::Extract tests
- lib/Archive/Extract/t/src/x.tar.gz.packed	Archive::Extract tests
- lib/Archive/Extract/t/src/x.tar.packed	Archive::Extract tests
diff --git a/perl-update-Archive-Tar.patch b/perl-update-Archive-Tar.patch
deleted file mode 100644
index fe0503f..0000000
--- a/perl-update-Archive-Tar.patch
+++ /dev/null
@@ -1,3202 +0,0 @@
-Archive-Tar-1.46
-
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2009-02-20 18:22:32.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-03-11 17:11:27.000000000 +0100
-@@ -1413,12 +1413,19 @@
- lib/Archive/Tar/t/02_methods.t	Archive::Tar tests
- lib/Archive/Tar/t/03_file.t	Archive::Tar tests
- lib/Archive/Tar/t/04_resolved_issues.t	Archive::Tar tests
-+lib/Archive/Tar/t/05_iter.t	Archive::Tar tests
-+lib/Archive/Tar/t/90_symlink.t	Archive::Tar tests
-+lib/Archive/Tar/t/src/linktest/linktest_missing_dir.tar.packed	Archive::Tar tests
-+lib/Archive/Tar/t/src/linktest/linktest_with_dir.tar.packed	Archive::Tar tests
- lib/Archive/Tar/t/src/long/b	Archive::Tar tests
- lib/Archive/Tar/t/src/long/bar.tar.packed	Archive::Tar tests
-+lib/Archive/Tar/t/src/long/foo.tbz.packed	Archive::Tar tests
- lib/Archive/Tar/t/src/long/foo.tgz.packed	Archive::Tar tests
- lib/Archive/Tar/t/src/short/b	Archive::Tar tests
- lib/Archive/Tar/t/src/short/bar.tar.packed	Archive::Tar tests
-+lib/Archive/Tar/t/src/short/foo.tbz.packed	Archive::Tar tests
- lib/Archive/Tar/t/src/short/foo.tgz.packed	Archive::Tar tests
-+lib/Archive/Tar/t/src/header/signed.tar.packed	Archive::Tar tests
- lib/assert.pl			assertion and panic with stack trace
- lib/Attribute/Handlers/Changes	Attribute::Handlers
- lib/Attribute/Handlers/demo/demo2.pl	Attribute::Handlers demo
-diff -urN perl-5.10.0.orig/lib/Archive/Tar/Constant.pm perl-5.10.0/lib/Archive/Tar/Constant.pm
---- perl-5.10.0.orig/lib/Archive/Tar/Constant.pm	2009-02-20 11:21:14.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/Constant.pm	2009-03-11 17:11:27.000000000 +0100
-@@ -2,20 +2,16 @@
- 
- BEGIN {
-     require Exporter;
--    $VERSION= '0.02';
--    @ISA    = qw[Exporter];
--    @EXPORT = qw[
--                FILE HARDLINK SYMLINK CHARDEV BLOCKDEV DIR FIFO SOCKET UNKNOWN
--                BUFFER HEAD READ_ONLY WRITE_ONLY UNPACK PACK TIME_OFFSET ZLIB
--                BLOCK_SIZE TAR_PAD TAR_END ON_UNIX BLOCK CAN_READLINK MAGIC 
--                TAR_VERSION UNAME GNAME CAN_CHOWN MODE CHECK_SUM UID GID 
--                GZIP_MAGIC_NUM MODE_READ LONGLINK LONGLINK_NAME PREFIX_LENGTH
--                LABEL NAME_LENGTH STRIP_MODE ON_VMS
--            ];
-+    
-+    $VERSION    = '0.02';
-+    @ISA        = qw[Exporter];
- 
-     require Time::Local if $^O eq "MacOS";
- }
- 
-+use Package::Constants;
-+@EXPORT = Package::Constants->list( __PACKAGE__ );
-+
- use constant FILE           => 0;
- use constant HARDLINK       => 1;
- use constant SYMLINK        => 2;
-@@ -32,6 +28,9 @@
- use constant HEAD           => 512;
- use constant BLOCK          => 512;
- 
-+use constant COMPRESS_GZIP  => 9;
-+use constant COMPRESS_BZIP  => 'bzip2';
-+
- use constant BLOCK_SIZE     => sub { my $n = int($_[0]/BLOCK); $n++ if $_[0] % BLOCK; $n * BLOCK };
- use constant TAR_PAD        => sub { my $x = shift || return; return "\0" x (BLOCK - ($x % BLOCK) ) };
- use constant TAR_END        => "\0" x BLOCK;
-@@ -61,16 +60,25 @@
- use constant MAGIC          => "ustar";
- use constant TAR_VERSION    => "00";
- use constant LONGLINK_NAME  => '././@LongLink';
-+use constant PAX_HEADER     => 'pax_global_header';
- 
--                            ### allow ZLIB to be turned off using ENV
--                            ### DEBUG only
-+                            ### allow ZLIB to be turned off using ENV: DEBUG only
- use constant ZLIB           => do { !$ENV{'PERL5_AT_NO_ZLIB'} and
-                                         eval { require IO::Zlib };
--                                    $ENV{'PERL5_AT_NO_ZLIB'} || $@ ? 0 : 1 };
--                                    
-+                                    $ENV{'PERL5_AT_NO_ZLIB'} || $@ ? 0 : 1 
-+                                };
-+
-+                            ### allow BZIP to be turned off using ENV: DEBUG only                                
-+use constant BZIP           => do { !$ENV{'PERL5_AT_NO_BZIP'} and
-+                                        eval { require IO::Uncompress::Bunzip2;
-+                                               require IO::Compress::Bzip2; };
-+                                    $ENV{'PERL5_AT_NO_BZIP'} || $@ ? 0 : 1 
-+                                };
-+
- use constant GZIP_MAGIC_NUM => qr/^(?:\037\213|\037\235)/;
-+use constant BZIP_MAGIC_NUM => qr/^BZh\d/;
- 
--use constant CAN_CHOWN      => do { ($> == 0 and $^O ne "MacOS" and $^O ne "MSWin32") };
-+use constant CAN_CHOWN      => sub { ($> == 0 and $^O ne "MacOS" and $^O ne "MSWin32") };
- use constant CAN_READLINK   => ($^O ne 'MSWin32' and $^O !~ /RISC(?:[ _])?OS/i and $^O ne 'VMS');
- use constant ON_UNIX        => ($^O ne 'MSWin32' and $^O ne 'MacOS' and $^O ne 'VMS');
- use constant ON_VMS         => $^O eq 'VMS'; 
-diff -urN perl-5.10.0.orig/lib/Archive/Tar/File.pm perl-5.10.0/lib/Archive/Tar/File.pm
---- perl-5.10.0.orig/lib/Archive/Tar/File.pm	2009-02-20 11:21:14.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/File.pm	2009-03-11 17:12:58.000000000 +0100
-@@ -1,15 +1,18 @@
- package Archive::Tar::File;
- use strict;
- 
-+use Carp                ();
- use IO::File;
- use File::Spec::Unix    ();
- use File::Spec          ();
- use File::Basename      ();
- 
-+### avoid circular use, so only require;
-+require Archive::Tar;
- use Archive::Tar::Constant;
- 
- use vars qw[@ISA $VERSION];
--@ISA        = qw[Archive::Tar];
-+#@ISA        = qw[Archive::Tar];
- $VERSION    = '0.02';
- 
- ### set value to 1 to oct() it during the unpack ###
-@@ -154,13 +157,13 @@
- 
- =head1 Methods
- 
--=head2 new( file => $path )
-+=head2 Archive::Tar::File->new( file => $path )
- 
- Returns a new Archive::Tar::File object from an existing file.
- 
- Returns undef on failure.
- 
--=head2 new( data => $path, $data, $opt )
-+=head2 Archive::Tar::File->new( data => $path, $data, $opt )
- 
- Returns a new Archive::Tar::File object from data.
- 
-@@ -171,7 +174,7 @@
- 
- Returns undef on failure.
- 
--=head2 new( chunk => $chunk )
-+=head2 Archive::Tar::File->new( chunk => $chunk )
- 
- Returns a new Archive::Tar::File object from a raw 512-byte tar
- archive chunk.
-@@ -266,6 +269,29 @@
-     my @items       = qw[mode uid gid size mtime];
-     my %hash        = map { shift(@items), $_ } (lstat $path)[2,4,5,7,9];
- 
-+    if (ON_VMS) {
-+        ### VMS has two UID modes, traditional and POSIX.  Normally POSIX is
-+        ### not used.  We currently do not have an easy way to see if we are in
-+        ### POSIX mode.  In traditional mode, the UID is actually the VMS UIC.
-+        ### The VMS UIC has the upper 16 bits is the GID, which in many cases
-+        ### the VMS UIC will be larger than 209715, the largest that TAR can
-+        ### handle.  So for now, assume it is traditional if the UID is larger
-+        ### than 0x10000.
-+
-+        if ($hash{uid} > 0x10000) {
-+            $hash{uid} = $hash{uid} & 0xFFFF;
-+        }
-+
-+        ### The file length from stat() is the physical length of the file
-+        ### However the amount of data read in may be more for some file types.
-+        ### Fixed length files are read past the logical EOF to end of the block
-+        ### containing.  Other file types get expanded on read because record
-+        ### delimiters are added.
-+
-+        my $data_len = length $data;
-+        $hash{size} = $data_len if $hash{size} < $data_len;
-+
-+    }
-     ### you *must* set size == 0 on symlinks, or the next entry will be
-     ### though of as the contents of the symlink, which is wrong.
-     ### this fixes bug #7937
-@@ -367,6 +393,9 @@
-     ### if it's a directory, then $file might be empty
-     $file = pop @dirs if $self->is_dir and not length $file;
- 
-+    ### splitting ../ gives you the relative path in native syntax
-+    map { $_ = '..' if $_  eq '-' } @dirs if ON_VMS;
-+
-     my $prefix = File::Spec::Unix->catdir(
-                         grep { length } $vol, @dirs
-                     );
-@@ -411,7 +440,25 @@
-     return 1;
- }
- 
--=head2 full_path
-+=head2 $bool = $file->extract( [ $alternative_name ] )
-+
-+Extract this object, optionally to an alternative name. 
-+
-+See C<< Archive::Tar->extract_file >> for details.
-+
-+Returns true on success and false on failure.
-+
-+=cut
-+
-+sub extract {
-+    my $self = shift;
-+    
-+    local $Carp::CarpLevel += 1;
-+    
-+    return Archive::Tar->_extract_file( $self, @_ );
-+}
-+
-+=head2 $path = $file->full_path
- 
- Returns the full path from the tar header; this is basically a
- concatenation of the C<prefix> and C<name> fields.
-@@ -429,7 +476,7 @@
- }
- 
- 
--=head2 validate
-+=head2 $bool = $file->validate
- 
- Done by Archive::Tar internally when reading the tar file:
- validate the header against the checksum to ensure integer tar file.
-@@ -445,10 +492,17 @@
- 
-     ### don't know why this one is different from the one we /write/ ###
-     substr ($raw, 148, 8) = "        ";
--	return unpack ("%16C*", $raw) == $self->chksum ? 1 : 0;
-+
-+    ### bug #43513: [PATCH] Accept wrong checksums from SunOS and HP-UX tar
-+    ### like GNU tar does. See here for details:
-+    ### http://www.gnu.org/software/tar/manual/tar.html#SEC139
-+    ### so we do both a signed AND unsigned validate. if one succeeds, that's
-+    ### good enough
-+	return (   (unpack ("%16C*", $raw) == $self->chksum)
-+	        or (unpack ("%16c*", $raw) == $self->chksum)) ? 1 : 0;
- }
- 
--=head2 has_content
-+=head2 $bool = $file->has_content
- 
- Returns a boolean to indicate whether the current object has content.
- Some special files like directories and so on never will have any
-@@ -462,7 +516,7 @@
-     return defined $self->data() && length $self->data() ? 1 : 0;
- }
- 
--=head2 get_content
-+=head2 $content = $file->get_content
- 
- Returns the current content for the in-memory file
- 
-@@ -473,7 +527,7 @@
-     $self->data( );
- }
- 
--=head2 get_content_by_ref
-+=head2 $cref = $file->get_content_by_ref
- 
- Returns the current content for the in-memory file as a scalar
- reference. Normal users won't need this, but it will save memory if
-@@ -489,7 +543,7 @@
-     return \$self->{data};
- }
- 
--=head2 replace_content( $content )
-+=head2 $bool = $file->replace_content( $content )
- 
- Replace the current content of the file with the new content. This
- only affects the in-memory archive, not the on-disk version until
-@@ -508,7 +562,7 @@
-     return 1;
- }
- 
--=head2 rename( $new_name )
-+=head2 $bool = $file->rename( $new_name )
- 
- Rename the current file to $new_name.
- 
-@@ -540,49 +594,49 @@
- 
- =over 4
- 
--=item is_file
-+=item $file->is_file
- 
- Returns true if the file is of type C<file>
- 
--=item is_dir
-+=item $file->is_dir
- 
- Returns true if the file is of type C<dir>
- 
--=item is_hardlink
-+=item $file->is_hardlink
- 
- Returns true if the file is of type C<hardlink>
- 
--=item is_symlink
-+=item $file->is_symlink
- 
- Returns true if the file is of type C<symlink>
- 
--=item is_chardev
-+=item $file->is_chardev
- 
- Returns true if the file is of type C<chardev>
- 
--=item is_blockdev
-+=item $file->is_blockdev
- 
- Returns true if the file is of type C<blockdev>
- 
--=item is_fifo
-+=item $file->is_fifo
- 
- Returns true if the file is of type C<fifo>
- 
--=item is_socket
-+=item $file->is_socket
- 
- Returns true if the file is of type C<socket>
- 
--=item is_longlink
-+=item $file->is_longlink
- 
- Returns true if the file is of type C<LongLink>.
- Should not happen after a successful C<read>.
- 
--=item is_label
-+=item $file->is_label
- 
- Returns true if the file is of type C<Label>.
- Should not happen after a successful C<read>.
- 
--=item is_unknown
-+=item $file->is_unknown
- 
- Returns true if the file type is C<unknown>
- 
-diff -urN perl-5.10.0.orig/lib/Archive/Tar/bin/ptar perl-5.10.0/lib/Archive/Tar/bin/ptar
---- perl-5.10.0.orig/lib/Archive/Tar/bin/ptar	2009-02-20 11:21:14.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/bin/ptar	2009-03-11 17:11:27.000000000 +0100
-@@ -1,12 +1,13 @@
- #!/usr/bin/perl
- use strict;
- 
-+use File::Find;
- use Getopt::Std;
- use Archive::Tar;
--use File::Find;
-+use Data::Dumper;
- 
- my $opts = {};
--getopts('dcvzthxf:I', $opts) or die usage();
-+getopts('Ddcvzthxf:I', $opts) or die usage();
- 
- ### show the help message ###
- die usage() if $opts->{h};
-@@ -33,72 +34,63 @@
-     find( sub { push @files, $File::Find::name;
-                 print $File::Find::name.$/ if $verbose }, @ARGV );
- 
--    Archive::Tar->create_archive( $file, $compress, @files );
--    exit;
--}
--
--my $tar = Archive::Tar->new($file, $compress);
-+    if ($file eq '-') {
-+        use IO::Handle;
-+        $file = IO::Handle->new();
-+        $file->fdopen(fileno(STDOUT),"w");
-+    }
- 
--if( $opts->{t} ) {
--    print map { $_->full_path . $/ } $tar->get_files;
-+    Archive::Tar->create_archive( $file, $compress, @files );
- 
--} elsif( $opts->{x} ) {
--    print map { $_->full_path . $/ } $tar->get_files
--        if $verbose;
--    Archive::Tar->extract_archive($file, $compress);
-+} else {
-+    if ($file eq '-') {
-+        use IO::Handle;
-+        $file = IO::Handle->new();
-+        $file->fdopen(fileno(STDIN),"r");
-+    }
-+
-+    ### print the files we're finding?
-+    my $print = $verbose || $opts->{'t'} || 0;
-+
-+    my $iter = Archive::Tar->iter( $file );
-+        
-+    while( my $f = $iter->() ) {
-+        print $f->full_path . $/ if $print;
-+
-+        ### data dumper output
-+        print Dumper( $f ) if $opts->{'D'};
-+        
-+        ### extract it
-+        $f->extract if $opts->{'x'};
-+    }
- }
- 
--
--
-+### pod & usage in one
- sub usage {
--    qq[
--Usage:  ptar -c [-v] [-z] [-f ARCHIVE_FILE] FILE FILE ...
--        ptar -x [-v] [-z] [-f ARCHIVE_FILE]
--        ptar -t [-z] [-f ARCHIVE_FILE]
--        ptar -h
--
--    ptar is a small, tar look-alike program that uses the perl module
--    Archive::Tar to extract, create and list tar archives.
--
--Options:
--    x   Extract from ARCHIVE_FILE
--    c   Create ARCHIVE_FILE from FILE
--    t   List the contents of ARCHIVE_FILE
--    f   Name of the ARCHIVE_FILE to use. Default is './default.tar'
--    z   Read/Write zlib compressed ARCHIVE_FILE (not always available)
--    v   Print filenames as they are added or extraced from ARCHIVE_FILE
--    h   Prints this help message
--    I   Enable 'Insecure Extract Mode', which allows archives to extract
--        files outside the current working directory. (Not advised).
--
--See Also:
--    tar(1)
--    Archive::Tar
--
--    \n]
--}
-+    my $usage .= << '=cut';
-+=pod
- 
- =head1 NAME
- 
--ptar - a tar-like program written in perl
-+    ptar - a tar-like program written in perl
- 
- =head1 DESCRIPTION
- 
--ptar is a small, tar look-alike program that uses the perl module
--Archive::Tar to extract, create and list tar archives.
-+    ptar is a small, tar look-alike program that uses the perl module
-+    Archive::Tar to extract, create and list tar archives.
- 
- =head1 SYNOPSIS
- 
--    ptar -c [-v] [-z] [-f ARCHIVE_FILE] FILE FILE ...
--    ptar -x [-v] [-z] [-f ARCHIVE_FILE]
--    ptar -t [-z] [-f ARCHIVE_FILE]
-+    ptar -c [-v] [-z] [-f ARCHIVE_FILE | -] FILE FILE ...
-+    ptar -x [-v] [-z] [-f ARCHIVE_FILE | -]
-+    ptar -t [-z] [-f ARCHIVE_FILE | -]
-     ptar -h
- 
- =head1 OPTIONS
- 
--    x   Extract from ARCHIVE_FILE
--    c   Create ARCHIVE_FILE from FILE
--    t   List the contents of ARCHIVE_FILE
-+    c   Create ARCHIVE_FILE or STDOUT (-) from FILE
-+    x   Extract from ARCHIVE_FILE or STDIN (-)
-+    t   List the contents of ARCHIVE_FILE or STDIN (-)
-     f   Name of the ARCHIVE_FILE to use. Default is './default.tar'
-     z   Read/Write zlib compressed ARCHIVE_FILE (not always available)
-     v   Print filenames as they are added or extraced from ARCHIVE_FILE
-@@ -106,6 +98,17 @@
- 
- =head1 SEE ALSO
- 
--tar(1), L<Archive::Tar>.
-+    tar(1), L<Archive::Tar>.
- 
- =cut
-+
-+    ### strip the pod directives
-+    $usage =~ s/=pod\n//g;
-+    $usage =~ s/=head1 //g;
-+    
-+    ### add some newlines
-+    $usage .= $/.$/;
-+    
-+    return $usage;
-+}
-+
-diff -urN perl-5.10.0.orig/lib/Archive/Tar/t/02_methods.t perl-5.10.0/lib/Archive/Tar/t/02_methods.t
---- perl-5.10.0.orig/lib/Archive/Tar/t/02_methods.t	2009-02-20 11:21:14.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/02_methods.t	2009-03-11 17:11:27.000000000 +0100
-@@ -1,7 +1,7 @@
- BEGIN {
-     if( $ENV{PERL_CORE} ) {
-         chdir '../lib/Archive/Tar' if -d '../lib/Archive/Tar';
--    }       
-+    }
-     use lib '../../..';
- }
- 
-@@ -21,9 +21,15 @@
- use File::Basename      ();
- use Data::Dumper;
- 
--use Archive::Tar;
-+### need the constants at compile time;
- use Archive::Tar::Constant;
- 
-+my $Class   = 'Archive::Tar';
-+my $FClass  = $Class . '::File';
-+use_ok( $Class );
-+
-+
-+
- ### XXX TODO:
- ### * change to fullname
- ### * add tests for global variables
-@@ -72,22 +78,23 @@
- }
- 
- my @ROOT        = grep { length }   'src', $TOO_LONG ? 'short' : 'long';
--
--my $ZLIB        = eval { require IO::Zlib; 1 } ? 1 : 0;
- my $NO_UNLINK   = $ARGV[0] ? 1 : 0;
- 
- ### enable debugging?
--$Archive::Tar::DEBUG = 1 if $ARGV[1];
-+### pesky warnings
-+$Archive::Tar::DEBUG = $Archive::Tar::DEBUG = 1 if $ARGV[1];
- 
- ### tests for binary and x/x files
--my $TARBIN      = Archive::Tar->new;
--my $TARX        = Archive::Tar->new;
-+my $TARBIN      = $Class->new;
-+my $TARX        = $Class->new;
- 
- ### paths to a .tar and .tgz file to use for tests
- my $TAR_FILE        = File::Spec->catfile( @ROOT, 'bar.tar' );
- my $TGZ_FILE        = File::Spec->catfile( @ROOT, 'foo.tgz' );
-+my $TBZ_FILE        = File::Spec->catfile( @ROOT, 'foo.tbz' );
- my $OUT_TAR_FILE    = File::Spec->catfile( @ROOT, 'out.tar' );
- my $OUT_TGZ_FILE    = File::Spec->catfile( @ROOT, 'out.tgz' );
-+my $OUT_TBZ_FILE    = File::Spec->catfile( @ROOT, 'out.tbz' );
- 
- my $COMPRESS_FILE = 'copy';
- $^O eq 'VMS' and $COMPRESS_FILE .= '.';
-@@ -96,18 +103,19 @@
- 
- ### done setting up environment ###
- 
--
--### did we probe IO::Zlib support ok? ###
--{   is( Archive::Tar->can_handle_compressed_files, $ZLIB,
--                                    "Proper IO::Zlib support detected" );
-+### check for zlib/bzip2 support
-+{   for my $meth ( qw[has_zlib_support has_bzip2_support] ) {
-+        can_ok( $Class, $meth );
-+    }
- }
- 
- 
-+
- ### tar error tests
--{   my $tar     = Archive::Tar->new;
-+{   my $tar     = $Class->new;
- 
-     ok( $tar,                       "Object created" );
--    isa_ok( $tar,                   'Archive::Tar');
-+    isa_ok( $tar,                   $Class );
- 
-     local $Archive::Tar::WARN  = 0;
- 
-@@ -133,151 +141,155 @@
- 
-     ### check if ->error eq $error
-     is( $tar->error, $Archive::Tar::error,
--                                    '$error matches error() method' );
--                     
--    ### check that 'contains_file' doesn't warn about missing files.                     
-+                                    "Error '$Archive::Tar::error' matches $Class->error method" );
-+
-+    ### check that 'contains_file' doesn't warn about missing files.
-     {   ### turn on warnings in general!
-         local $Archive::Tar::WARN  = 1;
- 
-         my $warnings = '';
-         local $SIG{__WARN__} = sub { $warnings .= "@_" };
--        
-+
-         my $rv = $tar->contains_file( $$ );
-         ok( !$rv,                   "Does not contain file '$$'" );
-         is( $warnings, '',          "   No warnings issued during lookup" );
--    }        
-+    }
- }
- 
- ### read tests ###
--{   ### normal tar + gz compressed file
--    my $archive         = $TAR_FILE;
--    my $compressed      = $TGZ_FILE;
--    my $tar             = Archive::Tar->new;
--    my $gzip            = 0;
-+{   my @to_try = ($TAR_FILE);
-+    push @to_try, $TGZ_FILE if $Class->has_zlib_support;
-+    push @to_try, $TBZ_FILE if $Class->has_bzip2_support;
- 
--    ### check we got the object
--    ok( $tar,                       "Object created" );
--    isa_ok( $tar,                   'Archive::Tar');
-+    for my $type( @to_try ) {
- 
--    for my $type( $archive, $compressed ) {
--        my $state = $gzip ? 'compressed' : 'uncompressed';
-+        ### normal tar + gz compressed file
-+        my $tar             = $Class->new;
- 
--        SKIP: {
-+        ### check we got the object
-+        ok( $tar,               "Object created" );
-+        isa_ok( $tar,           $Class );
- 
--            ### skip gz compressed archives wihtout IO::Zlib
--            skip(   "No IO::Zlib - cannot read compressed archives",
--                    4 + 2 * (scalar @EXPECT_NORMAL)
--            ) if( $gzip and !$ZLIB);
--
--            ### ->read test
--            {   my @list    = $tar->read( $type );
--                my $cnt     = scalar @list;
--                my $expect  = scalar __PACKAGE__->get_expect();
--
--                ok( $cnt,           "Reading $state file using 'read()'" );
--                is( $cnt, $expect,  "   All files accounted for" );
--
--                for my $file ( @list ) {
--                    ok( $file,      "Got File object" );
--                    isa_ok( $file,  "Archive::Tar::File" );
--
--                    ### whitebox test -- make sure find_entry gets the
--                    ### right files
--                    for my $test ( $file->full_path, $file ) {
--                        is( $tar->_find_entry( $test ), $file,
--                                    "   Found proper object" );
--                    }
--                    
--                    next unless $file->is_file;
--
--                    my $name = $file->full_path;
--                    my($expect_name, $expect_content) =
--                        get_expect_name_and_contents( $name, \@EXPECT_NORMAL );
-+        ### ->read test
-+        my @list    = $tar->read( $type );
-+        my $cnt     = scalar @list;
-+        my $expect  = scalar __PACKAGE__->get_expect();
-+
-+        ok( $cnt,               "Reading '$type' using 'read()'" );
-+        is( $cnt, $expect,      "   All files accounted for" );
-+
-+        for my $file ( @list ) {
-+            ok( $file,          "       Got File object" );
-+            isa_ok( $file,  $FClass );
-+
-+            ### whitebox test -- make sure find_entry gets the
-+            ### right files
-+            for my $test ( $file->full_path, $file ) {
-+                is( $tar->_find_entry( $test ), $file,
-+                                "           Found proper object" );
-+            }
- 
--                    ### ->fullname!
--                    ok($expect_name,"   Found expected file '$name'" );
-+            next unless $file->is_file;
- 
--                    like($tar->get_content($name), $expect_content,
--                                    "   Content OK" );
--                }
--            }
-+            my $name = $file->full_path;
-+            my($expect_name, $expect_content) =
-+                get_expect_name_and_contents( $name, \@EXPECT_NORMAL );
- 
-+            ### ->fullname!
-+            ok($expect_name,    "           Found expected file '$name'" );
- 
--            ### list_archive test
--            {   my @list    = Archive::Tar->list_archive( $archive );
--                my $cnt     = scalar @list;
--                my $expect  = scalar __PACKAGE__->get_expect();
--
--                ok( $cnt,           "Reading $state file using 'list_archive'");
--                is( $cnt, $expect,  "   All files accounted for" );
-+            like($tar->get_content($name), $expect_content,
-+                                "           Content OK" );
-+        }
- 
--                for my $file ( @list ) {
--                    next if __PACKAGE__->is_dir( $file ); # directories
- 
--                    my($expect_name, $expect_content) =
--                        get_expect_name_and_contents( $file, \@EXPECT_NORMAL );
-+        ### list_archive test
-+        {   my @list    = $Class->list_archive( $type );
-+            my $cnt     = scalar @list;
-+            my $expect  = scalar __PACKAGE__->get_expect();
-+
-+            ok( $cnt,           "Reading '$type' using 'list_archive'");
-+            is( $cnt, $expect,  "   All files accounted for" );
- 
--                    ok( $expect_name,
--                                    "   Found expected file '$file'" );
--                }
-+            for my $file ( @list ) {
-+                next if __PACKAGE__->is_dir( $file ); # directories
-+
-+                my($expect_name, $expect_content) =
-+                    get_expect_name_and_contents( $file, \@EXPECT_NORMAL );
-+
-+                ok( $expect_name,
-+                                "   Found expected file '$file'" );
-             }
-         }
--
--        ### now we try gz compressed archives
--        $gzip++;
-     }
- }
- 
- ### add files tests ###
- {   my @add     = map { File::Spec->catfile( @ROOT, @$_ ) } ['b'];
-     my @addunix = map { File::Spec::Unix->catfile( @ROOT, @$_ ) } ['b'];
--    my $tar     = Archive::Tar->new;
-+    my $tar     = $Class->new;
- 
-     ### check we got the object
-     ok( $tar,                       "Object created" );
--    isa_ok( $tar,                   'Archive::Tar');
-+    isa_ok( $tar,                   $Class );
- 
-     ### add the files
-     {   my @files = $tar->add_files( @add );
- 
-         is( scalar @files, scalar @add,
--                                    "Adding files");
--        is( $files[0]->name, 'b',   "   Proper name" );
-+                                    "   Adding files");
-+        is( $files[0]->name,'b',    "      Proper name" );
- 
-         SKIP: {
-             skip( "You are building perl using symlinks", 1)
-                 if ($ENV{PERL_CORE} and $Config{config_args} =~/Dmksymlinks/);
- 
--            is( $files[0]->is_file, 1,  
--                                    "   Proper type" );
-+            is( $files[0]->is_file, 1,
-+                                    "       Proper type" );
-         }
- 
-         like( $files[0]->get_content, qr/^bbbbbbbbbbb\s*$/,
--                                    "   Content OK" );
-+                                    "       Content OK" );
- 
-         ### check if we have then in our tar object
-         for my $file ( @addunix ) {
-             ok( $tar->contains_file($file),
--                                    "   File found in archive" );
-+                                    "       File found in archive" );
-         }
-     }
- 
-     ### check adding files doesn't conflict with a secondary archive
-     ### old A::T bug, we should keep testing for it
--    {   my $tar2    = Archive::Tar->new;
-+    {   my $tar2    = $Class->new;
-         my @added   = $tar2->add_files( $COMPRESS_FILE );
-         my @count   = $tar2->list_files;
- 
--        is( scalar @added, 1,       "Added files to secondary archive" );
-+        is( scalar @added, 1,       "   Added files to secondary archive" );
-         is( scalar @added, scalar @count,
--                                    "   Does not conflict with first archive" );
-+                                    "       No conflict with first archive" );
- 
-         ### check the adding of directories
-         my @add_dirs  = File::Spec->catfile( @ROOT );
-         my @dirs      = $tar2->add_files( @add_dirs );
-         is( scalar @dirs, scalar @add_dirs,
--                                    "Adding dirs");
--        ok( $dirs[0]->is_dir,       "   Proper type" );
-+                                    "       Adding dirs");
-+        ok( $dirs[0]->is_dir,       "           Proper type" );
-+    }
-+
-+    ### check if we can add a A::T::File object
-+    {   my $tar2    = $Class->new;
-+        my($added)  = $tar2->add_files( $add[0] );
-+
-+        ok( $added,                 "   Added a file '$add[0]' to new object" );
-+        isa_ok( $added, $FClass,    "       Object" );
-+
-+        my($added2) = $tar2->add_files( $added );
-+        ok( $added2,                "       Added an $FClass object" );
-+        isa_ok( $added2, $FClass,   "           Object" );
-+
-+        is_deeply( [$added, $added2], [$tar2->get_files],
-+                                    "       All files accounted for" );
-+        isnt( $added, $added2,      "       Different memory allocations" );
-     }
- }
- 
-@@ -285,20 +297,20 @@
- {
-     {   ### standard data ###
-         my @to_add  = ( 'a', 'aaaaa' );
--        my $tar     = Archive::Tar->new;
-+        my $tar     = $Class->new;
- 
-         ### check we got the object
-         ok( $tar,                   "Object created" );
--        isa_ok( $tar,               'Archive::Tar');
-+        isa_ok( $tar,               $Class );
- 
-         ### add a new file item as data
-         my $obj = $tar->add_data( @to_add );
- 
--        ok( $obj,                   "Adding data" );
--        is( $obj->name, $to_add[0], "   Proper name" );
--        is( $obj->is_file, 1,       "   Proper type" );
-+        ok( $obj,                   "   Adding data" );
-+        is( $obj->name, $to_add[0], "       Proper name" );
-+        is( $obj->is_file, 1,       "       Proper type" );
-         like( $obj->get_content, qr/^$to_add[1]\s*$/,
--                                    "   Content OK" );
-+                                    "       Content OK" );
-     }
- 
-     {   ### binary data +
-@@ -318,19 +330,19 @@
- 
-                 my $obj = $tar->add_data( $path, $data );
- 
--                ok( $obj,               "Adding data '$file'" );
-+                ok( $obj,               "   Adding data '$file'" );
-                 is( $obj->full_path, $path,
--                                        "   Proper name" );
--                ok( $obj->is_file,      "   Proper type" );
-+                                        "       Proper name" );
-+                ok( $obj->is_file,      "       Proper type" );
-                 is( $obj->get_content, $data,
--                                        "   Content OK" );
-+                                        "       Content OK" );
-             }
-         }
-     }
- }
- 
- ### rename/replace_content tests ###
--{   my $tar     = Archive::Tar->new;
-+{   my $tar     = $Class->new;
-     my $from    = 'c';
-     my $to      = 'e';
- 
-@@ -362,13 +374,13 @@
- 
- ### remove tests ###
- {   my $remove  = 'c';
--    my $tar     = Archive::Tar->new;
-+    my $tar     = $Class->new;
- 
-     ok( $tar->read( $TAR_FILE ),    "Read in '$TAR_FILE'" );
- 
-     ### remove returns the files left, which should be equal to list_files
-     is( scalar($tar->remove($remove)), scalar($tar->list_files),
--                                    "Removing file '$remove'" );
-+                                    "   Removing file '$remove'" );
- 
-     ### so what's left should be all expected files minus 1
-     is( scalar($tar->list_files), scalar(__PACKAGE__->get_expect) - 1,
-@@ -376,12 +388,14 @@
- }
- 
- ### write + read + extract tests ###
--SKIP: {
--    skip('no IO::String', 326) if   !$Archive::Tar::HAS_PERLIO && 
-+SKIP: {                             ### pesky warnings
-+    skip('no IO::String', 326) if   !$Archive::Tar::HAS_PERLIO &&
-+                                    !$Archive::Tar::HAS_PERLIO &&
-+                                    !$Archive::Tar::HAS_IO_STRING &&
-                                     !$Archive::Tar::HAS_IO_STRING;
--                                    
--    my $tar = Archive::Tar->new;
--    my $new = Archive::Tar->new;
-+
-+    my $tar = $Class->new;
-+    my $new = $Class->new;
-     ok( $tar->read( $TAR_FILE ),    "Read in '$TAR_FILE'" );
- 
-     for my $aref (  [$tar,    \@EXPECT_NORMAL],
-@@ -392,28 +406,33 @@
- 
-         ### check if we stringify it ok
-         {   my $string = $obj->write;
--            ok( $string,           "Stringified tar file has size" );
-+            ok( $string,           "    Stringified tar file has size" );
-             cmp_ok( length($string) % BLOCK, '==', 0,
--                                    "Tar archive stringified" );
-+                                    "       Tar archive stringified" );
-         }
- 
-         ### write tar tests
-         {   my $out = $OUT_TAR_FILE;
- 
-+            ### bug #41798: 'Nonempty $\ when writing a TAR file produces a
-+            ### corrupt TAR file' shows that setting $\ breaks writing tar files
-+            ### set it here purposely so we can verify NOTHING breaks
-+            local $\ = 'FOOBAR';
-+
-             {   ### write()
-                 ok( $obj->write($out),
--                                    "Wrote tarfile using 'write'" );
-+                                    "       Wrote tarfile using 'write'" );
-                 check_tar_file( $out );
-                 check_tar_object( $obj, $struct );
- 
-                 ### now read it in again
-                 ok( $new->read( $out ),
--                                    "Read '$out' in again" );
-+                                    "       Read '$out' in again" );
- 
-                 check_tar_object( $new, $struct );
- 
-                 ### now extract it again
--                ok( $new->extract,  "Extracted '$out' with 'extract'" );
-+                ok( $new->extract,  "       Extracted '$out' with 'extract'" );
-                 check_tar_extract( $new, $struct );
- 
-                 rm( $out ) unless $NO_UNLINK;
-@@ -421,63 +440,54 @@
- 
- 
-             {   ### create_archive()
--                ok( Archive::Tar->create_archive( $out, 0, $COMPRESS_FILE ),
--                                    "Wrote tarfile using 'create_archive'" );
-+                ok( $Class->create_archive( $out, 0, $COMPRESS_FILE ),
-+                                    "       Wrote tarfile using 'create_archive'" );
-                 check_tar_file( $out );
- 
-                 ### now extract it again
--                ok( Archive::Tar->extract_archive( $out ),
--                                    "Extracted file using 'extract_archive'");
-+                ok( $Class->extract_archive( $out ),
-+                                    "       Extracted file using 'extract_archive'");
-                 rm( $out ) unless $NO_UNLINK;
-             }
-         }
- 
-         ## write tgz tests
--        {   my $out = $OUT_TGZ_FILE;
--
--            SKIP: {
-+        {   my @out;
-+            push @out, [ $OUT_TGZ_FILE => 1             ] if $Class->has_zlib_support;
-+            push @out, [ $OUT_TBZ_FILE => COMPRESS_BZIP ] if $Class->has_bzip2_support;
- 
--                ### weird errors from scalar(@x,@y,@z), dot it this way...
--                my $file_cnt;
--                map { $file_cnt += scalar @$_ } \@EXPECT_NORMAL, \@EXPECTBIN,
--                                                \@EXPECTX;
--
--                my $cnt =   5 +                 # the tests below
--                            (5*3*2) +           # check_tgz_file
--                                                # check_tar_object fixed tests
--                            (3 * 2 * (2 + $file_cnt)) +
--                            ((4*$file_cnt) + 1);# check_tar_extract tests
-+            for my $entry ( @out ) {
- 
--                skip( "No IO::Zlib - cannot write compressed archives", $cnt )
--                    unless $ZLIB;
-+                my( $out, $compression ) = @$entry;
- 
-                 {   ### write()
--                    ok($obj->write($out, 1),
--                                    "Writing compressed file using 'write'" );
--                    check_tgz_file( $out );
-+                    ok($obj->write($out, $compression),
-+                                    "       Writing compressed file '$out' using 'write'" );
-+                    check_compressed_file( $out );
-+
-                     check_tar_object( $obj, $struct );
- 
-                     ### now read it in again
-                     ok( $new->read( $out ),
--                                    "Read '$out' in again" );
-+                                    "       Read '$out' in again" );
-                     check_tar_object( $new, $struct );
- 
-                     ### now extract it again
-                     ok( $new->extract,
--                                    "Extracted '$out' again" );
-+                                    "       Extracted '$out' again" );
-                     check_tar_extract( $new, $struct );
- 
-                     rm( $out ) unless $NO_UNLINK;
-                 }
- 
-                 {   ### create_archive()
--                    ok( Archive::Tar->create_archive( $out, 1, $COMPRESS_FILE ),
--                                    "Wrote gzip file using 'create_archive'" );
--                    check_tgz_file( $out );
-+                    ok( $Class->create_archive( $out, $compression, $COMPRESS_FILE ),
-+                                    "       Wrote '$out' using 'create_archive'" );
-+                    check_compressed_file( $out );
- 
-                     ### now extract it again
--                    ok( Archive::Tar->extract_archive( $out, 1 ),
--                                    "Extracted file using 'extract_archive'");
-+                    ok( $Class->extract_archive( $out, $compression ),
-+                                    "       Extracted file using 'extract_archive'");
-                     rm( $out ) unless $NO_UNLINK;
-                 }
-             }
-@@ -487,7 +497,7 @@
- 
- 
- ### limited read + extract tests ###
--{   my $tar     = Archive::Tar->new;
-+{   my $tar     = $Class->new;
-     my @files   = $tar->read( $TAR_FILE, 0, { limit => 1 } );
-     my $obj     = $files[0];
- 
-@@ -506,8 +516,8 @@
-         for my $arg ( $obj, $obj->full_path ) {
- 
-             ok( $tar->$meth( $arg ),
--                                    "Extracted '$name' to cwd() with $meth" );
--            ok( -e $obj->full_path, "   Extracted file exists" );
-+                                    "   Extract '$name' to cwd() with $meth" );
-+            ok( -e $obj->full_path, "       Extracted file exists" );
-             rm( $obj->full_path ) unless $NO_UNLINK;
-         }
-     }
-@@ -519,8 +529,8 @@
-         my $outfile = File::Spec->catfile( $outpath, $$ ); #$obj->full_path );
- 
-         ok( $tar->$meth( $obj->full_path, $outfile ),
--                                    "Extracted file '$name' to $outpath with $meth" );
--        ok( -e $outfile,            "   Extracted file '$outfile' exists" );
-+                                    "   Extract file '$name' to $outpath with $meth" );
-+        ok( -e $outfile,            "       Extracted file '$outfile' exists" );
-         rm( $outfile ) unless $NO_UNLINK;
-     }
- 
-@@ -528,7 +538,7 @@
- 
- 
- ### clear tests ###
--{   my $tar     = Archive::Tar->new;
-+{   my $tar     = $Class->new;
-     my @files   = $tar->read( $TAR_FILE );
- 
-     my $cnt = $tar->list_files();
-@@ -540,7 +550,7 @@
- }
- 
- ### $DO_NOT_USE_PREFIX tests
--{   my $tar     = Archive::Tar->new;
-+{   my $tar     = $Class->new;
- 
- 
-     ### first write a tar file without prefix
-@@ -549,14 +559,17 @@
-         my $file    = File::Basename::basename( $COMPRESS_FILE );
- 
-         ok( $obj,                   "File added" );
--        isa_ok( $obj,               "Archive::Tar::File" );
-+        isa_ok( $obj,               $FClass );
- 
-         ### internal storage ###
-         is( $obj->name, $file,      "   Name set to '$file'" );
-         is( $obj->prefix, $dir,     "   Prefix set to '$dir'" );
- 
-         ### write the tar file without a prefix in it
-+        ### pesky warnings
-         local $Archive::Tar::DO_NOT_USE_PREFIX = 1;
-+        local $Archive::Tar::DO_NOT_USE_PREFIX = 1;
-+
-         ok( $tar->write( $OUT_TAR_FILE ),
-                                     "   Tar file written" );
- 
-@@ -566,18 +579,18 @@
- 
-     ### now read it back in, there should be no prefix
-     {   ok( $tar->read( $OUT_TAR_FILE ),
--                                    "Tar file read in again" );
-+                                    "   Tar file read in again" );
- 
-         my ($obj) = $tar->get_files;
--        ok( $obj,                   "   File retrieved" );
--        isa_ok( $obj,               "Archive::Tar::File" );
-+        ok( $obj,                   "       File retrieved" );
-+        isa_ok( $obj, $FClass,      "       Object" );
- 
-         is( $obj->name, $COMPRESS_FILE,
--                                    "   Name now set to '$COMPRESS_FILE'" );
--        is( $obj->prefix, '',       "   Prefix now empty" );
-+                                    "       Name now set to '$COMPRESS_FILE'" );
-+        is( $obj->prefix, '',       "       Prefix now empty" );
- 
-         my $re = quotemeta $COMPRESS_FILE;
--        like( $obj->raw, qr/^$re/,  "   Prefix + name in name slot of header" );
-+        like( $obj->raw, qr/^$re/,  "       Prefix + name in name slot of header" );
-     }
- 
-     rm( $OUT_TAR_FILE ) unless $NO_UNLINK;
-@@ -645,10 +658,10 @@
-     return $contents;
- }
- 
--sub check_tgz_file {
-+sub check_compressed_file {
-     my $file                = shift;
-     my $filesize            = -s $file;
--    my $contents            = slurp_gzfile( $file );
-+    my $contents            = slurp_compressed_file( $file );
-     my $uncompressedsize    = length $contents;
- 
-     ok( defined( $contents ),   "   File read and uncompressed" );
-@@ -724,22 +737,22 @@
-         close $fh;
-         $NO_UNLINK or 1 while unlink $path;
- 
--        ### alternate extract path tests 
-+        ### alternate extract path tests
-         ### to abs and rel paths
-         {   for my $outpath (   File::Spec->catdir( @ROOT ),
--                                File::Spec->rel2abs( 
-+                                File::Spec->rel2abs(
-                                     File::Spec->catdir( @ROOT )
-                                 )
-             ) {
- 
-                 my $outfile = File::Spec->catfile( $outpath, $$ );
--    
-+
-                 ok( $tar->extract_file( $file->full_path, $outfile ),
-                                 "   Extracted file '$path' to $outfile" );
-                 ok( -e $outfile,"   Extracted file '$outfile' exists" );
--    
-+
-                 rm( $outfile ) unless $NO_UNLINK;
--            }            
-+            }
-         }
-     }
- 
-@@ -762,18 +775,29 @@
-     return <$fh>;
- }
- 
--sub slurp_gzfile {
-+sub slurp_compressed_file {
-     my $file = shift;
--    my $str;
--    my $buff;
-+    my $fh;
- 
--    require IO::Zlib;
--    my $fh = new IO::Zlib;
--    $fh->open( $file, READ_ONLY->(1) )
--        or warn( "Error opening '$file' with IO::Zlib" ), return undef;
-+    ### bzip2
-+    if( $file =~ /.tbz$/ ) {
-+        require IO::Uncompress::Bunzip2;
-+        $fh = IO::Uncompress::Bunzip2->new( $file )
-+            or warn( "Error opening '$file' with IO::Uncompress::Bunzip2" ), return
- 
-+    ### gzip
-+    } else {
-+        require IO::Zlib;
-+        $fh = new IO::Zlib;
-+        $fh->open( $file, READ_ONLY->(1) )
-+            or warn( "Error opening '$file' with IO::Zlib" ), return
-+    }
-+
-+    my $str;
-+    my $buff;
-     $str .= $buff while $fh->read( $buff, 4096 ) > 0;
-     $fh->close();
-+
-     return $str;
- }
- 
-diff -urN perl-5.10.0.orig/lib/Archive/Tar/t/04_resolved_issues.t perl-5.10.0/lib/Archive/Tar/t/04_resolved_issues.t
---- perl-5.10.0.orig/lib/Archive/Tar/t/04_resolved_issues.t	2009-02-20 11:21:14.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/04_resolved_issues.t	2009-03-05 15:13:09.000000000 +0100
-@@ -113,7 +113,7 @@
-     ### absolute paths are already taken care of. Only relative paths
-     ### matter
-     my $in_file     = basename($0);
--    my $out_file    = '../' . $in_file . ".$$";
-+    my $out_file    = '../' . $in_file . "_$$";
-     
-     ok( $tar->add_files( $in_file ), 
-                                 "       Added '$in_file'" );
-@@ -121,7 +121,6 @@
-                                 "       Renamed to '$out_file'" );
-     
-     ### first, test with strict extract permissions on
--TODO:
-     {   local $Archive::Tar::INSECURE_EXTRACT_MODE = 0;
- 
-         ### we quell the error on STDERR
-@@ -135,20 +134,14 @@
-         ok( ! -e $out_file,     "       File '$out_file' does not exist" );
-     
-         ok( $tar->error,        "       Error message stored" );
--
--        local $TODO = 'Exposed unrelated filespec handling bugs on VMS' if $^O eq 'VMS';
--
-         like( $tar->error, qr/attempting to leave/,
-                                 "           Proper violation detected" );
-     }
-     
-     ### now disable those
--TODO:
-     {   local $Archive::Tar::INSECURE_EXTRACT_MODE = 1;
-         ok( 1,                  "   Extracting in insecure mode" );
-     
--        local $TODO = 'Exposed unrelated filespec handling bugs on VMS' if $^O eq 'VMS';
--
-         ok( $tar->extract_file( $out_file ),
-                                 "       File extracted" );
-         ok( -e $out_file,       "       File '$out_file' exists" );
-@@ -156,6 +149,21 @@
-         ### and clean up
-         unless( $NO_UNLINK ) { 1 while unlink $out_file };
-     }    
--    
-+}
- 
-+### bug #43513: [PATCH] Accept wrong checksums from SunOS and HP-UX tar
-+### like GNU tar does. See here for details:
-+### http://www.gnu.org/software/tar/manual/tar.html#SEC139
-+{   ok( 1,                      "Testing bug 43513" );
-+    
-+    my $src = File::Spec->catfile( qw[src header signed.tar] );
-+    my $tar = $Class->new;
-+    
-+    isa_ok( $tar, $Class,       "   Object" );
-+    ok( $tar->read( $src ),     "   Read non-Posix file with signed Checksum" );
-+        
-+    for my $file ( $tar->get_files ) {
-+        ok( $file,              "       File object retrieved" );
-+        ok( $file->validate,    "           File validates" );
-+    }        
- }
-diff -urN perl-5.10.0.orig/lib/Archive/Tar/t/05_iter.t perl-5.10.0/lib/Archive/Tar/t/05_iter.t
---- perl-5.10.0.orig/lib/Archive/Tar/t/05_iter.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/05_iter.t	2009-03-11 17:11:27.000000000 +0100
-@@ -0,0 +1,65 @@
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir '../lib/Archive/Tar' if -d '../lib/Archive/Tar';
-+    }       
-+    use lib '../../..';
-+}
-+
-+BEGIN { chdir 't' if -d 't' }
-+
-+use Test::More 'no_plan';
-+use strict;
-+use lib '../lib';
-+
-+my $Class   = 'Archive::Tar';
-+my $FClass  = 'Archive::Tar::File';
-+my $File    = 'src/long/bar.tar';
-+my @Expect = (
-+    qr|^c$|,
-+    qr|^d$|,
-+    qr|^directory/$|,
-+    qr|^directory/really.*name/$|,
-+    qr|^directory/.*/myfile$|,
-+);
-+
-+use_ok( $Class );
-+
-+### crazy ref to special case 'all'
-+for my $index ( \0, 0 .. $#Expect ) {   
-+
-+    my %opts    = ();
-+    my @expect  = ();
-+    
-+    ### do a full test vs individual filters
-+    if( not ref $index ) {
-+        my $regex       = $Expect[$index];
-+        $opts{'filter'} = $regex;
-+        @expect         = ($regex);
-+    } else {
-+        @expect         = @Expect;
-+    }        
-+
-+    my $next = $Class->iter( $File, 0, \%opts );
-+    
-+    my $pp_opts = join " => ", %opts;
-+    ok( $next,                  "Iterator created from $File ($pp_opts)" );
-+    isa_ok( $next, "CODE",      "   Iterator" );
-+
-+    my @names;
-+    while( my $f = $next->() ) {
-+        ok( $f,                 "       File object retrieved" );
-+        isa_ok( $f, $FClass,    "           Object" );
-+
-+        push @names, $f->name;
-+    }
-+    
-+    is( scalar(@names), scalar(@expect),
-+                                "   Found correct number of files" );
-+    
-+    my $i = 0;
-+    for my $name ( @names ) {
-+        ok( 1,                  "   Inspecting '$name' " );
-+        like($name, $expect[$i],"       Matches $Expect[$i]" );
-+        $i++;
-+    }        
-+}
-diff -urN perl-5.10.0.orig/lib/Archive/Tar/t/90_symlink.t perl-5.10.0/lib/Archive/Tar/t/90_symlink.t
---- perl-5.10.0.orig/lib/Archive/Tar/t/90_symlink.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/90_symlink.t	2009-03-11 17:11:27.000000000 +0100
-@@ -0,0 +1,62 @@
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir '../lib/Archive/Tar' if -d '../lib/Archive/Tar';
-+    }       
-+    use lib '../../..';
-+}
-+
-+BEGIN { chdir 't' if -d 't' }
-+
-+use lib '../lib';
-+
-+use strict;
-+use File::Spec;
-+use File::Path;
-+use Test::More;
-+
-+### developer tests mostly, so enable them with an extra argument
-+plan skip_all => "Skipping tests on this platform" unless @ARGV;
-+plan 'no_plan';
-+
-+my $Class   = 'Archive::Tar';
-+my $Dir     = File::Spec->catdir( qw[src linktest] );    
-+my %Map     = (
-+    File::Spec->catfile( $Dir, "linktest_with_dir.tar" ) => [
-+        [ 0, qr/SECURE EXTRACT MODE/ ],
-+        [ 1, qr/^$/ ]
-+    ],
-+    File::Spec->catfile( $Dir, "linktest_missing_dir.tar" ) => [
-+        [ 0, qr/SECURE EXTRACT MODE/ ],
-+        [ 0, qr/File exists/ ],
-+    ],
-+);
-+
-+use_ok( $Class );
-+
-+{   while( my($file, $aref) = each %Map ) {
-+
-+        for my $mode ( 0, 1 ) {
-+            my $expect = $aref->[$mode]->[0];
-+            my $regex  = $aref->[$mode]->[1];
-+
-+            my $tar  = $Class->new( $file );
-+            ok( $tar,                   "Object created from $file" );
-+
-+            ### damn warnings
-+            local $Archive::Tar::INSECURE_EXTRACT_MODE = $mode;
-+            local $Archive::Tar::INSECURE_EXTRACT_MODE = $mode;
-+            
-+            ok( 1,                  "   Extracting with insecure mode: $mode" );
-+
-+            my $warning;
-+            local $SIG{__WARN__} = sub { $warning .= "@_"; warn @_; };
-+
-+            my $rv = eval { $tar->extract } || 0;
-+            ok( !$@,                "       No fatal error" );
-+            is( !!$rv, !!$expect,   "       RV as expected" );
-+            like( $warning, $regex, "       Error matches $regex" );
-+    
-+            rmtree( 'linktest' );
-+        }
-+    }        
-+}    
-diff -urN perl-5.10.0.orig/lib/Archive/Tar/t/src/header/signed.tar.packed perl-5.10.0/lib/Archive/Tar/t/src/header/signed.tar.packed
---- perl-5.10.0.orig/lib/Archive/Tar/t/src/header/signed.tar.packed	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/src/header/signed.tar.packed	2009-03-11 17:11:27.000000000 +0100
-@@ -0,0 +1,243 @@
-+#########################################################################
-+This is a binary file that was packed with the 'uupacktool.pl' which
-+is included in the Perl distribution.
-+
-+To unpack this file use the following command:
-+
-+     uupacktool.pl -u lib/Archive/Tar/t/src/header/signed.tar.packed lib/Archive/Tar/t/src/header/signed.tar
-+
-+To recreate it use the following command:
-+
-+     uupacktool.pl -p lib/Archive/Tar/t/src/header/signed.tar lib/Archive/Tar/t/src/header/signed.tar.packed
-+
-+Created at Fri Mar  6 17:03:40 2009
-+#########################################################################
-+__UU__
-+MPZ3#I,.D````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M`````````````#`P,#8P,"``,3,S-#8W(``P,C,T,C`@`#`P,#`P,#`P,#`U
-+M(#$Q,34P,S(V-#(R(#`Q,#0V,2``,```````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M``````````````````````````````````````````!U<W1A<@`P,&YT>6YI
-+M````````````````````````````````````871K;W,`````````````````
-+M```````````````````P,#`P,#`@`#`P,#`P,"``````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M``````````````````````!T97-T"@``````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+9````````````````````````````````````
-diff -urN perl-5.10.0.orig/lib/Archive/Tar/t/src/linktest/linktest_missing_dir.tar.packed perl-5.10.0/lib/Archive/Tar/t/src/linktest/linktest_missing_dir.tar.packed
---- perl-5.10.0.orig/lib/Archive/Tar/t/src/linktest/linktest_missing_dir.tar.packed	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/src/linktest/linktest_missing_dir.tar.packed	2009-03-11 17:11:27.000000000 +0100
-@@ -0,0 +1,243 @@
-+#########################################################################
-+This is a binary file that was packed with the 'uupacktool.pl' which
-+is included in the Perl distribution.
-+
-+To unpack this file use the following command:
-+
-+     uupacktool.pl -u lib/Archive/Tar/t/src/linktest/linktest_missing_dir.tar.packed lib/Archive/Tar/t/src/linktest/linktest_missing_dir.tar
-+
-+To recreate it use the following command:
-+
-+     uupacktool.pl -p lib/Archive/Tar/t/src/linktest/linktest_missing_dir.tar lib/Archive/Tar/t/src/linktest/linktest_missing_dir.tar.packed
-+
-+Created at Thu Feb 19 16:44:52 2009
-+#########################################################################
-+__UU__
-+M;&EN:W1E<W0O;&EN:P``````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M`````````````#`P,#`W-34`,#`P,#<V-0`P,#`P,#`P`#`P,#`P,#`P,#`P
-+M`#$Q,#4S-34T-S4P`#`Q,S(U,``@,F]R:6<`````````````````````````
-+M````````````````````````````````````````````````````````````
-+M``````````````````````````````````````````!U<W1A<B`@`&MA;F4`
-+M````````````````````````````````````=VAE96P`````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M``````````````````````!L:6YK=&5S="]L:6YK+W@`````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````,#`P,#8T-``P,#`P-S8U`#`P
-+M,#`P,#``,#`P,#`P,#`P,#``,3$P-3,U-30W,38`,#$R-C,S`"`P````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M`````'5S=&%R("``:V%N90````````````````````````````````````!W
-+M:&5E;```````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+9````````````````````````````````````
-diff -urN perl-5.10.0.orig/lib/Archive/Tar/t/src/linktest/linktest_with_dir.tar.packed perl-5.10.0/lib/Archive/Tar/t/src/linktest/linktest_with_dir.tar.packed
---- perl-5.10.0.orig/lib/Archive/Tar/t/src/linktest/linktest_with_dir.tar.packed	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/src/linktest/linktest_with_dir.tar.packed	2009-03-11 17:11:27.000000000 +0100
-@@ -0,0 +1,232 @@
-+#########################################################################
-+This is a binary file that was packed with the 'uupacktool.pl' which
-+is included in the Perl distribution.
-+
-+To unpack this file use the following command:
-+
-+     uupacktool.pl -u lib/Archive/Tar/t/src/linktest/linktest_with_dir.tar.packed lib/Archive/Tar/t/src/linktest/linktest_with_dir.tar
-+
-+To recreate it use the following command:
-+
-+     uupacktool.pl -p lib/Archive/Tar/t/src/linktest/linktest_with_dir.tar lib/Archive/Tar/t/src/linktest/linktest_with_dir.tar.packed
-+
-+Created at Thu Feb 19 16:44:52 2009
-+#########################################################################
-+__UU__
-+M;&EN:W1E<W0O;W)I9R\`````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M`````````````#`P,#`W-34`,#`P,#<V-0`P,#`P,#`P`#`P,#`P,#`P,#`P
-+M`#$Q,#4S-34T-S$V`#`Q,C0U-@`@-0``````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M``````````````````````````````````````````!U<W1A<B`@`&MA;F4`
-+M````````````````````````````````````=VAE96P`````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M``````````````````````!L:6YK=&5S="]L:6YK````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````,#`P,#<U-0`P,#`P-S8U`#`P
-+M,#`P,#``,#`P,#`P,#`P,#``,3$P-3,U-30W-3``,#$S,C4P`"`R;W)I9P``
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M`````'5S=&%R("``:V%N90````````````````````````````````````!W
-+M:&5E;```````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M`````````````````````````````````````````````&QI;FMT97-T+VQI
-+M;FLO>```````````````````````````````````````````````````````
-+M```````````````````````````````````````````````````````````P
-+M,#`P-C0T`#`P,#`W-C4`,#`P,#`P,``P,#`P,#`P,#`P,``Q,3`U,S4U-#<Q
-+M-@`P,3(V,S,`(#``````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````=7-T87(@(`!K86YE````````````````
-+M`````````````````````'=H965L````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+M````````````````````````````````````````````````````````````
-+)```````````*
-diff -urN perl-5.10.0.orig/lib/Archive/Tar/t/src/long/foo.tbz.packed perl-5.10.0/lib/Archive/Tar/t/src/long/foo.tbz.packed
---- perl-5.10.0.orig/lib/Archive/Tar/t/src/long/foo.tbz.packed	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/src/long/foo.tbz.packed	2009-03-11 17:11:27.000000000 +0100
-@@ -0,0 +1,23 @@
-+#########################################################################
-+This is a binary file that was packed with the 'uupacktool.pl' which
-+is included in the Perl distribution.
-+
-+To unpack this file use the following command:
-+
-+     uupacktool.pl -u lib/Archive/Tar/t/src/long/foo.tbz.packed lib/Archive/Tar/t/src/long/foo.tbz
-+
-+To recreate it use the following command:
-+
-+     uupacktool.pl -p lib/Archive/Tar/t/src/long/foo.tbz lib/Archive/Tar/t/src/long/foo.tbz.packed
-+
-+Created at Thu Feb 19 16:05:47 2009
-+#########################################################################
-+__UU__
-+M0EIH.3%!62936=873NT``9C_A._0`DA``_^`0`0)`._OGJ```40(,`%X9`8`
-+M::-!IB```!D`)28FI````````(HE,F%3RF3R8FIM/5&F#33(>IZID>"="?4U
-+M>/C^S:X'D<2&UOMUE`"-`(N%MQA29*3$)UC1X82:*B,-Q7FMI2DVI<#P6%65
-+M/B$/:G=OYT0SKT65Y'T()B;2=WF$2%CLTJ.KTD0;Q.)"/81[2R\B9=]9)23.
-+M1F@@IS0Q030J3;>[221,'HFJ3WH0M`Y#.TI(I@%<RH/$AH8>R26=14&*"&"L
-+M1PD0,HZH$-!#H2`UEQL.14#Z)L$$^3U2B\,R_?,RZ<_X7)YXG^04Q+R/=,4\
-+MK`R+N+%?P?2UFQ+S267E(`$I^B`!)-]"4Y!65-QU&U:BM<X`V$"L%BW%2XIS
-+<63('[6F2P:JS\FD@5"$VW*O_%W)%.%"0UA=.[0``
-diff -urN perl-5.10.0.orig/lib/Archive/Tar/t/src/short/foo.tbz.packed perl-5.10.0/lib/Archive/Tar/t/src/short/foo.tbz.packed
---- perl-5.10.0.orig/lib/Archive/Tar/t/src/short/foo.tbz.packed	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/src/short/foo.tbz.packed	2009-03-11 17:11:28.000000000 +0100
-@@ -0,0 +1,19 @@
-+#########################################################################
-+This is a binary file that was packed with the 'uupacktool.pl' which
-+is included in the Perl distribution.
-+
-+To unpack this file use the following command:
-+
-+     uupacktool.pl -u lib/Archive/Tar/t/src/short/foo.tbz.packed lib/Archive/Tar/t/src/short/foo.tbz
-+
-+To recreate it use the following command:
-+
-+     uupacktool.pl -p lib/Archive/Tar/t/src/short/foo.tbz lib/Archive/Tar/t/src/short/foo.tbz.packed
-+
-+Created at Thu Feb 19 16:05:52 2009
-+#########################################################################
-+__UU__
-+M0EIH.3%!62936>GH,8X``)O[A.90`D!``'^```#O*1X```%`""``E(*JGDA#
-+M1H#0Q&F@)%1J8C3$Q,T3`U)1(QL-#P5L`'2A)$,<1C&7N<@%XQ(2UAGTYV56
-+MM$I>-BHHJN(9*$J286."<%>*U,.3%6B$*2E6R+DH-6B&?[5DZ(J7DG#H_$@<
-+/AE%`D'\7<D4X4)#IZ#&.
-diff -urN perl-5.10.0.orig/lib/Archive/Tar.pm perl-5.10.0/lib/Archive/Tar.pm
---- perl-5.10.0.orig/lib/Archive/Tar.pm	2009-02-20 11:21:14.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar.pm	2009-03-11 17:13:04.000000000 +0100
-@@ -7,16 +7,31 @@
- package Archive::Tar;
- require 5.005_03;
- 
-+use Cwd;
-+use IO::Zlib;
-+use IO::File;
-+use Carp                qw(carp croak);
-+use File::Spec          ();
-+use File::Spec::Unix    ();
-+use File::Path          ();
-+
-+use Archive::Tar::File;
-+use Archive::Tar::Constant;
-+
-+require Exporter;
-+
- use strict;
- use vars qw[$DEBUG $error $VERSION $WARN $FOLLOW_SYMLINK $CHOWN $CHMOD
-             $DO_NOT_USE_PREFIX $HAS_PERLIO $HAS_IO_STRING
--            $INSECURE_EXTRACT_MODE
-+            $INSECURE_EXTRACT_MODE @ISA @EXPORT
-          ];
- 
-+@ISA                    = qw[Exporter];
-+@EXPORT                 = qw[ COMPRESS_GZIP COMPRESS_BZIP ];
- $DEBUG                  = 0;
- $WARN                   = 1;
- $FOLLOW_SYMLINK         = 0;
--$VERSION                = "1.38";
-+$VERSION                = "1.46";
- $CHOWN                  = 1;
- $CHMOD                  = 1;
- $DO_NOT_USE_PREFIX      = 0;
-@@ -28,24 +43,13 @@
- 
-     ### try and load IO::String anyway, so you can dynamically
-     ### switch between perlio and IO::String
--    eval {
-+    $HAS_IO_STRING = eval {
-         require IO::String;
-         import IO::String;
--    };
--    $HAS_IO_STRING = $@ ? 0 : 1;
--
-+        1;
-+    } || 0;
- }
- 
--use Cwd;
--use IO::File;
--use Carp                qw(carp croak);
--use File::Spec          ();
--use File::Spec::Unix    ();
--use File::Path          ();
--
--use Archive::Tar::File;
--use Archive::Tar::Constant;
--
- =head1 NAME
- 
- Archive::Tar - module for manipulations of tar archives
-@@ -55,7 +59,7 @@
-     use Archive::Tar;
-     my $tar = Archive::Tar->new;
- 
--    $tar->read('origin.tgz',1);
-+    $tar->read('origin.tgz');
-     $tar->extract();
- 
-     $tar->add_files('file/foo.pl', 'docs/README');
-@@ -63,7 +67,9 @@
- 
-     $tar->rename('oldname', 'new/file/name');
- 
--    $tar->write('files.tar');
-+    $tar->write('files.tar');                   # plain tar
-+    $tar->write('files.tgz', COMPRESS_GZIP);    # gzip compressed
-+    $tar->write('files.tbz', COMPRESS_BZIP);    # bzip2 compressed
- 
- =head1 DESCRIPTION
- 
-@@ -122,23 +128,25 @@
-     return $obj;
- }
- 
--=head2 $tar->read ( $filename|$handle, $compressed, {opt => 'val'} )
-+=head2 $tar->read ( $filename|$handle, [$compressed, {opt => 'val'}] )
- 
- Read the given tar file into memory.
- The first argument can either be the name of a file or a reference to
- an already open filehandle (or an IO::Zlib object if it's compressed)
--The second argument indicates whether the file referenced by the first
--argument is compressed.
- 
- The C<read> will I<replace> any previous content in C<$tar>!
- 
--The second argument may be considered optional if IO::Zlib is
--installed, since it will transparently Do The Right Thing.
--Archive::Tar will warn if you try to pass a compressed file if
--IO::Zlib is not available and simply return.
-+The second argument may be considered optional, but remains for
-+backwards compatibility. Archive::Tar now looks at the file
-+magic to determine what class should be used to open the file
-+and will transparently Do The Right Thing.
-+
-+Archive::Tar will warn if you try to pass a bzip2 compressed file and the
-+IO::Zlib / IO::Uncompress::Bunzip2 modules are not available and simply return.
- 
- Note that you can currently B<not> pass a C<gzip> compressed
--filehandle, which is not opened with C<IO::Zlib>, nor a string
-+filehandle, which is not opened with C<IO::Zlib>, a C<bzip2> compressed
-+filehandle, which is not opened with C<IO::Uncompress::Bunzip2>, nor a string
- containing the full archive information (either compressed or
- uncompressed). These are worth while features, but not currently
- implemented. See the C<TODO> section.
-@@ -153,12 +161,18 @@
- Do not read more than C<limit> files. This is useful if you have
- very big archives, and are only interested in the first few files.
- 
-+=item filter
-+
-+Can be set to a regular expression.  Only files with names that match
-+the expression will be read.
-+
- =item extract
- 
- If set to true, immediately extract entries when reading them. This
- gives you the same memory break as the C<extract_archive> function.
- Note however that entries will not be read into memory, but written
--straight to disk.
-+straight to disk. This means no C<Archive::Tar::File> objects are
-+created for you to inspect.
- 
- =back
- 
-@@ -194,49 +208,97 @@
- }
- 
- sub _get_handle {
--    my $self = shift;
--    my $file = shift;   return unless defined $file;
--                        return $file if ref $file;
-+    my $self     = shift;
-+    my $file     = shift;   return unless defined $file;
-+                            return $file if ref $file;
-+    my $compress = shift || 0;
-+    my $mode     = shift || READ_ONLY->( ZLIB ); # default to read only
- 
--    my $gzip = shift || 0;
--    my $mode = shift || READ_ONLY->( ZLIB ); # default to read only
- 
--    my $fh; my $bin;
-+    ### get a FH opened to the right class, so we can use it transparently
-+    ### throughout the program
-+    my $fh;
-+    {   ### reading magic only makes sense if we're opening a file for
-+        ### reading. otherwise, just use what the user requested.
-+        my $magic = '';
-+        if( MODE_READ->($mode) ) {
-+            open my $tmp, $file or do {
-+                $self->_error( qq[Could not open '$file' for reading: $!] );
-+                return;
-+            };
- 
--    ### only default to ZLIB if we're not trying to /write/ to a handle ###
--    if( ZLIB and $gzip || MODE_READ->( $mode ) ) {
-+            ### read the first 4 bites of the file to figure out which class to
-+            ### use to open the file.
-+            sysread( $tmp, $magic, 4 );
-+            close $tmp;
-+        }
- 
--        ### IO::Zlib will Do The Right Thing, even when passed
--        ### a plain file ###
--        $fh = new IO::Zlib;
-+        ### is it bzip?
-+        ### if you asked specifically for bzip compression, or if we're in
-+        ### read mode and the magic numbers add up, use bzip
-+        if( BZIP and (
-+                ($compress eq COMPRESS_BZIP) or
-+                ( MODE_READ->($mode) and $magic =~ BZIP_MAGIC_NUM )
-+            )
-+        ) {
- 
--    } else {
--        if( $gzip ) {
--            $self->_error(qq[Compression not available - Install IO::Zlib!]);
--            return;
-+            ### different reader/writer modules, different error vars... sigh
-+            if( MODE_READ->($mode) ) {
-+                $fh = IO::Uncompress::Bunzip2->new( $file ) or do {
-+                    $self->_error( qq[Could not read '$file': ] .
-+                        $IO::Uncompress::Bunzip2::Bunzip2Error
-+                    );
-+                    return;
-+                };
-+
-+            } else {
-+                $fh = IO::Compress::Bzip2->new( $file ) or do {
-+                    $self->_error( qq[Could not write to '$file': ] .
-+                        $IO::Compress::Bzip2::Bzip2Error
-+                    );
-+                    return;
-+                };
-+            }
- 
-+        ### is it gzip?
-+        ### if you asked for compression, if you wanted to read or the gzip
-+        ### magic number is present (redundant with read)
-+        } elsif( ZLIB and (
-+                    $compress or MODE_READ->($mode) or $magic =~ GZIP_MAGIC_NUM
-+                 )
-+        ) {
-+            $fh = IO::Zlib->new;
-+
-+            unless( $fh->open( $file, $mode ) ) {
-+                $self->_error(qq[Could not create filehandle for '$file': $!]);
-+                return;
-+            }
-+
-+        ### is it plain tar?
-         } else {
--            $fh = new IO::File;
--            $bin++;
--        }
--    }
-+            $fh = IO::File->new;
- 
--    unless( $fh->open( $file, $mode ) ) {
--        $self->_error( qq[Could not create filehandle for '$file': $!!] );
--        return;
--    }
-+            unless( $fh->open( $file, $mode ) ) {
-+                $self->_error(qq[Could not create filehandle for '$file': $!]);
-+                return;
-+            }
- 
--    binmode $fh if $bin;
-+            ### enable bin mode on tar archives
-+            binmode $fh;
-+        }
-+    }
- 
-     return $fh;
- }
- 
-+
- sub _read_tar {
-     my $self    = shift;
-     my $handle  = shift or return;
-     my $opts    = shift || {};
- 
-     my $count   = $opts->{limit}    || 0;
-+    my $filter  = $opts->{filter};
-     my $extract = $opts->{extract}  || 0;
- 
-     ### set a cap on the amount of files to extract ###
-@@ -289,9 +351,9 @@
-         my $entry;
-         {   my %extra_args = ();
-             $extra_args{'name'} = $$real_name if defined $real_name;
--            
--            unless( $entry = Archive::Tar::File->new(   chunk => $chunk, 
--                                                        %extra_args ) 
-+
-+            unless( $entry = Archive::Tar::File->new(   chunk => $chunk,
-+                                                        %extra_args )
-             ) {
-                 $self->_error( qq[Couldn't read chunk at offset $offset] );
-                 next LOOP;
-@@ -372,6 +434,17 @@
-             undef $real_name;
-         }
- 
-+        ### skip this entry if we're filtering
-+        if ($filter && $entry->name !~ $filter) {
-+            next LOOP;
-+
-+        ### skip this entry if it's a pax header. This is a special file added
-+        ### by, among others, git-generated tarballs. It holds comments and is
-+        ### not meant for extracting. See #38932: pax_global_header extracted
-+        } elsif ( $entry->name eq PAX_HEADER ) {
-+            next LOOP;
-+        }
-+
-         $self->_extract_file( $entry ) if $extract
-                                             && !$entry->is_longlink
-                                             && !$entry->is_unknown
-@@ -410,7 +483,7 @@
- sub contains_file {
-     my $self = shift;
-     my $full = shift;
--    
-+
-     return unless defined $full;
- 
-     ### don't warn if the entry isn't there.. that's what this function
-@@ -449,7 +522,7 @@
-     ### you requested the extraction of only certian files
-     if( @args ) {
-         for my $file ( @args ) {
--            
-+
-             ### it's already an object?
-             if( UNIVERSAL::isa( $file, 'Archive::Tar::File' ) ) {
-                 push @files, $file;
-@@ -457,18 +530,18 @@
- 
-             ### go find it then
-             } else {
--            
-+
-                 my $found;
-                 for my $entry ( @{$self->_data} ) {
-                     next unless $file eq $entry->full_path;
--    
-+
-                     ### we found the file you're looking for
-                     push @files, $entry;
-                     $found++;
-                 }
--    
-+
-                 unless( $found ) {
--                    return $self->_error( 
-+                    return $self->_error(
-                         qq[Could not find '$file' in archive] );
-                 }
-             }
-@@ -544,56 +617,92 @@
- 
-     my $dir;
-     ### is $name an absolute path? ###
--    if( File::Spec->file_name_is_absolute( $dirs ) ) {
-+    if( $vol || File::Spec->file_name_is_absolute( $dirs ) ) {
- 
-         ### absolute names are not allowed to be in tarballs under
-         ### strict mode, so only allow it if a user tells us to do it
-         if( not defined $alt and not $INSECURE_EXTRACT_MODE ) {
--            $self->_error( 
-+            $self->_error(
-                 q[Entry ']. $entry->full_path .q[' is an absolute path. ].
-                 q[Not extracting absolute paths under SECURE EXTRACT MODE]
--            );  
-+            );
-             return;
-         }
--        
-+
-         ### user asked us to, it's fine.
--        $dir = $dirs;
-+        $dir = File::Spec->catpath( $vol, $dirs, "" );
- 
-     ### it's a relative path ###
-     } else {
--        my $cwd     = (defined $self->{cwd} ? $self->{cwd} : cwd());
-+        my $cwd     = (ref $self and defined $self->{cwd})
-+                        ? $self->{cwd}
-+                        : cwd();
- 
-         my @dirs = defined $alt
-             ? File::Spec->splitdir( $dirs )         # It's a local-OS path
-             : File::Spec::Unix->splitdir( $dirs );  # it's UNIX-style, likely
-                                                     # straight from the tarball
- 
--        ### paths that leave the current directory are not allowed under
--        ### strict mode, so only allow it if a user tells us to do this.
--        if( not defined $alt            and 
--            not $INSECURE_EXTRACT_MODE  and 
--            grep { $_ eq '..' } @dirs
-+        if( not defined $alt            and
-+            not $INSECURE_EXTRACT_MODE
-         ) {
--            $self->_error(
--                q[Entry ']. $entry->full_path .q[' is attempting to leave the ].
--                q[current working directory. Not extracting under SECURE ].
--                q[EXTRACT MODE]
--            );
--            return;
--        }            
--        
--        ### '.' is the directory delimiter, of which the first one has to
--        ### be escaped/changed.
--        map tr/\./_/, @dirs if ON_VMS;        
- 
--        my ($cwd_vol,$cwd_dir,$cwd_file) 
-+            ### paths that leave the current directory are not allowed under
-+            ### strict mode, so only allow it if a user tells us to do this.
-+            if( grep { $_ eq '..' } @dirs ) {
-+
-+                $self->_error(
-+                    q[Entry ']. $entry->full_path .q[' is attempting to leave ].
-+                    q[the current working directory. Not extracting under ].
-+                    q[SECURE EXTRACT MODE]
-+                );
-+                return;
-+            }
-+
-+            ### the archive may be asking us to extract into a symlink. This
-+            ### is not sane and a possible security issue, as outlined here:
-+            ### https://rt.cpan.org/Ticket/Display.html?id=30380
-+            ### https://bugzilla.redhat.com/show_bug.cgi?id=295021
-+            ### https://issues.rpath.com/browse/RPL-1716
-+            my $full_path = $cwd;
-+            for my $d ( @dirs ) {
-+                $full_path = File::Spec->catdir( $full_path, $d );
-+
-+                ### we've already checked this one, and it's safe. Move on.
-+                next if ref $self and $self->{_link_cache}->{$full_path};
-+
-+                if( -l $full_path ) {
-+                    my $to   = readlink $full_path;
-+                    my $diag = "symlinked directory ($full_path => $to)";
-+
-+                    $self->_error(
-+                        q[Entry ']. $entry->full_path .q[' is attempting to ].
-+                        qq[extract to a $diag. This is considered a security ].
-+                        q[vulnerability and not allowed under SECURE EXTRACT ].
-+                        q[MODE]
-+                    );
-+                    return;
-+                }
-+
-+                ### XXX keep a cache if possible, so the stats become cheaper:
-+                $self->{_link_cache}->{$full_path} = 1 if ref $self;
-+            }
-+        }
-+
-+        ### '.' is the directory delimiter on VMS, which has to be escaped
-+        ### or changed to '_' on vms.  vmsify is used, because older versions
-+        ### of vmspath do not handle this properly.
-+        ### Must not add a '/' to an empty directory though.
-+        map { length() ? VMS::Filespec::vmsify($_.'/') : $_ } @dirs if ON_VMS;
-+
-+        my ($cwd_vol,$cwd_dir,$cwd_file)
-                     = File::Spec->splitpath( $cwd );
-         my @cwd     = File::Spec->splitdir( $cwd_dir );
-         push @cwd, $cwd_file if length $cwd_file;
- 
-         ### We need to pass '' as the last elemant to catpath. Craig Berry
-         ### explains why (msgid <p0624083dc311ae541393@[172.16.52.1]>):
--        ### The root problem is that splitpath on UNIX always returns the 
-+        ### The root problem is that splitpath on UNIX always returns the
-         ### final path element as a file even if it is a directory, and of
-         ### course there is no way it can know the difference without checking
-         ### against the filesystem, which it is documented as not doing.  When
-@@ -602,11 +711,12 @@
-         ### know the result should be a directory.  I had thought you could omit
-         ### the file argument to catpath in such a case, but apparently on UNIX
-         ### you can't.
--        $dir        = File::Spec->catpath( 
--                            $cwd_vol, File::Spec->catdir( @cwd, @dirs ), '' 
-+        $dir        = File::Spec->catpath(
-+                            $cwd_vol, File::Spec->catdir( @cwd, @dirs ), ''
-                         );
- 
--        ### catdir() returns undef if the path is longer than 255 chars on VMS
-+        ### catdir() returns undef if the path is longer than 255 chars on
-+        ### older VMS systems.
-         unless ( defined $dir ) {
-             $^W && $self->_error( qq[Could not compose a path for '$dirs'\n] );
-             return;
-@@ -622,10 +732,11 @@
-     unless ( -d _ ) {
-         eval { File::Path::mkpath( $dir, 0, 0777 ) };
-         if( $@ ) {
--            $self->_error( qq[Could not create directory '$dir': $@] );
-+            my $fp = $entry->full_path;
-+            $self->_error(qq[Could not create directory '$dir' for '$fp': $@]);
-             return;
-         }
--        
-+
-         ### XXX chown here? that might not be the same as in the archive
-         ### as we're only chown'ing to the owner of the file we're extracting
-         ### not to the owner of the directory itself, which may or may not
-@@ -672,10 +783,15 @@
-         $self->_make_special_file( $entry, $full ) or return;
-     }
- 
--    utime time, $entry->mtime - TIME_OFFSET, $full or
--        $self->_error( qq[Could not update timestamp] );
-+    ### only update the timestamp if it's not a symlink; that will change the
-+    ### timestamp of the original. This addresses bug #33669: Could not update
-+    ### timestamp warning on symlinks
-+    if( not -l $full ) {
-+        utime time, $entry->mtime - TIME_OFFSET, $full or
-+            $self->_error( qq[Could not update timestamp] );
-+    }
- 
--    if( $CHOWN && CAN_CHOWN ) {
-+    if( $CHOWN && CAN_CHOWN->() ) {
-         chown $entry->uid, $entry->gid, $full or
-             $self->_error( qq[Could not set uid/gid on '$full'] );
-     }
-@@ -707,8 +823,8 @@
-                 or $fail++;
-         }
- 
--        $err =  qq[Making symbolink link from '] . $entry->linkname .
--                qq[' to '$file' failed] if $fail;
-+        $err =  qq[Making symbolic link '$file' to '] .
-+                $entry->linkname .q[' failed] if $fail;
- 
-     } elsif ( $entry->is_hardlink ) {
-         my $fail;
-@@ -949,17 +1065,23 @@
- 
- Write the in-memory archive to disk.  The first argument can either
- be the name of a file or a reference to an already open filehandle (a
--GLOB reference). If the second argument is true, the module will use
--IO::Zlib to write the file in a compressed format.  If IO::Zlib is
--not available, the C<write> method will fail and return.
-+GLOB reference).
-+
-+The second argument is used to indicate compression. You can either
-+compress using C<gzip> or C<bzip2>. If you pass a digit, it's assumed
-+to be the C<gzip> compression level (between 1 and 9), but the use of
-+constants is prefered:
-+
-+  # write a gzip compressed file
-+  $tar->write( 'out.tgz', COMPRESS_GZIP );
-+
-+  # write a bzip compressed file
-+  $tar->write( 'out.tbz', COMPRESS_BZIP );
- 
- Note that when you pass in a filehandle, the compression argument
- is ignored, as all files are printed verbatim to your filehandle.
- If you wish to enable compression with filehandles, use an
--C<IO::Zlib> filehandle instead.
--
--Specific levels of compression can be chosen by passing the values 2
--through 9 as the second parameter.
-+C<IO::Zlib> or C<IO::Compress::Bzip2> filehandle instead.
- 
- The third argument is an optional prefix. All files will be tucked
- away in the directory you specify as prefix. So if you have files
-@@ -970,6 +1092,7 @@
- archive as a string, which could be useful if you'd like to stuff the
- archive into a socket or a pipe to gzip or something.
- 
-+
- =cut
- 
- sub write {
-@@ -978,16 +1101,19 @@
-     my $gzip        = shift || 0;
-     my $ext_prefix  = shift; $ext_prefix = '' unless defined $ext_prefix;
-     my $dummy       = '';
--    
-+
-     ### only need a handle if we have a file to print to ###
-     my $handle = length($file)
-                     ? ( $self->_get_handle($file, $gzip, WRITE_ONLY->($gzip) )
-                         or return )
-                     : $HAS_PERLIO    ? do { open my $h, '>', \$dummy; $h }
--                    : $HAS_IO_STRING ? IO::String->new 
-+                    : $HAS_IO_STRING ? IO::String->new
-                     : __PACKAGE__->no_string_support();
- 
--
-+    ### Addresses: #41798: Nonempty $\ when writing a TAR file produces a
-+    ### corrupt TAR file. Must clear out $\ to make sure no garbage is
-+    ### printed to the archive
-+    local $\;
- 
-     for my $entry ( @{$self->_data} ) {
-         ### entries to be written to the tarfile ###
-@@ -999,7 +1125,7 @@
-         my $clone = $entry->clone;
- 
- 
--        ### so, if you don't want use to use the prefix, we'll stuff 
-+        ### so, if you don't want use to use the prefix, we'll stuff
-         ### everything in the name field instead
-         if( $DO_NOT_USE_PREFIX ) {
- 
-@@ -1106,7 +1232,7 @@
- 
-     ### make sure to close the handle;
-     close $handle;
--    
-+
-     return $rv;
- }
- 
-@@ -1177,6 +1303,10 @@
- Be aware that the file's type/creator and resource fork will be lost,
- which is usually what you want in cross-platform archives.
- 
-+Instead of a filename, you can also pass it an existing C<Archive::Tar::File>
-+object from, for example, another archive. The object will be clone, and
-+effectively be a copy of the original, not an alias.
-+
- Returns a list of C<Archive::Tar::File> objects that were just added.
- 
- =cut
-@@ -1187,6 +1317,15 @@
- 
-     my @rv;
-     for my $file ( @files ) {
-+
-+        ### you passed an Archive::Tar::File object
-+        ### clone it so we don't accidentally have a reference to
-+        ### an object from another archive
-+        if( UNIVERSAL::isa( $file,'Archive::Tar::File' ) ) {
-+            push @rv, $file->clone;
-+            next;
-+        }
-+
-         unless( -e $file || -l $file ) {
-             $self->_error( qq[No such file: '$file'] );
-             next;
-@@ -1313,9 +1452,9 @@
- =head2 $tar->setcwd( $cwd );
- 
- C<Archive::Tar> needs to know the current directory, and it will run
--C<Cwd::cwd()> I<every> time it extracts a I<relative> entry from the 
-+C<Cwd::cwd()> I<every> time it extracts a I<relative> entry from the
- tarfile and saves it in the file system. (As of version 1.30, however,
--C<Archive::Tar> will use the speed optimization described below 
-+C<Archive::Tar> will use the speed optimization described below
- automatically, so it's only relevant if you're using C<extract_file()>).
- 
- Since C<Archive::Tar> doesn't change the current directory internally
-@@ -1330,7 +1469,7 @@
- 
- once before calling a function like C<extract_file> and
- C<Archive::Tar> will use the current directory setting from then on
--and won't call C<Cwd::cwd()> internally. 
-+and won't call C<Cwd::cwd()> internally.
- 
- To switch back to the default behaviour, use
- 
-@@ -1341,7 +1480,7 @@
- If you're using C<Archive::Tar>'s C<exract()> method, C<setcwd()> will
- be called for you.
- 
--=cut 
-+=cut
- 
- sub setcwd {
-     my $self     = shift;
-@@ -1350,56 +1489,29 @@
-     $self->{cwd} = $cwd;
- }
- 
--=head2 $bool = $tar->has_io_string
--
--Returns true if we currently have C<IO::String> support loaded.
--
--Either C<IO::String> or C<perlio> support is needed to support writing 
--stringified archives. Currently, C<perlio> is the preferred method, if
--available.
--
--See the C<GLOBAL VARIABLES> section to see how to change this preference.
--
--=cut
--
--sub has_io_string { return $HAS_IO_STRING; }
--
--=head2 $bool = $tar->has_perlio
--
--Returns true if we currently have C<perlio> support loaded.
--
--This requires C<perl-5.8> or higher, compiled with C<perlio> 
--
--Either C<IO::String> or C<perlio> support is needed to support writing 
--stringified archives. Currently, C<perlio> is the preferred method, if
--available.
--
--See the C<GLOBAL VARIABLES> section to see how to change this preference.
--
--=cut
--
--sub has_perlio { return $HAS_PERLIO; }
--
--
- =head1 Class Methods
- 
--=head2 Archive::Tar->create_archive($file, $compression, @filelist)
-+=head2 Archive::Tar->create_archive($file, $compressed, @filelist)
- 
- Creates a tar file from the list of files provided.  The first
- argument can either be the name of the tar file to create or a
- reference to an open file handle (e.g. a GLOB reference).
- 
--The second argument specifies the level of compression to be used, if
--any.  Compression of tar files requires the installation of the
--IO::Zlib module.  Specific levels of compression may be
--requested by passing a value between 2 and 9 as the second argument.
--Any other value evaluating as true will result in the default
--compression level being used.
-+The second argument is used to indicate compression. You can either
-+compress using C<gzip> or C<bzip2>. If you pass a digit, it's assumed
-+to be the C<gzip> compression level (between 1 and 9), but the use of
-+constants is prefered:
-+
-+  # write a gzip compressed file
-+  Archive::Tar->create_archive( 'out.tgz', COMPRESS_GZIP, @filelist );
-+
-+  # write a bzip compressed file
-+  Archive::Tar->create_archive( 'out.tbz', COMPRESS_BZIP, @filelist );
- 
- Note that when you pass in a filehandle, the compression argument
- is ignored, as all files are printed verbatim to your filehandle.
- If you wish to enable compression with filehandles, use an
--C<IO::Zlib> filehandle instead.
-+C<IO::Zlib> or C<IO::Compress::Bzip2> filehandle instead.
- 
- The remaining arguments list the files to be included in the tar file.
- These files must all exist. Any files which don't exist or can't be
-@@ -1431,7 +1543,63 @@
-     return $tar->write( $file, $gzip );
- }
- 
--=head2 Archive::Tar->list_archive ($file, $compressed, [\@properties])
-+=head2 Archive::Tar->iter( $filename, [ $compressed, {opt => $val} ] )
-+
-+Returns an iterator function that reads the tar file without loading
-+it all in memory.  Each time the function is called it will return the
-+next file in the tarball. The files are returned as
-+C<Archive::Tar::File> objects. The iterator function returns the
-+empty list once it has exhausted the the files contained.
-+
-+The second argument can be a hash reference with options, which are
-+identical to the arguments passed to C<read()>.
-+
-+Example usage:
-+
-+    my $next = Archive::Tar->iter( "example.tar.gz", 1, {filter => qr/\.pm$/} );
-+
-+    while( my $f = $next->() ) {
-+        print $f->name, "\n";
-+
-+        $f->extract or warn "Extraction failed";
-+
-+        # ....
-+    }
-+
-+=cut
-+
-+
-+sub iter {
-+    my $class       = shift;
-+    my $filename    = shift or return;
-+    my $compressed  = shift or 0;
-+    my $opts        = shift || {};
-+
-+    ### get a handle to read from.
-+    my $handle = $class->_get_handle(
-+        $filename,
-+        $compressed,
-+        READ_ONLY->( ZLIB )
-+    ) or return;
-+
-+    my @data;
-+    return sub {
-+        return shift(@data)     if @data;       # more than one file returned?
-+        return                  unless $handle; # handle exhausted?
-+
-+        ### read data, should only return file
-+        @data = @{ $class->_read_tar($handle, { %$opts, limit => 1 }) };
-+
-+        ### return one piece of data
-+        return shift(@data)     if @data;
-+
-+        ### data is exhausted, free the filehandle
-+        undef $handle;
-+        return;
-+    };
-+}
-+
-+=head2 Archive::Tar->list_archive($file, $compressed, [\@properties])
- 
- Returns a list of the names of all the files in the archive.  The
- first argument can either be the name of the tar file to list or a
-@@ -1440,7 +1608,7 @@
- If C<list_archive()> is passed an array reference as its third
- argument it returns a list of hash references containing the requested
- properties of each file.  The following list of properties is
--supported: full_path, name, size, mtime (last modified date), mode, 
-+supported: full_path, name, size, mtime (last modified date), mode,
- uid, gid, linkname, uname, gname, devmajor, devminor, prefix.
- 
- See C<Archive::Tar::File> for details about supported properties.
-@@ -1462,7 +1630,7 @@
-     return $tar->list_files( @_ );
- }
- 
--=head2 Archive::Tar->extract_archive ($file, $gzip)
-+=head2 Archive::Tar->extract_archive($file, $compressed)
- 
- Extracts the contents of the tar file.  The first argument can either
- be the name of the tar file to create or a reference to an open file
-@@ -1486,11 +1654,57 @@
-     return $tar->read( $file, $gzip, { extract => 1 } );
- }
- 
-+=head2 $bool = Archive::Tar->has_io_string
-+
-+Returns true if we currently have C<IO::String> support loaded.
-+
-+Either C<IO::String> or C<perlio> support is needed to support writing
-+stringified archives. Currently, C<perlio> is the preferred method, if
-+available.
-+
-+See the C<GLOBAL VARIABLES> section to see how to change this preference.
-+
-+=cut
-+
-+sub has_io_string { return $HAS_IO_STRING; }
-+
-+=head2 $bool = Archive::Tar->has_perlio
-+
-+Returns true if we currently have C<perlio> support loaded.
-+
-+This requires C<perl-5.8> or higher, compiled with C<perlio>
-+
-+Either C<IO::String> or C<perlio> support is needed to support writing
-+stringified archives. Currently, C<perlio> is the preferred method, if
-+available.
-+
-+See the C<GLOBAL VARIABLES> section to see how to change this preference.
-+
-+=cut
-+
-+sub has_perlio { return $HAS_PERLIO; }
-+
-+=head2 $bool = Archive::Tar->has_zlib_support
-+
-+Returns true if C<Archive::Tar> can extract C<zlib> compressed archives
-+
-+=cut
-+
-+sub has_zlib_support { return ZLIB }
-+
-+=head2 $bool = Archive::Tar->has_bzip2_support
-+
-+Returns true if C<Archive::Tar> can extract C<bzip2> compressed archives
-+
-+=cut
-+
-+sub has_bzip2_support { return BZIP }
-+
- =head2 Archive::Tar->can_handle_compressed_files
- 
- A simple checking routine, which will return true if C<Archive::Tar>
--is able to uncompress compressed archives on the fly with C<IO::Zlib>,
--or false if C<IO::Zlib> is not installed.
-+is able to uncompress compressed archives on the fly with C<IO::Zlib>
-+and C<IO::Compress::Bzip2> or false if not both are installed.
- 
- You can use this as a shortcut to determine whether C<Archive::Tar>
- will do what you think before passing compressed archives to its
-@@ -1498,7 +1712,7 @@
- 
- =cut
- 
--sub can_handle_compressed_files { return ZLIB ? 1 : 0 }
-+sub can_handle_compressed_files { return ZLIB && BZIP ? 1 : 0 }
- 
- sub no_string_support {
-     croak("You have to install IO::String to support writing archives to strings");
-@@ -1542,13 +1756,13 @@
- 
- =head2 $Archive::Tar::DO_NOT_USE_PREFIX
- 
--By default, C<Archive::Tar> will try to put paths that are over 
-+By default, C<Archive::Tar> will try to put paths that are over
- 100 characters in the C<prefix> field of your tar header, as
--defined per POSIX-standard. However, some (older) tar programs 
--do not implement this spec. To retain compatibility with these older 
--or non-POSIX compliant versions, you can set the C<$DO_NOT_USE_PREFIX> 
--variable to a true value, and C<Archive::Tar> will use an alternate 
--way of dealing with paths over 100 characters by using the 
-+defined per POSIX-standard. However, some (older) tar programs
-+do not implement this spec. To retain compatibility with these older
-+or non-POSIX compliant versions, you can set the C<$DO_NOT_USE_PREFIX>
-+variable to a true value, and C<Archive::Tar> will use an alternate
-+way of dealing with paths over 100 characters by using the
- C<GNU Extended Header> feature.
- 
- Note that clients who do not support the C<GNU Extended Header>
-@@ -1589,11 +1803,11 @@
- 
- Allowing this could have security implications, as a malicious
- tar archive could alter or replace any file the extracting user
--has permissions to. Therefor, the default is to not allow 
--insecure extractions. 
-+has permissions to. Therefor, the default is to not allow
-+insecure extractions.
- 
--If you trust the archive, or have other reasons to allow the 
--archive to write files outside your current working directory, 
-+If you trust the archive, or have other reasons to allow the
-+archive to write files outside your current working directory,
- set this variable to C<true>.
- 
- Note that this is a backwards incompatible change from version
-@@ -1601,9 +1815,9 @@
- 
- =head2 $Archive::Tar::HAS_PERLIO
- 
--This variable holds a boolean indicating if we currently have 
-+This variable holds a boolean indicating if we currently have
- C<perlio> support loaded. This will be enabled for any perl
--greater than C<5.8> compiled with C<perlio>. 
-+greater than C<5.8> compiled with C<perlio>.
- 
- If you feel strongly about disabling it, set this variable to
- C<false>. Note that you will then need C<IO::String> installed
-@@ -1614,7 +1828,7 @@
- 
- =head2 $Archive::Tar::HAS_IO_STRING
- 
--This variable holds a boolean indicating if we currently have 
-+This variable holds a boolean indicating if we currently have
- C<IO::String> support loaded. This will be enabled for any perl
- that has a loadable C<IO::String> module.
- 
-@@ -1645,18 +1859,24 @@
- C<IO::Zlib> doesn't support C<seek> on their filehandles, there is little
- choice but to read the archive into memory.
- This is ok if you want to do in-memory manipulation of the archive.
-+
- If you just want to extract, use the C<extract_archive> class method
- instead. It will optimize and write to disk immediately.
- 
--=item Can't you lazy-load data instead?
-+Another option is to use the C<iter> class method to iterate over
-+the files in the tarball without reading them all in memory at once.
-+
-+=item Can you lazy-load data instead?
- 
--No, not easily. See previous question.
-+In some cases, yes. You can use the C<iter> class method to iterate
-+over the files in the tarball without reading them all in memory at once.
- 
- =item How much memory will an X kb tar file need?
- 
- Probably more than X kb, since it will all be read into memory. If
- this is a problem, and you don't need to do in memory manipulation
--of the archive, consider using C</bin/tar> instead.
-+of the archive, consider using the C<iter> class method, or C</bin/tar>
-+instead.
- 
- =item What do you do with unsupported filetypes in an archive?
- 
-@@ -1666,8 +1886,9 @@
- 
- This does require you to read the entire archive in to memory first,
- since otherwise we wouldn't know what data to fill the copy with.
--(This means that you cannot use the class methods on archives that
--have incompatible filetypes and still expect things to work).
-+(This means that you cannot use the class methods, including C<iter>
-+on archives that have incompatible filetypes and still expect things
-+to work).
- 
- For other filetypes, like C<chardevs> and C<blockdevs> we'll warn that
- the extraction of this particular item didn't work.
-@@ -1680,7 +1901,7 @@
- C<POSIX header prefix>. Non-POSIX-compatible clients may not support
- this part of the specification, and may only support the C<GNU Extended
- Header> functionality. To facilitate those clients, you can set the
--C<$Archive::Tar::DO_NOT_USE_PREFIX> variable to C<true>. See the 
-+C<$Archive::Tar::DO_NOT_USE_PREFIX> variable to C<true>. See the
- C<GLOBAL VARIABLES> section for details on this variable.
- 
- Note that GNU tar earlier than version 1.14 does not cope well with
-@@ -1696,9 +1917,9 @@
- based on your criteria. For example, to extract only files that have
- the string C<foo> in their title, you would use:
- 
--    $tar->extract( 
-+    $tar->extract(
-         grep { $_->full_path =~ /foo/ } $tar->get_files
--    ); 
-+    );
- 
- This way, you can filter on any attribute of the files in the archive.
- Consult the C<Archive::Tar::File> documentation on how to use these
-@@ -1775,22 +1996,22 @@
- 
-     $tar->add_data('file.txt', $data);
- 
--A opposite problem occurs if you extract a UTF8-encoded file from a 
-+A opposite problem occurs if you extract a UTF8-encoded file from a
- tarball. Using C<get_content()> on the C<Archive::Tar::File> object
- will return its content as a bytestring, not as a Unicode string.
- 
- If you want it to be a Unicode string (because you want character
- semantics with operations like regular expression matching), you need
--to decode the UTF8-encoded content and have Perl convert it into 
-+to decode the UTF8-encoded content and have Perl convert it into
- a Unicode string:
- 
-     use Encode;
-     my $data = $tar->get_content();
--    
-+
-     # Make it a Unicode string
-     $data = decode('utf8', $data);
- 
--There is no easy way to provide this functionality in C<Archive::Tar>, 
-+There is no easy way to provide this functionality in C<Archive::Tar>,
- because a tarball can contain many files, and each of which could be
- encoded in a different way.
- 
-@@ -1852,15 +2073,15 @@
- 
- =head1 ACKNOWLEDGEMENTS
- 
--Thanks to Sean Burke, Chris Nandor, Chip Salzenberg, Tim Heaney and
--especially Andrew Savige for their help and suggestions.
-+Thanks to Sean Burke, Chris Nandor, Chip Salzenberg, Tim Heaney, Gisle Aas
-+and especially Andrew Savige for their help and suggestions.
- 
- =head1 COPYRIGHT
- 
--This module is copyright (c) 2002 - 2007 Jos Boumans 
-+This module is copyright (c) 2002 - 2008 Jos Boumans
- E<lt>kane@cpan.orgE<gt>. All rights reserved.
- 
--This library is free software; you may redistribute and/or modify 
-+This library is free software; you may redistribute and/or modify
- it under the same terms as Perl itself.
- 
- =cut
diff --git a/perl-update-CGI.patch b/perl-update-CGI.patch
deleted file mode 100644
index 25355b1..0000000
--- a/perl-update-CGI.patch
+++ /dev/null
@@ -1,2058 +0,0 @@
-CGI.pm-3.43
-
-diff -urN perl-5.10.0.orig/lib/CGI/Carp.pm perl-5.10.0/lib/CGI/Carp.pm
---- perl-5.10.0.orig/lib/CGI/Carp.pm	2009-04-06 18:28:23.000000000 +0200
-+++ perl-5.10.0/lib/CGI/Carp.pm	2009-04-07 14:36:05.000000000 +0200
-@@ -323,7 +323,7 @@
- 
- $main::SIG{__WARN__}=\&CGI::Carp::warn;
- 
--$CGI::Carp::VERSION     = '1.29';
-+$CGI::Carp::VERSION     = '1.30_01';
- $CGI::Carp::CUSTOM_MSG  = undef;
- $CGI::Carp::DIE_HANDLER = undef;
- 
-@@ -575,6 +575,7 @@
-         print STDOUT $mess;
-     }
-     else {
-+        print STDOUT "Status: 500\n";
-         print STDOUT "Content-type: text/html\n\n";
-         print STDOUT $mess;
-     }
-diff -urN perl-5.10.0.orig/lib/CGI/Changes perl-5.10.0/lib/CGI/Changes
---- perl-5.10.0.orig/lib/CGI/Changes	2009-04-06 18:28:23.000000000 +0200
-+++ perl-5.10.0/lib/CGI/Changes	2009-04-07 14:36:12.000000000 +0200
-@@ -1,3 +1,74 @@
-+  Version 3.43
-+  1. Documentation patch from MARKSTOS@cpan.org to replace all occurrences of
-+  "new CGI" with CGI->new()" to reflect best perl practices.
-+  2. Patch from Stepan Kasal to fix utf-8 related problems in perl 5.10
-+
-+  Version 3.42
-+  1. Added patch from Renee Baecker that makes it possible to subclass
-+  CGI::Pretty.
-+  2. Added patch from Nicholas Clark to allow ~ characters in temporary directories.
-+  3. Added patch from Renee Baecker that fixes the inappropriate escaping of fields
-+     in multipart headers.
-+
-+  Version 3.41
-+  1. Fix url() returning incorrect path when query string contains escaped newline.
-+  2. Added additional windows temporary directories and environment variables, courtesy patch from Renee Baecker
-+  3. Added a handle() method to the lightweight upload
-+  filehandles. This method returns a real IO::Handle object.
-+  4. Added patch from Tony Vanlingen to fix deep recursion warnings in CGI::Pretty.
-+
-+  Version 3.40
-+  1. Fixed CGI::Fast docs to eliminate references to a "special"
-+  version of Perl.
-+  2. Makefile.PL now depends on FCGI so that CGI::Fast installs properly.
-+  3. Fix script_name() call from Stephane Chazelas.
-+
-+  Version 3.39
-+  1. Fixed regression in "exists" function when using tied interface to CGI via $q->Vars.
-+
-+  Version 3.38
-+  1. Fix annoying warning in http://rt.cpan.org/Ticket/Display.html?id=34551
-+  2. Added nobr() function http://rt.cpan.org/Ticket/Display.html?id=35377
-+  3. popup_menu() allows multiple items to be selected by default, satisfying
-+   http://rt.cpan.org/Ticket/Display.html?id=35376
-+  4. Patch from Renee Backer to avoid doubled <http-equiv> headers.
-+  5. Fixed documentation bug that describes what happens when a
-+  parameter is empty (e.g. "?test1=").
-+  6. Fixed minor warning described at http://rt.cpan.org/Public/Bug/Display.html?id=36435
-+  7. Fixed overlap of attribute and parameter space described in http://rt.perl.org/rt3//Ticket/Display.html?id=24294
-+
-+  Version 3.37
-+  1. Fix pragmas so that they persist over modperl invocations (e.g. RT 34761)
-+  2. Fixed handling of chunked multipart uploads; thanks to Michael Bernhardt
-+     who reported and fixed the problem.
-+
-+  Version 3.36
-+  1. Fix CGI::Cookie to support cookies that are separated by "," instead of ";".
-+
-+  Version 3.35
-+  1. Resync with bleadperl, primarily fixing a bug in parsing semicolons in uploaded filenames.
-+
-+  Version 3.34
-+  1. Handle Unicode %uXXXX  escapes properly -- patch from DANKOGAI@cpan.org
-+  2. Fix url() method to not choke on path names that contain regex characters.
-+
-+  Version 3.33
-+  1. Remove uninit variable warning when calling url(-relative=>1)
-+  2. Fix uninit variable warnings for two lc calls
-+  3. Fixed failure of tempfile upload due to sprintf() taint failure in perl 5.10
-+
-+  Version 3.32
-+  1. Patch from Miguel Santinho to prevent sending premature headers under mod_perl 2.0
-+
-+  Version 3.31
-+  1. Patch from Xavier Robin so that CGI::Carp issues a 500 Status code rather than a 200 status code.
-+  2. Patch from Alexander Klink to select correct temporary directory in OSX Leopard so that upload works.
-+  3. Possibly fixed "wrapped pack" error on 5.10 and higher.
-+
-+  Version 3.30
-+  1. Patch from Mike Barry to handle POSTDATA in the same way as PUT.
-+  2. Patch from Rafael Garcia-Suarez to correctly reencode unicode values as byte values.
-+
-   Version 3.29
-   1. The position of file handles is now reset to zero when CGI->new is called.
-     (Mark Stosberg)
-diff -urN perl-5.10.0.orig/lib/CGI/Cookie.pm perl-5.10.0/lib/CGI/Cookie.pm
---- perl-5.10.0.orig/lib/CGI/Cookie.pm	2009-04-06 18:28:23.000000000 +0200
-+++ perl-5.10.0/lib/CGI/Cookie.pm	2009-04-07 14:36:05.000000000 +0200
-@@ -13,7 +13,7 @@
- # wish, but if you redistribute a modified version, please attach a note
- # listing the modifications you have made.
- 
--$CGI::Cookie::VERSION='1.28';
-+$CGI::Cookie::VERSION='1.29';
- 
- use CGI::Util qw(rearrange unescape escape);
- use CGI;
-@@ -51,7 +51,7 @@
-    my %results;
-    my($key,$value);
-    
--   my(@pairs) = split("[;,] ?",$raw_cookie);
-+   my @pairs = split("[;,] ?",$raw_cookie);
-    foreach (@pairs) {
-      s/\s*(.*?)\s*/$1/;
-      if (/^([^=]+)=(.*)/) {
-@@ -88,7 +88,7 @@
-   my ($self,$raw_cookie) = @_;
-   my %results;
- 
--  my(@pairs) = split("; ?",$raw_cookie);
-+  my @pairs = split("[;,] ?",$raw_cookie);
-   foreach (@pairs) {
-     s/\s*(.*?)\s*/$1/;
-     my($key,$value) = split("=",$_,2);
-diff -urN perl-5.10.0.orig/lib/CGI/Fast.pm perl-5.10.0/lib/CGI/Fast.pm
---- perl-5.10.0.orig/lib/CGI/Fast.pm	2009-04-06 18:28:23.000000000 +0200
-+++ perl-5.10.0/lib/CGI/Fast.pm	2009-04-07 14:36:05.000000000 +0200
-@@ -55,6 +55,7 @@
-      }
-      }
-      CGI->_reset_globals;
-+     $self->_setup_symbols(@SAVED_SYMBOLS) if @CGI::SAVED_SYMBOLS;
-      return $CGI::Q = $self->SUPER::new($initializer, @param);
- }
- 
-@@ -81,18 +82,17 @@
- 
- =head1 DESCRIPTION
- 
--CGI::Fast is a subclass of the CGI object created by
--CGI.pm.  It is specialized to work well with the Open Market
--FastCGI standard, which greatly speeds up CGI scripts by
--turning them into persistently running server processes.  Scripts
--that perform time-consuming initialization processes, such as
--loading large modules or opening persistent database connections,
--will see large performance improvements.
-+CGI::Fast is a subclass of the CGI object created by CGI.pm.  It is
-+specialized to work well FCGI module, which greatly speeds up CGI
-+scripts by turning them into persistently running server processes.
-+Scripts that perform time-consuming initialization processes, such as
-+loading large modules or opening persistent database connections, will
-+see large performance improvements.
- 
- =head1 OTHER PIECES OF THE PUZZLE
- 
--In order to use CGI::Fast you'll need a FastCGI-enabled Web
--server. See http://www.fastcgi.com/ for details.
-+In order to use CGI::Fast you'll need the FCGI module.  See
-+http://www.cpan.org/ for details.
- 
- =head1 WRITING FASTCGI PERL SCRIPTS
- 
-@@ -105,7 +105,7 @@
- 
- A typical FastCGI script will look like this:
- 
--    #!/usr/local/bin/perl    # must be a FastCGI version of perl!
-+    #!/usr/bin/perl
-     use CGI::Fast;
-     &do_some_initialization();
-     while ($q = new CGI::Fast) {
-diff -urN perl-5.10.0.orig/lib/CGI/Pretty.pm perl-5.10.0/lib/CGI/Pretty.pm
---- perl-5.10.0.orig/lib/CGI/Pretty.pm	2009-04-06 18:28:23.000000000 +0200
-+++ perl-5.10.0/lib/CGI/Pretty.pm	2009-04-07 14:36:05.000000000 +0200
-@@ -176,6 +176,35 @@
- }
- sub _reset_globals { initialize_globals(); }
- 
-+# ugly, but quick fix
-+sub import {
-+    my $self = shift;
-+    no strict 'refs';
-+    ${ "$self\::AutoloadClass" } = 'CGI';
-+
-+    # This causes modules to clash.
-+    undef %CGI::EXPORT;
-+    undef %CGI::EXPORT;
-+
-+    $self->_setup_symbols(@_);
-+    my ($callpack, $callfile, $callline) = caller;
-+
-+    # To allow overriding, search through the packages
-+    # Till we find one in which the correct subroutine is defined.
-+    my @packages = ($self,@{"$self\:\:ISA"});
-+    foreach my $sym (keys %CGI::EXPORT) {
-+	my $pck;
-+	my $def = ${"$self\:\:AutoloadClass"} || $CGI::DefaultClass;
-+	foreach $pck (@packages) {
-+	    if (defined(&{"$pck\:\:$sym"})) {
-+		$def = $pck;
-+		last;
-+	    }
-+	}
-+	*{"${callpack}::$sym"} = \&{"$def\:\:$sym"};
-+    }
-+}
-+
- 1;
- 
- =head1 NAME
-diff -urN perl-5.10.0.orig/lib/CGI/Util.pm perl-5.10.0/lib/CGI/Util.pm
---- perl-5.10.0.orig/lib/CGI/Util.pm	2009-04-06 18:28:23.000000000 +0200
-+++ perl-5.10.0/lib/CGI/Util.pm	2009-04-07 14:36:12.000000000 +0200
-@@ -4,7 +4,7 @@
- use vars qw($VERSION @EXPORT_OK @ISA $EBCDIC @A2E @E2A);
- require Exporter;
- @ISA = qw(Exporter);
--@EXPORT_OK = qw(rearrange make_attributes unescape escape 
-+@EXPORT_OK = qw(rearrange rearrange_header make_attributes unescape escape 
- 		expires ebcdic2ascii ascii2ebcdic);
- 
- $VERSION = '1.5_01';
-@@ -70,16 +70,34 @@
- }
- 
- # Smart rearrangement of parameters to allow named parameter
--# calling.  We do the rearangement if:
-+# calling.  We do the rearrangement if:
- # the first parameter begins with a -
-+
- sub rearrange {
-+    my ($order,@param) = @_;
-+    my ($result, $leftover) = _rearrange_params( $order, @param );
-+    push @$result, make_attributes( $leftover, defined $CGI::Q ? $CGI::Q->{escape} : 1 ) 
-+	if keys %$leftover;
-+    @$result;
-+}
-+
-+sub rearrange_header {
-+    my ($order,@param) = @_;
-+
-+    my ($result,$leftover) = _rearrange_params( $order, @param );
-+    push @$result, make_attributes( $leftover, 0, 1 ) if keys %$leftover;
-+
-+    @$result;
-+}
-+
-+sub _rearrange_params {
-     my($order,@param) = @_;
--    return () unless @param;
-+    return [] unless @param;
- 
-     if (ref($param[0]) eq 'HASH') {
- 	@param = %{$param[0]};
-     } else {
--	return @param 
-+	return \@param 
- 	    unless (defined($param[0]) && substr($param[0],0,1) eq '-');
-     }
- 
-@@ -103,14 +121,17 @@
- 	}
-     }
- 
--    push (@result,make_attributes(\%leftover,defined $CGI::Q ? $CGI::Q->{escape} : 1)) if %leftover;
--    @result;
-+    return \@result, \%leftover;
- }
- 
- sub make_attributes {
-     my $attr = shift;
-     return () unless $attr && ref($attr) && ref($attr) eq 'HASH';
-     my $escape =  shift || 0;
-+    my $do_not_quote = shift;
-+
-+    my $quote = $do_not_quote ? '' : '"';
-+
-     my(@att);
-     foreach (keys %{$attr}) {
- 	my($key) = $_;
-@@ -122,7 +143,7 @@
- 	($key="\L$key") =~ tr/_/-/; # parameters are lower case, use dashes
- 
- 	my $value = $escape ? simple_escape($attr->{$_}) : $attr->{$_};
--	push(@att,defined($attr->{$_}) ? qq/$key="$value"/ : qq/$key/);
-+	push(@att,defined($attr->{$_}) ? qq/$key=$quote$value$quote/ : qq/$key/);
-     }
-     return @att;
- }
-@@ -141,8 +162,12 @@
- 
- sub utf8_chr {
-         my $c = shift(@_);
--	return chr($c) if $] >= 5.006;
--
-+	if ($] >= 5.006){
-+	    require utf8;
-+	    my $u = chr($c);
-+	    utf8::encode($u); # drop utf8 flag
-+	    return $u;
-+	}
-         if ($c < 0x80) {
-                 return sprintf("%c", $c);
-         } elsif ($c < 0x800) {
-@@ -185,10 +210,20 @@
-   my $todecode = shift;
-   return undef unless defined($todecode);
-   $todecode =~ tr/+/ /;       # pluses become spaces
--    $EBCDIC = "\t" ne "\011";
-     if ($EBCDIC) {
-       $todecode =~ s/%([0-9a-fA-F]{2})/chr $A2E[hex($1)]/ge;
-     } else {
-+	# handle surrogate pairs first -- dankogai
-+	$todecode =~ s{
-+			%u([Dd][89a-bA-B][0-9a-fA-F]{2}) # hi
-+		        %u([Dd][c-fC-F][0-9a-fA-F]{2})   # lo
-+		      }{
-+			  utf8_chr(
-+				   0x10000 
-+				   + (hex($1) - 0xD800) * 0x400 
-+				   + (hex($2) - 0xDC00)
-+				  )
-+		      }gex;
-       $todecode =~ s/%(?:([0-9a-fA-F]{2})|u([0-9a-fA-F]{4}))/
- 	defined($1)? chr hex($1) : utf8_chr(hex($2))/ge;
-     }
-@@ -196,12 +231,24 @@
- }
- 
- # URL-encode data
-+#
-+# We cannot use the %u escapes, they were rejected by W3C, so the official
-+# way is %XX-escaped utf-8 encoding.
-+# Naturally, Unicode strings have to be converted to their utf-8 byte
-+# representation.  (No action is required on 5.6.)
-+# Byte strings were traditionally used directly as a sequence of octets.
-+# This worked if they actually represented binary data (i.e. in CGI::Compress).
-+# This also worked if these byte strings were actually utf-8 encoded; e.g.,
-+# when the source file used utf-8 without the apropriate "use utf8;".
-+# This fails if the byte string is actually a Latin 1 encoded string, but it
-+# was always so and cannot be fixed without breaking the binary data case.
-+# -- Stepan Kasal <skasal@redhat.com>
-+#
- sub escape {
-   shift() if @_ > 1 and ( ref($_[0]) || (defined $_[1] && $_[0] eq $CGI::DefaultClass));
-   my $toencode = shift;
-   return undef unless defined($toencode);
--  # force bytes while preserving backward compatibility -- dankogai
--  $toencode = pack("C*", unpack("U0C*", $toencode));
-+  utf8::encode($toencode) if ($] > 5.007 && utf8::is_utf8($toencode));
-     if ($EBCDIC) {
-       $toencode=~s/([^a-zA-Z0-9_.~-])/uc sprintf("%%%02x",$E2A[ord($1)])/eg;
-     } else {
-diff -urN perl-5.10.0.orig/lib/CGI/t/request.t perl-5.10.0/lib/CGI/t/request.t
---- perl-5.10.0.orig/lib/CGI/t/request.t	2009-04-06 18:28:23.000000000 +0200
-+++ perl-5.10.0/lib/CGI/t/request.t	2009-04-07 14:36:05.000000000 +0200
-@@ -4,7 +4,7 @@
- ######################### We start with some black magic to print on failure.
- use lib '.','../blib/lib','../blib/arch';
- 
--BEGIN {$| = 1; print "1..33\n"; }
-+BEGIN {$| = 1; print "1..34\n"; }
- END {print "not ok 1\n" unless $loaded;}
- use CGI ();
- use Config;
-@@ -74,6 +74,7 @@
- test(29,$p->{bar} eq 'froz',"tied interface fetch");
- $p->{bar} = join("\0",qw(foo bar baz));
- test(30,join(' ',$q->param('bar')) eq 'foo bar baz','tied interface store');
-+test(31,exists $p->{bar});
- 
- # test posting
- $q->_reset_globals;
-@@ -88,11 +89,11 @@
-     exit 0;
-   }
-   # at this point, we're in a new (child) process
--  test(31,$q=new CGI,"CGI::new() from POST");
--  test(32,$q->param('weather') eq 'nice',"CGI::param() from POST");
--  test(33,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
-+  test(32,$q=new CGI,"CGI::new() from POST");
-+  test(33,$q->param('weather') eq 'nice',"CGI::param() from POST");
-+  test(34,$q->url_param('big_balls') eq 'basketball',"CGI::url_param()");
- } else {
--  print "ok 31 # Skip\n";
-   print "ok 32 # Skip\n";
-   print "ok 33 # Skip\n";
-+  print "ok 34 # Skip\n";
- }
-diff -urN perl-5.10.0.orig/lib/CGI/t/util-58.t perl-5.10.0/lib/CGI/t/util-58.t
---- perl-5.10.0.orig/lib/CGI/t/util-58.t	2009-04-06 18:28:07.000000000 +0200
-+++ perl-5.10.0/lib/CGI/t/util-58.t	2009-04-07 14:36:12.000000000 +0200
-@@ -1,16 +1,29 @@
-+# test CGI::Util::escape
-+use Test::More tests => 4;
-+use_ok("CGI::Util");
-+
-+# Byte strings should be escaped byte by byte:
-+# 1) not a valid utf-8 sequence:
-+my $uri = "pe\x{f8}\x{ed}\x{e8}ko.ogg";
-+is(CGI::Util::escape($uri), "pe%F8%ED%E8ko.ogg", "Escape a Latin-2 string");
-+
-+# 2) is a valid utf-8 sequence, but not an UTF-8-flagged string
-+#    This happens often: people write utf-8 strings to source, but forget
-+#    to tell perl about it by "use utf8;"--this is obviously wrong, but we
-+#    have to handle it gracefully, for compatibility with GCI.pm under
-+#    perl-5.8.x
- #
--# This tests CGI::Util::escape() when fed with UTF-8-flagged string
--# -- dankogai
--BEGIN {
--    if ($] < 5.008) {
--       print "1..0 # \$] == $] < 5.008\n";
--       exit(0);
--    }
--}
-+$uri = "pe\x{c5}\x{99}\x{c3}\x{ad}\x{c4}\x{8d}ko.ogg";
-+is(CGI::Util::escape($uri), "pe%C5%99%C3%AD%C4%8Dko.ogg",
-+	"Escape an utf-8 byte string");
- 
--use Test::More tests => 2;
--use_ok("CGI::Util");
--my $uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
--is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
--   "# Escape string with UTF-8 flag");
-+SKIP:
-+{
-+	# This tests CGI::Util::escape() when fed with UTF-8-flagged string
-+	# -- dankogai
-+	skip("Unicode strings not available in $]", 1) if ($] < 5.008);
-+	$uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
-+	is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
-+   		"Escape string with UTF-8 flag");
-+}
- __END__
-diff -urN perl-5.10.0.orig/lib/CGI.pm perl-5.10.0/lib/CGI.pm
---- perl-5.10.0.orig/lib/CGI.pm	2009-04-06 18:28:23.000000000 +0200
-+++ perl-5.10.0/lib/CGI.pm	2009-04-07 14:36:12.000000000 +0200
-@@ -18,13 +18,13 @@
- # The most recent version and complete docs are available at:
- #   http://stein.cshl.org/WWW/software/CGI/
- 
--$CGI::revision = '$Id: CGI.pm,v 1.234 2007/04/16 16:58:46 lstein Exp $';
--$CGI::VERSION='3.29';
-+$CGI::revision = '$Id: CGI.pm,v 1.263 2009/02/11 16:56:37 lstein Exp $';
-+$CGI::VERSION='3.43';
- 
- # HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES.
- # UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING.
- # $CGITempFile::TMPDIRECTORY = '/usr/tmp';
--use CGI::Util qw(rearrange make_attributes unescape escape expires ebcdic2ascii ascii2ebcdic);
-+use CGI::Util qw(rearrange rearrange_header make_attributes unescape escape expires ebcdic2ascii ascii2ebcdic);
- 
- #use constant XHTML_DTD => ['-//W3C//DTD XHTML Basic 1.0//EN',
- #                           'http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd'];
-@@ -37,7 +37,12 @@
-   $TAINTED = substr("$0$^X",0,0);
- }
- 
--$MOD_PERL = 0; # no mod_perl by default
-+$MOD_PERL            = 0; # no mod_perl by default
-+
-+#global settings
-+$POST_MAX            = -1; # no limit to uploaded files
-+$DISABLE_UPLOADS     = 0;
-+
- @SAVED_SYMBOLS = ();
- 
- 
-@@ -91,13 +96,6 @@
-     # it can just be renamed, instead of read and written.
-     $CLOSE_UPLOAD_FILES = 0;
- 
--    # Set this to a positive value to limit the size of a POSTing
--    # to a certain number of bytes:
--    $POST_MAX = -1;
--
--    # Change this to 1 to disable uploads entirely:
--    $DISABLE_UPLOADS = 0;
--
-     # Automatically determined -- don't change
-     $EBCDIC = 0;
- 
-@@ -111,6 +109,9 @@
-     # use CGI qw(-no_undef_params);
-     $NO_UNDEF_PARAMS = 0;
- 
-+    # return everything as utf-8
-+    $PARAM_UTF8      = 0;
-+
-     # Other globals that you shouldn't worry about.
-     undef $Q;
-     $BEEN_THERE = 0;
-@@ -226,7 +227,7 @@
- 			   tt u i b blockquote pre img a address cite samp dfn html head
- 			   base body Link nextid title meta kbd start_html end_html
- 			   input Select option comment charset escapeHTML/],
--		':html3'=>[qw/div table caption th td TR Tr sup Sub strike applet Param 
-+		':html3'=>[qw/div table caption th td TR Tr sup Sub strike applet Param nobr
- 			   embed basefont style span layer ilayer font frameset frame script small big Area Map/],
-                 ':html4'=>[qw/abbr acronym bdo col colgroup del fieldset iframe
-                             ins label legend noframes noscript object optgroup Q 
-@@ -293,10 +294,10 @@
-     # To allow overriding, search through the packages
-     # Till we find one in which the correct subroutine is defined.
-     my @packages = ($self,@{"$self\:\:ISA"});
--    foreach $sym (keys %EXPORT) {
-+    for $sym (keys %EXPORT) {
- 	my $pck;
- 	my $def = ${"$self\:\:AutoloadClass"} || $DefaultClass;
--	foreach $pck (@packages) {
-+	for $pck (@packages) {
- 	    if (defined(&{"$pck\:\:$sym"})) {
- 		$def = $pck;
- 		last;
-@@ -316,7 +317,7 @@
-     return ("start_$1","end_$1") if $tag=~/^(?:\*|start_|end_)(.+)/;
-     my(@r);
-     return ($tag) unless $EXPORT_TAGS{$tag};
--    foreach (@{$EXPORT_TAGS{$tag}}) {
-+    for (@{$EXPORT_TAGS{$tag}}) {
- 	push(@r,&expand_tags($_));
-     }
-     return @r;
-@@ -352,6 +353,7 @@
-       $self->r(Apache->request) unless $self->r;
-       my $r = $self->r;
-       $r->register_cleanup(\&CGI::_reset_globals);
-+      $self->_setup_symbols(@SAVED_SYMBOLS) if @SAVED_SYMBOLS;
-     }
-     else {
-       # XXX: once we have the new API
-@@ -360,6 +362,7 @@
-       my $r = $self->r;
-       $r->subprocess_env unless exists $ENV{REQUEST_METHOD};
-       $r->pool->cleanup_register(\&CGI::_reset_globals);
-+      $self->_setup_symbols(@SAVED_SYMBOLS) if @SAVED_SYMBOLS;
-     }
-     undef $NPH;
-   }
-@@ -378,7 +381,7 @@
- sub DESTROY {
-   my $self = shift;
-   if ($OS eq 'WINDOWS') {
--    foreach my $href (values %{$self->{'.tmpfiles'}}) {
-+    for my $href (values %{$self->{'.tmpfiles'}}) {
-       $href->{hndl}->DESTROY if defined $href->{hndl};
-       $href->{name}->DESTROY if defined $href->{name};
-     }
-@@ -430,30 +433,29 @@
- 	if (substr($p[0],0,1) eq '-') {
- 	    @values = defined($value) ? (ref($value) && ref($value) eq 'ARRAY' ? @{$value} : $value) : ();
- 	} else {
--	    foreach ($value,@other) {
-+	    for ($value,@other) {
- 		push(@values,$_) if defined($_);
- 	    }
- 	}
- 	# If values is provided, then we set it.
- 	if (@values or defined $value) {
- 	    $self->add_parameter($name);
--	    $self->{$name}=[@values];
-+	    $self->{param}{$name}=[@values];
- 	}
-     } else {
- 	$name = $p[0];
-     }
- 
--    return unless defined($name) && $self->{$name};
-+    return unless defined($name) && $self->{param}{$name};
- 
--    my $charset = $self->charset || '';
--    my $utf8    = $charset eq 'utf-8';
--    if ($utf8) {
--      eval "require Encode; 1;" if $utf8 && !Encode->can('decode'); # bring in these functions
--      return wantarray ? map {Encode::decode(utf8=>$_) } @{$self->{$name}} 
--                       : Encode::decode(utf8=>$self->{$name}->[0]);
--    } else {
--      return wantarray ? @{$self->{$name}} : $self->{$name}->[0];
-+    my @result = @{$self->{param}{$name}};
-+
-+    if ($PARAM_UTF8) {
-+      eval "require Encode; 1;" unless Encode->can('decode'); # bring in these functions
-+      @result = map {ref $_ ? $_ : Encode::decode(utf8=>$_) } @result;
-     }
-+
-+    return wantarray ?  @result : $result[0];
- }
- 
- sub self_or_default {
-@@ -486,7 +488,7 @@
- 
- # Initialize the query object from the environment.
- # If a parameter list is found, this object will be set
--# to an associative array in which parameter names are keys
-+# to a hash in which parameter names are keys
- # and the values are stored as lists
- # If a keyword list is found, this method creates a bogus
- # parameter list with the single parameter 'keywords'.
-@@ -574,14 +576,14 @@
-                       $self->add_parameter($param);
-                       $self->read_from_client(\$value,$content_length,0)
-                         if $content_length > 0;
--                      push (@{$self->{$param}},$value);
-+                      push (@{$self->{param}{$param}},$value);
-                       $is_xforms = 1;
-               } elsif ($ENV{'CONTENT_TYPE'} =~ /multipart\/related.+boundary=\"?([^\";,]+)\"?.+start=\"?\<?([^\"\>]+)\>?\"?/) {
-                       my($boundary,$start) = ($1,$2);
-                       my($param) = 'XForms:Model';
-                       $self->add_parameter($param);
-                       my($value) = $self->read_multipart_related($start,$boundary,$content_length,0);
--                      push (@{$self->{$param}},$value);
-+                      push (@{$self->{param}{$param}},$value);
-                       if ($MOD_PERL) {
-                               $query_string = $self->r->args;
-                       } else {
-@@ -601,7 +603,7 @@
- 	      last METHOD;
- 	  }
- 	  if (ref($initializer) && ref($initializer) eq 'HASH') {
--	      foreach (keys %$initializer) {
-+	      for (keys %$initializer) {
- 		  $self->param('-name'=>$_,'-value'=>$initializer->{$_});
- 	      }
- 	      last METHOD;
-@@ -641,7 +643,7 @@
- 	  last METHOD;
-       }
- 
--      if ($meth eq 'POST') {
-+      if ($meth eq 'POST' || $meth eq 'PUT') {
- 	  $self->read_from_client(\$query_string,$content_length,0)
- 	      if $content_length > 0;
- 	  # Some people want to have their cake and eat it too!
-@@ -667,13 +669,13 @@
-   }
- 
- # YL: Begin Change for XML handler 10/19/2001
--    if (!$is_xforms && $meth eq 'POST'
-+    if (!$is_xforms && ($meth eq 'POST' || $meth eq 'PUT')
-         && defined($ENV{'CONTENT_TYPE'})
-         && $ENV{'CONTENT_TYPE'} !~ m|^application/x-www-form-urlencoded|
- 	&& $ENV{'CONTENT_TYPE'} !~ m|^multipart/form-data| ) {
--        my($param) = 'POSTDATA' ;
-+        my($param) = $meth . 'DATA' ;
-         $self->add_parameter($param) ;
--      push (@{$self->{$param}},$query_string);
-+      push (@{$self->{param}{$param}},$query_string);
-       undef $query_string ;
-     }
- # YL: End Change for XML handler 10/19/2001
-@@ -685,7 +687,7 @@
- 	    $self->parse_params($query_string);
- 	} else {
- 	    $self->add_parameter('keywords');
--	    $self->{'keywords'} = [$self->parse_keywordlist($query_string)];
-+	    $self->{param}{'keywords'} = [$self->parse_keywordlist($query_string)];
- 	}
-     }
- 
-@@ -695,9 +697,9 @@
-       $self->delete_all();
-     }
- 
--    # Associative array containing our defined fieldnames
-+    # hash containing our defined fieldnames
-     $self->{'.fieldnames'} = {};
--    foreach ($self->param('.cgifields')) {
-+    for ($self->param('.cgifields')) {
- 	$self->{'.fieldnames'}->{$_}++;
-     }
-     
-@@ -750,9 +752,9 @@
-     # again, we initialize ourselves in exactly the same way.  This allows
-     # us to have several of these objects.
-     @QUERY_PARAM = $self->param; # save list of parameters
--    foreach (@QUERY_PARAM) {
-+    for (@QUERY_PARAM) {
-       next unless defined $_;
--      $QUERY_PARAM{$_}=$self->{$_};
-+      $QUERY_PARAM{$_}=$self->{param}{$_};
-     }
-     $QUERY_CHARSET = $self->charset;
-     %QUERY_FIELDNAMES = %{$self->{'.fieldnames'}};
-@@ -763,7 +765,7 @@
-     my($self,$tosplit) = @_;
-     my(@pairs) = split(/[&;]/,$tosplit);
-     my($param,$value);
--    foreach (@pairs) {
-+    for (@pairs) {
- 	($param,$value) = split('=',$_,2);
- 	next unless defined $param;
- 	next if $NO_UNDEF_PARAMS and not defined $value;
-@@ -771,7 +773,7 @@
- 	$param = unescape($param);
- 	$value = unescape($value);
- 	$self->add_parameter($param);
--	push (@{$self->{$param}},$value);
-+	push (@{$self->{param}{$param}},$value);
-     }
- }
- 
-@@ -779,7 +781,7 @@
-     my($self,$param)=@_;
-     return unless defined $param;
-     push (@{$self->{'.parameters'}},$param) 
--	unless defined($self->{$param});
-+	unless defined($self->{param}{$param});
- }
- 
- sub all_parameters {
-@@ -897,13 +899,14 @@
-     # to avoid reexporting unwanted variables
-     undef %EXPORT;
- 
--    foreach (@_) {
-+    for (@_) {
- 	$HEADERS_ONCE++,         next if /^[:-]unique_headers$/;
- 	$NPH++,                  next if /^[:-]nph$/;
- 	$NOSTICKY++,             next if /^[:-]nosticky$/;
- 	$DEBUG=0,                next if /^[:-]no_?[Dd]ebug$/;
- 	$DEBUG=2,                next if /^[:-][Dd]ebug$/;
- 	$USE_PARAM_SEMICOLONS++, next if /^[:-]newstyle_urls$/;
-+	$PARAM_UTF8++,           next if /^[:-]utf8$/;
- 	$XHTML++,                next if /^[:-]xhtml$/;
- 	$XHTML=0,                next if /^[:-]no_?xhtml$/;
- 	$USE_PARAM_SEMICOLONS=0, next if /^[:-]oldstyle_urls$/;
-@@ -925,7 +928,7 @@
- 	    next;
- 	}
- 
--	foreach (&expand_tags($_)) {
-+	for (&expand_tags($_)) {
- 	    tr/a-zA-Z0-9_//cd;  # don't allow weird function names
- 	    $EXPORT{$_}++;
- 	}
-@@ -1003,9 +1006,9 @@
-     my(@names) = rearrange([NAME],@p);
-     my @to_delete = ref($names[0]) eq 'ARRAY' ? @$names[0] : @names;
-     my %to_delete;
--    foreach my $name (@to_delete)
-+    for my $name (@to_delete)
-     {
--        CORE::delete $self->{$name};
-+        CORE::delete $self->{param}{$name};
-         CORE::delete $self->{'.fieldnames'}->{$name};
-         $to_delete{$name}++;
-     }
-@@ -1025,7 +1028,7 @@
-     die "Can't import names into \"main\"\n" if \%{"${namespace}::"} == \%::;
-     if ($delete || $MOD_PERL || exists $ENV{'FCGI_ROLE'}) {
- 	# can anyone find an easier way to do this?
--	foreach (keys %{"${namespace}::"}) {
-+	for (keys %{"${namespace}::"}) {
- 	    local *symbol = "${namespace}::${_}";
- 	    undef $symbol;
- 	    undef @symbol;
-@@ -1033,7 +1036,7 @@
- 	}
-     }
-     my($param,@value,$var);
--    foreach $param ($self->param) {
-+    for $param ($self->param) {
- 	# protect against silly names
- 	($var = $param)=~tr/a-zA-Z0-9_/_/c;
- 	$var =~ s/^(?=\d)/_/;
-@@ -1054,8 +1057,8 @@
- sub keywords {
-     my($self,@values) = self_or_default(@_);
-     # If values is provided, then we set it.
--    $self->{'keywords'}=[@values] if @values;
--    my(@result) = defined($self->{'keywords'}) ? @{$self->{'keywords'}} : ();
-+    $self->{param}{'keywords'}=[@values] if @values;
-+    my(@result) = defined($self->{param}{'keywords'}) ? @{$self->{param}{'keywords'}} : ();
-     @result;
- }
- END_OF_FUNC
-@@ -1173,7 +1176,7 @@
- 
- 'EXISTS' => <<'END_OF_FUNC',
- sub EXISTS {
--    exists $_[0]->{$_[1]};
-+    exists $_[0]->{param}{$_[1]};
- }
- END_OF_FUNC
- 
-@@ -1200,7 +1203,7 @@
-     my(@values) = defined($value) ? (ref($value) ? @{$value} : $value) : ();
-     if (@values) {
- 	$self->add_parameter($name);
--	push(@{$self->{$name}},@values);
-+	push(@{$self->{param}{$name}},@values);
-     }
-     return $self->param($name);
- }
-@@ -1267,7 +1270,7 @@
- 	if ($ENV{QUERY_STRING} =~ /=/) {
- 	    my(@pairs) = split(/[&;]/,$ENV{QUERY_STRING});
- 	    my($param,$value);
--	    foreach (@pairs) {
-+	    for (@pairs) {
- 		($param,$value) = split('=',$_,2);
- 		$param = unescape($param);
- 		$value = unescape($value);
-@@ -1295,11 +1298,11 @@
-     my($param,$value,@result);
-     return '<ul></ul>' unless $self->param;
-     push(@result,"<ul>");
--    foreach $param ($self->param) {
-+    for $param ($self->param) {
- 	my($name)=$self->escapeHTML($param);
- 	push(@result,"<li><strong>$param</strong></li>");
- 	push(@result,"<ul>");
--	foreach $value ($self->param($param)) {
-+	for $value ($self->param($param)) {
- 	    $value = $self->escapeHTML($value);
-             $value =~ s/\n/<br \/>\n/g;
- 	    push(@result,"<li>$value</li>");
-@@ -1332,14 +1335,14 @@
-     my($param);
-     local($,) = '';  # set print field separator back to a sane value
-     local($\) = '';  # set output line separator to a sane value
--    foreach $param ($self->param) {
-+    for $param ($self->param) {
- 	my($escaped_param) = escape($param);
- 	my($value);
--	foreach $value ($self->param($param)) {
-+	for $value ($self->param($param)) {
- 	    print $filehandle "$escaped_param=",escape("$value"),"\n";
- 	}
-     }
--    foreach (keys %{$self->{'.fieldnames'}}) {
-+    for (keys %{$self->{'.fieldnames'}}) {
-           print $filehandle ".cgifields=",escape("$_"),"\n";
-     }
-     print $filehandle "=\n";    # end of record
-@@ -1378,7 +1381,7 @@
- 'multipart_init' => <<'END_OF_FUNC',
- sub multipart_init {
-     my($self,@p) = self_or_default(@_);
--    my($boundary,@other) = rearrange([BOUNDARY],@p);
-+    my($boundary,@other) = rearrange_header([BOUNDARY],@p);
-     $boundary = $boundary || '------- =_aaaaaaaaaa0';
-     $self->{'separator'} = "$CRLF--$boundary$CRLF";
-     $self->{'final_separator'} = "$CRLF--$boundary--$CRLF";
-@@ -1408,7 +1411,7 @@
- 
-     # rearrange() was designed for the HTML portion, so we
-     # need to fix it up a little.
--    foreach (@other) {
-+    for (@other) {
-         # Don't use \s because of perl bug 21951
-         next unless my($header,$value) = /([^ \r\n\t=]+)=\"?(.+?)\"?$/;
- 	($_ = $header) =~ s/^(\w)(.*)/$1 . lc ($2) . ': '.$self->unescapeHTML($value)/e;
-@@ -1477,7 +1480,7 @@
- 
-     # rearrange() was designed for the HTML portion, so we
-     # need to fix it up a little.
--    foreach (@other) {
-+    for (@other) {
-         # Don't use \s because of perl bug 21951
-         next unless my($header,$value) = /([^ \r\n\t=]+)=\"?(.+?)\"?$/;
-         ($_ = $header) =~ s/^(\w)(.*)/"\u$1\L$2" . ': '.$self->unescapeHTML($value)/e;
-@@ -1503,7 +1506,7 @@
-     # push all the cookies -- there may be several
-     if ($cookie) {
- 	my(@cookie) = ref($cookie) && ref($cookie) eq 'ARRAY' ? @{$cookie} : $cookie;
--	foreach (@cookie) {
-+	for (@cookie) {
-             my $cs = UNIVERSAL::isa($_,'CGI::Cookie') ? $_->as_string : $_;
- 	    push(@header,"Set-Cookie: $cs") if $cs ne '';
- 	}
-@@ -1519,7 +1522,7 @@
-     push(@header,map {ucfirst $_} @other);
-     push(@header,"Content-Type: $type") if $type ne '';
-     my $header = join($CRLF,@header)."${CRLF}${CRLF}";
--    if ($MOD_PERL and not $nph) {
-+    if (($MOD_PERL >= 1) && !$nph) {
-         $self->r->send_cgi_header($header);
-         return '';
-     }
-@@ -1556,7 +1559,7 @@
-     $status = '302 Found' unless defined $status;
-     $url ||= $self->self_url;
-     my(@o);
--    foreach (@other) { tr/\"//d; push(@o,split("=",$_,2)); }
-+    for (@other) { tr/\"//d; push(@o,split("=",$_,2)); }
-     unshift(@o,
- 	 '-Status'  => $status,
- 	 '-Location'=> $url,
-@@ -1659,16 +1662,26 @@
-     }
- 
-     if ($meta && ref($meta) && (ref($meta) eq 'HASH')) {
--	foreach (keys %$meta) { push(@result,$XHTML ? qq(<meta name="$_" content="$meta->{$_}" />) 
-+	for (keys %$meta) { push(@result,$XHTML ? qq(<meta name="$_" content="$meta->{$_}" />) 
- 			: qq(<meta name="$_" content="$meta->{$_}">)); }
-     }
- 
--    push(@result,ref($head) ? @$head : $head) if $head;
-+    my $meta_bits_set = 0;
-+    if( $head ) {
-+        if( ref $head ) {
-+            push @result, @$head;
-+            $meta_bits_set = 1 if grep { /http-equiv=["']Content-Type/i }@$head;
-+        }
-+        else {
-+            push @result, $head;
-+            $meta_bits_set = 1 if $head =~ /http-equiv=["']Content-Type/i;
-+        }
-+    }
- 
-     # handle the infrequently-used -style and -script parameters
-     push(@result,$self->_style($style))   if defined $style;
-     push(@result,$self->_script($script)) if defined $script;
--    push(@result,$meta_bits)              if defined $meta_bits;
-+    push(@result,$meta_bits)              if defined $meta_bits and !$meta_bits_set;
- 
-     # handle -noscript parameter
-     push(@result,<<END) if $noscript;
-@@ -1699,6 +1712,7 @@
-     my $cdata_end   = $XHTML ? "\n/* ]]> */-->\n" : " -->\n";
- 
-     my @s = ref($style) eq 'ARRAY' ? @$style : $style;
-+    my $other = '';
- 
-     for my $s (@s) {
-       if (ref($s)) {
-@@ -1708,11 +1722,11 @@
-                        ref($s) eq 'ARRAY' ? @$s : %$s));
-        my $type = defined $stype ? $stype : 'text/css';
-        my $rel  = $alternate ? 'alternate stylesheet' : 'stylesheet';
--       my $other = @other ? join ' ',@other : '';
-+       $other = "@other" if @other;
- 
-        if (ref($src) eq "ARRAY") # Check to see if the $src variable is an array reference
-        { # If it is, push a LINK tag for each one
--           foreach $src (@$src)
-+           for $src (@$src)
-          {
-            push(@result,$XHTML ? qq(<link rel="$rel" type="$type" href="$src" $other/>)
-                              : qq(<link rel="$rel" type="$type" href="$src"$other>)) if $src;
-@@ -1726,10 +1740,10 @@
-         }
-      if ($verbatim) {
-            my @v = ref($verbatim) eq 'ARRAY' ? @$verbatim : $verbatim;
--           push(@result, "<style type=\"text/css\">\n$_\n</style>") foreach @v;
-+           push(@result, "<style type=\"text/css\">\n$_\n</style>") for @v;
-       }
-       my @c = ref($code) eq 'ARRAY' ? @$code : $code if $code;
--      push(@result,style({'type'=>$type},"$cdata_start\n$_\n$cdata_end")) foreach @c;
-+      push(@result,style({'type'=>$type},"$cdata_start\n$_\n$cdata_end")) for @c;
- 
-       } else {
-            my $src = $s;
-@@ -1747,7 +1761,7 @@
-     my (@result);
- 
-     my (@scripts) = ref($script) eq 'ARRAY' ? @$script : ($script);
--    foreach $script (@scripts) {
-+    for $script (@scripts) {
- 	my($src,$code,$language);
- 	if (ref($script)) { # script is a hash
- 	    ($src,$code,$type) =
-@@ -1831,7 +1845,7 @@
-     my($method,$action,$enctype,@other) = 
- 	rearrange([METHOD,ACTION,ENCTYPE],@p);
- 
--    $method  = $self->escapeHTML(lc($method) || 'post');
-+    $method  = $self->escapeHTML(lc($method || 'post'));
-     $enctype = $self->escapeHTML($enctype || &URL_ENCODED);
-     if (defined $action) {
-        $action = $self->escapeHTML($action);
-@@ -2147,8 +2161,9 @@
- sub checkbox {
-     my($self,@p) = self_or_default(@_);
- 
--    my($name,$checked,$value,$label,$override,$tabindex,@other) = 
--	rearrange([NAME,[CHECKED,SELECTED,ON],VALUE,LABEL,[OVERRIDE,FORCE],TABINDEX],@p);
-+    my($name,$checked,$value,$label,$labelattributes,$override,$tabindex,@other) =
-+       rearrange([NAME,[CHECKED,SELECTED,ON],VALUE,LABEL,LABELATTRIBUTES,
-+                   [OVERRIDE,FORCE],TABINDEX],@p);
- 
-     $value = defined $value ? $value : 'on';
- 
-@@ -2165,7 +2180,8 @@
-     my($other) = @other ? "@other " : '';
-     $tabindex = $self->element_tab($tabindex);
-     $self->register_parameter($name);
--    return $XHTML ? CGI::label(qq{<input type="checkbox" name="$name" value="$value" $tabindex$checked$other/>$the_label})
-+    return $XHTML ? CGI::label($labelattributes,
-+                    qq{<input type="checkbox" name="$name" value="$value" $tabindex$checked$other/>$the_label})
-                   : qq{<input type="checkbox" name="$name" value="$value"$checked$other>$the_label};
- }
- END_OF_FUNC
-@@ -2192,9 +2208,11 @@
-          else {
- 	     $toencode =~ s{"}{&quot;}gso;
-          }
--         my $latin = uc $self->{'.charset'} eq 'ISO-8859-1' ||
--                     uc $self->{'.charset'} eq 'WINDOWS-1252';
--         if ($latin) {  # bug in some browsers
-+         # Handle bug in some browsers with Latin charsets
-+         if ($self->{'.charset'} &&
-+             (uc($self->{'.charset'}) eq 'ISO-8859-1' ||
-+              uc($self->{'.charset'}) eq 'WINDOWS-1252'))
-+         {
-                 $toencode =~ s{'}{&#39;}gso;
-                 $toencode =~ s{\x8b}{&#8249;}gso;
-                 $toencode =~ s{\x9b}{&#8250;}gso;
-@@ -2251,7 +2269,7 @@
-     my($row,$column);
-     unshift(@colheaders,'') if @colheaders && @rowheaders;
-     $result .= "<tr>" if @colheaders;
--    foreach (@colheaders) {
-+    for (@colheaders) {
- 	$result .= "<th>$_</th>";
-     }
-     for ($row=0;$row<$rows;$row++) {
-@@ -2280,7 +2298,7 @@
- #   $linebreak -> (optional) Set to true to place linebreaks
- #             between the buttons.
- #   $labels -> (optional)
--#             A pointer to an associative array of labels to print next to each checkbox
-+#             A pointer to a hash of labels to print next to each checkbox
- #             in the form $label{'value'}="Long explanatory label".
- #             Otherwise the provided values are used as the labels.
- # Returns:
-@@ -2308,7 +2326,7 @@
- #   $linebreak -> (optional) Set to true to place linebreaks
- #             between the buttons.
- #   $labels -> (optional)
--#             A pointer to an associative array of labels to print next to each checkbox
-+#             A pointer to a hash of labels to print next to each checkbox
- #             in the form $label{'value'}="Long explanatory label".
- #             Otherwise the provided values are used as the labels.
- # Returns:
-@@ -2327,13 +2345,14 @@
-     my $self     = shift;
-     my $box_type = shift;
- 
--    my($name,$values,$defaults,$linebreak,$labels,$attributes,
--       $rows,$columns,$rowheaders,$colheaders,
-+    my($name,$values,$defaults,$linebreak,$labels,$labelattributes,
-+       $attributes,$rows,$columns,$rowheaders,$colheaders,
-        $override,$nolabels,$tabindex,$disabled,@other) =
--       rearrange([      NAME,[VALUES,VALUE],[DEFAULT,DEFAULTS],LINEBREAK,LABELS,ATTRIBUTES,
--		        ROWS,[COLUMNS,COLS],[ROWHEADERS,ROWHEADER],[COLHEADERS,COLHEADER],
--			[OVERRIDE,FORCE],NOLABELS,TABINDEX,DISABLED
--                 ],@_);
-+        rearrange([NAME,[VALUES,VALUE],[DEFAULT,DEFAULTS],LINEBREAK,LABELS,LABELATTRIBUTES,
-+                       ATTRIBUTES,ROWS,[COLUMNS,COLS],[ROWHEADERS,ROWHEADER],[COLHEADERS,COLHEADER],
-+                       [OVERRIDE,FORCE],NOLABELS,TABINDEX,DISABLED
-+                  ],@_);
-+
- 
-     my($result,$checked,@elements,@values);
- 
-@@ -2361,11 +2380,11 @@
- 
-     # for disabling groups of radio/checkbox buttons
-     my %disabled;
--    foreach (@{$disabled}) {
-+    for (@{$disabled}) {
-    	$disabled{$_}=1;
-     }
- 
--    foreach (@values) {
-+    for (@values) {
-     	 my $disable="";
- 	 if ($disabled{$_}) {
- 		$disable="disabled='1'";
-@@ -2393,7 +2412,7 @@
- 
-         if ($XHTML) {
-            push @elements,
--              CGI::label(
-+              CGI::label($labelattributes,
-                    qq(<input type="$box_type" name="$name" value="$_" $checkit$other$tab$attribs$disable/>$label)).${break};
-         } else {
-             push(@elements,qq/<input type="$box_type" name="$name" value="$_"$checkit$other$tab$attribs$disable>${label}${break}/);
-@@ -2415,7 +2434,7 @@
- #             text of each menu item.
- #   $default -> (optional) Default item to display
- #   $labels -> (optional)
--#             A pointer to an associative array of labels to print next to each checkbox
-+#             A pointer to a hash of labels to print next to each checkbox
- #             in the form $label{'value'}="Long explanatory label".
- #             Otherwise the provided values are used as the labels.
- # Returns:
-@@ -2428,12 +2447,14 @@
-     my($name,$values,$default,$labels,$attributes,$override,$tabindex,@other) =
-        rearrange([NAME,[VALUES,VALUE],[DEFAULT,DEFAULTS],LABELS,
-        ATTRIBUTES,[OVERRIDE,FORCE],TABINDEX],@p);
--    my($result,$selected);
-+    my($result,%selected);
- 
-     if (!$override && defined($self->param($name))) {
--	$selected = $self->param($name);
--    } else {
--	$selected = $default;
-+	$selected{$self->param($name)}++;
-+    } elsif ($default) {
-+	%selected = map {$_=>1} ref($default) eq 'ARRAY' 
-+                                ? @$default 
-+                                : $default;
-     }
-     $name=$self->escapeHTML($name);
-     my($other) = @other ? " @other" : '';
-@@ -2442,22 +2463,24 @@
-     @values = $self->_set_values_and_labels($values,\$labels,$name);
-     $tabindex = $self->element_tab($tabindex);
-     $result = qq/<select name="$name" $tabindex$other>\n/;
--    foreach (@values) {
-+    for (@values) {
-         if (/<optgroup/) {
--            foreach (split(/\n/)) {
-+            for my $v (split(/\n/)) {
-                 my $selectit = $XHTML ? 'selected="selected"' : 'selected';
--                s/(value="$selected")/$selectit $1/ if defined $selected;
--                $result .= "$_\n";
-+		for my $selected (keys %selected) {
-+		    $v =~ s/(value="$selected")/$selectit $1/;
-+		}
-+                $result .= "$v\n";
-             }
-         }
-         else {
--          my $attribs = $self->_set_attributes($_, $attributes);
--	  my($selectit) = defined($selected) ? $self->_selected($selected eq $_) : '';
--	  my($label) = $_;
--	  $label = $labels->{$_} if defined($labels) && defined($labels->{$_});
--	  my($value) = $self->escapeHTML($_);
--	  $label=$self->escapeHTML($label,1);
--          $result .= "<option${attribs} ${selectit}value=\"$value\">$label</option>\n";
-+          my $attribs   = $self->_set_attributes($_, $attributes);
-+	  my($selectit) = $self->_selected($selected{$_});
-+	  my($label)    = $_;
-+	  $label        = $labels->{$_} if defined($labels) && defined($labels->{$_});
-+	  my($value)    = $self->escapeHTML($_);
-+	  $label        = $self->escapeHTML($label,1);
-+          $result      .= "<option${attribs} ${selectit}value=\"$value\">$label</option>\n";
-         }
-     }
- 
-@@ -2474,7 +2497,7 @@
- #   $values -> A pointer to a regular array containing the
- #              values for each option line in the group.
- #   $labels -> (optional)
--#              A pointer to an associative array of labels to print next to each item
-+#              A pointer to a hash of labels to print next to each item
- #              in the form $label{'value'}="Long explanatory label".
- #              Otherwise the provided values are used as the labels.
- #   $labeled -> (optional)
-@@ -2501,9 +2524,9 @@
- 
-     $name=$self->escapeHTML($name);
-     $result = qq/<optgroup label="$name"$other>\n/;
--    foreach (@values) {
-+    for (@values) {
-         if (/<optgroup/) {
--            foreach (split(/\n/)) {
-+            for (split(/\n/)) {
-                 my $selectit = $XHTML ? 'selected="selected"' : 'selected';
-                 s/(value="$selected")/$selectit $1/ if defined $selected;
-                 $result .= "$_\n";
-@@ -2541,7 +2564,7 @@
- #   $size -> (optional) Size of the list.
- #   $multiple -> (optional) If set, allow multiple selections.
- #   $labels -> (optional)
--#             A pointer to an associative array of labels to print next to each checkbox
-+#             A pointer to a hash of labels to print next to each checkbox
- #             in the form $label{'value'}="Long explanatory label".
- #             Otherwise the provided values are used as the labels.
- # Returns:
-@@ -2560,6 +2583,7 @@
-     $size = $size || scalar(@values);
- 
-     my(%selected) = $self->previous_or_default($name,$defaults,$override);
-+
-     my($is_multiple) = $multiple ? qq/ multiple="multiple"/ : '';
-     my($has_size) = $size ? qq/ size="$size"/: '';
-     my($other) = @other ? " @other" : '';
-@@ -2567,7 +2591,7 @@
-     $name=$self->escapeHTML($name);
-     $tabindex = $self->element_tab($tabindex);
-     $result = qq/<select name="$name" $tabindex$has_size$is_multiple$other>\n/;
--    foreach (@values) {
-+    for (@values) {
- 	my($selectit) = $self->_selected($selected{$_});
- 	my($label) = $_;
- 	$label = $labels->{$_} if defined($labels) && defined($labels->{$_});
-@@ -2607,7 +2631,7 @@
- 	@value = ref($default) ? @{$default} : $default;
- 	$do_override = $override;
-     } else {
--	foreach ($default,$override,@other) {
-+	for ($default,$override,@other) {
- 	    push(@value,$_) if defined($_);
- 	}
-     }
-@@ -2617,7 +2641,7 @@
-     @value = @prev if !$do_override && @prev;
- 
-     $name=$self->escapeHTML($name);
--    foreach (@value) {
-+    for (@value) {
- 	$_ = defined($_) ? $self->escapeHTML($_,1) : '';
- 	push @result,$XHTML ? qq(<input type="hidden" name="$name" value="$_" @other />)
-                             : qq(<input type="hidden" name="$name" value="$_" @other>);
-@@ -2692,12 +2716,13 @@
-     my $request_uri =  unescape($self->request_uri) || '';
-     my $query_str   =  $self->query_string;
- 
--    my $rewrite_in_use = $request_uri && $request_uri !~ /^$script_name/;
-+    my $rewrite_in_use = $request_uri && $request_uri !~ /^\Q$script_name/;
-     undef $path if $rewrite_in_use && $rewrite;  # path not valid when rewriting active
- 
-     my $uri         =  $rewrite && $request_uri ? $request_uri : $script_name;
--    $uri            =~ s/\?.*$//;                                 # remove query string
--    $uri            =~ s/\Q$path\E$//      if defined $path;      # remove path
-+    $uri            =~ s/\?.*$//s;                                # remove query string
-+    $uri            =~ s/\Q$ENV{PATH_INFO}\E$// if defined $ENV{PATH_INFO};
-+#    $uri            =~ s/\Q$path\E$//      if defined $path;      # remove path
- 
-     if ($full) {
- 	my $protocol = $self->protocol();
-@@ -2723,6 +2748,7 @@
- 
-     $url .= $path         if $path_info and defined $path;
-     $url .= "?$query_str" if $query     and $query_str ne '';
-+    $url ||= '';
-     $url =~ s/([^a-zA-Z0-9_.%;&?\/\\:+=~-])/sprintf("%%%02X",ord($1))/eg;
-     return $url;
- }
-@@ -2793,12 +2819,12 @@
- sub param_fetch {
-     my($self,@p) = self_or_default(@_);
-     my($name) = rearrange([NAME],@p);
--    unless (exists($self->{$name})) {
-+    unless (exists($self->{param}{$name})) {
- 	$self->add_parameter($name);
--	$self->{$name} = [];
-+	$self->{param}{$name} = [];
-     }
-     
--    return $self->{$name};
-+    return $self->{param}{$name};
- }
- END_OF_FUNC
- 
-@@ -2824,30 +2850,58 @@
- }
- END_OF_FUNC
- 
--# WE USE THIS TO COMPENSATE FOR A BUG IN APACHE 2 PRESENT AT LEAST UP THROUGH 2.0.54
-+# This function returns a potentially modified version of SCRIPT_NAME
-+# and PATH_INFO. Some HTTP servers do sanitise the paths in those
-+# variables. It is the case of at least Apache 2. If for instance the
-+# user requests: /path/./to/script.cgi/x//y/z/../x?y, Apache will set:
-+# REQUEST_URI=/path/./to/script.cgi/x//y/z/../x?y
-+# SCRIPT_NAME=/path/to/env.cgi
-+# PATH_INFO=/x/y/x
-+#
-+# This is all fine except that some bogus CGI scripts expect
-+# PATH_INFO=/http://foo when the user requests
-+# http://xxx/script.cgi/http://foo
-+#
-+# Old versions of this module used to accomodate with those scripts, so
-+# this is why we do this here to keep those scripts backward compatible.
-+# Basically, we accomodate with those scripts but within limits, that is
-+# we only try to preserve the number of / that were provided by the user
-+# if $REQUEST_URI and "$SCRIPT_NAME$PATH_INFO" only differ by the number
-+# of consecutive /.
-+#
-+# So for instance, in: http://foo/x//y/script.cgi/a//b, we'll return a
-+# script_name of /x//y/script.cgi and a path_info of /a//b, but in:
-+# http://foo/./x//z/script.cgi/a/../b//c, we'll return the versions
-+# possibly sanitised by the HTTP server, so in the case of Apache 2:
-+# script_name == /foo/x/z/script.cgi and path_info == /b/c.
-+#
-+# Future versions of this module may no longer do that, so one should
-+# avoid relying on the browser, proxy, server, and CGI.pm preserving the
-+# number of consecutive slashes as no guarantee can be made there.
- '_name_and_path_from_env' => <<'END_OF_FUNC',
- sub _name_and_path_from_env {
--   my $self = shift;
--   my $raw_script_name = $ENV{SCRIPT_NAME} || '';
--   my $raw_path_info   = $ENV{PATH_INFO}   || '';
--   my $uri             = unescape($self->request_uri) || '';
--
--   my $protected    = quotemeta($raw_path_info);
--   $raw_script_name =~ s/$protected$//;
--
--   my @uri_double_slashes  = $uri =~ m^(/{2,}?)^g;
--   my @path_double_slashes = "$raw_script_name $raw_path_info" =~ m^(/{2,}?)^g;
--
--   my $apache_bug      = @uri_double_slashes != @path_double_slashes;
--   return ($raw_script_name,$raw_path_info) unless $apache_bug;
--
--   my $path_info_search = quotemeta($raw_path_info);
--   $path_info_search    =~ s!/!/+!g;
--   if ($uri =~ m/^(.+)($path_info_search)/) {
--       return ($1,$2);
--   } else {
--       return ($raw_script_name,$raw_path_info);
--   }
-+    my $self = shift;
-+    my $script_name = $ENV{SCRIPT_NAME}  || '';
-+    my $path_info   = $ENV{PATH_INFO}    || '';
-+    my $uri         = $self->request_uri || '';
-+
-+    $uri =~ s/\?.*//s;
-+    $uri = unescape($uri);
-+
-+    if ($uri ne "$script_name$path_info") {
-+        my $script_name_pattern = quotemeta($script_name);
-+        my $path_info_pattern = quotemeta($path_info);
-+        $script_name_pattern =~ s{(?:\\/)+}{/+}g;
-+        $path_info_pattern =~ s{(?:\\/)+}{/+}g;
-+
-+        if ($uri =~ /^($script_name_pattern)($path_info_pattern)$/s) {
-+            # REQUEST_URI and SCRIPT_NAME . PATH_INFO only differ by the
-+            # numer of consecutive slashes, so we can extract the info from
-+            # REQUEST_URI:
-+            ($script_name, $path_info) = ($1, $2);
-+        }
-+    }
-+    return ($script_name,$path_info);
- }
- END_OF_FUNC
- 
-@@ -2899,15 +2953,15 @@
- sub query_string {
-     my($self) = self_or_default(@_);
-     my($param,$value,@pairs);
--    foreach $param ($self->param) {
-+    for $param ($self->param) {
- 	my($eparam) = escape($param);
--	foreach $value ($self->param($param)) {
-+	for $value ($self->param($param)) {
- 	    $value = escape($value);
-             next unless defined $value;
- 	    push(@pairs,"$eparam=$value");
- 	}
-     }
--    foreach (keys %{$self->{'.fieldnames'}}) {
-+    for (keys %{$self->{'.fieldnames'}}) {
-       push(@pairs,".cgifields=".escape("$_"));
-     }
-     return join($USE_PARAM_SEMICOLONS ? ';' : '&',@pairs);
-@@ -2931,9 +2985,11 @@
-     my($self,$search) = self_or_CGI(@_);
-     my(%prefs,$type,$pref,$pat);
-     
--    my(@accept) = split(',',$self->http('accept'));
-+    my(@accept) = defined $self->http('accept') 
-+                ? split(',',$self->http('accept'))
-+                : ();
- 
--    foreach (@accept) {
-+    for (@accept) {
- 	($pref) = /q=(\d\.\d+|\d+)/;
- 	($type) = m#(\S+/[^;]+)#;
- 	next unless $type;
-@@ -2952,7 +3008,7 @@
-     return $prefs{$search} if $prefs{$search};
- 
-     # Didn't get it, so try pattern matching.
--    foreach (keys %prefs) {
-+    for (keys %prefs) {
- 	next unless /\*/;       # not a pattern match
- 	($pat = $_) =~ s/([^\w*])/\\$1/g; # escape meta characters
- 	$pat =~ s/\*/.*/g; # turn it into a pattern
-@@ -3133,7 +3189,7 @@
-     $parameter =~ tr/-/_/;
-     return $ENV{"HTTP_\U$parameter\E"} if $parameter;
-     my(@p);
--    foreach (keys %ENV) {
-+    for (keys %ENV) {
- 	push(@p,$_) if /^HTTP/;
-     }
-     return @p;
-@@ -3152,7 +3208,7 @@
-     $parameter =~ tr/-/_/;
-     return $ENV{"HTTPS_\U$parameter\E"} if $parameter;
-     my(@p);
--    foreach (keys %ENV) {
-+    for (keys %ENV) {
- 	push(@p,$_) if /^HTTPS/;
-     }
-     return @p;
-@@ -3284,10 +3340,10 @@
- 
-     if (!$override && ($self->{'.fieldnames'}->{$name} || 
- 		       defined($self->param($name)) ) ) {
--	grep($selected{$_}++,$self->param($name));
-+	$selected{$_}++ for $self->param($name);
-     } elsif (defined($defaults) && ref($defaults) && 
- 	     (ref($defaults) eq 'ARRAY')) {
--	grep($selected{$_}++,@{$defaults});
-+	$selected{$_}++ for @{$defaults};
-     } else {
- 	$selected{$defaults}++ if defined($defaults);
-     }
-@@ -3326,7 +3382,7 @@
- 	$input = join(" ",@lines);
- 	@words = &shellwords($input);    
-     }
--    foreach (@words) {
-+    for (@words) {
- 	s/\\=/%3D/g;
- 	s/\\&/%26/g;	    
-     }
-@@ -3368,11 +3424,20 @@
- 	    return;
- 	}
- 
-+	$header{'Content-Disposition'} ||= ''; # quench uninit variable warning
-+
- 	my($param)= $header{'Content-Disposition'}=~/ name="([^"]*)"/;
-         $param .= $TAINTED;
- 
--	# Bug:  Netscape doesn't escape quotation marks in file names!!!
--	my($filename) = $header{'Content-Disposition'}=~/ filename="([^"]*)"/;
-+        # See RFC 1867, 2183, 2045
-+        # NB: File content will be loaded into memory should
-+        # content-disposition parsing fail.
-+        my ($filename) = $header{'Content-Disposition'}
-+	               =~/ filename=(("[^"]*")|([a-z\d!\#'\*\+,\.^_\`\{\}\|\~]*))/i;
-+
-+	$filename ||= ''; # quench uninit variable warning
-+
-+        $filename =~ s/^"([^"]*)"$/$1/;
- 	# Test for Opera's multiple upload feature
- 	my($multipart) = ( defined( $header{'Content-Type'} ) &&
- 		$header{'Content-Type'} =~ /multipart\/mixed/ ) ?
-@@ -3386,7 +3451,7 @@
- 	if ( ( !defined($filename) || $filename eq '' ) && !$multipart ) {
- 	    my($value) = $buffer->readBody;
-             $value .= $TAINTED;
--	    push(@{$self->{$param}},$value);
-+	    push(@{$self->{param}{$param}},$value);
- 	    next;
- 	}
- 
-@@ -3423,7 +3488,7 @@
- 	  # together with the body for later parsing with an external
- 	  # MIME parser module
- 	  if ( $multipart ) {
--	      foreach ( keys %header ) {
-+	      for ( keys %header ) {
- 		  print $filehandle "$_: $header{$_}${CRLF}";
- 	      }
- 	      print $filehandle "${CRLF}";
-@@ -3431,7 +3496,7 @@
- 
- 	  my ($data);
- 	  local($\) = '';
--          my $totalbytes;
-+          my $totalbytes = 0;
-           while (defined($data = $buffer->read)) {
-               if (defined $self->{'.upload_hook'})
-                {
-@@ -3462,7 +3527,7 @@
- 	      name => $tmpfile,
- 	      info => {%header},
- 	  };
--	  push(@{$self->{$param}},$filehandle);
-+	  push(@{$self->{param}{$param}},$filehandle);
-       }
-     }
- }
-@@ -3564,7 +3629,7 @@
- 	      name => $tmpfile,
- 	      info => {%header},
- 	  };
--	  push(@{$self->{$param}},$filehandle);
-+	  push(@{$self->{param}{$param}},$filehandle);
-       }
-     }
-     return $returnvalue;
-@@ -3616,7 +3681,7 @@
-     my($element, $attributes) = @_;
-     return '' unless defined($attributes->{$element});
-     $attribs = ' ';
--    foreach my $attrib (keys %{$attributes->{$element}}) {
-+    for my $attrib (keys %{$attributes->{$element}}) {
-         (my $clean_attrib = $attrib) =~ s/^-//;
-         $attribs .= "@{[lc($clean_attrib)]}=\"$attributes->{$element}{$attrib}\" ";
-     }
-@@ -3627,7 +3692,7 @@
- 
- '_compile_all' => <<'END_OF_FUNC',
- sub _compile_all {
--    foreach (@_) {
-+    for (@_) {
- 	next if defined(&$_);
- 	$AUTOLOAD = "CGI::$_";
- 	_compile();
-@@ -3645,6 +3710,7 @@
- 
- ################### Fh -- lightweight filehandle ###############
- package Fh;
-+
- use overload 
-     '""'  => \&asString,
-     'cmp' => \&compare,
-@@ -3696,7 +3762,7 @@
-     (my $safename = $name) =~ s/([':%])/ sprintf '%%%02X', ord $1 /eg;
-     my $fv = ++$FH . $safename;
-     my $ref = \*{"Fh::$fv"};
--    $file =~ m!^([a-zA-Z0-9_ \'\":/.\$\\-]+)$! || return;
-+    $file =~ m!^([a-zA-Z0-9_\+ \'\":/.\$\\~-]+)$! || return;
-     my $safe = $1;
-     sysopen($ref,$safe,Fcntl::O_RDWR()|Fcntl::O_CREAT()|Fcntl::O_EXCL(),0600) || return;
-     unlink($safe) if $delete;
-@@ -3705,6 +3771,14 @@
- }
- END_OF_FUNC
- 
-+'handle' => <<'END_OF_FUNC',
-+sub handle {
-+  my $self = shift;
-+  eval "require IO::Handle" unless IO::Handle->can('new_from_fd');
-+  return IO::Handle->new_from_fd(fileno $self,"<");
-+}
-+END_OF_FUNC
-+
- );
- END_OF_AUTOLOAD
- 
-@@ -3768,7 +3842,7 @@
-     }
- 
-     my $self = {LENGTH=>$length,
--		CHUNKED=>!defined $length,
-+		CHUNKED=>!$length,
- 		BOUNDARY=>$boundary,
- 		INTERFACE=>$interface,
- 		BUFFER=>'',
-@@ -3986,6 +4060,14 @@
- 	   "${vol}${SL}Temporary Items",
-            "${SL}WWW_ROOT", "${SL}SYS\$SCRATCH",
- 	   "C:${SL}system${SL}temp");
-+    
-+    if( $CGI::OS eq 'WINDOWS' ){
-+       unshift @TEMP,
-+           $ENV{TEMP},
-+           $ENV{TMP},
-+           $ENV{WINDIR} . $SL . 'TEMP';
-+    }
-+
-     unshift(@TEMP,$ENV{'TMPDIR'}) if defined $ENV{'TMPDIR'};
- 
-     # this feature was supposed to provide per-user tmpfiles, but
-@@ -3997,7 +4079,7 @@
-     #    : Refer to getpwuid() only at run-time if we're fortunate and have  UNIX.
-     # unshift(@TEMP,(eval {(getpwuid($>))[7]}).'/tmp') if $CGI::OS eq 'UNIX' and $> != 0;
- 
--    foreach (@TEMP) {
-+    for (@TEMP) {
-       do {$TMPDIRECTORY = $_; last} if -d $_ && -w _;
-     }
-   }
-@@ -4014,7 +4096,7 @@
- 
- sub DESTROY {
-     my($self) = @_;
--    $$self =~ m!^([a-zA-Z0-9_ \'\":/.\$\\-]+)$! || return;
-+    $$self =~ m!^([a-zA-Z0-9_ \'\":/.\$\\~-]+)$! || return;
-     my $safe = $1;             # untaint operation
-     unlink $safe;              # get rid of the file
- }
-@@ -4032,10 +4114,10 @@
-     my $filename;
-     find_tempdir() unless -w $TMPDIRECTORY;
-     for (my $i = 0; $i < $MAXTRIES; $i++) {
--	last if ! -f ($filename = sprintf("${TMPDIRECTORY}${SL}CGItemp%d",$sequence++));
-+	last if ! -f ($filename = sprintf("\%s${SL}CGItemp%d", $TMPDIRECTORY, $sequence++));
-     }
-     # check that it is a more-or-less valid filename
--    return unless $filename =~ m!^([a-zA-Z0-9_ \'\":/.\$\\-]+)$!;
-+    return unless $filename =~ m!^([a-zA-Z0-9_\+ \'\":/.\$\\~-]+)$!;
-     # this used to untaint, now it doesn't
-     # $filename = $1;
-     return bless \$filename;
-@@ -4075,64 +4157,52 @@
- 
- =head1 NAME
- 
--CGI - Simple Common Gateway Interface Class
-+CGI - Handle Common Gateway Interface requests and responses
- 
- =head1 SYNOPSIS
- 
--  # CGI script that creates a fill-out form
--  # and echoes back its values.
--
--  use CGI qw/:standard/;
--  print header,
--        start_html('A Simple Example'),
--        h1('A Simple Example'),
--        start_form,
--        "What's your name? ",textfield('name'),p,
--        "What's the combination?", p,
--        checkbox_group(-name=>'words',
--		       -values=>['eenie','meenie','minie','moe'],
--		       -defaults=>['eenie','minie']), p,
--        "What's your favorite color? ",
--        popup_menu(-name=>'color',
--	           -values=>['red','green','blue','chartreuse']),p,
--        submit,
--        end_form,
--        hr;
--
--   if (param()) {
--       my $name      = param('name');
--       my $keywords  = join ', ',param('words');
--       my $color     = param('color');
--       print "Your name is",em(escapeHTML($name)),p,
--	     "The keywords are: ",em(escapeHTML($keywords)),p,
--	     "Your favorite color is ",em(escapeHTML($color)),
--	     hr;
--   }
-+    use CGI;
- 
--=head1 ABSTRACT
-+    my $q = CGI->new;
- 
--This perl library uses perl5 objects to make it easy to create Web
--fill-out forms and parse their contents.  This package defines CGI
--objects, entities that contain the values of the current query string
--and other state variables.  Using a CGI object's methods, you can
--examine keywords and parameters passed to your script, and create
--forms whose initial values are taken from the current query (thereby
--preserving state information).  The module provides shortcut functions
--that produce boilerplate HTML, reducing typing and coding errors. It
--also provides functionality for some of the more advanced features of
--CGI scripting, including support for file uploads, cookies, cascading
--style sheets, server push, and frames.
-+    # Process an HTTP request
-+     @values  = $q->param('form_field');
- 
--CGI.pm also provides a simple function-oriented programming style for
--those who don't need its object-oriented features.
-+     $fh      = $q->upload('file_field');
- 
--The current version of CGI.pm is available at
-+     $riddle  = $query->cookie('riddle_name');
-+     %answers = $query->cookie('answers');
-+
-+    # Prepare various HTTP responses
-+    print $q->header();
-+    print $q->header('application/json');
-+
-+	$cookie1 = $q->cookie(-name=>'riddle_name', -value=>"The Sphynx's Question");
-+	$cookie2 = $q->cookie(-name=>'answers', -value=>\%answers);
-+    print $q->header(
-+        -type    => 'image/gif',
-+        -expires => '+3d',
-+        -cookie  => [$cookie1,$cookie2]
-+        );
- 
--  http://www.genome.wi.mit.edu/ftp/pub/software/WWW/cgi_docs.html
--  ftp://ftp-genome.wi.mit.edu/pub/software/WWW/
-+   print  $q->redirect('http://somewhere.else/in/movie/land');
- 
- =head1 DESCRIPTION
- 
-+CGI.pm is a stable, complete and mature solution for processing and preparing
-+HTTP requests and responses.  Major features including processing form
-+submissions, file uploads, reading and writing cookies, query string generation
-+and manipulation, and processing and preparing HTTP headers. Some HTML
-+generation utilities are included as well.
-+
-+CGI.pm performs very well in in a vanilla CGI.pm environment and also comes
-+with built-in support for mod_perl and mod_perl2 as well as FastCGI.
-+
-+It has the benefit of having developed and refined over 10 years with input
-+from dozens of contributors and being deployed on thousands of websites.
-+CGI.pm has been included in the Perl distribution since Perl 5.4, and has
-+become a de-facto standard.
-+
- =head2 PROGRAMMING STYLE
- 
- There are two styles of programming with CGI.pm, an object-oriented
-@@ -4327,7 +4397,7 @@
-     restore_parameters(IN);
-     close IN;
- 
--You can also initialize the query object from an associative array
-+You can also initialize the query object from a hash
- reference:
- 
-     $query = new CGI( {'dinosaur'=>'barney',
-@@ -4392,8 +4462,7 @@
- the method will return a single value.
- 
- If a value is not given in the query string, as in the queries
--"name1=&name2=" or "name1&name2", it will be returned as an empty
--string.  This feature is new in 2.63.
-+"name1=&name2=", it will be returned as an empty string.
- 
- 
- If the parameter does not exist at all, then param() will return undef
-@@ -4477,6 +4546,10 @@
- 
-    my $data = $query->param('POSTDATA');
- 
-+Likewise if PUTed data can be retrieved with code like this:
-+
-+   my $data = $query->param('PUTDATA');
-+
- (If you don't know what the preceding means, don't worry about it.  It
- only affects people trying to use CGI for XML processing and other
- specialized tasks.)
-@@ -4554,7 +4627,7 @@
- 
-    open (OUT,">>test.out") || die;
-    $records = 5;
--   foreach (0..$records) {
-+   for (0..$records) {
-        my $q = new CGI;
-        $q->param(-name=>'counter',-value=>$_);
-        $q->save(\*OUT);
-@@ -4812,6 +4885,16 @@
- XHTML will automatically be disabled without needing to use this 
- pragma.
- 
-+=item -utf8
-+
-+This makes CGI.pm treat all parameters as UTF-8 strings. Use this with
-+care, as it will interfere with the processing of binary uploads. It
-+is better to manually select which fields are expected to return utf-8
-+strings and convert them using code like this:
-+
-+ use Encode;
-+ my $arg = decode utf8=>param('foo');
-+
- =item -nph
- 
- This makes CGI.pm produce a header appropriate for an NPH (no
-@@ -5129,7 +5212,7 @@
- 
- All relative links will be interpreted relative to this tag.
- You add arbitrary meta information to the header with the B<-meta>
--argument.  This argument expects a reference to an associative array
-+argument.  This argument expects a reference to a hash
- containing name/value pairs of meta information.  These will be turned
- into a series of header <meta> tags that look something like this:
- 
-@@ -5388,7 +5471,7 @@
- If Apache's mod_rewrite is turned on, then the script name and path
- info probably won't match the request that the user sent. Set
- -rewrite=>1 (default) to return URLs that match what the user sent
--(the original request URI). Set -rewrite->0 to return URLs that match
-+(the original request URI). Set -rewrite=>0 to return URLs that match
- the URL after mod_rewrite's rules have run. Because the additional
- path information only makes sense in the context of the rewritten URL,
- -rewrite is set to false when you request path info in the URL.
-@@ -5468,8 +5551,8 @@
- 
-    print h1("Chapter","1"); # <h1>Chapter 1</h1>"
- 
--If the first argument is an associative array reference, then the keys
--and values of the associative array become the HTML tag's attributes:
-+If the first argument is a hash reference, then the keys
-+and values of the hash become the HTML tag's attributes:
- 
-    print a({-href=>'fred.html',-target=>'_new'},
-       "Open a new frame");
-@@ -5987,31 +6070,34 @@
- 
- To be safe, use the I<upload()> function (new in version 2.47).  When
- called with the name of an upload field, I<upload()> returns a
--filehandle, or undef if the parameter is not a valid filehandle.
-+filehandle-like object, or undef if the parameter is not a valid
-+filehandle.
- 
-      $fh = upload('uploaded_file');
-      while (<$fh>) {
- 	   print;
-      }
- 
--In an list context, upload() will return an array of filehandles.
-+In a list context, upload() will return an array of filehandles.
- This makes it possible to create forms that use the same name for
- multiple upload fields.
- 
- This is the recommended idiom.
- 
--For robust code, consider reseting the file handle position to beginning of the
--file. Inside of larger frameworks, other code may have already used the query
--object and changed the filehandle postion:
-+The lightweight filehandle returned by CGI.pm is not compatible with
-+IO::Handle; for example, it does not have read() or getline()
-+functions, but instead must be manipulated using read($fh) or
-+<$fh>. To get a compatible IO::Handle object, call the handle's
-+handle() method:
- 
--  seek($fh,0,0); # reset postion to beginning of file.
-+  my $real_io_handle = upload('uploaded_file')->handle;
- 
- When a file is uploaded the browser usually sends along some
- information along with it in the format of headers.  The information
- usually includes the MIME content type.  Future browsers may send
- other information as well (such as modification date and size). To
- retrieve this information, call uploadInfo().  It returns a reference to
--an associative array containing all the document headers.
-+a hash containing all the document headers.
- 
-        $filename = param('uploaded_file');
-        $type = uploadInfo($filename)->{'Content-Type'};
-@@ -6102,7 +6188,7 @@
- 
-    print popup_menu(-name=>'menu_name',
- 			    -values=>['eenie','meenie','minie'],
--			    -default=>'meenie',
-+			    -default=>['meenie','minie'],
-           -labels=>\%labels,
-           -attributes=>\%attributes);
- 
-@@ -6125,14 +6211,15 @@
- 
- The optional third parameter (-default) is the name of the default
- menu choice.  If not specified, the first item will be the default.
--The values of the previous choice will be maintained across queries.
-+The values of the previous choice will be maintained across
-+queries. Pass an array reference to select multiple defaults.
- 
- =item 4.
- 
- The optional fourth parameter (-labels) is provided for people who
- want to use different values for the user-visible label inside the
- popup menu and the value returned to your script.  It's a pointer to an
--associative array relating menu values to user-visible labels.  If you
-+hash relating menu values to user-visible labels.  If you
- leave this parameter blank, the menu values will be displayed by
- default.  (You can also leave a label undefined if you want to).
- 
-@@ -6140,8 +6227,8 @@
- 
- The optional fifth parameter (-attributes) is provided to assign
- any of the common HTML attributes to an individual menu item. It's
--a pointer to an associative array relating menu values to another
--associative array with the attribute's name as the key and the
-+a pointer to a hash relating menu values to another
-+hash with the attribute's name as the key and the
- attribute's value as the value.
- 
- =back
-@@ -6193,7 +6280,7 @@
- =item 3.
- 
- The optional third parameter (B<-labels>) allows you to pass a reference
--to an associative array containing user-visible labels for one or more
-+to a hash containing user-visible labels for one or more
- of the menu items.  You can use this when you want the user to see one
- menu string, but have the browser return your program a different one.
- If you don't specify this, the value string will be used instead
-@@ -6220,8 +6307,8 @@
- 
- An optional sixth parameter (-attributes) is provided to assign
- any of the common HTML attributes to an individual menu item. It's
--a pointer to an associative array relating menu values to another
--associative array with the attribute's name as the key and the
-+a pointer to a hash relating menu values to another
-+hash with the attribute's name as the key and the
- attribute's value as the value.
- 
- =back
-@@ -6281,7 +6368,7 @@
- 
- =item 5.
- 
--The optional sixth argument is a pointer to an associative array
-+The optional sixth argument is a pointer to a hash
- containing long user-visible labels for the list items (-labels).
- If not provided, the values will be displayed.
- 
-@@ -6289,8 +6376,8 @@
- 
- The optional sixth parameter (-attributes) is provided to assign
- any of the common HTML attributes to an individual menu item. It's
--a pointer to an associative array relating menu values to another
--associative array with the attribute's name as the key and the
-+a pointer to a hash relating menu values to another
-+hash with the attribute's name as the key and the
- attribute's value as the value.
- 
- When this form is processed, all selected list items will be returned as
-@@ -6354,7 +6441,7 @@
- =back
- 
- 
--The optional b<-labels> argument is a pointer to an associative array
-+The optional b<-labels> argument is a pointer to a hash
- relating the checkbox values to the user-visible labels that will be
- printed next to them.  If not provided, the values will be used as the
- default.
-@@ -6371,7 +6458,7 @@
- 
- The optional B<-attributes> argument is provided to assign any of the
- common HTML attributes to an individual menu item. It's a pointer to
--an associative array relating menu values to another associative array
-+a hash relating menu values to another hash
- with the attribute's name as the key and the attribute's value as the
- value.
- 
-@@ -6389,6 +6476,9 @@
-   -tabindex => ['moe','minie','eenie','meenie']  # tab in this order
-   -tabindex => {meenie=>100,moe=>101,minie=>102,eenie=>200} # tab in this order
- 
-+The optional B<-labelattributes> argument will contain attributes
-+attached to the <label> element that surrounds each button.
-+
- When the form is processed, all checked boxes will be returned as
- a list under the parameter name 'group_name'.  The values of the
- "on" checkboxes can be retrieved with:
-@@ -6542,10 +6632,13 @@
- 
- The optional B<-attributes> argument is provided to assign any of the
- common HTML attributes to an individual menu item. It's a pointer to
--an associative array relating menu values to another associative array
-+a hash relating menu values to another hash
- with the attribute's name as the key and the attribute's value as the
- value.
- 
-+The optional B<-labelattributes> argument will contain attributes
-+attached to the <label> element that surrounds each button.
-+
- When the form is processed, the selected radio button can
- be retrieved using:
- 
-@@ -6709,16 +6802,13 @@
- 
- button() produces a button that is compatible with Netscape 2.0's
- JavaScript.  When it's pressed the fragment of JavaScript code
--pointed to by the B<-onClick> parameter will be executed.  On
--non-Netscape browsers this form element will probably not even
--display.
-+pointed to by the B<-onClick> parameter will be executed.
- 
- =head1 HTTP COOKIES
- 
--Netscape browsers versions 1.1 and higher, and all versions of
--Internet Explorer, support a so-called "cookie" designed to help
--maintain state within a browser session.  CGI.pm has several methods
--that support cookies.
-+Browsers support a so-called "cookie" designed to help maintain state
-+within a browser session.  CGI.pm has several methods that support
-+cookies.
- 
- A cookie is a name=value pair much like the named parameters in a CGI
- query string.  CGI scripts create one or more cookies and send
-@@ -6793,8 +6883,8 @@
- =item B<-value>
- 
- The value of the cookie.  This can be any scalar value,
--array reference, or even associative array reference.  For example,
--you can store an entire associative array into a cookie this way:
-+array reference, or even hash reference.  For example,
-+you can store an entire hash into a cookie this way:
- 
- 	$cookie=cookie(-name=>'family information',
- 			       -value=>\%childrens_ages);
-@@ -6921,19 +7011,6 @@
- 
- =head1 SUPPORT FOR JAVASCRIPT
- 
--Netscape versions 2.0 and higher incorporate an interpreted language
--called JavaScript. Internet Explorer, 3.0 and higher, supports a
--closely-related dialect called JScript. JavaScript isn't the same as
--Java, and certainly isn't at all the same as Perl, which is a great
--pity. JavaScript allows you to programmatically change the contents of
--fill-out forms, create new windows, and pop up dialog box from within
--Netscape itself. From the point of view of CGI scripting, JavaScript
--is quite useful for validating fill-out forms prior to submitting
--them.
--
--You'll need to know JavaScript in order to use it. There are many good
--sources in bookstores and on the web.
--
- The usual way to use JavaScript is to define a set of functions in a
- <SCRIPT> block inside the HTML header and then to register event
- handlers in the various elements of the page. Events include such
-@@ -7275,11 +7352,9 @@
- 
- =item B<raw_cookie()>
- 
--Returns the HTTP_COOKIE variable, an HTTP extension implemented by
--Netscape browsers version 1.1 and higher, and all versions of Internet
--Explorer.  Cookies have a special format, and this method call just
--returns the raw form (?cookie dough).  See cookie() for ways of
--setting and retrieving cooked cookies.
-+Returns the HTTP_COOKIE variable.  Cookies have a special format, and
-+this method call just returns the raw form (?cookie dough).  See
-+cookie() for ways of setting and retrieving cooked cookies.
- 
- Called with no parameters, raw_cookie() returns the packed cookie
- structure.  You can separate it into individual cookies by splitting
-@@ -7293,7 +7368,7 @@
- Returns the HTTP_USER_AGENT variable.  If you give
- this method a single argument, it will attempt to
- pattern match on it, allowing you to do something
--like user_agent(netscape);
-+like user_agent(Mozilla);
- 
- =item B<path_info()>
- 
-@@ -7476,7 +7551,7 @@
-   use CGI qw/:push -nph/;
-   $| = 1;
-   print multipart_init(-boundary=>'----here we go!');
--  foreach (0 .. 4) {
-+  for (0 .. 4) {
-       print multipart_start(-type=>'text/plain'),
-             "The current time is ",scalar(localtime),"\n";
-       if ($_ < 4) {
-@@ -7532,9 +7607,6 @@
- Users interested in server push applications should also have a look
- at the CGI::Push module.
- 
--Only Netscape Navigator supports server push.  Internet Explorer
--browsers do not.
--
- =head1 Avoiding Denial of Service Attacks
- 
- A potential problem with CGI.pm is that, by default, it attempts to
-@@ -7658,10 +7730,8 @@
- 
- =head1 AUTHOR INFORMATION
- 
--Copyright 1995-1998, Lincoln D. Stein.  All rights reserved.  
--
--This library is free software; you can redistribute it and/or modify
--it under the same terms as Perl itself.
-+The GD.pm interface is copyright 1995-2007, Lincoln D. Stein.  It is
-+distributed under GPL and the Artistic License 2.0.
- 
- Address bug reports and comments to: lstein@cshl.org.  When sending
- bug reports, please provide the version of CGI.pm, the version of
-@@ -7788,7 +7858,7 @@
- 
- 	   print "<h2>Here are the current settings in this form</h2>";
- 
--	   foreach $key (param) {
-+	   for $key (param) {
- 	      print "<strong>$key</strong> -> ";
- 	      @values = param($key);
- 	      print join(", ",@values),"<br>\n";
diff --git a/perl-update-Compress-Raw-Zlib.patch b/perl-update-Compress-Raw-Zlib.patch
deleted file mode 100644
index 52126d9..0000000
--- a/perl-update-Compress-Raw-Zlib.patch
+++ /dev/null
@@ -1,1536 +0,0 @@
-Compress-Raw-Zlib-2.023
-(omitting changes to private/MakeUtil.pm)
-(omitting changes to perl-5.10.0/t/lib/compress; these are in
-IO-Compress-Base 2.015 update)
-
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2009-12-01 14:46:37.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-12-01 15:43:34.000000000 +0100
-@@ -124,6 +124,7 @@
- ext/Compress/Raw/Zlib/t/01version.t	Compress::Raw::Zlib
- ext/Compress/Raw/Zlib/t/02zlib.t	Compress::Raw::Zlib
- ext/Compress/Raw/Zlib/t/07bufsize.t	Compress::Raw::Zlib
-+ext/Compress/Raw/Zlib/t/09limitoutput.t	Compress::Raw::Zlib
- ext/Compress/Raw/Zlib/t/18lvalue.t	Compress::Raw::Zlib
- ext/Compress/Raw/Zlib/typemap		Compress::Raw::Zlib
- ext/Compress/Raw/Zlib/zlib-src/adler32.c	Compress::Raw::Zlib
-diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/Changes perl-5.10.0/ext/Compress/Raw/Zlib/Changes
---- perl-5.10.0.orig/ext/Compress/Raw/Zlib/Changes	2009-12-01 15:36:07.000000000 +0100
-+++ perl-5.10.0/ext/Compress/Raw/Zlib/Changes	2009-12-01 15:38:24.000000000 +0100
-@@ -1,6 +1,73 @@
- CHANGES
- -------
- 
-+  2.023 9 November 2009
-+
-+      * fixed instance where $[ should have been $] in t/02zlib.t
-+        Thanks to Robin Barker and zefram [RT #50765] for independantly
-+        spotting the issue.
-+
-+  2.021 30 August 2009
-+
-+      * Changed test harness so that it can cope with PERL5OPT=-MCarp=verbose
-+        [RT# 47225]
-+
-+  2.020 3 June 2009
-+
-+      * Minor documentation update.
-+
-+  2.019 4 May 2009
-+
-+      * No Changes
-+
-+  2.018 3 May 2009
-+
-+      * No Changes
-+
-+  2.017 28 March 2009
-+
-+      * Added 'LimitOutput' option
-+
-+      * Removed MAN3PODS from Makefile.PL
-+
-+      * Fixed coring issue when LimitOutput was used.
-+
-+      * Documented Compress::Raw::Zlib::zlib_version()
-+
-+      * Documented Compress::Raw::Zlib::deflateReset()
-+        [RT #40566]
-+
-+  2.015 3 September 2008
-+
-+      * Makefile.PL
-+        Backout changes made in 2.014
-+
-+  2.014 2 September 2008
-+
-+      * Makefile.PL
-+        Updated to check for indirect dependencies.
-+
-+  2.012 15 July 2008
-+
-+      * Document the gzip flags that WindowBits can take.
-+
-+      * Allow a dictionary to be used with a raw inflate. 
-+        Needs zlib 1.2.2.1 or better.
-+        [RT #36046]
-+      
-+  2.011 5 May 2008
-+
-+      * A C++-style comment sneaked in with the last update. Fixed.
-+        [core patch #33828]
-+
-+  2.010 5 May 2008
-+
-+      * No Changes
-+
-+  2.009 20 April 2008
-+
-+      * No Changes
-+
-   2.008 2 November 2007
- 
-       * Minor documentation changes in README
-diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/Makefile.PL perl-5.10.0/ext/Compress/Raw/Zlib/Makefile.PL
---- perl-5.10.0.orig/ext/Compress/Raw/Zlib/Makefile.PL	2009-12-01 14:47:16.000000000 +0100
-+++ perl-5.10.0/ext/Compress/Raw/Zlib/Makefile.PL	2009-12-01 15:38:24.000000000 +0100
-@@ -77,24 +77,11 @@
-                     },
- 
-     (
--      $ENV{SKIP_FOR_CORE}
--        ? (MAN3PODS    => {})
--        : ()
--    ),
--       
--    (
-       $BUILD_ZLIB
-         ? zlib_files($ZLIB_LIB)
-         : (LIBS => [ "-L$ZLIB_LIB -lz " ])
-     ),
-       
--    (
--      $] >= 5.005
--        ? (ABSTRACT_FROM => 'lib/Compress/Raw/Zlib.pm',
--            AUTHOR       => 'Paul Marquess <pmqs@cpan.org>')
--        : ()
--    ),
--
-     INSTALLDIRS => ($] >= 5.009 ? 'perl' : 'site'),
- 
-     ((ExtUtils::MakeMaker->VERSION() gt '6.30') ?
-diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/README perl-5.10.0/ext/Compress/Raw/Zlib/README
---- perl-5.10.0.orig/ext/Compress/Raw/Zlib/README	2009-12-01 15:36:07.000000000 +0100
-+++ perl-5.10.0/ext/Compress/Raw/Zlib/README	2009-12-01 15:38:24.000000000 +0100
-@@ -1,16 +1,14 @@
- 
-                              Compress-Raw-Zlib
- 
--                             Version 2.008
-+                             Version 2.023
- 
--                             2nd November 2007
-+                             9th November 2009
- 
--
--       Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+       Copyright (c) 2005-2009 Paul Marquess. All rights reserved.
-           This program is free software; you can redistribute it
-            and/or modify it under the same terms as Perl itself.
- 
--
-               The directory zlib-src contains a subset of the 
-              source files copied directly from zlib version 1.2.3.
-                   These files are Copyright(C) 1995-2005
-@@ -18,39 +16,27 @@
-              Full source for the zlib library is available at
-                             http://www.zlib.org
- 
--
--
- DESCRIPTION
- -----------
- 
--
- This module provides a Perl interface to the zlib compression library.  
- 
--
--
--
--
- PREREQUISITES
- -------------
- 
- Before you can build Compress-Raw-Zlib you need to have the following
- installed on your system:
- 
--
-     * A C compiler
- 
-     * Perl 5.004 or better. 
- 
--
--
- By default, Compress-Raw-Zlib will build its own private copy of the 
- zlib library. If you want to use a different version of 
- zlib, follow the instructions in the section called 
- "Controlling the version of zlib used by Compress-Raw-Zlib" 
- later in this document.
- 
--
--
- BUILDING THE MODULE
- -------------------
- 
-@@ -61,8 +47,6 @@
-     make
-     make test
- 
--
--
- INSTALLATION
- ------------
- 
-@@ -70,9 +54,6 @@
- 
-     make install
- 
--
--
--
- Controlling the version of zlib used by Compress-Raw-Zlib 
- ----------------------------------------------------------
- 
-@@ -92,7 +73,6 @@
- Note that if you intend to use either Option 2 or 3, you need to have
- zlib version 1.0.5 or better.
- 
--
- The contents of the file config.in are used to control which of the
- three options is actually used. This file is read during the
- 
-@@ -101,8 +81,6 @@
- step of the build, so remember to make any required changes to config.in
- before building this module.
- 
--
--
-   Option 1
-   --------
-   
-@@ -169,10 +147,9 @@
- ------------------------
- 
- Every gzip stream stores a byte in its header to identify the Operating
--System that was used to create the gzip stream. When you build
--Compress-Raw-Zlib it will attempt to determine the value that is correct for
--your Operating System. This will then be used by IO::Gzip as the default
--value for the OS byte in all gzip headers it creates. 
-+System that was used to create the gzip stream. When you build Compress-Raw-Zlib it will attempt to determine the value that is correct for
-+your Operating System. This will then be used by IO::Compress::Gzip as the
-+default value for the OS byte in all gzip headers it creates. 
-  
- The variable GZIP_OS_CODE in the config.in file controls the setting of
- this value when building Compress-Raw-Zlib. If GZIP_OS_CODE is set to
-@@ -197,16 +174,37 @@
- detected is incorrect, please take a few moments to contact the author of
- this module.
- 
--
--
- TROUBLESHOOTING
- ---------------
- 
-+Undefined Symbol gzsetparams
-+----------------------------
- 
-+If you get the error shown below when you run the Compress-Raw-Zlib test
-+harness it probably means you are running a copy of zlib that is
-+version 1.0.5 or older.
- 
-+t/01version.........Can't load 'blib/arch/auto/Compress/Zlib/Zlib.so' for 
-+                    module Compress::Raw::Zlib: blib/arch/auto/Compress/Raw/Zlib/Zlib.so:
-+                    undefined symbol: gzsetparams at ...
- 
-+There are two ways to fix this problem:
- 
-+    1. Upgrade to the latest version of zlib.
- 
-+    2. Edit config.in and set the OLD_ZLIB variable to True.
-+
-+Test Harness 01version fails
-+----------------------------
-+If the 01version test harness fails, and the problem isn't covered by the
-+scenario above, it probably means that you have two versions of 
-+zlib installed on your system.
-+
-+Run the command below to see if this is indeed the case
-+
-+    make test TEST_VERBOSE=1 TEST_FILES=t/01version.t 
-+
-+Try removing the one you don't want to use and rebuild.   
- 
- Solaris build fails with "language optional software package not installed"
- ---------------------------------------------------------------------------
-@@ -245,9 +243,6 @@
- If that doesn't work for you, it's time to make changes to the Makefile
- by hand. Good luck!
- 
--
--
--
- Solaris build fails with "gcc: unrecognized option `-KPIC'"
- -----------------------------------------------------------
- 
-@@ -285,10 +280,6 @@
- is necessary to have first built the zlib library with the -fpic
- option.
- 
--
--
--
--
- Linux Notes
- -----------
- 
-@@ -307,9 +298,6 @@
- for zlib. Check for an RPM that start with "zlib-devel" in your Linux
- distribution.
- 
--
--
--
- Win32 Notes
- -----------
- 
-@@ -318,15 +306,11 @@
- newer version of Compress-Raw-Zlib is available run this from the command
- prompt
- 
--    C:\> ppm verify -upgrade Compress-Zlib
--
-+    C:\> ppm verify -upgrade Compress-Raw-Zlib
- 
- If you are not running Activestate Perl and you don't have access
- to a C compiler, you will not be able to build and install this module.
- 
--
--
--
- Win32 & Cygwin Notes
- --------------------
- 
-@@ -338,7 +322,6 @@
- The workaround is to install Compress-Raw-Zlib manually using the
- instructions given at the start of this file.
- 
--
- FEEDBACK
- --------
- 
-@@ -372,8 +355,7 @@
-         If you haven't installed Compress-Raw-Zlib then search Compress::Raw::Zlib.pm
-         for a line like this:
- 
--          $VERSION = "2.008" ;
--
-+          $VERSION = "2.023" ;
- 
-      c. The version of zlib you have used.
-         If you have successfully installed Compress-Raw-Zlib, this one-liner
-@@ -381,10 +363,8 @@
- 
-           perl -MCompress::Raw::Zlib -e "print q[zlib ver ]. Compress::Raw::Zlib::ZLIB_VERSION.qq[\n]" 
- 
--
-         If not, look at the beginning of the file zlib.h. 
- 
--
-  2. If you are having problems building Compress-Raw-Zlib, send me a
-     complete log of what happened. Start by unpacking the Compress-Raw-Zlib
-     module into a fresh directory and keep a log of all the steps
-@@ -394,5 +374,4 @@
-         make
-         make test TEST_VERBOSE=1          
- 
--
- Paul Marquess <pmqs@cpan.org>
-diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/Zlib.xs perl-5.10.0/ext/Compress/Raw/Zlib/Zlib.xs
---- perl-5.10.0.orig/ext/Compress/Raw/Zlib/Zlib.xs	2009-12-01 15:36:07.000000000 +0100
-+++ perl-5.10.0/ext/Compress/Raw/Zlib/Zlib.xs	2009-12-01 15:38:24.000000000 +0100
-@@ -3,7 +3,7 @@
-  * Created : 22nd January 1996
-  * Version : 2.000
-  *
-- *   Copyright (c) 1995-2007 Paul Marquess. All rights reserved.
-+ *   Copyright (c) 1995-2009 Paul Marquess. All rights reserved.
-  *   This program is free software; you can redistribute it and/or
-  *   modify it under the same terms as Perl itself.
-  *
-@@ -50,6 +50,10 @@
- #  define AT_LEAST_ZLIB_1_2_2_1
- #endif
- 
-+#if  defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1222
-+#  define AT_LEAST_ZLIB_1_2_2_2
-+#endif
-+
- #if  defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1223
- #  define AT_LEAST_ZLIB_1_2_2_3
- #endif
-@@ -64,6 +68,11 @@
- #  include "ppport.h"
- #endif
- 
-+#if PERL_REVISION == 5 && PERL_VERSION == 9
-+    /* For Andreas */
-+#   define sv_pvbyte_force(sv,lp) sv_pvbyten_force(sv,lp)
-+#endif
-+
- #if PERL_REVISION == 5 && (PERL_VERSION < 8 || (PERL_VERSION == 8 && PERL_SUBVERSION < 4 ))
- 
- #    ifdef SvPVbyte_force
-@@ -103,6 +112,7 @@
- #define FLAG_CRC32              2
- #define FLAG_ADLER32            4
- #define FLAG_CONSUME_INPUT      8
-+#define FLAG_LIMIT_OUTPUT       16
-     uLong    crc32 ;
-     uLong    adler32 ;
-     z_stream stream;
-@@ -228,7 +238,8 @@
- #define adlerInitial adler32(0L, Z_NULL, 0)
- #define crcInitial crc32(0L, Z_NULL, 0)
- 
--static const char * const my_z_errmsg[] = {
-+/* static const char * const my_z_errmsg[] = { */
-+static const char my_z_errmsg[][32] = {
-     "need dictionary",     /* Z_NEED_DICT     2 */
-     "stream end",          /* Z_STREAM_END    1 */
-     "",                    /* Z_OK            0 */
-@@ -460,6 +471,8 @@
-         printf("           CRC32     %s\n",   EnDis(FLAG_CRC32));
-         printf("           ADLER32   %s\n",   EnDis(FLAG_ADLER32));
-         printf("           CONSUME   %s\n",   EnDis(FLAG_CONSUME_INPUT));
-+        printf("           LIMIT     %s\n",   EnDis(FLAG_LIMIT_OUTPUT));
-+
- 
- #ifdef MAGIC_APPEND
-         printf("    window           0x%p\n", s->window);
-@@ -510,7 +523,7 @@
- 
- static SV* 
- #ifdef CAN_PROTOTYPE
--deRef(SV * sv, char * string)
-+deRef(SV * sv, const char * string)
- #else
- deRef(sv, string)
- SV * sv ;
-@@ -528,6 +541,8 @@
-             case SVt_PVHV:
-             case SVt_PVCV:
-                 croak("%s: buffer parameter is not a SCALAR reference", string);
-+            default:
-+                break;
-         }
-         if (SvROK(sv))
-             croak("%s: buffer parameter is a reference to a reference", string) ;
-@@ -542,7 +557,7 @@
- 
- static SV*
- #ifdef CAN_PROTOTYPE
--deRef_l(SV * sv, char * string)
-+deRef_l(SV * sv, const char * string)
- #else
- deRef_l(sv, string)
- SV * sv ;
-@@ -565,6 +580,8 @@
-             case SVt_PVHV:
-             case SVt_PVCV:
-                 croak("%s: buffer parameter is not a SCALAR reference", string);
-+            default:
-+                break;
-         }
-         if (SvROK(sv))
-             croak("%s: buffer parameter is a reference to a reference", string) ;
-@@ -802,6 +819,19 @@
-             s = NULL ;
- 	}
- 	else if (SvCUR(dictionary)) {
-+#ifdef AT_LEAST_ZLIB_1_2_2_1
-+        /* Zlib 1.2.2.1 or better allows a dictionary with raw inflate */
-+        if (s->WindowBits < 0) {
-+            err = inflateSetDictionary(&(s->stream), 
-+                (const Bytef*)SvPVbyte_nolen(dictionary),
-+                SvCUR(dictionary));
-+            if (err != Z_OK) {
-+                Safefree(s) ;
-+                s = NULL ;
-+            }
-+        }
-+        else
-+#endif   
-             /* Dictionary specified - take a copy for use in inflate */
- 	    s->dictionary = newSVsv(dictionary) ;
- 	}
-@@ -1246,7 +1276,7 @@
-     bool 	eof 
-     uInt	cur_length = 0;
-     uInt	prefix_length = 0;
--    uInt	increment = 0;
-+    int	    increment = 0;
-     STRLEN  stmp    = NO_INIT
-     uLong     bufinc = NO_INIT
-   PREINIT:
-@@ -1280,22 +1310,39 @@
-     if((s->flags & FLAG_APPEND) != FLAG_APPEND) {
-         SvCUR_set(output, 0);
-     }
-+   
-+    /* Assume no output buffer - the code below will update if there is any available */
-+    s->stream.avail_out = 0;
-+
-+
-     if (SvLEN(output)) {
-         prefix_length = cur_length =  SvCUR(output) ;
--        s->stream.next_out = (Bytef*) SvPVbyte_nolen(output) + cur_length;
--        increment = SvLEN(output) -  cur_length - 1;
--        s->stream.avail_out = increment;
--    }
--    else {
--        s->stream.avail_out = 0;
-+    
-+        if (s->flags & FLAG_LIMIT_OUTPUT && SvLEN(output) - cur_length - 1 < bufinc)
-+        {
-+            Sv_Grow(output, bufinc + cur_length + 1) ;
-+        }
-+    
-+        /* Only setup the stream output pointers if there is spare 
-+           capacity in the outout SV
-+        */
-+        if (SvLEN(output) > cur_length + 1)
-+        {
-+            s->stream.next_out = (Bytef*) SvPVbyte_nolen(output) + cur_length;
-+            increment = SvLEN(output) -  cur_length - 1;
-+            s->stream.avail_out = increment;
-+        }
-     }
-+    
-+
-     s->bytesInflated = 0;
-     
--    while (1) {
-+    RETVAL = Z_OK;
- 
--        if (s->stream.avail_out == 0 ) {
-+    while (RETVAL == Z_OK) {
-+        if (s->stream.avail_out == 0) {
- 	    /* out of space in the output buffer so make it bigger */
--            Sv_Grow(output, SvLEN(output) + bufinc) ;
-+            Sv_Grow(output, SvLEN(output) + bufinc +1) ;
-             cur_length += increment ;
-             s->stream.next_out = (Bytef*) SvPVbyte_nolen(output) + cur_length ;
-             increment = bufinc ;
-@@ -1303,10 +1350,30 @@
-             bufinc *= 2 ; 
-         }
- 
-+        /* printf("INFLATE Availl In %d, Out %d\n", s->stream.avail_in,
-+ s->stream.avail_out); 
-+DispStream(s, "BEFORE");
-+Perl_sv_dump(output); */
-         RETVAL = inflate(&(s->stream), Z_SYNC_FLUSH);
-+        /* printf("INFLATE returned %d %s, avail in %d, out %d\n", RETVAL,
-+ GetErrorString(RETVAL), s->stream.avail_in, s->stream.avail_out); */
-+
-+    
-+        if (RETVAL == Z_NEED_DICT && s->dictionary) {
-+            s->dict_adler = s->stream.adler ;
-+            RETVAL = inflateSetDictionary(&(s->stream), 
-+            (const Bytef*)SvPVbyte_nolen(s->dictionary),
-+            SvCUR(s->dictionary));
-+            if (RETVAL == Z_OK)
-+                continue;
-+        }
-+        
-+        if (s->flags & FLAG_LIMIT_OUTPUT && 
-+                (RETVAL == Z_OK || RETVAL == Z_BUF_ERROR ))
-+            break;
- 
-         if (RETVAL == Z_STREAM_ERROR || RETVAL == Z_MEM_ERROR ||
--            RETVAL == Z_DATA_ERROR  || RETVAL == Z_STREAM_END )
-+            RETVAL == Z_DATA_ERROR   || RETVAL == Z_STREAM_END )
-             break ;
- 
-         if (RETVAL == Z_BUF_ERROR) {
-@@ -1317,19 +1384,9 @@
-                 break ;
-             }
-         }
--	
--        if (RETVAL == Z_NEED_DICT && s->dictionary) {
--            s->dict_adler = s->stream.adler ;
--            RETVAL = inflateSetDictionary(&(s->stream), 
--            (const Bytef*)SvPVbyte_nolen(s->dictionary),
--            SvCUR(s->dictionary));
--        }
--
--        if (RETVAL != Z_OK) 
--            break;
-     }
- #ifdef NEED_DUMMY_BYTE_AT_END 
--    if (eof && RETVAL == Z_OK) {
-+    if (eof && RETVAL == Z_OK && s->flags & FLAG_LIMIT_OUTPUT == 0) {
-         Bytef* nextIn =  s->stream.next_in;
-         uInt availIn =  s->stream.avail_in;
-         s->stream.next_in = (Bytef*) " ";
-@@ -1350,8 +1407,8 @@
- #endif
-     
-     s->last_error = RETVAL ;
--    if (RETVAL == Z_OK || RETVAL == Z_STREAM_END || RETVAL == Z_DATA_ERROR) {
--	unsigned in ;
-+    if (RETVAL == Z_OK || RETVAL == Z_STREAM_END || RETVAL == Z_BUF_ERROR || RETVAL == Z_DATA_ERROR) {
-+	   unsigned in ;
- 
-         s->bytesInflated = cur_length + increment - s->stream.avail_out - prefix_length;
-         s->uncompressedBytes += s->bytesInflated ;
-@@ -1377,7 +1434,7 @@
-             			SvCUR(output)-prefix_length) ;
- 
- 	/* fix the input buffer */
--	if (s->flags & FLAG_CONSUME_INPUT) {
-+	if (s->flags & FLAG_CONSUME_INPUT || s->flags & FLAG_LIMIT_OUTPUT) {
- 	    in = s->stream.avail_in ;
- 	    SvCUR_set(buf, in) ;
- 	    if (in)
-@@ -1385,6 +1442,7 @@
-             *SvEND(buf) = '\0';
-             SvSETMAGIC(buf);
- 	}
-+
-     }
-     OUTPUT:
- 	RETVAL
-diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm perl-5.10.0/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm
---- perl-5.10.0.orig/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm	2009-12-01 15:36:07.000000000 +0100
-+++ perl-5.10.0/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm	2009-12-01 15:38:24.000000000 +0100
-@@ -13,7 +13,7 @@
- use bytes ;
- our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
- 
--$VERSION = '2.008';
-+$VERSION = '2.023';
- $XS_VERSION = $VERSION; 
- $VERSION = eval $VERSION;
- 
-@@ -62,8 +62,13 @@
-         Z_SYNC_FLUSH
-         Z_UNKNOWN
-         Z_VERSION_ERROR
-+
-+        WANT_GZIP
-+        WANT_GZIP_OR_ZLIB
- );
- 
-+use constant WANT_GZIP           => 16;
-+use constant WANT_GZIP_OR_ZLIB   => 32;
- 
- sub AUTOLOAD {
-     my($constname);
-@@ -79,6 +84,7 @@
- use constant FLAG_CRC                => 2 ;
- use constant FLAG_ADLER              => 4 ;
- use constant FLAG_CONSUME_INPUT      => 8 ;
-+use constant FLAG_LIMIT_OUTPUT       => 16 ;
- 
- eval {
-     require XSLoader;
-@@ -361,10 +367,14 @@
-     $flags |= FLAG_CRC    if $got->value('CRC32') ;
-     $flags |= FLAG_ADLER  if $got->value('ADLER32') ;
- 
-+    my $windowBits =  $got->value('WindowBits');
-+    $windowBits += MAX_WBITS()
-+        if ($windowBits & MAX_WBITS()) == 0 ;
-+
-     _deflateInit($flags,
-                 $got->value('Level'), 
-                 $got->value('Method'), 
--                $got->value('WindowBits'), 
-+                $windowBits, 
-                 $got->value('MemLevel'), 
-                 $got->value('Strategy'), 
-                 $got->value('Bufsize'),
-@@ -378,6 +388,7 @@
-     my ($got) = ParseParameters(0,
-                     {
-                         'AppendOutput'  => [1, 1, Parse_boolean,  0],
-+                        'LimitOutput'   => [1, 1, Parse_boolean,  0],
-                         'CRC32'         => [1, 1, Parse_boolean,  0],
-                         'ADLER32'       => [1, 1, Parse_boolean,  0],
-                         'ConsumeInput'  => [1, 1, Parse_boolean,  1],
-@@ -397,8 +408,14 @@
-     $flags |= FLAG_CRC    if $got->value('CRC32') ;
-     $flags |= FLAG_ADLER  if $got->value('ADLER32') ;
-     $flags |= FLAG_CONSUME_INPUT if $got->value('ConsumeInput') ;
-+    $flags |= FLAG_LIMIT_OUTPUT if $got->value('LimitOutput') ;
-+
-+
-+    my $windowBits =  $got->value('WindowBits');
-+    $windowBits += MAX_WBITS()
-+        if ($windowBits & MAX_WBITS()) == 0 ;
- 
--    _inflateInit($flags, $got->value('WindowBits'), $got->value('Bufsize'), 
-+    _inflateInit($flags, $windowBits, $got->value('Bufsize'), 
-                  $got->value('Dictionary')) ;
- }
- 
-@@ -530,6 +547,7 @@
-     ($d, $status) = new Compress::Raw::Zlib::Deflate( [OPT] ) ;
-     $status = $d->deflate($input, $output) ;
-     $status = $d->flush($output [, $flush_type]) ;
-+    $d->deflateReset() ;
-     $d->deflateParams(OPTS) ;
-     $d->deflateTune(OPTS) ;
-     $d->dict_adler() ;
-@@ -559,8 +577,7 @@
-     $crc = adler32_combine($crc1, $crc2, $len2)l
-     $crc = crc32_combine($adler1, $adler2, $len2)
- 
--    ZLIB_VERSION
--    ZLIB_VERNUM
-+    my $version = Compress::Raw::Zlib::zlib_version();
- 
- =head1 DESCRIPTION
- 
-@@ -568,8 +585,6 @@
- compression library (see L</AUTHOR> for details about where to get
- I<zlib>). 
- 
--
--
- =head1 Compress::Raw::Zlib::Deflate
- 
- This section defines an interface that allows in-memory compression using
-@@ -577,7 +592,6 @@
- 
- Here is a definition of the interface available:
- 
--
- =head2 B<($d, $status) = new Compress::Raw::Zlib::Deflate( [OPT] ) >
- 
- Initialises a deflation object. 
-@@ -610,7 +624,7 @@
- C<Z_NO_COMPRESSION>, C<Z_BEST_SPEED>, C<Z_BEST_COMPRESSION>, and
- C<Z_DEFAULT_COMPRESSION>.
- 
--The default is Z_DEFAULT_COMPRESSION.
-+The default is C<Z_DEFAULT_COMPRESSION>.
- 
- =item B<-Method>
- 
-@@ -619,10 +633,18 @@
- 
- =item B<-WindowBits>
- 
-+To compress an RFC 1950 data stream, set C<WindowBits> to a positive
-+number between 8 and 15.
-+
-+To compress an RFC 1951 data stream, set C<WindowBits> to C<-MAX_WBITS>.
-+
-+To compress an RFC 1952 data stream (i.e. gzip), set C<WindowBits> to
-+C<WANT_GZIP>.
-+
- For a definition of the meaning and valid values for C<WindowBits>
- refer to the I<zlib> documentation for I<deflateInit2>.
- 
--Defaults to MAX_WBITS.
-+Defaults to C<MAX_WBITS>.
- 
- =item B<-MemLevel>
- 
-@@ -678,7 +700,6 @@
- 
- This option defaults to false.
- 
--
- =item B<-ADLER32>
- 
- If set to true, an adler32 checksum of the uncompressed data will be
-@@ -686,7 +707,6 @@
- 
- This option defaults to false.
- 
--
- =back
- 
- Here is an example of using the C<Compress::Raw::Zlib::Deflate> optional
-@@ -696,7 +716,6 @@
-     my $d = new Compress::Raw::Zlib::Deflate ( -Bufsize => 300, 
-                                                -Level   => Z_BEST_SPEED ) ;
- 
--
- =head2 B<$status = $d-E<gt>deflate($input, $output)>
- 
- Deflates the contents of C<$input> and writes the compressed data to
-@@ -744,6 +763,16 @@
- it is false, C<$output> will be truncated before any compressed data is
- written to it.
- 
-+=head2 B<$status = $d-E<gt>deflateReset() >
-+
-+This method will reset the deflation object C<$d>. It can be used when you
-+are compressing multiple data streams and want to use the same object to
-+compress each of them. It should only be used once the previous data stream
-+has been flushed successfully, i.e. a call to C<< $d->flush(Z_FINISH) >> has
-+returned C<Z_OK>.
-+
-+Returns C<Z_OK> if successful.
-+
- =head2 B<$status = $d-E<gt>deflateParams([OPT])>
- 
- Change settings for the deflate object C<$d>.
-@@ -751,7 +780,6 @@
- The list of the valid options is shown below. Options not specified
- will remain unchanged.
- 
--
- =over 5
- 
- =item B<-Level>
-@@ -772,7 +800,6 @@
- reallocated to increase the size, it will grow in increments of
- C<Bufsize>.
- 
--
- =back
- 
- =head2 B<$status = $d-E<gt>deflateTune($good_length, $max_lazy, $nice_length, $max_chain)>
-@@ -815,7 +842,6 @@
- Returns the deflation strategy currently used. Valid values are
- C<Z_DEFAULT_STRATEGY>, C<Z_FILTERED> and C<Z_HUFFMAN_ONLY>. 
- 
--
- =head2 B<$d-E<gt>get_Level()>
- 
- Returns the compression level being used. 
-@@ -826,7 +852,6 @@
- 
- =head2 Example
- 
--
- Here is a trivial example of using C<deflate>. It simply reads standard
- input, deflates it and writes it to standard output.
- 
-@@ -865,7 +890,6 @@
- 
- Here is a definition of the interface:
- 
--
- =head2 B< ($i, $status) = new Compress::Raw::Zlib::Inflate( [OPT] ) >
- 
- Initialises an inflation object. 
-@@ -894,14 +918,20 @@
- =item B<-WindowBits>
- 
- To uncompress an RFC 1950 data stream, set C<WindowBits> to a positive
--number.
-+number between 8 and 15.
- 
- To uncompress an RFC 1951 data stream, set C<WindowBits> to C<-MAX_WBITS>.
- 
-+To uncompress an RFC 1952 data stream (i.e. gzip), set C<WindowBits> to
-+C<WANT_GZIP>.
-+
-+To auto-detect and uncompress an RFC 1950 or RFC 1952 data stream (i.e.
-+gzip), set C<WindowBits> to C<WANT_GZIP_OR_ZLIB>.
-+
- For a full definition of the meaning and valid values for C<WindowBits>
- refer to the I<zlib> documentation for I<inflateInit2>.
- 
--Defaults to MAX_WBITS.
-+Defaults to C<MAX_WBITS>.
- 
- =item B<-Bufsize>
- 
-@@ -928,7 +958,6 @@
- 
- This option defaults to false.
- 
--
- =item B<-CRC32>
- 
- If set to true, a crc32 checksum of the uncompressed data will be
-@@ -946,7 +975,7 @@
- =item B<-ConsumeInput>
- 
- If set to true, this option will remove compressed data from the input
--buffer of the the C< $i-E<gt>inflate > method as the inflate progresses.
-+buffer of the C<< $i->inflate >> method as the inflate progresses.
- 
- This option can be useful when you are processing compressed data that is
- embedded in another file/buffer. In this case the data that immediately
-@@ -954,6 +983,29 @@
- 
- This option defaults to true.
- 
-+=item B<-LimitOutput>
-+
-+The C<LimitOutput> option changes the behavior of the C<< $i->inflate >>
-+method so that the amount of memory used by the output buffer can be
-+limited. 
-+
-+When C<LimitOutput> is used the size of the output buffer used will either
-+be the value of the C<Bufsize> option or the amount of memory already
-+allocated to C<$output>, whichever is larger. Predicting the output size
-+available is tricky, so don't rely on getting an exact output buffer size.
-+
-+When C<LimitOutout> is not specified C<< $i->inflate >> will use as much
-+memory as it takes to write all the uncompressed data it creates by
-+uncompressing the input buffer.
-+
-+If C<LimitOutput> is enabled, the C<ConsumeInput> option will also be
-+enabled.
-+
-+This option defaults to false.
-+
-+See L</The LimitOutput option> for a discussion on why C<LimitOutput> is
-+needed and how to use it.
-+
- =back
- 
- Here is an example of using an optional parameter to override the default
-@@ -1048,7 +1100,6 @@
- data streams. They must have been added explicitly when the data stream
- was created by calling C<Compress::Deflate::flush>  with C<Z_FULL_FLUSH>.
- 
--
- =head2 B<$i-E<gt>dict_adler()>
- 
- Returns the adler32 value for the dictionary.
-@@ -1083,7 +1134,7 @@
- 
- Returns the buffer size used to carry out the decompression.
- 
--=head2 Example
-+=head2 Examples
- 
- Here is an example of using C<inflate>.
- 
-@@ -1102,10 +1153,9 @@
-     my ($output, $status) ;
-     while (read(STDIN, $input, 4096))
-     {
--        $status = $x->inflate(\$input, $output) ;
-+        $status = $x->inflate($input, $output) ;
-     
--        print $output 
--            if $status == Z_OK or $status == Z_STREAM_END ;
-+        print $output ;
-     
-         last if $status != Z_OK ;
-     }
-@@ -1113,6 +1163,46 @@
-     die "inflation failed\n"
-         unless $status == Z_STREAM_END ;
- 
-+The next example show how to use the C<LimitOutput> option. Notice the use
-+of two nested loops in this case. The outer loop reads the data from the
-+input source - STDIN and the inner loop repeatedly calls C<inflate> until
-+C<$input> is exhausted, we get an error, or the end of the stream is
-+reached. One point worth remembering is by using the C<LimitOutput> option
-+you also get C<ConsumeInput> set as well - this makes the code below much
-+simpler.
-+
-+    use strict ;
-+    use warnings ;
-+    
-+    use Compress::Raw::Zlib;
-+    
-+    my $x = new Compress::Raw::Zlib::Inflate(LimitOutput => 1)
-+       or die "Cannot create a inflation stream\n" ;
-+    
-+    my $input = '' ;
-+    binmode STDIN;
-+    binmode STDOUT;
-+    
-+    my ($output, $status) ;
-+
-+  OUTER:
-+    while (read(STDIN, $input, 4096))
-+    {
-+        do
-+        {
-+            $status = $x->inflate($input, $output) ;
-+
-+            print $output ;
-+
-+            last OUTER
-+                unless $status == Z_OK || $status == Z_BUF_ERROR ;
-+        }
-+        while ($status == Z_OK && length $input);
-+    }
-+    
-+    die "inflation failed\n"
-+        unless $status == Z_STREAM_END ;
-+
- =head1 CHECKSUM FUNCTIONS
- 
- Two functions are provided by I<zlib> to calculate checksums. For the
-@@ -1135,24 +1225,163 @@
- 
- These functions allow checksums to be merged.
- 
--=head1 ACCESSING ZIP FILES
-+=head1 Misc
-+
-+=head2 my $version = Compress::Raw::Zlib::zlib_version();
-+
-+Returns the version of the zlib library.
-+
-+=head1 The LimitOutput option.
-+
-+By default C<< $i->inflate($input, $output) >> will uncompress I<all> data
-+in C<$input> and write I<all> of the uncompressed data it has generated to
-+C<$output>. This makes the interface to C<inflate> much simpler - if the
-+method has uncompressed C<$input> successfully I<all> compressed data in
-+C<$input> will have been dealt with. So if you are reading from an input
-+source and uncompressing as you go the code will look something like this
-+
-+    use strict ;
-+    use warnings ;
-+    
-+    use Compress::Raw::Zlib;
-+    
-+    my $x = new Compress::Raw::Zlib::Inflate()
-+       or die "Cannot create a inflation stream\n" ;
-+    
-+    my $input = '' ;
-+    
-+    my ($output, $status) ;
-+    while (read(STDIN, $input, 4096))
-+    {
-+        $status = $x->inflate($input, $output) ;
-+    
-+        print $output ;
-+    
-+        last if $status != Z_OK ;
-+    }
-+    
-+    die "inflation failed\n"
-+        unless $status == Z_STREAM_END ;
-+
-+The points to note are 
-+
-+=over 5
-+
-+=item *
-+
-+The main processing loop in the code handles reading of compressed data
-+from STDIN.
-+
-+=item *
-+
-+The status code returned from C<inflate> will only trigger termination of
-+the main processing loop if it isn't C<Z_OK>. When C<LimitOutput> has not
-+been used the C<Z_OK> status means means that the end of the compressed
-+data stream has been reached or there has been an error in uncompression.
-+
-+=item *
-+
-+After the call to C<inflate> I<all> of the uncompressed data in C<$input>
-+will have been processed. This means the subsequent call to C<read> can
-+overwrite it's contents without any problem.
-+
-+=back
-+
-+For most use-cases the behavior described above is acceptable (this module
-+and it's predecessor, C<Compress::Zlib>, have used it for over 10 years
-+without an issue), but in a few very specific use-cases the amount of
-+memory required for C<$output> can prohibitively large. For example, if the
-+compressed data stream contains the same pattern repeated thousands of
-+times, a relatively small compressed data stream can uncompress into
-+hundreds of megabytes.  Remember C<inflate> will keep allocating memory
-+until I<all> the uncompressed data has been written to the output buffer -
-+the size of C<$output> is unbounded. 
-+
-+The C<LimitOutput> option is designed to help with this use-case.
-+
-+The main difference in your code when using C<LimitOutput> is having to
-+deal with cases where the C<$input> parameter still contains some
-+uncompressed data that C<inflate> hasn't processed yet. The status code
-+returned from C<inflate> will be C<Z_OK> if uncompression took place and
-+C<Z_BUF_ERROR> if the output buffer is full.
-+
-+Below is typical code that shows how to use C<LimitOutput>.
-+
-+    use strict ;
-+    use warnings ;
-+    
-+    use Compress::Raw::Zlib;
-+    
-+    my $x = new Compress::Raw::Zlib::Inflate(LimitOutput => 1)
-+       or die "Cannot create a inflation stream\n" ;
-+    
-+    my $input = '' ;
-+    binmode STDIN;
-+    binmode STDOUT;
-+    
-+    my ($output, $status) ;
-+
-+  OUTER:
-+    while (read(STDIN, $input, 4096))
-+    {
-+        do
-+        {
-+            $status = $x->inflate($input, $output) ;
- 
--Although it is possible (with some effort on your part) to use this
--module to access .zip files, there is a module on CPAN that will do all
--the hard work for you. Check out the C<Archive::Zip> module on CPAN at
-+            print $output ;
- 
--    http://www.cpan.org/modules/by-module/Archive/Archive-Zip-*.tar.gz    
-+            last OUTER
-+                unless $status == Z_OK || $status == Z_BUF_ERROR ;
-+        }
-+        while ($status == Z_OK && length $input);
-+    }
-+    
-+    die "inflation failed\n"
-+        unless $status == Z_STREAM_END ;
- 
-+Points to note this time:
-+
-+=over 5
-+
-+=item *
-+
-+There are now two nested loops in the code: the outer loop for reading the
-+compressed data from STDIN, as before; and the inner loop to carry out the
-+uncompression.
-+
-+=item *
-+
-+There are two exit points from the inner uncompression loop.
-+
-+Firstly when C<inflate> has returned a status other than C<Z_OK> or
-+C<Z_BUF_ERROR>.  This means that either the end of the compressed data
-+stream has been reached (C<Z_STREAM_END>) or there is an error in the
-+compressed data. In either of these cases there is no point in continuing
-+with reading the compressed data, so both loops are terminated.
-+
-+The second exit point tests if there is any data left in the input buffer,
-+C<$input> - remember that the C<ConsumeInput> option is automatically
-+enabled when C<LimitOutput> is used.  When the input buffer has been
-+exhausted, the outer loop can run again and overwrite a now empty
-+C<$input>.
-+
-+=back
-+
-+=head1 ACCESSING ZIP FILES
-+
-+Although it is possible (with some effort on your part) to use this module
-+to access .zip files, there are other perl modules available that will
-+do all the hard work for you. Check out C<Archive::Zip>,
-+C<IO::Compress::Zip> and C<IO::Uncompress::Unzip>.
- 
- =head1 CONSTANTS
- 
- All the I<zlib> constants are automatically imported when you make use
- of I<Compress::Raw::Zlib>.
- 
--
- =head1 SEE ALSO
- 
--L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress>
-+L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzma>, L<IO::Uncompress::UnLzma>, L<IO::Compress::Xz>, L<IO::Uncompress::UnXz>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress>
- 
- L<Compress::Zlib::FAQ|Compress::Zlib::FAQ>
- 
-@@ -1160,7 +1389,6 @@
- L<Archive::Tar|Archive::Tar>,
- L<IO::Zlib|IO::Zlib>
- 
--
- For RFC 1950, 1951 and 1952 see 
- F<http://www.faqs.org/rfcs/rfc1950.html>,
- F<http://www.faqs.org/rfcs/rfc1951.html> and
-@@ -1174,25 +1402,18 @@
- 
- The primary site for gzip is F<http://www.gzip.org>.
- 
--
--
--
- =head1 AUTHOR
- 
- This module was written by Paul Marquess, F<pmqs@cpan.org>. 
- 
--
--
- =head1 MODIFICATION HISTORY
- 
- See the Changes file.
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+Copyright (c) 2005-2009 Paul Marquess. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
- 
--
--
-diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/t/02zlib.t perl-5.10.0/ext/Compress/Raw/Zlib/t/02zlib.t
---- perl-5.10.0.orig/ext/Compress/Raw/Zlib/t/02zlib.t	2009-12-01 15:36:07.000000000 +0100
-+++ perl-5.10.0/ext/Compress/Raw/Zlib/t/02zlib.t	2009-12-01 15:38:24.000000000 +0100
-@@ -24,13 +24,13 @@
- 
-     my $count = 0 ;
-     if ($] < 5.005) {
--        $count = 189 ;
-+        $count = 230 ;
-     }
-     elsif ($] >= 5.006) {
--        $count = 243 ;
-+        $count = 300 ;
-     }
-     else {
--        $count = 201 ;
-+        $count = 258 ;
-     }
- 
-     plan tests => $count + $extra;
-@@ -443,10 +443,13 @@
-     
-     # create a flush point
-     cmp_ok $x->flush($Answer, Z_FULL_FLUSH), '==', Z_OK ;
-+    
-+    my $len1 = length $Answer;
-      
-     cmp_ok $x->deflate($goodbye, $Answer), '==', Z_OK;
-     
-     cmp_ok $x->flush($Answer), '==', Z_OK ;
-+    my $len2 = length($Answer) - $len1 ;
-      
-     my ($first, @Answer) = split('', $Answer) ;
-      
-@@ -475,7 +478,6 @@
-         $GOT .= $Z if defined $Z ;
-         # print "x $status\n";
-         last if $status == Z_STREAM_END or $status != Z_OK ;
--     
-     }
-      
-     cmp_ok $status, '==', Z_DATA_ERROR ;
-@@ -488,7 +490,7 @@
-     my $initial = $1 ;
- 
-     
--    ok(($k, $err) = new Compress::Raw::Zlib::Inflate(-ConsumeInput => 0)) ;
-+    ok(($k, $err) = new Compress::Raw::Zlib::Inflate(ConsumeInput => 0)) ;
-     ok $k ;
-     cmp_ok $err, '==', Z_OK ;
-      
-@@ -499,8 +501,11 @@
-     cmp_ok $status, '==', Z_OK
-      or diag "status '$status'\nlength rest is " . length($rest) . "\n" ;
-      
--    cmp_ok $k->inflate($rest, $GOT), '==', Z_DATA_ERROR;
--    is $Z . $GOT, $goodbye ;
-+    is length($rest), $len2, "expected compressed output";
-+    
-+    $GOT = ''; 
-+    cmp_ok $k->inflate($rest, $GOT), '==', Z_DATA_ERROR, "inflate returns Z_DATA_ERROR";
-+    is $GOT, $goodbye ;
- }
- 
- {
-@@ -598,7 +603,7 @@
- 
- foreach (1 .. 2)
- {
--    next if $[ < 5.005 ;
-+    next if $] < 5.005 ;
- 
-     title 'test inflate/deflate with a substr';
- 
-@@ -726,6 +731,142 @@
-     ok 1, "resetLastBlockByte(undef) is ok" ;
- }
- 
-+{
-+
-+    title "gzip mode";
-+    # ================
-+
-+    my $hello = "I am a HAL 9000 computer" ;
-+    my @hello = split('', $hello) ;
-+    my ($err, $x, $X, $status); 
-+ 
-+    ok( ($x, $err) = new Compress::Raw::Zlib::Deflate ( 
-+            WindowBits => WANT_GZIP ,
-+            AppendOutput => 1
-+        ), "Create deflate object" );
-+    ok $x, "Compress::Raw::Zlib::Deflate ok" ;
-+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
-+ 
-+    $status = $x->deflate($hello, $X) ;
-+    cmp_ok $status, '==', Z_OK, "deflate returned Z_OK" ;
-+    
-+    cmp_ok  $x->flush($X), '==', Z_OK, "flush returned Z_OK" ;
-+     
-+    my ($k, $GOT); 
-+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
-+            WindowBits => WANT_GZIP ,
-+            ConsumeInput => 0 ,
-+            AppendOutput => 1);
-+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP ok" ;
-+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
-+ 
-+    $status = $k->inflate($X, $GOT) ;
-+    cmp_ok $status, '==', Z_STREAM_END, "Got Z_STREAM_END" ;
-+    is $GOT, $hello, "uncompressed data matches ok" ;
-+
-+    $GOT = '';
-+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
-+            WindowBits => WANT_GZIP_OR_ZLIB ,
-+            AppendOutput => 1);
-+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP_OR_ZLIB ok" ;
-+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
-+ 
-+    $status = $k->inflate($X, $GOT) ;
-+    cmp_ok $status, '==', Z_STREAM_END, "Got Z_STREAM_END" ;
-+    is $GOT, $hello, "uncompressed data matches ok" ;
-+}
-+
-+{
-+
-+    title "gzip error mode";
-+    # Create gzip -
-+    # read with no special windowbits setting - this will fail
-+    # then read with WANT_GZIP_OR_ZLIB - thi swill work
-+    # ================
-+
-+    my $hello = "I am a HAL 9000 computer" ;
-+    my ($err, $x, $X, $status); 
-+ 
-+    ok( ($x, $err) = new Compress::Raw::Zlib::Deflate ( 
-+            WindowBits => WANT_GZIP ,
-+            AppendOutput => 1
-+        ), "Create deflate object" );
-+    ok $x, "Compress::Raw::Zlib::Deflate ok" ;
-+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
-+ 
-+    $status = $x->deflate($hello, $X) ;
-+    cmp_ok $status, '==', Z_OK, "deflate returned Z_OK" ;
-+    
-+    cmp_ok  $x->flush($X), '==', Z_OK, "flush returned Z_OK" ;
-+     
-+    my ($k, $GOT); 
-+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
-+            WindowBits => MAX_WBITS ,
-+            ConsumeInput => 0 ,
-+            AppendOutput => 1);
-+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP ok" ;
-+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
-+ 
-+    $status = $k->inflate($X, $GOT) ;
-+    cmp_ok $status, '==', Z_DATA_ERROR, "Got Z_DATA_ERROR" ;
-+
-+    $GOT = '';
-+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
-+            WindowBits => WANT_GZIP_OR_ZLIB ,
-+            AppendOutput => 1);
-+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP_OR_ZLIB ok" ;
-+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
-+ 
-+    $status = $k->inflate($X, $GOT) ;
-+    cmp_ok $status, '==', Z_STREAM_END, "Got Z_STREAM_END" ;
-+    is $GOT, $hello, "uncompressed data matches ok" ;
-+}
-+
-+{
-+
-+    title "gzip/zlib error mode";
-+    # Create zlib -
-+    # read with no WANT_GZIP windowbits setting - this will fail
-+    # then read with WANT_GZIP_OR_ZLIB - thi swill work
-+    # ================
-+
-+    my $hello = "I am a HAL 9000 computer" ;
-+    my ($err, $x, $X, $status); 
-+ 
-+    ok( ($x, $err) = new Compress::Raw::Zlib::Deflate ( 
-+            AppendOutput => 1
-+        ), "Create deflate object" );
-+    ok $x, "Compress::Raw::Zlib::Deflate ok" ;
-+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
-+ 
-+    $status = $x->deflate($hello, $X) ;
-+    cmp_ok $status, '==', Z_OK, "deflate returned Z_OK" ;
-+    
-+    cmp_ok  $x->flush($X), '==', Z_OK, "flush returned Z_OK" ;
-+     
-+    my ($k, $GOT); 
-+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
-+            WindowBits => WANT_GZIP ,
-+            ConsumeInput => 0 ,
-+            AppendOutput => 1);
-+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP ok" ;
-+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
-+ 
-+    $status = $k->inflate($X, $GOT) ;
-+    cmp_ok $status, '==', Z_DATA_ERROR, "Got Z_DATA_ERROR" ;
-+
-+    $GOT = '';
-+    ($k, $err) = new Compress::Raw::Zlib::Inflate( 
-+            WindowBits => WANT_GZIP_OR_ZLIB ,
-+            AppendOutput => 1);
-+    ok $k, "Compress::Raw::Zlib::Inflate WANT_GZIP_OR_ZLIB ok" ;
-+    cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
-+ 
-+    $status = $k->inflate($X, $GOT) ;
-+    cmp_ok $status, '==', Z_STREAM_END, "Got Z_STREAM_END" ;
-+    is $GOT, $hello, "uncompressed data matches ok" ;
-+}
-+
- exit if $] < 5.006 ;
- 
- title 'Looping Append test with substr output - substr the end of the string';
-diff -urN perl-5.10.0.orig/ext/Compress/Raw/Zlib/t/09limitoutput.t perl-5.10.0/ext/Compress/Raw/Zlib/t/09limitoutput.t
---- perl-5.10.0.orig/ext/Compress/Raw/Zlib/t/09limitoutput.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Compress/Raw/Zlib/t/09limitoutput.t	2009-03-25 12:14:56.000000000 +0100
-@@ -0,0 +1,129 @@
-+BEGIN {
-+    if ($ENV{PERL_CORE}) {
-+	chdir 't' if -d 't';
-+	@INC = ("../lib", "lib/compress");
-+    }
-+}
-+
-+use lib qw(t t/compress);
-+use strict;
-+use warnings;
-+use bytes;
-+
-+use Test::More ;
-+use CompTestUtils;
-+
-+BEGIN 
-+{ 
-+    # use Test::NoWarnings, if available
-+    my $extra = 0 ;
-+    $extra = 1
-+        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
-+
-+    plan tests => 98 + $extra ;
-+
-+    use_ok('Compress::Raw::Zlib', 2) ; 
-+}
-+
-+
-+
-+my $hello = "I am a HAL 9000 computer" x 2001;
-+my $tmp = $hello ;
-+
-+my ($err, $x, $X, $status); 
-+
-+ok( ($x, $err) = new Compress::Raw::Zlib::Deflate (-AppendOutput => 1));
-+ok $x ;
-+cmp_ok $err, '==', Z_OK, "  status is Z_OK" ;
-+
-+my $out ;
-+$status = $x->deflate($tmp, $out) ;
-+cmp_ok $status, '==', Z_OK, "  status is Z_OK" ;
-+
-+cmp_ok $x->flush($out), '==', Z_OK, "  flush returned Z_OK" ;
-+     
-+     
-+sub getOut { my $x = ''; return \$x }
-+
-+for my $bufsize (1, 2, 3, 13, 4096, 1024*10)
-+{
-+    print "#\n#Bufsize $bufsize\n#\n";
-+    $tmp = $out;
-+
-+    my $k;
-+    ok(($k, $err) = new Compress::Raw::Zlib::Inflate( AppendOutput => 1,
-+                                                      LimitOutput => 1,
-+                                                      Bufsize => $bufsize
-+                                                    ));
-+    ok $k ;
-+    cmp_ok $err, '==', Z_OK, "  status is Z_OK" ;
-+ 
-+    ok ! defined $k->msg(), "  no msg" ;
-+    is $k->total_in(), 0, "  total_in == 0" ;
-+    is $k->total_out(), 0, "  total_out == 0" ;
-+    my $GOT = getOut();
-+    my $prev;
-+    my $deltaOK = 1;
-+    my $looped = 0;
-+    while (length $tmp)
-+    {
-+        ++ $looped;
-+        my $prev = length $GOT;
-+        $status = $k->inflate($tmp, $GOT) ;
-+        last if $status == Z_STREAM_END || $status == Z_DATA_ERROR || $status == Z_STREAM_ERROR ;
-+        $deltaOK = 0 if length($GOT) - $prev > $bufsize;
-+    }
-+     
-+    ok $deltaOK, "  Output Delta never > $bufsize";
-+    cmp_ok $looped, '>=', 1, "  looped $looped";
-+    is length($tmp), 0, "  length of input buffer is zero";
-+
-+    cmp_ok $status, '==', Z_STREAM_END, "  status is Z_STREAM_END" ;
-+    is $$GOT, $hello, "  got expected output" ;
-+    ok ! defined $k->msg(), "  no msg" ;
-+    is $k->total_in(), length $out, "  length total_in ok" ;
-+    is $k->total_out(), length $hello, "  length total_out ok " .  $k->total_out() ;
-+}
-+
-+sub getit
-+{
-+    my $obj = shift ;
-+    my $input = shift;
-+    
-+    my $data ;
-+    1 while $obj->inflate($input, $data) != Z_STREAM_END ;
-+    return \$data ;
-+}
-+
-+{
-+    title "regression test";
-+    
-+    my ($err, $x, $X, $status); 
-+    
-+    ok( ($x, $err) = new Compress::Raw::Zlib::Deflate (-AppendOutput => 1));
-+    ok $x ;
-+    cmp_ok $err, '==', Z_OK, "  status is Z_OK" ;
-+
-+    my $line1 = ("abcdefghijklmnopq" x 1000) . "\n" ;
-+    my $line2 = "second line\n" ;
-+    my $text = $line1 . $line2 ;
-+    my $tmp = $text;
-+   
-+    my $out ;
-+    $status = $x->deflate($tmp, $out) ;
-+    cmp_ok $status, '==', Z_OK, "  status is Z_OK" ;
-+    
-+    cmp_ok $x->flush($out), '==', Z_OK, "  flush returned Z_OK" ;
-+
-+    my $k;
-+    ok(($k, $err) = new Compress::Raw::Zlib::Inflate( AppendOutput => 1,
-+                                                      LimitOutput => 1
-+                                                    ));
-+
-+                                                        
-+    my $c = getit($k, $out);
-+    is $$c, $text;
-+    
-+                                              
-+}
-+
diff --git a/perl-update-Digest-SHA.patch b/perl-update-Digest-SHA.patch
deleted file mode 100644
index 5ad8d4a..0000000
--- a/perl-update-Digest-SHA.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-Digest-SHA-5.47
-- minus the move of SHA.pm from topdir to lib/Digest
-  (and the induced changes to *.t files and Makefile.PL
-
-diff -urN perl-5.10.0.orig/ext/Digest/SHA/Changes perl-5.10.0/ext/Digest/SHA/Changes
---- perl-5.10.0.orig/ext/Digest/SHA/Changes	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Digest/SHA/Changes	2009-03-23 16:33:05.000000000 +0100
-@@ -1,5 +1,21 @@
- Revision history for Perl extension Digest::SHA.
- 
-+5.47  Wed Apr 30 04:00:54 MST 2008
-+	- modified Makefile.PL to install in core for Perls >= 5.10
-+		-- thanks to Jerry Hedden for patch
-+	- changed from #include <> to #include "" in SHA.xs
-+		-- some platforms not able to find SHA source files
-+			-- thanks to Alexandr Ciornii for testing
-+	- moved .pm file to appropriate lib directory
-+	- minor addition to META.yml
-+
-+5.46  Wed Apr  9 05:04:00 MST 2008
-+	- modified Addfile to recognize leading and trailing
-+		whitespace in filenames (ref. rt.cpan.org #34690)
-+	- minor C source code modification (ref. hmac.c)
-+	- use const in sha.c for clean builds with -Wwrite-strings
-+		-- thanks to Robin Barker for patch
-+
- 5.45  Tue Jun 26 02:36:00 MST 2007
- 	- extended portability to earlier Perls
- 		-- works on Perl 5.003 and later
-diff -urN perl-5.10.0.orig/ext/Digest/SHA/README perl-5.10.0/ext/Digest/SHA/README
---- perl-5.10.0.orig/ext/Digest/SHA/README	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Digest/SHA/README	2009-03-23 16:33:05.000000000 +0100
-@@ -1,4 +1,4 @@
--Digest::SHA version 5.45
-+Digest::SHA version 5.47
- ========================
- 
- Digest::SHA is a complete implementation of the NIST Secure Hash
-@@ -34,7 +34,7 @@
- 
- COPYRIGHT AND LICENSE
- 
--Copyright (C) 2003-2007 Mark Shelor
-+Copyright (C) 2003-2008 Mark Shelor
- 
- This library is free software; you can redistribute it and/or modify
- it under the same terms as Perl itself.
-diff -urN perl-5.10.0.orig/ext/Digest/SHA/SHA.pm perl-5.10.0/ext/Digest/SHA/SHA.pm
---- perl-5.10.0.orig/ext/Digest/SHA/SHA.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Digest/SHA/SHA.pm	2009-03-23 16:33:05.000000000 +0100
-@@ -6,7 +6,7 @@
- use integer;
- use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
- 
--$VERSION = '5.45';
-+$VERSION = '5.47';
- 
- require Exporter;
- require DynaLoader;
-@@ -114,7 +114,10 @@
- 	my $text = -T $file;
- 
- 	local *FH;
--	open(FH, "<$file") or _bail("Open failed");
-+		# protect any leading or trailing whitespace in $file;
-+		# otherwise, 2-arg "open" will ignore them
-+	$file =~ s#^(\s)#./$1#;
-+	open(FH, "< $file\0") or _bail("Open failed");
- 	binmode(FH) if $binary || $portable;
- 
- 	unless ($portable && $text) {
-@@ -496,9 +499,9 @@
- 
- The "p" mode is handy since it ensures that the digest value of
- I<$filename> will be the same when computed on different operating
--systems.  It accomplishes this by internally translating all newlines
--in text files to UNIX format before calculating the digest; on the other
--hand, binary files are read in raw mode with no translation whatsoever.
-+systems.  It accomplishes this by internally translating all newlines in
-+text files to UNIX format before calculating the digest.  Binary files
-+are read in raw mode with no translation whatsoever.
- 
- For a fuller discussion of newline formats, refer to CPAN module
- L<File::LocalizeNewlines>.  Its "universal line separator" regex forms
-@@ -637,6 +640,7 @@
- 
- 	Gisle Aas
- 	Chris Carey
-+	Alexandr Ciornii
- 	Jim Doble
- 	Julius Duque
- 	Jeffrey Friedl
-@@ -655,7 +659,7 @@
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (C) 2003-2007 Mark Shelor
-+Copyright (C) 2003-2008 Mark Shelor
- 
- This library is free software; you can redistribute it and/or modify
- it under the same terms as Perl itself.
-diff -urN perl-5.10.0.orig/ext/Digest/SHA/SHA.xs perl-5.10.0/ext/Digest/SHA/SHA.xs
---- perl-5.10.0.orig/ext/Digest/SHA/SHA.xs	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Digest/SHA/SHA.xs	2009-03-23 16:33:05.000000000 +0100
-@@ -2,8 +2,8 @@
- #include "perl.h"
- #include "XSUB.h"
- 
--#include <src/sha.c>
--#include <src/hmac.c>
-+#include "src/sha.c"
-+#include "src/hmac.c"
- 
- static int ix2alg[] =
- 	{1,1,1,224,224,224,256,256,256,384,384,384,512,512,512};
-@@ -12,8 +12,8 @@
- 
- PROTOTYPES: ENABLE
- 
--#include <src/sha.h>
--#include <src/hmac.h>
-+#include "src/sha.h"
-+#include "src/hmac.h"
- 
- #ifndef INT2PTR
- #define INT2PTR(p, i) (p) (i)
-diff -urN perl-5.10.0.orig/ext/Digest/SHA/bin/shasum perl-5.10.0/ext/Digest/SHA/bin/shasum
---- perl-5.10.0.orig/ext/Digest/SHA/bin/shasum	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Digest/SHA/bin/shasum	2009-03-23 16:33:05.000000000 +0100
-@@ -2,10 +2,10 @@
- 
- 	# shasum: filter for computing SHA digests (analogous to sha1sum)
- 	#
--	# Copyright (C) 2003-2007 Mark Shelor, All Rights Reserved
-+	# Copyright (C) 2003-2008 Mark Shelor, All Rights Reserved
- 	#
--	# Version: 5.45
--	# Tue Jun 26 02:36:00 MST 2007
-+	# Version: 5.47
-+	# Wed Apr 30 04:00:54 MST 2008
- 
- =head1 NAME
- 
-@@ -61,7 +61,7 @@
- 
- =head1 AUTHOR
- 
--Copyright (c) 2003-2007 Mark Shelor <mshelor@cpan.org>.
-+Copyright (c) 2003-2008 Mark Shelor <mshelor@cpan.org>.
- 
- =head1 SEE ALSO
- 
-@@ -74,7 +74,7 @@
- use FileHandle;
- use Getopt::Long;
- 
--my $VERSION = "5.45";
-+my $VERSION = "5.47";
- 
- 
- 	# Try to use Digest::SHA, since it's faster.  If not installed,
-diff -urN perl-5.10.0.orig/ext/Digest/SHA/src/hmac.c perl-5.10.0/ext/Digest/SHA/src/hmac.c
---- perl-5.10.0.orig/ext/Digest/SHA/src/hmac.c	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Digest/SHA/src/hmac.c	2009-03-23 16:33:05.000000000 +0100
-@@ -3,10 +3,10 @@
-  *
-  * Ref: FIPS PUB 198 The Keyed-Hash Message Authentication Code
-  *
-- * Copyright (C) 2003-2007 Mark Shelor, All Rights Reserved
-+ * Copyright (C) 2003-2008 Mark Shelor, All Rights Reserved
-  *
-- * Version: 5.45
-- * Tue Jun 26 02:36:00 MST 2007
-+ * Version: 5.47
-+ * Wed Apr 30 04:00:54 MST 2008
-  *
-  */
- 
-@@ -94,8 +94,8 @@
- /* hmacclose: de-allocates digest object */
- int hmacclose(HMAC *h)
- {
--	shaclose(h->osha);
- 	if (h != NULL) {
-+		shaclose(h->osha);
- 		memset(h, 0, sizeof(HMAC));
- 		SHA_free(h);
- 	}
-diff -urN perl-5.10.0.orig/ext/Digest/SHA/src/hmac.h perl-5.10.0/ext/Digest/SHA/src/hmac.h
---- perl-5.10.0.orig/ext/Digest/SHA/src/hmac.h	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Digest/SHA/src/hmac.h	2009-03-23 16:33:05.000000000 +0100
-@@ -3,10 +3,10 @@
-  *
-  * Ref: FIPS PUB 198 The Keyed-Hash Message Authentication Code
-  *
-- * Copyright (C) 2003-2007 Mark Shelor, All Rights Reserved
-+ * Copyright (C) 2003-2008 Mark Shelor, All Rights Reserved
-  *
-- * Version: 5.45
-- * Tue Jun 26 02:36:00 MST 2007
-+ * Version: 5.47
-+ * Wed Apr 30 04:00:54 MST 2008
-  *
-  */
- 
-diff -urN perl-5.10.0.orig/ext/Digest/SHA/src/sha.c perl-5.10.0/ext/Digest/SHA/src/sha.c
---- perl-5.10.0.orig/ext/Digest/SHA/src/sha.c	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Digest/SHA/src/sha.c	2009-03-23 16:33:05.000000000 +0100
-@@ -3,10 +3,10 @@
-  *
-  * Ref: NIST FIPS PUB 180-2 Secure Hash Standard
-  *
-- * Copyright (C) 2003-2007 Mark Shelor, All Rights Reserved
-+ * Copyright (C) 2003-2008 Mark Shelor, All Rights Reserved
-  *
-- * Version: 5.45
-- * Tue Jun 26 02:36:00 MST 2007
-+ * Version: 5.47
-+ * Wed Apr 30 04:00:54 MST 2008
-  *
-  */
- 
-@@ -560,7 +560,7 @@
- /* ldvals: checks next line in dump file against tag, and loads values */
- static int ldvals(
- 	SHA_FILE *f,
--	char *tag,
-+	const char *tag,
- 	int type,
- 	void *pval,
- 	int reps,
-diff -urN perl-5.10.0.orig/ext/Digest/SHA/src/sha.h perl-5.10.0/ext/Digest/SHA/src/sha.h
---- perl-5.10.0.orig/ext/Digest/SHA/src/sha.h	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Digest/SHA/src/sha.h	2009-03-23 16:33:05.000000000 +0100
-@@ -3,10 +3,10 @@
-  *
-  * Ref: NIST FIPS PUB 180-2 Secure Hash Standard
-  *
-- * Copyright (C) 2003-2007 Mark Shelor, All Rights Reserved
-+ * Copyright (C) 2003-2008 Mark Shelor, All Rights Reserved
-  *
-- * Version: 5.45
-- * Tue Jun 26 02:36:00 MST 2007
-+ * Version: 5.47
-+ * Wed Apr 30 04:00:54 MST 2008
-  *
-  */
- 
diff --git a/perl-update-File-Fetch.patch b/perl-update-File-Fetch.patch
deleted file mode 100644
index a4359bc..0000000
--- a/perl-update-File-Fetch.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-File-Fetch-0.18
-
-diff -urN perl-5.10.0.orig/lib/File/Fetch/t/01_File-Fetch.t perl-5.10.0/lib/File/Fetch/t/01_File-Fetch.t
---- perl-5.10.0.orig/lib/File/Fetch/t/01_File-Fetch.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Fetch/t/01_File-Fetch.t	2009-03-10 14:28:48.000000000 +0100
-@@ -22,7 +22,7 @@
- 
- Some of these tests assume you are connected to the
- internet. If you are not, or if certain protocols or hosts
--are blocked and/or firewalled, these tests will fail due
-+are blocked and/or firewalled, these tests could fail due
- to no fault of the module itself.
- 
- ###########################################################
-@@ -115,6 +115,13 @@
- ) if &File::Fetch::ON_WIN;
- 
- 
-+### sanity tests
-+{   like( $File::Fetch::USER_AGENT, qr/$File::Fetch::VERSION/,
-+                                "User agent contains version" );
-+    like( $File::Fetch::FROM_EMAIL, qr/@/,
-+                                q[Email contains '@'] );
-+}                                
-+
- ### parse uri tests ###
- for my $entry (@map ) {
-     my $uri = $entry->{'uri'};
-@@ -148,14 +155,14 @@
-     my $prefix = &File::Fetch::ON_UNIX ? 'file://' : 'file:///';
-     my $uri = $prefix . cwd() .'/'. basename($0);
- 
--    for (qw[lwp file]) {
-+    for (qw[lwp lftp file]) {
-         _fetch_uri( file => $uri, $_ );
-     }
- }
- 
- ### ftp:// tests ###
- {   my $uri = 'ftp://ftp.funet.fi/pub/CPAN/index.html';
--    for (qw[lwp netftp wget curl ncftp]) {
-+    for (qw[lwp netftp wget curl lftp ncftp]) {
- 
-         ### STUPID STUPID warnings ###
-         next if $_ eq 'ncftp' and $File::Fetch::FTP_PASSIVE
-@@ -167,9 +174,10 @@
- 
- ### http:// tests ###
- {   for my $uri ( 'http://www.cpan.org/index.html',
--                  'http://www.cpan.org/index.html?q=1&y=2'
-+                  'http://www.cpan.org/index.html?q=1',
-+                  'http://www.cpan.org/index.html?q=1&y=2',
-     ) {
--        for (qw[lwp wget curl lynx]) {
-+        for (qw[lwp wget curl lftp lynx]) {
-             _fetch_uri( http => $uri, $_ );
-         }
-     }
-@@ -206,6 +214,11 @@
-             skip "You do not have '$method' installed/available", 3
-                 if $File::Fetch::METHOD_FAIL->{$method} &&
-                    $File::Fetch::METHOD_FAIL->{$method};
-+                
-+            ### if the file wasn't fetched, it may be a network/firewall issue                
-+            skip "Fetch failed; no network connectivity for '$type'?", 3 
-+                unless $file;
-+                
-             ok( $file,          "   File ($file) fetched with $method ($uri)" );
-             ok( $file && -s $file,   
-                                 "   File has size" );
-diff -urN perl-5.10.0.orig/lib/File/Fetch.pm perl-5.10.0/lib/File/Fetch.pm
---- perl-5.10.0.orig/lib/File/Fetch.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Fetch.pm	2009-03-10 14:29:10.000000000 +0100
-@@ -2,6 +2,7 @@
- 
- use strict;
- use FileHandle;
-+use File::Temp;
- use File::Copy;
- use File::Spec;
- use File::Spec::Unix;
-@@ -9,7 +10,7 @@
- 
- use Cwd                         qw[cwd];
- use Carp                        qw[carp];
--use IPC::Cmd                    qw[can_run run];
-+use IPC::Cmd                    qw[can_run run QUOTE];
- use File::Path                  qw[mkpath];
- use Params::Check               qw[check];
- use Module::Load::Conditional   qw[can_load];
-@@ -20,14 +21,11 @@
-                 $FTP_PASSIVE $TIMEOUT $DEBUG $WARN
-             ];
- 
--use constant QUOTE  => do { $^O eq 'MSWin32' ? q["] : q['] };            
--            
--
--$VERSION        = '0.14';
-+$VERSION        = '0.18';
- $VERSION        = eval $VERSION;    # avoid warnings with development releases
- $PREFER_BIN     = 0;                # XXX TODO implement
- $FROM_EMAIL     = 'File-Fetch@example.com';
--$USER_AGENT     = 'File::Fetch/$VERSION';
-+$USER_AGENT     = "File::Fetch/$VERSION";
- $BLACKLIST      = [qw|ftp|];
- $METHOD_FAIL    = { };
- $FTP_PASSIVE    = 1;
-@@ -37,9 +35,9 @@
- 
- ### methods available to fetch the file depending on the scheme
- $METHODS = {
--    http    => [ qw|lwp wget curl lynx| ],
--    ftp     => [ qw|lwp netftp wget curl ncftp ftp| ],
--    file    => [ qw|lwp file| ],
-+    http    => [ qw|lwp wget curl lftp lynx| ],
-+    ftp     => [ qw|lwp netftp wget curl lftp ncftp ftp| ],
-+    file    => [ qw|lwp lftp file| ],
-     rsync   => [ qw|rsync| ]
- };
- 
-@@ -50,11 +48,13 @@
- local $Module::Load::Conditional::VERBOSE   = 0;
- 
- ### see what OS we are on, important for file:// uris ###
--use constant ON_WIN         => ($^O eq 'MSWin32');
--use constant ON_VMS         => ($^O eq 'VMS');                                
--use constant ON_UNIX        => (!ON_WIN);
--use constant HAS_VOL        => (ON_WIN);
--use constant HAS_SHARE      => (ON_WIN);
-+use constant ON_WIN     => ($^O eq 'MSWin32');
-+use constant ON_VMS     => ($^O eq 'VMS');                                
-+use constant ON_UNIX    => (!ON_WIN);
-+use constant HAS_VOL    => (ON_WIN);
-+use constant HAS_SHARE  => (ON_WIN);
-+
-+
- =pod
- 
- =head1 NAME
-@@ -146,7 +146,7 @@
- ##########################
- 
- {
--    ### template for new() and autogenerated accessors ###
-+    ### template for autogenerated accessors ###
-     my $Tmpl = {
-         scheme          => { default => 'http' },
-         host            => { default => 'localhost' },
-@@ -626,11 +626,14 @@
-         push @$cmd, '--passive-ftp' if $FTP_PASSIVE;
- 
-         ### set the output document, add the uri ###
--        push @$cmd, '--output-document', 
--                    ### DO NOT quote things for IPC::Run, it breaks stuff.
--                    $IPC::Cmd::USE_IPC_RUN
--                        ? ($to, $self->uri)
--                        : (QUOTE. $to .QUOTE, QUOTE. $self->uri .QUOTE);
-+        push @$cmd, '--output-document', $to, $self->uri;
-+
-+        ### with IPC::Cmd > 0.41, this is fixed in teh library,
-+        ### and there's no need for special casing any more.
-+        ### DO NOT quote things for IPC::Run, it breaks stuff.
-+        # $IPC::Cmd::USE_IPC_RUN
-+        #    ? ($to, $self->uri)
-+        #    : (QUOTE. $to .QUOTE, QUOTE. $self->uri .QUOTE);
- 
-         ### shell out ###
-         my $captured;
-@@ -653,6 +656,81 @@
-     }
- }
- 
-+### /bin/lftp fetch ###
-+sub _lftp_fetch {
-+    my $self = shift;
-+    my %hash = @_;
-+
-+    my ($to);
-+    my $tmpl = {
-+        to  => { required => 1, store => \$to }
-+    };
-+    check( $tmpl, \%hash ) or return;
-+
-+    ### see if we have a wget binary ###
-+    if( my $lftp = can_run('lftp') ) {
-+
-+        ### no verboseness, thanks ###
-+        my $cmd = [ $lftp, '-f' ];
-+
-+        my $fh = File::Temp->new;
-+        
-+        my $str;
-+        
-+        ### if a timeout is set, add it ###
-+        $str .= "set net:timeout $TIMEOUT;\n" if $TIMEOUT;
-+
-+        ### run passive if specified ###
-+        $str .= "set ftp:passive-mode 1;\n" if $FTP_PASSIVE;
-+
-+        ### set the output document, add the uri ###
-+        ### quote the URI, because lftp supports certain shell
-+        ### expansions, most notably & for backgrounding.
-+        ### ' quote does nto work, must be "
-+        $str .= q[get ']. $self->uri .q[' -o ]. $to . $/;
-+
-+        if( $DEBUG ) {
-+            my $pp_str = join ' ', split $/, $str;
-+            print "# lftp command: $pp_str\n";
-+        }              
-+
-+        ### write straight to the file.
-+        $fh->autoflush(1);
-+        print $fh $str;
-+
-+        ### the command needs to be 1 string to be executed
-+        push @$cmd, $fh->filename;
-+
-+        ### with IPC::Cmd > 0.41, this is fixed in teh library,
-+        ### and there's no need for special casing any more.
-+        ### DO NOT quote things for IPC::Run, it breaks stuff.
-+        # $IPC::Cmd::USE_IPC_RUN
-+        #    ? ($to, $self->uri)
-+        #    : (QUOTE. $to .QUOTE, QUOTE. $self->uri .QUOTE);
-+
-+
-+        ### shell out ###
-+        my $captured;
-+        unless(run( command => $cmd,
-+                    buffer  => \$captured,
-+                    verbose => $DEBUG
-+        )) {
-+            ### wget creates the output document always, even if the fetch
-+            ### fails.. so unlink it in that case
-+            1 while unlink $to;
-+
-+            return $self->_error(loc( "Command failed: %1", $captured || '' ));
-+        }
-+
-+        return $to;
-+
-+    } else {
-+        $METHOD_FAIL->{'lftp'} = 1;
-+        return;
-+    }
-+}
-+
-+
- 
- ### /bin/ftp fetch ###
- sub _ftp_fetch {
-@@ -717,6 +795,33 @@
-                 'lynx' ));
-         }            
- 
-+        ### check if the HTTP resource exists ###
-+        if ($self->uri =~ /^https?:\/\//i) {
-+            my $cmd = [
-+                $lynx,
-+                '-head',
-+                '-source',
-+                "-auth=anonymous:$FROM_EMAIL",
-+            ];
-+
-+            push @$cmd, "-connect_timeout=$TIMEOUT" if $TIMEOUT;
-+
-+            push @$cmd, $self->uri;
-+
-+            ### shell out ###
-+            my $head;
-+            unless(run( command => $cmd,
-+                        buffer  => \$head,
-+                        verbose => $DEBUG )
-+            ) {
-+                return $self->_error(loc("Command failed: %1", $head || ''));
-+            }
-+
-+            unless($head =~ /^HTTP\/\d+\.\d+ 200\b/) {
-+                return $self->_error(loc("Command failed: %1", $head || ''));
-+            }
-+        }
-+
-         ### write to the output file ourselves, since lynx ass_u_mes to much
-         my $local = FileHandle->new(">$to")
-                         or return $self->_error(loc(
-@@ -732,9 +837,14 @@
-         push @$cmd, "-connect_timeout=$TIMEOUT" if $TIMEOUT;
- 
-         ### DO NOT quote things for IPC::Run, it breaks stuff.
--        push @$cmd, $IPC::Cmd::USE_IPC_RUN
--                        ? $self->uri
--                        : QUOTE. $self->uri .QUOTE;
-+        push @$cmd, $self->uri;
-+        
-+        ### with IPC::Cmd > 0.41, this is fixed in teh library,
-+        ### and there's no need for special casing any more.
-+        ### DO NOT quote things for IPC::Run, it breaks stuff.
-+        # $IPC::Cmd::USE_IPC_RUN
-+        #    ? $self->uri
-+        #    : QUOTE. $self->uri .QUOTE;
- 
- 
-         ### shell out ###
-@@ -829,7 +939,7 @@
-     if (my $curl = can_run('curl')) {
- 
-         ### these long opts are self explanatory - I like that -jmb
--	    my $cmd = [ $curl ];
-+	    my $cmd = [ $curl, '-q' ];
- 
- 	    push(@$cmd, '--connect-timeout', $TIMEOUT) if $TIMEOUT;
- 
-@@ -842,11 +952,15 @@
- 
-         ### curl doesn't follow 302 (temporarily moved) etc automatically
-         ### so we add --location to enable that.
--        push @$cmd, '--fail', '--location', '--output', 
--                    ### DO NOT quote things for IPC::Run, it breaks stuff.
--                    $IPC::Cmd::USE_IPC_RUN
--                        ? ($to, $self->uri)
--                        : (QUOTE. $to .QUOTE, QUOTE. $self->uri .QUOTE);
-+        push @$cmd, '--fail', '--location', '--output', $to, $self->uri;
-+
-+        ### with IPC::Cmd > 0.41, this is fixed in teh library,
-+        ### and there's no need for special casing any more.
-+        ### DO NOT quote things for IPC::Run, it breaks stuff.
-+        # $IPC::Cmd::USE_IPC_RUN
-+        #    ? ($to, $self->uri)
-+        #    : (QUOTE. $to .QUOTE, QUOTE. $self->uri .QUOTE);
-+
- 
-         my $captured;
-         unless(run( command => $cmd,
-@@ -960,9 +1074,14 @@
-         push(@$cmd, '--quiet') unless $DEBUG;
- 
-         ### DO NOT quote things for IPC::Run, it breaks stuff.
--        push @$cmd, $IPC::Cmd::USE_IPC_RUN
--                        ? ($self->uri, $to)
--                        : (QUOTE. $self->uri .QUOTE, QUOTE. $to .QUOTE);
-+        push @$cmd, $self->uri, $to;
-+
-+        ### with IPC::Cmd > 0.41, this is fixed in teh library,
-+        ### and there's no need for special casing any more.
-+        ### DO NOT quote things for IPC::Run, it breaks stuff.
-+        # $IPC::Cmd::USE_IPC_RUN
-+        #    ? ($to, $self->uri)
-+        #    : (QUOTE. $to .QUOTE, QUOTE. $self->uri .QUOTE);
- 
-         my $captured;
-         unless(run( command => $cmd,
-@@ -1030,9 +1149,9 @@
- Below is a mapping of what utilities will be used in what order
- for what schemes, if available:
- 
--    file    => LWP, file
--    http    => LWP, wget, curl, lynx
--    ftp     => LWP, Net::FTP, wget, curl, ncftp, ftp
-+    file    => LWP, lftp, file
-+    http    => LWP, wget, curl, lftp, lynx
-+    ftp     => LWP, Net::FTP, wget, curl, lftp, ncftp, ftp
-     rsync   => rsync
- 
- If you'd like to disable the use of one or more of these utilities
-@@ -1148,6 +1267,7 @@
-     ftp         => ftp
-     curl        => curl
-     rsync       => rsync
-+    lftp        => lftp
- 
- =head1 FREQUENTLY ASKED QUESTIONS
- 
diff --git a/perl-update-File-Temp.patch b/perl-update-File-Temp.patch
deleted file mode 100644
index 6d03b85..0000000
--- a/perl-update-File-Temp.patch
+++ /dev/null
@@ -1,1398 +0,0 @@
-File-Temp-0.21
-
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2009-02-20 18:22:32.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-03-10 15:19:19.000000000 +0100
-@@ -1890,6 +1890,8 @@
- lib/File/stat.t			See if File::stat works
- lib/File/Temp.pm		create safe temporary files and file handles
- lib/File/Temp/t/cmp.t		See if File::Temp works
-+lib/File/Temp/t/fork.t		See if File::Temp works
-+lib/File/Temp/t/lock.t		See if File::Temp works
- lib/File/Temp/t/mktemp.t	See if File::Temp works
- lib/File/Temp/t/object.t	See if File::Temp works
- lib/File/Temp/t/posix.t		See if File::Temp works
-diff -urN perl-5.10.0.orig/lib/File/Temp/t/fork.t perl-5.10.0/lib/File/Temp/t/fork.t
---- perl-5.10.0.orig/lib/File/Temp/t/fork.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/File/Temp/t/fork.t	2009-03-10 15:26:34.000000000 +0100
-@@ -0,0 +1,90 @@
-+#!/usr/bin/perl
-+$| = 1;
-+
-+# Note that because fork loses test count we do not use Test::More
-+
-+use strict;
-+
-+BEGIN { print "1..8\n"; }
-+
-+use File::Temp;
-+
-+# OO interface
-+
-+my $file = File::Temp->new(CLEANUP=>1);
-+
-+myok( 1, -f $file->filename, "OO File exists" );
-+
-+my $children = 2;
-+for my $i (1 .. $children) {
-+  my $pid = fork;
-+  die "Can't fork: $!" unless defined $pid;
-+  if ($pid) {
-+    # parent process
-+    next;
-+  } else {
-+    # in a child we can't keep the count properly so we do it manually
-+    # make sure that child 1 dies first
-+    srand();
-+    my $time = (($i-1) * 5) +int(rand(5));
-+    print "# child $i sleeping for $time seconds\n";
-+    sleep($time);
-+    my $count = $i + 1;
-+    myok( $count, -f $file->filename(), "OO file present in child $i" );
-+    print "# child $i exiting\n";
-+    exit;
-+  }
-+}
-+
-+while ($children) {
-+    wait;
-+    $children--;
-+}
-+
-+
-+
-+myok( 4, -f $file->filename(), "OO File exists in parent" );
-+
-+# non-OO interface
-+
-+my ($fh, $filename) = File::Temp::tempfile( CLEANUP => 1 );
-+
-+myok( 5, -f $filename, "non-OO File exists" );
-+
-+$children = 2;
-+for my $i (1 .. $children) {
-+  my $pid = fork;
-+  die "Can't fork: $!" unless defined $pid;
-+  if ($pid) {
-+    # parent process
-+    next;
-+  } else {
-+    srand();
-+    my $time = (($i-1) * 5) +int(rand(5));
-+    print "# child $i sleeping for $time seconds\n";
-+    sleep($time);
-+    my $count = 5 + $i;
-+    myok( $count, -f $filename, "non-OO File present in child $i" );
-+    print "# child $i exiting\n";
-+    exit;
-+  }
-+}
-+
-+while ($children) {
-+    wait;
-+    $children--;
-+}
-+myok(8, -f $filename, "non-OO File exists in parent" );
-+
-+
-+# Local ok sub handles explicit number
-+sub myok {
-+  my ($count, $test, $msg) = @_;
-+
-+  if ($test) {
-+    print "ok $count - $msg\n";
-+  } else {
-+    print "not ok $count - $msg\n";
-+  }
-+  return $test;
-+}
-diff -urN perl-5.10.0.orig/lib/File/Temp/t/lock.t perl-5.10.0/lib/File/Temp/t/lock.t
---- perl-5.10.0.orig/lib/File/Temp/t/lock.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/File/Temp/t/lock.t	2009-03-10 15:26:34.000000000 +0100
-@@ -0,0 +1,60 @@
-+#!perl -w
-+# Test O_EXLOCK
-+
-+use Test::More;
-+use strict;
-+use Fcntl;
-+
-+BEGIN {
-+# see if we have O_EXLOCK
-+  eval { &Fcntl::O_EXLOCK; };
-+  if ($@) {
-+    plan skip_all => 'Do not seem to have O_EXLOCK';
-+  } else {
-+    plan tests => 4;
-+    use_ok( "File::Temp" );
-+  }
-+}
-+
-+# Need Symbol package for lexical filehandle on older perls
-+require Symbol if $] < 5.006;
-+
-+# Get a tempfile with O_EXLOCK
-+my $fh = new File::Temp();
-+ok( -e "$fh", "temp file is present" );
-+
-+# try to open it with a lock
-+my $flags = O_CREAT | O_RDWR | O_EXLOCK;
-+
-+my $timeout = 5;
-+my $status;
-+eval {
-+   local $SIG{ALRM} = sub { die "alarm\n" }; # NB: \n required
-+   alarm $timeout;
-+   my $newfh;
-+   $newfh = &Symbol::gensym if $] < 5.006;
-+   $status = sysopen($newfh, "$fh", $flags, 0600);
-+   alarm 0;
-+};
-+if ($@) {
-+   die unless $@ eq "alarm\n";   # propagate unexpected errors
-+   # timed out
-+}
-+ok( !$status, "File $fh is locked" );
-+
-+# Now get a tempfile with locking disabled
-+$fh = new File::Temp( EXLOCK => 0 );
-+
-+eval {
-+   local $SIG{ALRM} = sub { die "alarm\n" }; # NB: \n required
-+   alarm $timeout;
-+   my $newfh;
-+   $newfh = &Symbol::gensym if $] < 5.006;
-+   $status = sysopen($newfh, "$fh", $flags, 0600);
-+   alarm 0;
-+};
-+if ($@) {
-+   die unless $@ eq "alarm\n";   # propagate unexpected errors
-+   # timed out
-+}
-+ok( $status, "File $fh is not locked");
-diff -urN perl-5.10.0.orig/lib/File/Temp/t/object.t perl-5.10.0/lib/File/Temp/t/object.t
---- perl-5.10.0.orig/lib/File/Temp/t/object.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Temp/t/object.t	2009-03-10 15:26:34.000000000 +0100
-@@ -2,7 +2,7 @@
- # Test for File::Temp - OO interface
- 
- use strict;
--use Test::More tests => 26;
-+use Test::More tests => 30;
- use File::Spec;
- 
- # Will need to check that all files were unlinked correctly
-@@ -44,7 +44,22 @@
- # Check again at exit
- push(@files, "$fh");
- 
--# TEMPDIR test
-+# OO tempdir
-+my $tdir = File::Temp->newdir();
-+my $dirname = "$tdir"; # Stringify overload
-+ok( -d $dirname, "Directory $tdir exists");
-+undef $tdir;
-+ok( !-d $dirname, "Directory should now be gone");
-+
-+# Quick basic tempfile test
-+my $qfh = File::Temp->new();
-+my $qfname = "$qfh";
-+ok (-f $qfname, "temp file exists");
-+undef $qfh;
-+ok( !-f $qfname, "temp file now gone");
-+
-+
-+# TEMPDIR test as somewhere to put the temp files
- # Create temp directory in current dir
- my $template = 'tmpdirXXXXXX';
- print "# Template: $template\n";
-diff -urN perl-5.10.0.orig/lib/File/Temp/t/seekable.t perl-5.10.0/lib/File/Temp/t/seekable.t
---- perl-5.10.0.orig/lib/File/Temp/t/seekable.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Temp/t/seekable.t	2009-03-10 15:26:34.000000000 +0100
-@@ -6,7 +6,7 @@
- 
- # change 'tests => 1' to 'tests => last_test_to_print';
- 
--use Test::More tests => 7;
-+use Test::More tests => 10;
- BEGIN { use_ok('File::Temp') };
- 
- #########################
-@@ -18,10 +18,17 @@
- $tmp = File::Temp->new;
- isa_ok( $tmp, 'File::Temp' );
- isa_ok( $tmp, 'IO::Handle' );
--isa_ok( $tmp, 'IO::Seekable' );
-+SKIP: {
-+  skip "->isa is broken on 5.6.0", 1 if $] == 5.006000;
-+  isa_ok( $tmp, 'IO::Seekable' );
-+}
- 
- # make sure the seek method is available...
--ok( File::Temp->can('seek'), 'tmp can seek' );
-+# Note that we need a reasonably modern IO::Seekable
-+SKIP: {
-+  skip "IO::Seekable is too old", 1 if IO::Seekable->VERSION <= 1.06;
-+  ok( File::Temp->can('seek'), 'tmp can seek' );
-+}
- 
- # make sure IO::Handle methods are still there...
- ok( File::Temp->can('print'), 'tmp can print' );
-@@ -30,3 +37,7 @@
- $c = scalar @File::Temp::EXPORT;
- $l = join ' ', @File::Temp::EXPORT;
- ok( $c == 9, "really exporting $c: $l" );
-+
-+ok(defined eval { SEEK_SET() }, 'SEEK_SET defined by File::Temp') or diag $@;
-+ok(defined eval { SEEK_END() }, 'SEEK_END defined by File::Temp') or diag $@;
-+ok(defined eval { SEEK_CUR() }, 'SEEK_CUR defined by File::Temp') or diag $@;
-diff -urN perl-5.10.0.orig/lib/File/Temp.pm perl-5.10.0/lib/File/Temp.pm
---- perl-5.10.0.orig/lib/File/Temp.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Temp.pm	2009-03-10 15:25:28.000000000 +0100
-@@ -52,7 +52,9 @@
- 
-   ($fh, $filename) = tempfile( $template, DIR => $dir);
-   ($fh, $filename) = tempfile( $template, SUFFIX => '.dat');
-+  ($fh, $filename) = tempfile( $template, TMPDIR => 1 );
- 
-+  binmode( $fh, ":utf8" );
- 
-   $dir = tempdir( CLEANUP => 1 );
-   ($fh, $filename) = tempfile( DIR => $dir );
-@@ -63,13 +65,13 @@
-   use File::Temp ();
-   use File::Temp qw/ :seekable /;
- 
--  $fh = new File::Temp();
-+  $fh = File::Temp->new();
-   $fname = $fh->filename;
- 
--  $fh = new File::Temp(TEMPLATE => $template);
-+  $fh = File::Temp->new(TEMPLATE => $template);
-   $fname = $fh->filename;
- 
--  $tmp = new File::Temp( UNLINK => 0, SUFFIX => '.dat' );
-+  $tmp = File::Temp->new( UNLINK => 0, SUFFIX => '.dat' );
-   print $tmp "Some data\n";
-   print "Filename is $tmp\n";
-   $tmp->seek( 0, SEEK_END );
-@@ -130,6 +132,8 @@
- that was valid when function was called, so cannot guarantee
- that the file will not exist by the time the caller opens the filename.
- 
-+Filehandles returned by these functions support the seekable methods.
-+
- =cut
- 
- # 5.6.0 gives us S_IWOTH, S_IWGRP, our and auto-vivifying filehandls
-@@ -140,7 +144,7 @@
- use File::Spec 0.8;
- use File::Path qw/ rmtree /;
- use Fcntl 1.03;
--use IO::Seekable; # For SEEK_*
-+use IO::Seekable;               # For SEEK_*
- use Errno;
- require VMS::Stdio if $^O eq 'VMS';
- 
-@@ -149,7 +153,7 @@
- # us that Carp::Heavy won't load rather than an error telling us we
- # have run out of file handles. We either preload croak() or we
- # switch the calls to croak from _gettemp() to use die.
--require Carp::Heavy;
-+eval { require Carp::Heavy; };
- 
- # Need the Symbol package if we are running older perl
- require Symbol if $] < 5.006;
-@@ -171,42 +175,42 @@
- # Export list - to allow fine tuning of export table
- 
- @EXPORT_OK = qw{
--	      tempfile
--	      tempdir
--	      tmpnam
--	      tmpfile
--	      mktemp
--	      mkstemp
--	      mkstemps
--	      mkdtemp
--	      unlink0
--	      cleanup
--	      SEEK_SET
--              SEEK_CUR
--              SEEK_END
--		};
-+                 tempfile
-+                 tempdir
-+                 tmpnam
-+                 tmpfile
-+                 mktemp
-+                 mkstemp
-+                 mkstemps
-+                 mkdtemp
-+                 unlink0
-+                 cleanup
-+                 SEEK_SET
-+                 SEEK_CUR
-+                 SEEK_END
-+             };
- 
- # Groups of functions for export
- 
- %EXPORT_TAGS = (
--		'POSIX' => [qw/ tmpnam tmpfile /],
--		'mktemp' => [qw/ mktemp mkstemp mkstemps mkdtemp/],
--		'seekable' => [qw/ SEEK_SET SEEK_CUR SEEK_END /],
--	       );
-+                'POSIX' => [qw/ tmpnam tmpfile /],
-+                'mktemp' => [qw/ mktemp mkstemp mkstemps mkdtemp/],
-+                'seekable' => [qw/ SEEK_SET SEEK_CUR SEEK_END /],
-+               );
- 
- # add contents of these tags to @EXPORT
- Exporter::export_tags('POSIX','mktemp','seekable');
- 
- # Version number
- 
--$VERSION = '0.18';
-+$VERSION = '0.21';
- 
- # This is a list of characters that can be used in random filenames
- 
- my @CHARS = (qw/ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
--	         a b c d e f g h i j k l m n o p q r s t u v w x y z
--	         0 1 2 3 4 5 6 7 8 9 _
--	     /);
-+                 a b c d e f g h i j k l m n o p q r s t u v w x y z
-+                 0 1 2 3 4 5 6 7 8 9 _
-+               /);
- 
- # Maximum number of tries to make a temp file before failing
- 
-@@ -229,9 +233,10 @@
- # us an optimisation when many temporary files are requested
- 
- my $OPENFLAGS = O_CREAT | O_EXCL | O_RDWR;
-+my $LOCKFLAG;
- 
- unless ($^O eq 'MacOS') {
--  for my $oflag (qw/ NOFOLLOW BINARY LARGEFILE EXLOCK NOINHERIT /) {
-+  for my $oflag (qw/ NOFOLLOW BINARY LARGEFILE NOINHERIT /) {
-     my ($bit, $func) = (0, "Fcntl::O_" . $oflag);
-     no strict 'refs';
-     $OPENFLAGS |= $bit if eval {
-@@ -243,6 +248,12 @@
-       1;
-     };
-   }
-+  # Special case O_EXLOCK
-+  $LOCKFLAG = eval {
-+    local $SIG{__DIE__} = sub {};
-+    local $SIG{__WARN__} = sub {};
-+    &Fcntl::O_EXLOCK();
-+  };
- }
- 
- # On some systems the O_TEMPORARY flag can be used to tell the OS
-@@ -256,6 +267,7 @@
- unless ($^O eq 'MacOS') {
-   for my $oflag (qw/ TEMPORARY /) {
-     my ($bit, $func) = (0, "Fcntl::O_" . $oflag);
-+    local($@);
-     no strict 'refs';
-     $OPENTEMPFLAGS |= $bit if eval {
-       # Make sure that redefined die handlers do not cause problems
-@@ -268,6 +280,9 @@
-   }
- }
- 
-+# Private hash tracking which files have been created by each process id via the OO interface
-+my %FILES_CREATED_BY_OBJECT;
-+
- # INTERNAL ROUTINES - not to be used outside of package
- 
- # Generic routine for getting a temporary filename
-@@ -292,6 +307,7 @@
- #                        the file as soon as it is closed. Usually indicates
- #                        use of the O_TEMPORARY flag to sysopen.
- #                        Usually irrelevant on unix
-+#   "use_exlock" => Indicates that O_EXLOCK should be used. Default is true.
- 
- # Optionally a reference to a scalar can be passed into the function
- # On error this will be used to store the reason for the error
-@@ -324,12 +340,13 @@
- 
-   # Default options
-   my %options = (
--		 "open" => 0,
--		 "mkdir" => 0,
--		 "suffixlen" => 0,
--		 "unlink_on_close" => 0,
--		 "ErrStr" => \$tempErrStr,
--		);
-+                 "open" => 0,
-+                 "mkdir" => 0,
-+                 "suffixlen" => 0,
-+                 "unlink_on_close" => 0,
-+                 "use_exlock" => 1,
-+                 "ErrStr" => \$tempErrStr,
-+                );
- 
-   # Read the template
-   my $template = shift;
-@@ -389,7 +406,7 @@
-   # or a tempfile
- 
-   my ($volume, $directories, $file);
--  my $parent; # parent directory
-+  my $parent;                   # parent directory
-   if ($options{"mkdir"}) {
-     # There is no filename at the end
-     ($volume, $directories, $file) = File::Spec->splitpath( $path, 1);
-@@ -404,16 +421,16 @@
-       $parent = File::Spec->curdir;
-     } else {
- 
--      if ($^O eq 'VMS') {  # need volume to avoid relative dir spec
-+      if ($^O eq 'VMS') {     # need volume to avoid relative dir spec
-         $parent = File::Spec->catdir($volume, @dirs[0..$#dirs-1]);
-         $parent = 'sys$disk:[]' if $parent eq '';
-       } else {
- 
--	# Put it back together without the last one
--	$parent = File::Spec->catdir(@dirs[0..$#dirs-1]);
-+        # Put it back together without the last one
-+        $parent = File::Spec->catdir(@dirs[0..$#dirs-1]);
- 
--	# ...and attach the volume (no filename)
--	$parent = File::Spec->catpath($volume, $parent, '');
-+        # ...and attach the volume (no filename)
-+        $parent = File::Spec->catpath($volume, $parent, '');
-       }
- 
-     }
-@@ -437,15 +454,14 @@
-   # not a file -- no point returning a name that includes a directory
-   # that does not exist or is not writable
- 
-+  unless (-e $parent) {
-+    ${$options{ErrStr}} = "Parent directory ($parent) does not exist";
-+    return ();
-+  }
-   unless (-d $parent) {
-     ${$options{ErrStr}} = "Parent directory ($parent) is not a directory";
-     return ();
-   }
--  unless (-w $parent) {
--    ${$options{ErrStr}} = "Parent directory ($parent) is not writable\n";
--      return ();
--  }
--
- 
-   # Check the stickiness of the directory and chown giveaway if required
-   # If the directory is world writable the sticky bit
-@@ -475,7 +491,7 @@
- 
-       # If we are running before perl5.6.0 we can not auto-vivify
-       if ($] < 5.006) {
--	$fh = &Symbol::gensym;
-+        $fh = &Symbol::gensym;
-       }
- 
-       # Try to make sure this will be marked close-on-exec
-@@ -487,52 +503,53 @@
-       my $open_success = undef;
-       if ( $^O eq 'VMS' and $options{"unlink_on_close"} && !$KEEP_ALL) {
-         # make it auto delete on close by setting FAB$V_DLT bit
--	$fh = VMS::Stdio::vmssysopen($path, $OPENFLAGS, 0600, 'fop=dlt');
--	$open_success = $fh;
-+        $fh = VMS::Stdio::vmssysopen($path, $OPENFLAGS, 0600, 'fop=dlt');
-+        $open_success = $fh;
-       } else {
--	my $flags = ( ($options{"unlink_on_close"} && !$KEEP_ALL) ?
--		      $OPENTEMPFLAGS :
--		      $OPENFLAGS );
--	$open_success = sysopen($fh, $path, $flags, 0600);
-+        my $flags = ( ($options{"unlink_on_close"} && !$KEEP_ALL) ?
-+                      $OPENTEMPFLAGS :
-+                      $OPENFLAGS );
-+        $flags |= $LOCKFLAG if (defined $LOCKFLAG && $options{use_exlock});
-+        $open_success = sysopen($fh, $path, $flags, 0600);
-       }
-       if ( $open_success ) {
- 
--	# in case of odd umask force rw
--	chmod(0600, $path);
-+        # in case of odd umask force rw
-+        chmod(0600, $path);
- 
--	# Opened successfully - return file handle and name
--	return ($fh, $path);
-+        # Opened successfully - return file handle and name
-+        return ($fh, $path);
- 
-       } else {
- 
--	# Error opening file - abort with error
--	# if the reason was anything but EEXIST
--	unless ($!{EEXIST}) {
--	  ${$options{ErrStr}} = "Could not create temp file $path: $!";
--	  return ();
--	}
-+        # Error opening file - abort with error
-+        # if the reason was anything but EEXIST
-+        unless ($!{EEXIST}) {
-+          ${$options{ErrStr}} = "Could not create temp file $path: $!";
-+          return ();
-+        }
- 
--	# Loop round for another try
-+        # Loop round for another try
- 
-       }
-     } elsif ($options{"mkdir"}) {
- 
-       # Open the temp directory
-       if (mkdir( $path, 0700)) {
--	# in case of odd umask
--	chmod(0700, $path);
-+        # in case of odd umask
-+        chmod(0700, $path);
- 
--	return undef, $path;
-+        return undef, $path;
-       } else {
- 
--	# Abort with error if the reason for failure was anything
--	# except EEXIST
--	unless ($!{EEXIST}) {
--	  ${$options{ErrStr}} = "Could not create directory $path: $!";
--	  return ();
--	}
-+        # Abort with error if the reason for failure was anything
-+        # except EEXIST
-+        unless ($!{EEXIST}) {
-+          ${$options{ErrStr}} = "Could not create directory $path: $!";
-+          return ();
-+        }
- 
--	# Loop round for another try
-+        # Loop round for another try
- 
-       }
- 
-@@ -559,7 +576,7 @@
-     # attempt and make sure that none are repeated
- 
-     my $original = $path;
--    my $counter = 0;  # Stop infinite loop
-+    my $counter = 0;            # Stop infinite loop
-     my $MAX_GUESS = 50;
- 
-     do {
-@@ -587,22 +604,6 @@
- 
- }
- 
--# Internal routine to return a random character from the
--# character list. Does not do an srand() since rand()
--# will do one automatically
--
--# No arguments. Return value is the random character
--
--# No longer called since _replace_XX runs a few percent faster if
--# I inline the code. This is important if we are creating thousands of
--# temporary files.
--
--sub _randchar {
--
--  $CHARS[ int( rand( $#CHARS ) ) ];
--
--}
--
- # Internal routine to replace the XXXX... with random characters
- # This has to be done by _gettemp() every time it fails to
- # open a temp file/dir
-@@ -623,11 +624,12 @@
-   # and suffixlen=0 returns nothing if used in the substr directly
-   # Alternatively, could simply set $ignore to length($path)-1
-   # Don't want to always use substr when not required though.
-+  my $end = ( $] >= 5.006 ? "\\z" : "\\Z" );
- 
-   if ($ignore) {
--    substr($path, 0, - $ignore) =~ s/X(?=X*\z)/$CHARS[ int( rand( $#CHARS ) ) ]/ge;
-+    substr($path, 0, - $ignore) =~ s/X(?=X*$end)/$CHARS[ int( rand( @CHARS ) ) ]/ge;
-   } else {
--    $path =~ s/X(?=X*\z)/$CHARS[ int( rand( $#CHARS ) ) ]/ge;
-+    $path =~ s/X(?=X*$end)/$CHARS[ int( rand( @CHARS ) ) ]/ge;
-   }
-   return $path;
- }
-@@ -670,16 +672,17 @@
-   unless (scalar(@info)) {
-     $$err_ref = "stat(path) returned no values";
-     return 0;
--  };
--  return 1 if $^O eq 'VMS';  # owner delete control at file level
-+  }
-+  ;
-+  return 1 if $^O eq 'VMS';     # owner delete control at file level
- 
-   # Check to see whether owner is neither superuser (or a system uid) nor me
-   # Use the effective uid from the $> variable
-   # UID is in [4]
-   if ($info[4] > File::Temp->top_system_uid() && $info[4] != $>) {
- 
--    Carp::cluck(sprintf "uid=$info[4] topuid=%s euid=$< path='$path'",
--		File::Temp->top_system_uid());
-+    Carp::cluck(sprintf "uid=$info[4] topuid=%s euid=$> path='$path'",
-+                File::Temp->top_system_uid());
- 
-     $$err_ref = "Directory owned neither by root nor the current user"
-       if ref($err_ref);
-@@ -691,18 +694,18 @@
-   # use 022 to check writability
-   # Do it with S_IWOTH and S_IWGRP for portability (maybe)
-   # mode is in info[2]
--  if (($info[2] & &Fcntl::S_IWGRP) ||   # Is group writable?
--      ($info[2] & &Fcntl::S_IWOTH) ) {  # Is world writable?
-+  if (($info[2] & &Fcntl::S_IWGRP) ||  # Is group writable?
-+      ($info[2] & &Fcntl::S_IWOTH) ) { # Is world writable?
-     # Must be a directory
-     unless (-d $path) {
-       $$err_ref = "Path ($path) is not a directory"
--      if ref($err_ref);
-+        if ref($err_ref);
-       return 0;
-     }
-     # Must have sticky bit set
-     unless (-k $path) {
-       $$err_ref = "Sticky bit not set on $path when dir is group|world writable"
--	if ref($err_ref);
-+        if ref($err_ref);
-       return 0;
-     }
-   }
-@@ -727,12 +730,13 @@
- 
-   my $path = shift;
-   print "_is_verysafe testing $path\n" if $DEBUG;
--  return 1 if $^O eq 'VMS';  # owner delete control at file level
-+  return 1 if $^O eq 'VMS';     # owner delete control at file level
- 
-   my $err_ref = shift;
- 
-   # Should Get the value of _PC_CHOWN_RESTRICTED if it is defined
-   # and If it is not there do the extensive test
-+  local($@);
-   my $chown_restricted;
-   $chown_restricted = &POSIX::_PC_CHOWN_RESTRICTED()
-     if eval { &POSIX::_PC_CHOWN_RESTRICTED(); 1};
-@@ -769,9 +773,9 @@
-   foreach my $pos (0.. $#dirs) {
-     # Get a directory name
-     my $dir = File::Spec->catpath($volume,
--				  File::Spec->catdir(@dirs[0.. $#dirs - $pos]),
--				  ''
--				  );
-+                                  File::Spec->catdir(@dirs[0.. $#dirs - $pos]),
-+                                  ''
-+                                 );
- 
-     print "TESTING DIR $dir\n" if $DEBUG;
- 
-@@ -863,6 +867,7 @@
- 
-   # Set up an end block to use these arrays
-   END {
-+    local($., $@, $!, $^E, $?);
-     cleanup();
-   }
- 
-@@ -872,33 +877,38 @@
-     if (!$KEEP_ALL) {
-       # Files
-       my @files = (exists $files_to_unlink{$$} ?
--		   @{ $files_to_unlink{$$} } : () );
-+                   @{ $files_to_unlink{$$} } : () );
-       foreach my $file (@files) {
--	# close the filehandle without checking its state
--	# in order to make real sure that this is closed
--	# if its already closed then I dont care about the answer
--	# probably a better way to do this
--	close($file->[0]);  # file handle is [0]
--
--	if (-f $file->[1]) {  # file name is [1]
--	  _force_writable( $file->[1] ); # for windows
--	  unlink $file->[1] or warn "Error removing ".$file->[1];
--	}
-+        # close the filehandle without checking its state
-+        # in order to make real sure that this is closed
-+        # if its already closed then I dont care about the answer
-+        # probably a better way to do this
-+        close($file->[0]);      # file handle is [0]
-+
-+        if (-f $file->[1]) {       # file name is [1]
-+          _force_writable( $file->[1] ); # for windows
-+          unlink $file->[1] or warn "Error removing ".$file->[1];
-+        }
-       }
-       # Dirs
-       my @dirs = (exists $dirs_to_unlink{$$} ?
--		  @{ $dirs_to_unlink{$$} } : () );
-+                  @{ $dirs_to_unlink{$$} } : () );
-       foreach my $dir (@dirs) {
--	if (-d $dir) {
--	  rmtree($dir, $DEBUG, 0);
--	}
-+        if (-d $dir) {
-+          # Some versions of rmtree will abort if you attempt to remove
-+          # the directory you are sitting in. We protect that and turn it
-+          # into a warning. We do this because this occurs during
-+          # cleanup and so can not be caught by the user.
-+          eval { rmtree($dir, $DEBUG, 0); };
-+          warn $@ if ($@ && $^W);
-+        }
-       }
- 
-       # clear the arrays
-       @{ $files_to_unlink{$$} } = ()
--	if exists $files_to_unlink{$$};
-+        if exists $files_to_unlink{$$};
-       @{ $dirs_to_unlink{$$} } = ()
--	if exists $dirs_to_unlink{$$};
-+        if exists $dirs_to_unlink{$$};
-     }
-   }
- 
-@@ -923,28 +933,28 @@
- 
-       if (-d $fname) {
- 
--	# Directory exists so store it
--	# first on VMS turn []foo into [.foo] for rmtree
--	$fname = VMS::Filespec::vmspath($fname) if $^O eq 'VMS';
--	$dirs_to_unlink{$$} = [] 
--	  unless exists $dirs_to_unlink{$$};
--	push (@{ $dirs_to_unlink{$$} }, $fname);
-+        # Directory exists so store it
-+        # first on VMS turn []foo into [.foo] for rmtree
-+        $fname = VMS::Filespec::vmspath($fname) if $^O eq 'VMS';
-+        $dirs_to_unlink{$$} = [] 
-+          unless exists $dirs_to_unlink{$$};
-+        push (@{ $dirs_to_unlink{$$} }, $fname);
- 
-       } else {
--	carp "Request to remove directory $fname could not be completed since it does not exist!\n" if $^W;
-+        carp "Request to remove directory $fname could not be completed since it does not exist!\n" if $^W;
-       }
- 
-     } else {
- 
-       if (-f $fname) {
- 
--	# file exists so store handle and name for later removal
--	$files_to_unlink{$$} = []
--	  unless exists $files_to_unlink{$$};
--	push(@{ $files_to_unlink{$$} }, [$fh, $fname]);
-+        # file exists so store handle and name for later removal
-+        $files_to_unlink{$$} = []
-+          unless exists $files_to_unlink{$$};
-+        push(@{ $files_to_unlink{$$} }, [$fh, $fname]);
- 
-       } else {
--	carp "Request to remove file $fname could not be completed since it is not there!\n" if $^W;
-+        carp "Request to remove file $fname could not be completed since it is not there!\n" if $^W;
-       }
- 
-     }
-@@ -974,7 +984,7 @@
- 
- Create a temporary file object.
- 
--  my $tmp = new File::Temp();
-+  my $tmp = File::Temp->new();
- 
- by default the object is constructed as if C<tempfile>
- was called without options, but with the additional behaviour
-@@ -982,11 +992,11 @@
- if UNLINK is set to true (the default).
- 
- Supported arguments are the same as for C<tempfile>: UNLINK
--(defaulting to true), DIR and SUFFIX. Additionally, the filename
-+(defaulting to true), DIR, EXLOCK and SUFFIX. Additionally, the filename
- template is specified using the TEMPLATE option. The OPEN option
- is not supported (the file is always opened).
- 
-- $tmp = new File::Temp( TEMPLATE => 'tempXXXXX',
-+ $tmp = File::Temp->new( TEMPLATE => 'tempXXXXX',
-                         DIR => 'mydir',
-                         SUFFIX => '.dat');
- 
-@@ -1008,8 +1018,8 @@
-   my $unlink = (exists $args{UNLINK} ? $args{UNLINK} : 1 );
-   delete $args{UNLINK};
- 
--  # template (store it in an error so that it will
--  # disappear from the arg list of tempfile
-+  # template (store it in an array so that it will
-+  # disappear from the arg list of tempfile)
-   my @template = ( exists $args{TEMPLATE} ? $args{TEMPLATE} : () );
-   delete $args{TEMPLATE};
- 
-@@ -1024,6 +1034,9 @@
-   # Store the filename in the scalar slot
-   ${*$fh} = $path;
- 
-+  # Cache the filename by pid so that the destructor can decide whether to remove it
-+  $FILES_CREATED_BY_OBJECT{$$}{$path} = 1;
-+
-   # Store unlink information in hash slot (plus other constructor info)
-   %{*$fh} = %args;
- 
-@@ -1036,9 +1049,48 @@
-   return $fh;
- }
- 
-+=item B<newdir>
-+
-+Create a temporary directory using an object oriented interface.
-+
-+  $dir = File::Temp->newdir();
-+
-+By default the directory is deleted when the object goes out of scope.
-+
-+Supports the same options as the C<tempdir> function. Note that directories
-+created with this method default to CLEANUP => 1.
-+
-+  $dir = File::Temp->newdir( $template, %options );
-+
-+=cut
-+
-+sub newdir {
-+  my $self = shift;
-+
-+  # need to handle args as in tempdir because we have to force CLEANUP
-+  # default without passing CLEANUP to tempdir
-+  my $template = (scalar(@_) % 2 == 1 ? shift(@_) : undef );
-+  my %options = @_;
-+  my $cleanup = (exists $options{CLEANUP} ? $options{CLEANUP} : 1 );
-+
-+  delete $options{CLEANUP};
-+
-+  my $tempdir;
-+  if (defined $template) {
-+    $tempdir = tempdir( $template, %options );
-+  } else {
-+    $tempdir = tempdir( %options );
-+  }
-+  return bless { DIRNAME => $tempdir,
-+                 CLEANUP => $cleanup,
-+                 LAUNCHPID => $$,
-+               }, "File::Temp::Dir";
-+}
-+
- =item B<filename>
- 
--Return the name of the temporary file associated with this object.
-+Return the name of the temporary file associated with this object
-+(if the object was created using the "new" constructor).
- 
-   $filename = $tmp->filename;
- 
-@@ -1057,6 +1109,15 @@
-   return $self->filename;
- }
- 
-+=item B<dirname>
-+
-+Return the name of the temporary directory associated with this
-+object (if the object was created using the "newdir" constructor).
-+
-+  $dirname = $tmpdir->dirname;
-+
-+This method is called automatically when the object is used in string context.
-+
- =item B<unlink_on_destroy>
- 
- Control whether the file is unlinked when the object goes out of scope.
-@@ -1085,24 +1146,47 @@
- 
- No error is given if the unlink fails.
- 
--If the global variable $KEEP_ALL is true, the file will not be removed.
-+If the object has been passed to a child process during a fork, the
-+file will be deleted when the object goes out of scope in the parent.
-+
-+For a temporary directory object the directory will be removed
-+unless the CLEANUP argument was used in the constructor (and set to
-+false) or C<unlink_on_destroy> was modified after creation.
-+
-+If the global variable $KEEP_ALL is true, the file or directory
-+will not be removed.
- 
- =cut
- 
- sub DESTROY {
-+  local($., $@, $!, $^E, $?);
-   my $self = shift;
-+
-+  # Make sure we always remove the file from the global hash
-+  # on destruction. This prevents the hash from growing uncontrollably
-+  # and post-destruction there is no reason to know about the file.
-+  my $file = $self->filename;
-+  my $was_created_by_proc;
-+  if (exists $FILES_CREATED_BY_OBJECT{$$}{$file}) {
-+    $was_created_by_proc = 1;
-+    delete $FILES_CREATED_BY_OBJECT{$$}{$file};
-+  }
-+
-   if (${*$self}{UNLINK} && !$KEEP_ALL) {
-     print "# --------->   Unlinking $self\n" if $DEBUG;
- 
-+    # only delete if this process created it
-+    return unless $was_created_by_proc;
-+
-     # The unlink1 may fail if the file has been closed
-     # by the caller. This leaves us with the decision
-     # of whether to refuse to remove the file or simply
-     # do an unlink without test. Seems to be silly
-     # to do this when we are trying to be careful
-     # about security
--    _force_writable( $self->filename ); # for windows
--    unlink1( $self, $self->filename )
--      or unlink($self->filename);
-+    _force_writable( $file ); # for windows
-+    unlink1( $self, $file )
-+      or unlink($file);
-   }
- }
- 
-@@ -1145,6 +1229,12 @@
- Translates the template as before except that a directory name
- is specified.
- 
-+  ($fh, $filename) = tempfile($template, TMPDIR => 1);
-+
-+Equivalent to specifying a DIR of "File::Spec->tmpdir", writing the file
-+into the same temporary directory as would be used if no template was
-+specified at all.
-+
-   ($fh, $filename) = tempfile($template, UNLINK => 1);
- 
- Return the filename and filehandle as before except that the file is
-@@ -1163,7 +1253,7 @@
- (L<File::Spec>) unless a directory is specified explicitly with the
- DIR option.
- 
--  $fh = tempfile( $template, DIR => $dir );
-+  $fh = tempfile( DIR => $dir );
- 
- If called in scalar context, only the filehandle is returned and the
- file will automatically be deleted when closed on operating systems
-@@ -1186,6 +1276,16 @@
- and mktemp() functions described elsewhere in this document
- if opening the file is not required.
- 
-+If the operating system supports it (for example BSD derived systems), the 
-+filehandle will be opened with O_EXLOCK (open with exclusive file lock). 
-+This can sometimes cause problems if the intention is to pass the filename 
-+to another system that expects to take an exclusive lock itself (such as 
-+DBD::SQLite) whilst ensuring that the tempfile is not reused. In this 
-+situation the "EXLOCK" option can be passed to tempfile. By default EXLOCK 
-+will be true (this retains compatibility with earlier releases).
-+
-+  ($fh, $filename) = tempfile($template, EXLOCK => 0);
-+
- Options can be combined as required.
- 
- Will croak() if there is an error.
-@@ -1199,11 +1299,13 @@
- 
-   # Default options
-   my %options = (
--		 "DIR"    => undef,  # Directory prefix
--                "SUFFIX" => '',     # Template suffix
--                "UNLINK" => 0,      # Do not unlink file on exit
--                "OPEN"   => 1,      # Open file
--		);
-+                 "DIR"    => undef, # Directory prefix
-+                 "SUFFIX" => '',    # Template suffix
-+                 "UNLINK" => 0,     # Do not unlink file on exit
-+                 "OPEN"   => 1,     # Open file
-+                 "TMPDIR" => 0, # Place tempfile in tempdir if template specified
-+                 "EXLOCK" => 1, # Open file with O_EXLOCK
-+                );
- 
-   # Check to see whether we have an odd or even number of arguments
-   my $template = (scalar(@_) % 2 == 1 ? shift(@_) : undef);
-@@ -1221,8 +1323,8 @@
- 
-   if ($options{"DIR"} and $^O eq 'VMS') {
- 
--      # on VMS turn []foo into [.foo] for concatenation
--      $options{"DIR"} = VMS::Filespec::vmspath($options{"DIR"});
-+    # on VMS turn []foo into [.foo] for concatenation
-+    $options{"DIR"} = VMS::Filespec::vmspath($options{"DIR"});
-   }
- 
-   # Construct the template
-@@ -1234,10 +1336,15 @@
-   # First generate a template if not defined and prefix the directory
-   # If no template must prefix the temp directory
-   if (defined $template) {
-+    # End up with current directory if neither DIR not TMPDIR are set
-     if ($options{"DIR"}) {
- 
-       $template = File::Spec->catfile($options{"DIR"}, $template);
- 
-+    } elsif ($options{TMPDIR}) {
-+
-+      $template = File::Spec->catfile(File::Spec->tmpdir, $template );
-+
-     }
- 
-   } else {
-@@ -1273,12 +1380,13 @@
-   my ($fh, $path, $errstr);
-   croak "Error in tempfile() using $template: $errstr"
-     unless (($fh, $path) = _gettemp($template,
--				    "open" => $options{'OPEN'},
--				    "mkdir"=> 0 ,
-+                                    "open" => $options{'OPEN'},
-+                                    "mkdir"=> 0 ,
-                                     "unlink_on_close" => $unlink_on_close,
--				    "suffixlen" => length($options{'SUFFIX'}),
--				    "ErrStr" => \$errstr,
--				   ) );
-+                                    "suffixlen" => length($options{'SUFFIX'}),
-+                                    "ErrStr" => \$errstr,
-+                                    "use_exlock" => $options{EXLOCK},
-+                                   ) );
- 
-   # Set up an exit handler that can do whatever is right for the
-   # system. This removes files at exit when requested explicitly or when
-@@ -1312,7 +1420,15 @@
- 
- =item B<tempdir>
- 
--This is the recommended interface for creation of temporary directories.
-+This is the recommended interface for creation of temporary
-+directories.  By default the directory will not be removed on exit
-+(that is, it won't be temporary; this behaviour can not be changed
-+because of issues with backwards compatibility). To enable removal
-+either use the CLEANUP option which will trigger removal on program
-+exit, or consider using the "newdir" method in the object interface which
-+will allow the directory to be cleaned up when the object goes out of
-+scope.
-+
- The behaviour of the function depends on the arguments:
- 
-   $tempdir = tempdir();
-@@ -1374,10 +1490,10 @@
- 
-   # Default options
-   my %options = (
--		 "CLEANUP"    => 0,  # Remove directory on exit
--		 "DIR"        => '', # Root directory
--		 "TMPDIR"     => 0,  # Use tempdir with template
--		);
-+                 "CLEANUP"    => 0, # Remove directory on exit
-+                 "DIR"        => '', # Root directory
-+                 "TMPDIR"     => 0,  # Use tempdir with template
-+                );
- 
-   # Check to see whether we have an odd or even number of arguments
-   my $template = (scalar(@_) % 2 == 1 ? shift(@_) : undef );
-@@ -1409,8 +1525,8 @@
- 
-       } elsif ($options{TMPDIR}) {
- 
--	# Prepend tmpdir
--	$template = File::Spec->catdir(File::Spec->tmpdir, $template);
-+        # Prepend tmpdir
-+        $template = File::Spec->catdir(File::Spec->tmpdir, $template);
- 
-       }
- 
-@@ -1433,7 +1549,7 @@
-   # Create the directory
-   my $tempdir;
-   my $suffixlen = 0;
--  if ($^O eq 'VMS') {  # dir names can end in delimiters
-+  if ($^O eq 'VMS') {           # dir names can end in delimiters
-     $template =~ m/([\.\]:>]+)$/;
-     $suffixlen = length($1);
-   }
-@@ -1445,11 +1561,11 @@
-   my $errstr;
-   croak "Error in tempdir() using $template: $errstr"
-     unless ((undef, $tempdir) = _gettemp($template,
--				    "open" => 0,
--				    "mkdir"=> 1 ,
--				    "suffixlen" => $suffixlen,
--				    "ErrStr" => \$errstr,
--				   ) );
-+                                         "open" => 0,
-+                                         "mkdir"=> 1 ,
-+                                         "suffixlen" => $suffixlen,
-+                                         "ErrStr" => \$errstr,
-+                                        ) );
- 
-   # Install exit handler; must be dynamic to get lexical
-   if ( $options{'CLEANUP'} && -d $tempdir) {
-@@ -1499,11 +1615,11 @@
-   my ($fh, $path, $errstr);
-   croak "Error in mkstemp using $template: $errstr"
-     unless (($fh, $path) = _gettemp($template,
--				    "open" => 1,
--				    "mkdir"=> 0 ,
--				    "suffixlen" => 0,
--				    "ErrStr" => \$errstr,
--				   ) );
-+                                    "open" => 1,
-+                                    "mkdir"=> 0 ,
-+                                    "suffixlen" => 0,
-+                                    "ErrStr" => \$errstr,
-+                                   ) );
- 
-   if (wantarray()) {
-     return ($fh, $path);
-@@ -1544,11 +1660,11 @@
-   my ($fh, $path, $errstr);
-   croak "Error in mkstemps using $template: $errstr"
-     unless (($fh, $path) = _gettemp($template,
--				    "open" => 1,
--				    "mkdir"=> 0 ,
--				    "suffixlen" => length($suffix),
--				    "ErrStr" => \$errstr,
--				   ) );
-+                                    "open" => 1,
-+                                    "mkdir"=> 0 ,
-+                                    "suffixlen" => length($suffix),
-+                                    "ErrStr" => \$errstr,
-+                                   ) );
- 
-   if (wantarray()) {
-     return ($fh, $path);
-@@ -1582,7 +1698,7 @@
- 
-   my $template = shift;
-   my $suffixlen = 0;
--  if ($^O eq 'VMS') {  # dir names can end in delimiters
-+  if ($^O eq 'VMS') {           # dir names can end in delimiters
-     $template =~ m/([\.\]:>]+)$/;
-     $suffixlen = length($1);
-   }
-@@ -1593,11 +1709,11 @@
-   my ($junk, $tmpdir, $errstr);
-   croak "Error creating temp directory from template $template\: $errstr"
-     unless (($junk, $tmpdir) = _gettemp($template,
--					"open" => 0,
--					"mkdir"=> 1 ,
--					"suffixlen" => $suffixlen,
--					"ErrStr" => \$errstr,
--				       ) );
-+                                        "open" => 0,
-+                                        "mkdir"=> 1 ,
-+                                        "suffixlen" => $suffixlen,
-+                                        "ErrStr" => \$errstr,
-+                                       ) );
- 
-   return $tmpdir;
- 
-@@ -1626,11 +1742,11 @@
-   my ($tmpname, $junk, $errstr);
-   croak "Error getting name to temp file from template $template: $errstr"
-     unless (($junk, $tmpname) = _gettemp($template,
--					 "open" => 0,
--					 "mkdir"=> 0 ,
--					 "suffixlen" => 0,
--					 "ErrStr" => \$errstr,
--					 ) );
-+                                         "open" => 0,
-+                                         "mkdir"=> 0 ,
-+                                         "suffixlen" => 0,
-+                                         "ErrStr" => \$errstr,
-+                                        ) );
- 
-   return $tmpname;
- }
-@@ -1680,20 +1796,20 @@
- 
- sub tmpnam {
- 
--   # Retrieve the temporary directory name
--   my $tmpdir = File::Spec->tmpdir;
-+  # Retrieve the temporary directory name
-+  my $tmpdir = File::Spec->tmpdir;
- 
--   croak "Error temporary directory is not writable"
--     if $tmpdir eq '';
-+  croak "Error temporary directory is not writable"
-+    if $tmpdir eq '';
- 
--   # Use a ten character template and append to tmpdir
--   my $template = File::Spec->catfile($tmpdir, TEMPXXX);
-+  # Use a ten character template and append to tmpdir
-+  my $template = File::Spec->catfile($tmpdir, TEMPXXX);
- 
--   if (wantarray() ) {
--       return mkstemp($template);
--   } else {
--       return mktemp($template);
--   }
-+  if (wantarray() ) {
-+    return mkstemp($template);
-+  } else {
-+    return mktemp($template);
-+  }
- 
- }
- 
-@@ -1939,12 +2055,12 @@
-   # depending on whether it is a file or a handle.
-   # Cannot simply compare all members of the stat return
-   # Select the ones we can use
--  my @okstat = (0..$#fh);  # Use all by default
-+  my @okstat = (0..$#fh);       # Use all by default
-   if ($^O eq 'MSWin32') {
-     @okstat = (1,2,3,4,5,7,8,9,10);
-   } elsif ($^O eq 'os2') {
-     @okstat = (0, 2..$#fh);
--  } elsif ($^O eq 'VMS') { # device and file ID are sufficient
-+  } elsif ($^O eq 'VMS') {      # device and file ID are sufficient
-     @okstat = (0, 1);
-   } elsif ($^O eq 'dos') {
-     @okstat = (0,2..7,11..$#fh);
-@@ -2045,11 +2161,10 @@
- 
- =item STANDARD
- 
--Do the basic security measures to ensure the directory exists and
--is writable, that the umask() is fixed before opening of the file,
--that temporary files are opened only if they do not already exist, and
--that possible race conditions are avoided.  Finally the L<unlink0|"unlink0">
--function is used to remove files safely.
-+Do the basic security measures to ensure the directory exists and is
-+writable, that temporary files are opened only if they do not already
-+exist, and that possible race conditions are avoided.  Finally the
-+L<unlink0|"unlink0"> function is used to remove files safely.
- 
- =item MEDIUM
- 
-@@ -2113,15 +2228,15 @@
-     if (@_) {
-       my $level = shift;
-       if (($level != STANDARD) && ($level != MEDIUM) && ($level != HIGH)) {
--	carp "safe_level: Specified level ($level) not STANDARD, MEDIUM or HIGH - ignoring\n" if $^W;
-+        carp "safe_level: Specified level ($level) not STANDARD, MEDIUM or HIGH - ignoring\n" if $^W;
-       } else {
--	# Dont allow this on perl 5.005 or earlier
--	if ($] < 5.006 && $level != STANDARD) {
--	  # Cant do MEDIUM or HIGH checks
--	  croak "Currently requires perl 5.006 or newer to do the safe checks";
--	}
--	# Check that we are allowed to change level
--	# Silently ignore if we can not.
-+        # Dont allow this on perl 5.005 or earlier
-+        if ($] < 5.006 && $level != STANDARD) {
-+          # Cant do MEDIUM or HIGH checks
-+          croak "Currently requires perl 5.006 or newer to do the safe checks";
-+        }
-+        # Check that we are allowed to change level
-+        # Silently ignore if we can not.
-         $LEVEL = $level if _can_do_level($level);
-       }
-     }
-@@ -2234,12 +2349,21 @@
- through the same set of random file names and may well cause
- themselves to give up if they exceed the number of retry attempts.
- 
-+=head2 Directory removal
-+
-+Note that if you have chdir'ed into the temporary directory and it is
-+subsequently cleaned up (either in the END block or as part of object
-+destruction), then you will get a warning from File::Path::rmtree().
-+
- =head2 BINMODE
- 
- The file returned by File::Temp will have been opened in binary mode
--if such a mode is available. If that is not correct, use the binmode()
-+if such a mode is available. If that is not correct, use the C<binmode()>
- function to change the mode of the filehandle.
- 
-+Note that you can modify the encoding of a file opened by File::Temp
-+also by using C<binmode()>.
-+
- =head1 HISTORY
- 
- Originally began life in May 1999 as an XS interface to the system
-@@ -2256,10 +2380,14 @@
- See L<IO::File> and L<File::MkTemp>, L<Apache::TempFile> for
- different implementations of temporary file handling.
- 
-+See L<File::Tempdir> for an alternative object-oriented wrapper for
-+the C<tempdir> function.
-+
- =head1 AUTHOR
- 
- Tim Jenness E<lt>tjenness@cpan.orgE<gt>
- 
-+Copyright (C) 2007-2008 Tim Jenness.
- Copyright (C) 1999-2007 Tim Jenness and the UK Particle Physics and
- Astronomy Research Council. All Rights Reserved.  This program is free
- software; you can redistribute it and/or modify it under the same
-@@ -2272,4 +2400,53 @@
- 
- =cut
- 
-+package File::Temp::Dir;
-+
-+use File::Path qw/ rmtree /;
-+use strict;
-+use overload '""' => "STRINGIFY", fallback => 1;
-+
-+# private class specifically to support tempdir objects
-+# created by File::Temp->newdir
-+
-+# ostensibly the same method interface as File::Temp but without
-+# inheriting all the IO::Seekable methods and other cruft
-+
-+# Read-only - returns the name of the temp directory
-+
-+sub dirname {
-+  my $self = shift;
-+  return $self->{DIRNAME};
-+}
-+
-+sub STRINGIFY {
-+  my $self = shift;
-+  return $self->dirname;
-+}
-+
-+sub unlink_on_destroy {
-+  my $self = shift;
-+  if (@_) {
-+    $self->{CLEANUP} = shift;
-+  }
-+  return $self->{CLEANUP};
-+}
-+
-+sub DESTROY {
-+  my $self = shift;
-+  local($., $@, $!, $^E, $?);
-+  if ($self->unlink_on_destroy && 
-+      $$ == $self->{LAUNCHPID} && !$File::Temp::KEEP_ALL) {
-+    if (-d $self->{DIRNAME}) {
-+      # Some versions of rmtree will abort if you attempt to remove
-+      # the directory you are sitting in. We protect that and turn it
-+      # into a warning. We do this because this occurs during object
-+      # destruction and so can not be caught by the user.
-+      eval { rmtree($self->{DIRNAME}, $File::Temp::DEBUG, 0); };
-+      warn $@ if ($@ && $^W);
-+    }
-+  }
-+}
-+
-+
- 1;
diff --git a/perl-update-FileSpec.patch b/perl-update-FileSpec.patch
deleted file mode 100644
index 34915ef..0000000
--- a/perl-update-FileSpec.patch
+++ /dev/null
@@ -1,1758 +0,0 @@
-diff -urN perl-5.10.0/lib/File/Spec.old/Cygwin.pm perl-5.10.0/lib/File/Spec/Cygwin.pm
---- perl-5.10.0/lib/File/Spec.old/Cygwin.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Spec/Cygwin.pm	2009-05-10 10:58:10.000000000 +0200
-@@ -4,7 +4,8 @@
- use vars qw(@ISA $VERSION);
- require File::Spec::Unix;
- 
--$VERSION = '3.2501';
-+$VERSION = '3.30';
-+$VERSION = eval $VERSION;
- 
- @ISA = qw(File::Spec::Unix);
- 
-@@ -39,6 +40,8 @@
- 
- sub canonpath {
-     my($self,$path) = @_;
-+    return unless defined $path;
-+
-     $path =~ s|\\|/|g;
- 
-     # Handle network path names beginning with double slash
-@@ -51,6 +54,7 @@
- 
- sub catdir {
-     my $self = shift;
-+    return unless @_;
- 
-     # Don't create something that looks like a //network/path
-     if ($_[0] and ($_[0] eq '/' or $_[0] eq '\\')) {
-@@ -108,10 +112,10 @@
- 
- =cut
- 
--sub case_tolerant () {
--  if ($^O ne 'cygwin') {
--    return 1;
--  }
-+sub case_tolerant {
-+  return 1 unless $^O eq 'cygwin'
-+    and defined &Cygwin::mount_flags;
-+
-   my $drive = shift;
-   if (! $drive) {
-       my @flags = split(/,/, Cygwin::mount_flags('/cygwin'));
-diff -urN perl-5.10.0/lib/File/Spec.old/Epoc.pm perl-5.10.0/lib/File/Spec/Epoc.pm
---- perl-5.10.0/lib/File/Spec.old/Epoc.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Spec/Epoc.pm	2009-05-10 10:58:10.000000000 +0200
-@@ -3,7 +3,8 @@
- use strict;
- use vars qw($VERSION @ISA);
- 
--$VERSION = '3.2501';
-+$VERSION = '3.30';
-+$VERSION = eval $VERSION;
- 
- require File::Spec::Unix;
- @ISA = qw(File::Spec::Unix);
-@@ -45,6 +46,7 @@
- 
- sub canonpath {
-     my ($self,$path) = @_;
-+    return unless defined $path;
- 
-     $path =~ s|/+|/|g;                             # xx////xx  -> xx/xx
-     $path =~ s|(/\.)+/|/|g;                        # xx/././xx -> xx/xx
-diff -urN perl-5.10.0/lib/File/Spec.old/Functions.pm perl-5.10.0/lib/File/Spec/Functions.pm
---- perl-5.10.0/lib/File/Spec.old/Functions.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Spec/Functions.pm	2009-05-10 10:58:10.000000000 +0200
-@@ -5,7 +5,8 @@
- 
- use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
- 
--$VERSION = '3.2501';
-+$VERSION = '3.30';
-+$VERSION = eval $VERSION;
- 
- require Exporter;
- 
-diff -urN perl-5.10.0/lib/File/Spec.old/Mac.pm perl-5.10.0/lib/File/Spec/Mac.pm
---- perl-5.10.0/lib/File/Spec.old/Mac.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Spec/Mac.pm	2009-05-10 10:58:10.000000000 +0200
-@@ -4,7 +4,8 @@
- use vars qw(@ISA $VERSION);
- require File::Spec::Unix;
- 
--$VERSION = '3.2501';
-+$VERSION = '3.30';
-+$VERSION = eval $VERSION;
- 
- @ISA = qw(File::Spec::Unix);
- 
-@@ -530,7 +531,7 @@
- 	my @result = ();
- 	my ($head, $sep, $tail, $volume, $directories);
- 
--	return ('') if ( (!defined($path)) || ($path eq '') );
-+	return @result if ( (!defined($path)) || ($path eq '') );
- 	return (':') if ($path eq ':');
- 
- 	( $volume, $sep, $directories ) = $path =~ m|^((?:[^:]+:)?)(:*)(.*)|s;
-diff -urN perl-5.10.0/lib/File/Spec.old/OS2.pm perl-5.10.0/lib/File/Spec/OS2.pm
---- perl-5.10.0/lib/File/Spec.old/OS2.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Spec/OS2.pm	2009-05-10 10:58:10.000000000 +0200
-@@ -4,7 +4,8 @@
- use vars qw(@ISA $VERSION);
- require File::Spec::Unix;
- 
--$VERSION = '3.2501';
-+$VERSION = '3.30';
-+$VERSION = eval $VERSION;
- 
- @ISA = qw(File::Spec::Unix);
- 
-@@ -54,6 +55,8 @@
- 
- sub canonpath {
-     my ($self,$path) = @_;
-+    return unless defined $path;
-+
-     $path =~ s/^([a-z]:)/\l$1/s;
-     $path =~ s|\\|/|g;
-     $path =~ s|([^/])/+|$1/|g;                  # xx////xx  -> xx/xx
-diff -up perl-5.10.0/lib/File/Spec/t/crossplatform.t.aa perl-5.10.0/lib/File/Spec/t/crossplatform.t
---- perl-5.10.0/lib/File/Spec/t/crossplatform.t.aa	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Spec/t/crossplatform.t	2009-05-10 10:58:10.000000000 +0200
-@@ -7,7 +7,36 @@ use Test::More;
- local $|=1;
- 
- my @platforms = qw(Cygwin Epoc Mac OS2 Unix VMS Win32);
--my $tests_per_platform = 7;
-+my $tests_per_platform = 10;
-+
-+my $vms_unix_rpt = 0;
-+my $vms_efs = 0;
-+my $vms_unix_mode = 0;
-+my $vms_real_root = 0;
-+
-+if ($^O eq 'VMS') {
-+    $vms_unix_mode = 0;
-+    if (eval 'require VMS::Feature') {
-+        $vms_unix_rpt = VMS::Feature::current("filename_unix_report");
-+        $vms_efs = VMS::Feature::current("efs_charset");
-+    } else {
-+        my $unix_rpt = $ENV{'DECC$FILENAME_UNIX_REPORT'} || '';
-+        my $efs_charset = $ENV{'DECC$EFS_CHARSET'} || '';
-+        $vms_unix_rpt = $unix_rpt =~ /^[ET1]/i; 
-+        $vms_efs = $efs_charset =~ /^[ET1]/i; 
-+    }
-+
-+    # Traditional VMS mode only if VMS is not in UNIX compatible mode.
-+    $vms_unix_mode = ($vms_efs && $vms_unix_rpt);
-+
-+    # If we are in UNIX mode, we may or may not have a real root.
-+    if ($vms_unix_mode) {
-+        my $rootdir = File::Spec->rootdir;
-+        $vms_real_root = 1 if ($rootdir eq '/');
-+    }
-+
-+}
-+
- 
- plan tests => 1 + @platforms * $tests_per_platform;
- 
-@@ -56,37 +85,82 @@ foreach my $platform (@platforms) {
- 
-     is $module->file_name_is_absolute($base), 1, "$base is absolute on $platform";
- 
-+    # splitdir('') -> ()
-+    my @result = $module->splitdir('');
-+    is @result, 0, "$platform->splitdir('') -> ()";
-+
-+    # canonpath() -> undef
-+    $result = $module->canonpath();
-+    is $result, undef, "$platform->canonpath() -> undef";
-+
-+    # canonpath(undef) -> undef
-+    $result = $module->canonpath(undef);
-+    is $result, undef, "$platform->canonpath(undef) -> undef";
- 
-     # abs2rel('A:/foo/bar', 'A:/foo')    ->  'bar'
-     $file = $module->catpath($v, $module->catdir($module->rootdir, 'foo', 'bar'), 'file');
-     $base = $module->catpath($v, $module->catdir($module->rootdir, 'foo'), '');
-     $result = $module->catfile('bar', 'file');
-+ 
-+    if ($vms_unix_mode and $platform eq 'VMS') {
-+        # test 56 special
-+        # If VMS is in UNIX mode, so is the result, but having the volume
-+        # parameter present forces the abs2rel into VMS mode.
-+        $result = VMS::Filespec::vmsify($result);
-+        $result =~ s/\.$//;
-+
-+        # If we have a real root, then we are dealing with absolute directories
-+        $result =~ s/\[\./\[/ if $vms_real_root;
-+    }
-+
-     is $module->abs2rel($file, $base), $result, "$platform->abs2rel($file, $base)";
-     
-+
-     # abs2rel('A:/foo/bar', 'B:/foo')    ->  'A:/foo/bar'
-     $base = $module->catpath($other_v, $module->catdir($module->rootdir, 'foo'), '');
-     $result = volumes_differ($module, $file, $base) ? $file : $module->catfile('bar', 'file');
-     is $module->abs2rel($file, $base), $result, "$platform->abs2rel($file, $base)";
- 
-+
-     # abs2rel('A:/foo/bar', '/foo')      ->  'A:/foo/bar'
-     $base = $module->catpath('', $module->catdir($module->rootdir, 'foo'), '');
-     $result = volumes_differ($module, $file, $base) ? $file : $module->catfile('bar', 'file');
-     is $module->abs2rel($file, $base), $result, "$platform->abs2rel($file, $base)";
- 
-+
-     # abs2rel('/foo/bar/file', 'A:/foo')    ->  '/foo/bar'
-     $file = $module->catpath('', $module->catdir($module->rootdir, 'foo', 'bar'), 'file');
-     $base = $module->catpath($v, $module->catdir($module->rootdir, 'foo'), '');
-     $result = volumes_differ($module, $file, $base) ? $module->rel2abs($file) : $module->catfile('bar', 'file');
-+
-+    if ($vms_unix_mode and $platform eq 'VMS') {
-+        # test 59 special
-+        # If VMS is in UNIX mode, so is the result, but having the volume
-+        # parameter present forces the abs2rel into VMS mode.
-+        $result = VMS::Filespec::vmsify($result);
-+    }
-+
-     is $module->abs2rel($file, $base), $result, "$platform->abs2rel($file, $base)";
-     
-+
-     # abs2rel('/foo/bar', 'B:/foo')    ->  '/foo/bar'
-     $base = $module->catpath($other_v, $module->catdir($module->rootdir, 'foo'), '');
-     $result = volumes_differ($module, $file, $base) ? $module->rel2abs($file) : $module->catfile('bar', 'file');
-+
-+    if ($vms_unix_mode and $platform eq 'VMS') {
-+        # test 60 special
-+        # If VMS is in UNIX mode, so is the result, but having the volume
-+        # parameter present forces the abs2rel into VMS mode.
-+        $result = VMS::Filespec::vmsify($result);
-+    }
-+
-     is $module->abs2rel($file, $base), $result, "$platform->abs2rel($file, $base)";
-     
-+
-     # abs2rel('/foo/bar', '/foo')      ->  'bar'
-     $base = $module->catpath('', $module->catdir($module->rootdir, 'foo'), '');
-     $result = $module->catfile('bar', 'file');
-+
-     is $module->abs2rel($file, $base), $result, "$platform->abs2rel($file, $base)";
-   }
- }
-diff -up perl-5.10.0/lib/File/Spec/t/Functions.t.aa perl-5.10.0/lib/File/Spec/t/Functions.t
-diff -up perl-5.10.0/lib/File/Spec/t/rel2abs2rel.t.aa perl-5.10.0/lib/File/Spec/t/rel2abs2rel.t
-diff -up perl-5.10.0/lib/File/Spec/t/Spec.t.aa perl-5.10.0/lib/File/Spec/t/Spec.t
---- perl-5.10.0/lib/File/Spec/t/Spec.t.aa	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Spec/t/Spec.t	2009-05-10 10:58:10.000000000 +0200
-@@ -13,6 +13,22 @@ eval {
-    require VMS::Filespec ;
- } ;
- 
-+my $vms_unix_rpt;
-+my $vms_efs;
-+
-+if ($^O eq 'VMS') {
-+    if (eval 'require VMS::Feature') {
-+        $vms_unix_rpt = VMS::Feature::current("filename_unix_report");
-+        $vms_efs = VMS::Feature::current("efs_charset");
-+    } else {
-+        my $unix_rpt = $ENV{'DECC$FILENAME_UNIX_REPORT'} || '';
-+        my $efs_charset = $ENV{'DECC$EFS_CHARSET'} || '';
-+        $vms_unix_rpt = $unix_rpt =~ /^[ET1]/i; 
-+        $vms_efs = $efs_charset =~ /^[ET1]/i; 
-+    }
-+}
-+
-+
- my $skip_exception = "Install VMS::Filespec (from vms/ext)" ;
- 
- if ( $@ ) {
-@@ -85,6 +101,7 @@ if ($^O eq 'MacOS') {
- [ "Unix->splitdir('d1/d2/d3')",   'd1,d2,d3'   ],
- 
- [ "Unix->catdir()",                     ''          ],
-+[ "Unix->catdir('')",                   '/'         ],
- [ "Unix->catdir('/')",                  '/'         ],
- [ "Unix->catdir('','d1','d2','d3','')", '/d1/d2/d3' ],
- [ "Unix->catdir('d1','d2','d3','')",    'd1/d2/d3'  ],
-@@ -191,10 +208,10 @@ if ($^O eq 'MacOS') {
- [ "Win32->catdir('\\d1','d2')",             '\\d1\\d2'         ],
- [ "Win32->catdir('\\d1','\\d2')",           '\\d1\\d2'         ],
- [ "Win32->catdir('\\d1','\\d2\\')",         '\\d1\\d2'         ],
--[ "Win32->catdir('','/d1','d2')",           '\\\\d1\\d2'         ],
--[ "Win32->catdir('','','/d1','d2')",        '\\\\\\d1\\d2'       ],
--[ "Win32->catdir('','//d1','d2')",          '\\\\\\d1\\d2'       ],
--[ "Win32->catdir('','','//d1','d2')",       '\\\\\\\\d1\\d2'     ],
-+[ "Win32->catdir('','/d1','d2')",           '\\d1\\d2'         ],
-+[ "Win32->catdir('','','/d1','d2')",        '\\d1\\d2'         ],
-+[ "Win32->catdir('','//d1','d2')",          '\\d1\\d2'         ],
-+[ "Win32->catdir('','','//d1','d2')",       '\\d1\\d2'         ],
- [ "Win32->catdir('','d1','','d2','')",      '\\d1\\d2'           ],
- [ "Win32->catdir('','d1','d2','d3','')",    '\\d1\\d2\\d3'       ],
- [ "Win32->catdir('d1','d2','d3','')",       'd1\\d2\\d3'         ],
-@@ -206,13 +223,16 @@ if ($^O eq 'MacOS') {
- [ "Win32->catdir('A:/d1','B:/d2','d3','')", 'A:\\d1\\B:\\d2\\d3' ],
- [ "Win32->catdir('A:/')",                   'A:\\'               ],
- [ "Win32->catdir('\\', 'foo')",             '\\foo'              ],
--
-+[ "Win32->catdir('','','..')",              '\\'                 ],
-+[ "Win32->catdir('A:', 'foo')",             'A:\\foo'            ],
- 
- [ "Win32->catfile('a','b','c')",        'a\\b\\c' ],
- [ "Win32->catfile('a','b','.\\c')",      'a\\b\\c'  ],
- [ "Win32->catfile('.\\a','b','c')",      'a\\b\\c'  ],
- [ "Win32->catfile('c')",                'c' ],
- [ "Win32->catfile('.\\c')",              'c' ],
-+[ "Win32->catfile('a/..','../b')",       '..\\b' ],
-+[ "Win32->catfile('A:', 'foo')",         'A:\\foo'            ],
- 
- 
- [ "Win32->canonpath('')",               ''                    ],
-@@ -224,9 +244,9 @@ if ($^O eq 'MacOS') {
- [ "Win32->canonpath('//a\\b//c')",      '\\\\a\\b\\c'         ],
- [ "Win32->canonpath('/a/..../c')",      '\\a\\....\\c'        ],
- [ "Win32->canonpath('//a/b\\c')",       '\\\\a\\b\\c'         ],
--[ "Win32->canonpath('////')",           '\\\\\\'              ],
-+[ "Win32->canonpath('////')",           '\\'                  ],
- [ "Win32->canonpath('//')",             '\\'                  ],
--[ "Win32->canonpath('/.')",             '\\.'                 ],
-+[ "Win32->canonpath('/.')",             '\\'                  ],
- [ "Win32->canonpath('//a/b/../../c')",  '\\\\a\\b\\c'         ],
- [ "Win32->canonpath('//a/b/c/../d')",   '\\\\a\\b\\d'         ],
- [ "Win32->canonpath('//a/b/c/../../d')",'\\\\a\\b\\d'         ],
-@@ -282,40 +302,81 @@ if ($^O eq 'MacOS') {
- 
- [ "VMS->case_tolerant()",         '1'  ],
- 
--[ "VMS->catfile('a','b','c')",         '[.a.b]c'  ],
-+[ "VMS->catfile('a','b','c')", $vms_unix_rpt ? 'a/b/c' : '[.a.b]c'  ],
- [ "VMS->catfile('a','b','[]c')",       '[.a.b]c'  ],
- [ "VMS->catfile('[.a]','b','c')",       '[.a.b]c'  ],
- [ "VMS->catfile('c')",                 'c' ],
- [ "VMS->catfile('[]c')",               'c' ],
- 
--[ "VMS->catfile('0','b','c')",     '[.0.b]c' ],
--[ "VMS->catfile('a','0','c')",     '[.a.0]c' ],
--[ "VMS->catfile('a','b','0')",     '[.a.b]0' ],
--[ "VMS->catfile('0','0','c')",     '[.0.0]c' ],
--[ "VMS->catfile('a','0','0')",     '[.a.0]0' ],
--[ "VMS->catfile('0','b','0')",     '[.0.b]0' ],
--[ "VMS->catfile('0','0','0')",     '[.0.0]0' ],
-+[ "VMS->catfile('0','b','c')", $vms_unix_rpt ? '0/b/c' : '[.0.b]c' ],
-+[ "VMS->catfile('a','0','c')", $vms_unix_rpt ? 'a/0/c' : '[.a.0]c' ],
-+[ "VMS->catfile('a','b','0')", $vms_unix_rpt ? 'a/b/0' : '[.a.b]0' ],
-+[ "VMS->catfile('0','0','c')", $vms_unix_rpt ? '0/0/c' : '[.0.0]c' ],
-+[ "VMS->catfile('a','0','0')", $vms_unix_rpt ? 'a/0/0' : '[.a.0]0' ],
-+[ "VMS->catfile('0','b','0')", $vms_unix_rpt ? '0/b/0' : '[.0.b]0' ],
-+[ "VMS->catfile('0','0','0')", $vms_unix_rpt ? '0/0/0' : '[.0.0]0' ],
- 
- 
- [ "VMS->splitpath('file')",                                       ',,file'                                   ],
- [ "VMS->splitpath('[d1.d2.d3]')",                                 ',[d1.d2.d3],'                               ],
- [ "VMS->splitpath('[.d1.d2.d3]')",                                ',[.d1.d2.d3],'                              ],
- [ "VMS->splitpath('[d1.d2.d3]file')",                             ',[d1.d2.d3],file'                           ],
--[ "VMS->splitpath('d1/d2/d3/file')",                              ',[.d1.d2.d3],file'                          ],
--[ "VMS->splitpath('/d1/d2/d3/file')",                             'd1:,[d2.d3],file'                         ],
-+[ "VMS->splitpath('d1/d2/d3/file')",
-+       $vms_efs ? ',d1/d2/d3/,file' : ',[.d1.d2.d3],file' ],
-+[ "VMS->splitpath('/d1/d2/d3/file')",
-+       $vms_efs ? ',/d1/d2/d3/,file' : 'd1:,[d2.d3],file' ],
- [ "VMS->splitpath('[.d1.d2.d3]file')",                            ',[.d1.d2.d3],file'                          ],
- [ "VMS->splitpath('node::volume:[d1.d2.d3]')",                    'node::volume:,[d1.d2.d3],'                  ],
- [ "VMS->splitpath('node::volume:[d1.d2.d3]file')",                'node::volume:,[d1.d2.d3],file'              ],
- [ "VMS->splitpath('node\"access_spec\"::volume:[d1.d2.d3]')",     'node"access_spec"::volume:,[d1.d2.d3],'     ],
- [ "VMS->splitpath('node\"access_spec\"::volume:[d1.d2.d3]file')", 'node"access_spec"::volume:,[d1.d2.d3],file' ],
- 
-+[ "VMS->splitpath('[]')",                                         ',[],'                                       ],
-+[ "VMS->splitpath('[-]')",                                        ',[-],'                                      ],
-+[ "VMS->splitpath('[]file')",                                     ',[],file'                                   ],
-+[ "VMS->splitpath('[-]file')",                                    ',[-],file'                                  ],
-+[ "VMS->splitpath('')",                                           ',,'                                         ],
-+[ "VMS->splitpath('0')",                                          ',,0'                                        ],
-+[ "VMS->splitpath('[0]')",                                        ',[0],'                                      ],
-+[ "VMS->splitpath('[.0]')",                                       ',[.0],'                                     ],
-+[ "VMS->splitpath('[0.0.0]')",                                    ',[0.0.0],'                                  ],
-+[ "VMS->splitpath('[.0.0.0]')",                                   ',[.0.0.0],'                                 ],
-+[ "VMS->splitpath('[0]0')",                                       ',[0],0'                                     ],
-+[ "VMS->splitpath('[0.0.0]0')",                                   ',[0.0.0],0'                                 ],
-+[ "VMS->splitpath('[.0.0.0]0')",                                  ',[.0.0.0],0'                                ],
-+[ "VMS->splitpath('0/0')",    $vms_efs ? ',0/,0' : ',[.0],0'  ],
-+[ "VMS->splitpath('0/0/0')",  $vms_efs ? ',0/0/,0' : ',[.0.0],0'  ],
-+[ "VMS->splitpath('/0/0')",   $vms_efs ? ',/0/,0' : '0:,[000000],0'  ],
-+[ "VMS->splitpath('/0/0/0')", $vms_efs ? ',/0/0/,0' : '0:,[0],0'  ],
-+[ "VMS->splitpath('d1',1)",                                       ',d1,'                                       ],
-+# $no_file tests
-+[ "VMS->splitpath('[d1.d2.d3]',1)",                               ',[d1.d2.d3],'                               ],
-+[ "VMS->splitpath('[.d1.d2.d3]',1)",                              ',[.d1.d2.d3],'                              ],
-+[ "VMS->splitpath('d1/d2/d3',1)",  $vms_efs ? ',d1/d2/d3,' : ',[.d1.d2.d3],' ],
-+[ "VMS->splitpath('/d1/d2/d3',1)", $vms_efs ? ',/d1/d2/d3,' : 'd1:,[d2.d3],' ],
-+[ "VMS->splitpath('node::volume:[d1.d2.d3]',1)",                  'node::volume:,[d1.d2.d3],'                  ],
-+[ "VMS->splitpath('node\"access_spec\"::volume:[d1.d2.d3]',1)",   'node"access_spec"::volume:,[d1.d2.d3],'     ],
-+[ "VMS->splitpath('[]',1)",                                       ',[],'                                       ],
-+[ "VMS->splitpath('[-]',1)",                                      ',[-],'                                      ],
-+[ "VMS->splitpath('',1)",                                         ',,'                                         ],
-+[ "VMS->splitpath('0',1)",                                        ',0,'                                        ],
-+[ "VMS->splitpath('[0]',1)",                                      ',[0],'                                      ],
-+[ "VMS->splitpath('[.0]',1)",                                     ',[.0],'                                     ],
-+[ "VMS->splitpath('[0.0.0]',1)",                                  ',[0.0.0],'                                  ],
-+[ "VMS->splitpath('[.0.0.0]',1)",                                 ',[.0.0.0],'                                 ],
-+[ "VMS->splitpath('0/0',1)",    $vms_efs ? ',0/0,' : ',[.0.0],' ],
-+[ "VMS->splitpath('0/0/0',1)",  $vms_efs ? ',0/0/0,' : ',[.0.0.0],' ],
-+[ "VMS->splitpath('/0/0',1)",   $vms_efs ? ',/0/0,' : '0:,[000000.0],' ],
-+[ "VMS->splitpath('/0/0/0',1)", $vms_efs ? ',/0/0/0,' : '0:,[0.0],' ],
-+
- [ "VMS->catpath('','','file')",                                       'file'                                     ],
- [ "VMS->catpath('','[d1.d2.d3]','')",                                 '[d1.d2.d3]'                               ],
- [ "VMS->catpath('','[.d1.d2.d3]','')",                                '[.d1.d2.d3]'                              ],
- [ "VMS->catpath('','[d1.d2.d3]','file')",                             '[d1.d2.d3]file'                           ],
- [ "VMS->catpath('','[.d1.d2.d3]','file')",                            '[.d1.d2.d3]file'                          ],
--[ "VMS->catpath('','d1/d2/d3','file')",                               '[.d1.d2.d3]file'                            ],
--[ "VMS->catpath('v','d1/d2/d3','file')",                              'v:[.d1.d2.d3]file'                            ],
-+[ "VMS->catpath('','d1/d2/d3','file')",
-+                             $vms_efs ? 'd1/d2/d3/file' : '[.d1.d2.d3]file' ],
-+[ "VMS->catpath('v','d1/d2/d3','file')",                              'v:[.d1.d2.d3]file' ],
- [ "VMS->catpath('v','w:[d1.d2.d3]','file')",                          'v:[d1.d2.d3]file'                         ],
- [ "VMS->catpath('node::volume:','[d1.d2.d3]','')",                    'node::volume:[d1.d2.d3]'                  ],
- [ "VMS->catpath('node::volume:','[d1.d2.d3]','file')",                'node::volume:[d1.d2.d3]file'              ],
-@@ -370,15 +431,18 @@ if ($^O eq 'MacOS') {
- [ "VMS->splitdir('[d1.][000000.d2]')",  'd1,d2'  ],
- [ "VMS->splitdir('[.d1.d2^.d3]')", 'd1,d2^.d3' ],
- 
--[ "VMS->catdir('')",                                                      ''                 ],
--[ "VMS->catdir('d1','d2','d3')",                                          '[.d1.d2.d3]'         ],
--[ "VMS->catdir('d1','d2/','d3')",                                         '[.d1.d2.d3]'         ],
--[ "VMS->catdir('','d1','d2','d3')",                                       '[.d1.d2.d3]'        ],
--[ "VMS->catdir('','-','d2','d3')",                                        '[-.d2.d3]'         ],
--[ "VMS->catdir('','-','','d3')",                                          '[-.d3]'            ],
--[ "VMS->catdir('dir.dir','d2.dir','d3.dir')",                             '[.dir.d2.d3]'        ],
--[ "VMS->catdir('[.name]')",                                               '[.name]'            ],
--[ "VMS->catdir('[.name]','[.name]')",                                     '[.name.name]'],
-+[ "VMS->catdir('')",                            ''                 ],
-+[ "VMS->catdir('d1','d2','d3')",   $vms_unix_rpt ? 'd1/d2/d3' : '[.d1.d2.d3]' ],
-+[ "VMS->catdir('d1','d2/','d3')",  $vms_efs ? 'd1/d2/d3' : '[.d1.d2.d3]' ],
-+[ "VMS->catdir('','d1','d2','d3')", 
-+             $vms_unix_rpt ? '/d1/d2/d3' : 
-+                  $vms_efs ? '[d1.d2.d3]' : '[.d1.d2.d3]' ],
-+[ "VMS->catdir('','-','d2','d3')",              '[-.d2.d3]'         ],
-+[ "VMS->catdir('','-','','d3')",                '[-.d3]'            ],
-+[ "VMS->catdir('dir.dir','d2.dir','d3.dir')",
-+              $vms_unix_rpt ? 'dir.dir/d2.dir/d3.dir' : '[.dir.d2.d3]' ],
-+[ "VMS->catdir('[.name]')",                     '[.name]'            ],
-+[ "VMS->catdir('[.name]','[.name]')",           '[.name.name]'],
- 
- [  "VMS->abs2rel('node::volume:[t1.t2.t3]','node::volume:[t1.t2.t3]')", '[]'                 ],
- [  "VMS->abs2rel('node::volume:[t1.t2.t3]','[t1.t2.t3]')", 'node::volume:[t1.t2.t3]'                 ],
-@@ -694,10 +758,11 @@ if ($^O eq 'MacOS') {
- [ "Cygwin->rel2abs('..','/t1/t2/t3')",             '/t1/t2/t3/..'    ],
- [ "Cygwin->rel2abs('../t4','/t1/t2/t3')",          '/t1/t2/t3/../t4' ],
- [ "Cygwin->rel2abs('/t1','/t1/t2/t3')",            '/t1'             ],
-+[ "Cygwin->rel2abs('//t1/t2/t3','/foo')",          '//t1/t2/t3'      ],
- 
- ) ;
- 
--
-+my $test_count = scalar @tests;
- 
- plan tests => scalar @tests;
- 
-diff -up perl-5.10.0/lib/File/Spec/t/tmpdir.t.aa perl-5.10.0/lib/File/Spec/t/tmpdir.t
---- perl-5.10.0/lib/File/Spec/t/tmpdir.t.aa	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Spec/t/tmpdir.t	2009-05-10 10:58:10.000000000 +0200
-@@ -9,14 +9,19 @@ plan tests => 4;
- 
- ok 1, 1, "Loaded";
- 
-+if ($^O eq 'VMS') {
-+    # hack:
-+    # Need to cause the %ENV to get populated or you only get the builtins at
-+    # first, and then something else can cause the hash to get populated.
-+    my %look_env = %ENV;
-+}
- my $num_keys = keys %ENV;
- File::Spec->tmpdir;
- ok scalar keys %ENV, $num_keys, "tmpdir() shouldn't change the contents of %ENV";
- 
- if ($^O eq 'VMS') {
--  skip('Can\'t make list assignment to \%ENV on this system', 1);
--}
--else {
-+  skip("Can't make list assignment to %ENV on this system", 1);
-+} else {
-   local %ENV;
-   File::Spec::Win32->tmpdir;
-   ok scalar keys %ENV, 0, "Win32->tmpdir() shouldn't change the contents of %ENV";
-diff -up perl-5.10.0/lib/File/Spec.pm.aa perl-5.10.0/lib/File/Spec.pm
---- perl-5.10.0/lib/File/Spec.pm.aa	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Spec.pm	2009-05-10 10:58:10.000000000 +0200
-@@ -3,7 +3,7 @@ package File::Spec;
- use strict;
- use vars qw(@ISA $VERSION);
- 
--$VERSION = '3.2501';
-+$VERSION = '3.30';
- $VERSION = eval $VERSION;
- 
- my %module = (MacOS   => 'Mac',
-diff -up perl-5.10.0/lib/File/Spec/Unix.pm.aa perl-5.10.0/lib/File/Spec/Unix.pm
---- perl-5.10.0/lib/File/Spec/Unix.pm.aa	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Spec/Unix.pm	2009-05-10 10:58:10.000000000 +0200
-@@ -3,7 +3,8 @@ package File::Spec::Unix;
- use strict;
- use vars qw($VERSION);
- 
--$VERSION = '3.2501';
-+$VERSION = '3.30';
-+$VERSION = eval $VERSION;
- 
- =head1 NAME
- 
-@@ -41,6 +42,7 @@ actually traverse the filesystem cleanin
- 
- sub canonpath {
-     my ($self,$path) = @_;
-+    return unless defined $path;
-     
-     # Handle POSIX-style node names beginning with double slash (qnx, nto)
-     # (POSIX says: "a pathname that begins with two successive slashes
-@@ -48,7 +50,10 @@ sub canonpath {
-     # more than two leading slashes shall be treated as a single slash.")
-     my $node = '';
-     my $double_slashes_special = $^O eq 'qnx' || $^O eq 'nto';
--    if ( $double_slashes_special && $path =~ s{^(//[^/]+)(?:/|\z)}{/}s ) {
-+
-+
-+    if ( $double_slashes_special
-+         && ( $path =~ s{^(//[^/]+)/?\z}{}s || $path =~ s{^(//[^/]+)/}{/}s ) ) {
-       $node = $1;
-     }
-     # This used to be
-@@ -103,7 +108,7 @@ Returns a string representation of the c
- 
- =cut
- 
--sub curdir () { '.' }
-+sub curdir { '.' }
- 
- =item devnull
- 
-@@ -111,7 +116,7 @@ Returns a string representation of the n
- 
- =cut
- 
--sub devnull () { '/dev/null' }
-+sub devnull { '/dev/null' }
- 
- =item rootdir
- 
-@@ -119,7 +124,7 @@ Returns a string representation of the r
- 
- =cut
- 
--sub rootdir () { '/' }
-+sub rootdir { '/' }
- 
- =item tmpdir
- 
-@@ -168,7 +173,7 @@ Returns a string representation of the p
- 
- =cut
- 
--sub updir () { '..' }
-+sub updir { '..' }
- 
- =item no_upwards
- 
-@@ -189,7 +194,7 @@ is not or is significant when comparing 
- 
- =cut
- 
--sub case_tolerant () { 0 }
-+sub case_tolerant { 0 }
- 
- =item file_name_is_absolute
- 
-diff -up perl-5.10.0/lib/File/Spec/VMS.pm.aa perl-5.10.0/lib/File/Spec/VMS.pm
---- perl-5.10.0/lib/File/Spec/VMS.pm.aa	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Spec/VMS.pm	2009-05-10 10:58:10.000000000 +0200
-@@ -4,7 +4,8 @@ use strict;
- use vars qw(@ISA $VERSION);
- require File::Spec::Unix;
- 
--$VERSION = '3.2501';
-+$VERSION = '3.30';
-+$VERSION = eval $VERSION;
- 
- @ISA = qw(File::Spec::Unix);
- 
-@@ -25,26 +26,105 @@ See File::Spec::Unix for a documentation
- there. This package overrides the implementation of these methods, not
- the semantics.
- 
-+The mode of operation of these routines depend on the VMS features that
-+are controlled by the DECC features C<DECC$FILENAME_REPORT_UNIX> and
-+C<DECC$EFS_CHARSET>.
-+
-+Perl needs to be at least at 5.10 for these feature settings to work.
-+Use of them on older perl versions on VMS will result in unpredictable
-+operations.
-+
-+The default and traditional mode of these routines have been to expect VMS
-+syntax on input and to return VMS syntax on output, even when Unix syntax was
-+given on input.
-+
-+The default and traditional mode is also incompatible with the VMS
-+C<EFS>, Extended File system character set, and with running Perl scripts
-+under <GNV>, Gnu is not VMS, an optional Unix like runtime environment on VMS.
-+
-+If the C<DECC$EFS_CHARSET> feature is enabled, These routines will now accept
-+either VMS or UNIX syntax.  If the input parameters are clearly VMS syntax,
-+the return value will be in VMS syntax.  If the input parameters are clearly
-+in Unix syntax, the output will be in Unix syntax.
-+
-+This corresponds to the way that the VMS C library routines have always
-+handled filenames, and what a programmer who has not specifically read this
-+pod before would also expect.
-+
-+If the C<DECC$FILENAME_REPORT_UNIX> feature is enabled, then if the output
-+syntax can not be determined from the input syntax, the output syntax will be
-+UNIX.  If the feature is not enabled, VMS output will be the default.
-+
- =over 4
- 
-+=cut
-+
-+# Need to look up the feature settings.  The preferred way is to use the
-+# VMS::Feature module, but that may not be available to dual life modules.
-+
-+my $use_feature;
-+BEGIN {
-+    if (eval { local $SIG{__DIE__}; require VMS::Feature; }) {
-+        $use_feature = 1;
-+    }
-+}
-+
-+# Need to look up the UNIX report mode.  This may become a dynamic mode
-+# in the future.
-+sub _unix_rpt {
-+    my $unix_rpt;
-+    if ($use_feature) {
-+        $unix_rpt = VMS::Feature::current("filename_unix_report");
-+    } else {
-+        my $env_unix_rpt = $ENV{'DECC$FILENAME_UNIX_REPORT'} || '';
-+        $unix_rpt = $env_unix_rpt =~ /^[ET1]/i; 
-+    }
-+    return $unix_rpt;
-+}
-+
-+# Need to look up the EFS character set mode.  This may become a dynamic
-+# mode in the future.
-+sub _efs {
-+    my $efs;
-+    if ($use_feature) {
-+        $efs = VMS::Feature::current("efs_charset");
-+    } else {
-+        my $env_efs = $ENV{'DECC$EFS_CHARSET'} || '';
-+        $efs = $env_efs =~ /^[ET1]/i; 
-+    }
-+    return $efs;
-+}
-+
- =item canonpath (override)
- 
--Removes redundant portions of file specifications according to VMS syntax.
-+Removes redundant portions of file specifications according to the syntax
-+detected.
- 
- =cut
- 
-+
- sub canonpath {
-     my($self,$path) = @_;
- 
-     return undef unless defined $path;
- 
-+    my $efs = $self->_efs;
-+
-     if ($path =~ m|/|) { # Fake Unix
-       my $pathify = $path =~ m|/\Z(?!\n)|;
-       $path = $self->SUPER::canonpath($path);
-+
-+      # Do not convert to VMS when EFS character sets are in use
-+      return $path if $efs;
-+
-       if ($pathify) { return vmspath($path); }
-       else          { return vmsify($path);  }
-     }
-     else {
-+
-+#FIXME - efs parsing has different rules.  Characters in a VMS filespec
-+#        are only delimiters if not preceded by '^';
-+
- 	$path =~ tr/<>/[]/;			# < and >       ==> [ and ]
- 	$path =~ s/\]\[\./\.\]\[/g;		# ][.		==> .][
- 	$path =~ s/\[000000\.\]\[/\[/g;		# [000000.][	==> [
-@@ -81,7 +161,7 @@ sub canonpath {
- =item catdir (override)
- 
- Concatenates a list of file specifications, and returns the result as a
--VMS-syntax directory specification.  No check is made for "impossible"
-+directory specification.  No check is made for "impossible"
- cases (e.g. elements other than the first being absolute filespecs).
- 
- =cut
-@@ -89,87 +169,377 @@ cases (e.g. elements other than the firs
- sub catdir {
-     my $self = shift;
-     my $dir = pop;
-+
-+    my $efs = $self->_efs;
-+    my $unix_rpt = $self->_unix_rpt;
-+
-+
-     my @dirs = grep {defined() && length()} @_;
-+    if ($efs) {
-+        # Legacy mode removes blank entries.
-+        # But that breaks existing generic perl code that
-+        # uses a blank path at the beginning of the array
-+        # to indicate an absolute path.
-+        # So put it back if found.
-+        if (@_) {
-+            if ($_[0] eq '') {
-+                unshift @dirs, '';
-+            }
-+        }
-+    }
- 
-     my $rslt;
-     if (@dirs) {
- 	my $path = (@dirs == 1 ? $dirs[0] : $self->catdir(@dirs));
- 	my ($spath,$sdir) = ($path,$dir);
--	$spath =~ s/\.dir\Z(?!\n)//; $sdir =~ s/\.dir\Z(?!\n)//; 
--	$sdir = $self->eliminate_macros($sdir) unless $sdir =~ /^[\w\-]+\Z(?!\n)/s;
--	$rslt = $self->fixpath($self->eliminate_macros($spath)."/$sdir",1);
--
--	# Special case for VMS absolute directory specs: these will have had device
--	# prepended during trip through Unix syntax in eliminate_macros(), since
--	# Unix syntax has no way to express "absolute from the top of this device's
--	# directory tree".
--	if ($spath =~ /^[\[<][^.\-]/s) { $rslt =~ s/^[^\[<]+//s; }
--    }
--    else {
-+
-+        if ($efs) {
-+            # Extended character set in use, go into DWIM mode.
-+
-+            # Now we need to identify what the directory is in
-+            # of the specification in order to merge them.
-+            my $path_unix = 0;
-+            $path_unix = 1 if ($path =~ m#/#);
-+            $path_unix = 1 if ($path =~ /^\.\.?$/);
-+            my $path_vms = 0;
-+            $path_vms = 1 if ($path =~ m#[\[<\]]#);
-+            $path_vms = 1 if ($path =~ /^--?$/);
-+            my $dir_unix = 0;
-+            $dir_unix = 1 if ($dir =~ m#/#);
-+            $dir_unix = 1 if ($dir =~ /^\.\.?$/);
-+            my $dir_vms = 0;
-+            $dir_vms = 1 if ($dir =~ m#[\[<\]]#);
-+            $dir_vms = 1 if ($dir =~ /^--?$/);
-+
-+            my $unix_mode = 0;
-+            if (($path_unix != $dir_unix) && ($path_vms != $dir_vms)) {
-+                # Ambiguous, so if in $unix_rpt mode then assume UNIX.
-+                $unix_mode = 1 if $unix_rpt;
-+            } else {
-+                $unix_mode = 1 if (!$path_vms && !$dir_vms && $unix_rpt);
-+                $unix_mode = 1 if ($path_unix || $dir_unix);
-+            }
-+
-+            if ($unix_mode) {
-+
-+                # Fix up mixed syntax imput as good as possible - GIGO
-+                $path = unixify($path) if $path_vms;
-+                $dir = unixify($dir) if $dir_vms;
-+
-+                $rslt = $path;
-+                # Append a path delimiter
-+                $rslt .= '/' unless ($rslt =~ m#/$#);
-+
-+                $rslt .= $dir;
-+                return $self->SUPER::canonpath($rslt);
-+            } else {
-+
-+                #with <> posible instead of [.
-+                # Normalize the brackets
-+                # Fixme - need to not switch when preceded by ^.
-+                $path =~ s/</\[/g;
-+                $path =~ s/>/\]/g;
-+                $dir =~ s/</\[/g;
-+                $dir =~ s/>/\]/g;
-+
-+                # Fix up mixed syntax imput as good as possible - GIGO
-+                $path = vmsify($path) if $path_unix;
-+                $dir = vmsify($dir) if $dir_unix;
-+
-+                #Possible path values: foo: [.foo] [foo] foo, and $(foo)
-+                #or starting with '-', or foo.dir
-+                #If path is foo, it needs to be converted to [.foo]
-+
-+                # Fix up a bare path name.
-+                unless ($path_vms) {
-+                    $path =~ s/\.dir\Z(?!\n)//i;
-+                    if (($path ne '') && ($path !~ /^-/)) {
-+                        # Non blank and not prefixed with '-', add a dot
-+                        $path = '[.' . $path;
-+                    } else {
-+                        # Just start a directory.
-+                        $path = '[' . $path;
-+                    }
-+                } else {
-+                    $path =~ s/\]$//;
-+                }
-+
-+                #Possible dir values: [.dir] dir and $(foo)
-+
-+                # No punctuation may have a trailing .dir
-+                unless ($dir_vms) {
-+                    $dir =~ s/\.dir\Z(?!\n)//i;
-+                } else {
-+
-+                    #strip off the brackets
-+                    $dir =~ s/^\[//;
-+                    $dir =~ s/\]$//;
-+                }
-+
-+                #strip off the leading dot if present.
-+                $dir =~ s/^\.//;
-+
-+                # Now put the specifications together.
-+                if ($dir ne '') {
-+                    # Add a separator unless this is an absolute path
-+                    $path .= '.' if ($path ne '[');
-+                    $rslt = $path . $dir . ']';
-+                } else {
-+                    $rslt = $path . ']';
-+                }
-+            }
-+
-+	} else {
-+	    # Traditional ODS-2 mode.
-+	    $spath =~ s/\.dir\Z(?!\n)//i; $sdir =~ s/\.dir\Z(?!\n)//i; 
-+
-+	    $sdir = $self->eliminate_macros($sdir)
-+		unless $sdir =~ /^[\w\-]+\Z(?!\n)/s;
-+	    $rslt = $self->fixpath($self->eliminate_macros($spath)."/$sdir",1);
-+
-+	    # Special case for VMS absolute directory specs: these will have
-+	    # had device prepended during trip through Unix syntax in
-+	    # eliminate_macros(), since Unix syntax has no way to express
-+	    # "absolute from the top of this device's directory tree".
-+	    if ($spath =~ /^[\[<][^.\-]/s) { $rslt =~ s/^[^\[<]+//s; }
-+	} 
-+    } else {
-+	# Single directory, just make sure it is in directory format
-+	# Return an empty string on null input, and pass through macros.
-+
- 	if    (not defined $dir or not length $dir) { $rslt = ''; }
--	elsif ($dir =~ /^\$\([^\)]+\)\Z(?!\n)/s)          { $rslt = $dir; }
--	else                                        { $rslt = vmspath($dir); }
-+	elsif ($dir =~ /^\$\([^\)]+\)\Z(?!\n)/s) { 
-+	    $rslt = $dir;
-+	} else {
-+            my $unix_mode = 0;
-+
-+            if ($efs) {
-+                my $dir_unix = 0;
-+                $dir_unix = 1 if ($dir =~ m#/#);
-+                $dir_unix = 1 if ($dir =~ /^\.\.?$/);
-+                my $dir_vms = 0;
-+                $dir_vms = 1 if ($dir =~ m#[\[<\]]#);
-+                $dir_vms = 1 if ($dir =~ /^--?$/);
-+
-+                if ($dir_vms == $dir_unix) {
-+                    # Ambiguous, so if in $unix_rpt mode then assume UNIX.
-+                    $unix_mode = 1 if $unix_rpt;
-+                } else {
-+                    $unix_mode = 1 if $dir_unix;
-+                }
-+            }
-+
-+            if ($unix_mode) {
-+                return $dir;
-+            } else {
-+                # For VMS, force it to be in directory format
-+	 	$rslt = vmspath($dir);
-+	    }
-+	}
-     }
-     return $self->canonpath($rslt);
- }
- 
- =item catfile (override)
- 
--Concatenates a list of file specifications, and returns the result as a
--VMS-syntax file specification.
-+Concatenates a list of directory specifications with a filename specification
-+to build a path.
- 
- =cut
- 
- sub catfile {
-     my $self = shift;
--    my $file = $self->canonpath(pop());
-+    my $tfile = pop();
-+    my $file = $self->canonpath($tfile);
-     my @files = grep {defined() && length()} @_;
- 
-+    my $efs = $self->_efs;
-+    my $unix_rpt = $self->_unix_rpt;
-+
-+    # Assume VMS mode
-+    my $unix_mode = 0;
-+    my $file_unix = 0;
-+    my $file_vms = 0;
-+    if ($efs) {
-+
-+        # Now we need to identify format the file is in
-+        # of the specification in order to merge them.
-+        $file_unix = 1 if ($tfile =~ m#/#);
-+        $file_unix = 1 if ($tfile =~ /^\.\.?$/);
-+        $file_vms = 1 if ($tfile =~ m#[\[<\]]#);
-+        $file_vms = 1 if ($tfile =~ /^--?$/);
-+
-+        # We may know for sure what the format is.
-+        if (($file_unix != $file_vms)) {
-+            $unix_mode = 1 if ($file_unix && $unix_rpt);
-+        }
-+    }
-+
-     my $rslt;
-     if (@files) {
--	my $path = (@files == 1 ? $files[0] : $self->catdir(@files));
-+	# concatenate the directories.
-+	my $path;
-+        if (@files == 1) {
-+           $path = $files[0];
-+        } else {
-+            if ($file_vms) {
-+                # We need to make sure this is in VMS mode to avoid doing
-+                # both a vmsify and unixfy on the same path, as that may
-+                # lose significant data.
-+                my $i = @files - 1;
-+                my $tdir = $files[$i];
-+                my $tdir_vms = 0;
-+                my $tdir_unix = 0;
-+                $tdir_vms = 1 if ($tdir =~ m#[\[<\]]#);
-+                $tdir_unix = 1 if ($tdir =~ m#/#);
-+                $tdir_unix = 1 if ($tdir =~ /^\.\.?$/);
-+
-+                if (!$tdir_vms) {
-+                    if ($tdir_unix) { 
-+                        $tdir = vmspath($tdir);
-+                    } else {
-+                        $tdir =~ s/\.dir\Z(?!\n)//i;
-+                        $tdir = '[.' . $tdir . ']';
-+                    }
-+                    $files[$i] = $tdir;
-+                }
-+            }
-+            $path = $self->catdir(@files);
-+        }
- 	my $spath = $path;
--	$spath =~ s/\.dir\Z(?!\n)//;
-+
-+        # Some thing building a VMS path in pieces may try to pass a
-+        # directory name in filename format, so normalize it.
-+	$spath =~ s/\.dir\Z(?!\n)//i;
-+
-+        # if the spath ends with a directory delimiter and the file is bare,
-+        # then just concat them.
-+        # FIX-ME: In VMS format "[]<>:" are not delimiters if preceded by '^' 
-+        # Quite a bit of Perl does not know that yet.
- 	if ($spath =~ /^[^\)\]\/:>]+\)\Z(?!\n)/s && basename($file) eq $file) {
- 	    $rslt = "$spath$file";
--	}
--	else {
--	    $rslt = $self->eliminate_macros($spath);
--	    $rslt = vmsify($rslt.((defined $rslt) && ($rslt ne '') ? '/' : '').unixify($file));
-+	} else {
-+            if ($efs) {
-+
-+                # Now we need to identify what the directory is in
-+                # of the specification in order to merge them.
-+                my $spath_unix = 0;
-+                $spath_unix = 1 if ($spath =~ m#/#);
-+                $spath_unix = 1 if ($spath =~ /^\.\.?$/);
-+                my $spath_vms = 0;
-+                $spath_vms = 1 if ($spath =~ m#[\[<\]]#);
-+                $spath_vms = 1 if ($spath =~ /^--?$/);
-+
-+                # Assume VMS mode
-+                if (($spath_unix == $spath_vms) &&
-+                    ($file_unix == $file_vms)) {
-+                     # Ambigous, so if in $unix_rpt mode then assume UNIX.
-+                     $unix_mode = 1 if $unix_rpt;
-+                } else {
-+                     $unix_mode = 1
-+                         if (($spath_unix || $file_unix) && $unix_rpt);
-+                }
-+
-+                if (!$unix_mode) {
-+                    if ($spath_vms) {
-+                        $spath = '[' . $spath . ']' if $spath =~ /^-/;
-+                        $rslt = vmspath($spath);
-+                    } else {
-+                        $rslt = '[.' . $spath . ']';
-+                    }
-+                    $file = vmsify($file) if ($file_unix);
-+                } else {
-+                    $spath = unixify($spath) if ($spath_vms);
-+                    $rslt = $spath;
-+                    $file = unixify($file) if ($file_vms);
-+
-+                    # Unix merge may need a directory delimitor.
-+                    # A null path indicates root on Unix.
-+                    $rslt .= '/' unless ($rslt =~ m#/$#);
-+                }
-+
-+                $rslt .= $file;
-+                $rslt =~ s/\]\[//;
-+
-+	    } else {
-+		# Traditional VMS Perl mode expects that this is done.
-+		# Note for future maintainers:
-+		# This is left here for compatibility with perl scripts
-+		# that have come to expect this behavior, even though
-+		# usually the Perl scripts ported to VMS have to be
-+		# patched because of it changing Unix syntax file
-+		# to VMS format.
-+
-+		$rslt = $self->eliminate_macros($spath);
-+
-+
-+	        $rslt = vmsify($rslt.((defined $rslt) &&
-+		    ($rslt ne '') ? '/' : '').unixify($file));
-+	    }
- 	}
-     }
--    else { $rslt = (defined($file) && length($file)) ? vmsify($file) : ''; }
--    return $self->canonpath($rslt);
-+    else {
-+        # Only passed a single file?
-+        my $xfile = $file;
-+
-+        # Traditional VMS perl expects this conversion.
-+        $xfile = vmsify($file) unless ($efs);
-+
-+        $rslt = (defined($file) && length($file)) ? $xfile : '';
-+    }
-+    return $self->canonpath($rslt) unless $unix_rpt;
-+
-+    # In Unix report mode, do not strip off redundent path information.
-+    return $rslt;
- }
- 
- 
- =item curdir (override)
- 
--Returns a string representation of the current directory: '[]'
-+Returns a string representation of the current directory: '[]' or '.'
- 
- =cut
- 
- sub curdir {
-+    my $self = shift @_;
-+    return '.' if ($self->_unix_rpt);
-     return '[]';
- }
- 
- =item devnull (override)
- 
--Returns a string representation of the null device: '_NLA0:'
-+Returns a string representation of the null device: '_NLA0:' or '/dev/null'
- 
- =cut
- 
- sub devnull {
-+    my $self = shift @_;
-+    return '/dev/null' if ($self->_unix_rpt);
-     return "_NLA0:";
- }
- 
- =item rootdir (override)
- 
- Returns a string representation of the root directory: 'SYS$DISK:[000000]'
-+or '/'
- 
- =cut
- 
- sub rootdir {
-+    my $self = shift @_;
-+    if ($self->_unix_rpt) {
-+       # Root may exist, try it first.
-+       my $try = '/';
-+       my ($dev1, $ino1) = stat('/');
-+       my ($dev2, $ino2) = stat('.');
-+
-+       # Perl falls back to '.' if it can not determine '/'
-+       if (($dev1 != $dev2) || ($ino1 != $ino2)) {
-+           return $try;
-+       }
-+       # Fall back to UNIX format sys$disk.
-+       return '/sys$disk/';
-+    }
-     return 'SYS$DISK:[000000]';
- }
- 
-@@ -178,6 +548,7 @@ sub rootdir {
- Returns a string representation of the first writable directory
- from the following list or '' if none are writable:
- 
-+    /tmp if C<DECC$FILENAME_REPORT_UNIX> is enabled.
-     sys$scratch:
-     $ENV{TMPDIR}
- 
-@@ -188,17 +559,25 @@ is tainted, it is not used.
- 
- my $tmpdir;
- sub tmpdir {
-+    my $self = shift @_;
-     return $tmpdir if defined $tmpdir;
--    $tmpdir = $_[0]->_tmpdir( 'sys$scratch:', $ENV{TMPDIR} );
-+    if ($self->_unix_rpt) {
-+        $tmpdir = $self->_tmpdir('/tmp', '/sys$scratch', $ENV{TMPDIR});
-+        return $tmpdir;
-+    }
-+
-+    $tmpdir = $self->_tmpdir( 'sys$scratch:', $ENV{TMPDIR} );
- }
- 
- =item updir (override)
- 
--Returns a string representation of the parent directory: '[-]'
-+Returns a string representation of the parent directory: '[-]' or '..'
- 
- =cut
- 
- sub updir {
-+    my $self = shift @_;
-+    return '..' if ($self->_unix_rpt);
-     return '[-]';
- }
- 
-@@ -242,21 +621,50 @@ sub file_name_is_absolute {
- 
- =item splitpath (override)
- 
--Splits using VMS syntax.
-+    ($volume,$directories,$file) = File::Spec->splitpath( $path );
-+    ($volume,$directories,$file) = File::Spec->splitpath( $path, $no_file );
-+
-+Passing a true value for C<$no_file> indicates that the path being
-+split only contains directory components, even on systems where you
-+can usually (when not supporting a foreign syntax) tell the difference
-+between directories and files at a glance.
- 
- =cut
- 
- sub splitpath {
--    my($self,$path) = @_;
--    my($dev,$dir,$file) = ('','','');
-+    my($self,$path, $nofile) = @_;
-+    my($dev,$dir,$file)      = ('','','');
-+    my $efs = $self->_efs;
-+    my $vmsify_path = vmsify($path);
-+    if ($efs) {
-+        my $path_vms = 0;
-+        $path_vms = 1 if ($path =~ m#[\[<\]]#);
-+        $path_vms = 1 if ($path =~ /^--?$/);
-+        if (!$path_vms) {
-+            return $self->SUPER::splitpath($path, $nofile);
-+        }
-+        $vmsify_path = $path;
-+    }
- 
--    vmsify($path) =~ /(.+:)?([\[<].*[\]>])?(.*)/s;
--    return ($1 || '',$2 || '',$3);
-+    if ( $nofile ) {
-+        #vmsify('d1/d2/d3') returns '[.d1.d2]d3'
-+        #vmsify('/d1/d2/d3') returns 'd1:[d2]d3'
-+        if( $vmsify_path =~ /(.*)\](.+)/ ){
-+            $vmsify_path = $1.'.'.$2.']';
-+        }
-+        $vmsify_path =~ /(.+:)?(.*)/s;
-+        $dir = defined $2 ? $2 : ''; # dir can be '0'
-+        return ($1 || '',$dir,$file);
-+    }
-+    else {
-+        $vmsify_path =~ /(.+:)?([\[<].*[\]>])?(.*)/s;
-+        return ($1 || '',$2 || '',$3);
-+    }
- }
- 
- =item splitdir (override)
- 
--Split dirspec using VMS syntax.
-+Split a directory specification into the components.
- 
- =cut
- 
-@@ -264,6 +672,20 @@ sub splitdir {
-     my($self,$dirspec) = @_;
-     my @dirs = ();
-     return @dirs if ( (!defined $dirspec) || ('' eq $dirspec) );
-+
-+    my $efs = $self->_efs;
-+
-+    my $dir_unix = 0;
-+    $dir_unix = 1 if ($dirspec =~ m#/#);
-+    $dir_unix = 1 if ($dirspec =~ /^\.\.?$/);
-+
-+    # Unix filespecs in EFS mode handled by Unix routines.
-+    if ($efs && $dir_unix) {
-+        return $self->SUPER::splitdir($dirspec);
-+    }
-+
-+    # FIX ME, only split for VMS delimiters not prefixed with '^'.
-+
-     $dirspec =~ tr/<>/[]/;			# < and >	==> [ and ]
-     $dirspec =~ s/\]\[\./\.\]\[/g;		# ][.		==> .][
-     $dirspec =~ s/\[000000\.\]\[/\[/g;		# [000000.][	==> [
-@@ -287,40 +709,152 @@ sub splitdir {
- 
- =item catpath (override)
- 
--Construct a complete filespec using VMS syntax
-+Construct a complete filespec.
- 
- =cut
- 
- sub catpath {
-     my($self,$dev,$dir,$file) = @_;
-     
-+    my $efs = $self->_efs;
-+    my $unix_rpt = $self->_unix_rpt;
-+
-+    my $unix_mode = 0;
-+    my $dir_unix = 0;
-+    $dir_unix = 1 if ($dir =~ m#/#);
-+    $dir_unix = 1 if ($dir =~ /^\.\.?$/);
-+    my $dir_vms = 0;
-+    $dir_vms = 1 if ($dir =~ m#[\[<\]]#);
-+    $dir_vms = 1 if ($dir =~ /^--?$/);
-+
-+    if ($efs && (length($dev) == 0)) {
-+        if ($dir_unix == $dir_vms) {
-+            $unix_mode = $unix_rpt;
-+        } else {
-+            $unix_mode = $dir_unix;
-+        }
-+    } 
-+
-     # We look for a volume in $dev, then in $dir, but not both
--    my ($dir_volume, $dir_dir, $dir_file) = $self->splitpath($dir);
--    $dev = $dir_volume unless length $dev;
--    $dir = length $dir_file ? $self->catfile($dir_dir, $dir_file) : $dir_dir;
--    
-+    # but only if using VMS syntax.
-+    if (!$unix_mode) {
-+        $dir = vmspath($dir) if $dir_unix;
-+        my ($dir_volume, $dir_dir, $dir_file) = $self->splitpath($dir);
-+        $dev = $dir_volume unless length $dev;
-+        $dir = length $dir_file ? $self->catfile($dir_dir, $dir_file) :
-+                                  $dir_dir;
-+    }
-     if ($dev =~ m|^/+([^/]+)|) { $dev = "$1:"; }
-     else { $dev .= ':' unless $dev eq '' or $dev =~ /:\Z(?!\n)/; }
-     if (length($dev) or length($dir)) {
--      $dir = "[$dir]" unless $dir =~ /[\[<\/]/;
--      $dir = vmspath($dir);
-+      if ($efs) {
-+          if ($unix_mode) {
-+              $dir .= '/' unless ($dir =~ m#/$#);
-+          } else {
-+              $dir = vmspath($dir) if (($dir =~ m#/#) || ($dir =~ /^\.\.?$/));
-+              $dir = "[$dir]" unless $dir =~ /^[\[<]/;
-+          }
-+      } else {
-+          $dir = "[$dir]" unless $dir =~ /[\[<\/]/;
-+          $dir = vmspath($dir);
-+      }
-     }
-     "$dev$dir$file";
- }
- 
- =item abs2rel (override)
- 
--Use VMS syntax when converting filespecs.
-+Attempt to convert a file specification to a relative specification.
-+On a system with volumes, like VMS, this may not be possible.
- 
- =cut
- 
- sub abs2rel {
-     my $self = shift;
--    return vmspath(File::Spec::Unix::abs2rel( $self, @_ ))
--        if grep m{/}, @_;
--
-     my($path,$base) = @_;
--    $base = $self->_cwd() unless defined $base and length $base;
-+
-+    my $efs = $self->_efs;
-+    my $unix_rpt = $self->_unix_rpt;
-+
-+    if (!$efs) {
-+        return vmspath(File::Spec::Unix::abs2rel( $self, @_ ))
-+            if grep m{/}, @_;
-+    }
-+
-+    # We need to identify what the directory is in
-+    # of the specification in order to process them
-+    my $path_unix = 0;
-+    $path_unix = 1 if ($path =~ m#/#);
-+    $path_unix = 1 if ($path =~ /^\.\.?$/);
-+    my $path_vms = 0;
-+    $path_vms = 1 if ($path =~ m#[\[<\]]#);
-+    $path_vms = 1 if ($path =~ /^--?$/);
-+
-+    my $unix_mode = 0;
-+    if ($path_vms == $path_unix) {
-+        $unix_mode = $unix_rpt;
-+    } else {
-+        $unix_mode = $path_unix;
-+    }
-+
-+    my $base_unix = 0;
-+    my $base_vms = 0;
-+
-+    if (defined $base) {
-+        $base_unix = 1 if ($base =~ m#/#);
-+        $base_unix = 1 if ($base =~ /^\.\.?$/);
-+        $base_vms = 1 if ($base =~ m#[\[<\]]#);
-+        $base_vms = 1 if ($base =~ /^--?$/);
-+
-+        if ($path_vms == $path_unix) {
-+            if ($base_vms == $base_unix) {
-+                $unix_mode = $unix_rpt;
-+            } else {
-+                $unix_mode = $base_unix;
-+            }
-+        } else {
-+            $unix_mode = 0 if $base_vms;
-+        }
-+    }
-+
-+    if ($efs) {
-+        if ($unix_mode) {
-+            # We are UNIX mode.
-+            $base = unixpath($base) if $base_vms;
-+            $base = unixify($path) if $path_vms;
-+
-+            # Here VMS is different, and in order to do this right
-+            # we have to take the realpath for both the path and the base
-+            # so that we can remove the common components.
-+
-+            if ($path =~ m#^/#) {
-+                if (defined $base) {
-+
-+                    # For the shorterm, if the starting directories are
-+                    # common, remove them.
-+                    my $bq = qq($base);
-+                    $bq =~ s/\$/\\\$/;
-+                    $path =~ s/^$bq//i;
-+                }
-+                return $path;
-+            }
-+
-+            return File::Spec::Unix::abs2rel( $self, $path, $base );
-+
-+        } else {
-+            $base = vmspath($base) if $base_unix;
-+            $path = vmsify($path) if $path_unix;
-+        }
-+    }
-+
-+    unless (defined $base and length $base) {
-+        $base = $self->_cwd();
-+        if ($efs) {
-+            $base_unix = 1 if ($base =~ m#/#);
-+            $base_unix = 1 if ($base =~ /^\.\.?$/);
-+            $base = vmspath($base) if $base_unix;
-+        }
-+    }
- 
-     for ($path, $base) { $_ = $self->canonpath($_) }
- 
-@@ -371,7 +905,7 @@ sub abs2rel {
- 
- =item rel2abs (override)
- 
--Use VMS syntax when converting filespecs.
-+Return an absolute file specification from a relative one.
- 
- =cut
- 
-@@ -379,12 +913,58 @@ sub rel2abs {
-     my $self = shift ;
-     my ($path,$base ) = @_;
-     return undef unless defined $path;
--    if ($path =~ m/\//) {
--	$path = ( -d $path || $path =~ m/\/\z/  # educated guessing about
--		   ? vmspath($path)             # whether it's a directory
--		   : vmsify($path) );
-+
-+    my $efs = $self->_efs;
-+    my $unix_rpt = $self->_unix_rpt;
-+
-+    # We need to identify what the directory is in
-+    # of the specification in order to process them
-+    my $path_unix = 0;
-+    $path_unix = 1 if ($path =~ m#/#);
-+    $path_unix = 1 if ($path =~ /^\.\.?$/);
-+    my $path_vms = 0;
-+    $path_vms = 1 if ($path =~ m#[\[<\]]#);
-+    $path_vms = 1 if ($path =~ /^--?$/);
-+
-+    my $unix_mode = 0;
-+    if ($path_vms == $path_unix) {
-+        $unix_mode = $unix_rpt;
-+    } else {
-+        $unix_mode = $path_unix;
-+    }
-+
-+    my $base_unix = 0;
-+    my $base_vms = 0;
-+
-+    if (defined $base) {
-+        $base_unix = 1 if ($base =~ m#/#);
-+        $base_unix = 1 if ($base =~ /^\.\.?$/);
-+        $base_vms = 1 if ($base =~ m#[\[<\]]#);
-+        $base_vms = 1 if ($base =~ /^--?$/);
-+
-+        # If we could not determine the path mode, see if we can find out
-+        # from the base.
-+        if ($path_vms == $path_unix) {
-+            if ($base_vms != $base_unix) {
-+                $unix_mode = $base_unix;
-+            }
-+        }
-     }
--    $base = vmspath($base) if defined $base && $base =~ m/\//;
-+
-+    if (!$efs) {
-+        # Legacy behavior, convert to VMS syntax.
-+        $unix_mode = 0;
-+        if (defined $base) {
-+            $base = vmspath($base) if $base =~ m/\//;
-+        }
-+
-+        if ($path =~ m/\//) {
-+	    $path = ( -d $path || $path =~ m/\/\z/  # educated guessing about
-+		       ? vmspath($path)             # whether it's a directory
-+		       : vmsify($path) );
-+        }
-+   }
-+
-     # Clean up and split up $path
-     if ( ! $self->file_name_is_absolute( $path ) ) {
-         # Figure out the effective $base and clean it up.
-@@ -398,6 +978,20 @@ sub rel2abs {
-             $base = $self->canonpath( $base ) ;
-         }
- 
-+        if ($efs) {
-+            # base may have changed, so need to look up format again.
-+            if ($unix_mode) {
-+                $base_vms = 1 if ($base =~ m#[\[<\]]#);
-+                $base_vms = 1 if ($base =~ /^--?$/);
-+                $base = unixpath($base) if $base_vms;
-+                $base .= '/' unless ($base =~ m#/$#);
-+            } else {
-+                $base_unix = 1 if ($base =~ m#/#);
-+                $base_unix = 1 if ($base =~ /^\.\.?$/);
-+                $base = vmspath($base) if $base_unix; 
-+            }
-+        }
-+
-         # Split up paths
-         my ( $path_directories, $path_file ) =
-             ($self->splitpath( $path ))[1,2] ;
-@@ -408,12 +1002,23 @@ sub rel2abs {
-         $path_directories = '' if $path_directories eq '[]' ||
-                                   $path_directories eq '<>';
-         my $sep = '' ;
--        $sep = '.'
--            if ( $base_directories =~ m{[^.\]>]\Z(?!\n)} &&
--                 $path_directories =~ m{^[^.\[<]}s
--            ) ;
--        $base_directories = "$base_directories$sep$path_directories";
--        $base_directories =~ s{\.?[\]>][\[<]\.?}{.};
-+
-+        if ($efs) {
-+            # Merge the paths assuming that the base is absolute.
-+            $base_directories = $self->catdir('',
-+                                              $base_directories,
-+                                              $path_directories);
-+        } else {
-+            # Legacy behavior assumes VMS only paths
-+            $sep = '.'
-+                if ( $base_directories =~ m{[^.\]>]\Z(?!\n)} &&
-+                     $path_directories =~ m{^[^.\[<]}s
-+                ) ;
-+            $base_directories = "$base_directories$sep$path_directories";
-+            $base_directories =~ s{\.?[\]>][\[<]\.?}{.};
-+        }
-+
-+        $path_file = '' if ($path_file eq '.') && $unix_mode;
- 
-         $path = $self->catpath( $base_volume, $base_directories, $path_file );
-    }
-@@ -430,6 +1035,14 @@ sub rel2abs {
- # 
- # Please consider these two methods deprecated.  Do not patch them,
- # patch the ones in ExtUtils::MM_VMS instead.
-+#
-+# Update:  MakeMaker 6.48 is still using these routines on VMS.
-+# so they need to be kept up to date with ExtUtils::MM_VMS.
-+#
-+# The traditional VMS mode using ODS-2 disks depends on these routines
-+# being here.  These routines should not be called in when the
-+# C<DECC$EFS_CHARSET> or C<DECC$FILENAME_REPORT_UNIX> modes are enabled.
-+
- sub eliminate_macros {
-     my($self,$path) = @_;
-     return '' unless (defined $path) && ($path ne '');
-@@ -439,13 +1052,16 @@ sub eliminate_macros {
-       return join ' ', map { $self->eliminate_macros($_) } split /\s+/, $path;
-     }
- 
--    my($npath) = unixify($path);
-+    my $npath = unixify($path);
-+    # sometimes unixify will return a string with an off-by-one trailing null
-+    $npath =~ s{\0$}{};
-+
-     my($complex) = 0;
-     my($head,$macro,$tail);
- 
-     # perform m##g in scalar context so it acts as an iterator
-     while ($npath =~ m#(.*?)\$\((\S+?)\)(.*)#gs) { 
--        if ($self->{$2}) {
-+        if (defined $self->{$2}) {
-             ($head,$macro,$tail) = ($1,$2,$3);
-             if (ref $self->{$macro}) {
-                 if (ref $self->{$macro} eq 'ARRAY') {
-@@ -467,10 +1083,23 @@ sub eliminate_macros {
- }
- 
- # Deprecated.  See the note above for eliminate_macros().
-+
-+# Catchall routine to clean up problem MM[SK]/Make macros.  Expands macros
-+# in any directory specification, in order to avoid juxtaposing two
-+# VMS-syntax directories when MM[SK] is run.  Also expands expressions which
-+# are all macro, so that we can tell how long the expansion is, and avoid
-+# overrunning DCL's command buffer when MM[KS] is running.
-+
-+# fixpath() checks to see whether the result matches the name of a
-+# directory in the current default directory and returns a directory or
-+# file specification accordingly.  C<$is_dir> can be set to true to
-+# force fixpath() to consider the path to be a directory or false to force
-+# it to be a file.
-+
- sub fixpath {
-     my($self,$path,$force_path) = @_;
-     return '' unless $path;
--    $self = bless {} unless ref $self;
-+    $self = bless {}, $self unless ref $self;
-     my($fixedpath,$prefix,$name);
- 
-     if ($path =~ /\s/) {
-diff -up perl-5.10.0/lib/File/Spec/Win32.pm.aa perl-5.10.0/lib/File/Spec/Win32.pm
---- perl-5.10.0/lib/File/Spec/Win32.pm.aa	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Spec/Win32.pm	2009-05-10 10:58:10.000000000 +0200
-@@ -5,7 +5,8 @@ use strict;
- use vars qw(@ISA $VERSION);
- require File::Spec::Unix;
- 
--$VERSION = '3.2501';
-+$VERSION = '3.30';
-+$VERSION = eval $VERSION;
- 
- @ISA = qw(File::Spec::Unix);
- 
-@@ -41,7 +42,7 @@ sub devnull {
-     return "nul";
- }
- 
--sub rootdir () { '\\' }
-+sub rootdir { '\\' }
- 
- 
- =item tmpdir
-@@ -87,7 +88,7 @@ Default: 1
- 
- =cut
- 
--sub case_tolerant () {
-+sub case_tolerant {
-   eval { require Win32API::File; } or return 1;
-   my $drive = shift || "C:";
-   my $osFsType = "\0"x256;
-@@ -126,23 +127,37 @@ complete path ending with a filename
- =cut
- 
- sub catfile {
--    my $self = shift;
--    my $file = $self->canonpath(pop @_);
--    return $file unless @_;
--    my $dir = $self->catdir(@_);
--    $dir .= "\\" unless substr($dir,-1) eq "\\";
--    return $dir.$file;
-+    shift;
-+
-+    # Legacy / compatibility support
-+    #
-+    shift, return _canon_cat( "/", @_ )
-+	if $_[0] eq "";
-+
-+    # Compatibility with File::Spec <= 3.26:
-+    #     catfile('A:', 'foo') should return 'A:\foo'.
-+    return _canon_cat( ($_[0].'\\'), @_[1..$#_] )
-+        if $_[0] =~ m{^$DRIVE_RX\z}o;
-+
-+    return _canon_cat( @_ );
- }
- 
- sub catdir {
--    my $self = shift;
--    my @args = @_;
--    foreach (@args) {
--	tr[/][\\];
--        # append a backslash to each argument unless it has one there
--        $_ .= "\\" unless m{\\$};
--    }
--    return $self->canonpath(join('', @args));
-+    shift;
-+
-+    # Legacy / compatibility support
-+    #
-+    return ""
-+    	unless @_;
-+    shift, return _canon_cat( "/", @_ )
-+	if $_[0] eq "";
-+
-+    # Compatibility with File::Spec <= 3.26:
-+    #     catdir('A:', 'foo') should return 'A:\foo'.
-+    return _canon_cat( ($_[0].'\\'), @_[1..$#_] )
-+        if $_[0] =~ m{^$DRIVE_RX\z}o;
-+
-+    return _canon_cat( @_ );
- }
- 
- sub path {
-@@ -165,25 +180,10 @@ On Win32 makes 
- =cut
- 
- sub canonpath {
--    my ($self,$path) = @_;
--    
--    $path =~ s/^([a-z]:)/\u$1/s;
--    $path =~ s|/|\\|g;
--    $path =~ s|([^\\])\\+|$1\\|g;                  # xx\\\\xx  -> xx\xx
--    $path =~ s|(\\\.)+\\|\\|g;                     # xx\.\.\xx -> xx\xx
--    $path =~ s|^(\.\\)+||s unless $path eq ".\\";  # .\xx      -> xx
--    $path =~ s|\\\Z(?!\n)||
--	unless $path =~ m{^([A-Z]:)?\\\Z(?!\n)}s;  # xx\       -> xx
--    # xx1/xx2/xx3/../../xx -> xx1/xx
--    $path =~ s|\\\.\.\.\\|\\\.\.\\\.\.\\|g; # \...\ is 2 levels up
--    $path =~ s|^\.\.\.\\|\.\.\\\.\.\\|g;    # ...\ is 2 levels up
--    return $path if $path =~ m|^\.\.|;      # skip relative paths
--    return $path unless $path =~ /\.\./;    # too few .'s to cleanup
--    return $path if $path =~ /\.\.\.\./;    # too many .'s to cleanup
--    $path =~ s{^\\\.\.$}{\\};                      # \..    -> \
--    1 while $path =~ s{^\\\.\.}{};                 # \..\xx -> \xx
--
--    return $self->_collapse($path);
-+    # Legacy / compatibility support
-+    #
-+    return $_[1] if !defined($_[1]) or $_[1] eq '';
-+    return _canon_cat( $_[1] );
- }
- 
- =item splitpath
-@@ -375,4 +375,70 @@ implementation of these methods, not the
- 
- =cut
- 
-+
-+sub _canon_cat				# @path -> path
-+{
-+    my ($first, @rest) = @_;
-+
-+    my $volume = $first =~ s{ \A ([A-Za-z]:) ([\\/]?) }{}x	# drive letter
-+    	       ? ucfirst( $1 ).( $2 ? "\\" : "" )
-+	       : $first =~ s{ \A (?:\\\\|//) ([^\\/]+)
-+				 (?: [\\/] ([^\\/]+) )?
-+	       			 [\\/]? }{}xs			# UNC volume
-+	       ? "\\\\$1".( defined $2 ? "\\$2" : "" )."\\"
-+	       : $first =~ s{ \A [\\/] }{}x			# root dir
-+	       ? "\\"
-+	       : "";
-+    my $path   = join "\\", $first, @rest;
-+
-+    $path =~ tr#\\/#\\\\#s;		# xx/yy --> xx\yy & xx\\yy --> xx\yy
-+
-+    					# xx/././yy --> xx/yy
-+    $path =~ s{(?:
-+		(?:\A|\\)		# at begin or after a slash
-+		\.
-+		(?:\\\.)*		# and more
-+		(?:\\|\z) 		# at end or followed by slash
-+	       )+			# performance boost -- I do not know why
-+	     }{\\}gx;
-+
-+    # XXX I do not know whether more dots are supported by the OS supporting
-+    #     this ... annotation (NetWare or symbian but not MSWin32).
-+    #     Then .... could easily become ../../.. etc:
-+    # Replace \.\.\. by (\.\.\.+)  and substitute with
-+    # { $1 . ".." . "\\.." x (length($2)-2) }gex
-+	     				# ... --> ../..
-+    $path =~ s{ (\A|\\)			# at begin or after a slash
-+    		\.\.\.
-+		(?=\\|\z) 		# at end or followed by slash
-+	     }{$1..\\..}gx;
-+    					# xx\yy\..\zz --> xx\zz
-+    while ( $path =~ s{(?:
-+		(?:\A|\\)		# at begin or after a slash
-+		[^\\]+			# rip this 'yy' off
-+		\\\.\.
-+		(?<!\A\.\.\\\.\.)	# do *not* replace ^..\..
-+		(?<!\\\.\.\\\.\.)	# do *not* replace \..\..
-+		(?:\\|\z) 		# at end or followed by slash
-+	       )+			# performance boost -- I do not know why
-+	     }{\\}sx ) {}
-+
-+    $path =~ s#\A\\##;			# \xx --> xx  NOTE: this is *not* root
-+    $path =~ s#\\\z##;			# xx\ --> xx
-+
-+    if ( $volume =~ m#\\\z# )
-+    {					# <vol>\.. --> <vol>\
-+	$path =~ s{ \A			# at begin
-+		    \.\.
-+		    (?:\\\.\.)*		# and more
-+		    (?:\\|\z) 		# at end or followed by slash
-+		 }{}x;
-+
-+	return $1			# \\HOST\SHARE\ --> \\HOST\SHARE
-+	    if    $path eq ""
-+	      and $volume =~ m#\A(\\\\.*)\\\z#s;
-+    }
-+    return $path ne "" || $volume ? $volume.$path : ".";
-+}
-+
- 1;
diff --git a/perl-update-IO-Compress-Base.patch b/perl-update-IO-Compress-Base.patch
deleted file mode 100644
index b8dc888..0000000
--- a/perl-update-IO-Compress-Base.patch
+++ /dev/null
@@ -1,1475 +0,0 @@
-IO-Compress-Base-2.015
-(omitting changes to private/MakeUtil.pm)
-
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/Changes perl-5.10.0/ext/IO_Compress_Base/Changes
---- perl-5.10.0.orig/ext/IO_Compress_Base/Changes	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Base/Changes	2009-12-01 11:17:37.000000000 +0100
-@@ -1,6 +1,74 @@
- CHANGES
- -------
- 
-+  2.015 3 September 2008
-+
-+      * Makefile.PL
-+        Backout changes made in 2.014
-+
-+  2.014 2 September 2008
-+
-+      * Makefile.PL
-+        Updated to check for indirect dependencies.
-+
-+  2.013 18 July 2008
-+
-+      * IO::Compress::Base 
-+        - Allow IO::Compress::Base::Parameters::parse to accept an IO::Compress::Base::Parameters object.
-+
-+  2.012 15 July 2008
-+
-+      * IO::Compress::Base 
-+        - Silenced an uninitialised value warning when reading a line
-+          at a time from a zip file where the content uses ZIP_CM_STORE. 
-+          [Problem spotted & fixed by Jeff Holt]
-+
-+      * IO::Compress::Base & IO::Uncompress::Base
-+        - local-ise $!, $? et al in the DESTROY methods.
-+          
-+  2.011 17 May 2008
-+
-+      * IO::Compress::Base
-+        - Fixed problem that prevented the creation of a zip file that
-+          contained more than one compression method.
-+
-+      * IO::Compress::Base::Common
-+        - The private Validator class in this module clashes with another
-+          CPAN module. Moved Validator into the IO::Compress::Base::Common
-+          namespace.
-+          [RT #35954]
-+
-+  2.010 5 May 2008
-+
-+      * Fixed problem that meant Perl 5.10 could not upgrade this module.
-+        [RT #35342]
-+
-+  2.009 20 April 2008
-+
-+      * Removed the alpha status from File::GlobMapper
-+      
-+      * IO::Compress::Base 
-+        When writing output never output a zero length buffer.
-+        Done to improve interoperability with other tied filenandle
-+        modules.
-+
-+      * Changed IO::Uncompress::Base to not use the offset parameter of
-+        the read method when reading from a filehandle. 
-+
-+        The object returned from Net::FTP::retr implements a non-standard
-+        read method. The third parameter is used for a timeout value
-+        rather than an offset.  
-+        [rt.cpan#33231]
-+        
-+      * Changed IO::Uncompress::Base to not use the eof method when
-+        reading from a filehandle. 
-+
-+        The object returned from Net::FTP::retr implements both the read
-+        method and the eof method. Unfortunately the implementation of
-+        the read method uses non-buffered IO (by using sysread) while
-+        the eof method uses buffered IO. Mixing buffered and non-buffered
-+        IO results in data corruption.
-+
-   2.008 2 November 2007
- 
-       * Minor documentation changes in README
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/Makefile.PL perl-5.10.0/ext/IO_Compress_Base/Makefile.PL
---- perl-5.10.0.orig/ext/IO_Compress_Base/Makefile.PL	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Base/Makefile.PL	2009-12-01 11:17:37.000000000 +0100
-@@ -37,6 +37,12 @@
- 
-     INSTALLDIRS => ($] >= 5.009 ? 'perl' : 'site'),
- 
-+    (
-+    $] >= 5.009 && ! $ENV{PERL_CORE}
-+        ? (INST_LIB    => 'blib/arch')
-+        : ()
-+    ),
-+
-     ((ExtUtils::MakeMaker->VERSION() gt '6.30') ?
-         ('LICENSE'  => 'perl')         : ()),
-     
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/README perl-5.10.0/ext/IO_Compress_Base/README
---- perl-5.10.0.orig/ext/IO_Compress_Base/README	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Base/README	2009-12-01 11:17:37.000000000 +0100
-@@ -1,42 +1,28 @@
- 
-                              IO-Compress-Base
- 
--                             Version 2.008
-+                             Version 2.015
- 
--                             2nd November 2007
-+                            2nd September 2008
- 
--
--       Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+       Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
-           This program is free software; you can redistribute it
-            and/or modify it under the same terms as Perl itself.
- 
--
--
--
- DESCRIPTION
- -----------
- 
--
- This module is the base class for all IO::Compress and IO::Uncompress
- modules.
- 
--
--
--
--
- PREREQUISITES
- -------------
- 
- Before you can build IO-Compress-Base you need to have the following
- installed on your system:
- 
--
-     * Perl 5.004 or better. 
- 
--
--
--
--
- BUILDING THE MODULE
- -------------------
- 
-@@ -47,8 +33,6 @@
-     make
-     make test
- 
--
--
- INSTALLATION
- ------------
- 
-@@ -56,24 +40,9 @@
- 
-     make install
- 
--
--
--
--
- TROUBLESHOOTING
- ---------------
- 
--
--
--
--
--
--
--
--
--
--
--
- FEEDBACK
- --------
- 
-@@ -107,9 +76,7 @@
-         If you haven't installed IO-Compress-Base then search IO::Compress::Base.pm
-         for a line like this:
- 
--          $VERSION = "2.008" ;
--
--
-+          $VERSION = "2.015" ;
- 
-  2. If you are having problems building IO-Compress-Base, send me a
-     complete log of what happened. Start by unpacking the IO-Compress-Base
-@@ -120,5 +87,4 @@
-         make
-         make test TEST_VERBOSE=1          
- 
--
- Paul Marquess <pmqs@cpan.org>
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/lib/File/GlobMapper.pm perl-5.10.0/ext/IO_Compress_Base/lib/File/GlobMapper.pm
---- perl-5.10.0.orig/ext/IO_Compress_Base/lib/File/GlobMapper.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Base/lib/File/GlobMapper.pm	2009-12-01 11:17:37.000000000 +0100
-@@ -26,7 +26,7 @@
- our ($Error);
- 
- our ($VERSION, @EXPORT_OK);
--$VERSION = '0.000_02';
-+$VERSION = '1.000';
- @EXPORT_OK = qw( globmap );
- 
- 
-@@ -389,24 +389,6 @@
- 
- =head1 DESCRIPTION
- 
--B<WARNING Alpha Release Alert!> 
--
--=over 5
--
--=item * This code is a work in progress. 
--
--=item * There are known bugs. 
--
--=item * The interface defined here is tentative. 
--
--=item * There are portability issues. 
--
--=item * Do not use in production code.
--
--=item * Consider yourself warned!
--
--=back
--
- This module needs Perl5.005 or better.
- 
- This module takes the existing C<File::Glob> module as a starting point and
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm
---- perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm	2009-12-01 11:17:37.000000000 +0100
-@@ -11,7 +11,7 @@
- require Exporter;
- our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE);
- @ISA = qw(Exporter);
--$VERSION = '2.008';
-+$VERSION = '2.015';
- 
- @EXPORT = qw( isaFilehandle isaFilename whatIsInput whatIsOutput 
-               isaFileGlobString cleanFileGlobString oneTarget
-@@ -192,7 +192,7 @@
-     return $_[0] =~ /^(code|handle|buffer|filename)$/;
- }
- 
--sub Validator::new
-+sub IO::Compress::Base::Validator::new
- {
-     my $class = shift ;
- 
-@@ -320,7 +320,7 @@
-     return $obj ;
- }
- 
--sub Validator::saveErrorString
-+sub IO::Compress::Base::Validator::saveErrorString
- {
-     my $self   = shift ;
-     ${ $self->{Error} } = shift ;
-@@ -328,7 +328,7 @@
-     
- }
- 
--sub Validator::croakError
-+sub IO::Compress::Base::Validator::croakError
- {
-     my $self   = shift ;
-     $self->saveErrorString($_[0]);
-@@ -337,7 +337,7 @@
- 
- 
- 
--sub Validator::validateInputFilenames
-+sub IO::Compress::Base::Validator::validateInputFilenames
- {
-     my $self = shift ;
- 
-@@ -367,7 +367,7 @@
-     return 1 ;
- }
- 
--sub Validator::validateInputArray
-+sub IO::Compress::Base::Validator::validateInputArray
- {
-     my $self = shift ;
- 
-@@ -398,7 +398,7 @@
-     return 1 ;
- }
- 
--#sub Validator::validateHash
-+#sub IO::Compress::Base::Validator::validateHash
- #{
- #    my $self = shift ;
- #    my $href = shift ;
-@@ -485,7 +485,11 @@
- 
-     my $sub = (caller($level + 1))[3] ;
-     local $Carp::CarpLevel = 1 ;
--    my $p = new IO::Compress::Base::Parameters() ;
-+    
-+    return $_[1]
-+        if @_ == 2 && defined $_[1] && UNIVERSAL::isa($_[1], "IO::Compress::Base::Parameters");
-+    
-+    my $p = new IO::Compress::Base::Parameters() ;            
-     $p->parse(@_)
-         or croak "$sub: $p->{Error}" ;
- 
-@@ -534,6 +538,7 @@
- 
-     my $got = $self->{Got} ;
-     my $firstTime = keys %{ $got } == 0 ;
-+    my $other;
- 
-     my (@Bad) ;
-     my @entered = () ;
-@@ -544,7 +549,8 @@
-         @entered = () ;
-     }
-     elsif (@_ == 1) {
--        my $href = $_[0] ;    
-+        my $href = $_[0] ;
-+    
-         return $self->setError("Expected even number of parameters, got 1")
-             if ! defined $href or ! ref $href or ref $href ne "HASH" ;
-  
-@@ -559,8 +565,13 @@
-             if $count % 2 != 0 ;
-         
-         for my $i (0.. $count / 2 - 1) {
--            push @entered, $_[2* $i] ;
--            push @entered, \$_[2* $i+1] ;
-+            if ($_[2 * $i] eq '__xxx__') {
-+                $other = $_[2 * $i + 1] ;
-+            }
-+            else {
-+                push @entered, $_[2 * $i] ;
-+                push @entered, \$_[2 * $i + 1] ;
-+            }
-         }
-     }
- 
-@@ -588,6 +599,24 @@
-     }
- 
-     my %parsed = ();
-+    
-+    if ($other) 
-+    {
-+        for my $key (keys %$default)  
-+        {
-+            my $canonkey = lc $key;
-+            if ($other->parsed($canonkey))
-+            {
-+                my $value = $other->value($canonkey);
-+#print "SET '$canonkey' to $value [$$value]\n";
-+                ++ $parsed{$canonkey};
-+                $got->{$canonkey}[OFF_PARSED]  = 1;
-+                $got->{$canonkey}[OFF_DEFAULT] = $value;
-+                $got->{$canonkey}[OFF_FIXED]   = $value;
-+            }
-+        }
-+    }
-+    
-     for my $i (0.. @entered / 2 - 1) {
-         my $key = $entered[2* $i] ;
-         my $value = $entered[2* $i+1] ;
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Compress/Base.pm perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base.pm
---- perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Compress/Base.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Base/lib/IO/Compress/Base.pm	2009-12-01 11:17:37.000000000 +0100
-@@ -6,7 +6,7 @@
- use strict ;
- use warnings;
- 
--use IO::Compress::Base::Common 2.008 ;
-+use IO::Compress::Base::Common 2.015 ;
- 
- use IO::File ;
- use Scalar::Util qw(blessed readonly);
-@@ -20,7 +20,7 @@
- our (@ISA, $VERSION);
- @ISA    = qw(Exporter IO::File);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- 
- #Can't locate object method "SWASHNEW" via package "utf8" (perhaps you forgot to load "utf8"?) at .../ext/Compress-Zlib/Gzip/blib/lib/Compress/Zlib/Common.pm line 16.
- 
-@@ -120,12 +120,14 @@
-         &{ *$self->{FilterEnvelope} }();
-     }
- 
--    if ( defined *$self->{FH} ) {
--        defined *$self->{FH}->write( $data, length $data )
--          or return $self->saveErrorString(0, $!, $!); 
--    }
--    else {
--        ${ *$self->{Buffer} } .= $data ;
-+    if (length $data) {
-+        if ( defined *$self->{FH} ) {
-+                defined *$self->{FH}->write( $data, length $data )
-+                or return $self->saveErrorString(0, $!, $!); 
-+        }
-+        else {
-+                ${ *$self->{Buffer} } .= $data ;
-+        }
-     }
- 
-     return 1;
-@@ -234,7 +236,7 @@
-     my $status ;
-     if (! $merge)
-     {
--        *$obj->{Compress} = $obj->mkComp($class, $got)
-+        *$obj->{Compress} = $obj->mkComp($got)
-             or return undef;
-         
-         *$obj->{UnCompSize} = new U64 ;
-@@ -321,7 +323,7 @@
-     my $haveOut = @_ ;
-     my $output = shift ;
- 
--    my $x = new Validator($class, *$obj->{Error}, $name, $input, $output)
-+    my $x = new IO::Compress::Base::Validator($class, *$obj->{Error}, $name, $input, $output)
-         or return undef ;
- 
-     push @_, $output if $haveOut && $x->{Hash};
-@@ -545,6 +547,8 @@
- sub DESTROY
- {
-     my $self = shift ;
-+    local ($., $@, $!, $^E, $?);
-+    
-     $self->close() ;
- 
-     # TODO - memory leak with 5.8.0 - this isn't called until 
-@@ -697,15 +701,13 @@
-     $self->ckParams($got)
-         or $self->croakError("newStream: $self->{Error}");
- 
-+    *$self->{Compress} = $self->mkComp($got)
-+        or return 0;
-+
-     *$self->{Header} = $self->mkHeader($got) ;
-     $self->output(*$self->{Header} )
-         or return 0;
-     
--    my $status = $self->reset() ;
--    return $self->saveErrorString(0, *$self->{Compress}{Error}, 
--                                  *$self->{Compress}{ErrorNo})
--        if $status == STATUS_ERROR;
--
-     *$self->{UnCompSize}->reset();
-     *$self->{CompSize}->reset();
- 
-@@ -939,23 +941,17 @@
- 
- =head1 NAME
- 
--
- IO::Compress::Base - Base Class for IO::Compress modules 
- 
--
- =head1 SYNOPSIS
- 
-     use IO::Compress::Base ;
- 
- =head1 DESCRIPTION
- 
--
- This module is not intended for direct use in application code. Its sole
- purpose if to to be sub-classed by IO::Compress modules.
- 
--
--
--
- =head1 SEE ALSO
- 
- L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress>
-@@ -966,25 +962,18 @@
- L<Archive::Tar|Archive::Tar>,
- L<IO::Zlib|IO::Zlib>
- 
--
--
--
--
- =head1 AUTHOR
- 
- This module was written by Paul Marquess, F<pmqs@cpan.org>. 
- 
--
--
- =head1 MODIFICATION HISTORY
- 
- See the Changes file.
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
- 
--
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm perl-5.10.0/ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm
---- perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm	2009-12-01 11:17:37.000000000 +0100
-@@ -4,16 +4,16 @@
- use warnings;
- use bytes;
- 
--use IO::Compress::Base::Common 2.008 qw(createSelfTiedObject);
-+use IO::Compress::Base::Common 2.015 qw(createSelfTiedObject);
- 
--use IO::Uncompress::Base 2.008 ;
-+use IO::Uncompress::Base 2.015 ;
- 
- 
- require Exporter ;
- 
- our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- $AnyUncompressError = '';
- 
- @ISA = qw( Exporter IO::Uncompress::Base );
-@@ -27,18 +27,18 @@
- 
- BEGIN
- {
--   eval ' use IO::Uncompress::Adapter::Inflate 2.008 ;';
--   eval ' use IO::Uncompress::Adapter::Bunzip2 2.008 ;';
--   eval ' use IO::Uncompress::Adapter::LZO 2.008 ;';
--   eval ' use IO::Uncompress::Adapter::Lzf 2.008 ;';
--
--   eval ' use IO::Uncompress::Bunzip2 2.008 ;';
--   eval ' use IO::Uncompress::UnLzop 2.008 ;';
--   eval ' use IO::Uncompress::Gunzip 2.008 ;';
--   eval ' use IO::Uncompress::Inflate 2.008 ;';
--   eval ' use IO::Uncompress::RawInflate 2.008 ;';
--   eval ' use IO::Uncompress::Unzip 2.008 ;';
--   eval ' use IO::Uncompress::UnLzf 2.008 ;';
-+   eval ' use IO::Uncompress::Adapter::Inflate 2.015 ;';
-+   eval ' use IO::Uncompress::Adapter::Bunzip2 2.015 ;';
-+   eval ' use IO::Uncompress::Adapter::LZO 2.015 ;';
-+   eval ' use IO::Uncompress::Adapter::Lzf 2.015 ;';
-+
-+   eval ' use IO::Uncompress::Bunzip2 2.015 ;';
-+   eval ' use IO::Uncompress::UnLzop 2.015 ;';
-+   eval ' use IO::Uncompress::Gunzip 2.015 ;';
-+   eval ' use IO::Uncompress::Inflate 2.015 ;';
-+   eval ' use IO::Uncompress::RawInflate 2.015 ;';
-+   eval ' use IO::Uncompress::Unzip 2.015 ;';
-+   eval ' use IO::Uncompress::UnLzf 2.015 ;';
- }
- 
- sub new
-@@ -56,7 +56,7 @@
- 
- sub getExtraParams
- {
--    use IO::Compress::Base::Common 2.008 qw(:Parse);
-+    use IO::Compress::Base::Common 2.015 qw(:Parse);
-     return ( 'RawInflate' => [1, 1, Parse_boolean,  0] ) ;
- }
- 
-@@ -75,7 +75,6 @@
- sub mkUncomp
- {
-     my $self = shift ;
--    my $class = shift ;
-     my $got = shift ;
- 
-     my $magic ;
-@@ -188,10 +187,8 @@
- 
- =head1 NAME
- 
--
- IO::Uncompress::AnyUncompress - Uncompress gzip, zip, bzip2 or lzop file/buffer
- 
--
- =head1 SYNOPSIS
- 
-     use IO::Uncompress::AnyUncompress qw(anyuncompress $AnyUncompressError) ;
-@@ -235,10 +232,8 @@
-     eof($z)
-     close($z)
- 
--
- =head1 DESCRIPTION
- 
--
- This module provides a Perl interface that allows the reading of
- files/buffers that have been compressed with a variety of compression
- libraries.
-@@ -266,9 +261,6 @@
- The module will auto-detect which, if any, of the supported
- compression formats is being used.
- 
--
--
--
- =head1 Functional Interface
- 
- A top-level function, C<anyuncompress>, is provided to carry out
-@@ -281,14 +273,10 @@
-     anyuncompress $input => $output [,OPTS] 
-         or die "anyuncompress failed: $AnyUncompressError\n";
- 
--
--
- The functional interface needs Perl5.005 or better.
- 
--
- =head2 anyuncompress $input => $output [, OPTS]
- 
--
- C<anyuncompress> expects at least two parameters, C<$input> and C<$output>.
- 
- =head3 The C<$input> parameter
-@@ -327,8 +315,6 @@
- The complete array will be walked to ensure that it only
- contains valid filenames before any data is uncompressed.
- 
--
--
- =item An Input FileGlob string
- 
- If C<$input> is a string that is delimited by the characters "<" and ">"
-@@ -339,13 +325,10 @@
- 
- See L<File::GlobMapper|File::GlobMapper> for more details.
- 
--
- =back
- 
- If the C<$input> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head3 The C<$output> parameter
- 
- The parameter C<$output> is used to control the destination of the
-@@ -365,14 +348,11 @@
- will be written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the uncompressed data will be
- stored in C<$$output>.
- 
--
--
- =item An Array Reference
- 
- If C<$output> is an array reference, the uncompressed data will be
-@@ -391,20 +371,13 @@
- 
- If the C<$output> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head2 Notes
- 
--
- When C<$input> maps to multiple compressed files/buffers and C<$output> is
- a single file/buffer, after uncompression C<$output> will contain a
- concatenation of all the uncompressed data from each of the input
- files/buffers.
- 
--
--
--
--
- =head2 Optional Parameters
- 
- Unless specified below, the optional parameters for C<anyuncompress>,
-@@ -424,7 +397,6 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< BinModeOut => 0|1 >>
- 
- When writing to a file or filehandle, set C<binmode> before writing to the
-@@ -432,26 +404,17 @@
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< Append => 0|1 >>
- 
- TODO
- 
- =item C<< MultiStream => 0|1 >>
- 
--
- If the input file/buffer contains multiple compressed data streams, this
- option will uncompress the whole lot as a single data stream.
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< TrailingData => $scalar >>
- 
- Returns the data, if any, that is present immediately after the compressed
-@@ -471,19 +434,12 @@
- 
- Don't bother using C<trailingData> if the input is a filename.
- 
--
--
- If you know the length of the compressed data stream before you start
- uncompressing, you can avoid having to use C<trailingData> by setting the
- C<InputLength> option.
- 
--
--
- =back
- 
--
--
--
- =head2 Examples
- 
- To read the contents of the file C<file1.txt.Compressed> and write the
-@@ -498,7 +454,6 @@
-     anyuncompress $input => $output
-         or die "anyuncompress failed: $AnyUncompressError\n";
- 
--
- To read from an existing Perl filehandle, C<$input>, and write the
- uncompressed data to a buffer, C<$buffer>.
- 
-@@ -542,7 +497,6 @@
- 
- The format of the constructor for IO::Uncompress::AnyUncompress is shown below
- 
--
-     my $z = new IO::Uncompress::AnyUncompress $input [OPTS]
-         or die "IO::Uncompress::AnyUncompress failed: $AnyUncompressError\n";
- 
-@@ -574,7 +528,6 @@
- read from it.
- The string '-' can be used as an alias for standard input.
- 
--
- =item A scalar reference 
- 
- If C<$input> is a scalar reference, the compressed data will be read from
-@@ -584,7 +537,6 @@
- 
- =head2 Constructor Options
- 
--
- The option names defined below are case insensitive and can be optionally
- prefixed by a '-'.  So all of the following are valid
- 
-@@ -608,8 +560,6 @@
- 
- =item C<< MultiStream => 0|1 >>
- 
--
--
- Allows multiple concatenated compressed streams to be treated as a single
- compressed stream. Decompression will stop once either the end of the
- file/buffer is reached, an error is encountered (premature eof, corrupt
-@@ -618,7 +568,6 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< Prime => $string >>
- 
- This option will uncompress the contents of C<$string> before processing the
-@@ -660,8 +609,6 @@
- the file pointer will be left pointing to the first byte directly after the
- compressed data stream.
- 
--
--
- This option defaults to off.
- 
- =item C<< Append => 0|1 >>
-@@ -678,24 +625,12 @@
- 
- =item C<< Strict => 0|1 >>
- 
--
--
- This option controls whether the extra checks defined below are used when
- carrying out the decompression. When Strict is on, the extra tests are
- carried out, when Strict is off they are not.
- 
- The default for this option is off.
- 
--
--
--
--
--
--
--
--
--
--
- =item C<< RawInflate => 0|1 >>
- 
- When auto-detecting the compressed format, try to test for raw-deflate (RFC
-@@ -707,11 +642,6 @@
- 
- Defaults to 0.
- 
--
--
--
--
--
- =back
- 
- =head2 Examples
-@@ -755,7 +685,6 @@
- Returns the number of uncompressed bytes written to C<$buffer>, zero if eof
- or a negative number on error.
- 
--
- =head2 getline
- 
- Usage is
-@@ -770,7 +699,6 @@
- determine what constitutes an end of line. Paragraph mode, record mode and
- file slurp mode are all supported. 
- 
--
- =head2 getc
- 
- Usage is 
-@@ -785,9 +713,6 @@
- 
-     $char = $z->ungetc($string)
- 
--
--
--
- =head2 getHeaderInfo
- 
- Usage is
-@@ -799,9 +724,6 @@
- or hash references (in array context) that contains information about each
- of the header fields in the compressed data stream(s).
- 
--
--
--
- =head2 tell
- 
- Usage is
-@@ -818,26 +740,17 @@
-     $z->eof();
-     eof($z);
- 
--
--
- Returns true if the end of the compressed input stream has been reached.
- 
--
--
- =head2 seek
- 
-     $z->seek($position, $whence);
-     seek($z, $position, $whence);
- 
--
--
--
- Provides a sub-set of the C<seek> functionality, with the restriction
- that it is only legal to seek forward in the input file/buffer.
- It is a fatal error to attempt to seek backward.
- 
--
--
- The C<$whence> parameter takes one the usual values, namely SEEK_SET,
- SEEK_CUR or SEEK_END.
- 
-@@ -879,8 +792,6 @@
-     $z->input_line_number()
-     $z->input_line_number(EXPR)
- 
--
--
- Returns the current uncompressed line number. If C<EXPR> is present it has
- the effect of setting the line number. Note that setting the line number
- does not change the current position within the file/buffer being read.
-@@ -888,30 +799,25 @@
- The contents of C<$/> are used to to determine what constitutes a line
- terminator.
- 
--
--
- =head2 fileno
- 
-     $z->fileno()
-     fileno($z)
- 
--If the C<$z> object is associated with a file or a filehandle, this method
--will return the underlying file descriptor.
-+If the C<$z> object is associated with a file or a filehandle, C<fileno>
-+will return the underlying file descriptor. Once the C<close> method is
-+called C<fileno> will return C<undef>.
- 
--If the C<$z> object is is associated with a buffer, this method will
--return undef.
-+If the C<$z> object is is associated with a buffer, this method will return
-+C<undef>.
- 
- =head2 close
- 
-     $z->close() ;
-     close $z ;
- 
--
--
- Closes the output file/buffer. 
- 
--
--
- For most versions of Perl this method will be automatically invoked if
- the IO::Uncompress::AnyUncompress object is destroyed (either explicitly or by the
- variable with the reference to the object going out of scope). The
-@@ -930,9 +836,6 @@
- object was created, and the object is associated with a file, the
- underlying file will also be closed.
- 
--
--
--
- =head2 nextStream
- 
- Usage is
-@@ -971,8 +874,6 @@
- 
- Don't bother using C<trailingData> if the input is a filename.
- 
--
--
- If you know the length of the compressed data stream before you start
- uncompressing, you can avoid having to use C<trailingData> by setting the
- C<InputLength> option in the constructor.
-@@ -994,9 +895,6 @@
- 
- =head1 EXAMPLES
- 
--
--
--
- =head1 SEE ALSO
- 
- L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>
-@@ -1007,23 +905,17 @@
- L<Archive::Tar|Archive::Tar>,
- L<IO::Zlib|IO::Zlib>
- 
--
--
--
--
- =head1 AUTHOR
- 
- This module was written by Paul Marquess, F<pmqs@cpan.org>. 
- 
--
--
- =head1 MODIFICATION HISTORY
- 
- See the Changes file.
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm perl-5.10.0/ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm
---- perl-5.10.0.orig/ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm	2009-12-01 11:17:37.000000000 +0100
-@@ -9,12 +9,12 @@
- @ISA    = qw(Exporter IO::File);
- 
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- 
- use constant G_EOF => 0 ;
- use constant G_ERR => -1 ;
- 
--use IO::Compress::Base::Common 2.008 ;
-+use IO::Compress::Base::Common 2.015 ;
- #use Parse::Parameters ;
- 
- use IO::File ;
-@@ -28,6 +28,7 @@
- #Exporter::export_ok_tags('all') ;
- 
- 
-+
- sub smartRead
- {
-     my $self = $_[0];
-@@ -59,12 +60,21 @@
- 
-     my $get_size = $size - $offset ;
- 
--    #if ( defined *$self->{InputLength} ) {
--    #    $get_size = min($get_size, *$self->{InputLengthRemaining});
--    #}
--
--    if (defined *$self->{FH})
--      { *$self->{FH}->read($$out, $get_size, $offset) }
-+    if (defined *$self->{FH}) {
-+        if ($offset) {
-+            # Not using this 
-+            #
-+            #  *$self->{FH}->read($$out, $get_size, $offset);
-+            #
-+            # because the filehandle may not support the offset parameter
-+            # An example is Net::FTP
-+            my $tmp = '';
-+            *$self->{FH}->read($tmp, $get_size) > 0 &&
-+                (substr($$out, $offset) = $tmp);
-+        }
-+        else
-+          { *$self->{FH}->read($$out, $get_size) }
-+    }
-     elsif (defined *$self->{InputEvent}) {
-         my $got = 1 ;
-         while (length $$out < $size) {
-@@ -174,7 +184,24 @@
-     return 0 if length *$self->{Prime} || *$self->{PushMode};
- 
-     if (defined *$self->{FH})
--     { *$self->{FH}->eof() }
-+    {
-+        # Could use
-+        #
-+        #  *$self->{FH}->eof() 
-+        #
-+        # here, but this can cause trouble if
-+        # the filehandle is itself a tied handle, but it uses sysread.
-+        # Then we get into mixing buffered & non-buffered IO, which will cause trouble
-+
-+        my $info = $self->getErrInfo();
-+        
-+        my $buffer = '';
-+        my $status = $self->smartRead(\$buffer, 1);
-+        $self->pushBack($buffer) if length $buffer;
-+        $self->setErrInfo($info);
-+        
-+        return $status == 0 ;
-+    }
-     elsif (defined *$self->{InputEvent})
-      { *$self->{EventEof} }
-     else 
-@@ -189,6 +216,22 @@
-     ${ *$self->{Error} } = '' ;
- }
- 
-+sub getErrInfo
-+{
-+    my $self   = shift ;
-+
-+    return [ *$self->{ErrorNo}, ${ *$self->{Error} } ] ;
-+}
-+
-+sub setErrInfo
-+{
-+    my $self   = shift ;
-+    my $ref    = shift;
-+
-+    *$self->{ErrorNo}  =  $ref->[0] ;
-+    ${ *$self->{Error} } = $ref->[1] ;
-+}
-+
- sub saveStatus
- {
-     my $self   = shift ;
-@@ -425,7 +468,7 @@
-         return $obj
-     }
- 
--    my $status = $obj->mkUncomp($class, $got);
-+    my $status = $obj->mkUncomp($got);
- 
-     return undef
-         unless defined $status;
-@@ -490,7 +533,7 @@
-     my $output = shift ;
- 
- 
--    my $x = new Validator($class, *$obj->{Error}, $name, $input, $output)
-+    my $x = new IO::Compress::Base::Validator($class, *$obj->{Error}, $name, $input, $output)
-         or return undef ;
-     
-     push @_, $output if $haveOut && $x->{Hash};
-@@ -813,7 +856,7 @@
-         $self->postBlockChk($buffer, $before_len) == STATUS_OK
-             or return G_ERR;
- 
--        $buf_len = length($$buffer) - $before_len;
-+        $buf_len = defined $$buffer ? length($$buffer) - $before_len : 0;
-     
-         *$self->{CompSize}->add($beforeC_len - length $temp_buf) ;
- 
-@@ -929,7 +972,7 @@
-     my $magic = $self->ckMagic();
-     #*$self->{EndStream} = 0 ;
- 
--    if ( ! $magic) {
-+    if ( ! defined $magic) {
-         if (! *$self->{Transparent} )
-         {
-             *$self->{EndStream} = 1 ;
-@@ -1247,6 +1290,8 @@
- sub DESTROY
- {
-     my $self = shift ;
-+    local ($., $@, $!, $^E, $?);
-+
-     $self->close() ;
- }
- 
-@@ -1372,23 +1417,17 @@
- 
- =head1 NAME
- 
--
- IO::Uncompress::Base - Base Class for IO::Uncompress modules 
- 
--
- =head1 SYNOPSIS
- 
-     use IO::Uncompress::Base ;
- 
- =head1 DESCRIPTION
- 
--
- This module is not intended for direct use in application code. Its sole
- purpose if to to be sub-classed by IO::Unompress modules.
- 
--
--
--
- =head1 SEE ALSO
- 
- L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress>
-@@ -1399,23 +1438,17 @@
- L<Archive::Tar|Archive::Tar>,
- L<IO::Zlib|IO::Zlib>
- 
--
--
--
--
- =head1 AUTHOR
- 
- This module was written by Paul Marquess, F<pmqs@cpan.org>. 
- 
--
--
- =head1 MODIFICATION HISTORY
- 
- See the Changes file.
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Base/t/01misc.t perl-5.10.0/ext/IO_Compress_Base/t/01misc.t
---- perl-5.10.0.orig/ext/IO_Compress_Base/t/01misc.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Base/t/01misc.t	2009-12-01 11:17:37.000000000 +0100
-@@ -19,7 +19,7 @@
-     $extra = 1
-         if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
- 
--    plan tests => 78 + $extra ;
-+    plan tests => 88 + $extra ;
- 
-     use_ok('Scalar::Util');
-     use_ok('IO::Compress::Base::Common');
-@@ -95,13 +95,11 @@
-     my $got = ParseParameters(1, {'Fred' => [1, 1, 0x1000000, 0]}, Fred => 'abc') ;
-     is $got->value('Fred'), "abc", "other" ;
- 
--    $got = ParseParameters(1, {'Fred' => [0, 1, Parse_any, undef]}, Fred =>
--undef) ;
-+    $got = ParseParameters(1, {'Fred' => [0, 1, Parse_any, undef]}, Fred => undef) ;
-     ok $got->parsed('Fred'), "undef" ;
-     ok ! defined $got->value('Fred'), "undef" ;
- 
--    $got = ParseParameters(1, {'Fred' => [0, 1, Parse_string, undef]}, Fred =>
--undef) ;
-+    $got = ParseParameters(1, {'Fred' => [0, 1, Parse_string, undef]}, Fred => undef) ;
-     ok $got->parsed('Fred'), "undef" ;
-     is $got->value('Fred'), "", "empty string" ;
- 
-@@ -117,11 +115,41 @@
- 
-     ok $got->parsed('Fred'), "parsed" ;
-     $xx_ref = $got->value('Fred');
-+
-     $$xx_ref = 666 ;
-     is $xx, 666;
- 
-+    {
-+        my $got1 = ParseParameters(1, {'Fred' => [1, 1, Parse_writable_scalar, undef]}, $got) ;
-+        is $got1, $got, "Same object";
-+    
-+        ok $got1->parsed('Fred'), "parsed" ;
-+        $xx_ref = $got1->value('Fred');
-+        
-+        $$xx_ref = 777 ;
-+        is $xx, 777;
-+    }
-+    
-+    my $got2 = ParseParameters(1, {'Fred' => [1, 1, Parse_writable_scalar, undef]}, '__xxx__' => $got) ;
-+    isnt $got2, $got, "not the Same object";
-+
-+    ok $got2->parsed('Fred'), "parsed" ;
-+    $xx_ref = $got2->value('Fred');
-+    $$xx_ref = 888 ;
-+    is $xx, 888;  
-+      
-+    my $other;
-+    my $got3 = ParseParameters(1, {'Fred' => [1, 1, Parse_writable_scalar, undef]}, '__xxx__' => $got, Fred => \$other) ;
-+    isnt $got3, $got, "not the Same object";
-+
-+    ok $got3->parsed('Fred'), "parsed" ;
-+    $xx_ref = $got3->value('Fred');
-+    $$xx_ref = 999 ;
-+    is $other, 999;  
-+    is $xx, 888;  
- }
- 
-+
- My::testParseParameters();
- 
- 
-diff -urN perl-5.10.0.orig/t/lib/compress/CompTestUtils.pm perl-5.10.0/t/lib/compress/CompTestUtils.pm
---- perl-5.10.0.orig/t/lib/compress/CompTestUtils.pm	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/compress/CompTestUtils.pm	2009-12-01 11:18:49.000000000 +0100
-@@ -203,6 +203,14 @@
-     return readFile($filename) eq unpack("u", $uue) ;
- }
- 
-+sub isRawFormat
-+{
-+    my $class = shift;
-+    my %raw = map { $_ => 1 } qw( RawDeflate );
-+
-+    return defined $raw{$class};
-+}
-+
- sub uncompressBuffer
- {
-     my $compWith = shift ;
-@@ -222,6 +230,8 @@
-                     'IO::Compress::Lzop::lzop'               => 'IO::Uncompress::UnLzop',
-                     'IO::Compress::Lzf'                      => 'IO::Uncompress::UnLzf' ,
-                     'IO::Compress::Lzf::lzf'                 => 'IO::Uncompress::UnLzf',
-+                    'IO::Compress::PPMd'                     => 'IO::Uncompress::UnPPMd' ,
-+                    'IO::Compress::PPMd::ppmd'               => 'IO::Uncompress::UnPPMd',
-                     'IO::Compress::DummyComp'                => 'IO::Uncompress::DummyUncomp',
-                     'IO::Compress::DummyComp::dummycomp'     => 'IO::Uncompress::DummyUncomp',
-                 );
-@@ -265,6 +275,10 @@
-                     'IO::Compress::Lzf::lzf'            => \$IO::Compress::Lzf::LzfError,
-                     'IO::Uncompress::UnLzf'             => \$IO::Uncompress::UnLzf::UnLzfError,
-                     'IO::Uncompress::UnLzf::unlzf'      => \$IO::Uncompress::UnLzf::UnLzfError,
-+                    'IO::Compress::PPMd'                 => \$IO::Compress::PPMd::PPMdError,
-+                    'IO::Compress::PPMd::ppmd'            => \$IO::Compress::PPMd::PPMdError,
-+                    'IO::Uncompress::UnPPMd'             => \$IO::Uncompress::UnPPMd::UnPPMdError,
-+                    'IO::Uncompress::UnPPMd::unppmd'      => \$IO::Uncompress::UnPPMd::UnPPMdError,
- 
-                     'IO::Compress::DummyComp'           => \$IO::Compress::DummyComp::DummyCompError,
-                     'IO::Compress::DummyComp::dummycomp'=> \$IO::Compress::DummyComp::DummyCompError,
-@@ -293,6 +307,8 @@
-                     'IO::Uncompress::UnLzop'      => 'IO::Uncompress::UnLzop::unlzop',
-                     'IO::Compress::Lzf'           => 'IO::Compress::Lzf::lzf',
-                     'IO::Uncompress::UnLzf'       => 'IO::Uncompress::UnLzf::unlzf',
-+                    'IO::Compress::PPMd'           => 'IO::Compress::PPMd::ppmd',
-+                    'IO::Uncompress::UnPPMd'       => 'IO::Uncompress::UnPPMd::unppmd',
-                     'IO::Compress::DummyComp'     => 'IO::Compress::DummyComp::dummyuncomp',
-                     'IO::Uncompress::DummyUncomp' => 'IO::Uncompress::DummyUncomp::dummyuncomp',
-                  );
-@@ -319,6 +335,8 @@
-                  'IO::Compress::Lzop'                    => 'IO::Uncompress::UnLzop',
-                  'IO::Compress::Lzf::lzf'                => 'IO::Uncompress::UnLzf::unlzf',
-                  'IO::Compress::Lzf'                     => 'IO::Uncompress::UnLzf',
-+                 'IO::Compress::PPMd::ppmd'              => 'IO::Uncompress::UnPPMd::unppmd',
-+                 'IO::Compress::PPMd'                    => 'IO::Uncompress::UnPPMd',
-                  'IO::Compress::DummyComp::dummycomp'    => 'IO::Uncompress::DummyUncomp::dummyuncomp',
-                  'IO::Compress::DummyComp'               => 'IO::Uncompress::DummyUncomp',
-              );
-@@ -372,6 +390,8 @@
-                     'IO::Uncompress::UnLzop::unlzop'          => 'IO::Compress::Lzop',
-                     'IO::Uncompress::UnLzp'                   => 'IO::Compress::Lzf',
-                     'IO::Uncompress::UnLzf::unlzf'            => 'IO::Compress::Lzf',
-+                    'IO::Uncompress::UnPPMd'                  => 'IO::Compress::PPMd',
-+                    'IO::Uncompress::UnPPMd::unppmd'          => 'IO::Compress::PPMd',
-                     'IO::Uncompress::AnyInflate'              => 'IO::Compress::Gzip',
-                     'IO::Uncompress::AnyInflate::anyinflate'  => 'IO::Compress::Gzip',
-                     'IO::Uncompress::AnyUncompress'           => 'IO::Compress::Gzip',
-diff -urN perl-5.10.0.orig/t/lib/compress/destroy.pl perl-5.10.0/t/lib/compress/destroy.pl
---- perl-5.10.0.orig/t/lib/compress/destroy.pl	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/compress/destroy.pl	2009-12-01 11:18:49.000000000 +0100
-@@ -17,7 +17,7 @@
-     $extra = 1
-         if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
- 
--    plan tests => 7 + $extra ;
-+    plan tests => 15 + $extra ;
- 
-     use_ok('IO::File') ;
- }
-@@ -73,6 +73,43 @@
- 
-         ok anyUncompress($name) eq $hello ;
-     }
-+    
-+    {
-+        title "Testing DESTROY doesn't clobber \$! etc ";
-+
-+        my $lex = new LexFile my $name ;
-+
-+        my $out;
-+        my $result;
-+        
-+        {
-+            ok my $z = new $CompressClass($name); 
-+            $z->write("abc") ;
-+            $! = 22 ;
-+
-+            cmp_ok $!, '==', 22, '  $! is 22';
-+        }
-+        
-+        cmp_ok $!, '==', 22, "  \$! has not been changed by $CompressClass destructor";
-+
-+                
-+        {
-+                my $uncomp;
-+                ok my $x = new $UncompressClass($name, -Append => 1)  ;
-+                
-+                my $len ;
-+                1 while ($len = $x->read($result)) > 0 ;
-+                
-+                $! = 22 ;
-+
-+                cmp_ok $!, '==', 22, '  $! is 22';
-+        }    
-+           
-+        cmp_ok $!, '==', 22, "  \$! has not been changed by $UncompressClass destructor";
-+                
-+        is $result, "abc", "  Got uncompressed content ok";
-+ 
-+    }
- }
- 
- 1;
-diff -urN perl-5.10.0.orig/t/lib/compress/generic.pl perl-5.10.0/t/lib/compress/generic.pl
---- perl-5.10.0.orig/t/lib/compress/generic.pl	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/compress/generic.pl	2009-12-01 11:18:49.000000000 +0100
-@@ -47,6 +47,7 @@
-     my $Error           = getErrorRef($CompressClass);
-     my $UnError         = getErrorRef($UncompressClass);
- 
-+    if(1)
-     {
- 
-         title "Testing $CompressClass Errors";
-@@ -81,7 +82,7 @@
-         like $@, mkEvalErr("^${CompressClass}::write: offset outside string");
- 
-         eval ' $gz->syswrite("abc", 1, -4)' ;
--        like $@, mkEvalErr("^${CompressClass}::write: offset outside string");
-+        like $@, mkEvalErr("^${CompressClass}::write: offset outside string"), "write outside string";
-     }
- 
- 
-@@ -118,6 +119,7 @@
- 
-     }
- 
-+
-     {
-         title "Testing $CompressClass and $UncompressClass";
- 
-@@ -161,7 +163,6 @@
- 
- 
-             my $lex = new LexFile my $name ;
--            #my $name = "/tmp/try.lzf";
- 
-             my $hello = <<EOM ;
- hello world
-@@ -322,7 +323,6 @@
- 
-               ok $x->close, "  close" ;
-             }
--            #exit;
- 
-             is $uncomp, $hello, "  expected output" ;
-         }
-@@ -419,11 +419,11 @@
-               ok ! defined $x->fileno() ;
-               1 while $x->read($uncomp) > 0  ;
- 
--              ok $x->close ;
-+              ok $x->close, "closed" ;
-             }
- 
--            is $uncomp, $hello ;
--            ok $buffer eq $keep ;
-+            is $uncomp, $hello, "got expected uncompressed data" ;
-+            ok $buffer eq $keep, "compressed input not changed" ;
-         }
- 
-         if ($CompressClass ne 'RawDeflate')
-@@ -434,8 +434,9 @@
-             my $buffer = '';
-             {
-               my $x ;
--              ok $x = new $CompressClass(\$buffer) ;
--              ok $x->close ;
-+              $x = new $CompressClass(\$buffer);
-+              ok $x, "new $CompressClass" ;
-+              ok $x->close, "close ok" ;
-           
-             }
- 
-@@ -541,7 +542,6 @@
-             read($fh1, $rest, 5000);
-             is $x->trailingData() . $rest, $trailer ;
-             #print "# [".$x->trailingData() . "][$rest]\n" ;
--            #exit;
- 
-         }
- 
-@@ -1416,7 +1416,6 @@
-             }
-         }
- 
--
-         {
-             title "write tests - invalid data" ;
- 
diff --git a/perl-update-IO-Compress-Zlib.patch b/perl-update-IO-Compress-Zlib.patch
deleted file mode 100644
index 71a06d0..0000000
--- a/perl-update-IO-Compress-Zlib.patch
+++ /dev/null
@@ -1,5232 +0,0 @@
-IO-Compress-Zlib-2.015
-(omitting changes to private/MakeUtil.pm)
-(omitting changes to perl-5.10.0/t/lib/compress; these are in
-IO-Compress-Base 2.015 update)
-
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2009-12-01 11:02:59.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-12-01 12:10:21.000000000 +0100
-@@ -736,6 +736,7 @@
- ext/IO_Compress_Zlib/t/002any-zip.t	IO::Compress::Zlib
- ext/IO_Compress_Zlib/t/004gziphdr.t	IO::Compress::Zlib
- ext/IO_Compress_Zlib/t/005defhdr.t	IO::Compress::Zlib
-+ext/IO_Compress_Zlib/t/006zip.t	IO::Compress::Zlib
- ext/IO_Compress_Zlib/t/010examples.t	IO::Compress::Zlib
- ext/IO_Compress_Zlib/t/020isize.t	IO::Compress::Zlib
- ext/IO_Compress_Zlib/t/050interop-gzip.t	IO::Compress::Zlib
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/Changes perl-5.10.0/ext/IO_Compress_Zlib/Changes
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/Changes	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/Changes	2009-12-01 12:05:25.000000000 +0100
-@@ -1,6 +1,44 @@
- CHANGES
- -------
- 
-+  2.015 3 September 2008
-+
-+      * Makefile.PL
-+        Backout changes made in 2.014
-+
-+  2.014 2 September 2008
-+
-+      * Makefile.PL
-+        Updated to check for indirect dependencies.
-+
-+  2.012 15 July 2008
-+
-+      * No Changes
-+
-+  2.011 17 May 2008
-+
-+      * IO::Uncompress::Unzip 
-+        - Print an error message if the zip file contains a
-+          member compressed with bzip2 and IO::Uncompress::Bunzip2 is 
-+          not available.
-+        - Could not cope with mixed compression zip files. For example a
-+          zip file that contains both STORED and DEFLATED content.
-+          [RT #35573]
-+
-+  2.010 5 May 2008
-+
-+      * Fixed problem that meant Perl 5.10 could not upgrade this module.
-+        [RT #35343]
-+
-+  2.009 20 April 2008
-+
-+      * IO::Compress::Zip 
-+
-+        - Added exUnix2 option to allow storing of UID & GID.
-+        - When running on a Unix derivative the ExtAttr option now defaults
-+          to the equivalent of 0666. For all other systems the default
-+          remains 0.
-+
-   2.008 2 November 2007
- 
-       * Minor documentation changes in README
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/Makefile.PL perl-5.10.0/ext/IO_Compress_Zlib/Makefile.PL
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/Makefile.PL	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/Makefile.PL	2009-12-01 12:05:35.000000000 +0100
-@@ -3,7 +3,7 @@
- use strict ;
- require 5.004 ;
- 
--$::VERSION = '2.008' ;
-+$::VERSION = '2.015' ;
- 
- use private::MakeUtil;
- use ExtUtils::MakeMaker 5.16 ;
-@@ -51,6 +51,13 @@
- 
-     INSTALLDIRS => ($] >= 5.009 ? 'perl' : 'site'),
- 
-+    (
-+    $] >= 5.009 && ! $ENV{PERL_CORE}
-+        ? (INST_LIB    => 'blib/arch')
-+        : ()
-+    ),
-+
-+
-     ((ExtUtils::MakeMaker->VERSION() gt '6.30') ?
-         ('LICENSE'  => 'perl')         : ()),    
- 
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/README perl-5.10.0/ext/IO_Compress_Zlib/README
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/README	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/README	2009-12-01 12:05:41.000000000 +0100
-@@ -1,44 +1,30 @@
- 
-                              IO-Compress-Zlib
- 
--                             Version 2.008
-+                             Version 2.015
- 
--                             2nd November 2007
-+                            2nd September 2008
- 
--
--       Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+       Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
-           This program is free software; you can redistribute it
-            and/or modify it under the same terms as Perl itself.
- 
--
--
--
- DESCRIPTION
- -----------
- 
--
- This module provides a Perl interface to allow reading and writing of RFC
- 1950, 1951, 1952 (i.e. gzip) and zip files/buffers.
- 
--
--
--
--
- PREREQUISITES
- -------------
- 
- Before you can build IO-Compress-Zlib you need to have the following
- installed on your system:
- 
--
-     * Perl 5.004 or better. 
-     * Compress::Raw::Zlib
-     * IO::Compress::Base
- 
--
--
--
--
- BUILDING THE MODULE
- -------------------
- 
-@@ -49,8 +35,6 @@
-     make
-     make test
- 
--
--
- INSTALLATION
- ------------
- 
-@@ -58,28 +42,16 @@
- 
-     make install
- 
--
--
--
--
- TROUBLESHOOTING
- ---------------
- 
--
--
--
--
--
--
--
--
- The t/020isize Test Suite
- ------------------------
- 
- This test suite checks that IO-Compress-Zlib can cope with gzip files
- that are larger than 2^32 bytes.
- 
--By default these test are NOT run when you do a "make test". If you
-+By default these tests are NOT run when you do a "make test". If you
- really want to run them, you need to execute "make longtest".
- 
- Be warned though -- this test suite can take hours to run on a slow box.
-@@ -88,9 +60,6 @@
- run out of memory during this test. This should not be considered a bug
- in the IO-Compress-Zlib module.
- 
--
--
--
- FEEDBACK
- --------
- 
-@@ -124,9 +93,7 @@
-         If you haven't installed IO-Compress-Zlib then search IO::Compress::Gzip.pm
-         for a line like this:
- 
--          $VERSION = "2.008" ;
--
--
-+          $VERSION = "2.015" ;
- 
-  2. If you are having problems building IO-Compress-Zlib, send me a
-     complete log of what happened. Start by unpacking the IO-Compress-Zlib
-@@ -137,5 +104,4 @@
-         make
-         make test TEST_VERBOSE=1          
- 
--
- Paul Marquess <pmqs@cpan.org>
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Deflate.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Deflate.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Deflate.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Deflate.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -4,12 +4,12 @@
- use warnings;
- use bytes;
- 
--use IO::Compress::Base::Common  2.008 qw(:Status);
-+use IO::Compress::Base::Common  2.015 qw(:Status);
- 
--use Compress::Raw::Zlib  2.008 qw(Z_OK Z_FINISH MAX_WBITS) ;
-+use Compress::Raw::Zlib  2.015 qw(Z_OK Z_FINISH MAX_WBITS) ;
- our ($VERSION);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- 
- sub mkCompObject
- {
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Identity.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Identity.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Identity.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Identity.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -4,10 +4,10 @@
- use warnings;
- use bytes;
- 
--use IO::Compress::Base::Common  2.008 qw(:Status);
-+use IO::Compress::Base::Common  2.015 qw(:Status);
- our ($VERSION);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- 
- sub mkCompObject
- {
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Deflate.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Deflate.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Deflate.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Deflate.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -6,16 +6,16 @@
- 
- require Exporter ;
- 
--use IO::Compress::RawDeflate 2.008 ;
-+use IO::Compress::RawDeflate 2.015 ;
- 
--use Compress::Raw::Zlib  2.008 ;
--use IO::Compress::Zlib::Constants 2.008 ;
--use IO::Compress::Base::Common  2.008 qw(createSelfTiedObject);
-+use Compress::Raw::Zlib  2.015 ;
-+use IO::Compress::Zlib::Constants 2.015 ;
-+use IO::Compress::Base::Common  2.015 qw(createSelfTiedObject);
- 
- 
- our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $DeflateError);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- $DeflateError = '';
- 
- @ISA    = qw(Exporter IO::Compress::RawDeflate);
-@@ -166,8 +166,6 @@
- 
- =head1 NAME
- 
--
--
- IO::Compress::Deflate - Write RFC 1950 files/buffers
-  
-  
-@@ -176,7 +174,6 @@
- 
-     use IO::Compress::Deflate qw(deflate $DeflateError) ;
- 
--
-     my $status = deflate $input => $output [,OPTS] 
-         or die "deflate failed: $DeflateError\n";
- 
-@@ -218,24 +215,12 @@
- 
- =head1 DESCRIPTION
- 
--
- This module provides a Perl interface that allows writing compressed
- data to files or buffer as defined in RFC 1950.
- 
--
--
--
--
--
--
--
--
--
--
- For reading RFC 1950 files/buffers, see the companion module 
- L<IO::Uncompress::Inflate|IO::Uncompress::Inflate>.
- 
--
- =head1 Functional Interface
- 
- A top-level function, C<deflate>, is provided to carry out
-@@ -248,14 +233,10 @@
-     deflate $input => $output [,OPTS] 
-         or die "deflate failed: $DeflateError\n";
- 
--
--
- The functional interface needs Perl5.005 or better.
- 
--
- =head2 deflate $input => $output [, OPTS]
- 
--
- C<deflate> expects at least two parameters, C<$input> and C<$output>.
- 
- =head3 The C<$input> parameter
-@@ -294,8 +275,6 @@
- The complete array will be walked to ensure that it only
- contains valid filenames before any data is compressed.
- 
--
--
- =item An Input FileGlob string
- 
- If C<$input> is a string that is delimited by the characters "<" and ">"
-@@ -306,13 +285,10 @@
- 
- See L<File::GlobMapper|File::GlobMapper> for more details.
- 
--
- =back
- 
- If the C<$input> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head3 The C<$output> parameter
- 
- The parameter C<$output> is used to control the destination of the
-@@ -332,14 +308,11 @@
- will be written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the compressed data will be
- stored in C<$$output>.
- 
--
--
- =item An Array Reference
- 
- If C<$output> is an array reference, the compressed data will be
-@@ -358,21 +331,12 @@
- 
- If the C<$output> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head2 Notes
- 
--
--
- When C<$input> maps to multiple files/buffers and C<$output> is a single
- file/buffer the input files/buffers will be stored
- in C<$output> as a concatenated series of compressed data streams.
- 
--
--
--
--
--
- =head2 Optional Parameters
- 
- Unless specified below, the optional parameters for C<deflate>,
-@@ -392,27 +356,18 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< BinModeIn => 0|1 >>
- 
- When reading from a file or filehandle, set C<binmode> before reading.
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< Append => 0|1 >>
- 
- TODO
- 
--
--
- =back
- 
--
--
- =head2 Examples
- 
- To read the contents of the file C<file1.txt> and write the compressed
-@@ -426,7 +381,6 @@
-     deflate $input => "$input.1950"
-         or die "deflate failed: $DeflateError\n";
- 
--
- To read from an existing Perl filehandle, C<$input>, and write the
- compressed data to a buffer, C<$buffer>.
- 
-@@ -464,7 +418,6 @@
-             or die "Error compressing '$input': $DeflateError\n";
-     }
- 
--
- =head1 OO Interface
- 
- =head2 Constructor
-@@ -504,7 +457,6 @@
- written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the compressed data will be stored
-@@ -560,23 +512,15 @@
- 
- This parameter defaults to 0.
- 
--
--
--
--
- =item C<< Merge => 0|1 >>
- 
- This option is used to compress input data and append it to an existing
- compressed data stream in C<$output>. The end result is a single compressed
- data stream stored in C<$output>. 
- 
--
--
- It is a fatal error to attempt to use this option when C<$output> is not an
- RFC 1950 data stream.
- 
--
--
- There are a number of other limitations with the C<Merge> option:
- 
- =over 5 
-@@ -593,11 +537,8 @@
- 
- =back
- 
--
- This parameter defaults to 0.
- 
--
--
- =item -Level 
- 
- Defines the compression level used by zlib. The value should either be
-@@ -630,19 +571,10 @@
- 
- The default is Z_DEFAULT_STRATEGY.
- 
--
--
--
--
--
- =item C<< Strict => 0|1 >>
- 
--
--
- This is a placeholder option.
- 
--
--
- =back
- 
- =head2 Examples
-@@ -704,14 +636,11 @@
- 
- Usage is
- 
--
-     $z->flush;
-     $z->flush($flush_type);
- 
--
- Flushes any pending compressed data to the output file/buffer.
- 
--
- This method takes an optional parameter, C<$flush_type>, that controls
- how the flushing will be carried out. By default the C<$flush_type>
- used is C<Z_FINISH>. Other valid values for C<$flush_type> are
-@@ -721,10 +650,8 @@
- can seriously degrade the level of compression achieved. See the C<zlib>
- documentation for details.
- 
--
- Returns true on success.
- 
--
- =head2 tell
- 
- Usage is
-@@ -741,28 +668,19 @@
-     $z->eof();
-     eof($z);
- 
--
--
- Returns true if the C<close> method has been called.
- 
--
--
- =head2 seek
- 
-     $z->seek($position, $whence);
-     seek($z, $position, $whence);
- 
--
--
--
- Provides a sub-set of the C<seek> functionality, with the restriction
- that it is only legal to seek forward in the output file/buffer.
- It is a fatal error to attempt to seek backward.
- 
- Empty parts of the file/buffer will have NULL (0x00) bytes written to them.
- 
--
--
- The C<$whence> parameter takes one the usual values, namely SEEK_SET,
- SEEK_CUR or SEEK_END.
- 
-@@ -804,33 +722,27 @@
-     $z->input_line_number()
-     $z->input_line_number(EXPR)
- 
--
- This method always returns C<undef> when compressing. 
- 
--
--
- =head2 fileno
- 
-     $z->fileno()
-     fileno($z)
- 
--If the C<$z> object is associated with a file or a filehandle, this method
--will return the underlying file descriptor.
-+If the C<$z> object is associated with a file or a filehandle, C<fileno>
-+will return the underlying file descriptor. Once the C<close> method is
-+called C<fileno> will return C<undef>.
- 
--If the C<$z> object is is associated with a buffer, this method will
--return undef.
-+If the C<$z> object is is associated with a buffer, this method will return
-+C<undef>.
- 
- =head2 close
- 
-     $z->close() ;
-     close $z ;
- 
--
--
- Flushes any pending compressed data and then closes the output file/buffer. 
- 
--
--
- For most versions of Perl this method will be automatically invoked if
- the IO::Compress::Deflate object is destroyed (either explicitly or by the
- variable with the reference to the object going out of scope). The
-@@ -849,9 +761,6 @@
- object was created, and the object is associated with a file, the
- underlying file will also be closed.
- 
--
--
--
- =head2 newStream([OPTS])
- 
- Usage is
-@@ -865,7 +774,6 @@
- 
- See the L</"Constructor Options"> section for more details.
- 
--
- =head2 deflateParams
- 
- Usage is
-@@ -874,20 +782,15 @@
- 
- TODO
- 
--
- =head1 Importing 
- 
--
- A number of symbolic constants are required by some methods in 
- C<IO::Compress::Deflate>. None are imported by default.
- 
--
--
- =over 5
- 
- =item :all
- 
--
- Imports C<deflate>, C<$DeflateError> and all symbolic
- constants that can be used by C<IO::Compress::Deflate>. Same as doing this
- 
-@@ -897,10 +800,8 @@
- 
- Import all symbolic constants. Same as doing this
- 
--
-     use IO::Compress::Deflate qw(:flush :level :strategy) ;
- 
--
- =item :flush
- 
- These symbolic constants are used by the C<flush> method.
-@@ -921,7 +822,6 @@
-     Z_BEST_COMPRESSION
-     Z_DEFAULT_COMPRESSION
- 
--
- =item :strategy
- 
- These symbolic constants are used by the C<Strategy> option in the constructor.
-@@ -937,21 +837,17 @@
- 
- =back
- 
--For 
--
- =head1 EXAMPLES
- 
--TODO
--
--
--
--
--
--
-+=head2 Apache::GZip Revisited
- 
-+See L<IO::Compress::Zlib::FAQ|IO::Compress::Zlib::FAQ/"Apache::GZip Revisited">
- 
-+    
- 
-+=head2 Working with Net::FTP
- 
-+See L<IO::Compress::Zlib::FAQ|IO::Compress::Zlib::FAQ/"Compressed files and Net::FTP">
- 
- =head1 SEE ALSO
- 
-@@ -963,7 +859,6 @@
- L<Archive::Tar|Archive::Tar>,
- L<IO::Zlib|IO::Zlib>
- 
--
- For RFC 1950, 1951 and 1952 see 
- F<http://www.faqs.org/rfcs/rfc1950.html>,
- F<http://www.faqs.org/rfcs/rfc1951.html> and
-@@ -977,24 +872,18 @@
- 
- The primary site for gzip is F<http://www.gzip.org>.
- 
--
--
--
- =head1 AUTHOR
- 
- This module was written by Paul Marquess, F<pmqs@cpan.org>. 
- 
--
--
- =head1 MODIFICATION HISTORY
- 
- See the Changes file.
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
- 
--
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip/Constants.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip/Constants.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip/Constants.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip/Constants.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -9,7 +9,7 @@
- our ($VERSION, @ISA, @EXPORT, %GZIP_OS_Names);
- our ($GZIP_FNAME_INVALID_CHAR_RE, $GZIP_FCOMMENT_INVALID_CHAR_RE);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- 
- @ISA = qw(Exporter);
- 
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -8,12 +8,12 @@
- use bytes;
- 
- 
--use IO::Compress::RawDeflate 2.008 ;
-+use IO::Compress::RawDeflate 2.015 ;
- 
--use Compress::Raw::Zlib  2.008 ;
--use IO::Compress::Base::Common  2.008 qw(:Status :Parse createSelfTiedObject);
--use IO::Compress::Gzip::Constants 2.008 ;
--use IO::Compress::Zlib::Extra 2.008 ;
-+use Compress::Raw::Zlib  2.015 ;
-+use IO::Compress::Base::Common  2.015 qw(:Status :Parse createSelfTiedObject);
-+use IO::Compress::Gzip::Constants 2.015 ;
-+use IO::Compress::Zlib::Extra 2.015 ;
- 
- BEGIN
- {
-@@ -27,7 +27,7 @@
- 
- our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $GzipError);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- $GzipError = '' ;
- 
- @ISA    = qw(Exporter IO::Compress::RawDeflate);
-@@ -274,8 +274,6 @@
- 
- =head1 NAME
- 
--
--
- IO::Compress::Gzip - Write RFC 1952 files/buffers
-  
-  
-@@ -284,7 +282,6 @@
- 
-     use IO::Compress::Gzip qw(gzip $GzipError) ;
- 
--
-     my $status = gzip $input => $output [,OPTS] 
-         or die "gzip failed: $GzipError\n";
- 
-@@ -326,27 +323,15 @@
- 
- =head1 DESCRIPTION
- 
--
- This module provides a Perl interface that allows writing compressed
- data to files or buffer as defined in RFC 1952.
- 
--
--
--
--
- All the gzip headers defined in RFC 1952 can be created using
- this module.
- 
--
--
--
--
--
--
- For reading RFC 1952 files/buffers, see the companion module 
- L<IO::Uncompress::Gunzip|IO::Uncompress::Gunzip>.
- 
--
- =head1 Functional Interface
- 
- A top-level function, C<gzip>, is provided to carry out
-@@ -359,14 +344,10 @@
-     gzip $input => $output [,OPTS] 
-         or die "gzip failed: $GzipError\n";
- 
--
--
- The functional interface needs Perl5.005 or better.
- 
--
- =head2 gzip $input => $output [, OPTS]
- 
--
- C<gzip> expects at least two parameters, C<$input> and C<$output>.
- 
- =head3 The C<$input> parameter
-@@ -405,8 +386,6 @@
- The complete array will be walked to ensure that it only
- contains valid filenames before any data is compressed.
- 
--
--
- =item An Input FileGlob string
- 
- If C<$input> is a string that is delimited by the characters "<" and ">"
-@@ -417,12 +396,10 @@
- 
- See L<File::GlobMapper|File::GlobMapper> for more details.
- 
--
- =back
- 
- If the C<$input> parameter is any other type, C<undef> will be returned.
- 
--
- In addition, if C<$input> is a simple filename, the default values for
- the C<Name> and C<Time> options will be sourced from that file.
- 
-@@ -430,8 +407,6 @@
- explicitly setting the C<Name> and C<Time> options or by setting the
- C<Minimal> parameter.
- 
--
--
- =head3 The C<$output> parameter
- 
- The parameter C<$output> is used to control the destination of the
-@@ -451,14 +426,11 @@
- will be written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the compressed data will be
- stored in C<$$output>.
- 
--
--
- =item An Array Reference
- 
- If C<$output> is an array reference, the compressed data will be
-@@ -477,21 +449,12 @@
- 
- If the C<$output> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head2 Notes
- 
--
--
- When C<$input> maps to multiple files/buffers and C<$output> is a single
- file/buffer the input files/buffers will be stored
- in C<$output> as a concatenated series of compressed data streams.
- 
--
--
--
--
--
- =head2 Optional Parameters
- 
- Unless specified below, the optional parameters for C<gzip>,
-@@ -511,27 +474,18 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< BinModeIn => 0|1 >>
- 
- When reading from a file or filehandle, set C<binmode> before reading.
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< Append => 0|1 >>
- 
- TODO
- 
--
--
- =back
- 
--
--
- =head2 Examples
- 
- To read the contents of the file C<file1.txt> and write the compressed
-@@ -545,7 +499,6 @@
-     gzip $input => "$input.gz"
-         or die "gzip failed: $GzipError\n";
- 
--
- To read from an existing Perl filehandle, C<$input>, and write the
- compressed data to a buffer, C<$buffer>.
- 
-@@ -583,7 +536,6 @@
-             or die "Error compressing '$input': $GzipError\n";
-     }
- 
--
- =head1 OO Interface
- 
- =head2 Constructor
-@@ -623,7 +575,6 @@
- written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the compressed data will be stored
-@@ -679,23 +630,15 @@
- 
- This parameter defaults to 0.
- 
--
--
--
--
- =item C<< Merge => 0|1 >>
- 
- This option is used to compress input data and append it to an existing
- compressed data stream in C<$output>. The end result is a single compressed
- data stream stored in C<$output>. 
- 
--
--
- It is a fatal error to attempt to use this option when C<$output> is not an
- RFC 1952 data stream.
- 
--
--
- There are a number of other limitations with the C<Merge> option:
- 
- =over 5 
-@@ -712,11 +655,8 @@
- 
- =back
- 
--
- This parameter defaults to 0.
- 
--
--
- =item -Level 
- 
- Defines the compression level used by zlib. The value should either be
-@@ -749,11 +689,6 @@
- 
- The default is Z_DEFAULT_STRATEGY.
- 
--
--
--
--
--
- =item C<< Minimal => 0|1 >>
- 
- If specified, this option will force the creation of the smallest possible
-@@ -881,12 +816,8 @@
- If C<< Level => Z_BEST_COMPRESSION >> has been specified then XFL is set to 4.
- Otherwise XFL is set to 0.
- 
--
--
- =item C<< Strict => 0|1 >>
- 
--
--
- C<Strict> will optionally police the values supplied with other options
- to ensure they are compliant with RFC1952.
- 
-@@ -956,8 +887,6 @@
- 
- =back
- 
--
--
- =back
- 
- =head2 Examples
-@@ -1019,14 +948,11 @@
- 
- Usage is
- 
--
-     $z->flush;
-     $z->flush($flush_type);
- 
--
- Flushes any pending compressed data to the output file/buffer.
- 
--
- This method takes an optional parameter, C<$flush_type>, that controls
- how the flushing will be carried out. By default the C<$flush_type>
- used is C<Z_FINISH>. Other valid values for C<$flush_type> are
-@@ -1036,10 +962,8 @@
- can seriously degrade the level of compression achieved. See the C<zlib>
- documentation for details.
- 
--
- Returns true on success.
- 
--
- =head2 tell
- 
- Usage is
-@@ -1056,28 +980,19 @@
-     $z->eof();
-     eof($z);
- 
--
--
- Returns true if the C<close> method has been called.
- 
--
--
- =head2 seek
- 
-     $z->seek($position, $whence);
-     seek($z, $position, $whence);
- 
--
--
--
- Provides a sub-set of the C<seek> functionality, with the restriction
- that it is only legal to seek forward in the output file/buffer.
- It is a fatal error to attempt to seek backward.
- 
- Empty parts of the file/buffer will have NULL (0x00) bytes written to them.
- 
--
--
- The C<$whence> parameter takes one the usual values, namely SEEK_SET,
- SEEK_CUR or SEEK_END.
- 
-@@ -1119,33 +1034,27 @@
-     $z->input_line_number()
-     $z->input_line_number(EXPR)
- 
--
- This method always returns C<undef> when compressing. 
- 
--
--
- =head2 fileno
- 
-     $z->fileno()
-     fileno($z)
- 
--If the C<$z> object is associated with a file or a filehandle, this method
--will return the underlying file descriptor.
-+If the C<$z> object is associated with a file or a filehandle, C<fileno>
-+will return the underlying file descriptor. Once the C<close> method is
-+called C<fileno> will return C<undef>.
- 
--If the C<$z> object is is associated with a buffer, this method will
--return undef.
-+If the C<$z> object is is associated with a buffer, this method will return
-+C<undef>.
- 
- =head2 close
- 
-     $z->close() ;
-     close $z ;
- 
--
--
- Flushes any pending compressed data and then closes the output file/buffer. 
- 
--
--
- For most versions of Perl this method will be automatically invoked if
- the IO::Compress::Gzip object is destroyed (either explicitly or by the
- variable with the reference to the object going out of scope). The
-@@ -1164,9 +1073,6 @@
- object was created, and the object is associated with a file, the
- underlying file will also be closed.
- 
--
--
--
- =head2 newStream([OPTS])
- 
- Usage is
-@@ -1180,7 +1086,6 @@
- 
- See the L</"Constructor Options"> section for more details.
- 
--
- =head2 deflateParams
- 
- Usage is
-@@ -1189,20 +1094,15 @@
- 
- TODO
- 
--
- =head1 Importing 
- 
--
- A number of symbolic constants are required by some methods in 
- C<IO::Compress::Gzip>. None are imported by default.
- 
--
--
- =over 5
- 
- =item :all
- 
--
- Imports C<gzip>, C<$GzipError> and all symbolic
- constants that can be used by C<IO::Compress::Gzip>. Same as doing this
- 
-@@ -1212,10 +1112,8 @@
- 
- Import all symbolic constants. Same as doing this
- 
--
-     use IO::Compress::Gzip qw(:flush :level :strategy) ;
- 
--
- =item :flush
- 
- These symbolic constants are used by the C<flush> method.
-@@ -1236,7 +1134,6 @@
-     Z_BEST_COMPRESSION
-     Z_DEFAULT_COMPRESSION
- 
--
- =item :strategy
- 
- These symbolic constants are used by the C<Strategy> option in the constructor.
-@@ -1252,21 +1149,17 @@
- 
- =back
- 
--For 
--
- =head1 EXAMPLES
- 
--TODO
--
--
--
--
--
--
-+=head2 Apache::GZip Revisited
- 
-+See L<IO::Compress::Zlib::FAQ|IO::Compress::Zlib::FAQ/"Apache::GZip Revisited">
- 
-+    
- 
-+=head2 Working with Net::FTP
- 
-+See L<IO::Compress::Zlib::FAQ|IO::Compress::Zlib::FAQ/"Compressed files and Net::FTP">
- 
- =head1 SEE ALSO
- 
-@@ -1278,7 +1171,6 @@
- L<Archive::Tar|Archive::Tar>,
- L<IO::Zlib|IO::Zlib>
- 
--
- For RFC 1950, 1951 and 1952 see 
- F<http://www.faqs.org/rfcs/rfc1950.html>,
- F<http://www.faqs.org/rfcs/rfc1951.html> and
-@@ -1292,24 +1184,18 @@
- 
- The primary site for gzip is F<http://www.gzip.org>.
- 
--
--
--
- =head1 AUTHOR
- 
- This module was written by Paul Marquess, F<pmqs@cpan.org>. 
- 
--
--
- =head1 MODIFICATION HISTORY
- 
- See the Changes file.
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
- 
--
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/RawDeflate.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/RawDeflate.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/RawDeflate.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/RawDeflate.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -7,16 +7,16 @@
- use bytes;
- 
- 
--use IO::Compress::Base 2.008 ;
--use IO::Compress::Base::Common  2.008 qw(:Status createSelfTiedObject);
--use IO::Compress::Adapter::Deflate  2.008 ;
-+use IO::Compress::Base 2.015 ;
-+use IO::Compress::Base::Common  2.015 qw(:Status createSelfTiedObject);
-+use IO::Compress::Adapter::Deflate  2.015 ;
- 
- require Exporter ;
- 
- 
- our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- $RawDeflateError = '';
- 
- @ISA = qw(Exporter IO::Compress::Base);
-@@ -92,7 +92,6 @@
- sub mkComp
- {
-     my $self = shift ;
--    my $class = shift ;
-     my $got = shift ;
- 
-     my ($obj, $errstr, $errno) = IO::Compress::Adapter::Deflate::mkCompObject(
-@@ -143,8 +142,8 @@
- {
-     my $self = shift ;
- 
--    use IO::Compress::Base::Common  2.008 qw(:Parse);
--    use Compress::Raw::Zlib  2.008 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
-+    use IO::Compress::Base::Common  2.015 qw(:Parse);
-+    use Compress::Raw::Zlib  2.015 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
- 
-     
-     return (
-@@ -251,8 +250,6 @@
- 
- =head1 NAME
- 
--
--
- IO::Compress::RawDeflate - Write RFC 1951 files/buffers
-  
-  
-@@ -261,7 +258,6 @@
- 
-     use IO::Compress::RawDeflate qw(rawdeflate $RawDeflateError) ;
- 
--
-     my $status = rawdeflate $input => $output [,OPTS] 
-         or die "rawdeflate failed: $RawDeflateError\n";
- 
-@@ -303,27 +299,15 @@
- 
- =head1 DESCRIPTION
- 
--
- This module provides a Perl interface that allows writing compressed
- data to files or buffer as defined in RFC 1951.
- 
--
--
--
--
--
--
- Note that RFC 1951 data is not a good choice of compression format
- to use in isolation, especially if you want to auto-detect it.
- 
--
--
--
--
- For reading RFC 1951 files/buffers, see the companion module 
- L<IO::Uncompress::RawInflate|IO::Uncompress::RawInflate>.
- 
--
- =head1 Functional Interface
- 
- A top-level function, C<rawdeflate>, is provided to carry out
-@@ -336,14 +320,10 @@
-     rawdeflate $input => $output [,OPTS] 
-         or die "rawdeflate failed: $RawDeflateError\n";
- 
--
--
- The functional interface needs Perl5.005 or better.
- 
--
- =head2 rawdeflate $input => $output [, OPTS]
- 
--
- C<rawdeflate> expects at least two parameters, C<$input> and C<$output>.
- 
- =head3 The C<$input> parameter
-@@ -382,8 +362,6 @@
- The complete array will be walked to ensure that it only
- contains valid filenames before any data is compressed.
- 
--
--
- =item An Input FileGlob string
- 
- If C<$input> is a string that is delimited by the characters "<" and ">"
-@@ -394,13 +372,10 @@
- 
- See L<File::GlobMapper|File::GlobMapper> for more details.
- 
--
- =back
- 
- If the C<$input> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head3 The C<$output> parameter
- 
- The parameter C<$output> is used to control the destination of the
-@@ -420,14 +395,11 @@
- will be written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the compressed data will be
- stored in C<$$output>.
- 
--
--
- =item An Array Reference
- 
- If C<$output> is an array reference, the compressed data will be
-@@ -446,21 +418,12 @@
- 
- If the C<$output> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head2 Notes
- 
--
--
- When C<$input> maps to multiple files/buffers and C<$output> is a single
- file/buffer the input files/buffers will be stored
- in C<$output> as a concatenated series of compressed data streams.
- 
--
--
--
--
--
- =head2 Optional Parameters
- 
- Unless specified below, the optional parameters for C<rawdeflate>,
-@@ -480,27 +443,18 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< BinModeIn => 0|1 >>
- 
- When reading from a file or filehandle, set C<binmode> before reading.
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< Append => 0|1 >>
- 
- TODO
- 
--
--
- =back
- 
--
--
- =head2 Examples
- 
- To read the contents of the file C<file1.txt> and write the compressed
-@@ -514,7 +468,6 @@
-     rawdeflate $input => "$input.1951"
-         or die "rawdeflate failed: $RawDeflateError\n";
- 
--
- To read from an existing Perl filehandle, C<$input>, and write the
- compressed data to a buffer, C<$buffer>.
- 
-@@ -552,7 +505,6 @@
-             or die "Error compressing '$input': $RawDeflateError\n";
-     }
- 
--
- =head1 OO Interface
- 
- =head2 Constructor
-@@ -592,7 +544,6 @@
- written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the compressed data will be stored
-@@ -648,23 +599,15 @@
- 
- This parameter defaults to 0.
- 
--
--
--
--
- =item C<< Merge => 0|1 >>
- 
- This option is used to compress input data and append it to an existing
- compressed data stream in C<$output>. The end result is a single compressed
- data stream stored in C<$output>. 
- 
--
--
- It is a fatal error to attempt to use this option when C<$output> is not an
- RFC 1951 data stream.
- 
--
--
- There are a number of other limitations with the C<Merge> option:
- 
- =over 5 
-@@ -681,11 +624,8 @@
- 
- =back
- 
--
- This parameter defaults to 0.
- 
--
--
- =item -Level 
- 
- Defines the compression level used by zlib. The value should either be
-@@ -718,19 +658,10 @@
- 
- The default is Z_DEFAULT_STRATEGY.
- 
--
--
--
--
--
- =item C<< Strict => 0|1 >>
- 
--
--
- This is a placeholder option.
- 
--
--
- =back
- 
- =head2 Examples
-@@ -792,14 +723,11 @@
- 
- Usage is
- 
--
-     $z->flush;
-     $z->flush($flush_type);
- 
--
- Flushes any pending compressed data to the output file/buffer.
- 
--
- This method takes an optional parameter, C<$flush_type>, that controls
- how the flushing will be carried out. By default the C<$flush_type>
- used is C<Z_FINISH>. Other valid values for C<$flush_type> are
-@@ -809,10 +737,8 @@
- can seriously degrade the level of compression achieved. See the C<zlib>
- documentation for details.
- 
--
- Returns true on success.
- 
--
- =head2 tell
- 
- Usage is
-@@ -829,28 +755,19 @@
-     $z->eof();
-     eof($z);
- 
--
--
- Returns true if the C<close> method has been called.
- 
--
--
- =head2 seek
- 
-     $z->seek($position, $whence);
-     seek($z, $position, $whence);
- 
--
--
--
- Provides a sub-set of the C<seek> functionality, with the restriction
- that it is only legal to seek forward in the output file/buffer.
- It is a fatal error to attempt to seek backward.
- 
- Empty parts of the file/buffer will have NULL (0x00) bytes written to them.
- 
--
--
- The C<$whence> parameter takes one the usual values, namely SEEK_SET,
- SEEK_CUR or SEEK_END.
- 
-@@ -892,33 +809,27 @@
-     $z->input_line_number()
-     $z->input_line_number(EXPR)
- 
--
- This method always returns C<undef> when compressing. 
- 
--
--
- =head2 fileno
- 
-     $z->fileno()
-     fileno($z)
- 
--If the C<$z> object is associated with a file or a filehandle, this method
--will return the underlying file descriptor.
-+If the C<$z> object is associated with a file or a filehandle, C<fileno>
-+will return the underlying file descriptor. Once the C<close> method is
-+called C<fileno> will return C<undef>.
- 
--If the C<$z> object is is associated with a buffer, this method will
--return undef.
-+If the C<$z> object is is associated with a buffer, this method will return
-+C<undef>.
- 
- =head2 close
- 
-     $z->close() ;
-     close $z ;
- 
--
--
- Flushes any pending compressed data and then closes the output file/buffer. 
- 
--
--
- For most versions of Perl this method will be automatically invoked if
- the IO::Compress::RawDeflate object is destroyed (either explicitly or by the
- variable with the reference to the object going out of scope). The
-@@ -937,9 +848,6 @@
- object was created, and the object is associated with a file, the
- underlying file will also be closed.
- 
--
--
--
- =head2 newStream([OPTS])
- 
- Usage is
-@@ -953,7 +861,6 @@
- 
- See the L</"Constructor Options"> section for more details.
- 
--
- =head2 deflateParams
- 
- Usage is
-@@ -962,20 +869,15 @@
- 
- TODO
- 
--
- =head1 Importing 
- 
--
- A number of symbolic constants are required by some methods in 
- C<IO::Compress::RawDeflate>. None are imported by default.
- 
--
--
- =over 5
- 
- =item :all
- 
--
- Imports C<rawdeflate>, C<$RawDeflateError> and all symbolic
- constants that can be used by C<IO::Compress::RawDeflate>. Same as doing this
- 
-@@ -985,10 +887,8 @@
- 
- Import all symbolic constants. Same as doing this
- 
--
-     use IO::Compress::RawDeflate qw(:flush :level :strategy) ;
- 
--
- =item :flush
- 
- These symbolic constants are used by the C<flush> method.
-@@ -1009,7 +909,6 @@
-     Z_BEST_COMPRESSION
-     Z_DEFAULT_COMPRESSION
- 
--
- =item :strategy
- 
- These symbolic constants are used by the C<Strategy> option in the constructor.
-@@ -1025,21 +924,17 @@
- 
- =back
- 
--For 
--
- =head1 EXAMPLES
- 
--TODO
--
--
--
--
--
--
-+=head2 Apache::GZip Revisited
- 
-+See L<IO::Compress::Zlib::FAQ|IO::Compress::Zlib::FAQ/"Apache::GZip Revisited">
- 
-+    
- 
-+=head2 Working with Net::FTP
- 
-+See L<IO::Compress::Zlib::FAQ|IO::Compress::Zlib::FAQ/"Compressed files and Net::FTP">
- 
- =head1 SEE ALSO
- 
-@@ -1051,7 +946,6 @@
- L<Archive::Tar|Archive::Tar>,
- L<IO::Zlib|IO::Zlib>
- 
--
- For RFC 1950, 1951 and 1952 see 
- F<http://www.faqs.org/rfcs/rfc1950.html>,
- F<http://www.faqs.org/rfcs/rfc1951.html> and
-@@ -1065,24 +959,18 @@
- 
- The primary site for gzip is F<http://www.gzip.org>.
- 
--
--
--
- =head1 AUTHOR
- 
- This module was written by Paul Marquess, F<pmqs@cpan.org>. 
- 
--
--
- =head1 MODIFICATION HISTORY
- 
- See the Changes file.
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
- 
--
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Zip/Constants.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Zip/Constants.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Zip/Constants.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Zip/Constants.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -7,7 +7,7 @@
- 
- our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- 
- @ISA = qw(Exporter);
- 
-@@ -17,6 +17,7 @@
-     ZIP_CM_DEFLATE
-     ZIP_CM_BZIP2
-     ZIP_CM_LZMA
-+    ZIP_CM_PPMD
-     
-     ZIP_LOCAL_HDR_SIG
-     ZIP_DATA_HDR_SIG
-@@ -32,6 +33,7 @@
-     ZIP_GP_FLAG_PATCHED_MASK
-     ZIP_GP_FLAG_STRONG_ENCRYPTED_MASK
-     ZIP_GP_FLAG_LZMA_EOS_PRESENT
-+    ZIP_GP_FLAG_LANGUAGE_ENCODING
- 
-     ZIP_EXTRA_ID_ZIP64
-     ZIP_EXTRA_ID_EXT_TIMESTAMP
-@@ -52,13 +54,15 @@
- use constant ZIP_CM_DEFLATE                    => 8 ;
- use constant ZIP_CM_BZIP2                      => 12 ;
- use constant ZIP_CM_LZMA                       => 14 ; # Not Supported yet
-+use constant ZIP_CM_PPMD                       => 98 ; # Not Supported yet
- 
- # General Purpose Flag
--use constant ZIP_GP_FLAG_ENCRYPTED_MASK        => 1 ;
--use constant ZIP_GP_FLAG_STREAMING_MASK        => 8 ;
--use constant ZIP_GP_FLAG_PATCHED_MASK          => 32 ;
--use constant ZIP_GP_FLAG_STRONG_ENCRYPTED_MASK => 64 ;
--use constant ZIP_GP_FLAG_LZMA_EOS_PRESENT      => 2 ;
-+use constant ZIP_GP_FLAG_ENCRYPTED_MASK        => (1 << 0) ;
-+use constant ZIP_GP_FLAG_STREAMING_MASK        => (1 << 3) ;
-+use constant ZIP_GP_FLAG_PATCHED_MASK          => (1 << 5) ;
-+use constant ZIP_GP_FLAG_STRONG_ENCRYPTED_MASK => (1 << 6) ;
-+use constant ZIP_GP_FLAG_LZMA_EOS_PRESENT      => (1 << 1) ;
-+use constant ZIP_GP_FLAG_LANGUAGE_ENCODING     => (1 << 11) ;
- 
- # Internal File Attributes
- use constant ZIP_IFA_TEXT_MASK                 => 1;
-@@ -80,6 +84,8 @@
- use constant ZIP_EXTRA_ID_ZIP64                => pack "v", 1;
- use constant ZIP_EXTRA_ID_EXT_TIMESTAMP        => "UT";
- use constant ZIP_EXTRA_ID_INFO_ZIP_UNIX2       => "Ux";
-+use constant ZIP_EXTRA_ID_INFO_ZIP_UNIXn       => "ux";
-+use constant ZIP_EXTRA_ID_JAVA_EXE             => pack "v", 0xCAFE;
- 
- use constant ZIP64_MIN_VERSION                 => 45;
- 
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Zip.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Zip.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Zip.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Zip.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -4,21 +4,21 @@
- use warnings;
- use bytes;
- 
--use IO::Compress::Base::Common  2.008 qw(:Status createSelfTiedObject);
--use IO::Compress::RawDeflate 2.008 ;
--use IO::Compress::Adapter::Deflate 2.008 ;
--use IO::Compress::Adapter::Identity 2.008 ;
--use IO::Compress::Zlib::Extra 2.008 ;
--use IO::Compress::Zip::Constants 2.008 ;
-+use IO::Compress::Base::Common  2.015 qw(:Status createSelfTiedObject);
-+use IO::Compress::RawDeflate 2.015 ;
-+use IO::Compress::Adapter::Deflate 2.015 ;
-+use IO::Compress::Adapter::Identity 2.015 ;
-+use IO::Compress::Zlib::Extra 2.015 ;
-+use IO::Compress::Zip::Constants 2.015 ;
- 
- 
--use Compress::Raw::Zlib  2.008 qw(crc32) ;
-+use Compress::Raw::Zlib  2.015 qw(crc32) ;
- BEGIN
- {
-     eval { require IO::Compress::Adapter::Bzip2 ; 
--           import  IO::Compress::Adapter::Bzip2 2.008 ; 
-+           import  IO::Compress::Adapter::Bzip2 2.015 ; 
-            require IO::Compress::Bzip2 ; 
--           import  IO::Compress::Bzip2 2.008 ; 
-+           import  IO::Compress::Bzip2 2.015 ; 
-          } ;
- }
- 
-@@ -27,7 +27,7 @@
- 
- our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $ZipError);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- $ZipError = '';
- 
- @ISA = qw(Exporter IO::Compress::RawDeflate);
-@@ -57,7 +57,6 @@
- sub mkComp
- {
-     my $self = shift ;
--    my $class = shift ;
-     my $got = shift ;
- 
-     my ($obj, $errstr, $errno) ;
-@@ -141,6 +140,10 @@
-     my $empty = 0;
-     my $osCode = $param->value('OS_Code') ;
-     my $extFileAttr = 0 ;
-+    
-+    # This code assumes Unix.
-+    $extFileAttr = 0666 << 16 
-+        if $osCode == ZIP_OS_CODE_UNIX ;
- 
-     if (*$self->{ZipData}{Zip64}) {
-         $empty = 0xFFFF;
-@@ -172,10 +175,6 @@
-             $ctlExtra .= mkUnix2Extra();
-         }
- 
--        # TODO - this code assumes Unix.
--        #$extFileAttr = 0666 << 16 
--        #    if $osCode == ZIP_OS_CODE_UNIX ;
--
-         $extFileAttr = $param->value('ExtAttr') 
-             if defined $param->value('ExtAttr') ;
- 
-@@ -392,6 +391,18 @@
-         $got->value("ATime", $timeRef->[0]);
-         $got->value("CTime", $timeRef->[2]);
-     }
-+    
-+    # Unix2 Extended Attribute
-+    if (! $got->parsed('exUnix2') ) {
-+        my $timeRef = $got->value('exUnix2');
-+        if ( defined $timeRef) {
-+            return $self->saveErrorString(undef, "exUnix2 not a 2-element array ref")   
-+                if ref $timeRef ne 'ARRAY' || @$timeRef != 2;
-+        }
-+
-+        $got->value("UID", $timeRef->[0]);
-+        $got->value("GID", $timeRef->[1]);
-+    }
- 
-     *$self->{ZipData}{Zip64} = $got->value('Zip64');
-     *$self->{ZipData}{Stream} = $got->value('Stream');
-@@ -441,8 +452,8 @@
- {
-     my $self = shift ;
- 
--    use IO::Compress::Base::Common  2.008 qw(:Parse);
--    use Compress::Raw::Zlib  2.008 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
-+    use IO::Compress::Base::Common  2.015 qw(:Parse);
-+    use Compress::Raw::Zlib  2.015 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
- 
-     my @Bzip2 = ();
-     
-@@ -465,6 +476,7 @@
-             'Name'      => [0, 1, Parse_any,       ''],
-             'Time'      => [0, 1, Parse_any,       undef],
-             'exTime'    => [0, 1, Parse_any,       undef],
-+            'exUnix2'   => [0, 1, Parse_any,       undef], 
-             'ExtAttr'   => [0, 1, Parse_any,       0],
-             'OS_Code'   => [0, 1, Parse_unsigned,  $Compress::Raw::Zlib::gzip_os_code],
-             
-@@ -504,6 +516,7 @@
-         $params->value('CTime' => undef) ; # No Creation time
-     }
- 
-+    # NOTE - Unix specific code alert
-     $params->value('ExtAttr' => $mode << 16) 
-         if ! $params->parsed('ExtAttr');
- 
-@@ -570,8 +583,6 @@
- 
- =head1 NAME
- 
--
--
- IO::Compress::Zip - Write zip files/buffers
-  
-  
-@@ -580,7 +591,6 @@
- 
-     use IO::Compress::Zip qw(zip $ZipError) ;
- 
--
-     my $status = zip $input => $output [,OPTS] 
-         or die "zip failed: $ZipError\n";
- 
-@@ -622,18 +632,9 @@
- 
- =head1 DESCRIPTION
- 
--
- This module provides a Perl interface that allows writing zip 
- compressed data to files or buffer.
- 
--
--
--
--
--
--
--
--
- The primary purpose of this module is to provide streaming write access to
- zip files and buffers. It is not a general-purpose file archiver. If that
- is what you want, check out C<Archive::Zip>.
-@@ -644,13 +645,9 @@
- Note that to create Bzip2 content, the module C<IO::Compress::Bzip2> must
- be installed.
- 
--
--
--
- For reading zip files/buffers, see the companion module 
- L<IO::Uncompress::Unzip|IO::Uncompress::Unzip>.
- 
--
- =head1 Functional Interface
- 
- A top-level function, C<zip>, is provided to carry out
-@@ -663,14 +660,10 @@
-     zip $input => $output [,OPTS] 
-         or die "zip failed: $ZipError\n";
- 
--
--
- The functional interface needs Perl5.005 or better.
- 
--
- =head2 zip $input => $output [, OPTS]
- 
--
- C<zip> expects at least two parameters, C<$input> and C<$output>.
- 
- =head3 The C<$input> parameter
-@@ -709,8 +702,6 @@
- The complete array will be walked to ensure that it only
- contains valid filenames before any data is compressed.
- 
--
--
- =item An Input FileGlob string
- 
- If C<$input> is a string that is delimited by the characters "<" and ">"
-@@ -721,12 +712,10 @@
- 
- See L<File::GlobMapper|File::GlobMapper> for more details.
- 
--
- =back
- 
- If the C<$input> parameter is any other type, C<undef> will be returned.
- 
--
- In addition, if C<$input> is a simple filename, the default values for
- the C<Name>, C<Time>, C<ExtAttr> and C<exTime> options will be sourced from that file.
- 
-@@ -734,8 +723,6 @@
- explicitly setting the C<Name>, C<Time>, C<ExtAttr> and C<exTime> options or by setting the
- C<Minimal> parameter.
- 
--
--
- =head3 The C<$output> parameter
- 
- The parameter C<$output> is used to control the destination of the
-@@ -755,14 +742,11 @@
- will be written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the compressed data will be
- stored in C<$$output>.
- 
--
--
- =item An Array Reference
- 
- If C<$output> is an array reference, the compressed data will be
-@@ -781,21 +765,12 @@
- 
- If the C<$output> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head2 Notes
- 
--
--
- When C<$input> maps to multiple files/buffers and C<$output> is a single
- file/buffer the input files/buffers will each be stored
- in C<$output> as a distinct entry.
- 
--
--
--
--
--
- =head2 Optional Parameters
- 
- Unless specified below, the optional parameters for C<zip>,
-@@ -815,27 +790,18 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< BinModeIn => 0|1 >>
- 
- When reading from a file or filehandle, set C<binmode> before reading.
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< Append => 0|1 >>
- 
- TODO
- 
--
--
- =back
- 
--
--
- =head2 Examples
- 
- To read the contents of the file C<file1.txt> and write the compressed
-@@ -849,7 +815,6 @@
-     zip $input => "$input.zip"
-         or die "zip failed: $ZipError\n";
- 
--
- To read from an existing Perl filehandle, C<$input>, and write the
- compressed data to a buffer, C<$buffer>.
- 
-@@ -887,7 +852,6 @@
-             or die "Error compressing '$input': $ZipError\n";
-     }
- 
--
- =head1 OO Interface
- 
- =head2 Constructor
-@@ -927,7 +891,6 @@
- written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the compressed data will be stored
-@@ -983,8 +946,6 @@
- 
- This parameter defaults to 0.
- 
--
--
- =item C<< Name => $string >>
- 
- Stores the contents of C<$string> in the zip filename header field. If
-@@ -1002,7 +963,14 @@
- This option controls the "external file attributes" field in the central
- header of the zip file. This is a 4 byte field.
- 
--This option defaults to 0.
-+If you are running a Unix derivative this value defaults to 
-+
-+    0666 << 16
-+
-+This should allow read/write access to any files that are extracted from
-+the zip file/buffer.
-+
-+For all other systems it defaults to 0.
- 
- =item C<< exTime => [$atime, $mtime, $ctime] >>
- 
-@@ -1010,9 +978,10 @@
- C<$atime>, C<mtime> and C<$ctime>. These correspond to the last access
- time, last modification time and creation time respectively.
- 
--It uses these values to set the extended timestamp field in the local zip
--header to the three values, $atime, $mtime, $ctime and sets the extended
--timestamp field in the central zip header to C<$mtime>.
-+It uses these values to set the extended timestamp field (ID is "UT") in
-+the local zip header using the three values, $atime, $mtime, $ctime. In
-+addition it sets the extended timestamp field in the central zip header
-+using C<$mtime>.
- 
- If any of the three values is C<undef> that time value will not be used.
- So, for example, to set only the C<$mtime> you would use this
-@@ -1023,6 +992,21 @@
- 
- By default no extended time field is created.
- 
-+=item C<< exUnix2 => [$uid, $gid] >>
-+
-+This option expects an array reference with exactly two elements: C<$uid>
-+and C<$gid>. These values correspond to the numeric user ID and group ID
-+of the owner of the files respectively.
-+
-+When the C<exUnix2> option is present it will trigger the creation of a
-+Unix2 extra field (ID is "Ux") in the local zip. This will be populated
-+with C<$uid> and C<$gid>. In addition an empty Unix2 extra field will also
-+be created in the central zip header
-+
-+If the C<Minimal> option is set to true, this option will be ignored.
-+
-+By default no Unix2 extra field is created.
-+
- =item C<< Comment => $comment >>
- 
- Stores the contents of C<$comment> in the Central File Header of
-@@ -1096,8 +1080,9 @@
- =item C<< ExtraFieldLocal => $data >>
- =item C<< ExtraFieldCentral => $data >>
- 
--These options allows additional metadata to be stored in the local and
--central headers in the zip file/buffer.
-+The C<ExtraFieldLocal> option is used to store additional metadata in the
-+local header for the zip file/buffer. The C<ExtraFieldCentral> does the
-+same for the matching central header.
- 
- An extra field consists of zero or more subfields. Each subfield consists
- of a two byte header followed by the subfield data.
-@@ -1129,10 +1114,9 @@
- 
-     ExtraField => $rawdata
- 
--The Extended Time field, set using the C<exTime> option, is an example of
--an extended field.
--
--
-+The Extended Time field (ID "UT"), set using the C<exTime> option, and the
-+Unix2 extra field (ID "Ux), set using the C<exUnix2> option, are examples
-+of extra fields.
- 
- If the C<Minimal> option is set to true, this option will be ignored.
- 
-@@ -1140,9 +1124,9 @@
- 
- =item C<< Minimal => 1|0 >>
- 
--If specified, this option will disable the creation of all extended fields
--in the zip local and central headers. So the C<exTime>, C<ExtraFieldLocal>
--and C<ExtraFieldCentral> options will be ignored.
-+If specified, this option will disable the creation of all extra fields
-+in the zip local and central headers. So the C<exTime>, C<exUnix2>,
-+C<ExtraFieldLocal> and C<ExtraFieldCentral> options will be ignored.
- 
- This parameter defaults to 0.
- 
-@@ -1169,9 +1153,6 @@
- 
- The default is 0.
- 
--
--
--
- =item -Level 
- 
- Defines the compression level used by zlib. The value should either be
-@@ -1204,19 +1185,10 @@
- 
- The default is Z_DEFAULT_STRATEGY.
- 
--
--
--
--
--
- =item C<< Strict => 0|1 >>
- 
--
--
- This is a placeholder option.
- 
--
--
- =back
- 
- =head2 Examples
-@@ -1278,14 +1250,11 @@
- 
- Usage is
- 
--
-     $z->flush;
-     $z->flush($flush_type);
- 
--
- Flushes any pending compressed data to the output file/buffer.
- 
--
- This method takes an optional parameter, C<$flush_type>, that controls
- how the flushing will be carried out. By default the C<$flush_type>
- used is C<Z_FINISH>. Other valid values for C<$flush_type> are
-@@ -1295,10 +1264,8 @@
- can seriously degrade the level of compression achieved. See the C<zlib>
- documentation for details.
- 
--
- Returns true on success.
- 
--
- =head2 tell
- 
- Usage is
-@@ -1315,28 +1282,19 @@
-     $z->eof();
-     eof($z);
- 
--
--
- Returns true if the C<close> method has been called.
- 
--
--
- =head2 seek
- 
-     $z->seek($position, $whence);
-     seek($z, $position, $whence);
- 
--
--
--
- Provides a sub-set of the C<seek> functionality, with the restriction
- that it is only legal to seek forward in the output file/buffer.
- It is a fatal error to attempt to seek backward.
- 
- Empty parts of the file/buffer will have NULL (0x00) bytes written to them.
- 
--
--
- The C<$whence> parameter takes one the usual values, namely SEEK_SET,
- SEEK_CUR or SEEK_END.
- 
-@@ -1378,33 +1336,27 @@
-     $z->input_line_number()
-     $z->input_line_number(EXPR)
- 
--
- This method always returns C<undef> when compressing. 
- 
--
--
- =head2 fileno
- 
-     $z->fileno()
-     fileno($z)
- 
--If the C<$z> object is associated with a file or a filehandle, this method
--will return the underlying file descriptor.
-+If the C<$z> object is associated with a file or a filehandle, C<fileno>
-+will return the underlying file descriptor. Once the C<close> method is
-+called C<fileno> will return C<undef>.
- 
--If the C<$z> object is is associated with a buffer, this method will
--return undef.
-+If the C<$z> object is is associated with a buffer, this method will return
-+C<undef>.
- 
- =head2 close
- 
-     $z->close() ;
-     close $z ;
- 
--
--
- Flushes any pending compressed data and then closes the output file/buffer. 
- 
--
--
- For most versions of Perl this method will be automatically invoked if
- the IO::Compress::Zip object is destroyed (either explicitly or by the
- variable with the reference to the object going out of scope). The
-@@ -1423,9 +1375,6 @@
- object was created, and the object is associated with a file, the
- underlying file will also be closed.
- 
--
--
--
- =head2 newStream([OPTS])
- 
- Usage is
-@@ -1439,7 +1388,6 @@
- 
- See the L</"Constructor Options"> section for more details.
- 
--
- =head2 deflateParams
- 
- Usage is
-@@ -1448,20 +1396,15 @@
- 
- TODO
- 
--
- =head1 Importing 
- 
--
- A number of symbolic constants are required by some methods in 
- C<IO::Compress::Zip>. None are imported by default.
- 
--
--
- =over 5
- 
- =item :all
- 
--
- Imports C<zip>, C<$ZipError> and all symbolic
- constants that can be used by C<IO::Compress::Zip>. Same as doing this
- 
-@@ -1471,10 +1414,8 @@
- 
- Import all symbolic constants. Same as doing this
- 
--
-     use IO::Compress::Zip qw(:flush :level :strategy :zip_method) ;
- 
--
- =item :flush
- 
- These symbolic constants are used by the C<flush> method.
-@@ -1495,7 +1436,6 @@
-     Z_BEST_COMPRESSION
-     Z_DEFAULT_COMPRESSION
- 
--
- =item :strategy
- 
- These symbolic constants are used by the C<Strategy> option in the constructor.
-@@ -1506,7 +1446,6 @@
-     Z_FIXED
-     Z_DEFAULT_STRATEGY
- 
--
- =item :zip_method
- 
- These symbolic constants are used by the C<Method> option in the
-@@ -1521,21 +1460,17 @@
- 
- =back
- 
--For 
--
- =head1 EXAMPLES
- 
--TODO
--
--
--
--
--
--
-+=head2 Apache::GZip Revisited
- 
-+See L<IO::Compress::Zlib::FAQ|IO::Compress::Zlib::FAQ/"Apache::GZip Revisited">
- 
-+    
- 
-+=head2 Working with Net::FTP
- 
-+See L<IO::Compress::Zlib::FAQ|IO::Compress::Zlib::FAQ/"Compressed files and Net::FTP">
- 
- =head1 SEE ALSO
- 
-@@ -1547,7 +1482,6 @@
- L<Archive::Tar|Archive::Tar>,
- L<IO::Zlib|IO::Zlib>
- 
--
- For RFC 1950, 1951 and 1952 see 
- F<http://www.faqs.org/rfcs/rfc1950.html>,
- F<http://www.faqs.org/rfcs/rfc1951.html> and
-@@ -1561,24 +1495,18 @@
- 
- The primary site for gzip is F<http://www.gzip.org>.
- 
--
--
--
- =head1 AUTHOR
- 
- This module was written by Paul Marquess, F<pmqs@cpan.org>. 
- 
--
--
- =head1 MODIFICATION HISTORY
- 
- See the Changes file.
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
- 
--
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Constants.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Constants.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Constants.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Constants.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -9,7 +9,7 @@
- 
- our ($VERSION, @ISA, @EXPORT);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- 
- @ISA = qw(Exporter);
- 
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Extra.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Extra.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Extra.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Extra.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -8,9 +8,9 @@
- 
- our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- 
--use IO::Compress::Gzip::Constants 2.008 ;
-+use IO::Compress::Gzip::Constants 2.015 ;
- 
- sub ExtraFieldError
- {
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Identity.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Identity.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Identity.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Identity.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -4,13 +4,13 @@
- use strict;
- use bytes;
- 
--use IO::Compress::Base::Common  2.008 qw(:Status);
-+use IO::Compress::Base::Common  2.015 qw(:Status);
- 
- our ($VERSION);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- 
--use Compress::Raw::Zlib  2.008 ();
-+use Compress::Raw::Zlib  2.015 ();
- 
- sub mkUncompObject
- {
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Inflate.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Inflate.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Inflate.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Inflate.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -4,11 +4,11 @@
- use warnings;
- use bytes;
- 
--use IO::Compress::Base::Common  2.008 qw(:Status);
--use Compress::Raw::Zlib  2.008 qw(Z_OK Z_DATA_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
-+use IO::Compress::Base::Common  2.015 qw(:Status);
-+use Compress::Raw::Zlib  2.015 qw(Z_OK Z_DATA_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
- 
- our ($VERSION);
--$VERSION = '2.008';
-+$VERSION = '2.015';
- 
- 
- 
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/AnyInflate.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/AnyInflate.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/AnyInflate.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/AnyInflate.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -6,22 +6,22 @@
- use warnings;
- use bytes;
- 
--use IO::Compress::Base::Common  2.008 qw(createSelfTiedObject);
-+use IO::Compress::Base::Common  2.015 qw(createSelfTiedObject);
- 
--use IO::Uncompress::Adapter::Inflate  2.008 ();
-+use IO::Uncompress::Adapter::Inflate  2.015 ();
- 
- 
--use IO::Uncompress::Base  2.008 ;
--use IO::Uncompress::Gunzip  2.008 ;
--use IO::Uncompress::Inflate  2.008 ;
--use IO::Uncompress::RawInflate  2.008 ;
--use IO::Uncompress::Unzip  2.008 ;
-+use IO::Uncompress::Base  2.015 ;
-+use IO::Uncompress::Gunzip  2.015 ;
-+use IO::Uncompress::Inflate  2.015 ;
-+use IO::Uncompress::RawInflate  2.015 ;
-+use IO::Uncompress::Unzip  2.015 ;
- 
- require Exporter ;
- 
- our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- $AnyInflateError = '';
- 
- @ISA = qw( Exporter IO::Uncompress::Base );
-@@ -48,7 +48,7 @@
- 
- sub getExtraParams
- {
--    use IO::Compress::Base::Common  2.008 qw(:Parse);
-+    use IO::Compress::Base::Common  2.015 qw(:Parse);
-     return ( 'RawInflate' => [1, 1, Parse_boolean,  0] ) ;
- }
- 
-@@ -67,7 +67,6 @@
- sub mkUncomp
- {
-     my $self = shift ;
--    my $class = shift ;
-     my $got = shift ;
- 
-     my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::Inflate::mkUncompObject();
-@@ -127,10 +126,8 @@
- 
- =head1 NAME
- 
--
- IO::Uncompress::AnyInflate - Uncompress zlib-based (zip, gzip) file/buffer
- 
--
- =head1 SYNOPSIS
- 
-     use IO::Uncompress::AnyInflate qw(anyinflate $AnyInflateError) ;
-@@ -176,10 +173,8 @@
-     eof($z)
-     close($z)
- 
--
- =head1 DESCRIPTION
- 
--
- This module provides a Perl interface that allows the reading of
- files/buffers that have been compressed in a number of formats that use the
- zlib compression library.
-@@ -201,10 +196,6 @@
- The module will auto-detect which, if any, of the supported
- compression formats is being used.
- 
--
--
--
--
- =head1 Functional Interface
- 
- A top-level function, C<anyinflate>, is provided to carry out
-@@ -217,14 +208,10 @@
-     anyinflate $input => $output [,OPTS] 
-         or die "anyinflate failed: $AnyInflateError\n";
- 
--
--
- The functional interface needs Perl5.005 or better.
- 
--
- =head2 anyinflate $input => $output [, OPTS]
- 
--
- C<anyinflate> expects at least two parameters, C<$input> and C<$output>.
- 
- =head3 The C<$input> parameter
-@@ -263,8 +250,6 @@
- The complete array will be walked to ensure that it only
- contains valid filenames before any data is uncompressed.
- 
--
--
- =item An Input FileGlob string
- 
- If C<$input> is a string that is delimited by the characters "<" and ">"
-@@ -275,13 +260,10 @@
- 
- See L<File::GlobMapper|File::GlobMapper> for more details.
- 
--
- =back
- 
- If the C<$input> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head3 The C<$output> parameter
- 
- The parameter C<$output> is used to control the destination of the
-@@ -301,14 +283,11 @@
- will be written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the uncompressed data will be
- stored in C<$$output>.
- 
--
--
- =item An Array Reference
- 
- If C<$output> is an array reference, the uncompressed data will be
-@@ -327,20 +306,13 @@
- 
- If the C<$output> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head2 Notes
- 
--
- When C<$input> maps to multiple compressed files/buffers and C<$output> is
- a single file/buffer, after uncompression C<$output> will contain a
- concatenation of all the uncompressed data from each of the input
- files/buffers.
- 
--
--
--
--
- =head2 Optional Parameters
- 
- Unless specified below, the optional parameters for C<anyinflate>,
-@@ -360,7 +332,6 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< BinModeOut => 0|1 >>
- 
- When writing to a file or filehandle, set C<binmode> before writing to the
-@@ -368,26 +339,17 @@
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< Append => 0|1 >>
- 
- TODO
- 
- =item C<< MultiStream => 0|1 >>
- 
--
- If the input file/buffer contains multiple compressed data streams, this
- option will uncompress the whole lot as a single data stream.
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< TrailingData => $scalar >>
- 
- Returns the data, if any, that is present immediately after the compressed
-@@ -407,19 +369,12 @@
- 
- Don't bother using C<trailingData> if the input is a filename.
- 
--
--
- If you know the length of the compressed data stream before you start
- uncompressing, you can avoid having to use C<trailingData> by setting the
- C<InputLength> option.
- 
--
--
- =back
- 
--
--
--
- =head2 Examples
- 
- To read the contents of the file C<file1.txt.Compressed> and write the
-@@ -434,7 +389,6 @@
-     anyinflate $input => $output
-         or die "anyinflate failed: $AnyInflateError\n";
- 
--
- To read from an existing Perl filehandle, C<$input>, and write the
- uncompressed data to a buffer, C<$buffer>.
- 
-@@ -478,7 +432,6 @@
- 
- The format of the constructor for IO::Uncompress::AnyInflate is shown below
- 
--
-     my $z = new IO::Uncompress::AnyInflate $input [OPTS]
-         or die "IO::Uncompress::AnyInflate failed: $AnyInflateError\n";
- 
-@@ -510,7 +463,6 @@
- read from it.
- The string '-' can be used as an alias for standard input.
- 
--
- =item A scalar reference 
- 
- If C<$input> is a scalar reference, the compressed data will be read from
-@@ -520,7 +472,6 @@
- 
- =head2 Constructor Options
- 
--
- The option names defined below are case insensitive and can be optionally
- prefixed by a '-'.  So all of the following are valid
- 
-@@ -544,8 +495,6 @@
- 
- =item C<< MultiStream => 0|1 >>
- 
--
--
- Allows multiple concatenated compressed streams to be treated as a single
- compressed stream. Decompression will stop once either the end of the
- file/buffer is reached, an error is encountered (premature eof, corrupt
-@@ -554,7 +503,6 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< Prime => $string >>
- 
- This option will uncompress the contents of C<$string> before processing the
-@@ -596,8 +544,6 @@
- the file pointer will be left pointing to the first byte directly after the
- compressed data stream.
- 
--
--
- This option defaults to off.
- 
- =item C<< Append => 0|1 >>
-@@ -614,20 +560,14 @@
- 
- =item C<< Strict => 0|1 >>
- 
--
--
- This option controls whether the extra checks defined below are used when
- carrying out the decompression. When Strict is on, the extra tests are
- carried out, when Strict is off they are not.
- 
- The default for this option is off.
- 
--
- If the input is an RFC 1950 data stream, the following will be checked:
- 
--
--
--
- =over 5
- 
- =item 1
-@@ -641,13 +581,8 @@
- 
- =back
- 
--
--
- If the input is a gzip (RFC 1952) data stream, the following will be checked:
- 
--
--
--
- =over 5
- 
- =item 1 
-@@ -686,10 +621,6 @@
- 
- =back
- 
--
--
--
--
- =item C<< RawInflate => 0|1 >>
- 
- When auto-detecting the compressed format, try to test for raw-deflate (RFC
-@@ -701,9 +632,6 @@
- 
- Defaults to 0.
- 
--
--
--
- =item C<< ParseExtra => 0|1 >>
- If the gzip FEXTRA header field is present and this option is set, it will
- force the module to check that it conforms to the sub-field structure as
-@@ -713,9 +641,6 @@
- 
- Defaults to 0.
- 
--
--
--
- =back
- 
- =head2 Examples
-@@ -759,7 +684,6 @@
- Returns the number of uncompressed bytes written to C<$buffer>, zero if eof
- or a negative number on error.
- 
--
- =head2 getline
- 
- Usage is
-@@ -774,7 +698,6 @@
- determine what constitutes an end of line. Paragraph mode, record mode and
- file slurp mode are all supported. 
- 
--
- =head2 getc
- 
- Usage is 
-@@ -789,8 +712,6 @@
- 
-     $char = $z->ungetc($string)
- 
--
--
- =head2 inflateSync
- 
- Usage is
-@@ -799,7 +720,6 @@
- 
- TODO
- 
--
- =head2 getHeaderInfo
- 
- Usage is
-@@ -811,9 +731,6 @@
- or hash references (in array context) that contains information about each
- of the header fields in the compressed data stream(s).
- 
--
--
--
- =head2 tell
- 
- Usage is
-@@ -830,26 +747,17 @@
-     $z->eof();
-     eof($z);
- 
--
--
- Returns true if the end of the compressed input stream has been reached.
- 
--
--
- =head2 seek
- 
-     $z->seek($position, $whence);
-     seek($z, $position, $whence);
- 
--
--
--
- Provides a sub-set of the C<seek> functionality, with the restriction
- that it is only legal to seek forward in the input file/buffer.
- It is a fatal error to attempt to seek backward.
- 
--
--
- The C<$whence> parameter takes one the usual values, namely SEEK_SET,
- SEEK_CUR or SEEK_END.
- 
-@@ -891,8 +799,6 @@
-     $z->input_line_number()
-     $z->input_line_number(EXPR)
- 
--
--
- Returns the current uncompressed line number. If C<EXPR> is present it has
- the effect of setting the line number. Note that setting the line number
- does not change the current position within the file/buffer being read.
-@@ -900,30 +806,25 @@
- The contents of C<$/> are used to to determine what constitutes a line
- terminator.
- 
--
--
- =head2 fileno
- 
-     $z->fileno()
-     fileno($z)
- 
--If the C<$z> object is associated with a file or a filehandle, this method
--will return the underlying file descriptor.
-+If the C<$z> object is associated with a file or a filehandle, C<fileno>
-+will return the underlying file descriptor. Once the C<close> method is
-+called C<fileno> will return C<undef>.
- 
--If the C<$z> object is is associated with a buffer, this method will
--return undef.
-+If the C<$z> object is is associated with a buffer, this method will return
-+C<undef>.
- 
- =head2 close
- 
-     $z->close() ;
-     close $z ;
- 
--
--
- Closes the output file/buffer. 
- 
--
--
- For most versions of Perl this method will be automatically invoked if
- the IO::Uncompress::AnyInflate object is destroyed (either explicitly or by the
- variable with the reference to the object going out of scope). The
-@@ -942,9 +843,6 @@
- object was created, and the object is associated with a file, the
- underlying file will also be closed.
- 
--
--
--
- =head2 nextStream
- 
- Usage is
-@@ -983,8 +881,6 @@
- 
- Don't bother using C<trailingData> if the input is a filename.
- 
--
--
- If you know the length of the compressed data stream before you start
- uncompressing, you can avoid having to use C<trailingData> by setting the
- C<InputLength> option in the constructor.
-@@ -1006,8 +902,9 @@
- 
- =head1 EXAMPLES
- 
-+=head2 Working with Net::FTP
- 
--
-+See L<IO::Uncompress::AnyInflate::FAQ|IO::Uncompress::AnyInflate::FAQ/"Compressed files and Net::FTP">
- 
- =head1 SEE ALSO
- 
-@@ -1019,7 +916,6 @@
- L<Archive::Tar|Archive::Tar>,
- L<IO::Zlib|IO::Zlib>
- 
--
- For RFC 1950, 1951 and 1952 see 
- F<http://www.faqs.org/rfcs/rfc1950.html>,
- F<http://www.faqs.org/rfcs/rfc1951.html> and
-@@ -1033,22 +929,17 @@
- 
- The primary site for gzip is F<http://www.gzip.org>.
- 
--
--
--
- =head1 AUTHOR
- 
- This module was written by Paul Marquess, F<pmqs@cpan.org>. 
- 
--
--
- =head1 MODIFICATION HISTORY
- 
- See the Changes file.
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/Gunzip.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/Gunzip.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/Gunzip.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/Gunzip.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -9,12 +9,12 @@
- use warnings;
- use bytes;
- 
--use IO::Uncompress::RawInflate 2.008 ;
-+use IO::Uncompress::RawInflate 2.015 ;
- 
--use Compress::Raw::Zlib 2.008 qw( crc32 ) ;
--use IO::Compress::Base::Common 2.008 qw(:Status createSelfTiedObject);
--use IO::Compress::Gzip::Constants 2.008 ;
--use IO::Compress::Zlib::Extra 2.008 ;
-+use Compress::Raw::Zlib 2.015 qw( crc32 ) ;
-+use IO::Compress::Base::Common 2.015 qw(:Status createSelfTiedObject);
-+use IO::Compress::Gzip::Constants 2.015 ;
-+use IO::Compress::Zlib::Extra 2.015 ;
- 
- require Exporter ;
- 
-@@ -28,7 +28,7 @@
- 
- $GunzipError = '';
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- 
- sub new
- {
-@@ -47,7 +47,7 @@
- 
- sub getExtraParams
- {
--    use IO::Compress::Base::Common  2.008 qw(:Parse);
-+    use IO::Compress::Base::Common  2.015 qw(:Parse);
-     return ( 'ParseExtra' => [1, 1, Parse_boolean,  0] ) ;
- }
- 
-@@ -278,12 +278,8 @@
- 
- =head1 NAME
- 
--
--
- IO::Uncompress::Gunzip - Read RFC 1952 files/buffers
- 
--
--
- =head1 SYNOPSIS
- 
-     use IO::Uncompress::Gunzip qw(gunzip $GunzipError) ;
-@@ -329,20 +325,13 @@
-     eof($z)
-     close($z)
- 
--
- =head1 DESCRIPTION
- 
--
--
- This module provides a Perl interface that allows the reading of
- files/buffers that conform to RFC 1952.
- 
- For writing RFC 1952 files/buffers, see the companion module IO::Compress::Gzip.
- 
--
--
--
--
- =head1 Functional Interface
- 
- A top-level function, C<gunzip>, is provided to carry out
-@@ -355,14 +344,10 @@
-     gunzip $input => $output [,OPTS] 
-         or die "gunzip failed: $GunzipError\n";
- 
--
--
- The functional interface needs Perl5.005 or better.
- 
--
- =head2 gunzip $input => $output [, OPTS]
- 
--
- C<gunzip> expects at least two parameters, C<$input> and C<$output>.
- 
- =head3 The C<$input> parameter
-@@ -401,8 +386,6 @@
- The complete array will be walked to ensure that it only
- contains valid filenames before any data is uncompressed.
- 
--
--
- =item An Input FileGlob string
- 
- If C<$input> is a string that is delimited by the characters "<" and ">"
-@@ -413,13 +396,10 @@
- 
- See L<File::GlobMapper|File::GlobMapper> for more details.
- 
--
- =back
- 
- If the C<$input> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head3 The C<$output> parameter
- 
- The parameter C<$output> is used to control the destination of the
-@@ -439,14 +419,11 @@
- will be written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the uncompressed data will be
- stored in C<$$output>.
- 
--
--
- =item An Array Reference
- 
- If C<$output> is an array reference, the uncompressed data will be
-@@ -465,20 +442,13 @@
- 
- If the C<$output> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head2 Notes
- 
--
- When C<$input> maps to multiple compressed files/buffers and C<$output> is
- a single file/buffer, after uncompression C<$output> will contain a
- concatenation of all the uncompressed data from each of the input
- files/buffers.
- 
--
--
--
--
- =head2 Optional Parameters
- 
- Unless specified below, the optional parameters for C<gunzip>,
-@@ -498,7 +468,6 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< BinModeOut => 0|1 >>
- 
- When writing to a file or filehandle, set C<binmode> before writing to the
-@@ -506,26 +475,17 @@
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< Append => 0|1 >>
- 
- TODO
- 
- =item C<< MultiStream => 0|1 >>
- 
--
- If the input file/buffer contains multiple compressed data streams, this
- option will uncompress the whole lot as a single data stream.
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< TrailingData => $scalar >>
- 
- Returns the data, if any, that is present immediately after the compressed
-@@ -545,19 +505,12 @@
- 
- Don't bother using C<trailingData> if the input is a filename.
- 
--
--
- If you know the length of the compressed data stream before you start
- uncompressing, you can avoid having to use C<trailingData> by setting the
- C<InputLength> option.
- 
--
--
- =back
- 
--
--
--
- =head2 Examples
- 
- To read the contents of the file C<file1.txt.gz> and write the
-@@ -572,7 +525,6 @@
-     gunzip $input => $output
-         or die "gunzip failed: $GunzipError\n";
- 
--
- To read from an existing Perl filehandle, C<$input>, and write the
- uncompressed data to a buffer, C<$buffer>.
- 
-@@ -616,7 +568,6 @@
- 
- The format of the constructor for IO::Uncompress::Gunzip is shown below
- 
--
-     my $z = new IO::Uncompress::Gunzip $input [OPTS]
-         or die "IO::Uncompress::Gunzip failed: $GunzipError\n";
- 
-@@ -648,7 +599,6 @@
- read from it.
- The string '-' can be used as an alias for standard input.
- 
--
- =item A scalar reference 
- 
- If C<$input> is a scalar reference, the compressed data will be read from
-@@ -658,7 +608,6 @@
- 
- =head2 Constructor Options
- 
--
- The option names defined below are case insensitive and can be optionally
- prefixed by a '-'.  So all of the following are valid
- 
-@@ -682,8 +631,6 @@
- 
- =item C<< MultiStream => 0|1 >>
- 
--
--
- Allows multiple concatenated compressed streams to be treated as a single
- compressed stream. Decompression will stop once either the end of the
- file/buffer is reached, an error is encountered (premature eof, corrupt
-@@ -692,7 +639,6 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< Prime => $string >>
- 
- This option will uncompress the contents of C<$string> before processing the
-@@ -734,8 +680,6 @@
- the file pointer will be left pointing to the first byte directly after the
- compressed data stream.
- 
--
--
- This option defaults to off.
- 
- =item C<< Append => 0|1 >>
-@@ -752,22 +696,12 @@
- 
- =item C<< Strict => 0|1 >>
- 
--
--
- This option controls whether the extra checks defined below are used when
- carrying out the decompression. When Strict is on, the extra tests are
- carried out, when Strict is off they are not.
- 
- The default for this option is off.
- 
--
--
--
--
--
--
--
--
- =over 5
- 
- =item 1 
-@@ -806,12 +740,6 @@
- 
- =back
- 
--
--
--
--
--
--
- =item C<< ParseExtra => 0|1 >>
- If the gzip FEXTRA header field is present and this option is set, it will
- force the module to check that it conforms to the sub-field structure as
-@@ -821,9 +749,6 @@
- 
- Defaults to 0.
- 
--
--
--
- =back
- 
- =head2 Examples
-@@ -867,7 +792,6 @@
- Returns the number of uncompressed bytes written to C<$buffer>, zero if eof
- or a negative number on error.
- 
--
- =head2 getline
- 
- Usage is
-@@ -882,7 +806,6 @@
- determine what constitutes an end of line. Paragraph mode, record mode and
- file slurp mode are all supported. 
- 
--
- =head2 getc
- 
- Usage is 
-@@ -897,8 +820,6 @@
- 
-     $char = $z->ungetc($string)
- 
--
--
- =head2 inflateSync
- 
- Usage is
-@@ -907,7 +828,6 @@
- 
- TODO
- 
--
- =head2 getHeaderInfo
- 
- Usage is
-@@ -919,8 +839,6 @@
- or hash references (in array context) that contains information about each
- of the header fields in the compressed data stream(s).
- 
--
--
- =over 5
- 
- =item Name
-@@ -937,9 +855,6 @@
- 
- =back
- 
--
--
--
- =head2 tell
- 
- Usage is
-@@ -956,26 +871,17 @@
-     $z->eof();
-     eof($z);
- 
--
--
- Returns true if the end of the compressed input stream has been reached.
- 
--
--
- =head2 seek
- 
-     $z->seek($position, $whence);
-     seek($z, $position, $whence);
- 
--
--
--
- Provides a sub-set of the C<seek> functionality, with the restriction
- that it is only legal to seek forward in the input file/buffer.
- It is a fatal error to attempt to seek backward.
- 
--
--
- The C<$whence> parameter takes one the usual values, namely SEEK_SET,
- SEEK_CUR or SEEK_END.
- 
-@@ -1017,8 +923,6 @@
-     $z->input_line_number()
-     $z->input_line_number(EXPR)
- 
--
--
- Returns the current uncompressed line number. If C<EXPR> is present it has
- the effect of setting the line number. Note that setting the line number
- does not change the current position within the file/buffer being read.
-@@ -1026,30 +930,25 @@
- The contents of C<$/> are used to to determine what constitutes a line
- terminator.
- 
--
--
- =head2 fileno
- 
-     $z->fileno()
-     fileno($z)
- 
--If the C<$z> object is associated with a file or a filehandle, this method
--will return the underlying file descriptor.
-+If the C<$z> object is associated with a file or a filehandle, C<fileno>
-+will return the underlying file descriptor. Once the C<close> method is
-+called C<fileno> will return C<undef>.
- 
--If the C<$z> object is is associated with a buffer, this method will
--return undef.
-+If the C<$z> object is is associated with a buffer, this method will return
-+C<undef>.
- 
- =head2 close
- 
-     $z->close() ;
-     close $z ;
- 
--
--
- Closes the output file/buffer. 
- 
--
--
- For most versions of Perl this method will be automatically invoked if
- the IO::Uncompress::Gunzip object is destroyed (either explicitly or by the
- variable with the reference to the object going out of scope). The
-@@ -1068,9 +967,6 @@
- object was created, and the object is associated with a file, the
- underlying file will also be closed.
- 
--
--
--
- =head2 nextStream
- 
- Usage is
-@@ -1109,8 +1005,6 @@
- 
- Don't bother using C<trailingData> if the input is a filename.
- 
--
--
- If you know the length of the compressed data stream before you start
- uncompressing, you can avoid having to use C<trailingData> by setting the
- C<InputLength> option in the constructor.
-@@ -1132,8 +1026,9 @@
- 
- =head1 EXAMPLES
- 
-+=head2 Working with Net::FTP
- 
--
-+See L<IO::Uncompress::Gunzip::FAQ|IO::Uncompress::Gunzip::FAQ/"Compressed files and Net::FTP">
- 
- =head1 SEE ALSO
- 
-@@ -1145,7 +1040,6 @@
- L<Archive::Tar|Archive::Tar>,
- L<IO::Zlib|IO::Zlib>
- 
--
- For RFC 1950, 1951 and 1952 see 
- F<http://www.faqs.org/rfcs/rfc1950.html>,
- F<http://www.faqs.org/rfcs/rfc1951.html> and
-@@ -1159,22 +1053,17 @@
- 
- The primary site for gzip is F<http://www.gzip.org>.
- 
--
--
--
- =head1 AUTHOR
- 
- This module was written by Paul Marquess, F<pmqs@cpan.org>. 
- 
--
--
- =head1 MODIFICATION HISTORY
- 
- See the Changes file.
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/Inflate.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/Inflate.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/Inflate.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/Inflate.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -5,15 +5,15 @@
- use warnings;
- use bytes;
- 
--use IO::Compress::Base::Common  2.008 qw(:Status createSelfTiedObject);
--use IO::Compress::Zlib::Constants 2.008 ;
-+use IO::Compress::Base::Common  2.015 qw(:Status createSelfTiedObject);
-+use IO::Compress::Zlib::Constants 2.015 ;
- 
--use IO::Uncompress::RawInflate  2.008 ;
-+use IO::Uncompress::RawInflate  2.015 ;
- 
- require Exporter ;
- our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- $InflateError = '';
- 
- @ISA    = qw( Exporter IO::Uncompress::RawInflate );
-@@ -199,12 +199,8 @@
- 
- =head1 NAME
- 
--
--
- IO::Uncompress::Inflate - Read RFC 1950 files/buffers
- 
--
--
- =head1 SYNOPSIS
- 
-     use IO::Uncompress::Inflate qw(inflate $InflateError) ;
-@@ -250,20 +246,13 @@
-     eof($z)
-     close($z)
- 
--
- =head1 DESCRIPTION
- 
--
--
- This module provides a Perl interface that allows the reading of
- files/buffers that conform to RFC 1950.
- 
- For writing RFC 1950 files/buffers, see the companion module IO::Compress::Deflate.
- 
--
--
--
--
- =head1 Functional Interface
- 
- A top-level function, C<inflate>, is provided to carry out
-@@ -276,14 +265,10 @@
-     inflate $input => $output [,OPTS] 
-         or die "inflate failed: $InflateError\n";
- 
--
--
- The functional interface needs Perl5.005 or better.
- 
--
- =head2 inflate $input => $output [, OPTS]
- 
--
- C<inflate> expects at least two parameters, C<$input> and C<$output>.
- 
- =head3 The C<$input> parameter
-@@ -322,8 +307,6 @@
- The complete array will be walked to ensure that it only
- contains valid filenames before any data is uncompressed.
- 
--
--
- =item An Input FileGlob string
- 
- If C<$input> is a string that is delimited by the characters "<" and ">"
-@@ -334,13 +317,10 @@
- 
- See L<File::GlobMapper|File::GlobMapper> for more details.
- 
--
- =back
- 
- If the C<$input> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head3 The C<$output> parameter
- 
- The parameter C<$output> is used to control the destination of the
-@@ -360,14 +340,11 @@
- will be written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the uncompressed data will be
- stored in C<$$output>.
- 
--
--
- =item An Array Reference
- 
- If C<$output> is an array reference, the uncompressed data will be
-@@ -386,20 +363,13 @@
- 
- If the C<$output> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head2 Notes
- 
--
- When C<$input> maps to multiple compressed files/buffers and C<$output> is
- a single file/buffer, after uncompression C<$output> will contain a
- concatenation of all the uncompressed data from each of the input
- files/buffers.
- 
--
--
--
--
- =head2 Optional Parameters
- 
- Unless specified below, the optional parameters for C<inflate>,
-@@ -419,7 +389,6 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< BinModeOut => 0|1 >>
- 
- When writing to a file or filehandle, set C<binmode> before writing to the
-@@ -427,26 +396,17 @@
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< Append => 0|1 >>
- 
- TODO
- 
- =item C<< MultiStream => 0|1 >>
- 
--
- If the input file/buffer contains multiple compressed data streams, this
- option will uncompress the whole lot as a single data stream.
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< TrailingData => $scalar >>
- 
- Returns the data, if any, that is present immediately after the compressed
-@@ -466,19 +426,12 @@
- 
- Don't bother using C<trailingData> if the input is a filename.
- 
--
--
- If you know the length of the compressed data stream before you start
- uncompressing, you can avoid having to use C<trailingData> by setting the
- C<InputLength> option.
- 
--
--
- =back
- 
--
--
--
- =head2 Examples
- 
- To read the contents of the file C<file1.txt.1950> and write the
-@@ -493,7 +446,6 @@
-     inflate $input => $output
-         or die "inflate failed: $InflateError\n";
- 
--
- To read from an existing Perl filehandle, C<$input>, and write the
- uncompressed data to a buffer, C<$buffer>.
- 
-@@ -537,7 +489,6 @@
- 
- The format of the constructor for IO::Uncompress::Inflate is shown below
- 
--
-     my $z = new IO::Uncompress::Inflate $input [OPTS]
-         or die "IO::Uncompress::Inflate failed: $InflateError\n";
- 
-@@ -569,7 +520,6 @@
- read from it.
- The string '-' can be used as an alias for standard input.
- 
--
- =item A scalar reference 
- 
- If C<$input> is a scalar reference, the compressed data will be read from
-@@ -579,7 +529,6 @@
- 
- =head2 Constructor Options
- 
--
- The option names defined below are case insensitive and can be optionally
- prefixed by a '-'.  So all of the following are valid
- 
-@@ -603,8 +552,6 @@
- 
- =item C<< MultiStream => 0|1 >>
- 
--
--
- Allows multiple concatenated compressed streams to be treated as a single
- compressed stream. Decompression will stop once either the end of the
- file/buffer is reached, an error is encountered (premature eof, corrupt
-@@ -613,7 +560,6 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< Prime => $string >>
- 
- This option will uncompress the contents of C<$string> before processing the
-@@ -655,8 +601,6 @@
- the file pointer will be left pointing to the first byte directly after the
- compressed data stream.
- 
--
--
- This option defaults to off.
- 
- =item C<< Append => 0|1 >>
-@@ -673,18 +617,12 @@
- 
- =item C<< Strict => 0|1 >>
- 
--
--
- This option controls whether the extra checks defined below are used when
- carrying out the decompression. When Strict is on, the extra tests are
- carried out, when Strict is off they are not.
- 
- The default for this option is off.
- 
--
--
--
--
- =over 5
- 
- =item 1
-@@ -698,17 +636,6 @@
- 
- =back
- 
--
--
--
--
--
--
--
--
--
--
--
- =back
- 
- =head2 Examples
-@@ -752,7 +679,6 @@
- Returns the number of uncompressed bytes written to C<$buffer>, zero if eof
- or a negative number on error.
- 
--
- =head2 getline
- 
- Usage is
-@@ -767,7 +693,6 @@
- determine what constitutes an end of line. Paragraph mode, record mode and
- file slurp mode are all supported. 
- 
--
- =head2 getc
- 
- Usage is 
-@@ -782,8 +707,6 @@
- 
-     $char = $z->ungetc($string)
- 
--
--
- =head2 inflateSync
- 
- Usage is
-@@ -792,7 +715,6 @@
- 
- TODO
- 
--
- =head2 getHeaderInfo
- 
- Usage is
-@@ -804,9 +726,6 @@
- or hash references (in array context) that contains information about each
- of the header fields in the compressed data stream(s).
- 
--
--
--
- =head2 tell
- 
- Usage is
-@@ -823,26 +742,17 @@
-     $z->eof();
-     eof($z);
- 
--
--
- Returns true if the end of the compressed input stream has been reached.
- 
--
--
- =head2 seek
- 
-     $z->seek($position, $whence);
-     seek($z, $position, $whence);
- 
--
--
--
- Provides a sub-set of the C<seek> functionality, with the restriction
- that it is only legal to seek forward in the input file/buffer.
- It is a fatal error to attempt to seek backward.
- 
--
--
- The C<$whence> parameter takes one the usual values, namely SEEK_SET,
- SEEK_CUR or SEEK_END.
- 
-@@ -884,8 +794,6 @@
-     $z->input_line_number()
-     $z->input_line_number(EXPR)
- 
--
--
- Returns the current uncompressed line number. If C<EXPR> is present it has
- the effect of setting the line number. Note that setting the line number
- does not change the current position within the file/buffer being read.
-@@ -893,30 +801,25 @@
- The contents of C<$/> are used to to determine what constitutes a line
- terminator.
- 
--
--
- =head2 fileno
- 
-     $z->fileno()
-     fileno($z)
- 
--If the C<$z> object is associated with a file or a filehandle, this method
--will return the underlying file descriptor.
-+If the C<$z> object is associated with a file or a filehandle, C<fileno>
-+will return the underlying file descriptor. Once the C<close> method is
-+called C<fileno> will return C<undef>.
- 
--If the C<$z> object is is associated with a buffer, this method will
--return undef.
-+If the C<$z> object is is associated with a buffer, this method will return
-+C<undef>.
- 
- =head2 close
- 
-     $z->close() ;
-     close $z ;
- 
--
--
- Closes the output file/buffer. 
- 
--
--
- For most versions of Perl this method will be automatically invoked if
- the IO::Uncompress::Inflate object is destroyed (either explicitly or by the
- variable with the reference to the object going out of scope). The
-@@ -935,9 +838,6 @@
- object was created, and the object is associated with a file, the
- underlying file will also be closed.
- 
--
--
--
- =head2 nextStream
- 
- Usage is
-@@ -976,8 +876,6 @@
- 
- Don't bother using C<trailingData> if the input is a filename.
- 
--
--
- If you know the length of the compressed data stream before you start
- uncompressing, you can avoid having to use C<trailingData> by setting the
- C<InputLength> option in the constructor.
-@@ -999,8 +897,9 @@
- 
- =head1 EXAMPLES
- 
-+=head2 Working with Net::FTP
- 
--
-+See L<IO::Uncompress::Inflate::FAQ|IO::Uncompress::Inflate::FAQ/"Compressed files and Net::FTP">
- 
- =head1 SEE ALSO
- 
-@@ -1012,7 +911,6 @@
- L<Archive::Tar|Archive::Tar>,
- L<IO::Zlib|IO::Zlib>
- 
--
- For RFC 1950, 1951 and 1952 see 
- F<http://www.faqs.org/rfcs/rfc1950.html>,
- F<http://www.faqs.org/rfcs/rfc1951.html> and
-@@ -1026,22 +924,17 @@
- 
- The primary site for gzip is F<http://www.gzip.org>.
- 
--
--
--
- =head1 AUTHOR
- 
- This module was written by Paul Marquess, F<pmqs@cpan.org>. 
- 
--
--
- =head1 MODIFICATION HISTORY
- 
- See the Changes file.
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/RawInflate.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/RawInflate.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/RawInflate.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/RawInflate.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -5,11 +5,11 @@
- use warnings;
- use bytes;
- 
--use Compress::Raw::Zlib  2.008 ;
--use IO::Compress::Base::Common  2.008 qw(:Status createSelfTiedObject);
-+use Compress::Raw::Zlib  2.015 ;
-+use IO::Compress::Base::Common  2.015 qw(:Status createSelfTiedObject);
- 
--use IO::Uncompress::Base  2.008 ;
--use IO::Uncompress::Adapter::Inflate  2.008 ;
-+use IO::Uncompress::Base  2.015 ;
-+use IO::Uncompress::Adapter::Inflate  2.015 ;
- 
- 
- 
-@@ -17,7 +17,7 @@
- require Exporter ;
- our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- $RawInflateError = '';
- 
- @ISA    = qw( Exporter IO::Uncompress::Base );
-@@ -58,7 +58,6 @@
- sub mkUncomp
- {
-     my $self = shift ;
--    my $class = shift ;
-     my $got = shift ;
- 
-     my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::Inflate::mkUncompObject(
-@@ -331,12 +330,8 @@
- 
- =head1 NAME
- 
--
--
- IO::Uncompress::RawInflate - Read RFC 1951 files/buffers
- 
--
--
- =head1 SYNOPSIS
- 
-     use IO::Uncompress::RawInflate qw(rawinflate $RawInflateError) ;
-@@ -382,20 +377,13 @@
-     eof($z)
-     close($z)
- 
--
- =head1 DESCRIPTION
- 
--
--
- This module provides a Perl interface that allows the reading of
- files/buffers that conform to RFC 1951.
- 
- For writing RFC 1951 files/buffers, see the companion module IO::Compress::RawDeflate.
- 
--
--
--
--
- =head1 Functional Interface
- 
- A top-level function, C<rawinflate>, is provided to carry out
-@@ -408,14 +396,10 @@
-     rawinflate $input => $output [,OPTS] 
-         or die "rawinflate failed: $RawInflateError\n";
- 
--
--
- The functional interface needs Perl5.005 or better.
- 
--
- =head2 rawinflate $input => $output [, OPTS]
- 
--
- C<rawinflate> expects at least two parameters, C<$input> and C<$output>.
- 
- =head3 The C<$input> parameter
-@@ -454,8 +438,6 @@
- The complete array will be walked to ensure that it only
- contains valid filenames before any data is uncompressed.
- 
--
--
- =item An Input FileGlob string
- 
- If C<$input> is a string that is delimited by the characters "<" and ">"
-@@ -466,13 +448,10 @@
- 
- See L<File::GlobMapper|File::GlobMapper> for more details.
- 
--
- =back
- 
- If the C<$input> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head3 The C<$output> parameter
- 
- The parameter C<$output> is used to control the destination of the
-@@ -492,14 +471,11 @@
- will be written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the uncompressed data will be
- stored in C<$$output>.
- 
--
--
- =item An Array Reference
- 
- If C<$output> is an array reference, the uncompressed data will be
-@@ -518,20 +494,13 @@
- 
- If the C<$output> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head2 Notes
- 
--
- When C<$input> maps to multiple compressed files/buffers and C<$output> is
- a single file/buffer, after uncompression C<$output> will contain a
- concatenation of all the uncompressed data from each of the input
- files/buffers.
- 
--
--
--
--
- =head2 Optional Parameters
- 
- Unless specified below, the optional parameters for C<rawinflate>,
-@@ -551,7 +520,6 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< BinModeOut => 0|1 >>
- 
- When writing to a file or filehandle, set C<binmode> before writing to the
-@@ -559,24 +527,14 @@
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< Append => 0|1 >>
- 
- TODO
- 
- =item C<< MultiStream => 0|1 >>
- 
--
--
- This option is a no-op.
- 
--
--
--
--
- =item C<< TrailingData => $scalar >>
- 
- Returns the data, if any, that is present immediately after the compressed
-@@ -596,19 +554,12 @@
- 
- Don't bother using C<trailingData> if the input is a filename.
- 
--
--
- If you know the length of the compressed data stream before you start
- uncompressing, you can avoid having to use C<trailingData> by setting the
- C<InputLength> option.
- 
--
--
- =back
- 
--
--
--
- =head2 Examples
- 
- To read the contents of the file C<file1.txt.1951> and write the
-@@ -623,7 +574,6 @@
-     rawinflate $input => $output
-         or die "rawinflate failed: $RawInflateError\n";
- 
--
- To read from an existing Perl filehandle, C<$input>, and write the
- uncompressed data to a buffer, C<$buffer>.
- 
-@@ -667,7 +617,6 @@
- 
- The format of the constructor for IO::Uncompress::RawInflate is shown below
- 
--
-     my $z = new IO::Uncompress::RawInflate $input [OPTS]
-         or die "IO::Uncompress::RawInflate failed: $RawInflateError\n";
- 
-@@ -699,7 +648,6 @@
- read from it.
- The string '-' can be used as an alias for standard input.
- 
--
- =item A scalar reference 
- 
- If C<$input> is a scalar reference, the compressed data will be read from
-@@ -709,7 +657,6 @@
- 
- =head2 Constructor Options
- 
--
- The option names defined below are case insensitive and can be optionally
- prefixed by a '-'.  So all of the following are valid
- 
-@@ -733,8 +680,6 @@
- 
- =item C<< MultiStream => 0|1 >>
- 
--
--
- Allows multiple concatenated compressed streams to be treated as a single
- compressed stream. Decompression will stop once either the end of the
- file/buffer is reached, an error is encountered (premature eof, corrupt
-@@ -743,7 +688,6 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< Prime => $string >>
- 
- This option will uncompress the contents of C<$string> before processing the
-@@ -785,8 +729,6 @@
- the file pointer will be left pointing to the first byte directly after the
- compressed data stream.
- 
--
--
- This option defaults to off.
- 
- =item C<< Append => 0|1 >>
-@@ -803,16 +745,8 @@
- 
- =item C<< Strict => 0|1 >>
- 
--
--
- This option is a no-op.
- 
--
--
--
--
--
--
- =back
- 
- =head2 Examples
-@@ -856,7 +790,6 @@
- Returns the number of uncompressed bytes written to C<$buffer>, zero if eof
- or a negative number on error.
- 
--
- =head2 getline
- 
- Usage is
-@@ -871,7 +804,6 @@
- determine what constitutes an end of line. Paragraph mode, record mode and
- file slurp mode are all supported. 
- 
--
- =head2 getc
- 
- Usage is 
-@@ -886,8 +818,6 @@
- 
-     $char = $z->ungetc($string)
- 
--
--
- =head2 inflateSync
- 
- Usage is
-@@ -896,7 +826,6 @@
- 
- TODO
- 
--
- =head2 getHeaderInfo
- 
- Usage is
-@@ -908,9 +837,6 @@
- or hash references (in array context) that contains information about each
- of the header fields in the compressed data stream(s).
- 
--
--
--
- =head2 tell
- 
- Usage is
-@@ -927,26 +853,17 @@
-     $z->eof();
-     eof($z);
- 
--
--
- Returns true if the end of the compressed input stream has been reached.
- 
--
--
- =head2 seek
- 
-     $z->seek($position, $whence);
-     seek($z, $position, $whence);
- 
--
--
--
- Provides a sub-set of the C<seek> functionality, with the restriction
- that it is only legal to seek forward in the input file/buffer.
- It is a fatal error to attempt to seek backward.
- 
--
--
- The C<$whence> parameter takes one the usual values, namely SEEK_SET,
- SEEK_CUR or SEEK_END.
- 
-@@ -988,8 +905,6 @@
-     $z->input_line_number()
-     $z->input_line_number(EXPR)
- 
--
--
- Returns the current uncompressed line number. If C<EXPR> is present it has
- the effect of setting the line number. Note that setting the line number
- does not change the current position within the file/buffer being read.
-@@ -997,30 +912,25 @@
- The contents of C<$/> are used to to determine what constitutes a line
- terminator.
- 
--
--
- =head2 fileno
- 
-     $z->fileno()
-     fileno($z)
- 
--If the C<$z> object is associated with a file or a filehandle, this method
--will return the underlying file descriptor.
-+If the C<$z> object is associated with a file or a filehandle, C<fileno>
-+will return the underlying file descriptor. Once the C<close> method is
-+called C<fileno> will return C<undef>.
- 
--If the C<$z> object is is associated with a buffer, this method will
--return undef.
-+If the C<$z> object is is associated with a buffer, this method will return
-+C<undef>.
- 
- =head2 close
- 
-     $z->close() ;
-     close $z ;
- 
--
--
- Closes the output file/buffer. 
- 
--
--
- For most versions of Perl this method will be automatically invoked if
- the IO::Uncompress::RawInflate object is destroyed (either explicitly or by the
- variable with the reference to the object going out of scope). The
-@@ -1039,9 +949,6 @@
- object was created, and the object is associated with a file, the
- underlying file will also be closed.
- 
--
--
--
- =head2 nextStream
- 
- Usage is
-@@ -1080,8 +987,6 @@
- 
- Don't bother using C<trailingData> if the input is a filename.
- 
--
--
- If you know the length of the compressed data stream before you start
- uncompressing, you can avoid having to use C<trailingData> by setting the
- C<InputLength> option in the constructor.
-@@ -1103,8 +1008,9 @@
- 
- =head1 EXAMPLES
- 
-+=head2 Working with Net::FTP
- 
--
-+See L<IO::Uncompress::RawInflate::FAQ|IO::Uncompress::RawInflate::FAQ/"Compressed files and Net::FTP">
- 
- =head1 SEE ALSO
- 
-@@ -1116,7 +1022,6 @@
- L<Archive::Tar|Archive::Tar>,
- L<IO::Zlib|IO::Zlib>
- 
--
- For RFC 1950, 1951 and 1952 see 
- F<http://www.faqs.org/rfcs/rfc1950.html>,
- F<http://www.faqs.org/rfcs/rfc1951.html> and
-@@ -1130,22 +1035,17 @@
- 
- The primary site for gzip is F<http://www.gzip.org>.
- 
--
--
--
- =head1 AUTHOR
- 
- This module was written by Paul Marquess, F<pmqs@cpan.org>. 
- 
--
--
- =head1 MODIFICATION HISTORY
- 
- See the Changes file.
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/Unzip.pm perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/Unzip.pm
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/lib/IO/Uncompress/Unzip.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/lib/IO/Uncompress/Unzip.pm	2009-12-01 12:08:12.000000000 +0100
-@@ -8,13 +8,14 @@
- use warnings;
- use bytes;
- 
--use IO::Uncompress::RawInflate  2.008 ;
--use IO::Compress::Base::Common  2.008 qw(:Status createSelfTiedObject);
--use IO::Uncompress::Adapter::Identity 2.008 ;
--use IO::Compress::Zlib::Extra 2.008 ;
--use IO::Compress::Zip::Constants 2.008 ;
-+use IO::Uncompress::RawInflate  2.015 ;
-+use IO::Compress::Base::Common  2.015 qw(:Status createSelfTiedObject);
-+use IO::Uncompress::Adapter::Inflate  2.015 ;
-+use IO::Uncompress::Adapter::Identity 2.015 ;
-+use IO::Compress::Zlib::Extra 2.015 ;
-+use IO::Compress::Zip::Constants 2.015 ;
- 
--use Compress::Raw::Zlib  2.008 qw(crc32) ;
-+use Compress::Raw::Zlib  2.015 qw(crc32) ;
- 
- BEGIN
- {
-@@ -27,7 +28,7 @@
- 
- our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup);
- 
--$VERSION = '2.008';
-+$VERSION = '2.015';
- $UnzipError = '';
- 
- @ISA    = qw(Exporter IO::Uncompress::RawInflate);
-@@ -60,7 +61,7 @@
- 
- sub getExtraParams
- {
--    use IO::Compress::Base::Common  2.008 qw(:Parse);
-+    use IO::Compress::Base::Common  2.015 qw(:Parse);
- 
-     
-     return (
-@@ -84,6 +85,20 @@
-     return 1;
- }
- 
-+sub mkUncomp
-+{
-+    my $self = shift ;
-+    my $got = shift ;
-+
-+     my $magic = $self->ckMagic()
-+        or return 0;
-+
-+    *$self->{Info} = $self->readHeader($magic)
-+        or return undef ;
-+
-+    return 1;
-+
-+}
- 
- sub ckMagic
- {
-@@ -585,19 +600,22 @@
-     if ($compressedMethod == ZIP_CM_DEFLATE)
-     {
-         *$self->{Type} = 'zip-deflate';
-+        my $obj = IO::Uncompress::Adapter::Inflate::mkUncompObject(1,0,0);
-+
-+        *$self->{Uncomp} = $obj;
-+        *$self->{ZipData}{CRC32} = crc32(undef);
-     }
-     elsif ($compressedMethod == ZIP_CM_BZIP2)
-     {
--    #if (! defined $IO::Uncompress::Adapter::Bunzip2::VERSION)
-+        return $self->HeaderError("Unsupported Compression format $compressedMethod")
-+            if ! defined $IO::Uncompress::Adapter::Bunzip2::VERSION ;
-         
-         *$self->{Type} = 'zip-bzip2';
-         
--        my $obj = IO::Uncompress::Adapter::Bunzip2::mkUncompObject(
--                                                              );
-+        my $obj = IO::Uncompress::Adapter::Bunzip2::mkUncompObject();
- 
-         *$self->{Uncomp} = $obj;
-         *$self->{ZipData}{CRC32} = crc32(undef);
--
-     }
-     elsif ($compressedMethod == ZIP_CM_STORE)
-     {
-@@ -605,12 +623,9 @@
- 
-         *$self->{Type} = 'zip-stored';
-         
--        my $obj = IO::Uncompress::Adapter::Identity::mkUncompObject(# $got->value('CRC32'),
--                                                             # $got->value('ADLER32'),
--                                                              );
-+        my $obj = IO::Uncompress::Adapter::Identity::mkUncompObject();
- 
-         *$self->{Uncomp} = $obj;
--
-     }
-     else
-     {
-@@ -705,12 +720,8 @@
- 
- =head1 NAME
- 
--
--
- IO::Uncompress::Unzip - Read zip files/buffers
- 
--
--
- =head1 SYNOPSIS
- 
-     use IO::Uncompress::Unzip qw(unzip $UnzipError) ;
-@@ -756,20 +767,13 @@
-     eof($z)
-     close($z)
- 
--
- =head1 DESCRIPTION
- 
--
--
- This module provides a Perl interface that allows the reading of
- zlib files/buffers.
- 
- For writing zip files/buffers, see the companion module IO::Compress::Zip.
- 
--
--
--
--
- =head1 Functional Interface
- 
- A top-level function, C<unzip>, is provided to carry out
-@@ -782,14 +786,10 @@
-     unzip $input => $output [,OPTS] 
-         or die "unzip failed: $UnzipError\n";
- 
--
--
- The functional interface needs Perl5.005 or better.
- 
--
- =head2 unzip $input => $output [, OPTS]
- 
--
- C<unzip> expects at least two parameters, C<$input> and C<$output>.
- 
- =head3 The C<$input> parameter
-@@ -828,8 +828,6 @@
- The complete array will be walked to ensure that it only
- contains valid filenames before any data is uncompressed.
- 
--
--
- =item An Input FileGlob string
- 
- If C<$input> is a string that is delimited by the characters "<" and ">"
-@@ -840,13 +838,10 @@
- 
- See L<File::GlobMapper|File::GlobMapper> for more details.
- 
--
- =back
- 
- If the C<$input> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head3 The C<$output> parameter
- 
- The parameter C<$output> is used to control the destination of the
-@@ -866,14 +861,11 @@
- will be written to it.
- The string '-' can be used as an alias for standard output.
- 
--
- =item A scalar reference 
- 
- If C<$output> is a scalar reference, the uncompressed data will be
- stored in C<$$output>.
- 
--
--
- =item An Array Reference
- 
- If C<$output> is an array reference, the uncompressed data will be
-@@ -892,20 +884,13 @@
- 
- If the C<$output> parameter is any other type, C<undef> will be returned.
- 
--
--
- =head2 Notes
- 
--
- When C<$input> maps to multiple compressed files/buffers and C<$output> is
- a single file/buffer, after uncompression C<$output> will contain a
- concatenation of all the uncompressed data from each of the input
- files/buffers.
- 
--
--
--
--
- =head2 Optional Parameters
- 
- Unless specified below, the optional parameters for C<unzip>,
-@@ -925,7 +910,6 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< BinModeOut => 0|1 >>
- 
- When writing to a file or filehandle, set C<binmode> before writing to the
-@@ -933,26 +917,17 @@
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< Append => 0|1 >>
- 
- TODO
- 
- =item C<< MultiStream => 0|1 >>
- 
--
- If the input file/buffer contains multiple compressed data streams, this
- option will uncompress the whole lot as a single data stream.
- 
- Defaults to 0.
- 
--
--
--
--
- =item C<< TrailingData => $scalar >>
- 
- Returns the data, if any, that is present immediately after the compressed
-@@ -972,19 +947,12 @@
- 
- Don't bother using C<trailingData> if the input is a filename.
- 
--
--
- If you know the length of the compressed data stream before you start
- uncompressing, you can avoid having to use C<trailingData> by setting the
- C<InputLength> option.
- 
--
--
- =back
- 
--
--
--
- =head2 Examples
- 
- To read the contents of the file C<file1.txt.zip> and write the
-@@ -999,7 +967,6 @@
-     unzip $input => $output
-         or die "unzip failed: $UnzipError\n";
- 
--
- To read from an existing Perl filehandle, C<$input>, and write the
- uncompressed data to a buffer, C<$buffer>.
- 
-@@ -1043,7 +1010,6 @@
- 
- The format of the constructor for IO::Uncompress::Unzip is shown below
- 
--
-     my $z = new IO::Uncompress::Unzip $input [OPTS]
-         or die "IO::Uncompress::Unzip failed: $UnzipError\n";
- 
-@@ -1075,7 +1041,6 @@
- read from it.
- The string '-' can be used as an alias for standard input.
- 
--
- =item A scalar reference 
- 
- If C<$input> is a scalar reference, the compressed data will be read from
-@@ -1085,7 +1050,6 @@
- 
- =head2 Constructor Options
- 
--
- The option names defined below are case insensitive and can be optionally
- prefixed by a '-'.  So all of the following are valid
- 
-@@ -1109,8 +1073,6 @@
- 
- =item C<< MultiStream => 0|1 >>
- 
--
--
- Treats the complete zip file/buffer as a single compressed data
- stream. When reading in multi-stream mode each member of the zip
- file/buffer will be uncompressed in turn until the end of the file/buffer
-@@ -1118,7 +1080,6 @@
- 
- This parameter defaults to 0.
- 
--
- =item C<< Prime => $string >>
- 
- This option will uncompress the contents of C<$string> before processing the
-@@ -1160,8 +1121,6 @@
- the file pointer will be left pointing to the first byte directly after the
- compressed data stream.
- 
--
--
- This option defaults to off.
- 
- =item C<< Append => 0|1 >>
-@@ -1178,28 +1137,12 @@
- 
- =item C<< Strict => 0|1 >>
- 
--
--
- This option controls whether the extra checks defined below are used when
- carrying out the decompression. When Strict is on, the extra tests are
- carried out, when Strict is off they are not.
- 
- The default for this option is off.
- 
--
--
--
--
--
--
--
--
--
--
--
--
--
--
- =back
- 
- =head2 Examples
-@@ -1243,7 +1186,6 @@
- Returns the number of uncompressed bytes written to C<$buffer>, zero if eof
- or a negative number on error.
- 
--
- =head2 getline
- 
- Usage is
-@@ -1258,7 +1200,6 @@
- determine what constitutes an end of line. Paragraph mode, record mode and
- file slurp mode are all supported. 
- 
--
- =head2 getc
- 
- Usage is 
-@@ -1273,8 +1214,6 @@
- 
-     $char = $z->ungetc($string)
- 
--
--
- =head2 inflateSync
- 
- Usage is
-@@ -1283,7 +1222,6 @@
- 
- TODO
- 
--
- =head2 getHeaderInfo
- 
- Usage is
-@@ -1295,9 +1233,6 @@
- or hash references (in array context) that contains information about each
- of the header fields in the compressed data stream(s).
- 
--
--
--
- =head2 tell
- 
- Usage is
-@@ -1314,26 +1249,17 @@
-     $z->eof();
-     eof($z);
- 
--
--
- Returns true if the end of the compressed input stream has been reached.
- 
--
--
- =head2 seek
- 
-     $z->seek($position, $whence);
-     seek($z, $position, $whence);
- 
--
--
--
- Provides a sub-set of the C<seek> functionality, with the restriction
- that it is only legal to seek forward in the input file/buffer.
- It is a fatal error to attempt to seek backward.
- 
--
--
- The C<$whence> parameter takes one the usual values, namely SEEK_SET,
- SEEK_CUR or SEEK_END.
- 
-@@ -1375,8 +1301,6 @@
-     $z->input_line_number()
-     $z->input_line_number(EXPR)
- 
--
--
- Returns the current uncompressed line number. If C<EXPR> is present it has
- the effect of setting the line number. Note that setting the line number
- does not change the current position within the file/buffer being read.
-@@ -1384,30 +1308,25 @@
- The contents of C<$/> are used to to determine what constitutes a line
- terminator.
- 
--
--
- =head2 fileno
- 
-     $z->fileno()
-     fileno($z)
- 
--If the C<$z> object is associated with a file or a filehandle, this method
--will return the underlying file descriptor.
-+If the C<$z> object is associated with a file or a filehandle, C<fileno>
-+will return the underlying file descriptor. Once the C<close> method is
-+called C<fileno> will return C<undef>.
- 
--If the C<$z> object is is associated with a buffer, this method will
--return undef.
-+If the C<$z> object is is associated with a buffer, this method will return
-+C<undef>.
- 
- =head2 close
- 
-     $z->close() ;
-     close $z ;
- 
--
--
- Closes the output file/buffer. 
- 
--
--
- For most versions of Perl this method will be automatically invoked if
- the IO::Uncompress::Unzip object is destroyed (either explicitly or by the
- variable with the reference to the object going out of scope). The
-@@ -1426,9 +1345,6 @@
- object was created, and the object is associated with a file, the
- underlying file will also be closed.
- 
--
--
--
- =head2 nextStream
- 
- Usage is
-@@ -1467,8 +1383,6 @@
- 
- Don't bother using C<trailingData> if the input is a filename.
- 
--
--
- If you know the length of the compressed data stream before you start
- uncompressing, you can avoid having to use C<trailingData> by setting the
- C<InputLength> option in the constructor.
-@@ -1490,8 +1404,46 @@
- 
- =head1 EXAMPLES
- 
-+=head2 Working with Net::FTP
- 
-+See L<IO::Uncompress::Unzip::FAQ|IO::Uncompress::Unzip::FAQ/"Compressed files and Net::FTP">
- 
-+=head2 Walking through a zip file
-+
-+The code below can be used to traverse a zip file, one compressed data
-+stream at a time.
-+
-+    use IO::Uncompress::Unzip qw($UnzipError);
-+
-+    my $zipfile = "somefile.zip";
-+    my $u = new IO::Uncompress::Unzip $zipfile
-+        or die "Cannot open $zipfile: $UnzipError";
-+
-+    my $status;
-+    for ($status = 1; ! $u->eof(); $status = $u->nextStream())
-+    {
-+ 
-+        my $name = $u->getHeaderInfo()->{Name};
-+        warn "Processing member $name\n" ;
-+
-+        my $buff;
-+        while (($status = $u->read($buff)) > 0) {
-+            # Do something here
-+        }
-+
-+        last unless $status == 0;
-+    }
-+
-+    die "Error processing $zipfile: $!\n"
-+        if $status < 0 ;
-+
-+Each individual compressed data stream is read until the logical
-+end-of-file is reached. Then C<nextStream> is called. This will skip to the
-+start of the next compressed data stream and clear the end-of-file flag.
-+
-+It is also worth noting that C<nextStream> can be called at any time -- you
-+don't have to wait until you have exhausted a compressed data stream before
-+skipping to the next one.
- 
- =head1 SEE ALSO
- 
-@@ -1503,7 +1455,6 @@
- L<Archive::Tar|Archive::Tar>,
- L<IO::Zlib|IO::Zlib>
- 
--
- For RFC 1950, 1951 and 1952 see 
- F<http://www.faqs.org/rfcs/rfc1950.html>,
- F<http://www.faqs.org/rfcs/rfc1951.html> and
-@@ -1517,22 +1468,17 @@
- 
- The primary site for gzip is F<http://www.gzip.org>.
- 
--
--
--
- =head1 AUTHOR
- 
- This module was written by Paul Marquess, F<pmqs@cpan.org>. 
- 
--
--
- =head1 MODIFICATION HISTORY
- 
- See the Changes file.
- 
- =head1 COPYRIGHT AND LICENSE
- 
--Copyright (c) 2005-2007 Paul Marquess. All rights reserved.
-+Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
-diff -urN perl-5.10.0.orig/ext/IO_Compress_Zlib/t/006zip.t perl-5.10.0/ext/IO_Compress_Zlib/t/006zip.t
---- perl-5.10.0.orig/ext/IO_Compress_Zlib/t/006zip.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/IO_Compress_Zlib/t/006zip.t	2008-07-12 01:15:00.000000000 +0200
-@@ -0,0 +1,276 @@
-+BEGIN {
-+    if ($ENV{PERL_CORE}) {
-+	chdir 't' if -d 't';
-+	@INC = ("../lib", "lib/compress");
-+    }
-+}
-+
-+use lib qw(t t/compress);
-+use strict;
-+use warnings;
-+use bytes;
-+
-+use Test::More ;
-+use CompTestUtils;
-+
-+BEGIN {
-+    # use Test::NoWarnings, if available
-+    my $extra = 0 ;
-+    $extra = 1
-+        if eval { require Test::NoWarnings ;  import Test::NoWarnings; 1 };
-+
-+    plan tests => 77 + $extra ;
-+
-+    use_ok('IO::Compress::Zip', qw(:all)) ;
-+    use_ok('IO::Uncompress::Unzip', qw(unzip $UnzipError)) ;
-+
-+    eval { 
-+           require IO::Compress::Bzip2 ; 
-+           import  IO::Compress::Bzip2 2.010 ; 
-+           require IO::Uncompress::Bunzip2 ; 
-+           import  IO::Uncompress::Bunzip2 2.010 ; 
-+         } ;
-+
-+}
-+
-+
-+sub getContent
-+{
-+    my $filename = shift;
-+
-+    my $u = new IO::Uncompress::Unzip $filename, Append => 1
-+        or die "Cannot open $filename: $UnzipError";
-+
-+    isa_ok $u, "IO::Uncompress::Unzip";
-+
-+    my @content;
-+    my $status ;
-+
-+    for ($status = 1; ! $u->eof(); $status = $u->nextStream())
-+    {
-+ 
-+        my $name = $u->getHeaderInfo()->{Name};
-+        #warn "Processing member $name\n" ;
-+
-+        my $buff = '';
-+        1 while ($status = $u->read($buff)) > 0;
-+
-+        push @content, $buff;
-+        last unless $status == 0;
-+    }
-+
-+    die "Error processing $filename: $status $!\n"
-+        if $status < 0 ;    
-+
-+    return @content;
-+}
-+
-+
-+{
-+    title "Create a simple zip - All Deflate";
-+
-+    my $lex = new LexFile my $file1;
-+
-+    my @content = (
-+                   'hello',
-+                   '',
-+                   'goodbye ',
-+                   );
-+
-+    my $zip = new IO::Compress::Zip $file1,
-+                    Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
-+    isa_ok $zip, "IO::Compress::Zip";
-+
-+    is $zip->write($content[0]), length($content[0]), "write"; 
-+    $zip->newStream(Name=> "two", Method => ZIP_CM_DEFLATE);
-+    is $zip->write($content[1]), length($content[1]), "write"; 
-+    $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
-+    is $zip->write($content[2]), length($content[2]), "write"; 
-+    ok $zip->close(), "closed";                    
-+
-+    my @got = getContent($file1);
-+
-+    is $got[0], $content[0], "Got 1st entry";
-+    is $got[1], $content[1], "Got 2nd entry";
-+    is $got[2], $content[2], "Got 3nd entry";
-+}
-+
-+SKIP:
-+{
-+    title "Create a simple zip - All Bzip2";
-+
-+    skip "IO::Compress::Bzip2 not available", 9
-+        unless defined $IO::Compress::Bzip2::VERSION;
-+
-+    my $lex = new LexFile my $file1;
-+
-+    my @content = (
-+                   'hello',
-+                   '',
-+                   'goodbye ',
-+                   );
-+
-+    my $zip = new IO::Compress::Zip $file1,
-+                    Name => "one", Method => ZIP_CM_BZIP2, Stream => 0;
-+    isa_ok $zip, "IO::Compress::Zip";
-+
-+    is $zip->write($content[0]), length($content[0]), "write"; 
-+    $zip->newStream(Name=> "two", Method => ZIP_CM_BZIP2);
-+    is $zip->write($content[1]), length($content[1]), "write"; 
-+    $zip->newStream(Name=> "three", Method => ZIP_CM_BZIP2);
-+    is $zip->write($content[2]), length($content[2]), "write"; 
-+    ok $zip->close(), "closed";                    
-+
-+    my @got = getContent($file1);
-+
-+    is $got[0], $content[0], "Got 1st entry";
-+    is $got[1], $content[1], "Got 2nd entry";
-+    is $got[2], $content[2], "Got 3nd entry";
-+}
-+
-+SKIP:
-+{
-+    title "Create a simple zip - Deflate + Bzip2";
-+
-+    skip "IO::Compress::Bzip2 not available", 9
-+        unless $IO::Compress::Bzip2::VERSION;
-+
-+    my $lex = new LexFile my $file1;
-+
-+    my @content = (
-+                   'hello',
-+                   'and',
-+                   'goodbye ',
-+                   );
-+
-+    my $zip = new IO::Compress::Zip $file1,
-+                    Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
-+    isa_ok $zip, "IO::Compress::Zip";
-+
-+    is $zip->write($content[0]), length($content[0]), "write"; 
-+    $zip->newStream(Name=> "two", Method => ZIP_CM_BZIP2);
-+    is $zip->write($content[1]), length($content[1]), "write"; 
-+    $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
-+    is $zip->write($content[2]), length($content[2]), "write"; 
-+    ok $zip->close(), "closed";                    
-+
-+    my @got = getContent($file1);
-+
-+    is $got[0], $content[0], "Got 1st entry";
-+    is $got[1], $content[1], "Got 2nd entry";
-+    is $got[2], $content[2], "Got 3nd entry";
-+}
-+
-+{
-+    title "Create a simple zip - All STORE";
-+
-+    my $lex = new LexFile my $file1;
-+
-+    my @content = (
-+                   'hello',
-+                   '',
-+                   'goodbye ',
-+                   );
-+
-+    my $zip = new IO::Compress::Zip $file1,
-+                    Name => "one", Method => ZIP_CM_STORE, Stream => 0;
-+    isa_ok $zip, "IO::Compress::Zip";
-+
-+    is $zip->write($content[0]), length($content[0]), "write"; 
-+    $zip->newStream(Name=> "two", Method => ZIP_CM_STORE);
-+    is $zip->write($content[1]), length($content[1]), "write"; 
-+    $zip->newStream(Name=> "three", Method => ZIP_CM_STORE);
-+    is $zip->write($content[2]), length($content[2]), "write"; 
-+    ok $zip->close(), "closed";                    
-+
-+    my @got = getContent($file1);
-+
-+    is $got[0], $content[0], "Got 1st entry";
-+    is $got[1], $content[1], "Got 2nd entry";
-+    is $got[2], $content[2], "Got 3nd entry";
-+}
-+
-+{
-+    title "Create a simple zip - Deflate + STORE";
-+
-+    my $lex = new LexFile my $file1;
-+
-+    my @content = qw(
-+                   hello 
-+                       and
-+                   goodbye 
-+                   );
-+
-+    my $zip = new IO::Compress::Zip $file1,
-+                    Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
-+    isa_ok $zip, "IO::Compress::Zip";
-+
-+    is $zip->write($content[0]), length($content[0]), "write"; 
-+    $zip->newStream(Name=> "two", Method => ZIP_CM_STORE);
-+    is $zip->write($content[1]), length($content[1]), "write"; 
-+    $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
-+    is $zip->write($content[2]), length($content[2]), "write"; 
-+    ok $zip->close(), "closed";                    
-+
-+    my @got = getContent($file1);
-+
-+    is $got[0], $content[0], "Got 1st entry";
-+    is $got[1], $content[1], "Got 2nd entry";
-+    is $got[2], $content[2], "Got 3nd entry";
-+}
-+
-+{
-+    title "Create a simple zip - Deflate + zero length STORE";
-+
-+    my $lex = new LexFile my $file1;
-+
-+    my @content = (
-+                   'hello ',
-+                   '',
-+                   'goodbye ',
-+                   );
-+
-+    my $zip = new IO::Compress::Zip $file1,
-+                    Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
-+    isa_ok $zip, "IO::Compress::Zip";
-+
-+    is $zip->write($content[0]), length($content[0]), "write"; 
-+    $zip->newStream(Name=> "two", Method => ZIP_CM_STORE);
-+    is $zip->write($content[1]), length($content[1]), "write"; 
-+    $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
-+    is $zip->write($content[2]), length($content[2]), "write"; 
-+    ok $zip->close(), "closed";                    
-+
-+    my @got = getContent($file1);
-+
-+    is $got[0], $content[0], "Got 1st entry";
-+    ok $got[1] eq $content[1], "Got 2nd entry";
-+    is $got[2], $content[2], "Got 3nd entry";
-+}
-+
-+
-+SKIP:
-+for my $method (ZIP_CM_DEFLATE, ZIP_CM_STORE, ZIP_CM_BZIP2)
-+{
-+    title "Read a line from zip, Method $method";
-+
-+    skip "IO::Compress::Bzip2 not available", 14
-+        unless defined $IO::Compress::Bzip2::VERSION;
-+
-+    my $content = "a single line\n";
-+    my $zip ;
-+
-+    my $status = zip \$content => \$zip, 
-+                    Method => $method, 
-+                    Stream => 0, 
-+                    Name => "123";
-+    is $status, 1, "  Created a zip file";
-+
-+    my $u = new IO::Uncompress::Unzip \$zip;
-+    isa_ok $u, "IO::Uncompress::Unzip";
-+
-+    is $u->getline, $content, "  Read first line ok";
-+    ok ! $u->getline, "  Second line doesn't exist";
-+
-+
-+}
diff --git a/perl-update-IPC-Cmd.patch b/perl-update-IPC-Cmd.patch
deleted file mode 100644
index ee30640..0000000
--- a/perl-update-IPC-Cmd.patch
+++ /dev/null
@@ -1,1268 +0,0 @@
-IPC-Cmd-0.42
-
-diff -urN perl-5.10.0.orig/lib/IPC/Cmd/t/01_IPC-Cmd.t perl-5.10.0/lib/IPC/Cmd/t/01_IPC-Cmd.t
---- perl-5.10.0.orig/lib/IPC/Cmd/t/01_IPC-Cmd.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/IPC/Cmd/t/01_IPC-Cmd.t	2009-03-10 15:43:11.000000000 +0100
-@@ -4,30 +4,43 @@
- 
- use strict;
- use lib qw[../lib];
--use File::Spec ();
-+use File::Spec;
- use Test::More 'no_plan';
- 
--my $Class   = 'IPC::Cmd';
--my @Funcs   = qw[run can_run];
--my @Meths   = qw[can_use_ipc_run can_use_ipc_open3 can_capture_buffer];
--my $IsWin32 = $^O eq 'MSWin32';
--my $Verbose = @ARGV ? 1 : 0;
-+my $Class       = 'IPC::Cmd';
-+my $AClass      = $Class . '::TimeOut';
-+my @Funcs       = qw[run can_run QUOTE];
-+my @Meths       = qw[can_use_ipc_run can_use_ipc_open3 can_capture_buffer];
-+my $IsWin32     = $^O eq 'MSWin32';
-+my $Verbose     = @ARGV ? 1 : 0;
- 
- use_ok( $Class,         $_ ) for @Funcs;
- can_ok( $Class,         $_ ) for @Funcs, @Meths;
- can_ok( __PACKAGE__,    $_ ) for @Funcs;
- 
--my $Have_IPC_Run    = $Class->can_use_ipc_run;
--my $Have_IPC_Open3  = $Class->can_use_ipc_open3;
-+my $Have_IPC_Run    = $Class->can_use_ipc_run   || 0;
-+my $Have_IPC_Open3  = $Class->can_use_ipc_open3 || 0;
-+
-+diag("IPC::Run: $Have_IPC_Run   IPC::Open3: $Have_IPC_Open3");    
-+
-+local $IPC::Cmd::VERBOSE = $Verbose;
-+local $IPC::Cmd::VERBOSE = $Verbose;
-+local $IPC::Cmd::DEBUG   = $Verbose;
-+local $IPC::Cmd::DEBUG   = $Verbose;
- 
--$IPC::Cmd::VERBOSE  = $IPC::Cmd::VERBOSE = $Verbose;
- 
- ### run tests in various configurations, based on what modules we have
--my @Prefs = ( 
--    [ $Have_IPC_Run, $Have_IPC_Open3 ], 
--    [ 0,             $Have_IPC_Open3 ], 
--    [ 0,             0 ] 
--);
-+my @Prefs = ( );
-+push @Prefs, [ $Have_IPC_Run, $Have_IPC_Open3 ] if $Have_IPC_Run; 
-+
-+### run this config twice to ensure FD restores work properly
-+push @Prefs, [ 0,             $Have_IPC_Open3 ],     
-+             [ 0,             $Have_IPC_Open3 ] if $Have_IPC_Open3;
-+
-+### run this config twice to ensure FD restores work properly
-+### these are the system() tests;
-+push @Prefs, [ 0,             0 ],  [ 0,             0 ];     
-+
- 
- ### can_run tests
- {
-@@ -35,59 +48,92 @@
-     ok( !can_run('10283lkjfdalskfjaf'), q[Not found non-existant binary] );
- }
- 
--### run tests that print only to stdout
--{   ### list of commands and regexes matching output ###
-+{   ### list of commands and regexes matching output 
-+    ### XXX use " everywhere when using literal strings as commands for
-+    ### portability, especially on win32
-     my $map = [
--        # command                                    # output regex
--        [ "$^X -v",                                  qr/larry\s+wall/i, ],
--        [ [$^X, '-v'],                               qr/larry\s+wall/i, ],
--        [ "$^X -eprint+42 | $^X -neprint",           qr/42/,            ],
--        [ [$^X,qw[-eprint+42 |], $^X, qw|-neprint|], qr/42/,            ],
-+        # command                                    # output regex     # buffer
-+
-+        ### run tests that print only to stdout
-+        [ "$^X -v",                                  qr/larry\s+wall/i, 3, ],
-+        [ [$^X, '-v'],                               qr/larry\s+wall/i, 3, ],
-+
-+        ### pipes
-+        [ "$^X -eprint+424 | $^X -neprint+split+2",  qr/44/,            3, ],
-+        [ [$^X,qw[-eprint+424 |], $^X, qw|-neprint+split+2|], 
-+                                                     qr/44/,            3, ],
-+        ### whitespace
-+        [ [$^X, '-eprint+shift', q|a b a|],          qr/a b a/,         3, ],
-+        [ qq[$^X -eprint+shift "a b a"],             qr/a b a/,         3, ],
-+
-+        ### whitespace + pipe
-+        [ [$^X, '-eprint+shift', q|a b a|, q[|], $^X, qw[-neprint+split+b] ],
-+                                                     qr/a  a/,          3, ],
-+        [ qq[$^X -eprint+shift "a b a" | $^X -neprint+split+b],
-+                                                     qr/a  a/,          3, ],
-+
-+        ### run tests that print only to stderr
-+        [ "$^X -ewarn+42",                           qr/^42 /,          4, ],
-+        [ [$^X, '-ewarn+42'],                        qr/^42 /,          4, ],
-     ];
- 
--    diag( "Running tests that print only to stdout" ) if $Verbose;
-+    ### extended test in developer mode
-+    ### test if gzip | tar works
-+    if( $Verbose ) {   
-+        my $gzip = can_run('gzip');
-+        my $tar  = can_run('tar');
-+        
-+        if( $gzip and $tar ) {
-+            push @$map,
-+                [ [$gzip, qw[-cdf src/x.tgz |], $tar, qw[-tf -]],     
-+                                                       qr/a/,           3, ];
-+        }
-+    }        
-+
-     ### for each configuarion
-     for my $pref ( @Prefs ) {
--        diag( "Running config: IPC::Run: $pref->[0] IPC::Open3: $pref->[1]" )
--            if $Verbose;
- 
--        $IPC::Cmd::USE_IPC_RUN    = $IPC::Cmd::USE_IPC_RUN      = $pref->[0];
--        $IPC::Cmd::USE_IPC_OPEN3  = $IPC::Cmd::USE_IPC_OPEN3    = $pref->[1];
-+        local $IPC::Cmd::USE_IPC_RUN    = !!$pref->[0];
-+        local $IPC::Cmd::USE_IPC_RUN    = !!$pref->[0];
-+        local $IPC::Cmd::USE_IPC_OPEN3  = !!$pref->[1];
-+        local $IPC::Cmd::USE_IPC_OPEN3  = !!$pref->[1];
- 
-         ### for each command
-         for my $aref ( @$map ) {
--            my $cmd                 = $aref->[0];
--            my $regex               = $aref->[1];
-+            my $cmd    = $aref->[0];
-+            my $regex  = $aref->[1];
-+            my $index  = $aref->[2];
-+
-+            my $pp_cmd = ref $cmd ? "Array: @$cmd" : "Scalar: $cmd";
-+            $pp_cmd .= " (IPC::Run: $pref->[0] IPC::Open3: $pref->[1])";
- 
--            my $pp_cmd = ref $cmd ? "@$cmd" : "$cmd";
--            diag( "Running '$pp_cmd' as " . (ref $cmd ? "ARRAY" : "SCALAR") ) 
--                if $Verbose;
-+            diag( "Running '$pp_cmd'") if $Verbose;
- 
-             ### in scalar mode
--            {   diag( "Running scalar mode" ) if $Verbose;
--                my $buffer;
-+            {   my $buffer;
-                 my $ok = run( command => $cmd, buffer => \$buffer );
- 
--                ok( $ok,        "Ran command succesfully" );
-+                ok( $ok,        "Ran '$pp_cmd' command succesfully" );
-                 
-                 SKIP: {
-                     skip "No buffers available", 1 
-                                 unless $Class->can_capture_buffer;
-                     
-                     like( $buffer, $regex,  
--                                "   Buffer filled properly" );
-+                                "   Buffer matches $regex -- ($pp_cmd)" );
-                 }
-             }
-                 
-             ### in list mode                
-             {   diag( "Running list mode" ) if $Verbose;
-                 my @list = run( command => $cmd );
--                ok( $list[0],   "Command ran successfully" );
--                ok( !$list[1],  "   No error code set" );
-+
-+                ok( $list[0],   "Ran '$pp_cmd' successfully" );
-+                ok( !$list[1],  "   No error code set -- ($pp_cmd)" );
- 
-                 my $list_length = $Class->can_capture_buffer ? 5 : 2;
-                 is( scalar(@list), $list_length,
--                                "   Output list has $list_length entries" );
-+                                "   Output list has $list_length entries -- ($pp_cmd)" );
- 
-                 SKIP: {
-                     skip "No buffers available", 6 
-@@ -97,188 +143,81 @@
-                     isa_ok( $list[$_], 'ARRAY' ) for 2..4;
- 
-                     like( "@{$list[2]}", $regex,
--                                "   Combined buffer holds output" );
-+                                "   Combined buffer matches $regex -- ($pp_cmd)" );
- 
--                    like( "@{$list[3]}", qr/$regex/,
--                            "   Stdout buffer filled" );
--                    is( scalar( @{$list[4]} ), 0,
--                                    "   Stderr buffer empty" );
-+                    like( "@{$list[$index]}", qr/$regex/,
-+                            "   Proper buffer($index) matches $regex -- ($pp_cmd)" );
-+                    is( scalar( @{$list[ $index==3 ? 4 : 3 ]} ), 0,
-+                                    "   Other buffer empty -- ($pp_cmd)" );
-                 }
-             }
-         }
-     }
- }
-+__END__
-+### special call to check that output is interleaved properly
-+{   my $cmd     = [$^X, File::Spec->catfile( qw[src output.pl] ) ];
- 
--### run tests that print only to stderr
--### XXX lots of duplication from stdout tests, only difference
--### is buffer inspection
--{   ### list of commands and regexes matching output ###
--    my $map = [
--        # command                                    # output regex
--        [ "$^X -ewarn+42",                          qr/^42 /, ],
--        [ [$^X, '-ewarn+42'],                       qr/^42 /, ],
--    ];
--
--    diag( "Running tests that print only to stderr" ) if $Verbose;
-     ### for each configuarion
-     for my $pref ( @Prefs ) {
-         diag( "Running config: IPC::Run: $pref->[0] IPC::Open3: $pref->[1]" )
-             if $Verbose;
- 
--        $IPC::Cmd::USE_IPC_RUN    = $IPC::Cmd::USE_IPC_RUN      = $pref->[0];
--        $IPC::Cmd::USE_IPC_OPEN3  = $IPC::Cmd::USE_IPC_OPEN3    = $pref->[1];
--
--        ### for each command
--        for my $aref ( @$map ) {
--            my $cmd                 = $aref->[0];
--            my $regex               = $aref->[1];
--
--            my $pp_cmd = ref $cmd ? "@$cmd" : "$cmd";
--            diag( "Running '$pp_cmd' as " . (ref $cmd ? "ARRAY" : "SCALAR") )
--                if $Verbose;
--
--            ### in scalar mode
--            {   diag( "Running stderr command in scalar mode" ) if $Verbose;
--                my $buffer;
--                my $ok = run( command => $cmd, buffer => \$buffer );
--
--                ok( $ok,        "Ran stderr command succesfully in scalar mode." );
--
--                SKIP: {
--           # No buffers are expected if neither IPC::Run nor IPC::Open3 is used.
--                    skip "No buffers available", 1
--                                unless $Class->can_capture_buffer;
-+        local $IPC::Cmd::USE_IPC_RUN    = $pref->[0];
-+        local $IPC::Cmd::USE_IPC_OPEN3  = $pref->[1];
- 
--                    like( $buffer, $regex,
--                                "   Buffer filled properly from stderr" );
--                }
--            }
--
--            ### in list mode
--            {   diag( "Running stderr command in list mode" ) if $Verbose;
--                my @list = run( command => $cmd );
--                ok( $list[0],   "Ran stderr command successfully in list mode." );
--                ok( !$list[1],  "   No error code set" );
--
--                my $list_length = $Class->can_capture_buffer ? 5 : 2;
--                is( scalar(@list), $list_length,
--                                "   Output list has $list_length entries" );
--
--                SKIP: {
--           # No buffers are expected if neither IPC::Run nor IPC::Open3 is used.
--                    skip "No buffers available", 6
--                                unless $Class->can_capture_buffer;
--
--                    ### the last 3 entries from the RV, are they array refs?
--                    isa_ok( $list[$_], 'ARRAY' ) for 2..4;
--
--                    like( "@{$list[2]}", $regex,
--                                "   Combined buffer holds output" );
--
--                    is( scalar( @{$list[3]} ), 0,
--                                    "   Stdout buffer empty" );
--                    like( "@{$list[4]}", qr/$regex/,
--                            "   Stderr buffer filled" );
--                }
-+        my @list    = run( command => $cmd, buffer => \my $buffer );
-+        ok( $list[0],                   "Ran @{$cmd} successfully" );
-+        ok( !$list[1],                  "   No errorcode set" );
-+        SKIP: {
-+            skip "No buffers available", 3 unless $Class->can_capture_buffer;
-+
-+            TODO: {
-+                local $TODO = qq[Can't interleave input/output buffers yet];
-+
-+                is( "@{$list[2]}",'1 2 3 4',"   Combined output as expected" );
-+                is( "@{$list[3]}", '1 3',   "   STDOUT as expected" );
-+                is( "@{$list[4]}", '2 4',   "   STDERR as expected" );
-+            
-             }
-         }
--    }
-+    }        
- }
- 
-+
-+
- ### test failures
- {   ### for each configuarion
-     for my $pref ( @Prefs ) {
-         diag( "Running config: IPC::Run: $pref->[0] IPC::Open3: $pref->[1]" )
-             if $Verbose;
- 
--        $IPC::Cmd::USE_IPC_RUN    = $IPC::Cmd::USE_IPC_RUN      = $pref->[0];
--        $IPC::Cmd::USE_IPC_OPEN3  = $IPC::Cmd::USE_IPC_OPEN3    = $pref->[1];
-+        local $IPC::Cmd::USE_IPC_RUN    = $pref->[0];
-+        local $IPC::Cmd::USE_IPC_OPEN3  = $pref->[1];
- 
--        my $ok = run( command => "$^X -ledie" );
--        ok( !$ok,               "Failure caught" );
-+        my ($ok,$err) = run( command => "$^X -edie" );
-+        ok( !$ok,               "Non-zero exit caught" );
-+        ok( $err,               "   Error '$err'" );
-     }
--}    
--
--__END__
--
--
--### check if IPC::Run is already loaded, if so, IPC::Run tests
--### from IPC::Run are known to fail on win32
--my $Skip_IPC_Run = ($^O eq 'MSWin32' && exists $INC{'IPC/Run.pm'}) ? 1 : 0;
--
--use_ok( 'IPC::Cmd' ) or diag "Cmd.pm not found.  Dying", die;
--
--IPC::Cmd->import( qw[can_run run] );
--
--### silence it ###
--$IPC::Cmd::VERBOSE = $IPC::Cmd::VERBOSE = $ARGV[0] ? 1 : 0;
--
--{
--    ok( can_run('perl'),                q[Found 'perl' in your path] );
--    ok( !can_run('10283lkjfdalskfjaf'), q[Not found non-existant binary] );
--}
--
-+}   
- 
--{   ### list of commands and regexes matching output ###
--    my $map = [
--        ["$^X -v",                                  qr/larry\s+wall/i, ],
--        [[$^X, '-v'],                               qr/larry\s+wall/i, ],
--        ["$^X -eprint1 | $^X -neprint",             qr/1/,             ],
--        [[$^X,qw[-eprint1 |], $^X, qw|-neprint|],   qr/1/,             ],
--    ];
--
--    my @prefs = ( [1,1], [0,1], [0,0] );
--
--    ### if IPC::Run is already loaded,remove tests involving IPC::Run
--    ### when on win32
--    shift @prefs if $Skip_IPC_Run;
--
--    for my $pref ( @prefs ) {
--        $IPC::Cmd::USE_IPC_RUN    = $IPC::Cmd::USE_IPC_RUN      = $pref->[0];
--        $IPC::Cmd::USE_IPC_OPEN3  = $IPC::Cmd::USE_IPC_OPEN3    = $pref->[1];
--
--        for my $aref ( @$map ) {
--            my $cmd     = $aref->[0];
--            my $regex   = $aref->[1];
--
--            my $Can_Buffer;
--            my $captured;
--            my $ok = run( command => $cmd,
--                          buffer  => \$captured,
--                    );
--
--            ok($ok,     q[Successful run of command] );
--
--            SKIP: {
--                skip "No buffers returned", 1 unless $captured;
--                like( $captured, $regex,      q[   Buffer filled] );
--
--                ### if we get here, we have buffers ###
--                $Can_Buffer++;
--            }
--
--            my @list = run( command => $cmd );
--            ok( $list[0],       "Command ran successfully" );
--            ok( !$list[1],      "   No error code set" );
--
--            SKIP: {
--                skip "No buffers, cannot do buffer tests", 3
--                        unless $Can_Buffer;
-+### timeout tests
-+{   my $timeout = 1;
-+    for my $pref ( @Prefs ) {
-+        diag( "Running config: IPC::Run: $pref->[0] IPC::Open3: $pref->[1]" )
-+            if $Verbose;
- 
--                ok( (grep /$regex/, @{$list[2]}),
--                                    "   Out buffer filled" );
--                SKIP: {
--                    skip "IPC::Run bug prevents separated " .
--                            "stdout/stderr buffers", 2 if $pref->[0];
-+        local $IPC::Cmd::USE_IPC_RUN    = $pref->[0];
-+        local $IPC::Cmd::USE_IPC_OPEN3  = $pref->[1];
- 
--                    ok( (grep /$regex/, @{$list[3]}),
--                                        "   Stdout buffer filled" );
--                    ok( @{$list[4]} == 0,
--                                        "   Stderr buffer empty" );
--                }
--            }
--        }
-+        ### -X to quiet the 'sleep without parens is ambiguous' warning
-+        my ($ok,$err) = run( command => "$^X -Xesleep+4", timeout => $timeout );
-+        ok( !$ok,               "Timeout caught" );
-+        ok( $err,               "   Error stored" );
-+        ok( not(ref($err)),     "   Error string is not a reference" );
-+        like( $err,qr/^$AClass/,"   Error '$err' mentions $AClass" );
-     }
--}
-+}    
-+    
- 
- 
-diff -urN perl-5.10.0.orig/lib/IPC/Cmd/t/src/output.pl perl-5.10.0/lib/IPC/Cmd/t/src/output.pl
---- perl-5.10.0.orig/lib/IPC/Cmd/t/src/output.pl	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/IPC/Cmd/t/src/output.pl	2009-03-10 15:43:11.000000000 +0100
-@@ -0,0 +1,13 @@
-+use strict;
-+use warnings;
-+use IO::Handle;
-+
-+STDOUT->autoflush(1);
-+STDERR->autoflush(1);
-+
-+my $max = shift || 4;
-+for ( 1..$max ) {
-+    $_ % 2 
-+        ? print STDOUT $_
-+        : print STDERR $_;
-+}
-diff -urN perl-5.10.0.orig/lib/IPC/Cmd/t/src/x.tgz.packed perl-5.10.0/lib/IPC/Cmd/t/src/x.tgz.packed
---- perl-5.10.0.orig/lib/IPC/Cmd/t/src/x.tgz.packed	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/IPC/Cmd/t/src/x.tgz.packed	2009-03-10 15:43:43.000000000 +0100
-@@ -0,0 +1,18 @@
-+#########################################################################
-+This is a binary file that was packed with the 'uupacktool.pl' which
-+is included in the Perl distribution.
-+
-+To unpack this file use the following command:
-+
-+     uupacktool.pl -u lib/IPC/Cmd/t/src/x.tgz.packed lib/IPC/Cmd/t/src/x.tgz
-+
-+To recreate it use the following command:
-+
-+     uupacktool.pl -p lib/IPC/Cmd/t/src/x.tgz lib/IPC/Cmd/t/src/x.tgz.packed
-+
-+Created at Tue Mar 10 15:43:43 2009
-+#########################################################################
-+__UU__
-+M'XL(`````````^W.NPW"0!!%T2EE2YC%:[N>#7""1,"G?QM##!&.SDE&(]W@
-+M]?B_K)E3:Y&;>1KWFZ?W_Q&O)(<Z9!OW/FN4/&!;/.^/?BLE+OUZ_M9MV;(<
-+6,0@```````````!^6P'GVS1B`"@`````
-diff -urN perl-5.10.0.orig/lib/IPC/Cmd.pm perl-5.10.0/lib/IPC/Cmd.pm
---- perl-5.10.0.orig/lib/IPC/Cmd.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/IPC/Cmd.pm	2009-03-10 15:42:10.000000000 +0100
-@@ -4,16 +4,19 @@
- 
- BEGIN {
- 
--    use constant IS_VMS   => $^O eq 'VMS'                       ? 1 : 0;    
--    use constant IS_WIN32 => $^O eq 'MSWin32'                   ? 1 : 0;
--    use constant IS_WIN98 => (IS_WIN32 and !Win32::IsWinNT())   ? 1 : 0;
-+    use constant IS_VMS         => $^O eq 'VMS'                       ? 1 : 0;    
-+    use constant IS_WIN32       => $^O eq 'MSWin32'                   ? 1 : 0;
-+    use constant IS_WIN98       => (IS_WIN32 and !Win32::IsWinNT())   ? 1 : 0;
-+    use constant ALARM_CLASS    => __PACKAGE__ . '::TimeOut';
-+    use constant SPECIAL_CHARS  => qw[< > | &];
-+    use constant QUOTE          => do { IS_WIN32 ? q["] : q['] };            
- 
-     use Exporter    ();
-     use vars        qw[ @ISA $VERSION @EXPORT_OK $VERBOSE $DEBUG
-                         $USE_IPC_RUN $USE_IPC_OPEN3 $WARN
-                     ];
- 
--    $VERSION        = '0.40_1';
-+    $VERSION        = '0.42';
-     $VERBOSE        = 0;
-     $DEBUG          = 0;
-     $WARN           = 1;
-@@ -21,12 +24,13 @@
-     $USE_IPC_OPEN3  = not IS_VMS;
- 
-     @ISA            = qw[Exporter];
--    @EXPORT_OK      = qw[can_run run];
-+    @EXPORT_OK      = qw[can_run run QUOTE];
- }
- 
- require Carp;
- use File::Spec;
- use Params::Check               qw[check];
-+use Text::ParseWords            ();             # import ONLY if needed!
- use Module::Load::Conditional   qw[can_load];
- use Locale::Maketext::Simple    Style => 'gettext';
- 
-@@ -50,7 +54,8 @@
-     my $buffer;
-     if( scalar run( command => $cmd,
-                     verbose => 0,
--                    buffer  => \$buffer )
-+                    buffer  => \$buffer,
-+                    timeout => 20 )
-     ) {
-         print "fetched webpage successfully: $buffer\n";
-     }
-@@ -73,6 +78,7 @@
-     ### don't have IPC::Cmd be verbose, ie don't print to stdout or
-     ### stderr when running commands -- default is '0'
-     $IPC::Cmd::VERBOSE = 0;
-+         
- 
- =head1 DESCRIPTION
- 
-@@ -86,7 +92,7 @@
- 
- =head1 CLASS METHODS 
- 
--=head2 $bool = IPC::Cmd->can_use_ipc_run( [VERBOSE] )
-+=head2 $ipc_run_version = IPC::Cmd->can_use_ipc_run( [VERBOSE] )
- 
- Utility function that tells you if C<IPC::Run> is available. 
- If the verbose flag is passed, it will print diagnostic messages
-@@ -109,10 +115,10 @@
-                     );
-                     
-     ### otherwise, we're good to go
--    return 1;                    
-+    return $IPC::Run::VERSION;                    
- }
- 
--=head2 $bool = IPC::Cmd->can_use_ipc_open3( [VERBOSE] )
-+=head2 $ipc_open3_version = IPC::Cmd->can_use_ipc_open3( [VERBOSE] )
- 
- Utility function that tells you if C<IPC::Open3> is available. 
- If the verbose flag is passed, it will print diagnostic messages
-@@ -126,17 +132,17 @@
-     my $verbose = shift || 0;
- 
-     ### ipc::open3 is not working on VMS becasue of a lack of fork.
--    ### todo, win32 also does not have fork, so need to do more research.
--    return 0 if IS_VMS;
-+    ### XXX todo, win32 also does not have fork, so need to do more research.
-+    return if IS_VMS;
- 
--    ### ipc::open3 works on every platform, but it can't capture buffers
--    ### on win32 :(
-+    ### ipc::open3 works on every non-VMS platform platform, but it can't 
-+    ### capture buffers on win32 :(
-     return unless can_load(
-         modules => { map {$_ => '0.0'} qw|IPC::Open3 IO::Select Symbol| },
-         verbose => ($WARN && $verbose),
-     );
-     
--    return 1;
-+    return $IPC::Open3::VERSION;
- }
- 
- =head2 $bool = IPC::Cmd->can_capture_buffer
-@@ -201,9 +207,9 @@
-     }
- }
- 
--=head2 $ok | ($ok, $err, $full_buf, $stdout_buff, $stderr_buff) = run( command => COMMAND, [verbose => BOOL, buffer => \$SCALAR] );
-+=head2 $ok | ($ok, $err, $full_buf, $stdout_buff, $stderr_buff) = run( command => COMMAND, [verbose => BOOL, buffer => \$SCALAR, timeout => DIGIT] );
- 
--C<run> takes 3 arguments:
-+C<run> takes 4 arguments:
- 
- =over 4
- 
-@@ -238,6 +244,16 @@
- Of course, this requires that the underlying call supports buffers. See
- the note on buffers right above.
- 
-+=item timeout
-+
-+Sets the maximum time the command is allowed to run before aborting,
-+using the built-in C<alarm()> call. If the timeout is triggered, the
-+C<errorcode> in the return value will be set to an object of the 
-+C<IPC::Cmd::TimeOut> class. See the C<errorcode> section below for
-+details.
-+
-+Defaults to C<0>, meaning no timeout is set.
-+
- =back
- 
- C<run> will return a simple C<true> or C<false> when called in scalar
-@@ -251,11 +267,15 @@
- A simple boolean indicating if the command executed without errors or
- not.
- 
--=item errorcode
-+=item error message
- 
- If the first element of the return value (success) was 0, then some
--error occurred. This second element is the error code the command
--you requested exited with, if available.
-+error occurred. This second element is the error message the command
-+you requested exited with, if available. This is generally a pretty 
-+printed value of C<$?> or C<$@>. See C<perldoc perlvar> for details on 
-+what they can contain.
-+If the error was a timeout, the C<error message> will be prefixed with
-+the string C<IPC::Cmd::TimeOut>, the timeout class.
- 
- =item full_buffer
- 
-@@ -288,27 +308,48 @@
- 
- =cut
- 
-+{   my @acc = qw[ok error _fds];
-+    
-+    ### autogenerate accessors ###
-+    for my $key ( @acc ) {
-+        no strict 'refs';
-+        *{__PACKAGE__."::$key"} = sub {
-+            $_[0]->{$key} = $_[1] if @_ > 1;
-+            return $_[0]->{$key};
-+        }
-+    }
-+}
-+
- sub run {
-+    ### container to store things in
-+    my $self = bless {}, __PACKAGE__;
-+
-     my %hash = @_;
-     
-     ### if the user didn't provide a buffer, we'll store it here.
-     my $def_buf = '';
-     
--    my($verbose,$cmd,$buffer);
-+    my($verbose,$cmd,$buffer,$timeout);
-     my $tmpl = {
-         verbose => { default  => $VERBOSE,  store => \$verbose },
-         buffer  => { default  => \$def_buf, store => \$buffer },
-         command => { required => 1,         store => \$cmd,
--                     allow    => sub { !ref($_[0]) or ref($_[0]) eq 'ARRAY' } 
-+                     allow    => sub { !ref($_[0]) or ref($_[0]) eq 'ARRAY' }, 
-         },
-+        timeout => { default  => 0,         store => \$timeout },                    
-     };
--
-+    
-     unless( check( $tmpl, \%hash, $VERBOSE ) ) {
--        Carp::carp(loc("Could not validate input: %1", Params::Check->last_error));
-+        Carp::carp( loc( "Could not validate input: %1",
-+                         Params::Check->last_error ) );
-         return;
-     };        
- 
--    print loc("Running [%1]...\n", (ref $cmd ? "@$cmd" : $cmd)) if $verbose;
-+    ### strip any empty elements from $cmd if present
-+    $cmd = [ grep { length && defined } @$cmd ] if ref $cmd;
-+
-+    my $pp_cmd = (ref $cmd ? "@$cmd" : $cmd);
-+    print loc("Running [%1]...\n", $pp_cmd ) if $verbose;
- 
-     ### did the user pass us a buffer to fill or not? if so, set this
-     ### flag so we know what is expected of us
-@@ -323,7 +364,7 @@
-     my $_out_handler = sub {
-         my $buf = shift;
-         return unless defined $buf;
--        
-+       
-         print STDOUT $buf if $verbose;
-         push @buffer,   $buf;
-         push @buff_out, $buf;
-@@ -341,39 +382,70 @@
-     
- 
-     ### flag to indicate we have a buffer captured
--    my $have_buffer = __PACKAGE__->can_capture_buffer ? 1 : 0;
-+    my $have_buffer = $self->can_capture_buffer ? 1 : 0;
-     
-     ### flag indicating if the subcall went ok
-     my $ok;
-     
--    ### IPC::Run is first choice if $USE_IPC_RUN is set.
--    if( $USE_IPC_RUN and __PACKAGE__->can_use_ipc_run( 1 ) ) {
--        ### ipc::run handlers needs the command as a string or an array ref
--
--        __PACKAGE__->_debug( "# Using IPC::Run. Have buffer: $have_buffer" )
--            if $DEBUG;
-+    ### dont look at previous errors:
-+    local $?;  
-+    local $@;
-+    local $!;
-+
-+    ### we might be having a timeout set
-+    eval {   
-+        local $SIG{ALRM} = sub { die bless sub { 
-+            ALARM_CLASS . 
-+            qq[: Command '$pp_cmd' aborted by alarm after $timeout seconds]
-+        }, ALARM_CLASS } if $timeout;
-+        alarm $timeout || 0;
-+    
-+        ### IPC::Run is first choice if $USE_IPC_RUN is set.
-+        if( $USE_IPC_RUN and $self->can_use_ipc_run( 1 ) ) {
-+            ### ipc::run handlers needs the command as a string or an array ref
-+    
-+            $self->_debug( "# Using IPC::Run. Have buffer: $have_buffer" )
-+                if $DEBUG;
-+                
-+            $ok = $self->_ipc_run( $cmd, $_out_handler, $_err_handler );
-+    
-+        ### since IPC::Open3 works on all platforms, and just fails on
-+        ### win32 for capturing buffers, do that ideally
-+        } elsif ( $USE_IPC_OPEN3 and $self->can_use_ipc_open3( 1 ) ) {
-+    
-+            $self->_debug("# Using IPC::Open3. Have buffer: $have_buffer")
-+                if $DEBUG;
-+    
-+            ### in case there are pipes in there;
-+            ### IPC::Open3 will call exec and exec will do the right thing 
-+            $ok = $self->_open3_run( 
-+                                    $cmd, $_out_handler, $_err_handler, $verbose 
-+                                );
-             
--        $ok = __PACKAGE__->_ipc_run( $cmd, $_out_handler, $_err_handler );
--
--    ### since IPC::Open3 works on all platforms, and just fails on
--    ### win32 for capturing buffers, do that ideally
--    } elsif ( $USE_IPC_OPEN3 and __PACKAGE__->can_use_ipc_open3( 1 ) ) {
--
--        __PACKAGE__->_debug( "# Using IPC::Open3. Have buffer: $have_buffer" )
--            if $DEBUG;
--
--        ### in case there are pipes in there;
--        ### IPC::Open3 will call exec and exec will do the right thing 
--        $ok = __PACKAGE__->_open3_run( 
--                                ( ref $cmd ? "@$cmd" : $cmd ),
--                                $_out_handler, $_err_handler, $verbose 
--                            );
-+        ### if we are allowed to run verbose, just dispatch the system command
-+        } else {
-+            $self->_debug( "# Using system(). Have buffer: $have_buffer" )
-+                if $DEBUG;
-+            $ok = $self->_system_run( $cmd, $verbose );
-+        }
-         
--    ### if we are allowed to run verbose, just dispatch the system command
--    } else {
--        __PACKAGE__->_debug( "# Using system(). Have buffer: $have_buffer" )
--            if $DEBUG;
--        $ok = __PACKAGE__->_system_run( (ref $cmd ? "@$cmd" : $cmd), $verbose );
-+        alarm 0;
-+    };
-+   
-+    ### restore STDIN after duping, or STDIN will be closed for
-+    ### this current perl process!   
-+    $self->__reopen_fds( @{ $self->_fds} ) if $self->_fds;
-+    
-+    my $err;
-+    unless( $ok ) {
-+        ### alarm happened
-+        if ( $@ and ref $@ and $@->isa( ALARM_CLASS ) ) {
-+            $err = $@->();  # the error code is an expired alarm
-+
-+        ### another error happened, set by the dispatchub
-+        } else {
-+            $err = $self->error;
-+        }
-     }
-     
-     ### fill the buffer;
-@@ -383,8 +455,8 @@
-     ### context, or just a simple 'ok' in scalar
-     return wantarray
-                 ? $have_buffer
--                    ? ($ok, $?, \@buffer, \@buff_out, \@buff_err)
--                    : ($ok, $? )
-+                    ? ($ok, $err, \@buffer, \@buff_out, \@buff_err)
-+                    : ($ok, $err )
-                 : $ok
-     
-     
-@@ -418,15 +490,30 @@
-                             ? qw[STDIN STDOUT STDERR] 
-                             : qw[STDIN]
-                         );
--    __PACKAGE__->__dup_fds( @fds_to_dup );
-+    $self->_fds( \@fds_to_dup );
-+    $self->__dup_fds( @fds_to_dup );
-     
--
--    my $pid = IPC::Open3::open3(
-+    ### pipes have to come in a quoted string, and that clashes with
-+    ### whitespace. This sub fixes up such commands so they run properly
-+    $cmd = $self->__fix_cmd_whitespace_and_special_chars( $cmd );
-+        
-+    ### dont stringify @$cmd, so spaces in filenames/paths are
-+    ### treated properly
-+    my $pid = eval { 
-+        IPC::Open3::open3(
-                     '<&STDIN',
-                     (IS_WIN32 ? '>&STDOUT' : $kidout),
-                     (IS_WIN32 ? '>&STDERR' : $kiderror),
--                    $cmd
-+                    ( ref $cmd ? @$cmd : $cmd ),
-                 );
-+    };
-+    
-+    ### open3 error occurred 
-+    if( $@ and $@ =~ /^open3:/ ) {
-+        $self->ok( 0 );
-+        $self->error( $@ );
-+        return;
-+    };
- 
-     ### use OUR stdin, not $kidin. Somehow,
-     ### we never get the input.. so jump through
-@@ -459,7 +546,7 @@
-                 warn(loc("Error reading from process: %1", $!));
-                 last OUTER;
-             }
--            
-+
-             ### check for $len. it may be 0, at which point we're
-             ### done reading, so don't try to process it.
-             ### if we would print anyway, we'd provide bogus information
-@@ -478,88 +565,130 @@
- 
-     ### restore STDIN after duping, or STDIN will be closed for
-     ### this current perl process!
--    __PACKAGE__->__reopen_fds( @fds_to_dup );
-+    ### done in the parent call now
-+    # $self->__reopen_fds( @fds_to_dup );
-     
--    return if $?;   # some error occurred
--    return 1;
-+    ### some error occurred
-+    if( $? ) {
-+        $self->error( $self->_pp_child_error( $cmd, $? ) );   
-+        $self->ok( 0 );
-+        return;
-+    } else {
-+        return $self->ok( 1 );
-+    }
- }
- 
-+### text::parsewords::shellwordss() uses unix semantics. that will break
-+### on win32
-+{   my $parse_sub = IS_WIN32 
-+                        ? __PACKAGE__->can('_split_like_shell_win32')
-+                        : Text::ParseWords->can('shellwords');
-+
-+    sub _ipc_run {  
-+        my $self            = shift;
-+        my $cmd             = shift;
-+        my $_out_handler    = shift;
-+        my $_err_handler    = shift;
-+        
-+        STDOUT->autoflush(1); STDERR->autoflush(1);
- 
--sub _ipc_run {  
--    my $self            = shift;
--    my $cmd             = shift;
--    my $_out_handler    = shift;
--    my $_err_handler    = shift;
--    
--    STDOUT->autoflush(1); STDERR->autoflush(1);
-+        ### a command like:
-+        # [
-+        #     '/usr/bin/gzip',
-+        #     '-cdf',
-+        #     '/Users/kane/sources/p4/other/archive-extract/t/src/x.tgz',
-+        #     '|',
-+        #     '/usr/bin/tar',
-+        #     '-tf -'
-+        # ]
-+        ### needs to become:
-+        # [
-+        #     ['/usr/bin/gzip', '-cdf',
-+        #       '/Users/kane/sources/p4/other/archive-extract/t/src/x.tgz']
-+        #     '|',
-+        #     ['/usr/bin/tar', '-tf -']
-+        # ]
-+
-+    
-+        my @command; 
-+        my $special_chars;
-+    
-+        my $re = do { my $x = join '', SPECIAL_CHARS; qr/([$x])/ };
-+        if( ref $cmd ) {
-+            my $aref = [];
-+            for my $item (@$cmd) {
-+                if( $item =~ $re ) {
-+                    push @command, $aref, $item;
-+                    $aref = [];
-+                    $special_chars .= $1;
-+                } else {
-+                    push @$aref, $item;
-+                }
-+            }
-+            push @command, $aref;
-+        } else {
-+            @command = map { if( $_ =~ $re ) {
-+                                $special_chars .= $1; $_;
-+                             } else {
-+#                                [ split /\s+/ ]
-+                                 [ map { m/[ ]/ ? qq{'$_'} : $_ } $parse_sub->($_) ]
-+                             }
-+                        } split( /\s*$re\s*/, $cmd );
-+        }
- 
--    ### a command like:
--    # [
--    #     '/usr/bin/gzip',
--    #     '-cdf',
--    #     '/Users/kane/sources/p4/other/archive-extract/t/src/x.tgz',
--    #     '|',
--    #     '/usr/bin/tar',
--    #     '-tf -'
--    # ]
--    ### needs to become:
--    # [
--    #     ['/usr/bin/gzip', '-cdf',
--    #       '/Users/kane/sources/p4/other/archive-extract/t/src/x.tgz']
--    #     '|',
--    #     ['/usr/bin/tar', '-tf -']
--    # ]
--
--    
--    my @command; my $special_chars;
--    if( ref $cmd ) {
--        my $aref = [];
--        for my $item (@$cmd) {
--            if( $item =~ /([<>|&])/ ) {
--                push @command, $aref, $item;
--                $aref = [];
--                $special_chars .= $1;
-+        ### if there's a pipe in the command, *STDIN needs to 
-+        ### be inserted *BEFORE* the pipe, to work on win32
-+        ### this also works on *nix, so we should do it when possible
-+        ### this should *also* work on multiple pipes in the command
-+        ### if there's no pipe in the command, append STDIN to the back
-+        ### of the command instead.
-+        ### XXX seems IPC::Run works it out for itself if you just
-+        ### dont pass STDIN at all.
-+        #     if( $special_chars and $special_chars =~ /\|/ ) {
-+        #         ### only add STDIN the first time..
-+        #         my $i;
-+        #         @command = map { ($_ eq '|' && not $i++) 
-+        #                             ? ( \*STDIN, $_ ) 
-+        #                             : $_ 
-+        #                         } @command; 
-+        #     } else {
-+        #         push @command, \*STDIN;
-+        #     }
-+  
-+        # \*STDIN is already included in the @command, see a few lines up
-+        my $ok = eval { IPC::Run::run(   @command, 
-+                                fileno(STDOUT).'>',
-+                                $_out_handler,
-+                                fileno(STDERR).'>',
-+                                $_err_handler
-+                            )
-+                        };
-+
-+        ### all is well
-+        if( $ok ) {
-+            return $self->ok( $ok );
-+
-+        ### some error occurred
-+        } else {
-+            $self->ok( 0 );
-+
-+            ### if the eval fails due to an exception, deal with it
-+            ### unless it's an alarm 
-+            if( $@ and not UNIVERSAL::isa( $@, ALARM_CLASS ) ) {        
-+                $self->error( $@ );
-+
-+            ### if it *is* an alarm, propagate        
-+            } elsif( $@ ) {
-+                die $@;
-+
-+            ### some error in the sub command
-             } else {
--                push @$aref, $item;
-+                $self->error( $self->_pp_child_error( $cmd, $? ) );
-             }
-+    
-+            return;
-         }
--        push @command, $aref;
--    } else {
--        @command = map { if( /([<>|&])/ ) {
--                            $special_chars .= $1; $_;
--                         } else {
--                            [ split / +/ ]
--                         }
--                    } split( /\s*([<>|&])\s*/, $cmd );
--    }
-- 
--    ### if there's a pipe in the command, *STDIN needs to 
--    ### be inserted *BEFORE* the pipe, to work on win32
--    ### this also works on *nix, so we should do it when possible
--    ### this should *also* work on multiple pipes in the command
--    ### if there's no pipe in the command, append STDIN to the back
--    ### of the command instead.
--    ### XXX seems IPC::Run works it out for itself if you just
--    ### dont pass STDIN at all.
--    #     if( $special_chars and $special_chars =~ /\|/ ) {
--    #         ### only add STDIN the first time..
--    #         my $i;
--    #         @command = map { ($_ eq '|' && not $i++) 
--    #                             ? ( \*STDIN, $_ ) 
--    #                             : $_ 
--    #                         } @command; 
--    #     } else {
--    #         push @command, \*STDIN;
--    #     }
--  
-- 
--    # \*STDIN is already included in the @command, see a few lines up
--    return IPC::Run::run(   @command, 
--                            fileno(STDOUT).'>',
--                            $_out_handler,
--                            fileno(STDERR).'>',
--                            $_err_handler
--                        );
-+    }
- }
- 
- sub _system_run { 
-@@ -567,18 +696,117 @@
-     my $cmd     = shift;
-     my $verbose = shift || 0;
- 
-+    ### pipes have to come in a quoted string, and that clashes with
-+    ### whitespace. This sub fixes up such commands so they run properly
-+    $cmd = $self->__fix_cmd_whitespace_and_special_chars( $cmd );
-+
-     my @fds_to_dup = $verbose ? () : qw[STDOUT STDERR];
--    __PACKAGE__->__dup_fds( @fds_to_dup );
--    
-+    $self->_fds( \@fds_to_dup );
-+    $self->__dup_fds( @fds_to_dup );
-+
-     ### system returns 'true' on failure -- the exit code of the cmd
--    system( $cmd );
-+    $self->ok( 1 );
-+    system( ref $cmd ? @$cmd : $cmd ) == 0 or do {
-+        $self->error( $self->_pp_child_error( $cmd, $? ) );
-+        $self->ok( 0 );
-+    };
-+
-+    ### done in the parent call now
-+    #$self->__reopen_fds( @fds_to_dup );
-+
-+    return unless $self->ok;
-+    return $self->ok;
-+}
-+
-+{   my %sc_lookup = map { $_ => $_ } SPECIAL_CHARS;
-+
-+
-+    sub __fix_cmd_whitespace_and_special_chars {
-+        my $self = shift;
-+        my $cmd  = shift;
-+
-+        ### command has a special char in it
-+        if( ref $cmd and grep { $sc_lookup{$_} } @$cmd ) {
-+            
-+            ### since we have special chars, we have to quote white space
-+            ### this *may* conflict with the parsing :(
-+            my $fixed;
-+            my @cmd = map { / / ? do { $fixed++; QUOTE.$_.QUOTE } : $_ } @$cmd;
-+            
-+            $self->_debug( "# Quoted $fixed arguments containing whitespace" )
-+                    if $DEBUG && $fixed;
-+            
-+            ### stringify it, so the special char isn't escaped as argument
-+            ### to the program
-+            $cmd = join ' ', @cmd;
-+        }
-+
-+        return $cmd;
-+    }
-+}
-+
-+
-+### XXX this is cribbed STRAIGHT from M::B 0.30 here:
-+### http://search.cpan.org/src/KWILLIAMS/Module-Build-0.30/lib/Module/Build/Platform/Windows.pm:split_like_shell
-+### XXX this *should* be integrated into text::parsewords
-+sub _split_like_shell_win32 {
-+  # As it turns out, Windows command-parsing is very different from
-+  # Unix command-parsing.  Double-quotes mean different things,
-+  # backslashes don't necessarily mean escapes, and so on.  So we
-+  # can't use Text::ParseWords::shellwords() to break a command string
-+  # into words.  The algorithm below was bashed out by Randy and Ken
-+  # (mostly Randy), and there are a lot of regression tests, so we
-+  # should feel free to adjust if desired.
-+  
-+  local $_ = shift;
-+  
-+  my @argv;
-+  return @argv unless defined() && length();
-+  
-+  my $arg = '';
-+  my( $i, $quote_mode ) = ( 0, 0 );
-+  
-+  while ( $i < length() ) {
-     
--    __PACKAGE__->__reopen_fds( @fds_to_dup );
-+    my $ch      = substr( $_, $i  , 1 );
-+    my $next_ch = substr( $_, $i+1, 1 );
-     
--    return if $?;
--    return 1;
-+    if ( $ch eq '\\' && $next_ch eq '"' ) {
-+      $arg .= '"';
-+      $i++;
-+    } elsif ( $ch eq '\\' && $next_ch eq '\\' ) {
-+      $arg .= '\\';
-+      $i++;
-+    } elsif ( $ch eq '"' && $next_ch eq '"' && $quote_mode ) {
-+      $quote_mode = !$quote_mode;
-+      $arg .= '"';
-+      $i++;
-+    } elsif ( $ch eq '"' && $next_ch eq '"' && !$quote_mode &&
-+          ( $i + 2 == length()  ||
-+        substr( $_, $i + 2, 1 ) eq ' ' )
-+        ) { # for cases like: a"" => [ 'a' ]
-+      push( @argv, $arg );
-+      $arg = '';
-+      $i += 2;
-+    } elsif ( $ch eq '"' ) {
-+      $quote_mode = !$quote_mode;
-+    } elsif ( $ch eq ' ' && !$quote_mode ) {
-+      push( @argv, $arg ) if $arg;
-+      $arg = '';
-+      ++$i while substr( $_, $i + 1, 1 ) eq ' ';
-+    } else {
-+      $arg .= $ch;
-+    }
-+    
-+    $i++;
-+  }
-+  
-+  push( @argv, $arg ) if defined( $arg ) && length( $arg );
-+  return @argv;
- }
- 
-+
-+
- {   use File::Spec;
-     use Symbol;
- 
-@@ -660,9 +888,50 @@
-     return 1;
- }
- 
-+sub _pp_child_error {
-+    my $self    = shift;
-+    my $cmd     = shift or return;
-+    my $ce      = shift or return;
-+    my $pp_cmd  = ref $cmd ? "@$cmd" : $cmd;
-+    
-+            
-+    my $str;
-+    if( $ce == -1 ) {
-+        ### Include $! in the error message, so that the user can
-+        ### see 'No such file or directory' versus 'Permission denied'
-+        ### versus 'Cannot fork' or whatever the cause was.
-+        $str = "Failed to execute '$pp_cmd': $!";
-+
-+    } elsif ( $ce & 127 ) {       
-+        ### some signal
-+        $str = loc( "'%1' died with signal %d, %s coredump\n",
-+               $pp_cmd, ($ce & 127), ($ce & 128) ? 'with' : 'without');
-+
-+    } else {
-+        ### Otherwise, the command run but gave error status.
-+        $str = "'$pp_cmd' exited with value " . ($ce >> 8);
-+    }
-+  
-+    $self->_debug( "# Child error '$ce' translated to: $str" ) if $DEBUG;
-+    
-+    return $str;
-+}
- 
- 1;
- 
-+=head2 $q = QUOTE
-+
-+Returns the character used for quoting strings on this platform. This is
-+usually a C<'> (single quote) on most systems, but some systems use different
-+quotes. For example, C<Win32> uses C<"> (double quote). 
-+
-+You can use it as follows:
-+
-+  use IPC::Cmd qw[run QUOTE];
-+  my $cmd = q[echo ] . QUOTE . q[foo bar] . QUOTE;
-+
-+This makes sure that C<foo bar> is treated as a string, rather than two
-+seperate arguments to the C<echo> function.
- 
- __END__
- 
-@@ -733,11 +1002,28 @@
- 
- =over 4
- 
--=item Whitespace
-+=item Whitespace and IPC::Open3 / system()
- 
--When you provide a string as this argument, the string will be
--split on whitespace to determine the individual elements of your
--command. Although this will usually just Do What You Mean, it may
-+When using C<IPC::Open3> or C<system>, if you provide a string as the
-+C<command> argument, it is assumed to be appropriately escaped. You can
-+use the C<QUOTE> constant to use as a portable quote character (see above).
-+However, if you provide and C<Array Reference>, special rules apply:
-+
-+If your command contains C<Special Characters> (< > | &), it will
-+be internally stringified before executing the command, to avoid that these
-+special characters are escaped and passed as arguments instead of retaining
-+their special meaning.
-+
-+However, if the command contained arguments that contained whitespace, 
-+stringifying the command would loose the significance of the whitespace.
-+Therefor, C<IPC::Cmd> will quote any arguments containing whitespace in your
-+command if the command is passed as an arrayref and contains special characters.
-+
-+=item Whitespace and IPC::Run
-+
-+When using C<IPC::Run>, if you provide a string as the C<command> argument, 
-+the string will be split on whitespace to determine the individual elements 
-+of your command. Although this will usually just Do What You Mean, it may
- break if you have files or commands with whitespace in them.
- 
- If you do not wish this to happen, you should provide an array
-@@ -765,12 +1051,30 @@
- 
- Since this will lead to issues as described above.
- 
-+
- =item IO Redirect
- 
- Currently it is too complicated to parse your command for IO
- Redirections. For capturing STDOUT or STDERR there is a work around
- however, since you can just inspect your buffers for the contents.
- 
-+=item Interleaving STDOUT/STDERR
-+
-+Neither IPC::Run nor IPC::Open3 can interleave STDOUT and STDERR. For short
-+bursts of output from a program, ie this sample:
-+
-+    for ( 1..4 ) {
-+        $_ % 2 ? print STDOUT $_ : print STDERR $_;
-+    }
-+
-+IPC::[Run|Open3] will first read all of STDOUT, then all of STDERR, meaning 
-+the output looks like 1 line on each, namely '13' on STDOUT and '24' on STDERR.
-+
-+It should have been 1, 2, 3, 4.
-+
-+This has been recorded in L<rt.cpan.org> as bug #37532: Unable to interleave
-+STDOUT and STDERR
-+
- =back
- 
- =head1 See Also
diff --git a/perl-update-Module-CoreList.patch b/perl-update-Module-CoreList.patch
deleted file mode 100644
index 74b6be2..0000000
--- a/perl-update-Module-CoreList.patch
+++ /dev/null
@@ -1,788 +0,0 @@
-Module-CoreList-2.17
-
-diff -urN perl-5.10.0.orig/lib/Module/CoreList/bin/corelist perl-5.10.0/lib/Module/CoreList/bin/corelist
---- perl-5.10.0.orig/lib/Module/CoreList/bin/corelist	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Module/CoreList/bin/corelist	2009-02-10 11:51:46.000000000 +0100
-@@ -11,14 +11,14 @@
- =head1 SYNOPSIS
- 
-     corelist -v
--    corelist [-a] <ModuleName> | /<ModuleRegex>/ [<ModuleVersion>] ...
-+    corelist [-a|-d] <ModuleName> | /<ModuleRegex>/ [<ModuleVersion>] ...
-     corelist [-v <PerlVersion>] [ <ModuleName> | /<ModuleRegex>/ ] ...
- 
- =head1 OPTIONS
- 
- =over
- 
--=item -a modulename
-+=item -a
- 
- lists all versions of the given module (or the matching modules, in case you
- used a module regexp) in the perls Module::CoreList knows about.
-@@ -44,6 +44,11 @@
-       5.009002   1.04
-       5.009003   1.06
- 
-+=item -d
-+
-+finds the first perl version where a module has been released by
-+date, and not by version number (as is the default).
-+
- =item -? or -help
- 
- help! help! help! to see more help, try --man.
-@@ -79,7 +84,7 @@
- 
- my %Opts;
- 
--GetOptions(\%Opts, qw[ help|?! man! v|version:f a! ] );
-+GetOptions(\%Opts, qw[ help|?! man! v|version:f a! d ] );
- 
- pod2usage(1) if $Opts{help};
- pod2usage(-verbose=>2) if $Opts{man};
-@@ -93,15 +98,16 @@
-     }
- 
-     $Opts{v} = numify_version( $Opts{v} );
--    if( !exists $Module::CoreList::version{$Opts{v}} ) {
-+    my $version_hash = Module::CoreList->find_version($Opts{v});
-+    if( !$version_hash ) {
-         print "\nModule::CoreList has no info on perl v$Opts{v}\n\n";
-         exit 1;
-     }
- 
-     if ( !@ARGV ) {
- 	print "\nThe following modules were in perl v$Opts{v} CORE\n";
--	print "$_ ", $Module::CoreList::version{$Opts{v}}{$_} || " ","\n"
--	for sort keys %{$Module::CoreList::version{$Opts{v}}};
-+	print "$_ ", $version_hash->{$_} || " ","\n"
-+	for sort keys %$version_hash;
- 	print "\n";
- 	exit 0;
-     }
-@@ -149,12 +155,17 @@
-     my($mod,$ver) = @_;
- 
-     if ( $Opts{v} ) {
--        return printf "  %-24s %-10s\n",
--            $mod,
--            $Module::CoreList::version{$Opts{v}}{$mod} || 'undef';
-+	my $version_hash = Module::CoreList->find_version($Opts{v});
-+	if ($version_hash) {
-+	    print $mod, " ", $version_hash->{$mod} || 'undef', "\n";
-+	    return;
-+	}
-+	else { die "Shouldn't happen" }
-     }
- 
--    my $ret = Module::CoreList->first_release(@_);
-+    my $ret = $Opts{d}
-+	? Module::CoreList->first_release_by_date(@_)
-+	: Module::CoreList->first_release(@_);
-     my $msg = $mod;
-     $msg .= " $ver" if $ver;
- 
-@@ -184,13 +195,12 @@
- 
- sub numify_version {
-     my $ver = shift;
--    if ( index( $ver, q{.}, index( $ver, q{.} ) ) >= 0 ) {
--	eval { require version };
--	if ($@) {
--	    die "You need to install version.pm to use dotted version numbers\n";
--	}
-+    if ($ver =~ /\..+\./) {
-+	eval { require version ; 1 }
-+	    or die "You need to install version.pm to use dotted version numbers\n";
-         $ver = version->new($ver)->numify;
-     }
-+    $ver += 0;
-     return $ver;
- }
- 
-diff -urN perl-5.10.0.orig/lib/Module/CoreList.pm perl-5.10.0/lib/Module/CoreList.pm
---- perl-5.10.0.orig/lib/Module/CoreList.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Module/CoreList.pm	2009-02-10 11:51:14.000000000 +0100
-@@ -1,7 +1,7 @@
- package Module::CoreList;
- use strict;
- use vars qw/$VERSION %released %patchlevel %version %families/;
--$VERSION = '2.13';
-+$VERSION = '2.17';
- 
- =head1 NAME
- 
-@@ -59,7 +59,7 @@
- 
- Module::CoreList currently covers the 5.000, 5.001, 5.002, 5.003_07, 5.004,
- 5.004_05, 5.005, 5.005_03, 5.005_04, 5.6.0, 5.6.1, 5.6.2, 5.7.3, 5.8.0, 5.8.1,
--5.8.2, 5.8.3, 5.8.4, 5.8.5, 5.8.6, 5.8.7, 5.8.8, 5.9.0, 5.9.1, 5.9.2, 5.9.3,
-+5.8.2, 5.8.3, 5.8.4, 5.8.5, 5.8.6, 5.8.7, 5.8.8, 5.8.9, 5.9.0, 5.9.1, 5.9.2, 5.9.3,
- 5.9.4, 5.9.5 and 5.10.0 releases of perl.
- 
- =head1 HISTORY
-@@ -74,7 +74,7 @@
- 
- =head1 COPYRIGHT
- 
--Copyright (C) 2002-2007 Richard Clamp.  All Rights Reserved.
-+Copyright (C) 2002-2009 Richard Clamp.  All Rights Reserved.
- 
- This module is free software; you can redistribute it and/or modify it
- under the same terms as Perl itself.
-@@ -138,12 +138,17 @@
-     return sort keys %mods
- }
- 
-+sub find_version {
-+    my ($class, $v) = @_;
-+    return $version{$v} if defined $version{$v};
-+    return undef;
-+}
- 
- # when things escaped
- %released = (
-     5.000    => '1994-10-17',
-     5.001    => '1995-03-14',
--    5.002    => '1996-02-96',
-+    5.002    => '1996-02-29',
-     5.00307  => '1996-10-10',
-     5.004    => '1997-05-15',
-     5.005    => '1998-07-22',
-@@ -170,13 +175,14 @@
-     5.009004 => '2006-08-15',
-     5.009005 => '2007-07-07',
-     5.010000 => '2007-12-18',
-+    5.008009 => '2008-12-14',
-    );
- 
- # perforce branches and patch levels
- %patchlevel = (
-     5.005    => [perl => 1647],
-     5.00503  => ['maint-5.005' => 3198],
--    5.00405  => ['maint-5.004' => 999],
-+    5.00405  => ['maint-5.004' => 3296],
-     5.006    => [perl => 5899],
-     5.006001 => ['maint-5.6' => 9654],
-     5.006002 => ['maint-5.6' => 21727],
-@@ -198,6 +204,7 @@
-     5.009004 => [perl => 28727],
-     5.009005 => [perl => 31562],
-     5.010000 => [perl => 32642],
-+    5.008009 => ['maint-5.8' => 35095],
- );
- 
- for my $version ( sort { $a <=> $b } keys %released ) {
-@@ -1377,6 +1384,7 @@
-         'ExtUtils::MM_Win32'    => undef, #./lib/ExtUtils/MM_Win32.pm
-         'ExtUtils::MakeMaker'   => '5.45', #./lib/ExtUtils/MakeMaker.pm
-         'ExtUtils::Manifest'    => '1.33 ', #./lib/ExtUtils/Manifest.pm
-+        'ExtUtils::Miniperl'    => undef,
-         'ExtUtils::Mkbootstrap' => '1.14 ', #./lib/ExtUtils/Mkbootstrap.pm
-         'ExtUtils::Mksymlists'  => '1.17 ', #./lib/ExtUtils/Mksymlists.pm
-         'ExtUtils::Packlist'    => '0.03', #./lib/ExtUtils/Packlist.pm
-@@ -1601,6 +1609,7 @@
-         'ExtUtils::Liblist'     => 1.26 ,
-         'ExtUtils::MakeMaker'   => 5.45,
-         'ExtUtils::Manifest'    => 1.33 ,
-+        'ExtUtils::Miniperl'    => undef,
-         'ExtUtils::Mkbootstrap' => 1.14 ,
-         'ExtUtils::Mksymlists'  => 1.17 ,
-         'ExtUtils::MM_Cygwin'   => undef,
-@@ -2002,7 +2011,7 @@
-         'warnings'              => undef, #lib/warnings.pm
-         'warnings::register'    => undef, #lib/warnings/register.pm
-         'XSLoader'              => '0.01', #lib/XSLoader.pm
--   },
-+    },
- 
-     5.007003   => {
-         'AnyDBM_File'           => '1.00',
-@@ -2103,6 +2112,7 @@
-         'ExtUtils::Liblist'     => '1.2701',
-         'ExtUtils::MakeMaker'   => '5.48_03',
-         'ExtUtils::Manifest'    => '1.35',
-+        'ExtUtils::Miniperl'    => undef,
-         'ExtUtils::Mkbootstrap' => '1.1401',
-         'ExtUtils::Mksymlists'  => '1.18',
-         'ExtUtils::MM_BeOS'     => '1.00',
-@@ -2424,6 +2434,7 @@
-         'ExtUtils::Liblist::Kid'=> '1.29', #./lib/ExtUtils/Liblist/Kid.pm
-         'ExtUtils::MakeMaker'   => '6.03', #./lib/ExtUtils/MakeMaker.pm
-         'ExtUtils::Manifest'    => '1.38', #./lib/ExtUtils/Manifest.pm
-+        'ExtUtils::Miniperl'    => undef,
-         'ExtUtils::Mkbootstrap' => '1.15', #./lib/ExtUtils/Mkbootstrap.pm
-         'ExtUtils::Mksymlists'  => '1.19', #./lib/ExtUtils/Mksymlists.pm
-         'ExtUtils::MM'          => '0.04', #./lib/ExtUtils/MM.pm
-@@ -4457,6 +4468,7 @@
-         'XSLoader'              => '0.03',  #lib/XSLoader.pm
-         'XS::Typemap'           => '0.01',  #lib/XS/Typemap.pm
-     },
-+
-     5.008004 => {
-         'AnyDBM_File'           => '1.00',  #lib/AnyDBM_File.pm
-         'attributes'            => '0.06',  #lib/attributes.pm
-@@ -5550,6 +5562,7 @@
-         'XSLoader'              => '0.02',  #lib/XSLoader.pm
-         'XS::Typemap'           => '0.01',  #lib/XS/Typemap.pm
-     },
-+
-     5.009002 => {
- 	'AnyDBM_File'           => '1.00',
- 	'Attribute::Handlers'   => '0.78_01',
-@@ -5590,6 +5603,7 @@
- 	'Carp::Heavy'           => '1.04',
- 	'Class::ISA'            => '0.33',
- 	'Class::Struct'         => '0.63',
-+        'Config'                => undef,
- 	'Config::Extensions'    => '0.01',
- 	'Cwd'                   => '3.05',
- 	'DB'                    => '1.0',
-@@ -5668,6 +5682,7 @@
- 	'ExtUtils::MakeMaker::bytes'=> '0.01',
- 	'ExtUtils::MakeMaker::vmsish'=> '0.01',
- 	'ExtUtils::Manifest'    => '1.44',
-+        'ExtUtils::Miniperl'    => undef,
- 	'ExtUtils::Mkbootstrap' => '1.15',
- 	'ExtUtils::Mksymlists'  => '1.19',
- 	'ExtUtils::Packlist'    => '0.04',
-@@ -5914,6 +5929,7 @@
- 	'warnings'              => '1.04',
- 	'warnings::register'    => '1.00',
-     },
-+
-     5.008007 => {
- 	'AnyDBM_File'           => '1.00',
- 	'Attribute::Handlers'   => '0.78_01',
-@@ -5954,6 +5970,7 @@
- 	'Carp::Heavy'           => '1.04',
- 	'Class::ISA'            => '0.33',
- 	'Class::Struct'         => '0.63',
-+        'Config'                => undef,
- 	'Cwd'                   => '3.05',
- 	'DB'                    => '1.0',
- 	'DBM_Filter'            => '0.01',
-@@ -6031,6 +6048,7 @@
- 	'ExtUtils::MakeMaker::bytes'=> '0.01',
- 	'ExtUtils::MakeMaker::vmsish'=> '0.01',
- 	'ExtUtils::Manifest'    => '1.42',
-+        'ExtUtils::Miniperl'    => undef,
- 	'ExtUtils::Mkbootstrap' => '1.15',
- 	'ExtUtils::Mksymlists'  => '1.19',
- 	'ExtUtils::Packlist'    => '0.04',
-@@ -6273,6 +6291,7 @@
- 	'warnings'              => '1.03',
- 	'warnings::register'    => '1.00',
-     },
-+
-     5.009003 => {
- 	'AnyDBM_File'           => '1.00',
- 	'Archive::Tar'          => '1.26_01',
-@@ -6343,6 +6362,7 @@
- 	'Compress::Zlib::ParseParameters'=> '2.000_07',
- 	'Compress::Zlib::UncompressPlugin::Identity'=> '2.000_05',
- 	'Compress::Zlib::UncompressPlugin::Inflate'=> '2.000_05',
-+        'Config'                => undef,
- 	'Config::Extensions'    => '0.01',
- 	'Cwd'                   => '3.15',
- 	'DB'                    => '1.01',
-@@ -6438,6 +6458,7 @@
- 	'ExtUtils::MakeMaker::bytes'=> '0.01',
- 	'ExtUtils::MakeMaker::vmsish'=> '0.01',
- 	'ExtUtils::Manifest'    => '1.46',
-+        'ExtUtils::Miniperl'    => undef,
- 	'ExtUtils::Mkbootstrap' => '1.15',
- 	'ExtUtils::Mksymlists'  => '1.19',
- 	'ExtUtils::Packlist'    => '0.04',
-@@ -6722,6 +6743,7 @@
- 	'warnings'              => '1.05',
- 	'warnings::register'    => '1.01',
-     },
-+
-     5.008008 => {
- 	'AnyDBM_File'           => '1.00',
- 	'Attribute::Handlers'   => '0.78_02',
-@@ -6762,6 +6784,7 @@
- 	'Carp::Heavy'           => '1.04',
- 	'Class::ISA'            => '0.33',
- 	'Class::Struct'         => '0.63',
-+        'Config'                => undef,
- 	'Cwd'                   => '3.12',
- 	'DB'                    => '1.01',
- 	'DBM_Filter'            => '0.01',
-@@ -6844,6 +6867,7 @@
- 	'ExtUtils::MakeMaker::bytes'=> '0.01',
- 	'ExtUtils::MakeMaker::vmsish'=> '0.01',
- 	'ExtUtils::Manifest'    => '1.46',
-+        'ExtUtils::Miniperl'    => undef,
- 	'ExtUtils::Mkbootstrap' => '1.15',
- 	'ExtUtils::Mksymlists'  => '1.19',
- 	'ExtUtils::Packlist'    => '0.04',
-@@ -7089,6 +7113,7 @@
- 	'warnings'              => '1.05',
- 	'warnings::register'    => '1.01',
-     },
-+
-     5.009004 => {
- 	'AnyDBM_File'           => '1.00',
- 	'Archive::Tar'          => '1.30_01',
-@@ -7138,6 +7163,7 @@
- 	'Class::Struct'         => '0.63',
- 	'Compress::Raw::Zlib'   => '2.000_13',
- 	'Compress::Zlib'        => '2.000_13',
-+        'Config'                => undef,
- 	'Config::Extensions'    => '0.01',
- 	'Cwd'                   => '3.19',
- 	'DB'                    => '1.01',
-@@ -7233,6 +7259,7 @@
- 	'ExtUtils::MakeMaker::bytes'=> '0.01',
- 	'ExtUtils::MakeMaker::vmsish'=> '0.01',
- 	'ExtUtils::Manifest'    => '1.46_01',
-+        'ExtUtils::Miniperl'    => undef,
- 	'ExtUtils::Mkbootstrap' => '1.15_01',
- 	'ExtUtils::Mksymlists'  => '1.19_01',
- 	'ExtUtils::Packlist'    => '1.41',
-@@ -7571,6 +7598,7 @@
- 	'warnings'              => '1.05',
- 	'warnings::register'    => '1.01',
-     },
-+
-     5.009005 => {
- 	'AnyDBM_File'           => '1.00',
- 	'Archive::Extract'      => '0.22_01',
-@@ -8105,6 +8133,7 @@
- 	'warnings'              => '1.06',
- 	'warnings::register'    => '1.01',
-     },
-+
-     5.010000 => {
- 	'AnyDBM_File'           => '1.00',
- 	'Archive::Extract'      => '0.24',
-@@ -8285,6 +8314,7 @@
- 	'ExtUtils::MakeMaker::bytes'=> '6.42',
- 	'ExtUtils::MakeMaker::vmsish'=> '6.42',
- 	'ExtUtils::Manifest'    => '1.51_01',
-+        'ExtUtils::Miniperl'    => undef,
- 	'ExtUtils::Mkbootstrap' => '6.42',
- 	'ExtUtils::Mksymlists'  => '6.42',
- 	'ExtUtils::Packlist'    => '1.43',
-@@ -8644,7 +8674,418 @@
- 	'warnings'              => '1.06',
- 	'warnings::register'    => '1.01',
-     },
-+
-+    5.008009 => {
-+	'AnyDBM_File'           => '1.00',
-+	'Attribute::Handlers'   => '0.78_03',
-+	'AutoLoader'            => '5.67',
-+	'AutoSplit'             => '1.06',
-+	'B'                     => '1.19',
-+	'B::Asmdata'            => '1.02',
-+	'B::Assembler'          => '0.08',
-+	'B::Bblock'             => '1.02_01',
-+	'B::Bytecode'           => '1.01_01',
-+	'B::C'                  => '1.05',
-+	'B::CC'                 => '1.00_01',
-+	'B::Concise'            => '0.76',
-+	'B::Debug'              => '1.05',
-+	'B::Deparse'            => '0.87',
-+	'B::Disassembler'       => '1.05',
-+	'B::Lint'               => '1.11',
-+	'B::Lint::Debug'        => undef,
-+	'B::Showlex'            => '1.02',
-+	'B::Stackobj'           => '1.00',
-+	'B::Stash'              => '1.00',
-+	'B::Terse'              => '1.05',
-+	'B::Xref'               => '1.01',
-+	'Benchmark'             => '1.1',
-+	'ByteLoader'            => '0.06',
-+	'CGI'                   => '3.42',
-+	'CGI::Apache'           => '1.00',
-+	'CGI::Carp'             => '1.30_01',
-+	'CGI::Cookie'           => '1.29',
-+	'CGI::Fast'             => '1.07',
-+	'CGI::Pretty'           => '1.08',
-+	'CGI::Push'             => '1.04',
-+	'CGI::Switch'           => '1.00',
-+	'CGI::Util'             => '1.5_01',
-+	'CPAN'                  => '1.9301',
-+	'CPAN::Debug'           => '5.5',
-+	'CPAN::DeferedCode'     => '5.50',
-+	'CPAN::Distroprefs'     => '6',
-+	'CPAN::FirstTime'       => '5.5_01',
-+	'CPAN::HandleConfig'    => '5.5',
-+	'CPAN::Kwalify'         => '5.50',
-+	'CPAN::Nox'             => '5.50',
-+	'CPAN::Queue'           => '5.5',
-+	'CPAN::Tarzip'          => '5.5',
-+	'CPAN::Version'         => '5.5',
-+	'Carp'                  => '1.10',
-+	'Carp::Heavy'           => '1.10',
-+	'Class::ISA'            => '0.33',
-+	'Class::Struct'         => '0.63',
-+	'Config'                => undef,
-+	'Cwd'                   => '3.29',
-+	'DB'                    => '1.01',
-+	'DBM_Filter'            => '0.02',
-+	'DBM_Filter::compress'  => '0.02',
-+	'DBM_Filter::encode'    => '0.02',
-+	'DBM_Filter::int32'     => '0.02',
-+	'DBM_Filter::null'      => '0.02',
-+	'DBM_Filter::utf8'      => '0.02',
-+	'DB_File'               => '1.817',
-+	'DCLsym'                => '1.03',
-+	'Data::Dumper'          => '2.121_17',
-+	'Devel::DProf'          => '20080331.00',
-+	'Devel::InnerPackage'   => '0.3',
-+	'Devel::PPPort'         => '3.14',
-+	'Devel::Peek'           => '1.04',
-+	'Devel::SelfStubber'    => '1.03',
-+	'Digest'                => '1.15',
-+	'Digest::MD5'           => '2.37',
-+	'Digest::base'          => '1.00',
-+	'Digest::file'          => '1.00',
-+	'DirHandle'             => '1.02',
-+	'Dumpvalue'             => '1.12',
-+	'DynaLoader'            => '1.09',
-+	'Encode'                => '2.26',
-+	'Encode::Alias'         => '2.10',
-+	'Encode::Byte'          => '2.03',
-+	'Encode::CJKConstants'  => '2.02',
-+	'Encode::CN'            => '2.02',
-+	'Encode::CN::HZ'        => '2.05',
-+	'Encode::Config'        => '2.05',
-+	'Encode::EBCDIC'        => '2.02',
-+	'Encode::Encoder'       => '2.01',
-+	'Encode::Encoding'      => '2.05',
-+	'Encode::GSM0338'       => '2.01',
-+	'Encode::Guess'         => '2.02',
-+	'Encode::JP'            => '2.03',
-+	'Encode::JP::H2Z'       => '2.02',
-+	'Encode::JP::JIS7'      => '2.04',
-+	'Encode::KR'            => '2.02',
-+	'Encode::KR::2022_KR'   => '2.02',
-+	'Encode::MIME::Header'  => '2.05',
-+	'Encode::MIME::Header::ISO_2022_JP'=> '1.03',
-+	'Encode::MIME::Name'    => '1.01',
-+	'Encode::Symbol'        => '2.02',
-+	'Encode::TW'            => '2.02',
-+	'Encode::Unicode'       => '2.05',
-+	'Encode::Unicode::UTF7' => '2.04',
-+	'English'               => '1.03',
-+	'Env'                   => '1.00',
-+	'Errno'                 => '1.10',
-+	'Exporter'              => '5.63',
-+	'Exporter::Heavy'       => '5.63',
-+	'ExtUtils::Command'     => '1.15',
-+	'ExtUtils::Command::MM' => '6.48',
-+	'ExtUtils::Constant'    => '0.21',
-+	'ExtUtils::Constant::Base'=> '0.04',
-+	'ExtUtils::Constant::ProxySubs'=> '0.06',
-+	'ExtUtils::Constant::Utils'=> '0.02',
-+	'ExtUtils::Constant::XS'=> '0.02',
-+	'ExtUtils::Embed'       => '1.28',
-+	'ExtUtils::Install'     => '1.50_01',
-+	'ExtUtils::Installed'   => '1.43',
-+	'ExtUtils::Liblist'     => '6.48',
-+	'ExtUtils::Liblist::Kid'=> '6.48',
-+	'ExtUtils::MM'          => '6.48',
-+	'ExtUtils::MM_AIX'      => '6.48',
-+	'ExtUtils::MM_Any'      => '6.48',
-+	'ExtUtils::MM_BeOS'     => '6.48',
-+	'ExtUtils::MM_Cygwin'   => '6.48',
-+	'ExtUtils::MM_DOS'      => '6.48',
-+	'ExtUtils::MM_Darwin'   => '6.48',
-+	'ExtUtils::MM_MacOS'    => '6.48',
-+	'ExtUtils::MM_NW5'      => '6.48',
-+	'ExtUtils::MM_OS2'      => '6.48',
-+	'ExtUtils::MM_QNX'      => '6.48',
-+	'ExtUtils::MM_UWIN'     => '6.48',
-+	'ExtUtils::MM_Unix'     => '6.48',
-+	'ExtUtils::MM_VMS'      => '6.48',
-+	'ExtUtils::MM_VOS'      => '6.48',
-+	'ExtUtils::MM_Win32'    => '6.48',
-+	'ExtUtils::MM_Win95'    => '6.48',
-+	'ExtUtils::MY'          => '6.48',
-+	'ExtUtils::MakeMaker'   => '6.48',
-+	'ExtUtils::MakeMaker::Config'=> '6.48',
-+	'ExtUtils::MakeMaker::bytes'=> '6.48',
-+	'ExtUtils::MakeMaker::vmsish'=> '6.48',
-+	'ExtUtils::Manifest'    => '1.55',
-+	'ExtUtils::Miniperl'    => undef,
-+	'ExtUtils::Mkbootstrap' => '6.48',
-+	'ExtUtils::Mksymlists'  => '6.48',
-+	'ExtUtils::Packlist'    => '1.43',
-+	'ExtUtils::ParseXS'     => '2.19',
-+	'ExtUtils::testlib'     => '6.48',
-+	'Fatal'                 => '1.06',
-+	'Fcntl'                 => '1.06',
-+	'File::Basename'        => '2.77',
-+	'File::CheckTree'       => '4.4',
-+	'File::Compare'         => '1.1005',
-+	'File::Copy'            => '2.13',
-+	'File::DosGlob'         => '1.01',
-+	'File::Find'            => '1.13',
-+	'File::Glob'            => '1.06',
-+	'File::Path'            => '2.07_02',
-+	'File::Spec'            => '3.29',
-+	'File::Spec::Cygwin'    => '3.29',
-+	'File::Spec::Epoc'      => '3.29',
-+	'File::Spec::Functions' => '3.29',
-+	'File::Spec::Mac'       => '3.29',
-+	'File::Spec::OS2'       => '3.29',
-+	'File::Spec::Unix'      => '3.29',
-+	'File::Spec::VMS'       => '3.29',
-+	'File::Spec::Win32'     => '3.29',
-+	'File::Temp'            => '0.20',
-+	'File::stat'            => '1.01',
-+	'FileCache'             => '1.07',
-+	'FileHandle'            => '2.01',
-+	'Filespec'              => '1.11',
-+	'Filter::Simple'        => '0.83',
-+	'Filter::Util::Call'    => '1.07',
-+	'FindBin'               => '1.49',
-+	'GDBM_File'             => '1.09',
-+	'Getopt::Long'          => '2.37',
-+	'Getopt::Std'           => '1.06',
-+	'Hash::Util'            => '0.06',
-+	'I18N::Collate'         => '1.00',
-+	'I18N::LangTags'        => '0.35',
-+	'I18N::LangTags::Detect'=> '1.03',
-+	'I18N::LangTags::List'  => '0.35',
-+	'I18N::Langinfo'        => '0.02',
-+	'IO'                    => '1.23',
-+	'IO::Dir'               => '1.06',
-+	'IO::File'              => '1.14',
-+	'IO::Handle'            => '1.27',
-+	'IO::Pipe'              => '1.13',
-+	'IO::Poll'              => '0.07',
-+	'IO::Seekable'          => '1.10',
-+	'IO::Select'            => '1.17',
-+	'IO::Socket'            => '1.30',
-+	'IO::Socket::INET'      => '1.31',
-+	'IO::Socket::UNIX'      => '1.23',
-+	'IPC::Msg'              => '2.00',
-+	'IPC::Open2'            => '1.03',
-+	'IPC::Open3'            => '1.03',
-+	'IPC::Semaphore'        => '2.00',
-+	'IPC::SharedMem'        => '2.00',
-+	'IPC::SysV'             => '2.00',
-+	'IPC::lib::IPC::Msg'    => '2.00',
-+	'IPC::lib::IPC::Semaphore'=> '2.00',
-+	'IPC::lib::IPC::SharedMem'=> '2.00',
-+	'List::Util'            => '1.19',
-+	'Locale::Constants'     => '2.07',
-+	'Locale::Country'       => '2.07',
-+	'Locale::Currency'      => '2.07',
-+	'Locale::Language'      => '2.07',
-+	'Locale::Maketext'      => '1.13',
-+	'Locale::Maketext::Guts'=> '1.13',
-+	'Locale::Maketext::GutsLoader'=> '1.13',
-+	'Locale::Script'        => '2.07',
-+	'MIME::Base64'          => '3.07',
-+	'MIME::QuotedPrint'     => '3.07',
-+	'Math::BigFloat'        => '1.60',
-+	'Math::BigFloat::Trace' => '0.01',
-+	'Math::BigInt'          => '1.89',
-+	'Math::BigInt::Calc'    => '0.52',
-+	'Math::BigInt::CalcEmu' => '0.05',
-+	'Math::BigInt::Trace'   => '0.01',
-+	'Math::BigRat'          => '0.22',
-+	'Math::Complex'         => '1.54',
-+	'Math::Trig'            => '1.18',
-+	'Memoize'               => '1.01',
-+	'Memoize::AnyDBM_File'  => '0.65',
-+	'Memoize::Expire'       => '1.00',
-+	'Memoize::ExpireFile'   => '1.01',
-+	'Memoize::ExpireTest'   => '0.65',
-+	'Memoize::NDBM_File'    => '0.65',
-+	'Memoize::SDBM_File'    => '0.65',
-+	'Memoize::Storable'     => '0.65',
-+	'Module::CoreList'      => '2.17',
-+	'Module::Pluggable'     => '3.8',
-+	'Module::Pluggable::Object'=> '3.6',
-+	'Module::Pluggable::lib::Devel::InnerPackage'=> '0.3',
-+	'NDBM_File'             => '1.07',
-+	'NEXT'                  => '0.61',
-+	'Net::Cmd'              => '2.29',
-+	'Net::Config'           => '1.11',
-+	'Net::Domain'           => '2.20',
-+	'Net::FTP'              => '2.77',
-+	'Net::FTP::A'           => '1.18',
-+	'Net::FTP::E'           => '0.01',
-+	'Net::FTP::I'           => '1.12',
-+	'Net::FTP::L'           => '0.01',
-+	'Net::FTP::dataconn'    => '0.11',
-+	'Net::NNTP'             => '2.24',
-+	'Net::Netrc'            => '2.12',
-+	'Net::POP3'             => '2.29',
-+	'Net::Ping'             => '2.35',
-+	'Net::SMTP'             => '2.31',
-+	'Net::Time'             => '2.10',
-+	'Net::hostent'          => '1.01',
-+	'Net::netent'           => '1.00',
-+	'Net::protoent'         => '1.00',
-+	'Net::servent'          => '1.01',
-+	'O'                     => '1.01',
-+	'ODBM_File'             => '1.07',
-+	'Opcode'                => '1.0601',
-+	'POSIX'                 => '1.15',
-+	'PerlIO'                => '1.05',
-+	'PerlIO::encoding'      => '0.11',
-+	'PerlIO::scalar'        => '0.06',
-+	'PerlIO::via'           => '0.05',
-+	'PerlIO::via::QuotedPrint'=> '0.06',
-+	'Pod::Checker'          => '1.43',
-+	'Pod::Find'             => '1.34',
-+	'Pod::Functions'        => '1.03',
-+	'Pod::Html'             => '1.09',
-+	'Pod::InputObjects'     => '1.3',
-+	'Pod::LaTeX'            => '0.58',
-+	'Pod::Man'              => '1.37',
-+	'Pod::ParseLink'        => '1.06',
-+	'Pod::ParseUtils'       => '1.35',
-+	'Pod::Parser'           => '1.35',
-+	'Pod::Perldoc'          => '3.14',
-+	'Pod::Perldoc::BaseTo'  => undef,
-+	'Pod::Perldoc::GetOptsOO'=> undef,
-+	'Pod::Perldoc::ToChecker'=> undef,
-+	'Pod::Perldoc::ToMan'   => undef,
-+	'Pod::Perldoc::ToNroff' => undef,
-+	'Pod::Perldoc::ToPod'   => undef,
-+	'Pod::Perldoc::ToRtf'   => undef,
-+	'Pod::Perldoc::ToText'  => undef,
-+	'Pod::Perldoc::ToTk'    => undef,
-+	'Pod::Perldoc::ToXml'   => undef,
-+	'Pod::PlainText'        => '2.02',
-+	'Pod::Plainer'          => '0.01',
-+	'Pod::Select'           => '1.35',
-+	'Pod::Text'             => '2.21',
-+	'Pod::Text::Color'      => '1.04',
-+	'Pod::Text::Overstrike' => '1.1',
-+	'Pod::Text::Termcap'    => '1.11',
-+	'Pod::Usage'            => '1.35',
-+	'SDBM_File'             => '1.06',
-+	'Safe'                  => '2.16',
-+	'Scalar::Util'          => '1.19',
-+	'Search::Dict'          => '1.02',
-+	'SelectSaver'           => '1.01',
-+	'SelfLoader'            => '1.17',
-+	'Shell'                 => '0.72',
-+	'Socket'                => '1.81',
-+	'Stdio'                 => '2.4',
-+	'Storable'              => '2.19',
-+	'Switch'                => '2.13',
-+	'Symbol'                => '1.06',
-+	'Sys::Hostname'         => '1.11',
-+	'Sys::Syslog'           => '0.27',
-+	'Sys::Syslog::win32::Win32'=> undef,
-+	'Term::ANSIColor'       => '1.12',
-+	'Term::Cap'             => '1.12',
-+	'Term::Complete'        => '1.402',
-+	'Term::ReadLine'        => '1.03',
-+	'Test'                  => '1.25',
-+	'Test::Builder'         => '0.80',
-+	'Test::Builder::Module' => '0.80',
-+	'Test::Builder::Tester' => '1.13',
-+	'Test::Builder::Tester::Color'=> undef,
-+	'Test::Harness'         => '2.64',
-+	'Test::Harness::Assert' => '0.02',
-+	'Test::Harness::Iterator'=> '0.02',
-+	'Test::Harness::Point'  => '0.01',
-+	'Test::Harness::Results'=> '0.01_01',
-+	'Test::Harness::Straps' => '0.26_01',
-+	'Test::Harness::Util'   => '0.01',
-+	'Test::More'            => '0.80',
-+	'Test::Simple'          => '0.80',
-+	'Text::Abbrev'          => '1.01',
-+	'Text::Balanced'        => '1.98',
-+	'Text::ParseWords'      => '3.27',
-+	'Text::Soundex'         => '3.03',
-+	'Text::Tabs'            => '2007.1117',
-+	'Text::Wrap'            => '2006.1117',
-+	'Thread'                => '2.01',
-+	'Thread::Queue'         => '2.11',
-+	'Thread::Semaphore'     => '2.09',
-+	'Thread::Signal'        => '1.00',
-+	'Thread::Specific'      => '1.00',
-+	'Tie::Array'            => '1.03',
-+	'Tie::File'             => '0.97',
-+	'Tie::Handle'           => '4.2',
-+	'Tie::Hash'             => '1.03',
-+	'Tie::Memoize'          => '1.1',
-+	'Tie::RefHash'          => '1.38',
-+	'Tie::Scalar'           => '1.01',
-+	'Tie::StdHandle'        => '4.2',
-+	'Tie::SubstrHash'       => '1.00',
-+	'Time::HiRes'           => '1.9715',
-+	'Time::Local'           => '1.1901',
-+	'Time::gmtime'          => '1.03',
-+	'Time::localtime'       => '1.02',
-+	'Time::tm'              => '1.00',
-+	'UNIVERSAL'             => '1.01',
-+	'Unicode'               => '5.1.0',
-+	'Unicode::Collate'      => '0.52',
-+	'Unicode::Normalize'    => '1.02',
-+	'Unicode::UCD'          => '0.25',
-+	'User::grent'           => '1.01',
-+	'User::pwent'           => '1.00',
-+	'Win32'                 => '0.38',
-+	'Win32API::File'        => '0.1001_01',
-+	'Win32API::File::ExtUtils::Myconst2perl'=> '1',
-+	'Win32CORE'             => '0.02',
-+	'XS::APItest'           => '0.15',
-+	'XS::Typemap'           => '0.03',
-+	'XSLoader'              => '0.10',
-+	'XSSymSet'              => '1.1',
-+	'attributes'            => '0.09',
-+	'attrs'                 => '1.02',
-+	'autouse'               => '1.06',
-+	'base'                  => '2.13',
-+	'bigint'                => '0.23',
-+	'bignum'                => '0.23',
-+	'bigrat'                => '0.23',
-+	'blib'                  => '1.04',
-+	'bytes'                 => '1.02',
-+	'charnames'             => '1.06',
-+	'constant'              => '1.17',
-+	'diagnostics'           => '1.16',
-+	'encoding'              => '2.6_01',
-+	'fields'                => '2.12',
-+	'filetest'              => '1.02',
-+	'if'                    => '0.05',
-+	'integer'               => '1.00',
-+	'less'                  => '0.01',
-+	'lib'                   => '0.61',
-+	'locale'                => '1.00',
-+	'open'                  => '1.06',
-+	'ops'                   => '1.02',
-+	'overload'              => '1.06',
-+	're'                    => '0.0601',
-+	'sigtrap'               => '1.04',
-+	'sort'                  => '1.02',
-+	'strict'                => '1.03',
-+	'subs'                  => '1.00',
-+	'threads'               => '1.71',
-+	'threads::shared'       => '1.27',
-+	'utf8'                  => '1.07',
-+	'vars'                  => '1.01',
-+	'vmsish'                => '1.02',
-+	'warnings'              => '1.05_01',
-+	'warnings::register'    => '1.01',
-+    },
- );
- 
-+# Create aliases with trailing zeros for $] use
-+
-+$released{'5.000'} = $released{5};
-+$released{'5.010000'} = $released{5.01};
-+
-+$patchlevel{'5.000'} = $patchlevel{5};
-+$patchlevel{'5.010000'} = $patchlevel{5.01};
-+
-+$version{'5.000'} = $version{5};
-+$version{'5.010000'} = $version{5.01};
-+
- 1;
- __END__
diff --git a/perl-update-Module-Load-Conditional.patch b/perl-update-Module-Load-Conditional.patch
deleted file mode 100644
index 5ad22f4..0000000
--- a/perl-update-Module-Load-Conditional.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-Module-Load-Conditional-0.30
-
-diff -ur perl-5.10.0.orig/lib/Module/Load/Conditional/t/01_Module_Load_Conditional.t perl-5.10.0/lib/Module/Load/Conditional/t/01_Module_Load_Conditional.t
---- perl-5.10.0.orig/lib/Module/Load/Conditional/t/01_Module_Load_Conditional.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Module/Load/Conditional/t/01_Module_Load_Conditional.t	2009-02-10 11:41:18.000000000 +0100
-@@ -20,8 +20,8 @@
- 
- use constant ON_VMS     => $^O eq 'VMS';
- 
--use lib "$FindBin::Bin/../lib";
--use lib "$FindBin::Bin/to_load";
-+use lib File::Spec->catdir($FindBin::Bin, qw[.. lib] );
-+use lib File::Spec->catdir($FindBin::Bin, q[to_load] );
- 
- use_ok( 'Module::Load::Conditional' );
- 
-@@ -46,6 +46,23 @@
-     ok( $rv->{uptodate},    q[Verify self] );
-     is( $rv->{version}, $Module::Load::Conditional::VERSION,  
-                             q[  Found proper version] );
-+    ok( $rv->{dir},         q[  Found directory information] );
-+    
-+    {   my $dir = File::Spec->canonpath( $rv->{dir} );
-+
-+        ### special rules apply on VMS, as always...
-+        if (ON_VMS) {
-+            ### Need path syntax for VMS compares.
-+            $dir = VMS::Filespec::pathify($dir);
-+            ### Remove the trailing VMS specific directory delimiter
-+            $dir =~ s/\]//;
-+        }    
-+    
-+        ### quote for Win32 paths, use | to avoid slash confusion
-+        my $dir_re = qr|^\Q$dir\E|i;
-+        like( File::Spec->canonpath( $rv->{file} ), $dir_re,
-+                            q[      Dir subset of file path] );
-+    }
- 
-     ### break up the specification
-     my @rv_path = do {
-@@ -64,11 +81,17 @@
-         ### and return it    
-         @path;
-     };
--    
--    is( $INC{'Module/Load/Conditional.pm'},            
-+    my $inc_path = $INC{'Module/Load/Conditional.pm'};
-+    if ( $^O eq 'MSWin32' ) {
-+        $inc_path = File::Spec->canonpath( $inc_path );
-+        $inc_path =~ s{\\}{/}g; # to meet with unix path
-+    }
-+    is( $inc_path,
-             File::Spec::Unix->catfile(@rv_path),
-                             q[  Found proper file]
-     );
-+    
-+    
- 
- }
- 
-diff -ur perl-5.10.0.orig/lib/Module/Load/Conditional.pm perl-5.10.0/lib/Module/Load/Conditional.pm
---- perl-5.10.0.orig/lib/Module/Load/Conditional.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Module/Load/Conditional.pm	2009-02-10 11:40:22.000000000 +0100
-@@ -9,7 +9,7 @@
- use Carp        ();
- use File::Spec  ();
- use FileHandle  ();
--use version     qw[qv];
-+use version;
- 
- use constant ON_VMS  => $^O eq 'VMS';
- 
-@@ -18,7 +18,7 @@
-                         $FIND_VERSION $ERROR $CHECK_INC_HASH];
-     use Exporter;
-     @ISA            = qw[Exporter];
--    $VERSION        = '0.22';
-+    $VERSION        = '0.30';
-     $VERBOSE        = 0;
-     $FIND_VERSION   = 1;
-     $CHECK_INC_HASH = 0;
-@@ -116,6 +116,11 @@
- 
- Full path to the file that contains the module
- 
-+=item dir
-+
-+Directory, or more exact the C<@INC> entry, where the module was
-+loaded from.
-+
- =item version
- 
- The version number of the installed module - this will be C<undef> if
-@@ -226,6 +231,9 @@
-                 }
-             }
-     
-+            ### store the directory we found the file in
-+            $href->{dir} = $dir;
-+    
-             ### files need to be in unix format under vms,
-             ### or they might be loaded twice
-             $href->{file} = ON_VMS
-@@ -236,18 +244,20 @@
-             if( $FIND_VERSION ) {
-                 
-                 my $in_pod = 0;
--                while (local $_ = <$fh> ) {
-+                while ( my $line = <$fh> ) {
-     
-                     ### stolen from EU::MM_Unix->parse_version to address
-                     ### #24062: "Problem with CPANPLUS 0.076 misidentifying
-                     ### versions after installing Text::NSP 1.03" where a 
-                     ### VERSION mentioned in the POD was found before
-                     ### the real $VERSION declaration.
--                    $in_pod = /^=(?!cut)/ ? 1 : /^=cut/ ? 0 : $in_pod;
-+                    $in_pod = $line =~ /^=(?!cut)/  ? 1 : 
-+                              $line =~ /^=cut/      ? 0 : 
-+                              $in_pod;
-                     next if $in_pod;
-                     
-                     ### try to find a version declaration in this string.
--                    my $ver = __PACKAGE__->_parse_version( $_ );
-+                    my $ver = __PACKAGE__->_parse_version( $line );
- 
-                     if( defined $ver ) {
-                         $href->{version} = $ver;
-@@ -280,8 +290,14 @@
-         ### use qv(), as it will deal with developer release number
-         ### ie ones containing _ as well. This addresses bug report
-         ### #29348: Version compare logic doesn't handle alphas?
-+        ###
-+        ### Update from JPeacock: apparently qv() and version->new
-+        ### are different things, and we *must* use version->new
-+        ### here, or things like #30056 might start happening
-         $href->{uptodate} = 
--            qv( $args->{version} ) <= qv( $href->{version} ) ? 1 : 0;
-+            version->new( $args->{version} ) <= version->new( $href->{version} )
-+                ? 1 
-+                : 0;
-     }
- 
-     return $href;
-@@ -301,7 +317,8 @@
-     ### regex breaks under -T, we must modifiy it so
-     ### it captures the entire expression, and eval /that/
-     ### rather than $_, which is insecure.
--
-+    my $taint_safe_str = do { $str =~ /(^.*$)/sm; $1 };
-+        
-     if( $str =~ /(?<!\\)([\$*])(([\w\:\']*)\bVERSION)\b.*\=/ ) {
-         
-         print "Evaluating: $str\n" if $verbose;
-@@ -321,7 +338,7 @@
- 
-             local $1$2;
-             \$$2=undef; do {
--                $str
-+                $taint_safe_str
-             }; \$$2
-         };
-         
-@@ -426,9 +443,14 @@
-             ### use qv(), as it will deal with developer release number
-             ### ie ones containing _ as well. This addresses bug report
-             ### #29348: Version compare logic doesn't handle alphas?
-+            ###
-+            ### Update from JPeacock: apparently qv() and version->new
-+            ### are different things, and we *must* use version->new
-+            ### here, or things like #30056 might start happening            
-             if (    !$args->{nocache}
-                     && defined $CACHE->{$mod}->{usable}
--                    && (qv($CACHE->{$mod}->{version}||0) >= qv($href->{$mod}))
-+                    && (version->new( $CACHE->{$mod}->{version}||0 ) 
-+                        >= version->new( $href->{$mod} ) )
-             ) {
-                 $error = loc( q[Already tried to use '%1', which was unsuccessful], $mod);
-                 last BLOCK;
diff --git a/perl-update-Module-Pluggable.patch b/perl-update-Module-Pluggable.patch
deleted file mode 100644
index 56a28e5..0000000
--- a/perl-update-Module-Pluggable.patch
+++ /dev/null
@@ -1,964 +0,0 @@
-This patch is derived from the perl-5.10.1 tarball as released on the CPAN.
-
-diff -urN perl-5.10.0.orig/lib/Devel/InnerPackage.pm perl-5.10.0/lib/Devel/InnerPackage.pm
---- perl-5.10.0.orig/lib/Devel/InnerPackage.pm	2007-12-18 02:47:07.000000000 -0800
-+++ perl-5.10.0/lib/Devel/InnerPackage.pm	2009-08-31 19:47:24.444773931 -0700
-@@ -17,7 +17,7 @@
- =head1 SYNOPSIS
- 
-     use Foo::Bar;
--    use Devel::innerPackage qw(list_packages);
-+    use Devel::InnerPackage qw(list_packages);
- 
-     my @inner_packages = list_packages('Foo::Bar');
- 
-@@ -75,7 +75,7 @@
-                     !__PACKAGE__->_loaded($pack.$cand); # or @children;
-                 push @packs, @children;
-             }
--            return grep {$_ !~ /::::ISA::CACHE/} @packs;
-+            return grep {$_ !~ /::(::ISA::CACHE|SUPER)/} @packs;
- }
- 
- ### XXX this is an inlining of the Class-Inspector->loaded()
-diff -urN perl-5.10.0.orig/lib/Module/Pluggable/Object.pm perl-5.10.0/lib/Module/Pluggable/Object.pm
---- perl-5.10.0.orig/lib/Module/Pluggable/Object.pm	2007-12-18 02:47:07.000000000 -0800
-+++ perl-5.10.0/lib/Module/Pluggable/Object.pm	2009-08-31 19:47:24.446771196 -0700
-@@ -6,10 +6,9 @@
- use File::Spec::Functions qw(splitdir catdir curdir catfile abs2rel);
- use Carp qw(croak carp);
- use Devel::InnerPackage;
--use Data::Dumper;
- use vars qw($VERSION);
- 
--$VERSION = '3.6';
-+$VERSION = '3.9';
- 
- 
- sub new {
-@@ -20,6 +19,10 @@
- 
- }
- 
-+### Eugggh, this code smells 
-+### This is what happens when you keep adding patches
-+### *sigh*
-+
- 
- sub plugins {
-         my $self = shift;
-@@ -30,14 +33,14 @@
-         my $filename   = $self->{'filename'};
-         my $pkg        = $self->{'package'};
- 
-+        # Get the exception params instantiated
-+        $self->_setup_exceptions;
-+
-         # automatically turn a scalar search path or namespace into a arrayref
-         for (qw(search_path search_dirs)) {
-             $self->{$_} = [ $self->{$_} ] if exists $self->{$_} && !ref($self->{$_});
-         }
- 
--
--
--
-         # default search path is '<Module>::<Name>::Plugin'
-         $self->{'search_path'} = ["${pkg}::Plugin"] unless $self->{'search_path'}; 
- 
-@@ -46,13 +49,14 @@
- 
- 
-         # check to see if we're running under test
--        my @SEARCHDIR = exists $INC{"blib.pm"} && $filename =~ m!(^|/)blib/! ? grep {/blib/} @INC : @INC;
-+        my @SEARCHDIR = exists $INC{"blib.pm"} && defined $filename && $filename =~ m!(^|/)blib/! ? grep {/blib/} @INC : @INC;
- 
-         # add any search_dir params
-         unshift @SEARCHDIR, @{$self->{'search_dirs'}} if defined $self->{'search_dirs'};
- 
- 
-         my @plugins = $self->search_directories(@SEARCHDIR);
-+        push(@plugins, $self->handle_innerpackages($_)) for @{$self->{'search_path'}};
- 
-         # push @plugins, map { print STDERR "$_\n"; $_->require } list_packages($_) for (@{$self->{'search_path'}});
-         
-@@ -60,43 +64,12 @@
-         return () unless @plugins;
- 
- 
--        # exceptions
--        my %only;   
--        my %except; 
--        my $only;
--        my $except;
--
--        if (defined $self->{'only'}) {
--            if (ref($self->{'only'}) eq 'ARRAY') {
--                %only   = map { $_ => 1 } @{$self->{'only'}};
--            } elsif (ref($self->{'only'}) eq 'Regexp') {
--                $only = $self->{'only'}
--            } elsif (ref($self->{'only'}) eq '') {
--                $only{$self->{'only'}} = 1;
--            }
--        }
--        
--
--        if (defined $self->{'except'}) {
--            if (ref($self->{'except'}) eq 'ARRAY') {
--                %except   = map { $_ => 1 } @{$self->{'except'}};
--            } elsif (ref($self->{'except'}) eq 'Regexp') {
--                $except = $self->{'except'}
--            } elsif (ref($self->{'except'}) eq '') {
--                $except{$self->{'except'}} = 1;
--            }
--        }
--
- 
-         # remove duplicates
-         # probably not necessary but hey ho
-         my %plugins;
-         for(@plugins) {
--            next if (keys %only   && !$only{$_}     );
--            next unless (!defined $only || m!$only! );
--
--            next if (keys %except &&  $except{$_}   );
--            next if (defined $except &&  m!$except! );
-+            next unless $self->_is_legit($_);
-             $plugins{$_} = 1;
-         }
- 
-@@ -112,6 +85,58 @@
- 
- }
- 
-+sub _setup_exceptions {
-+    my $self = shift;
-+
-+    my %only;   
-+    my %except; 
-+    my $only;
-+    my $except;
-+
-+    if (defined $self->{'only'}) {
-+        if (ref($self->{'only'}) eq 'ARRAY') {
-+            %only   = map { $_ => 1 } @{$self->{'only'}};
-+        } elsif (ref($self->{'only'}) eq 'Regexp') {
-+            $only = $self->{'only'}
-+        } elsif (ref($self->{'only'}) eq '') {
-+            $only{$self->{'only'}} = 1;
-+        }
-+    }
-+        
-+
-+    if (defined $self->{'except'}) {
-+        if (ref($self->{'except'}) eq 'ARRAY') {
-+            %except   = map { $_ => 1 } @{$self->{'except'}};
-+        } elsif (ref($self->{'except'}) eq 'Regexp') {
-+            $except = $self->{'except'}
-+        } elsif (ref($self->{'except'}) eq '') {
-+            $except{$self->{'except'}} = 1;
-+        }
-+    }
-+    $self->{_exceptions}->{only_hash}   = \%only;
-+    $self->{_exceptions}->{only}        = $only;
-+    $self->{_exceptions}->{except_hash} = \%except;
-+    $self->{_exceptions}->{except}      = $except;
-+        
-+}
-+
-+sub _is_legit {
-+    my $self   = shift;
-+    my $plugin = shift;
-+    my %only   = %{$self->{_exceptions}->{only_hash}||{}};
-+    my %except = %{$self->{_exceptions}->{except_hash}||{}};
-+    my $only   = $self->{_exceptions}->{only};
-+    my $except = $self->{_exceptions}->{except};
-+
-+    return 0 if     (keys %only   && !$only{$plugin}     );
-+    return 0 unless (!defined $only || $plugin =~ m!$only!     );
-+
-+    return 0 if     (keys %except &&  $except{$plugin}   );
-+    return 0 if     (defined $except &&  $plugin =~ m!$except! );
-+
-+    return 1;
-+}
-+
- sub search_directories {
-     my $self      = shift;
-     my @SEARCHDIR = @_;
-@@ -121,7 +146,6 @@
-     foreach my $dir (@SEARCHDIR) {
-         push @plugins, $self->search_paths($dir);
-     }
--
-     return @plugins;
- }
- 
-@@ -151,6 +175,8 @@
-             # parse the file to get the name
-             my ($name, $directory, $suffix) = fileparse($file, $file_regex);
- 
-+            next if (!$self->{include_editor_junk} && $self->_is_editor_junk($name));
-+
-             $directory = abs2rel($directory, $sp);
- 
-             # If we have a mixed-case package name, assume case has been preserved
-@@ -203,17 +229,34 @@
-         # now add stuff that may have been in package
-         # NOTE we should probably use all the stuff we've been given already
-         # but then we can't unload it :(
--        push @plugins, $self->handle_innerpackages($searchpath) unless (exists $self->{inner} && !$self->{inner});
-+        push @plugins, $self->handle_innerpackages($searchpath);
-     } # foreach $searchpath
- 
-     return @plugins;
- }
- 
-+sub _is_editor_junk {
-+    my $self = shift;
-+    my $name = shift;
-+
-+    # Emacs (and other Unix-y editors) leave temp files ending in a
-+    # tilde as a backup.
-+    return 1 if $name =~ /~$/;
-+    # Emacs makes these files while a buffer is edited but not yet
-+    # saved.
-+    return 1 if $name =~ /^\.#/;
-+    # Vim can leave these files behind if it crashes.
-+    return 1 if $name =~ /\.sw[po]$/;
-+
-+    return 0;
-+}
-+
- sub handle_finding_plugin {
-     my $self   = shift;
-     my $plugin = shift;
- 
-     return unless (defined $self->{'instantiate'} || $self->{'require'}); 
-+    return unless $self->_is_legit($plugin);
-     $self->_require($plugin);
- }
- 
-@@ -245,10 +288,11 @@
- 
- sub handle_innerpackages {
-     my $self = shift;
-+    return () if (exists $self->{inner} && !$self->{inner});
-+
-     my $path = shift;
-     my @plugins;
- 
--
-     foreach my $plugin (Devel::InnerPackage::list_packages($path)) {
-         my $err = $self->handle_finding_plugin($plugin);
-         #next if $err;
-@@ -299,6 +343,14 @@
- 
- Optionally it instantiates those classes for you.
- 
-+This object is wrapped by C<Module::Pluggable>. If you want to do something
-+odd or add non-general special features you're probably best to wrap this
-+and produce your own subclass.
-+
-+=head1 OPTIONS
-+
-+See the C<Module::Pluggable> docs.
-+
- =head1 AUTHOR
- 
- Simon Wistow <simon@thegestalt.org>
-diff -urN perl-5.10.0.orig/lib/Module/Pluggable.pm perl-5.10.0/lib/Module/Pluggable.pm
---- perl-5.10.0.orig/lib/Module/Pluggable.pm	2007-12-18 02:47:07.000000000 -0800
-+++ perl-5.10.0/lib/Module/Pluggable.pm	2009-08-31 19:47:24.448771465 -0700
-@@ -9,7 +9,7 @@
- # Peter Gibbons: I wouldn't say I've been missing it, Bob! 
- 
- 
--$VERSION = '3.6';
-+$VERSION = '3.9';
- 
- sub import {
-     my $class        = shift;
-@@ -60,8 +60,9 @@
- 
- 
-     no strict 'refs';
--    no warnings 'redefine';
--    *{"$package\::$sub"}    = $subroutine;
-+    no warnings qw(redefine prototype);
-+    
-+    *{"$package\::$sub"}        = $subroutine;
-     *{"$package\::search_path"} = $searchsub;
-     *{"$package\::only"}        = $onlysub;
-     *{"$package\::except"}      = $exceptsub;
-@@ -297,6 +298,14 @@
- 
-     file_regex => qr/\.plugin$/
- 
-+=head2 include_editor_junk
-+
-+By default C<Module::Pluggable> ignores files that look like they were
-+left behind by editors. Currently this means files ending in F<~> (~),
-+the extensions F<.swp> or F<.swo>, or files beginning with F<.#>.
-+
-+Setting C<include_editor_junk> changes C<Module::Pluggable> so it does
-+not ignore any files it finds.
- 
- 
- =head1 METHODs
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2007-12-18 02:47:07.000000000 -0800
-+++ perl-5.10.0/MANIFEST	2009-08-31 19:47:24.452770885 -0700
-@@ -3612,11 +3612,14 @@
- t/Module_Pluggable/09require.t	Module::Pluggable tests
- t/Module_Pluggable/10innerpack_inner.t	Module::Pluggable tests
- t/Module_Pluggable/10innerpack_noinner.t	Module::Pluggable tests
-+t/Module_Pluggable/10innerpack_onefile.t	Module::Pluggable tests
- t/Module_Pluggable/10innerpack_override.t	Module::Pluggable tests
-+t/Module_Pluggable/10innerpack_super.t	Module::Pluggable tests
- t/Module_Pluggable/10innerpack.t	Module::Pluggable tests
- t/Module_Pluggable/11usetwice.t	Module::Pluggable tests
- t/Module_Pluggable/12onlyarray.t	Module::Pluggable tests
- t/Module_Pluggable/12onlyregex.t	Module::Pluggable tests
-+t/Module_Pluggable/12onlyrequire.t	Module::Pluggable tests
- t/Module_Pluggable/12only.t	Module::Pluggable tests
- t/Module_Pluggable/13exceptarray.t	Module::Pluggable tests
- t/Module_Pluggable/13exceptregex.t	Module::Pluggable tests
-@@ -3628,8 +3631,15 @@
- t/Module_Pluggable/18skipped_package.t	Module::Pluggable tests
- t/Module_Pluggable/19can_ok_clobber.t	Module::Pluggable tests
- t/Module_Pluggable/20dodgy_files.t	Module::Pluggable tests
-+t/Module_Pluggable/21editor_junk.t	Module::Pluggable tests
- t/Module_Pluggable/acme/Acme/MyTest/Plugin/Foo.pm	Module::Pluggable tests
- t/Module_Pluggable/lib/Acme/MyTest/Plugin/Foo.pm	Module::Pluggable tests
-+t/Module_Pluggable/lib/Acme/Foo-Bar.pm	Module::Pluggable tests
-+t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm	Module::Pluggable tests
-+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo	Module::Pluggable tests
-+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp	Module::Pluggable tests
-+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~	Module::Pluggable tests
-+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm	Module::Pluggable tests
- t/Module_Pluggable/lib/ExtTest/Plugin/Bar.plugin	Module::Pluggable tests
- t/Module_Pluggable/lib/ExtTest/Plugin/Foo.plugin	Module::Pluggable tests
- t/Module_Pluggable/lib/ExtTest/Plugin/Quux/Foo.plugin	Module::Pluggable tests
-@@ -3646,6 +3656,7 @@
- t/Module_Pluggable/lib/OddTest/Plugin/-Dodgy.pm	Module::Pluggable tests
- t/Module_Pluggable/lib/OddTest/Plugin/Foo.pm	Module::Pluggable tests
- t/Module_Pluggable/lib/TA/C/A/I.pm	Module::Pluggable tests
-+t/Module_Pluggable/lib/Zot/.Zork.pm	Module::Pluggable tests
- t/mro/basic_01_c3.t		mro tests
- t/mro/basic_01_dfs.t		mro tests
- t/mro/basic_02_c3.t		mro tests
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/02alsoworks.t perl-5.10.0/t/Module_Pluggable/02alsoworks.t
---- perl-5.10.0.orig/t/Module_Pluggable/02alsoworks.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/02alsoworks.t	2009-08-31 19:47:24.454770805 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 5;
- 
- my $foo;
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/02works.t perl-5.10.0/t/Module_Pluggable/02works.t
---- perl-5.10.0.orig/t/Module_Pluggable/02works.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/02works.t	2009-08-31 19:47:24.455771358 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 5;
- 
- my $foo;
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/03diffname.t perl-5.10.0/t/Module_Pluggable/03diffname.t
---- perl-5.10.0.orig/t/Module_Pluggable/03diffname.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/03diffname.t	2009-08-31 19:47:24.456771493 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 3;
- 
- my $foo;
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmedir_single.t perl-5.10.0/t/Module_Pluggable/04acmedir_single.t
---- perl-5.10.0.orig/t/Module_Pluggable/04acmedir_single.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/04acmedir_single.t	2009-08-31 19:47:24.456771493 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 3;
- 
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmedir.t perl-5.10.0/t/Module_Pluggable/04acmedir.t
---- perl-5.10.0.orig/t/Module_Pluggable/04acmedir.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/04acmedir.t	2009-08-31 19:47:24.457771627 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 3;
- 
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmepath_single.t perl-5.10.0/t/Module_Pluggable/04acmepath_single.t
---- perl-5.10.0.orig/t/Module_Pluggable/04acmepath_single.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/04acmepath_single.t	2009-08-31 19:47:24.458773508 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 3;
- 
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmepath.t perl-5.10.0/t/Module_Pluggable/04acmepath.t
---- perl-5.10.0.orig/t/Module_Pluggable/04acmepath.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/04acmepath.t	2009-08-31 19:47:24.459772105 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 3;
- 
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/05postpath.t perl-5.10.0/t/Module_Pluggable/05postpath.t
---- perl-5.10.0.orig/t/Module_Pluggable/05postpath.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/05postpath.t	2009-08-31 19:47:24.460771332 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 3;
- 
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/06multipath.t perl-5.10.0/t/Module_Pluggable/06multipath.t
---- perl-5.10.0.orig/t/Module_Pluggable/06multipath.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/06multipath.t	2009-08-31 19:47:24.461771676 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 3;
- 
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/07instantiate.t perl-5.10.0/t/Module_Pluggable/07instantiate.t
---- perl-5.10.0.orig/t/Module_Pluggable/07instantiate.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/07instantiate.t	2009-08-31 19:47:24.462772090 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 6;
- 
- my $foo;
-@@ -26,7 +26,7 @@
- use File::Spec::Functions qw(catdir);
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Module::Pluggable (search_path => ["MyTest::Extend::Plugin"], sub_name => 'booga', instantiate => 'new');
- use Module::Pluggable (search_path => ["MyTest::Extend::Plugin"], sub_name => 'wooga', instantiate => 'nosomuchmethod');
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/08nothing.t perl-5.10.0/t/Module_Pluggable/08nothing.t
---- perl-5.10.0.orig/t/Module_Pluggable/08nothing.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/08nothing.t	2009-08-31 19:47:24.463771316 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 2;
- 
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/09require.t perl-5.10.0/t/Module_Pluggable/09require.t
---- perl-5.10.0.orig/t/Module_Pluggable/09require.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/09require.t	2009-08-31 19:47:24.464771800 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 2;
- 
- my $t = MyTest->new();
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_inner.t perl-5.10.0/t/Module_Pluggable/10innerpack_inner.t
---- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_inner.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/10innerpack_inner.t	2009-08-31 19:47:24.465771515 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 3;
- 
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_noinner.t perl-5.10.0/t/Module_Pluggable/10innerpack_noinner.t
---- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_noinner.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/10innerpack_noinner.t	2009-08-31 19:47:24.479772629 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 3;
- 
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_onefile.t perl-5.10.0/t/Module_Pluggable/10innerpack_onefile.t
---- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_onefile.t	1969-12-31 16:00:00.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/10innerpack_onefile.t	2009-08-31 19:47:24.480772134 -0700
-@@ -0,0 +1,27 @@
-+#!perl -wT
-+
-+use strict;
-+use Test::More tests => 2;
-+use Data::Dumper;
-+
-+my $mc  = MyClass->new();
-+my $mc2 = MyClass2->new();
-+
-+
-+is_deeply([$mc->plugins],  [qw(MyClass::Plugin::MyPlugin)], "Got inner plugin");
-+is_deeply([$mc2->plugins], [],                              "Didn't get plugin");
-+
-+package MyClass::Plugin::MyPlugin;
-+sub pretty { print "I am pretty" };
-+
-+package MyClass;
-+use Module::Pluggable inner => 1;
-+
-+sub new { return bless {}, $_[0] }
-+
-+package MyClass2;
-+use Module::Pluggable search_path => "MyClass::Plugin", inner => 0;
-+
-+sub new { return bless {}, $_[0] }
-+1;
-+
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_override.t perl-5.10.0/t/Module_Pluggable/10innerpack_override.t
---- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_override.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/10innerpack_override.t	2009-08-31 19:47:24.481771501 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 3;
- 
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_super.t perl-5.10.0/t/Module_Pluggable/10innerpack_super.t
---- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_super.t	1969-12-31 16:00:00.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/10innerpack_super.t	2009-08-31 19:47:24.482771565 -0700
-@@ -0,0 +1,29 @@
-+#!perl -wT
-+
-+use Test::More tests => 3;
-+use strict;
-+use_ok('Devel::InnerPackage');
-+Bar->whee;
-+is_deeply([Devel::InnerPackage::list_packages("Bar")],[], "Don't pick up ::SUPER pseudo stash"); 
-+is_deeply([Devel::InnerPackage::list_packages("Foo")],['Foo::Bar'], "Still pick up other inner package");
-+
-+package Foo;
-+
-+sub whee {
-+    1;
-+}
-+
-+package Foo::Bar;
-+
-+sub whee {}
-+
-+package Bar;
-+use base 'Foo';
-+
-+sub whee {
-+    shift->SUPER::whee;
-+    2;
-+}
-+
-+
-+1;
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack.t perl-5.10.0/t/Module_Pluggable/10innerpack.t
---- perl-5.10.0.orig/t/Module_Pluggable/10innerpack.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/10innerpack.t	2009-08-31 19:47:24.483771909 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 4;
- 
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/11usetwice.t perl-5.10.0/t/Module_Pluggable/11usetwice.t
---- perl-5.10.0.orig/t/Module_Pluggable/11usetwice.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/11usetwice.t	2009-08-31 19:47:24.484771624 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 3;
- 
- my $foo;
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyarray.t perl-5.10.0/t/Module_Pluggable/12onlyarray.t
---- perl-5.10.0.orig/t/Module_Pluggable/12onlyarray.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/12onlyarray.t	2009-08-31 19:47:24.485772038 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 10;
- 
- {
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyregex.t perl-5.10.0/t/Module_Pluggable/12onlyregex.t
---- perl-5.10.0.orig/t/Module_Pluggable/12onlyregex.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/12onlyregex.t	2009-08-31 19:47:24.485772038 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 10;
- 
- {
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyrequire.t perl-5.10.0/t/Module_Pluggable/12onlyrequire.t
---- perl-5.10.0.orig/t/Module_Pluggable/12onlyrequire.t	1969-12-31 16:00:00.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/12onlyrequire.t	2009-08-31 19:47:24.505021273 -0700
-@@ -0,0 +1,21 @@
-+#!perl -w
-+use strict;
-+use FindBin;
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-+use Test::More tests => 2;
-+
-+my @packages = eval { Zot->_dist_types };
-+is($@, '',                "No warnings");
-+is(scalar(@packages), 0,  "Correctly only got 1 package");
-+
-+
-+package Zot;
-+use strict;
-+use Module::Pluggable (
-+        sub_name => '_dist_types',
-+        search_path => __PACKAGE__,
-+        only => qr/Zot::\w+$/,
-+        require => 1,
-+    );
-+
-+1;
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/12only.t perl-5.10.0/t/Module_Pluggable/12only.t
---- perl-5.10.0.orig/t/Module_Pluggable/12only.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/12only.t	2009-08-31 19:47:24.506022385 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 10;
- 
- {
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/13exceptarray.t perl-5.10.0/t/Module_Pluggable/13exceptarray.t
---- perl-5.10.0.orig/t/Module_Pluggable/13exceptarray.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/13exceptarray.t	2009-08-31 19:47:24.507021263 -0700
-@@ -1,8 +1,8 @@
--#!perl -w
-+#!perl -wT
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 10;
- 
- {
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/13exceptregex.t perl-5.10.0/t/Module_Pluggable/13exceptregex.t
---- perl-5.10.0.orig/t/Module_Pluggable/13exceptregex.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/13exceptregex.t	2009-08-31 19:47:24.510021945 -0700
-@@ -1,8 +1,8 @@
--#!perl -w
-+#!perl -wT
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 10;
- 
- {
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/13except.t perl-5.10.0/t/Module_Pluggable/13except.t
---- perl-5.10.0.orig/t/Module_Pluggable/13except.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/13except.t	2009-08-31 19:47:24.511021381 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 10;
- 
- {
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/14package.t perl-5.10.0/t/Module_Pluggable/14package.t
---- perl-5.10.0.orig/t/Module_Pluggable/14package.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/14package.t	2009-08-31 19:47:24.842414378 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 5;
- 
- my $foo;
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/15topicsafe.t perl-5.10.0/t/Module_Pluggable/15topicsafe.t
---- perl-5.10.0.orig/t/Module_Pluggable/15topicsafe.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/15topicsafe.t	2009-08-31 19:47:24.842774343 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More 'no_plan';
- 
- use Module::Pluggable search_path => 'Acme::MyTest';
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/16different_extension.t perl-5.10.0/t/Module_Pluggable/16different_extension.t
---- perl-5.10.0.orig/t/Module_Pluggable/16different_extension.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/16different_extension.t	2009-08-31 19:47:24.843800947 -0700
-@@ -2,7 +2,7 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- use Test::More tests => 5;
- 
- my $foo;
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/17devel_inner_package.t perl-5.10.0/t/Module_Pluggable/17devel_inner_package.t
---- perl-5.10.0.orig/t/Module_Pluggable/17devel_inner_package.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/17devel_inner_package.t	2009-08-31 19:47:24.843800947 -0700
-@@ -3,7 +3,7 @@
- 
- use Devel::InnerPackage qw(list_packages);
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- 
- my @packages;
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/18skipped_package.t perl-5.10.0/t/Module_Pluggable/18skipped_package.t
---- perl-5.10.0.orig/t/Module_Pluggable/18skipped_package.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/18skipped_package.t	2009-08-31 19:47:24.844780129 -0700
-@@ -2,7 +2,7 @@
- 
- use Test::More tests => 1;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- 
- use Devel::InnerPackage qw(list_packages);
- use No::Middle;
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/19can_ok_clobber.t perl-5.10.0/t/Module_Pluggable/19can_ok_clobber.t
---- perl-5.10.0.orig/t/Module_Pluggable/19can_ok_clobber.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/19can_ok_clobber.t	2009-08-31 19:47:24.844780129 -0700
-@@ -3,7 +3,7 @@
- use warnings;
- use Data::Dumper;
- use FindBin;
--use lib "$FindBin::Bin/lib";
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
- 
- use Test::More tests=>5;
- 
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/20dodgy_files.t perl-5.10.0/t/Module_Pluggable/20dodgy_files.t
---- perl-5.10.0.orig/t/Module_Pluggable/20dodgy_files.t	2007-12-18 02:47:08.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/20dodgy_files.t	2009-08-31 19:47:24.845769158 -0700
-@@ -1,7 +1,7 @@
- #!perl -w
- 
- BEGIN {
--    if ($^O eq 'VMS') {
-+    if ($^O eq 'VMS' || $^O eq 'VOS') {
-         print "1..0 # Skip: can't handle misspelled plugin names\n";
-         exit;
-     }
-@@ -9,8 +9,18 @@
- 
- use strict;
- use FindBin;
--use lib "$FindBin::Bin/lib";
--use Test::More tests => 5;
-+use Test::More;
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-+use File::Spec::Functions qw(catfile);
-+
-+
-+my ($dodgy_file) = (catfile($FindBin::Bin, "lib", "OddTest", "Plugin", "-Dodgy.pm")=~/^(.*)$/);
-+unless (-f $dodgy_file) {
-+        plan skip_all => "Can't handle misspelled plugin names\n";
-+} else {
-+        plan tests => 5;
-+}
-+
- 
- my $foo;
- ok($foo = OddTest->new());
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/21editor_junk.t perl-5.10.0/t/Module_Pluggable/21editor_junk.t
---- perl-5.10.0.orig/t/Module_Pluggable/21editor_junk.t	1969-12-31 16:00:00.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/21editor_junk.t	2009-08-31 19:47:24.845769158 -0700
-@@ -0,0 +1,53 @@
-+#!perl -w
-+
-+use Test::More;
-+use FindBin;
-+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-+use Module::Pluggable::Object;
-+use File::Spec::Functions qw(catfile);
-+
-+my ($dodgy_file) = (catfile($FindBin::Bin,"lib", "EditorJunk", "Plugin", "#Bar.pm#")=~/^(.*)$/);
-+unless (-f $dodgy_file) {
-+        plan skip_all => "Can't handle plugin names with octothorpes\n";
-+} else {
-+        plan tests => 4;
-+}
-+
-+
-+
-+my $foo;
-+ok($foo = EditorJunk->new());
-+
-+my @plugins;
-+my @expected = qw(EditorJunk::Plugin::Bar EditorJunk::Plugin::Foo);
-+ok(@plugins = sort $foo->plugins);
-+
-+is_deeply(\@plugins, \@expected, "is deeply");
-+
-+
-+my $mpo = Module::Pluggable::Object->new(
-+    package             => 'EditorJunk',
-+    filename            => __FILE__,
-+    include_editor_junk => 1,
-+);
-+
-+@expected = ('EditorJunk::Plugin::.#Bar', 'EditorJunk::Plugin::Bar', 'EditorJunk::Plugin::Foo');
-+@plugins = sort $mpo->plugins();
-+is_deeply(\@plugins, \@expected, "is deeply");
-+
-+
-+
-+package EditorJunk;
-+
-+use strict;
-+use Module::Pluggable;
-+
-+
-+sub new {
-+    my $class = shift;
-+    return bless {}, $class;
-+
-+}
-+1;
-+
-+
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/Acme/Foo-Bar.pm perl-5.10.0/t/Module_Pluggable/lib/Acme/Foo-Bar.pm
---- perl-5.10.0.orig/t/Module_Pluggable/lib/Acme/Foo-Bar.pm	1969-12-31 16:00:00.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/lib/Acme/Foo-Bar.pm	2009-08-31 19:47:24.845769158 -0700
-@@ -0,0 +1,6 @@
-+package Acme::FooBar;
-+
-+our $quux = "hello";
-+
-+1;
-+
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm
---- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm	1969-12-31 16:00:00.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm	2009-08-31 19:47:24.846769084 -0700
-@@ -0,0 +1,9 @@
-+package EditorJunk::Bar;
-+
-+
-+use strict;
-+
-+
-+1;
-+
-+
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~
---- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~	1969-12-31 16:00:00.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~	2009-08-31 19:47:24.851770803 -0700
-@@ -0,0 +1,9 @@
-+package EditorJunk::Bar;
-+
-+
-+use strict;
-+
-+
-+1;
-+
-+
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo
---- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo	1969-12-31 16:00:00.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo	2009-08-31 19:47:24.852771985 -0700
-@@ -0,0 +1,9 @@
-+package EditorJunk::Bar;
-+
-+
-+use strict;
-+
-+
-+1;
-+
-+
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp
---- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp	1969-12-31 16:00:00.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp	2009-08-31 19:47:24.853771770 -0700
-@@ -0,0 +1,9 @@
-+package EditorJunk::Bar;
-+
-+
-+use strict;
-+
-+
-+1;
-+
-+
-diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm
---- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm	1969-12-31 16:00:00.000000000 -0800
-+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm	2009-08-31 19:47:24.854771835 -0700
-@@ -0,0 +1,9 @@
-+package EditorJunk::Foo;
-+
-+
-+use strict;
-+
-+
-+1;
-+
-+
diff --git a/perl-update-Pod-Simple.patch b/perl-update-Pod-Simple.patch
deleted file mode 100644
index 57c9c77..0000000
--- a/perl-update-Pod-Simple.patch
+++ /dev/null
@@ -1,1278 +0,0 @@
-Pod-Simple-3.07
-
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2009-02-20 18:22:32.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-02-23 19:20:15.000000000 +0100
-@@ -2508,6 +2508,8 @@
- lib/Pod/Simple/t/verbatim.t		Pod::Simple test file
- lib/Pod/Simple/t/verb_fmt.t	Pod::Simple test file
- lib/Pod/Simple/t/x_nixer.t		Pod::Simple test file
-+lib/Pod/Simple/t/xhtml01.t	Pod::Simple test file
-+lib/Pod/Simple/t/xhtml05.t	Pod::Simple test file
- lib/Pod/Simple/XMLOutStream.pm	turn Pod into XML
- lib/Pod/t/basic.cap		podlators test
- lib/Pod/t/basic.clr		podlators test
-diff -urN perl-5.10.0.orig/lib/Pod/Simple/BlackBox.pm perl-5.10.0/lib/Pod/Simple/BlackBox.pm
---- perl-5.10.0.orig/lib/Pod/Simple/BlackBox.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/BlackBox.pm	2009-02-23 13:52:51.000000000 +0100
-@@ -910,17 +910,10 @@
-     return 1;
-   }
-   
--  unless($content =~ m/^\S+$/s) {  # i.e., unless it's one word
--    $self->whine(
--      $para->[1]{'start_line'},
--      "'=begin' only takes one parameter, not several as in '=begin $content'"
--    );
--    DEBUG and print "Ignoring unintelligible =begin $content\n";
--    return 1;
--  }
--
--
--  $para->[1]{'target'} = $content;  # without any ':'
-+  my ($target, $title) = $content =~ m/^(\S+)\s*(.*)$/;
-+  $para->[1]{'title'} = $title if ($title);
-+  $para->[1]{'target'} = $target;  # without any ':'
-+  $content = $target; # strip off the title
- 
-   $content =~ s/^:!/!:/s;
-   my $neg;  # whether this is a negation-match
-@@ -1681,8 +1674,11 @@
-               [A-Z](?!<)
-             )
-             |
-+            # whitespace is ok, but we don't want to eat the whitespace before
-+            # a multiple-bracket end code.
-+            # NOTE: we may still have problems with e.g. S<<    >>
-             (?:
--              \s(?!\s*>)
-+              \s(?!\s*>{2,})
-             )
-           )+
-         )
-diff -urN perl-5.10.0.orig/lib/Pod/Simple/ChangeLog perl-5.10.0/lib/Pod/Simple/ChangeLog
---- perl-5.10.0.orig/lib/Pod/Simple/ChangeLog	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/ChangeLog	2009-02-23 13:51:48.000000000 +0100
-@@ -1,6 +1,35 @@
- # ChangeLog for Pod::Simple dist
- #---------------------------------------------------------------------------
- 
-+2008-06-04   Allison Randal <allison@perl.org>
-+	* Release 3.07
-+
-+	Fix module dependencies, make HTML::Entities optional and require
-+	Test::More.
-+
-+2008-06-03   Allison Randal <allison@perl.org>
-+	* Release 3.06
-+
-+	Fix bugs related to passing $1 to File::Spec, reported by Andrew Hamlin and
-+	John McNamara.
-+
-+	Applied a suggested fix from Kevin Ryde to return a successful exit
-+	code when Pod::Simple::HTML is run from the command line.
-+
-+	Fix handling of complex L<URL> entries, thanks to tests supplied in RT#4896.
-+
-+	Fix incorrect handling of S<> entries made up of entirely whitespace, thanks
-+	to test case from Andreas Koenig.
-+
-+	Launch Pod::Simple::XHTML, an XHTML compliant, more easily extensible
-+	HTML formatter.
-+
-+	Add feature to parse additional text after =begin target as a block
-+	title, requested by Adam Kennedy.
-+
-+	Thanks to Hans Dieter Pearcey for applying patches, resolving bugs,
-+	and generally getting ready for the release.
-+
- 2007-03-03   Allison Randal <allison@perl.org>
- 	* Release 3.05
- 
-diff -urN perl-5.10.0.orig/lib/Pod/Simple/HTML.pm perl-5.10.0/lib/Pod/Simple/HTML.pm
---- perl-5.10.0.orig/lib/Pod/Simple/HTML.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/HTML.pm	2009-02-23 13:52:51.000000000 +0100
-@@ -164,7 +164,7 @@
- }
- 
- #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--sub go { exit Pod::Simple::HTML->parse_from_file(@ARGV) }
-+sub go { Pod::Simple::HTML->parse_from_file(@ARGV); exit 0 }
-  # Just so we can run from the command line.  No options.
-  #  For that, use perldoc!
- #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-diff -urN perl-5.10.0.orig/lib/Pod/Simple/HTMLBatch.pm perl-5.10.0/lib/Pod/Simple/HTMLBatch.pm
---- perl-5.10.0.orig/lib/Pod/Simple/HTMLBatch.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/HTMLBatch.pm	2009-02-23 13:52:51.000000000 +0100
-@@ -607,7 +607,7 @@
-     my $url = $chunk->[0];
-     my $outfile;
-     if( ref($chunk->[-1]) and $url =~ m{^(_[-a-z0-9_]+\.css$)} ) {
--      $outfile = $self->filespecsys->catfile( $outdir, $1 );
-+      $outfile = $self->filespecsys->catfile( $outdir, "$1" );
-       DEBUG > 5 and print "Noting $$chunk[0] as a file I'll create.\n";
-     } else {
-       DEBUG > 5 and print "OK, noting $$chunk[0] as an external CSS.\n";
-@@ -772,7 +772,7 @@
-     my $outfile;
-     
-     if( ref($script->[-1]) and $url =~ m{^(_[-a-z0-9_]+\.js$)} ) {
--      $outfile = $self->filespecsys->catfile( $outdir, $1 );
-+      $outfile = $self->filespecsys->catfile( $outdir, "$1" );
-       DEBUG > 5 and print "Noting $$script[0] as a file I'll create.\n";
-     } else {
-       DEBUG > 5 and print "OK, noting $$script[0] as an external JavaScript.\n";
-diff -urN perl-5.10.0.orig/lib/Pod/Simple/XHTML.pm perl-5.10.0/lib/Pod/Simple/XHTML.pm
---- perl-5.10.0.orig/lib/Pod/Simple/XHTML.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/XHTML.pm	2009-02-23 13:52:51.000000000 +0100
-@@ -0,0 +1,400 @@
-+=pod
-+
-+=head1 NAME
-+
-+Pod::Simple::XHTML -- format Pod as validating XHTML
-+
-+=head1 SYNOPSIS
-+
-+  use Pod::Simple::XHTML;
-+
-+  my $parser = Pod::Simple::XHTML->new();
-+
-+  ...
-+
-+  $parser->parse_file('path/to/file.pod');
-+
-+=head1 DESCRIPTION
-+
-+This class is a formatter that takes Pod and renders it as XHTML
-+validating HTML.
-+
-+This is a subclass of L<Pod::Simple::Methody> and inherits all its
-+methods. The implementation is entirely different than
-+L<Pod::Simple::HTML>, but it largely preserves the same interface.
-+
-+=cut
-+
-+package Pod::Simple::XHTML;
-+use strict;
-+use vars qw( $VERSION @ISA $HAS_HTML_ENTITIES );
-+$VERSION = '3.04';
-+use Carp ();
-+use Pod::Simple::Methody ();
-+@ISA = ('Pod::Simple::Methody');
-+
-+BEGIN {
-+  $HAS_HTML_ENTITIES = eval "require HTML::Entities; 1";
-+}
-+
-+my %entities = (
-+  q{>} => 'gt',
-+  q{<} => 'lt',
-+  q{'} => '#39',
-+  q{"} => 'quot',
-+  q{&} => 'amp',
-+);
-+
-+sub encode_entities {
-+  return HTML::Entities::encode_entities( $_[0] ) if $HAS_HTML_ENTITIES;
-+  my $str = $_[0];
-+  my $ents = join '', keys %entities;
-+  $str =~ s/([$ents])/'&' . $entities{$1} . ';'/ge;
-+  return $str;
-+}
-+
-+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+
-+=head1 METHODS
-+
-+Pod::Simple::XHTML offers a number of methods that modify the format of
-+the HTML output. Call these after creating the parser object, but before
-+the call to C<parse_file>:
-+
-+  my $parser = Pod::PseudoPod::HTML->new();
-+  $parser->set_optional_param("value");
-+  $parser->parse_file($file);
-+
-+=head2 perldoc_url_prefix
-+
-+In turning L<Foo::Bar> into http://whatever/Foo%3a%3aBar, what
-+to put before the "Foo%3a%3aBar". The default value is
-+"http://search.cpan.org/perldoc?".
-+
-+=head2 perldoc_url_postfix
-+
-+What to put after "Foo%3a%3aBar" in the URL. This option is not set by
-+default.
-+
-+=head2 title_prefix, title_postfix
-+
-+What to put before and after the title in the head. The values should
-+already be &-escaped.
-+
-+=head2 html_css
-+
-+  $parser->html_css('path/to/style.css');
-+
-+The URL or relative path of a CSS file to include. This option is not
-+set by default.
-+
-+=head2 html_javascript
-+
-+The URL or relative path of a JavaScript file to pull in. This option is
-+not set by default.
-+
-+=head2 html_doctype
-+
-+A document type tag for the file. This option is not set by default.
-+
-+=head2 html_header_tags
-+
-+Additional arbitrary HTML tags for the header of the document. The
-+default value is just a content type header tag:
-+
-+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-+
-+Add additional meta tags here, or blocks of inline CSS or JavaScript
-+(wrapped in the appropriate tags).
-+
-+=head2 default_title
-+
-+Set a default title for the page if no title can be determined from the
-+content. The value of this string should already be &-escaped.
-+
-+=head2 force_title
-+
-+Force a title for the page (don't try to determine it from the content).
-+The value of this string should already be &-escaped.
-+
-+=head2 html_header, html_footer
-+
-+Set the HTML output at the beginning and end of each file. The default
-+header includes a title, a doctype tag (if C<html_doctype> is set), a
-+content tag (customized by C<html_header_tags>), a tag for a CSS file
-+(if C<html_css> is set), and a tag for a Javascript file (if
-+C<html_javascript> is set). The default footer simply closes the C<html>
-+and C<body> tags.
-+
-+The options listed above customize parts of the default header, but
-+setting C<html_header> or C<html_footer> completely overrides the
-+built-in header or footer. These may be useful if you want to use
-+template tags instead of literal HTML headers and footers or are
-+integrating converted POD pages in a larger website.
-+
-+If you want no headers or footers output in the HTML, set these options
-+to the empty string.
-+
-+=head2 index
-+
-+TODO -- Not implemented.
-+
-+Whether to add a table-of-contents at the top of each page (called an
-+index for the sake of tradition).
-+
-+
-+=cut
-+
-+__PACKAGE__->_accessorize(
-+ 'perldoc_url_prefix',
-+ 'perldoc_url_postfix',
-+ 'title_prefix',  'title_postfix',
-+ 'html_css', 
-+ 'html_javascript',
-+ 'html_doctype',
-+ 'html_header_tags',
-+ 'title', # Used internally for the title extracted from the content
-+ 'default_title',
-+ 'force_title',
-+ 'html_header',
-+ 'html_footer',
-+ 'index',
-+ 'batch_mode', # whether we're in batch mode
-+ 'batch_mode_current_level',
-+    # When in batch mode, how deep the current module is: 1 for "LWP",
-+    #  2 for "LWP::Procotol", 3 for "LWP::Protocol::GHTTP", etc
-+);
-+
-+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+
-+=head1 SUBCLASSING
-+
-+If the standard options aren't enough, you may want to subclass
-+Pod::Simple::XHMTL. These are the most likely candidates for methods
-+you'll want to override when subclassing.
-+
-+=cut
-+
-+sub new {
-+  my $self = shift;
-+  my $new = $self->SUPER::new(@_);
-+  $new->{'output_fh'} ||= *STDOUT{IO};
-+  $new->accept_targets( 'html', 'HTML' );
-+  $new->perldoc_url_prefix('http://search.cpan.org/perldoc?');
-+  $new->html_header_tags('<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">');
-+  $new->nix_X_codes(1);
-+  $new->codes_in_verbatim(1);
-+  $new->{'scratch'} = '';
-+  return $new;
-+}
-+
-+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+
-+=head2 handle_text
-+
-+This method handles the body of text within any element: it's the body
-+of a paragraph, or everything between a "=begin" tag and the
-+corresponding "=end" tag, or the text within an L entity, etc. You would
-+want to override this if you are adding a custom element type that does
-+more than just display formatted text. Perhaps adding a way to generate
-+HTML tables from an extended version of POD.
-+
-+So, let's say you want add a custom element called 'foo'. In your
-+subclass's C<new> method, after calling C<SUPER::new> you'd call:
-+
-+  $new->accept_targets_as_text( 'foo' );
-+
-+Then override the C<start_for> method in the subclass to check for when
-+"$flags->{'target'}" is equal to 'foo' and set a flag that marks that
-+you're in a foo block (maybe "$self->{'in_foo'} = 1"). Then override the
-+C<handle_text> method to check for the flag, and pass $text to your
-+custom subroutine to construct the HTML output for 'foo' elements,
-+something like:
-+
-+  sub handle_text {
-+      my ($self, $text) = @_;
-+      if ($self->{'in_foo'}) {
-+          $self->{'scratch'} .= build_foo_html($text); 
-+      } else {
-+          $self->{'scratch'} .= $text;
-+      }
-+  }
-+
-+=cut
-+
-+sub handle_text {
-+    # escape special characters in HTML (<, >, &, etc)
-+    $_[0]{'scratch'} .= $_[0]{'in_verbatim'} ? encode_entities( $_[1] ) : $_[1]
-+}
-+
-+sub start_Para     { $_[0]{'scratch'} = '<p>' }
-+sub start_Verbatim { $_[0]{'scratch'} = '<pre><code>'; $_[0]{'in_verbatim'} = 1}
-+
-+sub start_head1 {  $_[0]{'scratch'} = '<h1>' }
-+sub start_head2 {  $_[0]{'scratch'} = '<h2>' }
-+sub start_head3 {  $_[0]{'scratch'} = '<h3>' }
-+sub start_head4 {  $_[0]{'scratch'} = '<h4>' }
-+
-+sub start_item_bullet { $_[0]{'scratch'} = '<li>' }
-+sub start_item_number { $_[0]{'scratch'} = "<li>$_[1]{'number'}. "  }
-+sub start_item_text   { $_[0]{'scratch'} = '<li>'   }
-+
-+sub start_over_bullet { $_[0]{'scratch'} = '<ul>'; $_[0]->emit }
-+sub start_over_text   { $_[0]{'scratch'} = '<ul>'; $_[0]->emit }
-+sub start_over_block  { $_[0]{'scratch'} = '<ul>'; $_[0]->emit }
-+sub start_over_number { $_[0]{'scratch'} = '<ol>'; $_[0]->emit }
-+
-+sub end_over_bullet { $_[0]{'scratch'} .= '</ul>'; $_[0]->emit }
-+sub end_over_text   { $_[0]{'scratch'} .= '</ul>'; $_[0]->emit }
-+sub end_over_block  { $_[0]{'scratch'} .= '</ul>'; $_[0]->emit }
-+sub end_over_number { $_[0]{'scratch'} .= '</ol>'; $_[0]->emit }
-+
-+# . . . . . Now the actual formatters:
-+
-+sub end_Para     { $_[0]{'scratch'} .= '</p>'; $_[0]->emit }
-+sub end_Verbatim {
-+    $_[0]{'scratch'}     .= '</code></pre>';
-+    $_[0]{'in_verbatim'}  = 0;
-+    $_[0]->emit;
-+}
-+
-+sub end_head1       { $_[0]{'scratch'} .= '</h1>'; $_[0]->emit }
-+sub end_head2       { $_[0]{'scratch'} .= '</h2>'; $_[0]->emit }
-+sub end_head3       { $_[0]{'scratch'} .= '</h3>'; $_[0]->emit }
-+sub end_head4       { $_[0]{'scratch'} .= '</h4>'; $_[0]->emit }
-+
-+sub end_item_bullet { $_[0]{'scratch'} .= '</li>'; $_[0]->emit }
-+sub end_item_number { $_[0]{'scratch'} .= '</li>'; $_[0]->emit }
-+sub end_item_text   { $_[0]->emit }
-+
-+# This handles =begin and =for blocks of all kinds.
-+sub start_for { 
-+  my ($self, $flags) = @_;
-+  $self->{'scratch'} .= '<div';
-+  $self->{'scratch'} .= ' class="'.$flags->{'target'}.'"' if ($flags->{'target'});
-+  $self->{'scratch'} .= '>';
-+  $self->emit;
-+
-+}
-+sub end_for { 
-+  my ($self) = @_;
-+  $self->{'scratch'} .= '</div>';
-+  $self->emit;
-+}
-+
-+sub start_Document { 
-+  my ($self) = @_;
-+  if (defined $self->html_header) {
-+    $self->{'scratch'} .= $self->html_header;
-+    $self->emit unless $self->html_header eq "";
-+  } else {
-+    my ($doctype, $title, $metatags);
-+    $doctype = $self->html_doctype || '';
-+    $title = $self->force_title || $self->title || $self->default_title || '';
-+    $metatags = $self->html_header_tags || '';
-+    if ($self->html_css) {
-+      $metatags .= "\n<link rel='stylesheet' href='" .
-+             $self->html_css . "' type='text/css'>";
-+    }
-+    if ($self->html_javascript) {
-+      $metatags .= "\n<script type='text/javascript' src='" .
-+                    $self->html_javascript . "'></script>";
-+    }
-+    $self->{'scratch'} .= <<"HTML";
-+$doctype
-+<html>
-+<head>
-+<title>$title</title>
-+$metatags
-+</head>
-+<body>
-+HTML
-+    $self->emit;
-+  }
-+}
-+
-+sub end_Document   { 
-+  my ($self) = @_;
-+  if (defined $self->html_footer) {
-+    $self->{'scratch'} .= $self->html_footer;
-+    $self->emit unless $self->html_footer eq "";
-+  } else {
-+    $self->{'scratch'} .= "</body>\n</html>";
-+    $self->emit;
-+  }
-+}
-+
-+# Handling code tags
-+sub start_B { $_[0]{'scratch'} .= '<b>' }
-+sub end_B   { $_[0]{'scratch'} .= '</b>' }
-+
-+sub start_C { $_[0]{'scratch'} .= '<code>' }
-+sub end_C   { $_[0]{'scratch'} .= '</code>' }
-+
-+sub start_E { $_[0]{'scratch'} .= '&' }
-+sub end_E   { $_[0]{'scratch'} .= ';' }
-+
-+sub start_F { $_[0]{'scratch'} .= '<i>' }
-+sub end_F   { $_[0]{'scratch'} .= '</i>' }
-+
-+sub start_I { $_[0]{'scratch'} .= '<i>' }
-+sub end_I   { $_[0]{'scratch'} .= '</i>' }
-+
-+sub start_L { 
-+  my ($self, $flags) = @_;
-+    my $url;
-+    if ($flags->{'type'} eq 'url') {
-+      $url = $flags->{'to'};
-+    } elsif ($flags->{'type'} eq 'pod') {
-+      $url .= $self->perldoc_url_prefix || '';
-+      $url .= $flags->{'to'} || '';
-+      $url .= '/' . $flags->{'section'} if ($flags->{'section'});
-+      $url .= $self->perldoc_url_postfix || '';
-+#    require Data::Dumper;
-+#    print STDERR Data::Dumper->Dump([$flags]);
-+    }
-+
-+    $self->{'scratch'} .= '<a href="'. $url . '">';
-+}
-+sub end_L   { $_[0]{'scratch'} .= '</a>' }
-+
-+sub start_S { $_[0]{'scratch'} .= '<nobr>' }
-+sub end_S   { $_[0]{'scratch'} .= '</nobr>' }
-+
-+sub emit {
-+  my($self) = @_;
-+  my $out = $self->{'scratch'} . "\n";
-+  print {$self->{'output_fh'}} $out, "\n";
-+  $self->{'scratch'} = '';
-+  return;
-+}
-+
-+# Bypass built-in E<> handling to preserve entity encoding
-+sub _treat_Es {} 
-+
-+1;
-+
-+__END__
-+
-+=head1 SEE ALSO
-+
-+L<Pod::Simple>, L<Pod::Simple::Methody>
-+
-+=head1 COPYRIGHT
-+
-+Copyright (c) 2003-2005 Allison Randal.
-+
-+This library is free software; you can redistribute it and/or modify
-+it under the same terms as Perl itself. The full text of the license
-+can be found in the LICENSE file included with this module.
-+
-+This library is distributed in the hope that it will be useful, but
-+without any warranty; without even the implied warranty of
-+merchantability or fitness for a particular purpose.
-+
-+=head1 AUTHOR
-+
-+Allison Randal <allison@perl.org>
-+
-+=cut
-+
-diff -urN perl-5.10.0.orig/lib/Pod/Simple/t/begin.t perl-5.10.0/lib/Pod/Simple/t/begin.t
---- perl-5.10.0.orig/lib/Pod/Simple/t/begin.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/begin.t	2009-02-23 13:56:01.000000000 +0100
-@@ -7,7 +7,7 @@
- 
- use strict;
- use Test;
--BEGIN { plan tests => 61 };
-+BEGIN { plan tests => 62 };
- 
- my $d;
- #use Pod::Simple::Debug (\$d, 0);
-@@ -114,7 +114,6 @@
-   '<Document><Para>I like pie.</Para><Para>Yup.</Para></Document>'
- );
- 
--
- #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- 
- print "# Testing matching because of negated non-acceptance...\n";
-@@ -448,8 +447,14 @@
-  qq{<Para>Yup.</Para></Document>}
- );
- 
-+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- 
-+print "# Testing matching of begin block titles\n";
-+ok( $x->_out( \&moj, "=pod\n\nI like pie.\n\n=begin mojojojo Title\n\nstuff\n\n=end mojojojo \n\nYup.\n"),
-+  '<Document><Para>I like pie.</Para><for target="mojojojo" target_matching="mojojojo" title="Title"><Data xml:space="preserve">stuff</Data></for><Para>Yup.</Para></Document>'
-+);
- 
-+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- 
- print "# Wrapping up... one for the road...\n";
- ok 1;
-diff -urN perl-5.10.0.orig/lib/Pod/Simple/t/fcodes_l.t perl-5.10.0/lib/Pod/Simple/t/fcodes_l.t
---- perl-5.10.0.orig/lib/Pod/Simple/t/fcodes_l.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/fcodes_l.t	2009-02-23 13:56:01.000000000 +0100
-@@ -7,7 +7,7 @@
- 
- use strict;
- use Test;
--BEGIN { plan tests => 93 };
-+BEGIN { plan tests => 99 };
- 
- #use Pod::Simple::Debug (10);
- 
-@@ -398,6 +398,27 @@
-  '<Document><Para>I like <L section="Member Data" type="pod">the <F>various</F> attributes</L>.</Para></Document>'
- );
- 
-+ok( $x->_out(qq{=pod\n\nI like L<<< B<text>s|http://text.com >>>.\n}),
-+'<Document><Para>I like <L to="http://text.com" type="url"><B>text</B>s</L>.</Para></Document>'
-+);
-+ok( $x->_out(qq{=pod\n\nI like L<<< text|https://text.com/1/2 >>>.\n}),
-+'<Document><Para>I like <L to="https://text.com/1/2" type="url">text</L>.</Para></Document>'
-+);
-+ok( $x->_out(qq{=pod\n\nI like L<<< I<text>|http://text.com >>>.\n}),
-+'<Document><Para>I like <L to="http://text.com" type="url"><I>text</I></L>.</Para></Document>'
-+);
-+ok( $x->_out(qq{=pod\n\nI like L<<< C<text>|http://text.com >>>.\n}),
-+'<Document><Para>I like <L to="http://text.com" type="url"><C>text</C></L>.</Para></Document>'
-+);
-+ok( $x->_out(qq{=pod\n\nI like L<<< I<tI<eI<xI<t>>>>|mailto:earlE<64>text.com >>>.\n}),
-+'<Document><Para>I like <L to="mailto:earl@text.com" type="url"><I>t<I>e<I>x<I>t</I></I></I></I></L>.</Para></Document>'
-+);
-+ok( $x->_out(qq{=pod\n\nI like L<<< textZ<>|http://text.com >>>.\n}),
-+'<Document><Para>I like <L to="http://text.com" type="url">text</L>.</Para></Document>'
-+);
-+
-+
-+
- 
- #
- # TODO: S testing.
-diff -urN perl-5.10.0.orig/lib/Pod/Simple/t/fcodes_s.t perl-5.10.0/lib/Pod/Simple/t/fcodes_s.t
---- perl-5.10.0.orig/lib/Pod/Simple/t/fcodes_s.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/fcodes_s.t	2009-02-23 13:56:01.000000000 +0100
-@@ -7,7 +7,7 @@
- 
- use strict;
- use Test;
--BEGIN { plan tests => 13 };
-+BEGIN { plan tests => 14 };
- 
- #use Pod::Simple::Debug (6);
- 
-@@ -76,7 +76,30 @@
-     qq{=pod\n\nI like L<StuffE<160>I<likeE<160>that>|"bric-a-brac a gogo">.\n},
- ));
- 
-+use Pod::Simple::Text;
-+$x = Pod::Simple::Text->new;
-+$x->preserve_whitespace(1);
-+# RT#25679
-+ok(
-+  $x->_out(<<END
-+=head1 The Tk::mega manpage showed me how C<< SE<lt> E<gt> foo >> is being rendered
- 
-+Both pod2text and pod2man S<    > lose the rest of the line
-+
-+=head1 Do they always S<    > lose the rest of the line?
-+
-+=cut
-+END
-+  ),
-+  <<END
-+The Tk::mega manpage showed me how S< > foo is being rendered
-+
-+    Both pod2text and pod2man      lose the rest of the line
-+
-+Do they always      lose the rest of the line?
-+
-+END
-+);
- 
- print "# Wrapping up... one for the road...\n";
- ok 1;
-diff -urN perl-5.10.0.orig/lib/Pod/Simple/t/xhtml01.t perl-5.10.0/lib/Pod/Simple/t/xhtml01.t
---- perl-5.10.0.orig/lib/Pod/Simple/t/xhtml01.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/xhtml01.t	2009-02-23 13:56:01.000000000 +0100
-@@ -0,0 +1,351 @@
-+#!/usr/bin/perl -w
-+
-+# t/xhtml01.t - check basic output from Pod::Simple::XHTML
-+
-+BEGIN {
-+    chdir 't' if -d 't';
-+}
-+
-+use strict;
-+use lib '../lib';
-+use Test::More tests => 26;
-+
-+use_ok('Pod::Simple::XHTML') or exit;
-+
-+my $parser = Pod::Simple::XHTML->new ();
-+isa_ok ($parser, 'Pod::Simple::XHTML');
-+
-+my $results;
-+
-+my $PERLDOC = "http://search.cpan.org/perldoc?";
-+
-+initialize($parser, $results);
-+$parser->parse_string_document( "=head1 Poit!" );
-+is($results, "<h1>Poit!</h1>\n\n", "head1 level output");
-+
-+initialize($parser, $results);
-+$parser->parse_string_document( "=head2 I think so Brain." );
-+is($results, "<h2>I think so Brain.</h2>\n\n", "head2 level output");
-+
-+initialize($parser, $results);
-+$parser->parse_string_document( "=head3 I say, Brain..." );
-+is($results, "<h3>I say, Brain...</h3>\n\n", "head3 level output");
-+
-+initialize($parser, $results);
-+$parser->parse_string_document( "=head4 Zort!" );
-+is($results, "<h4>Zort!</h4>\n\n", "head4 level output");
-+
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+Gee, Brain, what do you want to do tonight?
-+EOPOD
-+
-+is($results, <<'EOHTML', "simple paragraph");
-+<p>Gee, Brain, what do you want to do tonight?</p>
-+
-+EOHTML
-+
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+B: Now, Pinky, if by any chance you are captured during this mission,
-+remember you are Gunther Heindriksen from Appenzell. You moved to
-+Grindelwald to drive the cog train to Murren. Can you repeat that?
-+
-+P: Mmmm, no, Brain, don't think I can.
-+EOPOD
-+
-+is($results, <<'EOHTML', "multiple paragraphs");
-+<p>B: Now, Pinky, if by any chance you are captured during this mission, remember you are Gunther Heindriksen from Appenzell. You moved to Grindelwald to drive the cog train to Murren. Can you repeat that?</p>
-+
-+<p>P: Mmmm, no, Brain, don't think I can.</p>
-+
-+EOHTML
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=over
-+
-+=item *
-+
-+P: Gee, Brain, what do you want to do tonight?
-+
-+=item *
-+
-+B: The same thing we do every night, Pinky. Try to take over the world!
-+
-+=back
-+
-+EOPOD
-+
-+is($results, <<'EOHTML', "simple bulleted list");
-+<ul>
-+
-+<li>P: Gee, Brain, what do you want to do tonight?</li>
-+
-+<li>B: The same thing we do every night, Pinky. Try to take over the world!</li>
-+
-+</ul>
-+
-+EOHTML
-+
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=over
-+
-+=item 1
-+
-+P: Gee, Brain, what do you want to do tonight?
-+
-+=item 2
-+
-+B: The same thing we do every night, Pinky. Try to take over the world!
-+
-+=back
-+
-+EOPOD
-+
-+is($results, <<'EOHTML', "numbered list");
-+<ol>
-+
-+<li>1. P: Gee, Brain, what do you want to do tonight?</li>
-+
-+<li>2. B: The same thing we do every night, Pinky. Try to take over the world!</li>
-+
-+</ol>
-+
-+EOHTML
-+
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=over
-+
-+=item Pinky
-+
-+Gee, Brain, what do you want to do tonight?
-+
-+=item Brain
-+
-+The same thing we do every night, Pinky. Try to take over the world!
-+
-+=back
-+
-+EOPOD
-+
-+is($results, <<'EOHTML', "list with text headings");
-+<ul>
-+
-+<li>Pinky
-+
-+<p>Gee, Brain, what do you want to do tonight?</p>
-+
-+<li>Brain
-+
-+<p>The same thing we do every night, Pinky. Try to take over the world!</p>
-+
-+</ul>
-+
-+EOHTML
-+
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+  1 + 1 = 2;
-+  2 + 2 = 4;
-+
-+EOPOD
-+
-+is($results, <<'EOHTML', "code block");
-+<pre><code>  1 + 1 = 2;
-+  2 + 2 = 4;</code></pre>
-+
-+EOHTML
-+
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+A plain paragraph with a C<functionname>.
-+EOPOD
-+is($results, <<"EOHTML", "code entity in a paragraph");
-+<p>A plain paragraph with a <code>functionname</code>.</p>
-+
-+EOHTML
-+
-+
-+initialize($parser, $results);
-+$parser->html_header("<html>\n<body>");
-+$parser->html_footer("</body>\n</html>");
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+A plain paragraph with body tags turned on.
-+EOPOD
-+is($results, <<"EOHTML", "adding html body tags");
-+<html>
-+<body>
-+
-+<p>A plain paragraph with body tags turned on.</p>
-+
-+</body>
-+</html>
-+
-+EOHTML
-+
-+
-+initialize($parser, $results);
-+$parser->html_css('style.css');
-+$parser->html_header(undef);
-+$parser->html_footer(undef);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+A plain paragraph with body tags and css tags turned on.
-+EOPOD
-+like($results, qr/<link rel='stylesheet' href='style.css' type='text\/css'>/,
-+"adding html body tags and css tags");
-+
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+A plain paragraph with S<non breaking text>.
-+EOPOD
-+is($results, <<"EOHTML", "Non breaking text in a paragraph");
-+<p>A plain paragraph with <nobr>non breaking text</nobr>.</p>
-+
-+EOHTML
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+A plain paragraph with a L<Newlines>.
-+EOPOD
-+is($results, <<"EOHTML", "Link entity in a paragraph");
-+<p>A plain paragraph with a <a href="${PERLDOC}Newlines">Newlines</a>.</p>
-+
-+EOHTML
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+A plain paragraph with a L<perlport/Newlines>.
-+EOPOD
-+is($results, <<"EOHTML", "Link entity in a paragraph");
-+<p>A plain paragraph with a <a href="${PERLDOC}perlport/Newlines">"Newlines" in perlport</a>.</p>
-+
-+EOHTML
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+A plain paragraph with a L<Boo|http://link.included.here>.
-+EOPOD
-+is($results, <<"EOHTML", "A link in a paragraph");
-+<p>A plain paragraph with a <a href="http://link.included.here">Boo</a>.</p>
-+
-+EOHTML
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+A plain paragraph with a L<http://link.included.here>.
-+EOPOD
-+is($results, <<"EOHTML", "A link in a paragraph");
-+<p>A plain paragraph with a <a href="http://link.included.here">http://link.included.here</a>.</p>
-+
-+EOHTML
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+A plain paragraph with B<bold text>.
-+EOPOD
-+is($results, <<"EOHTML", "Bold text in a paragraph");
-+<p>A plain paragraph with <b>bold text</b>.</p>
-+
-+EOHTML
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+A plain paragraph with I<italic text>.
-+EOPOD
-+is($results, <<"EOHTML", "Italic text in a paragraph");
-+<p>A plain paragraph with <i>italic text</i>.</p>
-+
-+EOHTML
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+A plain paragraph with a F<filename>.
-+EOPOD
-+is($results, <<"EOHTML", "File name in a paragraph");
-+<p>A plain paragraph with a <i>filename</i>.</p>
-+
-+EOHTML
-+
-+
-+initialize($parser, $results);
-+$parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+  # this header is very important & don't you forget it
-+  my $text = "File is: " . <FILE>;
-+EOPOD
-+is($results, <<"EOHTML", "Verbatim text with encodable entities");
-+<pre><code>  # this header is very important &amp; don&#39;t you forget it
-+  my \$text = &quot;File is: &quot; . &lt;FILE&gt;;</code></pre>
-+
-+EOHTML
-+
-+SKIP: for my $use_html_entities (0, 1) {
-+  if ($use_html_entities and not $Pod::Simple::XHTML::HAS_HTML_ENTITIES) {
-+    skip("HTML::Entities not installed", 1);
-+  }
-+  local $Pod::Simple::XHTML::HAS_HTML_ENTITIES = $use_html_entities;
-+  initialize($parser, $results);
-+  $parser->parse_string_document(<<'EOPOD');
-+=pod
-+
-+  # this header is very important & don't you forget it
-+  B<my $file = <FILEE<gt> || 'Blank!';>
-+  my $text = "File is: " . <FILE>;
-+EOPOD
-+is($results, <<"EOHTML", "Verbatim text with markup and embedded formatting");
-+<pre><code>  # this header is very important &amp; don&#39;t you forget it
-+  <b>my \$file = &lt;FILE&gt; || &#39;Blank!&#39;;</b>
-+  my \$text = &quot;File is: &quot; . &lt;FILE&gt;;</code></pre>
-+
-+EOHTML
-+}
-+
-+######################################
-+
-+sub initialize {
-+	$_[0] = Pod::Simple::XHTML->new ();
-+        $_[0]->html_header("");
-+        $_[0]->html_footer("");
-+	$_[0]->output_string( \$results ); # Send the resulting output to a string
-+	$_[1] = '';
-+	return;
-+}
-diff -urN perl-5.10.0.orig/lib/Pod/Simple/t/xhtml05.t perl-5.10.0/lib/Pod/Simple/t/xhtml05.t
---- perl-5.10.0.orig/lib/Pod/Simple/t/xhtml05.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/xhtml05.t	2009-02-23 13:56:01.000000000 +0100
-@@ -0,0 +1,67 @@
-+#!/usr/bin/perl -w
-+
-+# t/xhtml05.t - check block output from Pod::Simple::XHTML
-+
-+BEGIN {
-+    chdir 't' if -d 't';
-+}
-+
-+use strict;
-+use lib '../lib';
-+use Test::More tests => 6;
-+
-+use_ok('Pod::Simple::XHTML') or exit;
-+
-+my $parser = Pod::Simple::XHTML->new ();
-+isa_ok ($parser, 'Pod::Simple::XHTML');
-+
-+my $results;
-+initialize($parser, $results);
-+$parser->accept_targets_as_text( 'comment' );
-+$parser->parse_string_document(<<'EOPOD');
-+=for comment
-+This is an ordinary for block.
-+
-+EOPOD
-+
-+is($results, <<'EOHTML', "a for block");
-+<div class="comment">
-+
-+<p>This is an ordinary for block.</p>
-+
-+</div>
-+
-+EOHTML
-+
-+foreach my $target qw(note tip warning) {
-+  initialize($parser, $results);
-+  $parser->accept_targets_as_text( $target );
-+  $parser->parse_string_document(<<"EOPOD");
-+=begin $target
-+
-+This is a $target.
-+
-+=end $target
-+EOPOD
-+
-+  is($results, <<"EOHTML", "allow $target blocks");
-+<div class="$target">
-+
-+<p>This is a $target.</p>
-+
-+</div>
-+
-+EOHTML
-+
-+}
-+
-+######################################
-+
-+sub initialize {
-+	$_[0] = Pod::Simple::XHTML->new ();
-+        $_[0]->html_header("");
-+        $_[0]->html_footer("");
-+	$_[0]->output_string( \$results ); # Send the resulting output to a string
-+	$_[1] = '';
-+	return;
-+}
-diff -urN perl-5.10.0.orig/lib/Pod/Simple.pm perl-5.10.0/lib/Pod/Simple.pm
---- perl-5.10.0.orig/lib/Pod/Simple.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple.pm	2009-02-23 13:52:51.000000000 +0100
-@@ -18,7 +18,7 @@
- );
- 
- @ISA = ('Pod::Simple::BlackBox');
--$VERSION = '3.05';
-+$VERSION = '3.07';
- 
- @Known_formatting_codes = qw(I B C L E F S X Z); 
- %Known_formatting_codes = map(($_=>1), @Known_formatting_codes);
-@@ -983,6 +983,7 @@
-   # L<text|name/"sec"> or L<text|name/sec>
-   # L<text|/"sec"> or L<text|/sec> or L<text|"sec">
-   # L<scheme:...>
-+  # Ltext|scheme:...>
- 
-   my($self,@stack) = @_;
- 
-@@ -1002,11 +1003,12 @@
-       
-       
-       # By here, $treelet->[$i] is definitely an L node
--      DEBUG > 1 and print "Ogling L node $treelet->[$i]\n";
-+      my $ell = $treelet->[$i];
-+      DEBUG > 1 and print "Ogling L node $ell\n";
-         
-       # bitch if it's empty
--      if(  @{$treelet->[$i]} == 2
--       or (@{$treelet->[$i]} == 3 and $treelet->[$i][2] eq '')
-+      if(  @{$ell} == 2
-+       or (@{$ell} == 3 and $ell->[2] eq '')
-       ) {
-         $self->whine( $start_line, "An empty L<>" );
-         $treelet->[$i] = 'L<>';  # just make it a text node
-@@ -1014,55 +1016,70 @@
-       }
-      
-       # Catch URLs:
--      # URLs can, alas, contain E<...> sequences, so we can't /assume/
--      #  that this is one text node.  But it has to START with one text
--      #  node...
--      if(! ref $treelet->[$i][2] and
--        $treelet->[$i][2] =~ m/^\w+:[^:\s]\S*$/s
-+
-+      # there are a number of possible cases:
-+      # 1) text node containing url: http://foo.com
-+      #   -> [ 'http://foo.com' ]
-+      # 2) text node containing url and text: foo|http://foo.com
-+      #   -> [ 'foo|http://foo.com' ]
-+      # 3) text node containing url start: mailto:xE<at>foo.com
-+      #   -> [ 'mailto:x', [ E ... ], 'foo.com' ]
-+      # 4) text node containing url start and text: foo|mailto:xE<at>foo.com
-+      #   -> [ 'foo|mailto:x', [ E ... ], 'foo.com' ]
-+      # 5) other nodes containing text and url start: OE<39>Malley|http://foo.com
-+      #   -> [ 'O', [ E ... ], 'Malley', '|http://foo.com' ]
-+      # ... etc.
-+
-+      # anything before the url is part of the text.
-+      # anything after it is part of the url.
-+      # the url text node itself may contain parts of both.
-+
-+      if (my ($url_index, $text_part, $url_part) =
-+        # grep is no good here; we want to bail out immediately so that we can
-+        # use $1, $2, etc. without having to do the match twice.
-+        sub {
-+          for (2..$#$ell) {
-+            next if ref $ell->[$_];
-+            next unless $ell->[$_] =~ m/^(?:([^|]*)\|)?(\w+:[^:\s]\S*)$/s;
-+            return ($_, $1, $2);
-+          }
-+          return;
-+        }->()
-       ) {
--        $treelet->[$i][1]{'type'} = 'url';
--        $treelet->[$i][1]{'content-implicit'} = 'yes';
-+        $ell->[1]{'type'} = 'url';
- 
--        # TODO: deal with rel: URLs here?
-+        my @text = @{$ell}[2..$url_index-1];
-+        push @text, $text_part if defined $text_part;
- 
--        if( 3 == @{ $treelet->[$i] } ) {
--          # But if it IS just one text node (most common case)
--          DEBUG > 1 and printf qq{Catching "%s as " as ho-hum L<URL> link.\n},
--            $treelet->[$i][2]
--          ;
--          $treelet->[$i][1]{'to'} = Pod::Simple::LinkSection->new(
--            $treelet->[$i][2]
--          );                   # its own treelet
--        } else {
--          # It's a URL but complex (like "L<foo:bazE<123>bar>").  Feh.
--          #$treelet->[$i][1]{'to'} = [ @{$treelet->[$i]} ];
--          #splice @{ $treelet->[$i][1]{'to'} }, 0,2;
--          #DEBUG > 1 and printf qq{Catching "%s as " as complex L<URL> link.\n},
--          #  join '~', @{$treelet->[$i][1]{'to'  }};
--          
--          $treelet->[$i][1]{'to'} = Pod::Simple::LinkSection->new(
--            $treelet->[$i]  # yes, clone the whole content as a treelet
--          );
--          $treelet->[$i][1]{'to'}[0] = ''; # set the copy's tagname to nil
--          die "SANITY FAILURE" if $treelet->[0] eq ''; # should never happen!
--          DEBUG > 1 and print
--           qq{Catching "$treelet->[$i][1]{'to'}" as a complex L<URL> link.\n};
-+        my @url  = @{$ell}[$url_index+1..$#$ell];
-+        unshift @url, $url_part;
-+
-+        unless (@text) {
-+          $ell->[1]{'content-implicit'} = 'yes';
-+          @text = @url;
-         }
- 
--        next; # and move on
-+        $ell->[1]{to} = Pod::Simple::LinkSection->new(
-+          @url == 1
-+          ? $url[0]
-+          : [ '', {}, @url ],
-+        );
-+
-+        splice @$ell, 2, $#$ell, @text;
-+
-+        next;
-       }
-       
--      
-       # Catch some very simple and/or common cases
--      if(@{$treelet->[$i]} == 3 and ! ref $treelet->[$i][2]) {
--        my $it = $treelet->[$i][2];
-+      if(@{$ell} == 3 and ! ref $ell->[2]) {
-+        my $it = $ell->[2];
-         if($it =~ m/^[-a-zA-Z0-9]+\([-a-zA-Z0-9]+\)$/s) { # man sections
-           # Hopefully neither too broad nor too restrictive a RE
-           DEBUG > 1 and print "Catching \"$it\" as manpage link.\n";
--          $treelet->[$i][1]{'type'} = 'man';
-+          $ell->[1]{'type'} = 'man';
-           # This's the only place where man links can get made.
--          $treelet->[$i][1]{'content-implicit'} = 'yes';
--          $treelet->[$i][1]{'to'  } =
-+          $ell->[1]{'content-implicit'} = 'yes';
-+          $ell->[1]{'to'  } =
-             Pod::Simple::LinkSection->new( $it ); # treelet!
- 
-           next;
-@@ -1071,9 +1088,9 @@
-           # Extremely forgiving idea of what constitutes a bare
-           #  modulename link like L<Foo::Bar> or even L<Thing::1.0::Docs::Tralala>
-           DEBUG > 1 and print "Catching \"$it\" as ho-hum L<Modulename> link.\n";
--          $treelet->[$i][1]{'type'} = 'pod';
--          $treelet->[$i][1]{'content-implicit'} = 'yes';
--          $treelet->[$i][1]{'to'  } =
-+          $ell->[1]{'type'} = 'pod';
-+          $ell->[1]{'content-implicit'} = 'yes';
-+          $ell->[1]{'to'  } =
-             Pod::Simple::LinkSection->new( $it ); # treelet!
-           next;
-         }
-@@ -1089,7 +1106,6 @@
-       
-       
-       my $link_text; # set to an arrayref if found
--      my $ell = $treelet->[$i];
-       my @ell_content = @$ell;
-       splice @ell_content,0,2; # Knock off the 'L' and {} bits
- 
-@@ -1443,7 +1459,7 @@
-    "\nAbout to parse source: {{\n$_[0]\n}}\n\n";
-   
-   
--  my $parser = $class->new;
-+  my $parser = ref $class && $class->isa(__PACKAGE__) ? $class : $class->new;
-   $parser->hide_line_numbers(1);
- 
-   my $out = '';
-diff -urN perl-5.10.0.orig/lib/Pod/Simple.pod perl-5.10.0/lib/Pod/Simple.pod
---- perl-5.10.0.orig/lib/Pod/Simple.pod	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple.pod	2009-02-23 13:52:51.000000000 +0100
-@@ -211,7 +211,15 @@
- 
- Original author: Sean M. Burke C<sburke@cpan.org>
- 
--Maintained by: Allison Randal C<allison@perl.org>
-+Maintained by: 
-+
-+=over
-+
-+=item * Allison Randal C<allison@perl.org>
-+
-+=item * Hans Dieter Pearcey C<hdp@cpan.org>
-+
-+=back
- 
- =cut
- 
-diff -up perl-5.10.0/lib/Pod/t/text.t.old perl-5.10.0/lib/Pod/t/text.t
---- perl-5.10.0/lib/Pod/t/text.t.old	2008-10-07 15:21:33.000000000 +0200
-+++ perl-5.10.0/lib/Pod/t/text.t	2008-10-07 15:20:10.000000000 +0200
-@@ -58,7 +58,7 @@ while (<DATA>) {
-     }
-     if ($output eq $expected) {
-         print "ok $n\n";
--    } elsif ($n == 4 && $Pod::Simple::VERSION < 3.06) {
-+    } elsif ($n == 4 && $Pod::Simple::VERSION < 3.08) {
-         print "ok $n # skip Pod::Simple S<> parsing bug\n";
-     } else {
-         print "not ok $n\n";
diff --git a/perl-update-Scalar-List-Utils.patch b/perl-update-Scalar-List-Utils.patch
deleted file mode 100644
index 4c03a63..0000000
--- a/perl-update-Scalar-List-Utils.patch
+++ /dev/null
@@ -1,1520 +0,0 @@
-Scalar-List-Utils-1.21
-
-Makefile.PL patched to build Util.so instead of ListUtil.so
-
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-07-10 12:34:47.000000000 +0200
-@@ -842,6 +842,7 @@
- ext/List/Util/t/00version.t	Scalar::Util
- ext/List/Util/t/blessed.t	Scalar::Util
- ext/List/Util/t/dualvar.t	Scalar::Util
-+ext/List/Util/t/expfail.t	Scalar::Util
- ext/List/Util/t/first.t		List::Util
- ext/List/Util/t/isvstring.t	Scalar::Util
- ext/List/Util/t/lln.t		Scalar::Util
-@@ -850,6 +851,7 @@
- ext/List/Util/t/minstr.t	List::Util
- ext/List/Util/t/min.t		List::Util
- ext/List/Util/t/openhan.t	Scalar::Util
-+ext/List/Util/t/p_00version.t	Scalar::Util
- ext/List/Util/t/p_blessed.t	Scalar::Util
- ext/List/Util/t/p_first.t	List::Util
- ext/List/Util/t/p_lln.t		Scalar::Util
-@@ -871,6 +873,7 @@
- ext/List/Util/t/refaddr.t	Scalar::Util
- ext/List/Util/t/reftype.t	Scalar::Util
- ext/List/Util/t/shuffle.t	List::Util
-+ext/List/Util/t/stack-corruption.t	List::Util
- ext/List/Util/t/sum.t		List::Util
- ext/List/Util/t/tainted.t	Scalar::Util
- ext/List/Util/t/weak.t		Scalar::Util
-diff -urN perl-5.10.0.orig/ext/List/Util/Changes perl-5.10.0/ext/List/Util/Changes
---- perl-5.10.0.orig/ext/List/Util/Changes	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/Changes	2009-07-08 17:22:59.000000000 +0200
-@@ -1,3 +1,25 @@
-+1.21 -- Mon May 18 10:32:14 CDT 2009
-+
-+  * Change build system for perl-only install not to need to modify blib
-+  * When building inside perl, tests for weaken should be always run (Alexandr Ciornii)
-+
-+1.20 -- Wed May 13 16:42:53 CDT 2009
-+
-+*** NOTE***
-+This distribution now requires perl 5.6 or greater
-+
-+Bug Fixes
-+  * Fixed stack pop issue in POP_MULTICALL
-+  * Fixed error reporting in import when XS not compiled
-+  * Check first argument to reduce is a CODE reference to avoid segfault
-+  * Handle overloaded and tied values
-+  * Fix tainted test to run on Win32
-+
-+Enhancements
-+  * Added List::Util::XS so authors can depend on XS version
-+  * Removed need for dummy methods in UNIVERSAL for perl-only code
-+
-+
- 1.19 -- Sun Dec 10 09:58:03 CST 2006
- 
- Bug Fixes
-diff -urN perl-5.10.0.orig/ext/List/Util/Makefile.PL perl-5.10.0/ext/List/Util/Makefile.PL
---- perl-5.10.0.orig/ext/List/Util/Makefile.PL	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/Makefile.PL	2009-05-15 04:54:09.000000000 +0200
-@@ -1,47 +1,86 @@
-+# -*- perl -*-
-+BEGIN { require 5.006; } # allow CPAN testers to get the point
-+use strict;
-+use warnings;
-+use Config;
-+use File::Spec;
- use ExtUtils::MakeMaker;
-+my $PERL_CORE = grep { $_ eq 'PERL_CORE=1' } @ARGV;
-+
-+my $do_xs = $PERL_CORE || can_cc();
-+
-+for (@ARGV) {
-+  /^-pm/ and $do_xs = 0;
-+  /^-xs/ and $do_xs = 1;
-+}
- 
- WriteMakefile(
--    VERSION_FROM    => "lib/List/Util.pm",
--    MAN3PODS        => {},  # Pods will be built by installman.
--    NAME            => "List::Util",
--    DEFINE          => "-DPERL_EXT",
-+  NAME         => q[List::Util],
-+  ABSTRACT     => q[Common Scalar and List utility subroutines],
-+  AUTHOR       => q[Graham Barr <gbarr@cpan.org>],
-+  DEFINE       => q[-DPERL_EXT],
-+  DISTNAME     => q[Scalar-List-Utils],
-+  VERSION_FROM => 'lib/List/Util.pm',
-+
-+  # We go through the ListUtil.xs trickery to foil platforms
-+  # that have the feature combination of
-+  # (1) static builds
-+  # (2) allowing only one object by the same name in the static library
-+  # (3) the object name matching being case-blind
-+  # This means that we can't have the top-level util.o
-+  # and the extension-level Util.o in the same build.
-+  # One such platform is the POSIX-BC BS2000 EBCDIC mainframe platform.
-+  XS     => {'Util.xs' => 'Util.c'},
-+  OBJECT => 'Util$(OBJ_EXT)',
-+  ( $PERL_CORE
-+    ? ()
-+    : (
-+      INSTALLDIRS => q[perl],
-+      PREREQ_PM   => {'Test::More' => 0,},
-+      (eval { ExtUtils::MakeMaker->VERSION(6.31) } ? (LICENSE => 'perl') : ()),
-+      ($do_xs ? () : (XS => {}, C => [], OBJECT => '')),
-+      ( eval { ExtUtils::MakeMaker->VERSION(6.46) } ? (
-+          META_MERGE => {
-+            resources => {    ##
-+              repository => 'http://github.com/gbarr/Scalar-List-Utils',
-+            },
-+          }
-+          )
-+        : ()
-+      ),
-+    )
-+  ),
- );
- 
--package MY;
- 
--# We go through the ListUtil.c trickery to foil platforms
--# that have the feature combination of
--# (1) static builds
--# (2) allowing only one object by the same name in the static library
--# (3) the object name matching being case-blind
--# This means that we can't have the top-level util.o
--# and the extension-level Util.o in the same build.
--# One such platform is the POSIX-BC BS2000 EBCDIC mainframe platform.
--
--BEGIN {
--    use Config;
--    unless (defined $Config{usedl}) {
--	eval <<'__EOMM__';
--sub xs_c {
--    my($self) = shift;
--    return '' unless $self->needs_linking();
--'
--ListUtil.c:	Util.xs
--	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) $(XSUBPP) $(XSPROTOARG) $(XSUBPPARGS) Util.xs > ListUtil.xsc && $(MV) ListUtil.xsc ListUtil.c
--';
--}
-+sub can_cc {
-+
-+    foreach my $cmd (split(/ /, $Config::Config{cc})) {
-+        my $_cmd = $cmd;
-+        return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
-+
-+        for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
-+            my $abs = File::Spec->catfile($dir, $_[1]);
-+            return $abs if (-x $abs or $abs = MM->maybe_command($abs));
-+        }
-+    }
- 
--sub xs_o {
--    my($self) = shift;
--    return '' unless $self->needs_linking();
--'
--
--Util$(OBJ_EXT):	ListUtil.c
--	$(CCCMD) $(CCCDLFLAGS) -I$(PERL_INC) $(DEFINE) ListUtil.c
--	$(MV) ListUtil$(OBJ_EXT) Util$(OBJ_EXT)
--';
-+    return;
- }
- 
--__EOMM__
--    }
-+package MY;
-+
-+sub init_PM  {
-+  my $self = shift;
-+
-+  $self->SUPER::init_PM(@_);
-+
-+  return if $do_xs;
-+
-+  my $pm = $self->{PM};
-+  my $pm_file = File::Spec->catfile(qw(lib List Util XS.pm));
-+
-+  # When installing pure perl, install XS.pp as XS.pm
-+  $self->{PM}{'XS.pp'} = delete $self->{PM}{$pm_file};
- }
-+
-diff -urN perl-5.10.0.orig/ext/List/Util/Util.xs perl-5.10.0/ext/List/Util/Util.xs
---- perl-5.10.0.orig/ext/List/Util/Util.xs	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/Util.xs	2009-05-13 23:59:43.000000000 +0200
-@@ -147,18 +147,38 @@
-     int index;
-     NV retval;
-     SV *retsv;
-+    int magic;
-     if(!items) {
- 	XSRETURN_UNDEF;
-     }
-     retsv = ST(0);
--    retval = slu_sv_value(retsv);
-+    magic = SvAMAGIC(retsv);
-+    if (!magic) {
-+      retval = slu_sv_value(retsv);
-+    }
-     for(index = 1 ; index < items ; index++) {
- 	SV *stacksv = ST(index);
--	NV val = slu_sv_value(stacksv);
--	if(val < retval ? !ix : ix) {
--	    retsv = stacksv;
--	    retval = val;
--	}
-+        SV *tmpsv;
-+        if ((magic || SvAMAGIC(stacksv)) && (tmpsv = amagic_call(retsv, stacksv, gt_amg, 0))) {
-+             if (SvTRUE(tmpsv) ? !ix : ix) {
-+                  retsv = stacksv;
-+                  magic = SvAMAGIC(retsv);
-+                  if (!magic) {
-+                      retval = slu_sv_value(retsv);
-+                  }
-+             }
-+        }
-+        else {
-+            NV val = slu_sv_value(stacksv);
-+            if (magic) {
-+                retval = slu_sv_value(retsv);
-+                magic = 0;
-+            }
-+            if(val < retval ? !ix : ix) {
-+                retsv = stacksv;
-+                retval = val;
-+            }
-+        }
-     }
-     ST(0) = retsv;
-     XSRETURN(1);
-@@ -166,25 +186,49 @@
- 
- 
- 
--NV
-+void
- sum(...)
- PROTOTYPE: @
- CODE:
- {
-     SV *sv;
-+    SV *retsv = NULL;
-     int index;
-+    int magic;
-+    NV retval = 0;
-     if(!items) {
- 	XSRETURN_UNDEF;
-     }
-     sv = ST(0);
--    RETVAL = slu_sv_value(sv);
-+    if (SvAMAGIC(sv)) {
-+        retsv = sv_newmortal();
-+        sv_setsv(retsv, sv);
-+    }
-+    else {
-+        retval = slu_sv_value(sv);
-+    }
-     for(index = 1 ; index < items ; index++) {
- 	sv = ST(index);
--	RETVAL += slu_sv_value(sv);
-+        if (retsv || SvAMAGIC(sv)) {
-+            if (!retsv) {
-+                retsv = sv_newmortal();
-+                sv_setnv(retsv,retval);
-+            }
-+            if (!amagic_call(retsv, sv, add_amg, AMGf_assign)) {
-+                sv_setnv(retsv, SvNV(retsv) + SvNV(sv));
-+            }
-+        }
-+        else {
-+          retval += slu_sv_value(sv);
-+        }
-+    }
-+    if (!retsv) {
-+        retsv = sv_newmortal();
-+        sv_setnv(retsv,retval);
-     }
-+    ST(0) = retsv;
-+    XSRETURN(1);
- }
--OUTPUT:
--    RETVAL
- 
- 
- void
-@@ -252,6 +296,9 @@
- 	XSRETURN_UNDEF;
-     }
-     cv = sv_2cv(block, &stash, &gv, 0);
-+    if (cv == Nullcv) {
-+       croak("Not a subroutine reference");
-+    }
-     PUSH_MULTICALL(cv);
-     agv = gv_fetchpv("a", TRUE, SVt_PV);
-     bgv = gv_fetchpv("b", TRUE, SVt_PV);
-@@ -485,6 +532,13 @@
- 	SV *sv
- PROTOTYPE: $
- CODE:
-+  SV *tempsv;
-+  if (SvAMAGIC(sv) && (tempsv = AMG_CALLun(sv, numer))) {
-+    sv = tempsv;
-+  }
-+  else if (SvMAGICAL(sv)) {
-+      SvGETMAGIC(sv);
-+  }
- #if (PERL_VERSION < 8) || (PERL_VERSION == 8 && PERL_SUBVERSION <5)
-   if (SvPOK(sv) || SvPOKp(sv)) {
-     RETVAL = looks_like_number(sv);
-diff -urN perl-5.10.0.orig/ext/List/Util/lib/List/Util/PP.pm perl-5.10.0/ext/List/Util/lib/List/Util/PP.pm
---- perl-5.10.0.orig/ext/List/Util/lib/List/Util/PP.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/lib/List/Util/PP.pm	2009-07-08 17:22:59.000000000 +0200
-@@ -0,0 +1,75 @@
-+# List::Util::PP.pm
-+#
-+# Copyright (c) 1997-2009 Graham Barr <gbarr@pobox.com>. All rights reserved.
-+# This program is free software; you can redistribute it and/or
-+# modify it under the same terms as Perl itself.
-+
-+package List::Util::PP;
-+
-+use strict;
-+use warnings;
-+use vars qw(@ISA @EXPORT $VERSION $a $b);
-+require Exporter;
-+
-+@ISA     = qw(Exporter);
-+@EXPORT  = qw(first min max minstr maxstr reduce sum shuffle);
-+$VERSION = "1.21";
-+$VERSION = eval $VERSION;
-+
-+sub reduce (&@) {
-+  my $code = shift;
-+  unless(ref($code)) {
-+    require Carp;
-+    Carp::croak("Not a subroutine reference");
-+  }
-+  no strict 'refs';
-+
-+  return shift unless @_ > 1;
-+
-+  use vars qw($a $b);
-+
-+  my $caller = caller;
-+  local(*{$caller."::a"}) = \my $a;
-+  local(*{$caller."::b"}) = \my $b;
-+
-+  $a = shift;
-+  foreach (@_) {
-+    $b = $_;
-+    $a = &{$code}();
-+  }
-+
-+  $a;
-+}
-+
-+sub first (&@) {
-+  my $code = shift;
-+
-+  foreach (@_) {
-+    return $_ if &{$code}();
-+  }
-+
-+  undef;
-+}
-+
-+
-+sub sum (@) { reduce { $a + $b } @_ }
-+
-+sub min (@) { reduce { $a < $b ? $a : $b } @_ }
-+
-+sub max (@) { reduce { $a > $b ? $a : $b } @_ }
-+
-+sub minstr (@) { reduce { $a lt $b ? $a : $b } @_ }
-+
-+sub maxstr (@) { reduce { $a gt $b ? $a : $b } @_ }
-+
-+sub shuffle (@) {
-+  my @a=\(@_);
-+  my $n;
-+  my $i=@_;
-+  map {
-+    $n = rand($i--);
-+    (${$a[$n]}, $a[$n] = $a[$i])[0];
-+  } @_;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/List/Util/lib/List/Util/XS.pm perl-5.10.0/ext/List/Util/lib/List/Util/XS.pm
---- perl-5.10.0.orig/ext/List/Util/lib/List/Util/XS.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/lib/List/Util/XS.pm	2009-07-08 17:22:59.000000000 +0200
-@@ -0,0 +1,45 @@
-+package List::Util::XS;
-+use strict;
-+use vars qw($VERSION);
-+use List::Util;
-+
-+$VERSION = "1.21";           # FIXUP
-+$VERSION = eval $VERSION;    # FIXUP
-+
-+sub _VERSION { # FIXUP
-+  require Carp;
-+  Carp::croak("You need to install Scalar-List-Utils with a C compiler to ensure the XS is compiled")
-+    if defined $_[1];
-+  $VERSION;
-+}
-+
-+1;
-+__END__
-+
-+=head1 NAME
-+
-+List::Util::XS - Indicate if List::Util was compiled with a C compiler
-+
-+=head1 SYNOPSIS
-+
-+    use List::Util::XS 1.20;
-+
-+=head1 DESCRIPTION
-+
-+C<List::Util::XS> can be used as a dependency to ensure List::Util was
-+installed using a C compiler and that the XS version is installed.
-+
-+During installation C<$List::Util::XS::VERSION> will be set to
-+C<undef> if the XS was not compiled.
-+
-+=head1 SEE ALSO
-+
-+L<Scalar::Util>, L<List::Util>, L<List::MoreUtils>
-+
-+=head1 COPYRIGHT
-+
-+Copyright (c) 2008 Graham Barr <gbarr@pobox.com>. All rights reserved.
-+This program is free software; you can redistribute it and/or
-+modify it under the same terms as Perl itself.
-+
-+=cut
-diff -urN perl-5.10.0.orig/ext/List/Util/lib/List/Util.pm perl-5.10.0/ext/List/Util/lib/List/Util.pm
---- perl-5.10.0.orig/ext/List/Util/lib/List/Util.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/lib/List/Util.pm	2009-07-08 17:22:59.000000000 +0200
-@@ -1,8 +1,10 @@
- # List::Util.pm
- #
--# Copyright (c) 1997-2006 Graham Barr <gbarr@pobox.com>. All rights reserved.
-+# Copyright (c) 1997-2009 Graham Barr <gbarr@pobox.com>. All rights reserved.
- # This program is free software; you can redistribute it and/or
- # modify it under the same terms as Perl itself.
-+#
-+# This module is normally only loaded if the XS module is not available
- 
- package List::Util;
- 
-@@ -12,7 +14,7 @@
- 
- @ISA        = qw(Exporter);
- @EXPORT_OK  = qw(first min max minstr maxstr reduce sum shuffle);
--$VERSION    = "1.19";
-+$VERSION    = "1.21";
- $XS_VERSION = $VERSION;
- $VERSION    = eval $VERSION;
- 
-@@ -32,73 +34,11 @@
- } unless $TESTING_PERL_ONLY;
- 
- 
--# This code is only compiled if the XS did not load
--# of for perl < 5.6.0
--
--if (!defined &reduce) {
--eval <<'ESQ' 
--
--sub reduce (&@) {
--  my $code = shift;
--  no strict 'refs';
--
--  return shift unless @_ > 1;
--
--  use vars qw($a $b);
--
--  my $caller = caller;
--  local(*{$caller."::a"}) = \my $a;
--  local(*{$caller."::b"}) = \my $b;
--
--  $a = shift;
--  foreach (@_) {
--    $b = $_;
--    $a = &{$code}();
--  }
--
--  $a;
--}
--
--sub first (&@) {
--  my $code = shift;
--
--  foreach (@_) {
--    return $_ if &{$code}();
--  }
--
--  undef;
--}
--
--ESQ
--}
--
--# This code is only compiled if the XS did not load
--eval <<'ESQ' if !defined &sum;
--
--use vars qw($a $b);
--
--sub sum (@) { reduce { $a + $b } @_ }
--
--sub min (@) { reduce { $a < $b ? $a : $b } @_ }
--
--sub max (@) { reduce { $a > $b ? $a : $b } @_ }
--
--sub minstr (@) { reduce { $a lt $b ? $a : $b } @_ }
--
--sub maxstr (@) { reduce { $a gt $b ? $a : $b } @_ }
--
--sub shuffle (@) {
--  my @a=\(@_);
--  my $n;
--  my $i=@_;
--  map {
--    $n = rand($i--);
--    (${$a[$n]}, $a[$n] = $a[$i])[0];
--  } @_;
-+if (!defined &sum) {
-+  require List::Util::PP;
-+  List::Util::PP->import;
- }
- 
--ESQ
--
- 1;
- 
- __END__
-@@ -212,6 +152,12 @@
-     $foo = reduce { $a + $b } 1 .. 10               # sum
-     $foo = reduce { $a . $b } @bar                  # concat
- 
-+If your algorithm requires that C<reduce> produce an identity value, then
-+make sure that you always pass that identity value as the first argument to prevent
-+C<undef> being returned
-+
-+  $foo = reduce { $a + $b } 0, @values;             # sum with 0 identity value
-+
- =item shuffle LIST
- 
- Returns the elements of LIST in a random order
-@@ -231,6 +177,12 @@
- 
-     $foo = reduce { $a + $b } 1..10
- 
-+If your algorithm requires that C<sum> produce an identity of 0, then
-+make sure that you always pass C<0> as the first argument to prevent
-+C<undef> being returned
-+
-+  $foo = sum 0, @values;
-+
- =back
- 
- =head1 KNOWN BUGS
-@@ -274,7 +226,7 @@
- 
- =head1 COPYRIGHT
- 
--Copyright (c) 1997-2006 Graham Barr <gbarr@pobox.com>. All rights reserved.
-+Copyright (c) 1997-2007 Graham Barr <gbarr@pobox.com>. All rights reserved.
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
- 
-diff -urN perl-5.10.0.orig/ext/List/Util/lib/Scalar/Util/PP.pm perl-5.10.0/ext/List/Util/lib/Scalar/Util/PP.pm
---- perl-5.10.0.orig/ext/List/Util/lib/Scalar/Util/PP.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/lib/Scalar/Util/PP.pm	2009-07-08 17:22:59.000000000 +0200
-@@ -0,0 +1,109 @@
-+# Scalar::Util::PP.pm
-+#
-+# Copyright (c) 1997-2009 Graham Barr <gbarr@pobox.com>. All rights reserved.
-+# This program is free software; you can redistribute it and/or
-+# modify it under the same terms as Perl itself.
-+#
-+# This module is normally only loaded if the XS module is not available
-+
-+package Scalar::Util::PP;
-+
-+use strict;
-+use warnings;
-+use vars qw(@ISA @EXPORT $VERSION $recurse);
-+require Exporter;
-+use B qw(svref_2object);
-+
-+@ISA     = qw(Exporter);
-+@EXPORT  = qw(blessed reftype tainted readonly refaddr looks_like_number);
-+$VERSION = "1.21";
-+$VERSION = eval $VERSION;
-+
-+sub blessed ($) {
-+  return undef unless length(ref($_[0]));
-+  my $b = svref_2object($_[0]);
-+  return undef unless $b->isa('B::PVMG');
-+  my $s = $b->SvSTASH;
-+  return $s->isa('B::HV') ? $s->NAME : undef;
-+}
-+
-+sub refaddr($) {
-+  return undef unless length(ref($_[0]));
-+
-+  my $addr;
-+  if(defined(my $pkg = blessed($_[0]))) {
-+    $addr .= bless $_[0], 'Scalar::Util::Fake';
-+    bless $_[0], $pkg;
-+  }
-+  else {
-+    $addr .= $_[0]
-+  }
-+
-+  $addr =~ /0x(\w+)/;
-+  local $^W;
-+  hex($1);
-+}
-+
-+{
-+  my %tmap = qw(
-+    B::HV HASH
-+    B::AV ARRAY
-+    B::CV CODE
-+    B::IO IO
-+    B::NULL SCALAR
-+    B::NV SCALAR
-+    B::PV SCALAR
-+    B::GV GLOB
-+    B::RV REF
-+    B::REGEXP REGEXP
-+  );
-+
-+  sub reftype ($) {
-+    my $r = shift;
-+
-+    return undef unless length(ref($r));
-+
-+    my $t = ref(svref_2object($r));
-+
-+    return
-+        exists $tmap{$t} ? $tmap{$t}
-+      : length(ref($$r)) ? 'REF'
-+      :                    'SCALAR';
-+  }
-+}
-+
-+sub tainted {
-+  local($@, $SIG{__DIE__}, $SIG{__WARN__});
-+  local $^W = 0;
-+  no warnings;
-+  eval { kill 0 * $_[0] };
-+  $@ =~ /^Insecure/;
-+}
-+
-+sub readonly {
-+  return 0 if tied($_[0]) || (ref(\($_[0])) ne "SCALAR");
-+
-+  local($@, $SIG{__DIE__}, $SIG{__WARN__});
-+  my $tmp = $_[0];
-+
-+  !eval { $_[0] = $tmp; 1 };
-+}
-+
-+sub looks_like_number {
-+  local $_ = shift;
-+
-+  # checks from perlfaq4
-+  return 0 if !defined($_);
-+  if (ref($_)) {
-+    require overload;
-+    return overload::Overloaded($_) ? defined(0 + $_) : 0;
-+  }
-+  return 1 if (/^[+-]?\d+$/); # is a +/- integer
-+  return 1 if (/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/); # a C float
-+  return 1 if ($] >= 5.008 and /^(Inf(inity)?|NaN)$/i) or ($] >= 5.006001 and /^Inf$/i);
-+
-+  0;
-+}
-+
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/List/Util/lib/Scalar/Util.pm perl-5.10.0/ext/List/Util/lib/Scalar/Util.pm
---- perl-5.10.0.orig/ext/List/Util/lib/Scalar/Util.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/lib/Scalar/Util.pm	2009-07-08 17:22:59.000000000 +0200
-@@ -1,34 +1,46 @@
- # Scalar::Util.pm
- #
--# Copyright (c) 1997-2006 Graham Barr <gbarr@pobox.com>. All rights reserved.
-+# Copyright (c) 1997-2007 Graham Barr <gbarr@pobox.com>. All rights reserved.
- # This program is free software; you can redistribute it and/or
- # modify it under the same terms as Perl itself.
- 
- package Scalar::Util;
- 
- use strict;
--use vars qw(@ISA @EXPORT_OK $VERSION);
-+use vars qw(@ISA @EXPORT_OK $VERSION @EXPORT_FAIL);
- require Exporter;
- require List::Util; # List::Util loads the XS
- 
- @ISA       = qw(Exporter);
- @EXPORT_OK = qw(blessed dualvar reftype weaken isweak tainted readonly openhandle refaddr isvstring looks_like_number set_prototype);
--$VERSION    = "1.19";
-+$VERSION    = "1.21";
- $VERSION   = eval $VERSION;
- 
-+unless (defined &dualvar) {
-+  # Load Pure Perl version if XS not loaded
-+  require Scalar::Util::PP;
-+  Scalar::Util::PP->import;
-+  push @EXPORT_FAIL, qw(weaken isweak dualvar isvstring set_prototype);
-+}
-+
- sub export_fail {
-+  if (grep { /dualvar/ } @EXPORT_FAIL) { # no XS loaded
-+    my $pat = join("|", @EXPORT_FAIL);
-+    if (my ($err) = grep { /^($pat)$/ } @_ ) {
-+      require Carp;
-+      Carp::croak("$err is only available with the XS version of Scalar::Util");
-+    }
-+  }
-+
-   if (grep { /^(weaken|isweak)$/ } @_ ) {
-     require Carp;
-     Carp::croak("Weak references are not implemented in the version of perl");
-   }
-+
-   if (grep { /^(isvstring)$/ } @_ ) {
-     require Carp;
-     Carp::croak("Vstrings are not implemented in the version of perl");
-   }
--  if (grep { /^(dualvar|set_prototype)$/ } @_ ) {
--    require Carp;
--    Carp::croak("$1 is only avaliable with the XS version");
--  }
- 
-   @_;
- }
-@@ -51,96 +63,6 @@
-     ? $fh : undef;
- }
- 
--eval <<'ESQ' unless defined &dualvar;
--
--use vars qw(@EXPORT_FAIL);
--push @EXPORT_FAIL, qw(weaken isweak dualvar isvstring set_prototype);
--
--# The code beyond here is only used if the XS is not installed
--
--# Hope nobody defines a sub by this name
--sub UNIVERSAL::a_sub_not_likely_to_be_here { ref($_[0]) }
--
--sub blessed ($) {
--  local($@, $SIG{__DIE__}, $SIG{__WARN__});
--  length(ref($_[0]))
--    ? eval { $_[0]->a_sub_not_likely_to_be_here }
--    : undef
--}
--
--sub refaddr($) {
--  my $pkg = ref($_[0]) or return undef;
--  if (blessed($_[0])) {
--    bless $_[0], 'Scalar::Util::Fake';
--  }
--  else {
--    $pkg = undef;
--  }
--  "$_[0]" =~ /0x(\w+)/;
--  my $i = do { local $^W; hex $1 };
--  bless $_[0], $pkg if defined $pkg;
--  $i;
--}
--
--sub reftype ($) {
--  local($@, $SIG{__DIE__}, $SIG{__WARN__});
--  my $r = shift;
--  my $t;
--
--  length($t = ref($r)) or return undef;
--
--  # This eval will fail if the reference is not blessed
--  eval { $r->a_sub_not_likely_to_be_here; 1 }
--    ? do {
--      $t = eval {
--	  # we have a GLOB or an IO. Stringify a GLOB gives it's name
--	  my $q = *$r;
--	  $q =~ /^\*/ ? "GLOB" : "IO";
--	}
--	or do {
--	  # OK, if we don't have a GLOB what parts of
--	  # a glob will it populate.
--	  # NOTE: A glob always has a SCALAR
--	  local *glob = $r;
--	  defined *glob{ARRAY} && "ARRAY"
--	  or defined *glob{HASH} && "HASH"
--	  or defined *glob{CODE} && "CODE"
--	  or length(ref(${$r})) ? "REF" : "SCALAR";
--	}
--    }
--    : $t
--}
--
--sub tainted {
--  local($@, $SIG{__DIE__}, $SIG{__WARN__});
--  local $^W = 0;
--  eval { kill 0 * $_[0] };
--  $@ =~ /^Insecure/;
--}
--
--sub readonly {
--  return 0 if tied($_[0]) || (ref(\($_[0])) ne "SCALAR");
--
--  local($@, $SIG{__DIE__}, $SIG{__WARN__});
--  my $tmp = $_[0];
--
--  !eval { $_[0] = $tmp; 1 };
--}
--
--sub looks_like_number {
--  local $_ = shift;
--
--  # checks from perlfaq4
--  return 0 if !defined($_) or ref($_);
--  return 1 if (/^[+-]?\d+$/); # is a +/- integer
--  return 1 if (/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/); # a C float
--  return 1 if ($] >= 5.008 and /^(Inf(inity)?|NaN)$/i) or ($] >= 5.006001 and /^Inf$/i);
--
--  0;
--}
--
--ESQ
--
- 1;
- 
- __END__
-@@ -153,6 +75,7 @@
- 
-     use Scalar::Util qw(blessed dualvar isweak readonly refaddr reftype tainted
-                         weaken isvstring looks_like_number set_prototype);
-+                        # and other useful utils appearing below
- 
- =head1 DESCRIPTION
- 
-@@ -209,7 +132,7 @@
- B<NOTE>: Copying a weak reference creates a normal, strong, reference.
- 
-     $copy = $ref;
--    $weak = isweak($ref);               # false
-+    $weak = isweak($copy);              # false
- 
- =item looks_like_number EXPR
- 
-@@ -310,6 +233,32 @@
- 
- =back
- 
-+=head1 DIAGNOSTICS
-+
-+Module use may give one of the following errors during import.
-+
-+=over
-+
-+=item Weak references are not implemented in the version of perl
-+
-+The version of perl that you are using does not implement weak references, to use
-+C<isweak> or C<weaken> you will need to use a newer release of perl.
-+
-+=item Vstrings are not implemented in the version of perl
-+
-+The version of perl that you are using does not implement Vstrings, to use
-+C<isvstring> you will need to use a newer release of perl.
-+
-+=item C<NAME> is only available with the XS version of Scalar::Util
-+
-+C<Scalar::Util> contains both perl and C implementations of many of its functions
-+so that those without access to a C compiler may still use it. However some of the functions
-+are only available when a C compiler was available to compile the XS version of the extension.
-+
-+At present that list is: weaken, isweak, dualvar, isvstring, set_prototype
-+
-+=back
-+
- =head1 KNOWN BUGS
- 
- There is a bug in perl5.6.0 with UV's that are >= 1<<31. This will
-@@ -321,7 +270,7 @@
- 
- =head1 COPYRIGHT
- 
--Copyright (c) 1997-2006 Graham Barr <gbarr@pobox.com>. All rights reserved.
-+Copyright (c) 1997-2007 Graham Barr <gbarr@pobox.com>. All rights reserved.
- This program is free software; you can redistribute it and/or modify it
- under the same terms as Perl itself.
- 
-@@ -331,11 +280,4 @@
- This program is free software; you can redistribute it and/or modify it
- under the same terms as perl itself.
- 
--=head1 BLATANT PLUG
--
--The weaken and isweak subroutines in this module and the patch to the core Perl
--were written in connection  with the APress book `Tuomas J. Lukka's Definitive
--Guide to Object-Oriented Programming in Perl', to avoid explaining why certain
--things would have to be done in cumbersome ways.
--
- =cut
-diff -urN perl-5.10.0.orig/ext/List/Util/t/00version.t perl-5.10.0/ext/List/Util/t/00version.t
---- perl-5.10.0.orig/ext/List/Util/t/00version.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/00version.t	2009-07-08 17:22:59.000000000 +0200
-@@ -15,8 +15,11 @@
- 
- use Scalar::Util ();
- use List::Util ();
--use Test::More tests => 1;
-+use List::Util::XS ();
-+use Test::More tests => 2;
- 
- is( $Scalar::Util::VERSION, $List::Util::VERSION, "VERSION mismatch");
--
-+my $has_xs = eval { Scalar::Util->import('dualvar'); 1 };
-+my $xs_version = $has_xs ? $List::Util::VERSION : undef;
-+is( $List::Util::XS::VERSION, $xs_version, "XS VERSION");
- 
-diff -urN perl-5.10.0.orig/ext/List/Util/t/blessed.t perl-5.10.0/ext/List/Util/t/blessed.t
---- perl-5.10.0.orig/ext/List/Util/t/blessed.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/blessed.t	2009-07-08 17:22:59.000000000 +0200
-@@ -13,7 +13,7 @@
-     }
- }
- 
--use Test::More tests => 8;
-+use Test::More tests => 11;
- use Scalar::Util qw(blessed);
- use vars qw($t $x);
- 
-@@ -29,3 +29,26 @@
- 
- $x = bless {}, "DEF";
- is(blessed($x), "DEF",	'blessed HASH-ref');
-+
-+$x = bless {}, "0";
-+cmp_ok(blessed($x), "eq", "0",	'blessed HASH-ref');
-+
-+{
-+  my $depth;
-+  {
-+    no warnings 'redefine';
-+    *UNIVERSAL::can = sub { die "Burp!" if ++$depth > 2; blessed(shift) };
-+  }
-+  $x = bless {}, "DEF";
-+  is(blessed($x), "DEF", 'recursion of UNIVERSAL::can');
-+}
-+
-+{
-+  package Broken;
-+  sub isa { die };
-+  sub can { die };
-+
-+  my $obj = bless [], __PACKAGE__;
-+  ::is( ::blessed($obj), __PACKAGE__, "blessed on broken isa() and can()" );
-+}
-+
-diff -urN perl-5.10.0.orig/ext/List/Util/t/dualvar.t perl-5.10.0/ext/List/Util/t/dualvar.t
---- perl-5.10.0.orig/ext/List/Util/t/dualvar.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/dualvar.t	2009-07-08 17:22:59.000000000 +0200
-@@ -42,9 +42,12 @@
- 
- ok( $var == $numstr,	'NV');
- 
--$var = dualvar(1<<31, "");
--ok( $var == (1<<31),	'UV 1');
--ok( $var > 0,		'UV 2');
-+SKIP: {
-+  skip("dualvar with UV value known to fail with $]",2) if $] < 5.006_001;
-+  $var = dualvar(1<<31, "");
-+  ok( $var == (1<<31),	'UV 1');
-+  ok( $var > 0,		'UV 2');
-+}
- 
- tie my $tied, 'Tied';
- $var = dualvar($tied, "ok");
-diff -urN perl-5.10.0.orig/ext/List/Util/t/expfail.t perl-5.10.0/ext/List/Util/t/expfail.t
---- perl-5.10.0.orig/ext/List/Util/t/expfail.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/expfail.t	2009-07-08 17:22:59.000000000 +0200
-@@ -0,0 +1,29 @@
-+#!./perl
-+
-+BEGIN {
-+    unless (-d 'blib') {
-+	chdir 't' if -d 't';
-+	@INC = '../lib';
-+	require Config; import Config;
-+	keys %Config; # Silence warning
-+	if ($Config{extensions} !~ /\bList\/Util\b/) {
-+	    print "1..0 # Skip: List::Util was not built\n";
-+	    exit 0;
-+	}
-+    }
-+}
-+
-+use Test::More tests => 3;
-+use strict;
-+
-+$List::Util::TESTING_PERL_ONLY = $List::Util::TESTING_PERL_ONLY = 1;
-+require Scalar::Util;
-+
-+for my $func (qw(dualvar set_prototype weaken)) {
-+	eval { Scalar::Util->import($func); };
-+	like(
-+	    $@,
-+ 	    qr/$func is only available with the XS/,
-+ 	    "no pure perl $func: error raised",
-+	);
-+}
-diff -urN perl-5.10.0.orig/ext/List/Util/t/lln.t perl-5.10.0/ext/List/Util/t/lln.t
---- perl-5.10.0.orig/ext/List/Util/t/lln.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/lln.t	2009-07-08 17:22:59.000000000 +0200
-@@ -14,7 +14,7 @@
- }
- 
- use strict;
--use Test::More tests => 16;
-+use Test::More tests => 18;
- use Scalar::Util qw(looks_like_number);
- 
- foreach my $num (qw(1 -1 +1 1.0 +1.0 -1.0 -1.0e-12)) {
-@@ -31,7 +31,16 @@
- 
- use Math::BigInt;
- my $bi = Math::BigInt->new('1234567890');
--is(!!looks_like_number($bi),	    '',			'Math::BigInt');
-+is(!!looks_like_number($bi),	    1,			'Math::BigInt');
- is(!!looks_like_number("$bi"),	    1,			'Stringified Math::BigInt');
- 
-+{ package Foo;
-+sub TIEHASH { bless {} }
-+sub FETCH { $_[1] }
-+}
-+my %foo;
-+tie %foo, 'Foo';
-+is(!!looks_like_number($foo{'abc'}),	    '',			'Tied');
-+is(!!looks_like_number($foo{'123'}),	    1,			'Tied');
-+
- # We should copy some of perl core tests like t/base/num.t here
-diff -urN perl-5.10.0.orig/ext/List/Util/t/max.t perl-5.10.0/ext/List/Util/t/max.t
---- perl-5.10.0.orig/ext/List/Util/t/max.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/max.t	2009-07-08 17:22:59.000000000 +0200
-@@ -14,7 +14,7 @@
- }
- 
- use strict;
--use Test::More tests => 5;
-+use Test::More tests => 8;
- use List::Util qw(max);
- 
- my $v;
-@@ -34,3 +34,36 @@
- my @b = sort { $a <=> $b } @a;
- $v = max(@a);
- is($v, $b[-1], '20-arg random order');
-+
-+my $one = Foo->new(1);
-+my $two = Foo->new(2);
-+my $thr = Foo->new(3);
-+
-+$v = max($one,$two,$thr);
-+is($v, 3, 'overload');
-+
-+$v = max($thr,$two,$one);
-+is($v, 3, 'overload');
-+
-+{ package Foo;
-+
-+use overload
-+  '""' => sub { ${$_[0]} },
-+  '+0' => sub { ${$_[0]} },
-+  fallback => 1;
-+  sub new {
-+    my $class = shift;
-+    my $value = shift;
-+    bless \$value, $class;
-+  }
-+}
-+
-+SKIP: {
-+  eval { require bignum; } or skip("Need bignum for testing overloading",1);
-+
-+  my $v1 = 2**65;
-+  my $v2 = $v1 - 1;
-+  my $v3 = $v2 - 1;
-+  $v = max($v1,$v2,$v1,$v3,$v1);
-+  is($v, $v1, 'bigint');
-+}
-diff -urN perl-5.10.0.orig/ext/List/Util/t/min.t perl-5.10.0/ext/List/Util/t/min.t
---- perl-5.10.0.orig/ext/List/Util/t/min.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/min.t	2009-07-08 17:22:59.000000000 +0200
-@@ -14,7 +14,7 @@
- }
- 
- use strict;
--use Test::More tests => 5;
-+use Test::More tests => 8;
- use List::Util qw(min);
- 
- my $v;
-@@ -34,3 +34,36 @@
- my @b = sort { $a <=> $b } @a;
- $v = min(@a);
- is($v, $b[0], '20-arg random order');
-+
-+my $one = Foo->new(1);
-+my $two = Foo->new(2);
-+my $thr = Foo->new(3);
-+
-+$v = min($one,$two,$thr);
-+is($v, 1, 'overload');
-+
-+$v = min($thr,$two,$one);
-+is($v, 1, 'overload');
-+
-+{ package Foo;
-+
-+use overload
-+  '""' => sub { ${$_[0]} },
-+  '+0' => sub { ${$_[0]} },
-+  fallback => 1;
-+  sub new {
-+    my $class = shift;
-+    my $value = shift;
-+    bless \$value, $class;
-+  }
-+}
-+
-+SKIP: {
-+  eval { require bignum; } or skip("Need bignum for testing overloading",1);
-+
-+  my $v1 = 2**65;
-+  my $v2 = $v1 - 1;
-+  my $v3 = $v2 - 1;
-+  $v = min($v1,$v2,$v1,$v3,$v1);
-+  is($v, $v3, 'bigint');
-+}
-diff -urN perl-5.10.0.orig/ext/List/Util/t/openhan.t perl-5.10.0/ext/List/Util/t/openhan.t
---- perl-5.10.0.orig/ext/List/Util/t/openhan.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/openhan.t	2009-07-08 17:22:59.000000000 +0200
-@@ -14,16 +14,76 @@
- }
- 
- use strict;
--use vars qw(*CLOSED);
--use Test::More tests => 4;
-+
-+use Test::More tests => 14;
- use Scalar::Util qw(openhandle);
- 
- ok(defined &openhandle, 'defined');
- 
--my $fh = \*STDERR;
--is(openhandle($fh), $fh, 'STDERR');
-+{
-+    my $fh = \*STDERR;
-+    is(openhandle($fh), $fh, 'STDERR');
-+
-+    is(fileno(openhandle(*STDERR)), fileno(STDERR), 'fileno(STDERR)');
-+}
-+
-+{
-+    use vars qw(*CLOSED);
-+    is(openhandle(*CLOSED), undef, 'closed');
-+}
-+
-+SKIP: {
-+    skip "3-arg open only on 5.6 or later", 1 if $]<5.006;
-+
-+    open my $fh, "<", $0;
-+    skip "could not open $0 for reading: $!", 1 unless $fh;
-+    is(openhandle($fh), $fh, "works with indirect filehandles");
-+}
- 
--is(fileno(openhandle(*STDERR)), fileno(STDERR), 'fileno(STDERR)');
-+SKIP: {
-+    skip "in-memory files only on 5.8 or later", 1 if $]<5.008;
-+
-+    open my $fh, "<", \"in-memory file";
-+    skip "could not open in-memory file: $!", 1 unless $fh;
-+    is(openhandle($fh), $fh, "works with in-memory files");
-+}
- 
--is(openhandle(*CLOSED), undef, 'closed');
-+ok(openhandle(\*DATA), "works for \*DATA");
-+ok(openhandle(*DATA), "works for *DATA");
-+ok(openhandle(*DATA{IO}), "works for *DATA{IO}");
-+
-+{
-+    require IO::Handle;
-+    my $fh = IO::Handle->new_from_fd(fileno(*STDERR), 'w');
-+    skip "new_from_fd(fileno(*STDERR)) failed", 1 unless $fh;
-+    ok(openhandle($fh), "works for IO::Handle objects");
-+
-+    ok(!openhandle(IO::Handle->new), "unopened IO::Handle");
-+}
-+
-+{
-+    require IO::File;
-+    my $fh = IO::File->new;
-+    $fh->open("< $0")
-+        or skip "could not open $0: $!", 1;
-+    ok(openhandle($fh), "works for IO::File objects");
-+
-+    ok(!openhandle(IO::File->new), "unopened IO::File" );
-+}
-+
-+SKIP: {
-+    skip( "Tied handles only on 5.8 or later", 1) if $]<5.008;
-+
-+    use vars qw(*H);
-+
-+    package My::Tie;
-+    require Tie::Handle;
-+    @My::Tie::ISA = qw(Tie::Handle);
-+    sub TIEHANDLE { bless {} }
-+
-+    package main;
-+    tie *H, 'My::Tie';
-+    ok(openhandle(*H), "tied handles are always ok");
-+}
- 
-+__DATA__
-diff -urN perl-5.10.0.orig/ext/List/Util/t/p_00version.t perl-5.10.0/ext/List/Util/t/p_00version.t
---- perl-5.10.0.orig/ext/List/Util/t/p_00version.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/p_00version.t	2009-07-08 17:22:59.000000000 +0200
-@@ -0,0 +1,26 @@
-+#!./perl
-+
-+BEGIN {
-+    unless (-d 'blib') {
-+	chdir 't' if -d 't';
-+	@INC = '../lib';
-+	require Config; import Config;
-+	keys %Config; # Silence warning
-+	if ($Config{extensions} !~ /\bList\/Util\b/) {
-+	    print "1..0 # Skip: List::Util was not built\n";
-+	    exit 0;
-+	}
-+    }
-+}
-+
-+use Test::More tests => 2;
-+
-+# force perl-only version to be tested
-+$List::Util::TESTING_PERL_ONLY = $List::Util::TESTING_PERL_ONLY = 1;
-+
-+require Scalar::Util;
-+require List::Util;
-+
-+is( $Scalar::Util::PP::VERSION, $List::Util::VERSION, "VERSION mismatch");
-+is( $List::Util::PP::VERSION, $List::Util::VERSION, "VERSION mismatch");
-+
-diff -urN perl-5.10.0.orig/ext/List/Util/t/p_tainted.t perl-5.10.0/ext/List/Util/t/p_tainted.t
---- perl-5.10.0.orig/ext/List/Util/t/p_tainted.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/p_tainted.t	2009-07-08 17:24:47.000000000 +0200
-@@ -6,5 +6,7 @@
- $List::Util::TESTING_PERL_ONLY = $List::Util::TESTING_PERL_ONLY = 1;
- 
- (my $f = __FILE__) =~ s/p_//;
--my $filename = File::Spec->catfile(".", $f);
-+my $filename = $^O eq 'MSWin32'
-+             ? File::Spec->rel2abs(File::Spec->catfile(".", $f))
-+             : File::Spec->catfile(".", $f);
- do $filename; die $@ if $@;
-diff -urN perl-5.10.0.orig/ext/List/Util/t/reduce.t perl-5.10.0/ext/List/Util/t/reduce.t
---- perl-5.10.0.orig/ext/List/Util/t/reduce.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/reduce.t	2009-07-08 17:22:59.000000000 +0200
-@@ -16,7 +16,7 @@
- 
- use List::Util qw(reduce min);
- use Test::More;
--plan tests => ($::PERL_ONLY ? 21 : 23);
-+plan tests => ($::PERL_ONLY ? 23 : 25);
- 
- my $v = reduce {};
- 
-@@ -122,6 +122,16 @@
-     is(&Internals::SvREFCNT(\&mult), $refcnt, "Refcount unchanged");
- }
- 
-+{
-+  my $ok = 'failed';
-+  local $SIG{__DIE__} = sub { $ok = $_[0] =~ /Not a (subroutine|CODE) reference/ ? '' : $_[0] };
-+  eval { &reduce('foo',1,2) };
-+  is($ok, '', 'Not a subroutine reference');
-+  $ok = 'failed';
-+  eval { &reduce({},1,2) };
-+  is($ok, '', 'Not a subroutine reference');
-+}
-+
- # The remainder of the tests are only relevant for the XS
- # implementation. The Perl-only implementation behaves differently
- # (and more flexibly) in a way that we can't emulate from XS.
-diff -urN perl-5.10.0.orig/ext/List/Util/t/refaddr.t perl-5.10.0/ext/List/Util/t/refaddr.t
---- perl-5.10.0.orig/ext/List/Util/t/refaddr.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/refaddr.t	2009-07-08 17:22:59.000000000 +0200
-@@ -14,7 +14,7 @@
- }
- 
- 
--use Test::More tests => 29;
-+use Test::More tests => 32;
- 
- use Scalar::Util qw(refaddr);
- use vars qw($t $y $x *F $v $r);
-@@ -58,11 +58,22 @@
-   ok(refaddr($x{$y}));
-   ok(refaddr($x{$b}));
- }
-+{
-+  my $z = bless {}, '0';
-+  ok(refaddr($z));
-+  @{"0::ISA"} = qw(FooBar);
-+  my $a = {};
-+  my $r = refaddr($a);
-+  $z = bless $a, '0';
-+  ok(refaddr($z) > 10);
-+  is(refaddr($z),$r,"foo");
-+}
- 
- package FooBar;
- 
- use overload  '0+' => sub { 10 },
--		'+' => sub { 10 + $_[1] };
-+		'+' => sub { 10 + $_[1] },
-+		'"' => sub { "10" };
- 
- package MyTie;
- 
-diff -urN perl-5.10.0.orig/ext/List/Util/t/reftype.t perl-5.10.0/ext/List/Util/t/reftype.t
---- perl-5.10.0.orig/ext/List/Util/t/reftype.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/reftype.t	2009-07-08 17:22:59.000000000 +0200
-@@ -13,7 +13,7 @@
-     }
- }
- 
--use Test::More tests => 23;
-+use Test::More tests => 29;
- 
- use Scalar::Util qw(reftype);
- use vars qw($t $y $x *F);
-@@ -21,6 +21,7 @@
- 
- # Ensure we do not trigger and tied methods
- tie *F, 'MyTie';
-+my $RE = $] < 5.011 ? 'SCALAR' : 'REGEXP';
- 
- @test = (
-  [ undef, 1,		'number'	],
-@@ -32,7 +33,8 @@
-  [ GLOB   => \*F,	'tied GLOB ref'	],
-  [ GLOB   => gensym,	'GLOB ref'	],
-  [ CODE   => sub {},	'CODE ref'	],
--# [ IO => *STDIN{IO} ] the internal sv_reftype returns UNKNOWN
-+ [ IO     => *STDIN{IO},'IO ref'        ],
-+ [ $RE    => qr/x/,     'REGEEXP'       ],
- );
- 
- foreach $test (@test) {
-diff -urN perl-5.10.0.orig/ext/List/Util/t/stack-corruption.t perl-5.10.0/ext/List/Util/t/stack-corruption.t
---- perl-5.10.0.orig/ext/List/Util/t/stack-corruption.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/stack-corruption.t	2009-07-08 17:22:59.000000000 +0200
-@@ -0,0 +1,30 @@
-+#!./perl
-+
-+BEGIN {
-+    unless (-d 'blib') {
-+	chdir 't' if -d 't';
-+	@INC = '../lib';
-+	require Config; import Config;
-+	keys %Config; # Silence warning
-+	if ($Config{extensions} !~ /\bList\/Util\b/) {
-+	    print "1..0 # Skip: List::Util was not built\n";
-+	    exit 0;
-+	}
-+    }
-+    if ($] eq "5.008009" or $] eq "5.010000" or $] le "5.006002") {
-+        print "1..0 # Skip: known to fail on $]\n";
-+        exit 0;
-+    }
-+}
-+
-+use List::Util qw(reduce);
-+use Test::More tests => 1;
-+
-+my $ret = "original";
-+$ret = $ret . broken();
-+is($ret, "originalreturn");
-+
-+sub broken {
-+    reduce { return "bogus"; } qw/some thing/;
-+    return "return";
-+}
-diff -urN perl-5.10.0.orig/ext/List/Util/t/sum.t perl-5.10.0/ext/List/Util/t/sum.t
---- perl-5.10.0.orig/ext/List/Util/t/sum.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/sum.t	2009-07-08 17:22:59.000000000 +0200
-@@ -13,7 +13,7 @@
-     }
- }
- 
--use Test::More tests => 6;
-+use Test::More tests => 8;
- 
- use List::Util qw(sum);
- 
-@@ -37,3 +37,33 @@
- $v = sum(-3.5,3);
- is( $v, -0.5, 'real numbers');
- 
-+my $one = Foo->new(1);
-+my $two = Foo->new(2);
-+my $thr = Foo->new(3);
-+
-+$v = sum($one,$two,$thr);
-+is($v, 6, 'overload');
-+
-+
-+{ package Foo;
-+
-+use overload
-+  '""' => sub { ${$_[0]} },
-+  '+0' => sub { ${$_[0]} },
-+  fallback => 1;
-+  sub new {
-+    my $class = shift;
-+    my $value = shift;
-+    bless \$value, $class;
-+  }
-+}
-+
-+SKIP: {
-+  eval { require bignum; } or skip("Need bignum for testing overloading",1);
-+
-+  my $v1 = 2**65;
-+  my $v2 = 2**65;
-+  my $v3 = $v1 + $v2;
-+  $v = sum($v1,$v2);
-+  is($v, $v3, 'bignum');
-+}
-diff -urN perl-5.10.0.orig/ext/List/Util/t/weak.t perl-5.10.0/ext/List/Util/t/weak.t
---- perl-5.10.0.orig/ext/List/Util/t/weak.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/List/Util/t/weak.t	2009-07-08 17:23:27.000000000 +0200
-@@ -1,10 +1,11 @@
- #!./perl
- 
-+use strict;
-+use Config;
- BEGIN {
-     unless (-d 'blib') {
- 	chdir 't' if -d 't';
- 	@INC = '../lib';
--	require Config; import Config;
- 	keys %Config; # Silence warning
- 	if ($Config{extensions} !~ /\bList\/Util\b/) {
- 	    print "1..0 # Skip: List::Util was not built\n";
-@@ -14,7 +15,7 @@
- }
- 
- use Scalar::Util ();
--use Test::More  (grep { /weaken/ } @Scalar::Util::EXPORT_FAIL)
-+use Test::More  ((grep { /weaken/ } @Scalar::Util::EXPORT_FAIL) and !$ENV{PERL_CORE})
- 			? (skip_all => 'weaken requires XS version')
- 			: (tests => 22);
- 
-@@ -94,9 +95,9 @@
- # Case 3: a circular structure
- #
- 
--$flag = 0;
-+my $flag = 0;
- {
--	my $y = bless {}, Dest;
-+	my $y = bless {}, 'Dest';
- 	Dump($y);
- 	print "# 1: $y\n";
- 	$y->{Self} = $y;
-@@ -126,8 +127,8 @@
- 
- $flag = 0;
- {
--	my $y = bless {}, Dest;
--	my $x = bless {}, Dest;
-+	my $y = bless {}, 'Dest';
-+	my $x = bless {}, 'Dest';
- 	$x->{Ref} = $y;
- 	$y->{Ref} = $x;
- 	$x->{Flag} = \$flag;
-@@ -140,6 +141,7 @@
- # Case 5: deleting a weakref before the other one
- #
- 
-+my ($y,$z);
- {
- 	my $x = "foo";
- 	$y = \$x;
-@@ -170,7 +172,7 @@
- $b = \$a;
- ok(!isweak($b));
- 
--$x = {};
-+my $x = {};
- weaken($x->{Y} = \$a);
- ok(isweak($x->{Y}));
- ok(!isweak($x->{Z}));
diff --git a/perl-update-Storable.patch b/perl-update-Storable.patch
deleted file mode 100644
index beff64d..0000000
--- a/perl-update-Storable.patch
+++ /dev/null
@@ -1,389 +0,0 @@
-Storable-2.21
-
-diff -urpN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-10-01 13:18:44.000000000 +0200
-@@ -1028,6 +1028,7 @@ ext/Socket/t/Socket.t		See if Socket wor
- ext/Storable/ChangeLog		Storable extension
- ext/Storable/hints/gnukfreebsd.pl	Hint for Storable for named architecture
- ext/Storable/hints/gnuknetbsd.pl	Hint for Storable for named architecture
-+ext/Storable/hints/hpux.pl	Hint for Storable for named architecture
- ext/Storable/hints/linux.pl	Hint for Storable for named architecture
- ext/Storable/Makefile.PL	Storable extension
- ext/Storable/MANIFEST		Storable extension
-diff -urpN perl-5.10.0.orig/ext/Storable/ChangeLog perl-5.10.0/ext/Storable/ChangeLog
---- perl-5.10.0.orig/ext/Storable/ChangeLog	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Storable/ChangeLog	2009-10-01 13:17:50.000000000 +0200
-@@ -1,3 +1,18 @@
-+Thu Aug  6 10:55:50 IST 2009   Abhijit Menon-Sen <ams@toroid.org>
-+
-+    Version 2.21
-+
-+	Includes hints/hpux.pl that was inadvertently left out of 2.20.
-+
-+Mon May 18 09:38:20 IST 2009   Abhijit Menon-Sen <ams@toroid.org>
-+
-+    Version 2.20
-+
-+	Fix bug handling blessed references to overloaded objects, plus
-+	other miscellaneous fixes.
-+
-+	(Version 2.19 was released with 5.8.9.)
-+
- Thu Nov 22 13:24:18 IST 2007   Abhijit Menon-Sen <ams@toroid.org>
- 
-     Version 2.18
-diff -urpN perl-5.10.0.orig/ext/Storable/MANIFEST perl-5.10.0/ext/Storable/MANIFEST
---- perl-5.10.0.orig/ext/Storable/MANIFEST	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Storable/MANIFEST	2009-10-01 13:17:50.000000000 +0200
-@@ -4,6 +4,7 @@ Makefile.PL		    Generic Makefile templa
- Storable.pm		    The perl side of Storable
- Storable.xs		    The C side of Storable
- ChangeLog		    Changes since baseline
-+hints/hpux.pl		    Hint file to drop to -O1 on HPUX
- hints/linux.pl		    Hint file to drop gcc to -O2
- hints/gnukfreebsd.pl	    Hint file to drop gcc to -O2
- hints/gnuknetbsd.pl	    Hint file to drop gcc to -O2
-diff -urpN perl-5.10.0.orig/ext/Storable/Makefile.PL perl-5.10.0/ext/Storable/Makefile.PL
---- perl-5.10.0.orig/ext/Storable/Makefile.PL	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Storable/Makefile.PL	2009-10-01 13:17:58.000000000 +0200
-@@ -11,7 +11,6 @@ use Config;
- WriteMakefile(
-     NAME                => 'Storable',
-     DISTNAME            => "Storable",
--    MAN3PODS            => {},
- # We now ship this in t/
- #    PREREQ_PM           => { 'Test::More' => '0.41' },
-     INSTALLDIRS		=> $] >= 5.007 ? 'perl' : 'site',
-diff -urpN perl-5.10.0.orig/ext/Storable/Storable.pm perl-5.10.0/ext/Storable/Storable.pm
---- perl-5.10.0.orig/ext/Storable/Storable.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Storable/Storable.pm	2009-10-01 13:17:58.000000000 +0200
-@@ -23,7 +23,7 @@ use AutoLoader;
- use FileHandle;
- use vars qw($canonical $forgive_me $VERSION);
- 
--$VERSION = '2.18';
-+$VERSION = '2.21';
- *AUTOLOAD = \&AutoLoader::AUTOLOAD;		# Grrr...
- 
- #
-@@ -1177,7 +1177,7 @@ Storable was written by Raphael Manfredi
- Maintenance is now done by the perl5-porters F<E<lt>perl5-porters@perl.orgE<gt>>
- 
- Please e-mail us with problems, bug fixes, comments and complaints,
--although if you have complements you should send them to Raphael.
-+although if you have compliments you should send them to Raphael.
- Please don't e-mail Raphael with problems, as he no longer works on
- Storable, and your message will be delayed while he forwards it to us.
- 
-diff -urpN perl-5.10.0.orig/ext/Storable/Storable.xs perl-5.10.0/ext/Storable/Storable.xs
---- perl-5.10.0.orig/ext/Storable/Storable.xs	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Storable/Storable.xs	2009-10-01 13:17:58.000000000 +0200
-@@ -151,7 +151,7 @@ typedef double NV;			/* Older perls lack
- 
- #define TRACEME(x)										\
-   STMT_START {											\
--	if (SvTRUE(perl_get_sv("Storable::DEBUGME", TRUE)))	\
-+	if (SvTRUE(perl_get_sv("Storable::DEBUGME", GV_ADD)))	\
- 		{ PerlIO_stdoutf x; PerlIO_stdoutf("\n"); }		\
-   } STMT_END
- #else
-@@ -401,7 +401,7 @@ typedef struct stcxt {
- 
- #if (PATCHLEVEL <= 4) && (SUBVERSION < 68)
- #define dSTCXT_SV 									\
--	SV *perinterp_sv = perl_get_sv(MY_VERSION, FALSE)
-+	SV *perinterp_sv = perl_get_sv(MY_VERSION, 0)
- #else	/* >= perl5.004_68 */
- #define dSTCXT_SV									\
- 	SV *perinterp_sv = *hv_fetch(PL_modglobal,		\
-@@ -1682,7 +1682,7 @@ static SV *pkg_fetchmeth(
-         pTHX_
- 	HV *cache,
- 	HV *pkg,
--	char *method)
-+	const char *method)
- {
- 	GV *gv;
- 	SV *sv;
-@@ -1722,7 +1722,7 @@ static void pkg_hide(
-         pTHX_
- 	HV *cache,
- 	HV *pkg,
--	char *method)
-+	const char *method)
- {
- 	const char *hvname = HvNAME_get(pkg);
- 	(void) hv_store(cache,
-@@ -1738,7 +1738,7 @@ static void pkg_uncache(
-         pTHX_
- 	HV *cache,
- 	HV *pkg,
--	char *method)
-+	const char *method)
- {
- 	const char *hvname = HvNAME_get(pkg);
- 	(void) hv_delete(cache, hvname, strlen(hvname), G_DISCARD);
-@@ -1756,7 +1756,7 @@ static SV *pkg_can(
-         pTHX_
- 	HV *cache,
- 	HV *pkg,
--	char *method)
-+	const char *method)
- {
- 	SV **svh;
- 	SV *sv;
-@@ -2332,7 +2332,7 @@ static int store_hash(pTHX_ stcxt_t *cxt
- 	if (
- 		!(cxt->optype & ST_CLONE) && (cxt->canonical == 1 ||
- 		(cxt->canonical < 0 && (cxt->canonical =
--			(SvTRUE(perl_get_sv("Storable::canonical", TRUE)) ? 1 : 0))))
-+			(SvTRUE(perl_get_sv("Storable::canonical", GV_ADD)) ? 1 : 0))))
- 	) {
- 		/*
- 		 * Storing in order, sorted by key.
-@@ -2619,7 +2619,7 @@ static int store_code(pTHX_ stcxt_t *cxt
- 	if (
- 		cxt->deparse == 0 ||
- 		(cxt->deparse < 0 && !(cxt->deparse =
--			SvTRUE(perl_get_sv("Storable::Deparse", TRUE)) ? 1 : 0))
-+			SvTRUE(perl_get_sv("Storable::Deparse", GV_ADD)) ? 1 : 0))
- 	) {
- 		return store_other(aTHX_ cxt, (SV*)cv);
- 	}
-@@ -3397,7 +3397,7 @@ static int store_other(pTHX_ stcxt_t *cx
- 	if (
- 		cxt->forgive_me == 0 ||
- 		(cxt->forgive_me < 0 && !(cxt->forgive_me =
--			SvTRUE(perl_get_sv("Storable::forgive_me", TRUE)) ? 1 : 0))
-+			SvTRUE(perl_get_sv("Storable::forgive_me", GV_ADD)) ? 1 : 0))
- 	)
- 		CROAK(("Can't store %s items", sv_reftype(sv, FALSE)));
- 
-@@ -3434,7 +3434,9 @@ static int sv_type(pTHX_ SV *sv)
- {
- 	switch (SvTYPE(sv)) {
- 	case SVt_NULL:
-+#if PERL_VERSION <= 10
- 	case SVt_IV:
-+#endif
- 	case SVt_NV:
- 		/*
- 		 * No need to check for ROK, that can't be set here since there
-@@ -3442,7 +3444,11 @@ static int sv_type(pTHX_ SV *sv)
- 		 */
- 		return svis_SCALAR;
- 	case SVt_PV:
-+#if PERL_VERSION <= 10
- 	case SVt_RV:
-+#else
-+	case SVt_IV:
-+#endif
- 	case SVt_PVIV:
- 	case SVt_PVNV:
- 		/*
-@@ -3683,7 +3689,7 @@ static int magic_write(pTHX_ stcxt_t *cx
-         length = sizeof (network_file_header);
-     } else {
- #ifdef USE_56_INTERWORK_KLUDGE
--        if (SvTRUE(perl_get_sv("Storable::interwork_56_64bit", TRUE))) {
-+        if (SvTRUE(perl_get_sv("Storable::interwork_56_64bit", GV_ADD))) {
-             header = file_header_56;
-             length = sizeof (file_header_56);
-         } else
-@@ -4444,7 +4450,7 @@ static SV *retrieve_hook(pTHX_ stcxt_t *
- 	 * into the existing design.  -- RAM, 17/02/2001
- 	 */
- 
--	sv_magic(sv, rv, mtype, Nullch, 0);
-+	sv_magic(sv, rv, mtype, (char *)NULL, 0);
- 	SvREFCNT_dec(rv);			/* Undo refcnt inc from sv_magic() */
- 
- 	return sv;
-@@ -4497,7 +4503,7 @@ static SV *retrieve_ref(pTHX_ stcxt_t *c
- 
- 	if (cname) {
- 		/* No need to do anything, as rv will already be PVMG.  */
--		assert (SvTYPE(rv) >= SVt_RV);
-+		assert (SvTYPE(rv) == SVt_RV || SvTYPE(rv) >= SVt_PV);
- 	} else {
- 		sv_upgrade(rv, SVt_RV);
- 	}
-@@ -4561,7 +4567,7 @@ static SV *retrieve_overloaded(pTHX_ stc
- 	 * WARNING: breaks RV encapsulation.
- 	 */
- 
--	sv_upgrade(rv, SVt_RV);
-+	SvUPGRADE(rv, SVt_RV);
- 	SvRV_set(rv, sv);				/* $rv = \$sv */
- 	SvROK_on(rv);
- 
-@@ -4641,7 +4647,7 @@ static SV *retrieve_tied_array(pTHX_ stc
- 
- 	sv_upgrade(tv, SVt_PVAV);
- 	AvREAL_off((AV *)tv);
--	sv_magic(tv, sv, 'P', Nullch, 0);
-+	sv_magic(tv, sv, 'P', (char *)NULL, 0);
- 	SvREFCNT_dec(sv);			/* Undo refcnt inc from sv_magic() */
- 
- 	TRACEME(("ok (retrieve_tied_array at 0x%"UVxf")", PTR2UV(tv)));
-@@ -4669,7 +4675,7 @@ static SV *retrieve_tied_hash(pTHX_ stcx
- 		return (SV *) 0;		/* Failed */
- 
- 	sv_upgrade(tv, SVt_PVHV);
--	sv_magic(tv, sv, 'P', Nullch, 0);
-+	sv_magic(tv, sv, 'P', (char *)NULL, 0);
- 	SvREFCNT_dec(sv);			/* Undo refcnt inc from sv_magic() */
- 
- 	TRACEME(("ok (retrieve_tied_hash at 0x%"UVxf")", PTR2UV(tv)));
-@@ -4701,7 +4707,7 @@ static SV *retrieve_tied_scalar(pTHX_ st
- 	}
- 
- 	sv_upgrade(tv, SVt_PVMG);
--	sv_magic(tv, obj, 'q', Nullch, 0);
-+	sv_magic(tv, obj, 'q', (char *)NULL, 0);
- 
- 	if (obj) {
- 		/* Undo refcnt inc from sv_magic() */
-@@ -4768,7 +4774,7 @@ static SV *retrieve_tied_idx(pTHX_ stcxt
- 	RLEN(idx);					/* Retrieve <idx> */
- 
- 	sv_upgrade(tv, SVt_PVMG);
--	sv_magic(tv, sv, 'p', Nullch, idx);
-+	sv_magic(tv, sv, 'p', (char *)NULL, idx);
- 	SvREFCNT_dec(sv);			/* Undo refcnt inc from sv_magic() */
- 
- 	return tv;
-@@ -4907,7 +4913,7 @@ static SV *retrieve_utf8str(pTHX_ stcxt_
- #else
-         if (cxt->use_bytes < 0)
-             cxt->use_bytes
--                = (SvTRUE(perl_get_sv("Storable::drop_utf8", TRUE))
-+                = (SvTRUE(perl_get_sv("Storable::drop_utf8", GV_ADD))
-                    ? 1 : 0);
-         if (cxt->use_bytes == 0)
-             UTF8_CROAK();
-@@ -4936,7 +4942,7 @@ static SV *retrieve_lutf8str(pTHX_ stcxt
- #else
-         if (cxt->use_bytes < 0)
-             cxt->use_bytes
--                = (SvTRUE(perl_get_sv("Storable::drop_utf8", TRUE))
-+                = (SvTRUE(perl_get_sv("Storable::drop_utf8", GV_ADD))
-                    ? 1 : 0);
-         if (cxt->use_bytes == 0)
-             UTF8_CROAK();
-@@ -5267,7 +5273,7 @@ static SV *retrieve_flag_hash(pTHX_ stcx
-     if (hash_flags & SHV_RESTRICTED) {
-         if (cxt->derestrict < 0)
-             cxt->derestrict
--                = (SvTRUE(perl_get_sv("Storable::downgrade_restricted", TRUE))
-+                = (SvTRUE(perl_get_sv("Storable::downgrade_restricted", GV_ADD))
-                    ? 1 : 0);
-         if (cxt->derestrict == 0)
-             RESTRICTED_HASH_CROAK();
-@@ -5336,7 +5342,7 @@ static SV *retrieve_flag_hash(pTHX_ stcx
- #else
-                 if (cxt->use_bytes < 0)
-                     cxt->use_bytes
--                        = (SvTRUE(perl_get_sv("Storable::drop_utf8", TRUE))
-+                        = (SvTRUE(perl_get_sv("Storable::drop_utf8", GV_ADD))
-                            ? 1 : 0);
-                 if (cxt->use_bytes == 0)
-                     UTF8_CROAK();
-@@ -5437,14 +5443,14 @@ static SV *retrieve_code(pTHX_ stcxt_t *
- 	 */
- 
- 	if (cxt->eval == NULL) {
--		cxt->eval = perl_get_sv("Storable::Eval", TRUE);
-+		cxt->eval = perl_get_sv("Storable::Eval", GV_ADD);
- 		SvREFCNT_inc(cxt->eval);
- 	}
- 	if (!SvTRUE(cxt->eval)) {
- 		if (
- 			cxt->forgive_me == 0 ||
- 			(cxt->forgive_me < 0 && !(cxt->forgive_me =
--				SvTRUE(perl_get_sv("Storable::forgive_me", TRUE)) ? 1 : 0))
-+				SvTRUE(perl_get_sv("Storable::forgive_me", GV_ADD)) ? 1 : 0))
- 		) {
- 			CROAK(("Can't eval, please set $Storable::Eval to a true value"));
- 		} else {
-@@ -5459,7 +5465,7 @@ static SV *retrieve_code(pTHX_ stcxt_t *
- 	SAVETMPS;
- 
- 	if (SvROK(cxt->eval) && SvTYPE(SvRV(cxt->eval)) == SVt_PVCV) {
--		SV* errsv = get_sv("@", TRUE);
-+		SV* errsv = get_sv("@", GV_ADD);
- 		sv_setpvn(errsv, "", 0);	/* clear $@ */
- 		PUSHMARK(sp);
- 		XPUSHs(sv_2mortal(newSVsv(sub)));
-@@ -5771,7 +5777,7 @@ static SV *magic_check(pTHX_ stcxt_t *cx
-             if (cxt->accept_future_minor < 0)
-                 cxt->accept_future_minor
-                     = (SvTRUE(perl_get_sv("Storable::accept_future_minor",
--                                          TRUE))
-+                                          GV_ADD))
-                        ? 1 : 0);
-             if (cxt->accept_future_minor == 1)
-                 croak_now = 0;  /* Don't croak yet.  */
-@@ -5808,7 +5814,7 @@ static SV *magic_check(pTHX_ stcxt_t *cx
- #ifdef USE_56_INTERWORK_KLUDGE
-     /* No point in caching this in the context as we only need it once per
-        retrieve, and we need to recheck it each read.  */
--    if (SvTRUE(perl_get_sv("Storable::interwork_56_64bit", TRUE))) {
-+    if (SvTRUE(perl_get_sv("Storable::interwork_56_64bit", GV_ADD))) {
-         if ((c != (sizeof (byteorderstr_56) - 1))
-             || memNE(buf, byteorderstr_56, c))
-             CROAK(("Byte order is not compatible"));
-@@ -5942,7 +5948,7 @@ static SV *retrieve(pTHX_ stcxt_t *cxt, 
-             if (cxt->accept_future_minor < 0)
-                 cxt->accept_future_minor
-                     = (SvTRUE(perl_get_sv("Storable::accept_future_minor",
--                                          TRUE))
-+                                          GV_ADD))
-                        ? 1 : 0);
-             if (cxt->accept_future_minor == 1) {
-                 CROAK(("Storable binary image v%d.%d contains data of type %d. "
-diff -urpN perl-5.10.0.orig/ext/Storable/hints/hpux.pl perl-5.10.0/ext/Storable/hints/hpux.pl
---- perl-5.10.0.orig/ext/Storable/hints/hpux.pl	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Storable/hints/hpux.pl	2009-10-01 13:17:58.000000000 +0200
-@@ -0,0 +1,10 @@
-+# HP C-ANSI-C has problems in the optimizer for 5.8.x (not for 5.11.x)
-+# So drop to -O1 for Storable
-+
-+use Config;
-+
-+unless ($Config{gccversion}) {
-+    my $optimize = $Config{optimize};
-+    $optimize =~ s/(^| )[-+]O[2-9]( |$)/$1+O1$2/ and
-+	$self->{OPTIMIZE} = $optimize;
-+    }
-diff -urpN perl-5.10.0.orig/ext/Storable/t/overload.t perl-5.10.0/ext/Storable/t/overload.t
---- perl-5.10.0.orig/ext/Storable/t/overload.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Storable/t/overload.t	2009-10-01 13:17:58.000000000 +0200
-@@ -25,7 +25,7 @@ sub ok;
- 
- use Storable qw(freeze thaw);
- 
--print "1..16\n";
-+print "1..19\n";
- 
- package OVERLOADED;
- 
-@@ -103,4 +103,17 @@ ok 13, $@ eq "";
- ok 14, ref ($t) eq 'REF';
- ok 15, ref ($$t) eq 'HAS_OVERLOAD';
- ok 16, $$$t eq 'snow';
-+
-+
-+#---
-+# blessed reference to overloded object.
-+{
-+  my $a = bless [88], 'OVERLOADED';
-+  my $c = thaw freeze bless \$a, 'main';
-+  ok 17, ref $c eq 'main';
-+  ok 18, ref $$c eq 'OVERLOADED';
-+  ok 19, "$$c" eq "88";
-+
-+}
-+
- 1;
diff --git a/perl-update-Sys-Syslog.patch b/perl-update-Sys-Syslog.patch
deleted file mode 100644
index e401b77..0000000
--- a/perl-update-Sys-Syslog.patch
+++ /dev/null
@@ -1,965 +0,0 @@
-Sys-Syslog-0.27
-
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-02-10 11:14:14.000000000 +0100
-@@ -1081,6 +1081,7 @@
- ext/Sys/Syslog/Changes		Changlog for Sys::Syslog
- ext/Sys/Syslog/fallback/const-c.inc	Sys::Syslog constants fallback file
- ext/Sys/Syslog/fallback/const-xs.inc	Sys::Syslog constants fallback file
-+ext/Sys/Syslog/fallback/syslog.h	Sys::Syslog fallback file
- ext/Sys/Syslog/Makefile.PL	Sys::Syslog extension makefile writer
- ext/Sys/Syslog/README		README for Sys::Syslog
- ext/Sys/Syslog/README.win32	README for Sys::Syslog on Windows
-@@ -1088,6 +1089,7 @@
- ext/Sys/Syslog/Syslog.xs	Sys::Syslog extension external subroutines
- ext/Sys/Syslog/t/00-load.t	test for Sys::Syslog
- ext/Sys/Syslog/t/constants.t	test for Sys::Syslog
-+ext/Sys/Syslog/t/data-validation.t	test for Sys::Syslog
- ext/Sys/Syslog/t/syslog.t	See if Sys::Syslog works
- ext/Sys/Syslog/win32/compile.pl	Sys::Syslog extension Win32 related file
- ext/Sys/Syslog/win32/PerlLog_dll.uu	Sys::Syslog extension Win32 related file
-diff -urN perl-5.10.0.orig/ext/Sys/Syslog/Changes perl-5.10.0/ext/Sys/Syslog/Changes
---- perl-5.10.0.orig/ext/Sys/Syslog/Changes	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Sys/Syslog/Changes	2009-02-10 11:10:19.000000000 +0100
-@@ -1,5 +1,41 @@
- Revision history for Sys-Syslog
- 
-+0.27 -- 2008.09.21 -- Sebastien Aperghis-Tramoni (SAPER)
-+        [BUGFIX] Fixed compilation on Win32, thanks to Serguei Trouchelle.
-+        Also added stubs so calling the XS functions will never fail.
-+        [TESTS] t/pod.t now also uses Pod::Checker.
-+
-+0.26 -- 2008.06.16 -- Sebastien Aperghis-Tramoni (SAPER)
-+        [BUGFIX] Make Sys::Syslog works with Perl 5.10.0 (because of 
-+        ExtUtils::Constant::ProxySubs).
-+        [CODE] setlogsock() is now a little more strict about its arguments.
-+
-+0.25 -- 2008.05.17 -- Sebastien Aperghis-Tramoni (SAPER)
-+        [BUGFIX] CPAN-RT#34691: Fixed an incorrect call to sysopen() which
-+        prevented Sys::Syslog from working on some Solaris systems. 
-+        Thanks to Paul Townsend. 
-+        [BUGFIX] CPAN-RT#34753: Fixed a slowness introduced in v0.19 (which 
-+        was to work around OSX syslog own slowness). Thanks to Alex Efros.
-+        [BUGFIX] CPAN-RT#35952: Fixed a bug with the "nofatal" option.
-+        [BUGFIX] CPAN-RT#35189: Fixed a bug in xlate().
-+        [BUGFIX] Fixed build on Win32, thanks to Adam Kennedy.
-+        [FEATURE] setlogsock() now interprets the second argument as the 
-+        hostname for network mechanisms.
-+        [DIST] Add AUTHOR to WriteMakefile() in order to fix the META.yml
-+        generated by ExtUtils::MakeMaker.
-+        [TESTS] Improved t/pod.t with Pod::Checker.
-+
-+0.24 -- 2007.12.31 -- Sebastien Aperghis-Tramoni (SAPER)
-+        [BUGFIX] CPANT-RT#32001: Skip the setlogsock('stream') tests when 
-+        /dev/log is unavailable (Brendan O'Dea).
-+
-+0.23 -- 2007.11.12 -- Sebastien Aperghis-Tramoni (SAPER)
-+        [BUGFIX] Fixed a too liberal test in the "pipe" mechanism, thanks
-+        to Jan Dubois.
-+        [DIST] fallback/syslog.h was missing from MANIFEST (thanks to CPAN 
-+        Tester Matthew Musgrove).
-+        [TESTS] Better handling of Perl 5.005, thanks to CPAN Tester Slaven Rezic.
-+
- 0.22 -- 2007.11.08 -- Sebastien Aperghis-Tramoni (SAPER)
-         [BUGFIX] CPAN-RT#29875: Added workaround SpamAssassin overzealous
-         logging features.
-@@ -33,6 +69,8 @@
-         via syslog().
-         [BUGFIX] Rewrote the constants generation code in order to provide 
-         fallback value for non-standard macros.
-+        [BUGFIX] Mark Blackman and Edmund von der Burg identified and fixed the
-+        random failures appearing on OSX, caused by a UDP timeout.
-         [FEATURE] Added Win32 event log support thanks to Yves Orton.
-         [FEATURE] Added new macros from modern BSD and IRIX.
-         [FEATURE] Each non-standard macro now fall backs to a standard macro.
-diff -urN perl-5.10.0.orig/ext/Sys/Syslog/Makefile.PL perl-5.10.0/ext/Sys/Syslog/Makefile.PL
---- perl-5.10.0.orig/ext/Sys/Syslog/Makefile.PL	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Sys/Syslog/Makefile.PL	2009-02-10 11:10:19.000000000 +0100
-@@ -29,11 +29,14 @@
-     print " * Win32::EventLog detected.\n";
-     my $name = "PerlLog";
- 
--    push @extra_prereqs, "Win32::TieRegistry" => 0, "Win32::EventLog" => 0;
-+    push @extra_prereqs, 
-+        Win32 => 0,  "Win32::TieRegistry" => 0,  "Win32::EventLog" => 0;
- 
-     $virtual_path{'win32/Win32.pm'   } = '$(INST_LIBDIR)/Syslog/Win32.pm';
-     $virtual_path{'win32/PerlLog.dll'} = '$(INST_ARCHAUTODIR)/PerlLog.dll';
- 
-+    push @extra_params, CCFLAGS => "-Ifallback";
-+
-     # recreate the DLL from its uuencoded form if it's not here
-     if (! -f File::Spec->catfile("win32", "$name.dll")) {
-         # read the uuencoded data
-@@ -70,22 +73,37 @@
-         DEFINE      => '-DUSE_PPPORT_H';
- }
- 
-+# on pre-5.6 Perls, add warnings::compat to the prereq modules
-+push @extra_prereqs, "warnings::compat" => "0.06"  if $] < 5.006;
-+
- WriteMakefile(
-     NAME            => 'Sys::Syslog',
-     LICENSE         => 'perl',
-+    AUTHOR          => 'Sebastien Aperghis-Tramoni <sebastien@aperghis.net>',
-     VERSION_FROM    => 'Syslog.pm', 
-     ABSTRACT_FROM   => 'Syslog.pm', 
-     INSTALLDIRS     => 'perl',
-     XSPROTOARG      => '-noprototypes',
-     PM              => \%virtual_path, 
-     PREREQ_PM       => {
--        'Test::More' => 0,
--        'XSLoader'   => 0,
-+        # run prereqs
-+        'Carp'              => 0,
-+        'Fcntl'             => 0,
-+        'File::Basename'    => 0,
-+        'File::Spec'        => 0,
-+        'POSIX'             => 0,
-+        'Socket'            => 0,
-+        'XSLoader'          => 0,
-         @extra_prereqs,
-+
-+        # build/test prereqs
-+        'Test::More'        => 0,
-     },
-+    PL_FILES        => {},
-     dist            => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
-     clean           => { FILES => 'Sys-Syslog-*' }, 
--    realclean       => { FILES => 'lib const-c.inc const-xs.inc macros.all PerlLog.h *.bak *.bin *.rc' },
-+    realclean       => { FILES => 'lib const-c.inc const-xs.inc macros.all '
-+        .'PerlLog.h typemap *.bak *.bin *.rc win32/PerlLog_dll' },
-     @extra_params
- );
- 
-@@ -160,9 +178,9 @@
-     );
- 
-     ExtUtils::Constant::WriteConstants(
--        ($] > 5.009002 ? (PROXYSUBS => 1) : ()),
-         NAME => 'Sys::Syslog',
-         NAMES => [ @levels, @facilities, @options, @others_macros ],
-+        ($] > 5.009002 ? (PROXYSUBS => 1) : ()),
-     );
- 
-     my @names = map { ref $_ ? $_->{name} : $_ } @levels, @facilities, @options;
-diff -urN perl-5.10.0.orig/ext/Sys/Syslog/README perl-5.10.0/ext/Sys/Syslog/README
---- perl-5.10.0.orig/ext/Sys/Syslog/README	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Sys/Syslog/README	2009-02-10 11:10:19.000000000 +0100
-@@ -63,5 +63,7 @@
- 
- COPYRIGHT AND LICENCE
- 
-+    Copyright (C) 1990-2008 by Larry Wall and others.
-+
-     This program is free software; you can redistribute it and/or modify it
-     under the same terms as Perl itself.
-diff -urN perl-5.10.0.orig/ext/Sys/Syslog/Syslog.pm perl-5.10.0/ext/Sys/Syslog/Syslog.pm
---- perl-5.10.0.orig/ext/Sys/Syslog/Syslog.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Sys/Syslog/Syslog.pm	2009-02-10 11:10:19.000000000 +0100
-@@ -1,16 +1,17 @@
- package Sys::Syslog;
- use strict;
-+use warnings;
- use warnings::register;
- use Carp;
-+use Exporter ();
- use Fcntl qw(O_WRONLY);
- use File::Basename;
- use POSIX qw(strftime setlocale LC_TIME);
- use Socket ':all';
- require 5.005;
--require Exporter;
- 
- {   no strict 'vars';
--    $VERSION = '0.22';
-+    $VERSION = '0.27';
-     @ISA = qw(Exporter);
- 
-     %EXPORT_TAGS = (
-@@ -76,6 +77,11 @@
- # 
- use vars qw($host);             # host to send syslog messages to (see notes at end)
- 
-+#
-+# Prototypes
-+#
-+sub silent_eval (&);
-+
- # 
- # Global variables
- # 
-@@ -85,6 +91,7 @@
- my $syslog_path = undef;        # syslog path for "stream" and "unix" mechanisms
- my $syslog_xobj = undef;        # if defined, holds the external object used to send messages
- my $transmit_ok = 0;            # flag to indicate if the last message was transmited
-+my $sock_timeout  = 0;          # socket timeout, see below
- my $current_proto = undef;      # current mechanism used to transmit messages
- my $ident = '';                 # identifiant prepended to each message
- $facility = '';                 # current facility
-@@ -105,15 +112,12 @@
-     @connectMethods = grep { $_ ne 'udp' } @connectMethods;
- }
- 
-+# And on Win32 systems, we try to use the native mechanism for this 
-+# platform, the events logger, available through Win32::EventLog.
- EVENTLOG: {
--    # use EventLog on Win32
-     my $is_Win32 = $^O =~ /Win32/i;
- 
--    # some applications are trying to be too smart
--    # yes I'm speaking of YOU, SpamAssassin, grr..
--    local($SIG{__DIE__}, $SIG{__WARN__}, $@);
--
--    if (eval "use Sys::Syslog::Win32; 1") {
-+    if (can_load("Sys::Syslog::Win32")) {
-         unshift @connectMethods, 'eventlog';
-     }
-     elsif ($is_Win32) {
-@@ -124,6 +128,18 @@
- my @defaultMethods = @connectMethods;
- my @fallbackMethods = ();
- 
-+# The timeout in connection_ok() was pushed up to 0.25 sec in 
-+# Sys::Syslog v0.19 in order to address a heisenbug on MacOSX:
-+# http://london.pm.org/pipermail/london.pm/Week-of-Mon-20061211/005961.html
-+# 
-+# However, this also had the effect of slowing this test for 
-+# all other operating systems, which apparently impacted some 
-+# users (cf. CPAN-RT #34753). So, in order to make everybody 
-+# happy, the timeout is now zero by default on all systems 
-+# except on OSX where it is set to 250 msec, and can be set 
-+# with the infamous setlogsock() function.
-+$sock_timeout = 0.25 if $^O =~ /darwin/;
-+
- # coderef for a nicer handling of errors
- my $err_sub = $options{nofatal} ? \&warnings::warnif : \&croak;
- 
-@@ -155,7 +171,7 @@
-         $options{$opt} = 1 if exists $options{$opt}
-     }
- 
--    $err_sub = $options{nofatal} ? \&warnings::warnif : \&croak;
-+    $err_sub = delete $options{nofatal} ? \&warnings::warnif : \&croak;
-     return 1 unless $options{ndelay};
-     connect_log();
- } 
-@@ -172,8 +188,18 @@
- }
-  
- sub setlogsock {
--    my $setsock = shift;
--    $syslog_path = shift;
-+    my ($setsock, $setpath, $settime) = @_;
-+
-+    # check arguments
-+    my $diag_invalid_arg
-+        = "Invalid argument passed to setlogsock; must be 'stream', 'pipe', "
-+        . "'unix', 'native', 'eventlog', 'tcp', 'udp' or 'inet'";
-+    croak $diag_invalid_arg unless defined $setsock;
-+    croak "Invalid number of arguments" unless @_ >= 1 and @_ <= 3;
-+
-+    $syslog_path  = $setpath if defined $setpath;
-+    $sock_timeout = $settime if defined $settime;
-+
-     disconnect_log() if $connected;
-     $transmit_ok = 0;
-     @fallbackMethods = ();
-@@ -221,7 +247,7 @@
- 
-     } elsif (lc $setsock eq 'pipe') {
-         for my $path ($syslog_path, &_PATH_LOG, "/dev/log") {
--            next unless defined $path and length $path and -w $path;
-+            next unless defined $path and length $path and -p $path and -w _;
-             $syslog_path = $path;
-             last
-         }
-@@ -237,7 +263,7 @@
-         @connectMethods = qw(native);
- 
-     } elsif (lc $setsock eq 'eventlog') {
--        if (eval "use Win32::EventLog; 1") {
-+        if (can_load("Win32::EventLog")) {
-             @connectMethods = qw(eventlog);
-         } else {
-             warnings::warnif "eventlog passed to setlogsock, but no Win32 API available";
-@@ -248,6 +274,7 @@
-     } elsif (lc $setsock eq 'tcp') {
- 	if (getservbyname('syslog', 'tcp') || getservbyname('syslogng', 'tcp')) {
-             @connectMethods = qw(tcp);
-+            $host = $syslog_path;
- 	} else {
-             warnings::warnif "tcp passed to setlogsock, but tcp service unavailable";
- 	    return undef;
-@@ -256,6 +283,7 @@
-     } elsif (lc $setsock eq 'udp') {
- 	if (getservbyname('syslog', 'udp')) {
-             @connectMethods = qw(udp);
-+            $host = $syslog_path;
- 	} else {
-             warnings::warnif "udp passed to setlogsock, but udp service unavailable";
- 	    return undef;
-@@ -268,8 +296,7 @@
- 	@connectMethods = qw(console);
- 
-     } else {
--        croak "Invalid argument passed to setlogsock; must be 'stream', 'pipe', ",
--              "'unix', 'native', 'eventlog', 'tcp', 'udp' or 'inet'"
-+        croak $diag_invalid_arg
-     }
- 
-     return 1;
-@@ -293,25 +320,29 @@
-     croak "syslog: expecting argument \$priority" unless defined $priority;
-     croak "syslog: expecting argument \$format"   unless defined $mask;
- 
-+    croak "syslog: invalid level/facility: $priority" if $priority =~ /^-\d+$/;
-     @words = split(/\W+/, $priority, 2);    # Allow "level" or "level|facility".
-     undef $numpri;
-     undef $numfac;
- 
--    foreach (@words) {
--	$num = xlate($_);		    # Translate word to number.
--	if ($num < 0) {
--	    croak "syslog: invalid level/facility: $_"
--	}
--	elsif ($num <= &LOG_PRIMASK) {
--	    croak "syslog: too many levels given: $_" if defined $numpri;
--	    $numpri = $num;
--	    return 0 unless LOG_MASK($numpri) & $maskpri;
--	}
--	else {
--	    croak "syslog: too many facilities given: $_" if defined $numfac;
--	    $facility = $_;
--	    $numfac = $num;
--	}
-+    for my $word (@words) {
-+        next if length $word == 0;
-+
-+        $num = xlate($word);        # Translate word to number.
-+
-+        if ($num < 0) {
-+            croak "syslog: invalid level/facility: $word"
-+        }
-+        elsif ($num <= &LOG_PRIMASK) {
-+            croak "syslog: too many levels given: $word" if defined $numpri;
-+            $numpri = $num;
-+            return 0 unless LOG_MASK($numpri) & $maskpri;
-+        }
-+        else {
-+            croak "syslog: too many facilities given: $word" if defined $numfac;
-+            $facility = $word;
-+            $numfac = $num;
-+        }
-     }
- 
-     croak "syslog: level must be given" unless defined $numpri;
-@@ -464,14 +495,28 @@
- # private function to translate names to numeric values
- # 
- sub xlate {
--    my($name) = @_;
-+    my ($name) = @_;
-+
-     return $name+0 if $name =~ /^\s*\d+\s*$/;
-     $name = uc $name;
-     $name = "LOG_$name" unless $name =~ /^LOG_/;
--    $name = "Sys::Syslog::$name";
--    # Can't have just eval { &$name } || -1 because some LOG_XXX may be zero.
--    my $value = eval { no strict 'refs'; &$name };
--    $@ = "";
-+
-+    # ExtUtils::Constant 0.20 introduced a new way to implement
-+    # constants, called ProxySubs.  When it was used to generate
-+    # the C code, the constant() function no longer returns the 
-+    # correct value.  Therefore, we first try a direct call to 
-+    # constant(), and if the value is an error we try to call the 
-+    # constant by its full name. 
-+    my $value = constant($name);
-+
-+    if (index($value, "not a valid") >= 0) {
-+        $name = "Sys::Syslog::$name";
-+        $value = eval { no strict "refs"; &$name };
-+        $value = $@ unless defined $value;
-+    }
-+
-+    $value = -1 if index($value, "not a valid") >= 0;
-+
-     return defined $value ? $value : -1;
- }
- 
-@@ -546,11 +591,10 @@
-     }
- 
-     setsockopt(SYSLOG, SOL_SOCKET, SO_KEEPALIVE, 1);
--    if (eval { IPPROTO_TCP() }) {
-+    if (silent_eval { IPPROTO_TCP() }) {
-         # These constants don't exist in 5.005. They were added in 1999
-         setsockopt(SYSLOG, IPPROTO_TCP(), TCP_NODELAY(), 1);
-     }
--    $@ = "";
-     if (!connect(SYSLOG, $addr)) {
- 	push @$errs, "tcp connect: $!";
- 	return 0;
-@@ -619,7 +663,7 @@
- 	push @$errs, "stream $syslog_path is not writable";
- 	return 0;
-     }
--    if (!sysopen(SYSLOG, $syslog_path, 0400, O_WRONLY)) {
-+    if (!sysopen(SYSLOG, $syslog_path, O_WRONLY, 0400)) {
- 	push @$errs, "stream can't open $syslog_path: $!";
- 	return 0;
-     }
-@@ -697,12 +741,7 @@
-         $logopt += xlate($opt) if $options{$opt}
-     }
- 
--    eval { openlog_xs($ident, $logopt, xlate($facility)) };
--    if ($@) {
--        push @$errs, $@;
--        return 0;
--    }
--
-+    openlog_xs($ident, $logopt, xlate($facility));
-     $syslog_send = \&_syslog_send_native;
- 
-     return 1;
-@@ -741,7 +780,7 @@
- 
-     my $rin = '';
-     vec($rin, fileno(SYSLOG), 1) = 1;
--    my $ret = select $rin, undef, $rin, 0.25;
-+    my $ret = select $rin, undef, $rin, $sock_timeout;
-     return ($ret ? 0 : 1);
- }
- 
-@@ -761,7 +800,26 @@
-     return close SYSLOG;
- }
- 
--1;
-+
-+#
-+# Wrappers around eval() that makes sure that nobody, and I say NOBODY, 
-+# ever knows that I wanted to test if something was here or not. 
-+# It is needed because some applications are trying to be too smart,
-+# do it wrong, and it ends up in EPIC FAIL. 
-+# Yes I'm speaking of YOU, SpamAssassin.
-+#
-+sub silent_eval (&) {
-+    local($SIG{__DIE__}, $SIG{__WARN__}, $@);
-+    return eval { $_[0]->() }
-+}
-+
-+sub can_load {
-+    local($SIG{__DIE__}, $SIG{__WARN__}, $@);
-+    return eval "use $_[0]; 1"
-+}
-+
-+
-+"Eighth Rule: read the documentation."
- 
- __END__
- 
-@@ -771,7 +829,7 @@
- 
- =head1 VERSION
- 
--Version 0.22
-+Version 0.27
- 
- =head1 SYNOPSIS
- 
-@@ -965,6 +1023,8 @@
- 
- =item B<setlogsock($sock_type, $stream_location)> (added in Perl 5.004_02)
- 
-+=item B<setlogsock($sock_type, $stream_location, $sock_timeout)> (added in 0.25)
-+
- Sets the socket type to be used for the next call to
- C<openlog()> or C<syslog()> and returns true on success,
- C<undef> on failure. The available mechanisms are: 
-@@ -984,15 +1044,18 @@
- =item *
- 
- C<"tcp"> - connect to a TCP socket, on the C<syslog/tcp> or C<syslogng/tcp> 
--service. 
-+service. If defined, the second parameter is used as a hostname to connect to.
- 
- =item *
- 
- C<"udp"> - connect to a UDP socket, on the C<syslog/udp> service.
-+If defined, the second parameter is used as a hostname to connect to, 
-+and the third parameter as the timeout used to check for UDP response. 
- 
- =item *
- 
--C<"inet"> - connect to an INET socket, either TCP or UDP, tried in that order. 
-+C<"inet"> - connect to an INET socket, either TCP or UDP, tried in that 
-+order.  If defined, the second parameter is used as a hostname to connect to.
- 
- =item *
- 
-@@ -1026,7 +1089,8 @@
- When this calling method is used, the array should contain a list of
- mechanisms which are attempted in order.
- 
--The default is to try C<native>, C<tcp>, C<udp>, C<unix>, C<stream>, C<console>.
-+The default is to try C<native>, C<tcp>, C<udp>, C<unix>, C<pipe>, C<stream>, 
-+C<console>.
- Under systems with the Win32 API, C<eventlog> will be added as the first 
- mechanism to try if C<Win32::EventLog> is available.
- 
-@@ -1113,8 +1177,7 @@
- 
- Log to UDP port on C<$remotehost> instead of logging locally:
- 
--    setlogsock('udp');
--    $Sys::Syslog::host = $remotehost;
-+    setlogsock("udp", $remotehost);
-     openlog($program, 'ndelay', 'user');
-     syslog('info', 'something happened over here');
- 
-@@ -1342,16 +1405,19 @@
- L<http://www.gnu.org/software/libc/manual/html_node/Syslog.html>
- 
- Solaris 10 documentation on syslog, 
--L<http://docs.sun.com/app/docs/doc/816-5168/6mbb3hruo?a=view>
-+L<http://docs.sun.com/app/docs/doc/816-5168/syslog-3c?a=view>
- 
--IRIX 6.4 documentation on syslog,
--L<http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?coll=0640&db=man&fname=3c+syslog>
-+Mac OS X documentation on syslog,
-+L<http://developer.apple.com/documentation/Darwin/Reference/ManPages/man3/syslog.3.html>
-+
-+IRIX 6.5 documentation on syslog,
-+L<http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?coll=0650&db=man&fname=3c+syslog>
- 
- AIX 5L 5.3 documentation on syslog, 
- L<http://publib.boulder.ibm.com/infocenter/pseries/v5r3/index.jsp?topic=/com.ibm.aix.basetechref/doc/basetrf2/syslog.htm>
- 
- HP-UX 11i documentation on syslog, 
--L<http://docs.hp.com/en/B9106-90010/syslog.3C.html>
-+L<http://docs.hp.com/en/B2355-60130/syslog.3C.html>
- 
- Tru64 5.1 documentation on syslog, 
- L<http://h30097.www3.hp.com/docs/base_doc/DOCUMENTATION/V51_HTML/MAN/MAN3/0193____.HTM>
-@@ -1455,7 +1521,7 @@
- 
- =head1 COPYRIGHT
- 
--Copyright (C) 1990-2007 by Larry Wall and others.
-+Copyright (C) 1990-2008 by Larry Wall and others.
- 
- 
- =head1 LICENSE
-@@ -1518,6 +1584,9 @@
- 
- Links
- -----
-+Linux Fast-STREAMS
-+- L<http://www.openss7.org/streams.html>
-+
- II12021: SYSLOGD HOWTO TCPIPINFO (z/OS, OS/390, MVS)
- - L<http://www-1.ibm.com/support/docview.wss?uid=isg1II12021>
- 
-diff -urN perl-5.10.0.orig/ext/Sys/Syslog/Syslog.xs perl-5.10.0/ext/Sys/Syslog/Syslog.xs
---- perl-5.10.0.orig/ext/Sys/Syslog/Syslog.xs	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Sys/Syslog/Syslog.xs	2009-02-10 11:10:19.000000000 +0100
-@@ -1,3 +1,7 @@
-+#if defined(_WIN32)
-+#  include <windows.h>
-+#endif
-+
- #include "EXTERN.h"
- #include "perl.h"
- #include "XSUB.h"
-@@ -9,13 +13,13 @@
- #define HAVE_SYSLOG 1
- #endif
- 
--#if defined(I_SYSLOG) || PATCHLEVEL < 6
--#include <syslog.h>
--#endif
--
- #if defined(_WIN32) && !defined(__CYGWIN__)
--#undef HAVE_SYSLOG
--#include "fallback/syslog.h"
-+#  undef HAVE_SYSLOG
-+#  include "fallback/syslog.h"
-+#else
-+#  if defined(I_SYSLOG) || PATCHLEVEL < 6
-+#    include <syslog.h>
-+#  endif
- #endif
- 
- static SV *ident_svptr;
-@@ -126,7 +130,9 @@
-     INPUT:
-         int mask
-     CODE:
--        setlogmask(mask);
-+        RETVAL = setlogmask(mask);
-+    OUTPUT:
-+        RETVAL
- 
- void
- closelog_xs()
-@@ -135,4 +141,31 @@
-         if (SvREFCNT(ident_svptr))
-             SvREFCNT_dec(ident_svptr);
- 
-+#else  /* HAVE_SYSLOG */
-+
-+void
-+openlog_xs(ident, option, facility)
-+    INPUT:
-+        SV*   ident
-+        int   option
-+        int   facility
-+    CODE:
-+
-+void
-+syslog_xs(priority, message)
-+    INPUT:
-+        int   priority
-+        const char * message
-+    CODE:
-+
-+int
-+setlogmask_xs(mask)
-+    INPUT:
-+        int mask
-+    CODE:
-+
-+void
-+closelog_xs()
-+    CODE:
-+
- #endif /* HAVE_SYSLOG */
-diff -urN perl-5.10.0.orig/ext/Sys/Syslog/fallback/syslog.h perl-5.10.0/ext/Sys/Syslog/fallback/syslog.h
---- perl-5.10.0.orig/ext/Sys/Syslog/fallback/syslog.h	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Sys/Syslog/fallback/syslog.h	2009-02-10 11:10:19.000000000 +0100
-@@ -0,0 +1,111 @@
-+/*
-+ * Copyright (c) 1982, 1986, 1988, 1993
-+ *	The Regents of the University of California.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
-+ */
-+
-+#ifndef _SYS_SYSLOG_H
-+#define _SYS_SYSLOG_H 1
-+
-+#define	_PATH_LOG	""
-+
-+/*
-+ * priorities/facilities are encoded into a single 32-bit quantity, where the
-+ * bottom 3 bits are the priority (0-7) and the top 28 bits are the facility
-+ * (0-big number).  Both the priorities and the facilities map roughly
-+ * one-to-one to strings in the syslogd(8) source code.  This mapping is
-+ * included in this file.
-+ *
-+ * priorities (these are ordered)
-+ */
-+#define	LOG_EMERG	0	/* system is unusable */
-+#define	LOG_ALERT	1	/* action must be taken immediately */
-+#define	LOG_CRIT	2	/* critical conditions */
-+#define	LOG_ERR		3	/* error conditions */
-+#define	LOG_WARNING	4	/* warning conditions */
-+#define	LOG_NOTICE	5	/* normal but significant condition */
-+#define	LOG_INFO	6	/* informational */
-+#define	LOG_DEBUG	7	/* debug-level messages */
-+
-+#define	LOG_PRIMASK	0x07	/* mask to extract priority part (internal) */
-+				/* extract priority */
-+#define	LOG_PRI(p)	((p) & LOG_PRIMASK)
-+#define	LOG_MAKEPRI(fac, pri)	(((fac) << 3) | (pri))
-+
-+/* facility codes */
-+#define	LOG_KERN	(0<<3)	/* kernel messages */
-+#define	LOG_USER	(1<<3)	/* random user-level messages */
-+#define	LOG_MAIL	(2<<3)	/* mail system */
-+#define	LOG_DAEMON	(3<<3)	/* system daemons */
-+#define	LOG_AUTH	(4<<3)	/* security/authorization messages */
-+#define	LOG_SYSLOG	(5<<3)	/* messages generated internally by syslogd */
-+#define	LOG_LPR		(6<<3)	/* line printer subsystem */
-+#define	LOG_NEWS	(7<<3)	/* network news subsystem */
-+#define	LOG_UUCP	(8<<3)	/* UUCP subsystem */
-+#define	LOG_CRON	(9<<3)	/* clock daemon */
-+#define	LOG_AUTHPRIV	(10<<3)	/* security/authorization messages (private) */
-+#define	LOG_FTP		(11<<3)	/* ftp daemon */
-+#define	LOG_NETINFO     (12<<3) /* NetInfo */
-+#define	LOG_REMOTEAUTH  (13<<3) /* remote authentication/authorization */
-+#define	LOG_INSTALL     (14<<3) /* installer subsystem */
-+#define	LOG_RAS         (15<<3) /* Remote Access Service (VPN / PPP) */
-+#define	LOG_LOCAL0	(16<<3)	/* reserved for local use */
-+#define	LOG_LOCAL1	(17<<3)	/* reserved for local use */
-+#define	LOG_LOCAL2	(18<<3)	/* reserved for local use */
-+#define	LOG_LOCAL3	(19<<3)	/* reserved for local use */
-+#define	LOG_LOCAL4	(20<<3)	/* reserved for local use */
-+#define	LOG_LOCAL5	(21<<3)	/* reserved for local use */
-+#define	LOG_LOCAL6	(22<<3)	/* reserved for local use */
-+#define	LOG_LOCAL7	(23<<3)	/* reserved for local use */
-+#define	LOG_LAUNCHD     (24<<3) /* launchd - general bootstrap daemon */
-+
-+#define	LOG_NFACILITIES	25	/* current number of facilities */
-+#define	LOG_FACMASK	0x03f8	/* mask to extract facility part */
-+				/* facility of pri */
-+#define	LOG_FAC(p)	(((p) & LOG_FACMASK) >> 3)
-+
-+/*
-+ * arguments to setlogmask.
-+ */
-+#define	LOG_MASK(pri)	(1 << (pri))		/* mask for one priority */
-+#define	LOG_UPTO(pri)	((1 << ((pri)+1)) - 1)	/* all priorities through pri */
-+
-+/*
-+ * Option flags for openlog.
-+ *
-+ * LOG_ODELAY no longer does anything.
-+ * LOG_NDELAY is the inverse of what it used to be.
-+ */
-+#define	LOG_PID		0x01	/* log the pid with each message */
-+#define	LOG_CONS	0x02	/* log on the console if errors in sending */
-+#define	LOG_ODELAY	0x04	/* delay open until first syslog() (default) */
-+#define	LOG_NDELAY	0x08	/* don't delay open */
-+#define	LOG_NOWAIT	0x10	/* don't wait for console forks: DEPRECATED */
-+#define	LOG_PERROR	0x20	/* log to stderr as well */
-+
-+#endif /* sys/syslog.h */
-diff -urN perl-5.10.0.orig/ext/Sys/Syslog/t/00-load.t perl-5.10.0/ext/Sys/Syslog/t/00-load.t
---- perl-5.10.0.orig/ext/Sys/Syslog/t/00-load.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Sys/Syslog/t/00-load.t	2009-02-10 11:10:19.000000000 +0100
-@@ -2,9 +2,7 @@
- use strict;
- use Test::More tests => 1;
- 
--BEGIN {
--    use_ok( 'Sys::Syslog' );
--}
-+use_ok( 'Sys::Syslog' );
- 
- diag( "Testing Sys::Syslog $Sys::Syslog::VERSION, Perl $], $^X" )
-     unless $ENV{PERL_CORE};
-diff -urN perl-5.10.0.orig/ext/Sys/Syslog/t/data-validation.t perl-5.10.0/ext/Sys/Syslog/t/data-validation.t
---- perl-5.10.0.orig/ext/Sys/Syslog/t/data-validation.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Sys/Syslog/t/data-validation.t	2009-02-10 11:10:19.000000000 +0100
-@@ -0,0 +1,114 @@
-+#!perl -w
-+# --------------------------------------------------------------------
-+# The aim of this test is to start a syslog server (TCP or UDP) using 
-+# the one available in POE, make Sys::Syslog connect to it by manually 
-+# select the corresponding mechanism, send some messages and, inside 
-+# the POE syslog server, check that these message are correctly crafted. 
-+# --------------------------------------------------------------------
-+use strict;
-+
-+my $port;
-+BEGIN {
-+    # override getservbyname()
-+    *CORE::GLOBAL::getservbyname = sub ($$) {
-+        my @v = CORE::getservbyname($_[0], $_[1]);
-+
-+        if (@v) {
-+            $v[2] = $port;
-+        } else {
-+            @v = ($_[0], "", $port, $_[1]);
-+        }
-+
-+        return wantarray ? @v : $port
-+    }
-+}
-+
-+use File::Spec;
-+use Test::More;
-+use Socket;
-+use Sys::Syslog qw(:standard :extended :macros);
-+
-+
-+# check than POE is available
-+plan skip_all => "POE is not available" unless eval "use POE; 1";
-+
-+# check than POE::Component::Server::Syslog is available
-+plan skip_all => "POE::Component::Server::Syslog is not available"
-+    unless eval "use POE::Component::Server::Syslog; 1";
-+
-+plan tests => 1;
-+
-+   $port    = 5140;
-+my $proto   = "tcp";
-+
-+my $ident   = "pocosyslog";
-+my $text    = "Close the world, txEn eht nepO.";
-+
-+
-+$SIG{ALRM} = sub {
-+    ok( 0, "test took too much time to execute" );
-+    exit
-+};
-+alarm 30;
-+
-+my $pid = fork();
-+
-+if ($pid) {
-+    # parent: setup a syslog server
-+    POE::Component::Server::Syslog->spawn(
-+        Alias       => 'syslog',
-+        Type        => $proto, 
-+        BindAddress => '127.0.0.1',
-+        BindPort    => $port,
-+        InputState  => \&client_input,
-+        ErrorState  => \&client_error,
-+    );
-+
-+    $SIG{CHLD} = sub { wait() };
-+
-+    POE::Kernel->run;
-+}
-+else {
-+    # child: send a message to the syslog server setup in the parent
-+    sleep 2;
-+    openlog($ident, "ndelay,pid", "local0");
-+    setlogsock($proto);
-+    syslog(info => $text);
-+    closelog();
-+    exit
-+}
-+
-+sub client_input {
-+    my $message = $_[&ARG0];
-+    delete $message->{'time'};  # too hazardous to test
-+    my $nl = $^O =~ /darwin/ ? "" : "\n";
-+
-+    is_deeply(
-+        $message,
-+        {
-+            host     => scalar gethostbyaddr(inet_aton('127.0.0.1'), AF_INET),
-+            pri      => &LOG_LOCAL0 + &LOG_INFO,
-+            facility => &LOG_LOCAL0 >> 3,
-+            severity => &LOG_INFO,
-+            msg      => "$ident\[$pid]: $text$nl\0",
-+        },
-+        "checking syslog message"
-+    );
-+
-+    POE::Kernel->post(syslog => "shutdown");
-+    POE::Kernel->stop;
-+}
-+
-+sub client_error {
-+    my $message = $_[&ARG0];
-+
-+    require Data::Dumper;
-+    $Data::Dumper::Indent   = 0;    $Data::Dumper::Indent   = 0;
-+    $Data::Dumper::Sortkeys = 1;    $Data::Dumper::Sortkeys = 1;
-+    fail "checking syslog message";
-+    diag "[client_error] message = ", Data::Dumper::Dumper($message);
-+
-+    POE::Kernel->post(syslog => "shutdown");
-+    POE::Kernel->stop;
-+}
-+
-diff -urN perl-5.10.0.orig/ext/Sys/Syslog/t/syslog.t perl-5.10.0/ext/Sys/Syslog/t/syslog.t
---- perl-5.10.0.orig/ext/Sys/Syslog/t/syslog.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Sys/Syslog/t/syslog.t	2009-02-10 11:10:19.000000000 +0100
-@@ -19,6 +19,10 @@
-                 pack portable recursion redefine regexp severe signal substr
-                 syntax taint uninitialized unpack untie utf8 void);
- 
-+# if someone is using warnings::compat, the previous trick won't work, so we
-+# must manually disable warnings
-+$^W = 0 if $] < 5.006;
-+
- my $is_Win32  = $^O =~ /win32/i;
- my $is_Cygwin = $^O =~ /cygwin/i;
- 
-@@ -111,35 +115,35 @@
- }
- 
- 
--BEGIN { $tests += 20 * 8 }
-+BEGIN { $tests += 22 * 8 }
- # try to open a syslog using all the available connection methods
- my @passed = ();
- for my $sock_type (qw(native eventlog unix pipe stream inet tcp udp)) {
-     SKIP: {
--        skip "the 'stream' mechanism because a previous mechanism with similar interface succeeded", 20 
-+        skip "the 'stream' mechanism because a previous mechanism with similar interface succeeded", 22 
-             if $sock_type eq 'stream' and grep {/pipe|unix/} @passed;
- 
-         # setlogsock() called with an arrayref
-         $r = eval { setlogsock([$sock_type]) } || 0;
--        skip "can't use '$sock_type' socket", 20 unless $r;
-+        skip "can't use '$sock_type' socket", 22 unless $r;
-         is( $@, '', "[$sock_type] setlogsock() called with ['$sock_type']" );
-         ok( $r, "[$sock_type] setlogsock() should return true: '$r'" );
- 
-         # setlogsock() called with a single argument
-         $r = eval { setlogsock($sock_type) } || 0;
--        skip "can't use '$sock_type' socket", 18 unless $r;
-+        skip "can't use '$sock_type' socket", 20 unless $r;
-         is( $@, '', "[$sock_type] setlogsock() called with '$sock_type'" );
-         ok( $r, "[$sock_type] setlogsock() should return true: '$r'" );
- 
-         # openlog() without option NDELAY
-         $r = eval { openlog('perl', '', 'local0') } || 0;
--        skip "can't connect to syslog", 16 if $@ =~ /^no connection to syslog available/;
-+        skip "can't connect to syslog", 18 if $@ =~ /^no connection to syslog available/;
-         is( $@, '', "[$sock_type] openlog() called with facility 'local0' and without option 'ndelay'" );
-         ok( $r, "[$sock_type] openlog() should return true: '$r'" );
- 
-         # openlog() with the option NDELAY
-         $r = eval { openlog('perl', 'ndelay', 'local0') } || 0;
--        skip "can't connect to syslog", 14 if $@ =~ /^no connection to syslog available/;
-+        skip "can't connect to syslog", 16 if $@ =~ /^no connection to syslog available/;
-         is( $@, '', "[$sock_type] openlog() called with facility 'local0' with option 'ndelay'" );
-         ok( $r, "[$sock_type] openlog() should return true: '$r'" );
- 
-@@ -148,6 +152,11 @@
-         like( $@, '/^syslog: invalid level\/facility: /', "[$sock_type] syslog() called with level -1" );
-         ok( !$r, "[$sock_type] syslog() should return false: '$r'" );
- 
-+        # syslog() with invalid level, should fail
-+        $r = eval { syslog("plonk", "$test_string by connecting to a $sock_type socket") } || 0;
-+        like( $@, '/^syslog: invalid level\/facility: /', "[$sock_type] syslog() called with level plonk" );
-+        ok( !$r, "[$sock_type] syslog() should return false: '$r'" );
-+
-         # syslog() with levels "info" and "notice" (as a strings), should fail
-         $r = eval { syslog('info,notice', "$test_string by connecting to a $sock_type socket") } || 0;
-         like( $@, '/^syslog: too many levels given: notice/', "[$sock_type] syslog() called with level 'info,notice'" );
-@@ -189,6 +198,9 @@
-     skip "the 'unix' mechanism works, so the tests will likely fail with the 'stream' mechanism", 10 
-         if grep {/unix/} @passed;
- 
-+    skip "not testing setlogsock('stream'): _PATH_LOG unavailable", 10
-+        unless -e Sys::Syslog::_PATH_LOG();
-+
-     # setlogsock() with "stream" and an undef path
-     $r = eval { setlogsock("stream", undef ) } || '';
-     is( $@, '', "setlogsock() called, with 'stream' and an undef path" );
diff --git a/perl-update-Test-Harness.patch b/perl-update-Test-Harness.patch
deleted file mode 100644
index 5938cce..0000000
--- a/perl-update-Test-Harness.patch
+++ /dev/null
@@ -1,33016 +0,0 @@
-Test-Harness-3.16
-- disabled perl5lib.t; it runs the installed /usr/bin/perl
-- fixed the preamble of harness-bailout.t
-
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2009-02-20 18:22:32.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-03-10 17:20:31.000000000 +0100
-@@ -1094,6 +1094,56 @@
- ext/Sys/Syslog/win32/PerlLog.mc	Sys::Syslog extension Win32 related file
- ext/Sys/Syslog/win32/PerlLog_RES.uu	Sys::Syslog extension Win32 related file
- ext/Sys/Syslog/win32/Win32.pm	Sys::Syslog extension Win32 related file
-+ext/Test/Harness/t/000-load.t	test for Test::Harness
-+ext/Test/Harness/t/aggregator.t	test for Test::Harness
-+ext/Test/Harness/t/bailout.t	test for Test::Harness
-+ext/Test/Harness/t/base.t	test for Test::Harness
-+ext/Test/Harness/t/callbacks.t	test for Test::Harness
-+ext/Test/Harness/t/console.t	test for Test::Harness
-+ext/Test/Harness/t/compat/env.t	test for Test::Harness
-+ext/Test/Harness/t/compat/failure.t	test for Test::Harness
-+ext/Test/Harness/t/compat/inc-propagation.t	test for Test::Harness
-+ext/Test/Harness/t/compat/inc_taint.t	test for Test::Harness
-+ext/Test/Harness/t/compat/nonumbers.t	test for Test::Harness
-+ext/Test/Harness/t/compat/regression.t	test for Test::Harness
-+ext/Test/Harness/t/compat/test-harness-compat.t	test for Test::Harness
-+ext/Test/Harness/t/compat/version.t	test for Test::Harness
-+ext/Test/Harness/t/errors.t	test for Test::Harness
-+ext/Test/Harness/t/file.t	test for Test::Harness
-+ext/Test/Harness/t/glob-to-regexp.t	test for Test::Harness
-+ext/Test/Harness/t/grammar.t	test for Test::Harness
-+ext/Test/Harness/t/harness-bailout.t	test for Test::Harness
-+ext/Test/Harness/t/harness-subclass.t	test for Test::Harness
-+ext/Test/Harness/t/harness.t	test for Test::Harness
-+ext/Test/Harness/t/iterators.t	test for Test::Harness
-+ext/Test/Harness/t/multiplexer.t	test for Test::Harness
-+ext/Test/Harness/t/nofork-mux.t	test for Test::Harness
-+ext/Test/Harness/t/nofork.t	test for Test::Harness
-+ext/Test/Harness/t/object.t	test for Test::Harness
-+ext/Test/Harness/t/parse.t	test for Test::Harness
-+ext/Test/Harness/t/parser-config.t	test for Test::Harness
-+ext/Test/Harness/t/parser-subclass.t	test for Test::Harness
-+ext/Test/Harness/t/premature-bailout.t	test for Test::Harness
-+ext/Test/Harness/t/process.t	test for Test::Harness
-+ext/Test/Harness/t/prove.t	test for Test::Harness
-+ext/Test/Harness/t/proveenv.t	test for Test::Harness
-+ext/Test/Harness/t/proverc.t	test for Test::Harness
-+ext/Test/Harness/t/proverun.t	test for Test::Harness
-+ext/Test/Harness/t/regression.t	test for Test::Harness
-+ext/Test/Harness/t/results.t	test for Test::Harness
-+ext/Test/Harness/t/scheduler.t	test for Test::Harness
-+ext/Test/Harness/t/source.t	test for Test::Harness
-+ext/Test/Harness/t/spool.t	test for Test::Harness
-+ext/Test/Harness/t/state.t	test for Test::Harness
-+ext/Test/Harness/t/state_results.t	test for Test::Harness
-+ext/Test/Harness/t/streams.t	test for Test::Harness
-+ext/Test/Harness/t/taint.t	test for Test::Harness
-+ext/Test/Harness/t/testargs.t	test for Test::Harness
-+ext/Test/Harness/t/unicode.t	test for Test::Harness
-+ext/Test/Harness/t/utils.t	test for Test::Harness
-+ext/Test/Harness/t/yamlish-output.t	test for Test::Harness
-+ext/Test/Harness/t/yamlish-writer.t	test for Test::Harness
-+ext/Test/Harness/t/yamlish.t	test for Test::Harness
- ext/Text/Soundex/Changes	Changelog for Text::Soundex
- ext/Text/Soundex/Makefile.PL	Text::Soundex extension makefile writer
- ext/Text/Soundex/README		README for Text::Soundex
-@@ -2593,34 +2643,9 @@
- lib/Test/Builder.pm		For writing new test libraries
- lib/Test/Builder/Tester/Color.pm	Turn on color in Test::Builder::Tester
- lib/Test/Builder/Tester.pm	For testing Test::Builder based classes
--lib/Test/Harness/Assert.pm	Test::Harness::Assert (internal use only)
- lib/Test/Harness/bin/prove	The prove harness utility
- lib/Test/Harness/Changes	Test::Harness
--lib/Test/Harness/Iterator.pm	Test::Harness::Iterator (internal use only)
- lib/Test/Harness.pm		A test harness
--lib/Test/Harness/Point.pm	Test::Harness::Point (internal use only)
--lib/Test/Harness/Results.pm	object for tracking results from a single test file
--lib/Test/Harness/Straps.pm	Test::Harness::Straps
--lib/Test/Harness/t/00compile.t	Test::Harness test
--lib/Test/Harness/TAP.pod	Documentation for the Test Anything Protocol
--lib/Test/Harness/t/assert.t	Test::Harness::Assert test
--lib/Test/Harness/t/base.t	Test::Harness test
--lib/Test/Harness/t/callback.t	Test::Harness test
--lib/Test/Harness/t/failure.t	Test::Harness test
--lib/Test/Harness/t/from_line.t	Test::Harness test
--lib/Test/Harness/t/harness.t	Test::Harness test
--lib/Test/Harness/t/inc_taint.t	Test::Harness test
--lib/Test/Harness/t/nonumbers.t	Test::Harness test
--lib/Test/Harness/t/ok.t		Test::Harness test
--lib/Test/Harness/t/point-parse.t	Test::Harness test
--lib/Test/Harness/t/point.t	Test::Harness test
--lib/Test/Harness/t/prove-globbing.t	Test::Harness::Straps test
--lib/Test/Harness/t/prove-switches.t	Test::Harness::Straps test
--lib/Test/Harness/t/strap-analyze.t	Test::Harness::Straps test
--lib/Test/Harness/t/strap.t		Test::Harness::Straps test
--lib/Test/Harness/t/test-harness.t	Test::Harness test
--lib/Test/Harness/t/version.t	Test::Harness test
--lib/Test/Harness/Util.pm	Various utility functions for Test::Harness
- lib/Test/More.pm		More utilities for writing tests
- lib/Test.pm			A simple framework for writing test scripts
- lib/Test/Simple/Changes		Test::Simple changes
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/000-load.t perl-5.10.0/ext/Test/Harness/t/000-load.t
---- perl-5.10.0.orig/ext/Test/Harness/t/000-load.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/000-load.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,61 @@
-+#!/usr/bin/perl -wT
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 78;
-+
-+BEGIN {
-+
-+    # TAP::Parser must come first
-+    my @classes = qw(
-+      TAP::Parser
-+      App::Prove
-+      App::Prove::State
-+      App::Prove::State::Result
-+      App::Prove::State::Result::Test
-+      TAP::Base
-+      TAP::Formatter::Color
-+      TAP::Formatter::Console::ParallelSession
-+      TAP::Formatter::Console::Session
-+      TAP::Formatter::Console
-+      TAP::Harness
-+      TAP::Parser::Aggregator
-+      TAP::Parser::Grammar
-+      TAP::Parser::Iterator
-+      TAP::Parser::Iterator::Array
-+      TAP::Parser::Iterator::Process
-+      TAP::Parser::Iterator::Stream
-+      TAP::Parser::IteratorFactory
-+      TAP::Parser::Multiplexer
-+      TAP::Parser::Result
-+      TAP::Parser::ResultFactory
-+      TAP::Parser::Result::Bailout
-+      TAP::Parser::Result::Comment
-+      TAP::Parser::Result::Plan
-+      TAP::Parser::Result::Pragma
-+      TAP::Parser::Result::Test
-+      TAP::Parser::Result::Unknown
-+      TAP::Parser::Result::Version
-+      TAP::Parser::Result::YAML
-+      TAP::Parser::Result
-+      TAP::Parser::Scheduler
-+      TAP::Parser::Scheduler::Job
-+      TAP::Parser::Scheduler::Spinner
-+      TAP::Parser::Source::Perl
-+      TAP::Parser::Source
-+      TAP::Parser::YAMLish::Reader
-+      TAP::Parser::YAMLish::Writer
-+      TAP::Parser::Utils
-+      Test::Harness
-+    );
-+
-+    foreach my $class (@classes) {
-+        use_ok $class or BAIL_OUT("Could not load $class");
-+        is $class->VERSION, TAP::Parser->VERSION,
-+          "... and $class should have the correct version";
-+    }
-+
-+    diag("Testing Test::Harness $Test::Harness::VERSION, Perl $], $^X")
-+      unless $ENV{PERL_CORE};
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/aggregator.t perl-5.10.0/ext/Test/Harness/t/aggregator.t
---- perl-5.10.0.orig/ext/Test/Harness/t/aggregator.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/aggregator.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,305 @@
-+#!/usr/bin/perl -wT
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 81;
-+
-+use TAP::Parser;
-+use TAP::Parser::IteratorFactory;
-+use TAP::Parser::Aggregator;
-+
-+my $tap = <<'END_TAP';
-+1..5
-+ok 1 - input file opened
-+... this is junk
-+not ok first line of the input valid # todo some data
-+# this is a comment
-+ok 3 - read the rest of the file
-+not ok 4 - this is a real failure
-+ok 5 # skip we have no description
-+END_TAP
-+
-+my $factory = TAP::Parser::IteratorFactory->new;
-+my $stream = $factory->make_iterator( [ split /\n/ => $tap ] );
-+isa_ok $stream, 'TAP::Parser::Iterator';
-+
-+my $parser1 = TAP::Parser->new( { stream => $stream } );
-+isa_ok $parser1, 'TAP::Parser';
-+
-+$parser1->run;
-+
-+$tap = <<'END_TAP';
-+1..7
-+ok 1 - gentlemen, start your engines
-+not ok first line of the input valid # todo some data
-+# this is a comment
-+ok 3 - read the rest of the file
-+not ok 4 - this is a real failure
-+ok 5 
-+ok 6 - you shall not pass! # TODO should have failed
-+not ok 7 - Gandalf wins.  Game over.  # TODO 'bout time!
-+END_TAP
-+
-+my $parser2 = TAP::Parser->new( { tap => $tap } );
-+isa_ok $parser2, 'TAP::Parser';
-+$parser2->run;
-+
-+can_ok 'TAP::Parser::Aggregator', 'new';
-+my $agg = TAP::Parser::Aggregator->new;
-+isa_ok $agg, 'TAP::Parser::Aggregator';
-+
-+can_ok $agg, 'add';
-+ok $agg->add( 'tap1', $parser1 ), '... and calling it should succeed';
-+ok $agg->add( 'tap2', $parser2 ), '... even if we add more than one parser';
-+eval { $agg->add( 'tap1', $parser1 ) };
-+like $@, qr/^You already have a parser for \Q(tap1)/,
-+  '... but trying to reuse a description should be fatal';
-+
-+can_ok $agg, 'parsers';
-+is scalar $agg->parsers, 2,
-+  '... and it should report how many parsers it has';
-+is_deeply [ $agg->parsers ], [ $parser1, $parser2 ],
-+  '... or which parsers it has';
-+is_deeply $agg->parsers('tap2'), $parser2, '... or reporting a single parser';
-+is_deeply [ $agg->parsers(qw(tap2 tap1)) ], [ $parser2, $parser1 ],
-+  '... or a group';
-+
-+# test aggregate results
-+
-+can_ok $agg, 'passed';
-+is $agg->passed, 10,
-+  '... and we should have the correct number of passed tests';
-+is_deeply [ $agg->passed ], [qw(tap1 tap2)],
-+  '... and be able to get their descriptions';
-+
-+can_ok $agg, 'failed';
-+is $agg->failed, 2,
-+  '... and we should have the correct number of failed tests';
-+is_deeply [ $agg->failed ], [qw(tap1 tap2)],
-+  '... and be able to get their descriptions';
-+
-+can_ok $agg, 'todo';
-+is $agg->todo, 4, '... and we should have the correct number of todo tests';
-+is_deeply [ $agg->todo ], [qw(tap1 tap2)],
-+  '... and be able to get their descriptions';
-+
-+can_ok $agg, 'skipped';
-+is $agg->skipped, 1,
-+  '... and we should have the correct number of skipped tests';
-+is_deeply [ $agg->skipped ], [qw(tap1)],
-+  '... and be able to get their descriptions';
-+
-+can_ok $agg, 'parse_errors';
-+is $agg->parse_errors, 0, '... and the correct number of parse errors';
-+is_deeply [ $agg->parse_errors ], [],
-+  '... and be able to get their descriptions';
-+
-+can_ok $agg, 'todo_passed';
-+is $agg->todo_passed, 1,
-+  '... and the correct number of unexpectedly succeeded tests';
-+is_deeply [ $agg->todo_passed ], [qw(tap2)],
-+  '... and be able to get their descriptions';
-+
-+can_ok $agg, 'total';
-+is $agg->total, $agg->passed + $agg->failed,
-+  '... and we should have the correct number of total tests';
-+
-+can_ok $agg, 'planned';
-+is $agg->planned, $agg->passed + $agg->failed,
-+  '... and we should have the correct number of planned tests';
-+
-+can_ok $agg, 'has_problems';
-+ok $agg->has_problems, '... and it should report true if there are problems';
-+
-+can_ok $agg, 'has_errors';
-+ok $agg->has_errors, '... and it should report true if there are errors';
-+
-+can_ok $agg, 'get_status';
-+is $agg->get_status, 'FAIL', '... and it should tell us the tests failed';
-+
-+can_ok $agg, 'all_passed';
-+ok !$agg->all_passed, '... and it should tell us not all tests passed';
-+
-+# coverage testing
-+
-+# _get_parsers
-+# bad descriptions
-+# currently the $agg object has descriptions tap1 and tap2
-+# call _get_parsers with another description.
-+# $agg will call  its _croak method
-+my @die;
-+
-+eval {
-+    local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+    $agg->_get_parsers('no_such_parser_for');
-+};
-+
-+is @die, 1,
-+  'coverage tests for missing parsers... and we caught just one death message';
-+like pop(@die),
-+  qr/^A parser for \(no_such_parser_for\) could not be found at /,
-+  '... and it was the expected death message';
-+
-+# _get_parsers in scalar context
-+
-+my $gp = $agg->_get_parsers(qw(tap1 tap2))
-+  ;    # should return ref to array containing parsers for tap1 and tap2
-+
-+is @$gp, 2,
-+  'coverage tests for _get_parser in scalar context... and we got the right number of parsers';
-+isa_ok( $_, 'TAP::Parser' ) foreach (@$gp);
-+
-+# _get_parsers
-+# todo_failed - this is a deprecated method, so it  (and these tests)
-+# can be removed eventually.  However, it is showing up in the coverage
-+# as never tested.
-+my @warn;
-+
-+eval {
-+    local $SIG{__WARN__} = sub { push @warn, @_ };
-+
-+    $agg->todo_failed();
-+};
-+
-+# check the warning, making sure to capture the fullstops correctly (not
-+# as "any char" matches)
-+is @warn, 1,
-+  'coverage tests for deprecated todo_failed... and just one warning caught';
-+like pop(@warn),
-+  qr/^"todo_failed" is deprecated[.]  Please use "todo_passed"[.]  See the docs[.] at/,
-+  '... and it was the expected warning';
-+
-+# has_problems
-+# this has a large number of conditions 'OR'd together, so the tests get
-+# a little complicated here
-+
-+# currently, we have covered the cases of failed() being true and none
-+# of the summary methods failing
-+
-+# we need to set up test cases for
-+# 1. !failed && todo_passed
-+# 2. !failed && !todo_passed && parse_errors
-+# 3. !failed && !todo_passed && !parse_errors && exit
-+# 4. !failed && !todo_passed && !parse_errors && !exit && wait
-+
-+# note there is nothing wrong per se with the has_problems logic, these
-+# are simply coverage tests
-+
-+# 1. !failed && todo_passed
-+
-+$agg = TAP::Parser::Aggregator->new();
-+isa_ok $agg, 'TAP::Parser::Aggregator';
-+
-+$tap = <<'END_TAP';
-+1..1
-+ok 1 - you shall not pass! # TODO should have failed
-+END_TAP
-+
-+my $parser3 = TAP::Parser->new( { tap => $tap } );
-+isa_ok $parser3, 'TAP::Parser';
-+$parser3->run;
-+
-+$agg->add( 'tap3', $parser3 );
-+
-+is $agg->passed, 1,
-+  'coverage tests for !failed && todo_passed... and we should have the correct number of passed tests';
-+is $agg->failed, 0,
-+  '... and we should have the correct number of failed tests';
-+is $agg->todo_passed, 1,
-+  '... and the correct number of unexpectedly succeeded tests';
-+ok $agg->has_problems,
-+  '... and it should report true that there are problems';
-+is $agg->get_status, 'PASS', '... and the status should be passing';
-+ok !$agg->has_errors, '.... but it should not report any errors';
-+ok $agg->all_passed, '... bonus tests should be passing tests, too';
-+
-+# 2. !failed && !todo_passed && parse_errors
-+
-+$agg = TAP::Parser::Aggregator->new();
-+
-+$tap = <<'END_TAP';
-+1..-1
-+END_TAP
-+
-+my $parser4 = TAP::Parser->new( { tap => $tap } );
-+isa_ok $parser4, 'TAP::Parser';
-+$parser4->run;
-+
-+$agg->add( 'tap4', $parser4 );
-+
-+is $agg->passed, 0,
-+  'coverage tests for !failed && !todo_passed && parse_errors... and we should have the correct number of passed tests';
-+is $agg->failed, 0,
-+  '... and we should have the correct number of failed tests';
-+is $agg->todo_passed, 0,
-+  '... and the correct number of unexpectedly succeeded tests';
-+is $agg->parse_errors, 1, '... and the correct number of parse errors';
-+ok $agg->has_problems,
-+  '... and it should report true that there are problems';
-+
-+# 3. !failed && !todo_passed && !parse_errors && exit
-+# now this is a little harder to emulate cleanly through creating tap
-+# fragments and parsing, as exit and wait collect OS-status codes.
-+# so we'll get a little funky with $agg and push exit and wait descriptions
-+# in it - not very friendly to internal rep changes.
-+
-+$agg = TAP::Parser::Aggregator->new();
-+
-+$tap = <<'END_TAP';
-+1..1
-+ok 1 - you shall not pass!
-+END_TAP
-+
-+my $parser5 = TAP::Parser->new( { tap => $tap } );
-+$parser5->run;
-+
-+$agg->add( 'tap', $parser5 );
-+
-+push @{ $agg->{descriptions_for_exit} }, 'one possible reason';
-+$agg->{exit}++;
-+
-+is $agg->passed, 1,
-+  'coverage tests for !failed && !todo_passed && !parse_errors... and we should have the correct number of passed tests';
-+is $agg->failed, 0,
-+  '... and we should have the correct number of failed tests';
-+is $agg->todo_passed, 0,
-+  '... and the correct number of unexpectedly succeeded tests';
-+is $agg->parse_errors, 0, '... and the correct number of parse errors';
-+
-+my @exits = $agg->exit;
-+
-+is @exits, 1, '... and the correct number of exits';
-+is pop(@exits), 'one possible reason',
-+  '... and we collected the right exit reason';
-+
-+ok $agg->has_problems,
-+  '... and it should report true that there are problems';
-+
-+# 4. !failed && !todo_passed && !parse_errors && !exit && wait
-+
-+$agg = TAP::Parser::Aggregator->new();
-+
-+$agg->add( 'tap', $parser5 );
-+
-+push @{ $agg->{descriptions_for_wait} }, 'another possible reason';
-+$agg->{wait}++;
-+
-+is $agg->passed, 1,
-+  'coverage tests for !failed && !todo_passed && !parse_errors && !exit... and we should have the correct number of passed tests';
-+is $agg->failed, 0,
-+  '... and we should have the correct number of failed tests';
-+is $agg->todo_passed, 0,
-+  '... and the correct number of unexpectedly succeeded tests';
-+is $agg->parse_errors, 0, '... and the correct number of parse errors';
-+is $agg->exit,         0, '... and the correct number of exits';
-+
-+my @waits = $agg->wait;
-+
-+is @waits, 1, '... and the correct number of waits';
-+is pop(@waits), 'another possible reason',
-+  '... and we collected the right wait reason';
-+
-+ok $agg->has_problems,
-+  '... and it should report true that there are problems';
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/bailout.t perl-5.10.0/ext/Test/Harness/t/bailout.t
---- perl-5.10.0.orig/ext/Test/Harness/t/bailout.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/bailout.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,114 @@
-+#!/usr/bin/perl -wT
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 33;
-+
-+use TAP::Parser;
-+
-+my $tap = <<'END_TAP';
-+1..4
-+ok 1 - input file opened
-+... this is junk
-+not ok first line of the input valid # todo some data
-+# this is a comment
-+ok 3 - read the rest of the file
-+not ok 4 - this is a real failure
-+Bail out!  We ran out of foobar.
-+END_TAP
-+my $parser = TAP::Parser->new( { tap => $tap } );
-+isa_ok $parser, 'TAP::Parser',
-+  '... we should be able to parse bailed out tests';
-+
-+my @results;
-+while ( my $result = $parser->next ) {
-+    push @results => $result;
-+}
-+
-+can_ok $parser, 'passed';
-+is $parser->passed, 3,
-+  '... and we shold have the correct number of passed tests';
-+is_deeply [ $parser->passed ], [ 1, 2, 3 ],
-+  '... and get a list of the passed tests';
-+
-+can_ok $parser, 'failed';
-+is $parser->failed, 1, '... and the correct number of failed tests';
-+is_deeply [ $parser->failed ], [4], '... and get a list of the failed tests';
-+
-+can_ok $parser, 'actual_passed';
-+is $parser->actual_passed, 2,
-+  '... and we shold have the correct number of actually passed tests';
-+is_deeply [ $parser->actual_passed ], [ 1, 3 ],
-+  '... and get a list of the actually passed tests';
-+
-+can_ok $parser, 'actual_failed';
-+is $parser->actual_failed, 2,
-+  '... and the correct number of actually failed tests';
-+is_deeply [ $parser->actual_failed ], [ 2, 4 ],
-+  '... or get a list of the actually failed tests';
-+
-+can_ok $parser, 'todo';
-+is $parser->todo, 1,
-+  '... and we should have the correct number of TODO tests';
-+is_deeply [ $parser->todo ], [2], '... and get a list of the TODO tests';
-+
-+ok !$parser->skipped,
-+  '... and we should have the correct number of skipped tests';
-+
-+# check the plan
-+
-+can_ok $parser, 'plan';
-+is $parser->plan,          '1..4', '... and we should have the correct plan';
-+is $parser->tests_planned, 4,      '... and the correct number of tests';
-+
-+# results() is sane?
-+
-+ok @results, 'The parser should return results';
-+is scalar @results, 8, '... and there should be one for each line';
-+
-+# check the test plan
-+
-+my $result = shift @results;
-+ok $result->is_plan, 'We should have a plan';
-+
-+# a normal, passing test
-+
-+my $test = shift @results;
-+ok $test->is_test, '... and a test';
-+
-+# junk lines should be preserved
-+
-+my $unknown = shift @results;
-+ok $unknown->is_unknown, '... and an unknown line';
-+
-+# a failing test, which also happens to have a directive
-+
-+my $failed = shift @results;
-+ok $failed->is_test, '... and another test';
-+
-+# comments
-+
-+my $comment = shift @results;
-+ok $comment->is_comment, '... and a comment';
-+
-+# another normal, passing test
-+
-+$test = shift @results;
-+ok $test->is_test, '... and another test';
-+
-+# a failing test
-+
-+$failed = shift @results;
-+ok $failed->is_test, '... and yet another test';
-+
-+# ok 5 # skip we have no description
-+# skipped test
-+my $bailout = shift @results;
-+ok $bailout->is_bailout, 'And finally we should have a bailout';
-+is $bailout->as_string,  'We ran out of foobar.',
-+  '... and as_string() should return the explanation';
-+is $bailout->raw, 'Bail out!  We ran out of foobar.',
-+  '... and raw() should return the explanation';
-+is $bailout->explanation, 'We ran out of foobar.',
-+  '... and it should have the correct explanation';
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/base.t perl-5.10.0/ext/Test/Harness/t/base.t
---- perl-5.10.0.orig/ext/Test/Harness/t/base.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/base.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,173 @@
-+#!/usr/bin/perl -wT
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 38;
-+
-+use TAP::Base;
-+
-+{
-+
-+    # No callbacks allowed
-+    can_ok 'TAP::Base', 'new';
-+    my $base = TAP::Base->new();
-+    isa_ok $base, 'TAP::Base', 'object of correct type';
-+    foreach my $method (qw(callback _croak _callback_for _initialize)) {
-+        can_ok $base, $method;
-+    }
-+
-+    eval {
-+        $base->callback(
-+            some_event => sub {
-+
-+                # do nothing
-+            }
-+        );
-+    };
-+    like( $@, qr/No callbacks/, 'no callbacks allowed croaks OK' );
-+    my $cb = $base->_callback_for('some_event');
-+    ok( !$cb, 'no callback installed' );
-+}
-+
-+{
-+
-+    # No callbacks allowed, constructor should croak
-+    eval {
-+        my $base = TAP::Base->new(
-+            {   callbacks => {
-+                    some_event => sub {
-+
-+                        # do nothing
-+                      }
-+                }
-+            }
-+        );
-+    };
-+    like(
-+        $@, qr/No callbacks/,
-+        'no callbacks in constructor croaks OK'
-+    );
-+}
-+
-+package CallbackOK;
-+
-+use TAP::Base;
-+use vars qw(@ISA);
-+@ISA = 'TAP::Base';
-+
-+sub _initialize {
-+    my $self = shift;
-+    my $args = shift;
-+    $self->SUPER::_initialize( $args, [qw( nice_event other_event )] );
-+    return $self;
-+}
-+
-+package main;
-+{
-+    my $base = CallbackOK->new();
-+    isa_ok $base, 'TAP::Base';
-+
-+    eval {
-+        $base->callback(
-+            some_event => sub {
-+
-+                # do nothing
-+            }
-+        );
-+    };
-+    like( $@, qr/Callback some_event/, 'illegal callback croaks OK' );
-+
-+    my ( $nice, $other ) = ( 0, 0 );
-+
-+    eval {
-+        $base->callback( other_event => sub { $other-- } );
-+        $base->callback( nice_event => sub { $nice++; return shift() . 'OK' }
-+        );
-+    };
-+
-+    ok( !$@, 'callbacks installed OK' );
-+
-+    my $nice_cbs = $base->_callback_for('nice_event');
-+    is( ref $nice_cbs,     'ARRAY', 'callbacks type ok' );
-+    is( scalar @$nice_cbs, 1,       'right number of callbacks' );
-+    my $nice_cb = $nice_cbs->[0];
-+    ok( ref $nice_cb eq 'CODE', 'callback for nice_event returned' );
-+    my $got = $nice_cb->('Is ');
-+    is( $got, 'Is OK', 'args passed to callback' );
-+    cmp_ok( $nice, '==', 1, 'callback calls the right sub' );
-+
-+    my $other_cbs = $base->_callback_for('other_event');
-+    is( ref $other_cbs,     'ARRAY', 'callbacks type ok' );
-+    is( scalar @$other_cbs, 1,       'right number of callbacks' );
-+    my $other_cb = $other_cbs->[0];
-+    ok( ref $other_cb eq 'CODE', 'callback for other_event returned' );
-+    $other_cb->();
-+    cmp_ok( $other, '==', -1, 'callback calls the right sub' );
-+
-+    my @got = $base->_make_callback( 'nice_event', 'I am ' );
-+    is( scalar @got, 1,         'right number of results' );
-+    is( $got[0],     'I am OK', 'callback via _make_callback works' );
-+}
-+
-+{
-+    my ( $nice, $other ) = ( 0, 0 );
-+
-+    my $base = CallbackOK->new(
-+        {   callbacks => {
-+                nice_event => sub { $nice++ }
-+            }
-+        }
-+    );
-+
-+    isa_ok $base, 'TAP::Base', 'object creation with callback succeeds';
-+
-+    eval {
-+        $base->callback(
-+            some_event => sub {
-+
-+                # do nothing
-+            }
-+        );
-+    };
-+    like( $@, qr/Callback some_event/, 'illegal callback croaks OK' );
-+
-+    eval {
-+        $base->callback( other_event => sub { $other-- } );
-+    };
-+
-+    ok( !$@, 'callback installed OK' );
-+
-+    my $nice_cbs = $base->_callback_for('nice_event');
-+    is( ref $nice_cbs,     'ARRAY', 'callbacks type ok' );
-+    is( scalar @$nice_cbs, 1,       'right number of callbacks' );
-+    my $nice_cb = $nice_cbs->[0];
-+    ok( ref $nice_cb eq 'CODE', 'callback for nice_event returned' );
-+    $nice_cb->();
-+    cmp_ok( $nice, '==', 1, 'callback calls the right sub' );
-+
-+    my $other_cbs = $base->_callback_for('other_event');
-+    is( ref $other_cbs,     'ARRAY', 'callbacks type ok' );
-+    is( scalar @$other_cbs, 1,       'right number of callbacks' );
-+    my $other_cb = $other_cbs->[0];
-+    ok( ref $other_cb eq 'CODE', 'callback for other_event returned' );
-+    $other_cb->();
-+    cmp_ok( $other, '==', -1, 'callback calls the right sub' );
-+
-+    # my @got = $base->_make_callback( 'nice_event', 'I am ' );
-+    # is ( scalar @got, 1, 'right number of results' );
-+    # is( $got[0], 'I am OK', 'callback via _make_callback works' );
-+
-+    my $status = undef;
-+
-+    # Stack another callback
-+    $base->callback( other_event => sub { $status = 'OK'; return 'Aye' } );
-+
-+    my $new_cbs = $base->_callback_for('other_event');
-+    is( ref $new_cbs,     'ARRAY', 'callbacks type ok' );
-+    is( scalar @$new_cbs, 2,       'right number of callbacks' );
-+    my $new_cb = $new_cbs->[1];
-+    ok( ref $new_cb eq 'CODE', 'callback for new_event returned' );
-+    my @got = $new_cb->();
-+    is( $status, 'OK', 'new callback called OK' );
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/callbacks.t perl-5.10.0/ext/Test/Harness/t/callbacks.t
---- perl-5.10.0.orig/ext/Test/Harness/t/callbacks.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/callbacks.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,115 @@
-+#!/usr/bin/perl -wT
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 10;
-+
-+use TAP::Parser;
-+use TAP::Parser::IteratorFactory;
-+
-+my $tap = <<'END_TAP';
-+1..5
-+ok 1 - input file opened
-+... this is junk
-+not ok first line of the input valid # todo some data
-+# this is a comment
-+ok 3 - read the rest of the file
-+not ok 4 - this is a real failure
-+ok 5 # skip we have no description
-+END_TAP
-+
-+my @tests;
-+my $plan_output;
-+my $todo      = 0;
-+my $skip      = 0;
-+my %callbacks = (
-+    test => sub {
-+        my $test = shift;
-+        push @tests => $test;
-+        $todo++ if $test->has_todo;
-+        $skip++ if $test->has_skip;
-+    },
-+    plan => sub {
-+        my $plan = shift;
-+        $plan_output = $plan->as_string;
-+    }
-+);
-+
-+my $factory = TAP::Parser::IteratorFactory->new;
-+my $stream  = $factory->make_iterator( [ split /\n/ => $tap ] );
-+my $parser  = TAP::Parser->new(
-+    {   stream    => $stream,
-+        callbacks => \%callbacks,
-+    }
-+);
-+
-+can_ok $parser, 'run';
-+$parser->run;
-+is $plan_output, '1..5', 'Plan callbacks should succeed';
-+is scalar @tests, $parser->tests_run, '... as should the test callbacks';
-+
-+@tests       = ();
-+$plan_output = '';
-+$todo        = 0;
-+$skip        = 0;
-+my $else = 0;
-+my $all  = 0;
-+my $end  = 0;
-+%callbacks = (
-+    test => sub {
-+        my $test = shift;
-+        push @tests => $test;
-+        $todo++ if $test->has_todo;
-+        $skip++ if $test->has_skip;
-+    },
-+    plan => sub {
-+        my $plan = shift;
-+        $plan_output = $plan->as_string;
-+    },
-+    EOF => sub {
-+        $end = 1 if $all == 8;
-+    },
-+    ELSE => sub {
-+        $else++;
-+    },
-+    ALL => sub {
-+        $all++;
-+    },
-+);
-+
-+$stream = $factory->make_iterator( [ split /\n/ => $tap ] );
-+$parser = TAP::Parser->new(
-+    {   stream    => $stream,
-+        callbacks => \%callbacks,
-+    }
-+);
-+
-+can_ok $parser, 'run';
-+$parser->run;
-+is $plan_output, '1..5', 'Plan callbacks should succeed';
-+is scalar @tests, $parser->tests_run, '... as should the test callbacks';
-+is $else, 2, '... and the correct number of "ELSE" lines should be seen';
-+is $all,  8, '... and the correct total number of lines should be seen';
-+is $end,  1, 'EOF callback correctly called';
-+
-+# Check callback name policing
-+
-+%callbacks = (
-+    sometest => sub { },
-+    plan     => sub { },
-+    random   => sub { },
-+    ALL      => sub { },
-+    ELSES    => sub { },
-+);
-+
-+$stream = $factory->make_iterator( [ split /\n/ => $tap ] );
-+eval {
-+    $parser = TAP::Parser->new(
-+        {   stream    => $stream,
-+            callbacks => \%callbacks,
-+        }
-+    );
-+};
-+
-+like $@, qr/Callback/, 'Bad callback keys faulted';
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/compat/env.t perl-5.10.0/ext/Test/Harness/t/compat/env.t
---- perl-5.10.0.orig/ext/Test/Harness/t/compat/env.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/compat/env.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,39 @@
-+#!/usr/bin/perl -w
-+
-+# Test that env vars are honoured.
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More (
-+    $^O eq 'VMS'
-+    ? ( skip_all => 'VMS' )
-+    : ( tests => 1 )
-+);
-+
-+use Test::Harness;
-+
-+# HARNESS_PERL_SWITCHES
-+
-+my $test_template = <<'END';
-+#!/usr/bin/perl
-+
-+use Test::More tests => 1;
-+
-+is $ENV{HARNESS_PERL_SWITCHES}, '-w';
-+END
-+
-+open TEST, ">env_check_t.tmp";
-+print TEST $test_template;
-+close TEST;
-+
-+END { unlink 'env_check_t.tmp'; }
-+
-+{
-+    local $ENV{HARNESS_PERL_SWITCHES} = '-w';
-+    my ( $tot, $failed )
-+      = Test::Harness::execute_tests( tests => ['env_check_t.tmp'] );
-+    is $tot->{bad}, 0;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/compat/failure.t perl-5.10.0/ext/Test/Harness/t/compat/failure.t
---- perl-5.10.0.orig/ext/Test/Harness/t/compat/failure.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/compat/failure.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,66 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 5;
-+
-+use File::Spec;
-+use Test::Harness;
-+
-+{
-+
-+    #todo_skip 'Harness compatibility incomplete', 5;
-+    #local $TODO = 'Harness compatibility incomplete';
-+    my $died;
-+
-+    sub prepare_for_death {
-+        $died = 0;
-+        return sub { $died = 1 }
-+    }
-+
-+    my $sample_tests;
-+    if ( $ENV{PERL_CORE} ) {
-+        my $updir = File::Spec->updir;
-+        $sample_tests = File::Spec->catdir(
-+            $updir, 'ext', 'Test', 'Harness', 't',
-+            'sample-tests'
-+        );
-+    }
-+    else {
-+        my $curdir = File::Spec->curdir;
-+        $sample_tests = File::Spec->catdir( $curdir, 't', 'sample-tests' );
-+    }
-+
-+    {
-+        local $SIG{__DIE__} = prepare_for_death();
-+        eval { _runtests( File::Spec->catfile( $sample_tests, "simple" ) ); };
-+        ok( !$@, "simple lives" );
-+        is( $died, 0, "Death never happened" );
-+    }
-+
-+    {
-+        local $SIG{__DIE__} = prepare_for_death();
-+        eval {
-+            _runtests( File::Spec->catfile( $sample_tests, "too_many" ) );
-+        };
-+        ok( $@, "error OK" );
-+        ok( $@ =~ m[Failed 1/1], "too_many dies" );
-+        is( $died, 1, "Death happened" );
-+    }
-+}
-+
-+sub _runtests {
-+    my (@tests) = @_;
-+
-+    local $ENV{PERL_TEST_HARNESS_DUMP_TAP} = 0;
-+    local $ENV{HARNESS_VERBOSE}            = 0;
-+    local $ENV{HARNESS_DEBUG}              = 0;
-+    local $ENV{HARNESS_TIMER}              = 0;
-+
-+    local $Test::Harness::Verbose = -9;
-+
-+    runtests(@tests);
-+}
-+
-+# vim:ts=4:sw=4:et:sta
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/compat/inc-propagation.t perl-5.10.0/ext/Test/Harness/t/compat/inc-propagation.t
---- perl-5.10.0.orig/ext/Test/Harness/t/compat/inc-propagation.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/compat/inc-propagation.t	2009-03-10 17:38:43.000000000 +0100
-@@ -0,0 +1,57 @@
-+#!/usr/bin/perl -w
-+
-+# Test that @INC is propogated from the harness process to the test
-+# process.
-+
-+use strict;
-+use lib 't/lib';
-+use Config;
-+
-+local
-+  $ENV{PERL5OPT};   # avoid any user-provided PERL5OPT from contaminating @INC
-+
-+sub has_crazy_patch {
-+    my $sentinel = 'blirpzoffle';
-+    local $ENV{PERL5LIB} = $sentinel;
-+    my $command = join ' ',
-+      map {qq{"$_"}} ( $^X, '-e', 'print join q(:), @INC' );
-+    my $path = `$command`;
-+    my @got = ( $path =~ /($sentinel)/g );
-+    return @got > 1;
-+}
-+
-+use Test::More (
-+      $^O eq 'VMS' ? ( skip_all => 'VMS' )
-+    : has_crazy_patch() ? ( skip_all => 'Incompatible @INC patch' )
-+    : ( tests => 2 )
-+);
-+
-+use Test::Harness;
-+
-+# Change @INC so we ensure it's preserved.
-+use lib 'wibble';
-+
-+my $test_template = <<'END';
-+#!/usr/bin/perl %s
-+
-+use Test::More tests => 2;
-+
-+is $INC[0], "wibble", 'basic order of @INC preserved' or diag "\@INC: @INC";
-+like $ENV{PERL5LIB}, qr{wibble};
-+
-+END
-+
-+open TEST, ">inc_check.t.tmp";
-+printf TEST $test_template, '';
-+close TEST;
-+
-+open TEST, ">inc_check_taint.t.tmp";
-+printf TEST $test_template, '-T';
-+close TEST;
-+END { 1 while unlink 'inc_check_taint.t.tmp', 'inc_check.t.tmp'; }
-+
-+for my $test ( 'inc_check_taint.t.tmp', 'inc_check.t.tmp' ) {
-+    my ( $tot, $failed ) = Test::Harness::execute_tests( tests => [$test] );
-+    is $tot->{bad}, 0;
-+}
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/compat/inc_taint.t perl-5.10.0/ext/Test/Harness/t/compat/inc_taint.t
---- perl-5.10.0.orig/ext/Test/Harness/t/compat/inc_taint.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/compat/inc_taint.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,45 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
-+    }
-+    else {
-+        use lib 't/lib';
-+    }
-+}
-+
-+use strict;
-+
-+use Test::More tests => 1;
-+
-+use Dev::Null;
-+
-+use Test::Harness;
-+
-+sub _all_ok {
-+    my ($tot) = shift;
-+    return $tot->{bad} == 0
-+      && ( $tot->{max} || $tot->{skipped} ) ? 1 : 0;
-+}
-+
-+{
-+    local $ENV{PERL_TEST_HARNESS_DUMP_TAP} = 0;
-+    local $Test::Harness::Verbose = -9;
-+
-+    push @INC, 'examples';
-+
-+    tie *NULL, 'Dev::Null' or die $!;
-+    select NULL;
-+    my ( $tot, $failed ) = Test::Harness::execute_tests(
-+        tests => [
-+            $ENV{PERL_CORE}
-+            ? '../ext/Test/Harness/t/sample-tests/inc_taint'
-+            : 't/sample-tests/inc_taint'
-+        ]
-+    );
-+    select STDOUT;
-+
-+    ok( _all_ok($tot), 'tests with taint on preserve @INC' );
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/compat/nonumbers.t perl-5.10.0/ext/Test/Harness/t/compat/nonumbers.t
---- perl-5.10.0.orig/ext/Test/Harness/t/compat/nonumbers.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/compat/nonumbers.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,14 @@
-+if ( $ENV{PERL_CORE} && !$ENV{HARNESS_ACTIVE} ) {
-+    print "1..0 # Skip: t/TEST needs numbers\n";
-+    exit;
-+}
-+
-+print <<END;
-+1..6
-+ok
-+ok
-+ok
-+ok
-+ok
-+ok
-+END
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/compat/regression.t perl-5.10.0/ext/Test/Harness/t/compat/regression.t
---- perl-5.10.0.orig/ext/Test/Harness/t/compat/regression.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/compat/regression.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,19 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 1;
-+use Test::Harness;
-+
-+# 28567
-+my ( @before, @after );
-+{
-+    local @INC;
-+    unshift @INC, 'wibble';
-+    @before = Test::Harness::_filtered_inc();
-+    unshift @INC, sub {die};
-+    @after = Test::Harness::_filtered_inc();
-+}
-+
-+is_deeply \@after, \@before, 'subref removed from @INC';
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/compat/test-harness-compat.t perl-5.10.0/ext/Test/Harness/t/compat/test-harness-compat.t
---- perl-5.10.0.orig/ext/Test/Harness/t/compat/test-harness-compat.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/compat/test-harness-compat.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,858 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = '../lib';
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+
-+# use lib 't/lib';
-+
-+use Test::More;
-+use File::Spec;
-+use Test::Harness qw(execute_tests);
-+
-+# unset this global when self-testing ('testcover' and etc issue)
-+local $ENV{HARNESS_PERL_SWITCHES};
-+
-+my $TEST_DIR
-+  = $ENV{PERL_CORE} ? '../ext/Test/Harness/t/sample-tests' : 't/sample-tests';
-+
-+{
-+
-+    # if the harness wants to save the resulting TAP we shouldn't
-+    # do it for our internal calls
-+    local $ENV{PERL_TEST_HARNESS_DUMP_TAP} = 0;
-+
-+    my $PER_LOOP = 4;
-+
-+    my $results = {
-+        'descriptive' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 5,
-+                'ok'          => 5,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        join(
-+            ',', qw(
-+              descriptive die die_head_end die_last_minute duplicates
-+              head_end head_fail inc_taint junk_before_plan lone_not_bug
-+              no_nums no_output schwern sequence_misparse shbang_misparse
-+              simple simple_fail skip skip_nomsg skipall skipall_nomsg
-+              stdout_stderr taint todo_inline
-+              todo_misparse too_many vms_nit
-+              )
-+          ) => {
-+            'failed' => {
-+                "$TEST_DIR/die" => {
-+                    'canon'  => '??',
-+                    'estat'  => 1,
-+                    'failed' => '??',
-+                    'max'    => '??',
-+                    'name'   => "$TEST_DIR/die",
-+                    'wstat'  => '256'
-+                },
-+                "$TEST_DIR/die_head_end" => {
-+                    'canon'  => '??',
-+                    'estat'  => 1,
-+                    'failed' => '??',
-+                    'max'    => '??',
-+                    'name'   => "$TEST_DIR/die_head_end",
-+                    'wstat'  => '256'
-+                },
-+                "$TEST_DIR/die_last_minute" => {
-+                    'canon'  => '??',
-+                    'estat'  => 1,
-+                    'failed' => 0,
-+                    'max'    => 4,
-+                    'name'   => "$TEST_DIR/die_last_minute",
-+                    'wstat'  => '256'
-+                },
-+                "$TEST_DIR/duplicates" => {
-+                    'canon'  => '??',
-+                    'estat'  => '',
-+                    'failed' => '??',
-+                    'max'    => 10,
-+                    'name'   => "$TEST_DIR/duplicates",
-+                    'wstat'  => ''
-+                },
-+                "$TEST_DIR/head_fail" => {
-+                    'canon'  => 2,
-+                    'estat'  => '',
-+                    'failed' => 1,
-+                    'max'    => 4,
-+                    'name'   => "$TEST_DIR/head_fail",
-+                    'wstat'  => ''
-+                },
-+                "$TEST_DIR/inc_taint" => {
-+                    'canon'  => 1,
-+                    'estat'  => 1,
-+                    'failed' => 1,
-+                    'max'    => 1,
-+                    'name'   => "$TEST_DIR/inc_taint",
-+                    'wstat'  => '256'
-+                },
-+                "$TEST_DIR/no_nums" => {
-+                    'canon'  => 3,
-+                    'estat'  => '',
-+                    'failed' => 1,
-+                    'max'    => 5,
-+                    'name'   => "$TEST_DIR/no_nums",
-+                    'wstat'  => ''
-+                },
-+                "$TEST_DIR/no_output" => {
-+                    'canon'  => '??',
-+                    'estat'  => '',
-+                    'failed' => '??',
-+                    'max'    => '??',
-+                    'name'   => "$TEST_DIR/no_output",
-+                    'wstat'  => ''
-+                },
-+                "$TEST_DIR/simple_fail" => {
-+                    'canon'  => '2 5',
-+                    'estat'  => '',
-+                    'failed' => 2,
-+                    'max'    => 5,
-+                    'name'   => "$TEST_DIR/simple_fail",
-+                    'wstat'  => ''
-+                },
-+                "$TEST_DIR/todo_misparse" => {
-+                    'canon'  => 1,
-+                    'estat'  => '',
-+                    'failed' => 1,
-+                    'max'    => 1,
-+                    'name'   => "$TEST_DIR/todo_misparse",
-+                    'wstat'  => ''
-+                },
-+                "$TEST_DIR/too_many" => {
-+                    'canon'  => '4-7',
-+                    'estat'  => 4,
-+                    'failed' => 4,
-+                    'max'    => 3,
-+                    'name'   => "$TEST_DIR/too_many",
-+                    'wstat'  => '1024'
-+                },
-+                "$TEST_DIR/vms_nit" => {
-+                    'canon'  => 1,
-+                    'estat'  => '',
-+                    'failed' => 1,
-+                    'max'    => 2,
-+                    'name'   => "$TEST_DIR/vms_nit",
-+                    'wstat'  => ''
-+                }
-+            },
-+            'todo' => {
-+                "$TEST_DIR/todo_inline" => {
-+                    'canon'  => 2,
-+                    'estat'  => '',
-+                    'failed' => 1,
-+                    'max'    => 2,
-+                    'name'   => "$TEST_DIR/todo_inline",
-+                    'wstat'  => ''
-+                }
-+            },
-+            'totals' => {
-+                'bad'         => 12,
-+                'bonus'       => 1,
-+                'files'       => 27,
-+                'good'        => 15,
-+                'max'         => 76,
-+                'ok'          => 78,
-+                'skipped'     => 2,
-+                'sub_skipped' => 2,
-+                'tests'       => 27,
-+                'todo'        => 2
-+            }
-+          },
-+        'die' => {
-+            'failed' => {
-+                "$TEST_DIR/die" => {
-+                    'canon'  => '??',
-+                    'estat'  => 1,
-+                    'failed' => '??',
-+                    'max'    => '??',
-+                    'name'   => "$TEST_DIR/die",
-+                    'wstat'  => '256'
-+                }
-+            },
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 1,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 0,
-+                'max'         => 0,
-+                'ok'          => 0,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'die_head_end' => {
-+            'failed' => {
-+                "$TEST_DIR/die_head_end" => {
-+                    'canon'  => '??',
-+                    'estat'  => 1,
-+                    'failed' => '??',
-+                    'max'    => '??',
-+                    'name'   => "$TEST_DIR/die_head_end",
-+                    'wstat'  => '256'
-+                }
-+            },
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 1,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 0,
-+                'max'         => 0,
-+                'ok'          => 4,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'die_last_minute' => {
-+            'failed' => {
-+                "$TEST_DIR/die_last_minute" => {
-+                    'canon'  => '??',
-+                    'estat'  => 1,
-+                    'failed' => 0,
-+                    'max'    => 4,
-+                    'name'   => "$TEST_DIR/die_last_minute",
-+                    'wstat'  => '256'
-+                }
-+            },
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 1,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 0,
-+                'max'         => 4,
-+                'ok'          => 4,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'duplicates' => {
-+            'failed' => {
-+                "$TEST_DIR/duplicates" => {
-+                    'canon'  => '??',
-+                    'estat'  => '',
-+                    'failed' => '??',
-+                    'max'    => 10,
-+                    'name'   => "$TEST_DIR/duplicates",
-+                    'wstat'  => ''
-+                }
-+            },
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 1,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 0,
-+                'max'         => 10,
-+                'ok'          => 11,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'head_end' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 4,
-+                'ok'          => 4,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'head_fail' => {
-+            'failed' => {
-+                "$TEST_DIR/head_fail" => {
-+                    'canon'  => 2,
-+                    'estat'  => '',
-+                    'failed' => 1,
-+                    'max'    => 4,
-+                    'name'   => "$TEST_DIR/head_fail",
-+                    'wstat'  => ''
-+                }
-+            },
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 1,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 0,
-+                'max'         => 4,
-+                'ok'          => 3,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'inc_taint' => {
-+            'failed' => {
-+                "$TEST_DIR/inc_taint" => {
-+                    'canon'  => 1,
-+                    'estat'  => 1,
-+                    'failed' => 1,
-+                    'max'    => 1,
-+                    'name'   => "$TEST_DIR/inc_taint",
-+                    'wstat'  => '256'
-+                }
-+            },
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 1,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 0,
-+                'max'         => 1,
-+                'ok'          => 0,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'junk_before_plan' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 1,
-+                'ok'          => 1,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'lone_not_bug' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 4,
-+                'ok'          => 4,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'no_nums' => {
-+            'failed' => {
-+                "$TEST_DIR/no_nums" => {
-+                    'canon'  => 3,
-+                    'estat'  => '',
-+                    'failed' => 1,
-+                    'max'    => 5,
-+                    'name'   => "$TEST_DIR/no_nums",
-+                    'wstat'  => ''
-+                }
-+            },
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 1,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 0,
-+                'max'         => 5,
-+                'ok'          => 4,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'no_output' => {
-+            'failed' => {
-+                "$TEST_DIR/no_output" => {
-+                    'canon'  => '??',
-+                    'estat'  => '',
-+                    'failed' => '??',
-+                    'max'    => '??',
-+                    'name'   => "$TEST_DIR/no_output",
-+                    'wstat'  => ''
-+                }
-+            },
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 1,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 0,
-+                'max'         => 0,
-+                'ok'          => 0,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'schwern' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 1,
-+                'ok'          => 1,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'sequence_misparse' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 5,
-+                'ok'          => 5,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'shbang_misparse' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 2,
-+                'ok'          => 2,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'simple' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 5,
-+                'ok'          => 5,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'simple_fail' => {
-+            'failed' => {
-+                "$TEST_DIR/simple_fail" => {
-+                    'canon'  => '2 5',
-+                    'estat'  => '',
-+                    'failed' => 2,
-+                    'max'    => 5,
-+                    'name'   => "$TEST_DIR/simple_fail",
-+                    'wstat'  => ''
-+                }
-+            },
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 1,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 0,
-+                'max'         => 5,
-+                'ok'          => 3,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'skip' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 5,
-+                'ok'          => 5,
-+                'skipped'     => 0,
-+                'sub_skipped' => 1,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'skip_nomsg' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 1,
-+                'ok'          => 1,
-+                'skipped'     => 0,
-+                'sub_skipped' => 1,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'skipall' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 0,
-+                'ok'          => 0,
-+                'skipped'     => 1,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'skipall_nomsg' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 0,
-+                'ok'          => 0,
-+                'skipped'     => 1,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'stdout_stderr' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 4,
-+                'ok'          => 4,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'switches' => {
-+            'skip_if' => sub {
-+                ( $ENV{PERL5OPT} || '' ) =~ m{(?:^|\s)-[dM]};
-+            },
-+            'failed' => {
-+                "$TEST_DIR/switches" => {
-+                    'canon'  => 1,
-+                    'estat'  => '',
-+                    'failed' => 1,
-+                    'max'    => 1,
-+                    'name'   => "$TEST_DIR/switches",
-+                    'wstat'  => ''
-+                }
-+            },
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 1,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 0,
-+                'max'         => 1,
-+                'ok'          => 0,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'taint' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 1,
-+                'ok'          => 1,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'taint_warn' => {
-+            'failed' => {},
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 1,
-+                'ok'          => 1,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            },
-+            'require' => 5.008001,
-+        },
-+        'todo_inline' => {
-+            'failed' => {},
-+            'todo'   => {
-+                "$TEST_DIR/todo_inline" => {
-+                    'canon'  => 2,
-+                    'estat'  => '',
-+                    'failed' => 1,
-+                    'max'    => 2,
-+                    'name'   => "$TEST_DIR/todo_inline",
-+                    'wstat'  => ''
-+                }
-+            },
-+            'totals' => {
-+                'bad'         => 0,
-+                'bonus'       => 1,
-+                'files'       => 1,
-+                'good'        => 1,
-+                'max'         => 3,
-+                'ok'          => 3,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 2
-+            }
-+        },
-+        'todo_misparse' => {
-+            'failed' => {
-+                "$TEST_DIR/todo_misparse" => {
-+                    'canon'  => 1,
-+                    'estat'  => '',
-+                    'failed' => 1,
-+                    'max'    => 1,
-+                    'name'   => "$TEST_DIR/todo_misparse",
-+                    'wstat'  => ''
-+                }
-+            },
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 1,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 0,
-+                'max'         => 1,
-+                'ok'          => 0,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'too_many' => {
-+            'failed' => {
-+                "$TEST_DIR/too_many" => {
-+                    'canon'  => '4-7',
-+                    'estat'  => 4,
-+                    'failed' => 4,
-+                    'max'    => 3,
-+                    'name'   => "$TEST_DIR/too_many",
-+                    'wstat'  => '1024'
-+                }
-+            },
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 1,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 0,
-+                'max'         => 3,
-+                'ok'          => 7,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        },
-+        'vms_nit' => {
-+            'failed' => {
-+                "$TEST_DIR/vms_nit" => {
-+                    'canon'  => 1,
-+                    'estat'  => '',
-+                    'failed' => 1,
-+                    'max'    => 2,
-+                    'name'   => "$TEST_DIR/vms_nit",
-+                    'wstat'  => ''
-+                }
-+            },
-+            'todo'   => {},
-+            'totals' => {
-+                'bad'         => 1,
-+                'bonus'       => 0,
-+                'files'       => 1,
-+                'good'        => 0,
-+                'max'         => 2,
-+                'ok'          => 1,
-+                'skipped'     => 0,
-+                'sub_skipped' => 0,
-+                'tests'       => 1,
-+                'todo'        => 0
-+            }
-+        }
-+    };
-+
-+    my $num_tests = ( keys %$results ) * $PER_LOOP;
-+
-+    plan tests => $num_tests;
-+
-+    sub local_name {
-+        my $name = shift;
-+        return File::Spec->catfile( split /\//, $name );
-+    }
-+
-+    sub local_result {
-+        my $hash = shift;
-+        my $new  = {};
-+
-+        while ( my ( $file, $want ) = each %$hash ) {
-+            if ( exists $want->{name} ) {
-+                $want->{name} = local_name( $want->{name} );
-+            }
-+            $new->{ local_name($file) } = $want;
-+        }
-+        return $new;
-+    }
-+
-+    sub vague_status {
-+        my $hash = shift;
-+        return $hash unless $^O eq 'VMS';
-+
-+        while ( my ( $file, $want ) = each %$hash ) {
-+            for (qw( estat wstat )) {
-+                if ( exists $want->{$_} ) {
-+                    $want->{$_} = $want->{$_} ? 1 : 0;
-+                }
-+            }
-+        }
-+        return $hash;
-+    }
-+
-+    {
-+        local $^W = 0;
-+
-+        # Silence harness output
-+        *TAP::Formatter::Console::_output = sub {
-+
-+            # do nothing
-+        };
-+    }
-+
-+    for my $test_key ( sort keys %$results ) {
-+        my $result = $results->{$test_key};
-+        SKIP: {
-+            if ( $result->{require} && $] < $result->{require} ) {
-+                skip "Test requires Perl $result->{require}, we have $]", 4;
-+            }
-+
-+            if ( my $skip_if = $result->{skip_if} ) {
-+                skip
-+                  "Test '$test_key' can't run properly in this environment", 4
-+                  if $skip_if->();
-+            }
-+
-+            my @test_names = split( /,/, $test_key );
-+            my @test_files
-+              = map { File::Spec->catfile( $TEST_DIR, $_ ) } @test_names;
-+
-+            # For now we supress STDERR because it crufts up /our/ test
-+            # results. Should probably capture and analyse it.
-+            local ( *OLDERR, *OLDOUT );
-+            open OLDERR, '>&STDERR' or die $!;
-+            open OLDOUT, '>&STDOUT' or die $!;
-+            my $devnull = File::Spec->devnull;
-+            open STDERR, ">$devnull" or die $!;
-+            open STDOUT, ">$devnull" or die $!;
-+
-+            my ( $tot, $fail, $todo, $harness, $aggregate )
-+              = execute_tests( tests => \@test_files );
-+
-+            open STDERR, '>&OLDERR' or die $!;
-+            open STDOUT, '>&OLDOUT' or die $!;
-+
-+            my $bench = delete $tot->{bench};
-+            isa_ok $bench, 'Benchmark';
-+
-+            # Localise filenames in failed, todo
-+            my $lfailed = vague_status( local_result( $result->{failed} ) );
-+            my $ltodo   = vague_status( local_result( $result->{todo} ) );
-+
-+            # use Data::Dumper;
-+            # diag Dumper( [ $lfailed, $ltodo ] );
-+
-+            is_deeply $tot, $result->{totals}, "totals match for $test_key";
-+            is_deeply vague_status($fail), $lfailed,
-+              "failure summary matches for $test_key";
-+            is_deeply vague_status($todo), $ltodo,
-+              "todo summary matches for $test_key";
-+        }
-+    }
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/compat/version.t perl-5.10.0/ext/Test/Harness/t/compat/version.t
---- perl-5.10.0.orig/ext/Test/Harness/t/compat/version.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/compat/version.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,11 @@
-+#!/usr/bin/perl -Tw
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 2;
-+use Test::Harness;
-+
-+my $ver = $ENV{HARNESS_VERSION} or die "HARNESS_VERSION not set";
-+ok( $ver =~ /^[23].\d\d(_\d\d)?$/, "Version is proper format" );
-+is( $ver, $Test::Harness::VERSION );
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/console.t perl-5.10.0/ext/Test/Harness/t/console.t
---- perl-5.10.0.orig/ext/Test/Harness/t/console.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/console.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,47 @@
-+use strict;
-+use lib 't/lib';
-+use Test::More;
-+use TAP::Formatter::Console;
-+
-+my @schedule;
-+
-+BEGIN {
-+    @schedule = (
-+        {   method => '_range',
-+            in     => sub {qw/2 7 1 3 10 9/},
-+            out    => sub {qw/1-3 7 9-10/},
-+            name   => '... and it should return numbers as ranges'
-+        },
-+        {   method => '_balanced_range',
-+            in     => sub { 7, qw/2 7 1 3 10 9/ },
-+            out    => sub { '1-3, 7', '9-10' },
-+            name   => '... and it should return numbers as ranges'
-+        },
-+    );
-+
-+    plan tests => @schedule * 3;
-+}
-+
-+for my $test (@schedule) {
-+    my $name = $test->{name};
-+    my $cons = TAP::Formatter::Console->new;
-+    isa_ok $cons, 'TAP::Formatter::Console';
-+    my $method = $test->{method};
-+    can_ok $cons, $method;
-+    is_deeply [ $cons->$method( $test->{in}->() ) ], [ $test->{out}->() ],
-+      $name;
-+}
-+
-+#### Color tests ####
-+
-+package Colorizer;
-+
-+sub new { bless {}, shift }
-+sub can_color {1}
-+
-+sub set_color {
-+    my ( $self, $output, $color ) = @_;
-+    $output->("[[$color]]");
-+}
-+
-+package main;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/data/catme.1 perl-5.10.0/ext/Test/Harness/t/data/catme.1
---- perl-5.10.0.orig/ext/Test/Harness/t/data/catme.1	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/data/catme.1	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,2 @@
-+1..1
-+ok 1
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/data/proverc perl-5.10.0/ext/Test/Harness/t/data/proverc
---- perl-5.10.0.orig/ext/Test/Harness/t/data/proverc	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/data/proverc	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,7 @@
-+--should be --split correctly # No comment!
-+Can "quote things" 'using single or' "double quotes"
-+
-+# More stuff
-+--this
-+is
-+'OK?'
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/data/sample.yml perl-5.10.0/ext/Test/Harness/t/data/sample.yml
---- perl-5.10.0.orig/ext/Test/Harness/t/data/sample.yml	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/data/sample.yml	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,29 @@
-+---
-+invoice: 34843
-+date   : 2001-01-23
-+bill-to:
-+    given  : Chris
-+    family : Dumars
-+    address:
-+        lines: |
-+            458 Walkman Dr.
-+            Suite #292
-+        city    : Royal Oak
-+        state   : MI
-+        postal  : 48046
-+product:
-+    - sku         : BL394D
-+      quantity    : 4
-+      description : Basketball
-+      price       : 450.00
-+    - sku         : BL4438H
-+      quantity    : 1
-+      description : Super Hoop
-+      price       : 2392.00
-+tax  : 251.42
-+total: 4443.52
-+comments: >
-+    Late afternoon is best.
-+    Backup contact is Nancy
-+    Billsmer @ 338-4338
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/errors.t perl-5.10.0/ext/Test/Harness/t/errors.t
---- perl-5.10.0.orig/ext/Test/Harness/t/errors.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/errors.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,183 @@
-+#!/usr/bin/perl -wT
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 23;
-+
-+use TAP::Parser;
-+
-+my $plan_line = 'TAP::Parser::Result::Plan';
-+my $test_line = 'TAP::Parser::Result::Test';
-+
-+sub _parser {
-+    my $parser = TAP::Parser->new( { tap => shift } );
-+    $parser->run;
-+    return $parser;
-+}
-+
-+# validate that plan!
-+
-+my $parser = _parser(<<'END_TAP');
-+ok 1 - input file opened
-+not ok 2 - first line of the input valid # todo some data
-+ok 3 - read the rest of the file
-+1..3
-+# comments are allowed after an ending plan
-+END_TAP
-+
-+can_ok $parser, 'parse_errors';
-+ok !$parser->parse_errors,
-+  '... comments should be allowed after a terminating plan';
-+
-+$parser = _parser(<<'END_TAP');
-+ok 1 - input file opened
-+not ok 2 - first line of the input valid # todo some data
-+ok 3 - read the rest of the file
-+1..3
-+# yeah, yeah, I know.
-+ok
-+END_TAP
-+
-+can_ok $parser, 'parse_errors';
-+is scalar $parser->parse_errors, 2, '... and we should have two parse errors';
-+
-+is [ $parser->parse_errors ]->[0],
-+  'Plan (1..3) must be at the beginning or end of the TAP output',
-+  '... telling us that our plan was misplaced';
-+is [ $parser->parse_errors ]->[1],
-+  'Bad plan.  You planned 3 tests but ran 4.',
-+  '... and telling us we ran the wrong number of tests.';
-+
-+$parser = _parser(<<'END_TAP');
-+ok 1 - input file opened
-+not ok 2 - first line of the input valid # todo some data
-+ok 3 - read the rest of the file
-+#1..3
-+# yo quiero tests!
-+1..3
-+END_TAP
-+ok !$parser->parse_errors, '... but test plan-like data can be in a comment';
-+
-+$parser = _parser(<<'END_TAP');
-+ok 1 - input file opened
-+not ok 2 - first line of the input valid # todo some data
-+ok 3 - read the rest of the file 1..5
-+# yo quiero tests!
-+1..3
-+END_TAP
-+ok !$parser->parse_errors, '... or a description';
-+
-+$parser = _parser(<<'END_TAP');
-+ok 1 - input file opened
-+not ok 2 - first line of the input valid # todo 1..4
-+ok 3 - read the rest of the file
-+# yo quiero tests!
-+1..3
-+END_TAP
-+ok !$parser->parse_errors, '... or a directive';
-+
-+# test numbers included?
-+
-+$parser = _parser(<<'END_TAP');
-+1..3
-+ok 1 - input file opened
-+not ok 2 - first line of the input valid # todo some data
-+ok read the rest of the file
-+# this is ...
-+END_TAP
-+eval { $parser->run };
-+ok !$@, 'We can mix and match the presence of test numbers';
-+
-+$parser = _parser(<<'END_TAP');
-+1..3
-+ok 1 - input file opened
-+not ok 2 - first line of the input valid # todo some data
-+ok 2 read the rest of the file
-+END_TAP
-+
-+is + ( $parser->parse_errors )[0],
-+  'Tests out of sequence.  Found (2) but expected (3)',
-+  '... and if the numbers are there, they cannot be out of sequence';
-+
-+$parser = _parser(<<'END_TAP');
-+ok 1 - input file opened
-+not ok 2 - first line of the input valid # todo some data
-+ok 2 read the rest of the file
-+END_TAP
-+
-+is $parser->parse_errors, 2,
-+  'Having two errors in the TAP should result in two errors (duh)';
-+my $expected = [
-+    'Tests out of sequence.  Found (2) but expected (3)',
-+    'No plan found in TAP output'
-+];
-+is_deeply [ $parser->parse_errors ], $expected,
-+  '... and they should be the correct errors';
-+
-+$parser = _parser(<<'END_TAP');
-+ok 1 - input file opened
-+not ok 2 - first line of the input valid # todo some data
-+ok 3 read the rest of the file
-+END_TAP
-+
-+is $parser->parse_errors, 1, 'Having no plan should cause an error';
-+is + ( $parser->parse_errors )[0], 'No plan found in TAP output',
-+  '... with a correct error message';
-+
-+$parser = _parser(<<'END_TAP');
-+1..3
-+ok 1 - input file opened
-+not ok 2 - first line of the input valid # todo some data
-+ok 3 read the rest of the file
-+1..3
-+END_TAP
-+
-+is $parser->parse_errors, 1,
-+  'Having more than one plan should cause an error';
-+is + ( $parser->parse_errors )[0], 'More than one plan found in TAP output',
-+  '... with a correct error message';
-+
-+can_ok $parser, 'is_good_plan';
-+$parser = _parser(<<'END_TAP');
-+1..2
-+ok 1 - input file opened
-+not ok 2 - first line of the input valid # todo some data
-+ok 3 read the rest of the file
-+END_TAP
-+
-+is $parser->parse_errors, 1,
-+  'Having the wrong number of planned tests is a parse error';
-+is + ( $parser->parse_errors )[0],
-+  'Bad plan.  You planned 2 tests but ran 3.',
-+  '... with a correct error message';
-+
-+# XXX internals:  plan will not set to true if defined
-+$parser->is_good_plan(undef);
-+$parser = _parser(<<'END_TAP');
-+ok 1 - input file opened
-+1..1
-+END_TAP
-+
-+ok $parser->is_good_plan,
-+  '... and it should return true if the plan is correct';
-+
-+# TAP::Parser coverage tests
-+{
-+
-+    # good_plan coverage
-+
-+    my @warn;
-+
-+    eval {
-+        local $SIG{__WARN__} = sub { push @warn, @_ };
-+
-+        $parser->good_plan;
-+    };
-+
-+    is @warn, 1, 'coverage testing of good_plan';
-+
-+    like pop @warn,
-+      qr/good_plan[(][)] is deprecated.  Please use "is_good_plan[(][)]"/,
-+      '...and it fell-back like we expected';
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/file.t perl-5.10.0/ext/Test/Harness/t/file.t
---- perl-5.10.0.orig/ext/Test/Harness/t/file.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/file.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,402 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+
-+use Test::More;
-+
-+use TAP::Harness;
-+
-+my $HARNESS = 'TAP::Harness';
-+
-+my $source_tests
-+  = $ENV{PERL_CORE} ? '../ext/Test/Harness/t/source_tests' : 't/source_tests';
-+my $sample_tests
-+  = $ENV{PERL_CORE} ? '../ext/Test/Harness/t/sample-tests' : 't/sample-tests';
-+
-+plan tests => 41;
-+
-+# note that this test will always pass when run through 'prove'
-+ok $ENV{HARNESS_ACTIVE},  'HARNESS_ACTIVE env variable should be set';
-+ok $ENV{HARNESS_VERSION}, 'HARNESS_VERSION env variable should be set';
-+
-+{
-+    my @output;
-+    local $^W;
-+    require TAP::Formatter::Base;
-+    local *TAP::Formatter::Base::_output = sub {
-+        my $self = shift;
-+        push @output => grep { $_ ne '' }
-+          map {
-+            local $_ = $_;
-+            chomp;
-+            trim($_)
-+          } map { split /\n/ } @_;
-+    };
-+    my $harness            = TAP::Harness->new( { verbosity  => 1 } );
-+    my $harness_whisper    = TAP::Harness->new( { verbosity  => -1 } );
-+    my $harness_mute       = TAP::Harness->new( { verbosity  => -2 } );
-+    my $harness_directives = TAP::Harness->new( { directives => 1 } );
-+    my $harness_failures   = TAP::Harness->new( { failures   => 1 } );
-+
-+    can_ok $harness, 'runtests';
-+
-+    # normal tests in verbose mode
-+
-+    ok my $aggregate = _runtests( $harness, "$source_tests/harness" ),
-+      '... runtests returns the aggregate';
-+
-+    isa_ok $aggregate, 'TAP::Parser::Aggregator';
-+
-+    chomp(@output);
-+
-+    my @expected = (
-+        "$source_tests/harness ..",
-+        '1..1',
-+        'ok 1 - this is a test',
-+        'ok',
-+        'All tests successful.',
-+    );
-+    my $status           = pop @output;
-+    my $expected_status  = qr{^Result: PASS$};
-+    my $summary          = pop @output;
-+    my $expected_summary = qr{^Files=1, Tests=1,  \d+ wallclock secs};
-+
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+    like $status, $expected_status,
-+      '... and the status line should be correct';
-+    like $summary, $expected_summary,
-+      '... and the report summary should look correct';
-+
-+    # use an alias for test name
-+
-+    @output = ();
-+    ok $aggregate
-+      = _runtests( $harness, [ "$source_tests/harness", 'My Nice Test' ] ),
-+      '... runtests returns the aggregate';
-+
-+    isa_ok $aggregate, 'TAP::Parser::Aggregator';
-+
-+    chomp(@output);
-+
-+    @expected = (
-+        'My Nice Test ..',
-+        '1..1',
-+        'ok 1 - this is a test',
-+        'ok',
-+        'All tests successful.',
-+    );
-+    $status           = pop @output;
-+    $expected_status  = qr{^Result: PASS$};
-+    $summary          = pop @output;
-+    $expected_summary = qr{^Files=1, Tests=1,  \d+ wallclock secs};
-+
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+    like $status, $expected_status,
-+      '... and the status line should be correct';
-+    like $summary, $expected_summary,
-+      '... and the report summary should look correct';
-+
-+    # run same test twice
-+
-+    @output = ();
-+    ok $aggregate = _runtests(
-+        $harness, [ "$source_tests/harness", 'My Nice Test' ],
-+        [ "$source_tests/harness", 'My Nice Test Again' ]
-+      ),
-+      '... runtests returns the aggregate';
-+
-+    isa_ok $aggregate, 'TAP::Parser::Aggregator';
-+
-+    chomp(@output);
-+
-+    @expected = (
-+        'My Nice Test ........',
-+        '1..1',
-+        'ok 1 - this is a test',
-+        'ok',
-+        'My Nice Test Again ..',
-+        '1..1',
-+        'ok 1 - this is a test',
-+        'ok',
-+        'All tests successful.',
-+    );
-+    $status           = pop @output;
-+    $expected_status  = qr{^Result: PASS$};
-+    $summary          = pop @output;
-+    $expected_summary = qr{^Files=2, Tests=2,  \d+ wallclock secs};
-+
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+    like $status, $expected_status,
-+      '... and the status line should be correct';
-+    like $summary, $expected_summary,
-+      '... and the report summary should look correct';
-+
-+    # normal tests in quiet mode
-+
-+    @output = ();
-+    _runtests( $harness_whisper, "$source_tests/harness" );
-+
-+    chomp(@output);
-+    @expected = (
-+        "$source_tests/harness .. ok",
-+        'All tests successful.',
-+    );
-+
-+    $status           = pop @output;
-+    $expected_status  = qr{^Result: PASS$};
-+    $summary          = pop @output;
-+    $expected_summary = qr/^Files=1, Tests=1,  \d+ wallclock secs/;
-+
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+    like $status, $expected_status,
-+      '... and the status line should be correct';
-+    like $summary, $expected_summary,
-+      '... and the report summary should look correct';
-+
-+    # normal tests in really_quiet mode
-+
-+    @output = ();
-+    _runtests( $harness_mute, "$source_tests/harness" );
-+
-+    chomp(@output);
-+    @expected = (
-+        'All tests successful.',
-+    );
-+
-+    $status           = pop @output;
-+    $expected_status  = qr{^Result: PASS$};
-+    $summary          = pop @output;
-+    $expected_summary = qr/^Files=1, Tests=1,  \d+ wallclock secs/;
-+
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+    like $status, $expected_status,
-+      '... and the status line should be correct';
-+    like $summary, $expected_summary,
-+      '... and the report summary should look correct';
-+
-+    # normal tests with failures
-+
-+    @output = ();
-+    _runtests( $harness, "$source_tests/harness_failure" );
-+
-+    $status  = pop @output;
-+    $summary = pop @output;
-+
-+    like $status, qr{^Result: FAIL$},
-+      '... and the status line should be correct';
-+
-+    my @summary = @output[ 5 .. $#output ];
-+    @output = @output[ 0 .. 4 ];
-+
-+    @expected = (
-+        "$source_tests/harness_failure ..",
-+        '1..2',
-+        'ok 1 - this is a test',
-+        'not ok 2 - this is another test',
-+        'Failed 1/2 subtests',
-+    );
-+
-+    is_deeply \@output, \@expected,
-+      '... and failing test output should be correct';
-+
-+    my @expected_summary = (
-+        'Test Summary Report',
-+        '-------------------',
-+        "$source_tests/harness_failure (Wstat: 0 Tests: 2 Failed: 1)",
-+        'Failed test:',
-+        '2',
-+    );
-+
-+    is_deeply \@summary, \@expected_summary,
-+      '... and the failure summary should also be correct';
-+
-+    # quiet tests with failures
-+
-+    @output = ();
-+    _runtests( $harness_whisper, "$source_tests/harness_failure" );
-+
-+    $status   = pop @output;
-+    $summary  = pop @output;
-+    @expected = (
-+        "$source_tests/harness_failure ..",
-+        'Failed 1/2 subtests',
-+        'Test Summary Report',
-+        '-------------------',
-+        "$source_tests/harness_failure (Wstat: 0 Tests: 2 Failed: 1)",
-+        'Failed test:',
-+        '2',
-+    );
-+
-+    like $status, qr{^Result: FAIL$},
-+      '... and the status line should be correct';
-+
-+    is_deeply \@output, \@expected,
-+      '... and failing test output should be correct';
-+
-+    # really quiet tests with failures
-+
-+    @output = ();
-+    _runtests( $harness_mute, "$source_tests/harness_failure" );
-+
-+    $status   = pop @output;
-+    $summary  = pop @output;
-+    @expected = (
-+        'Test Summary Report',
-+        '-------------------',
-+        "$source_tests/harness_failure (Wstat: 0 Tests: 2 Failed: 1)",
-+        'Failed test:',
-+        '2',
-+    );
-+
-+    like $status, qr{^Result: FAIL$},
-+      '... and the status line should be correct';
-+
-+    is_deeply \@output, \@expected,
-+      '... and failing test output should be correct';
-+
-+    # only show directives
-+
-+    @output = ();
-+    _runtests(
-+        $harness_directives,
-+        "$source_tests/harness_directives"
-+    );
-+
-+    chomp(@output);
-+
-+    @expected = (
-+        "$source_tests/harness_directives ..",
-+        'not ok 2 - we have a something # TODO some output',
-+        "ok 3 houston, we don't have liftoff # SKIP no funding",
-+        'ok',
-+        'All tests successful.',
-+
-+        # ~TODO {{{ this should be an option
-+        #'Test Summary Report',
-+        #'-------------------',
-+        #"$source_tests/harness_directives (Wstat: 0 Tests: 3 Failed: 0)",
-+        #'Tests skipped:',
-+        #'3',
-+        # }}}
-+    );
-+
-+    $status           = pop @output;
-+    $summary          = pop @output;
-+    $expected_summary = qr/^Files=1, Tests=3,  \d+ wallclock secs/;
-+
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+    like $summary, $expected_summary,
-+      '... and the report summary should look correct';
-+
-+    like $status, qr{^Result: PASS$},
-+      '... and the status line should be correct';
-+
-+    # normal tests with bad tap
-+
-+    @output = ();
-+    _runtests( $harness, "$source_tests/harness_badtap" );
-+    chomp(@output);
-+
-+    @output   = map { trim($_) } @output;
-+    $status   = pop @output;
-+    @summary  = @output[ 6 .. ( $#output - 1 ) ];
-+    @output   = @output[ 0 .. 5 ];
-+    @expected = (
-+        "$source_tests/harness_badtap ..",
-+        '1..2',
-+        'ok 1 - this is a test',
-+        'not ok 2 - this is another test',
-+        '1..2',
-+        'Failed 1/2 subtests',
-+    );
-+    is_deeply \@output, \@expected,
-+      '... and failing test output should be correct';
-+    like $status, qr{^Result: FAIL$},
-+      '... and the status line should be correct';
-+    @expected_summary = (
-+        'Test Summary Report',
-+        '-------------------',
-+        "$source_tests/harness_badtap (Wstat: 0 Tests: 2 Failed: 1)",
-+        'Failed test:',
-+        '2',
-+        'Parse errors: More than one plan found in TAP output',
-+    );
-+    is_deeply \@summary, \@expected_summary,
-+      '... and the badtap summary should also be correct';
-+
-+    # coverage testing for _should_show_failures
-+    # only show failures
-+
-+    @output = ();
-+    _runtests( $harness_failures, "$source_tests/harness_failure" );
-+
-+    chomp(@output);
-+
-+    @expected = (
-+        "$source_tests/harness_failure ..",
-+        'not ok 2 - this is another test',
-+        'Failed 1/2 subtests',
-+        'Test Summary Report',
-+        '-------------------',
-+        "$source_tests/harness_failure (Wstat: 0 Tests: 2 Failed: 1)",
-+        'Failed test:',
-+        '2',
-+    );
-+
-+    $status  = pop @output;
-+    $summary = pop @output;
-+
-+    like $status, qr{^Result: FAIL$},
-+      '... and the status line should be correct';
-+    $expected_summary = qr/^Files=1, Tests=2,  \d+ wallclock secs/;
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+
-+    # check the status output for no tests
-+
-+    @output = ();
-+    _runtests( $harness_failures, "$sample_tests/no_output" );
-+
-+    chomp(@output);
-+
-+    @expected = (
-+        "$sample_tests/no_output ..",
-+        'No subtests run',
-+        'Test Summary Report',
-+        '-------------------',
-+        "$sample_tests/no_output (Wstat: 0 Tests: 0 Failed: 0)",
-+        'Parse errors: No plan found in TAP output',
-+    );
-+
-+    $status  = pop @output;
-+    $summary = pop @output;
-+
-+    like $status, qr{^Result: FAIL$},
-+      '... and the status line should be correct';
-+    $expected_summary = qr/^Files=1, Tests=2,  \d+ wallclock secs/;
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+
-+    #XXXX
-+}
-+
-+sub trim {
-+    $_[0] =~ s/^\s+|\s+$//g;
-+    return $_[0];
-+}
-+
-+sub _runtests {
-+    my ( $harness, @tests ) = @_;
-+    local $ENV{PERL_TEST_HARNESS_DUMP_TAP} = 0;
-+    my $aggregate = $harness->runtests(@tests);
-+    return $aggregate;
-+}
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/glob-to-regexp.t perl-5.10.0/ext/Test/Harness/t/glob-to-regexp.t
---- perl-5.10.0.orig/ext/Test/Harness/t/glob-to-regexp.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/glob-to-regexp.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,44 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+
-+use Test::More;
-+
-+require TAP::Parser::Scheduler;
-+
-+my @tests;
-+while (<DATA>) {
-+    my ( $glob, $pattern, $name ) = /^(\S+)\t+(\S+)(?:\t+(.*))?$/;
-+    die "'$_'" unless $pattern;
-+    push @tests, [ $glob, $pattern, $name ];
-+}
-+
-+plan tests => scalar @tests;
-+
-+foreach (@tests) {
-+    my ( $glob, $pattern, $name ) = @$_;
-+    is( TAP::Parser::Scheduler->_glob_to_regexp($glob), $pattern,
-+        defined $name ? "$glob  -- $name" : $glob
-+    );
-+}
-+__DATA__
-+Pie			Pie
-+*.t			[^/]*\.t
-+**.t			.*?\.t
-+A?B			A[^/]B
-+*/*.t			[^/]*\/[^/]*\.t
-+A,B			A\,B				, outside {} not special
-+{A,B}			(?:A|B)
-+A{B}C			A(?:B)C
-+A{B,C}D			A(?:B|C)D
-+A{B,C,D}E{F,G,H}I,J	A(?:B|C|D)E(?:F|G|H)I\,J
-+{Perl,Rules}		(?:Perl|Rules)
-+A}B			A\}B				Bare } corner case
-+A{B,C}D}E		A(?:B|C)D\}E
-+},A{B,C}D},E		\}\,A(?:B|C)D\}\,E
-+{A{1,2},D{3,4}}		(?:A(?:1|2)|D(?:3|4))
-+{A,{B,C},D}		(?:A|(?:B|C)|D)
-+A{B,C\}D,E\,F}G		A(?:B|C\}D|E\,F)G
-+A\\B			A\\B
-+A(B)C			A\(B\)C
-+1{A(B)C,D|E}2		1(?:A\(B\)C|D\|E)2
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/grammar.t perl-5.10.0/ext/Test/Harness/t/grammar.t
---- perl-5.10.0.orig/ext/Test/Harness/t/grammar.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/grammar.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,461 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use Test::More tests => 94;
-+
-+use EmptyParser;
-+use TAP::Parser::Grammar;
-+use TAP::Parser::Iterator::Array;
-+
-+my $GRAMMAR = 'TAP::Parser::Grammar';
-+
-+# Array based stream that we can push items in to
-+package SS;
-+
-+sub new {
-+    my $class = shift;
-+    return bless [], $class;
-+}
-+
-+sub next {
-+    my $self = shift;
-+    return shift @$self;
-+}
-+
-+sub put {
-+    my $self = shift;
-+    unshift @$self, @_;
-+}
-+
-+sub handle_unicode { }
-+
-+package main;
-+
-+my $stream = SS->new;
-+my $parser = EmptyParser->new;
-+can_ok $GRAMMAR, 'new';
-+my $grammar = $GRAMMAR->new( { stream => $stream, parser => $parser } );
-+isa_ok $grammar, $GRAMMAR, '... and the object it returns';
-+
-+# Note:  all methods are actually class methods.  See the docs for the reason
-+# why.  We'll still use the instance because that should be forward
-+# compatible.
-+
-+my @V12 = sort qw(bailout comment plan simple_test test version);
-+my @V13 = sort ( @V12, 'pragma', 'yaml' );
-+
-+can_ok $grammar, 'token_types';
-+ok my @types = sort( $grammar->token_types ),
-+  '... and calling it should succeed (v12)';
-+is_deeply \@types, \@V12, '... and return the correct token types (v12)';
-+
-+$grammar->set_version(13);
-+ok @types = sort( $grammar->token_types ),
-+  '... and calling it should succeed (v13)';
-+is_deeply \@types, \@V13, '... and return the correct token types (v13)';
-+
-+can_ok $grammar, 'syntax_for';
-+can_ok $grammar, 'handler_for';
-+
-+my ( %syntax_for, %handler_for );
-+foreach my $type (@types) {
-+    ok $syntax_for{$type} = $grammar->syntax_for($type),
-+      '... and calling syntax_for() with a type name should succeed';
-+    cmp_ok ref $syntax_for{$type}, 'eq', 'Regexp',
-+      '... and it should return a regex';
-+
-+    ok $handler_for{$type} = $grammar->handler_for($type),
-+      '... and calling handler_for() with a type name should succeed';
-+    cmp_ok ref $handler_for{$type}, 'eq', 'CODE',
-+      '... and it should return a code reference';
-+}
-+
-+# Test the plan.  Gotta have a plan.
-+my $plan = '1..1';
-+like $plan, $syntax_for{'plan'}, 'A basic plan should match its syntax';
-+
-+my $method = $handler_for{'plan'};
-+$plan =~ $syntax_for{'plan'};
-+ok my $plan_token = $grammar->$method($plan),
-+  '... and the handler should return a token';
-+
-+my $expected = {
-+    'explanation'   => '',
-+    'directive'     => '',
-+    'type'          => 'plan',
-+    'tests_planned' => 1,
-+    'raw'           => '1..1',
-+    'todo_list'     => [],
-+};
-+is_deeply $plan_token, $expected,
-+  '... and it should contain the correct data';
-+
-+can_ok $grammar, 'tokenize';
-+$stream->put($plan);
-+ok my $token = $grammar->tokenize,
-+  '... and calling it with data should return a token';
-+is_deeply $token, $expected,
-+  '... and the token should contain the correct data';
-+
-+# a plan with a skip directive
-+
-+$plan = '1..0 # SKIP why not?';
-+like $plan, $syntax_for{'plan'}, 'a basic plan should match its syntax';
-+
-+$plan =~ $syntax_for{'plan'};
-+ok $plan_token = $grammar->$method($plan),
-+  '... and the handler should return a token';
-+
-+$expected = {
-+    'explanation'   => 'why not?',
-+    'directive'     => 'SKIP',
-+    'type'          => 'plan',
-+    'tests_planned' => 0,
-+    'raw'           => '1..0 # SKIP why not?',
-+    'todo_list'     => [],
-+};
-+is_deeply $plan_token, $expected,
-+  '... and it should contain the correct data';
-+
-+$stream->put($plan);
-+ok $token = $grammar->tokenize,
-+  '... and calling it with data should return a token';
-+is_deeply $token, $expected,
-+  '... and the token should contain the correct data';
-+
-+# implied skip
-+
-+$plan = '1..0';
-+like $plan, $syntax_for{'plan'},
-+  'A plan  with an implied "skip all" should match its syntax';
-+
-+$plan =~ $syntax_for{'plan'};
-+ok $plan_token = $grammar->$method($plan),
-+  '... and the handler should return a token';
-+
-+$expected = {
-+    'explanation'   => '',
-+    'directive'     => 'SKIP',
-+    'type'          => 'plan',
-+    'tests_planned' => 0,
-+    'raw'           => '1..0',
-+    'todo_list'     => [],
-+};
-+is_deeply $plan_token, $expected,
-+  '... and it should contain the correct data';
-+
-+$stream->put($plan);
-+ok $token = $grammar->tokenize,
-+  '... and calling it with data should return a token';
-+is_deeply $token, $expected,
-+  '... and the token should contain the correct data';
-+
-+# bad plan
-+
-+$plan = '1..0 # TODO 3,4,5';    # old syntax.  No longer supported
-+unlike $plan, $syntax_for{'plan'},
-+  'Bad plans should not match the plan syntax';
-+
-+# Bail out!
-+
-+my $bailout = 'Bail out!';
-+like $bailout, $syntax_for{'bailout'},
-+  'Bail out! should match a bailout syntax';
-+
-+$stream->put($bailout);
-+ok $token = $grammar->tokenize,
-+  '... and calling it with data should return a token';
-+$expected = {
-+    'bailout' => '',
-+    'type'    => 'bailout',
-+    'raw'     => 'Bail out!'
-+};
-+is_deeply $token, $expected,
-+  '... and the token should contain the correct data';
-+
-+$bailout = 'Bail out! some explanation';
-+like $bailout, $syntax_for{'bailout'},
-+  'Bail out! should match a bailout syntax';
-+
-+$stream->put($bailout);
-+ok $token = $grammar->tokenize,
-+  '... and calling it with data should return a token';
-+$expected = {
-+    'bailout' => 'some explanation',
-+    'type'    => 'bailout',
-+    'raw'     => 'Bail out! some explanation'
-+};
-+is_deeply $token, $expected,
-+  '... and the token should contain the correct data';
-+
-+# test comment
-+
-+my $comment = '# this is a comment';
-+like $comment, $syntax_for{'comment'},
-+  'Comments should match the comment syntax';
-+
-+$stream->put($comment);
-+ok $token = $grammar->tokenize,
-+  '... and calling it with data should return a token';
-+$expected = {
-+    'comment' => 'this is a comment',
-+    'type'    => 'comment',
-+    'raw'     => '# this is a comment'
-+};
-+is_deeply $token, $expected,
-+  '... and the token should contain the correct data';
-+
-+# test tests :/
-+
-+my $test = 'ok 1 this is a test';
-+like $test, $syntax_for{'test'}, 'Tests should match the test syntax';
-+
-+$stream->put($test);
-+ok $token = $grammar->tokenize,
-+  '... and calling it with data should return a token';
-+
-+$expected = {
-+    'ok'          => 'ok',
-+    'explanation' => '',
-+    'type'        => 'test',
-+    'directive'   => '',
-+    'description' => 'this is a test',
-+    'test_num'    => '1',
-+    'raw'         => 'ok 1 this is a test'
-+};
-+is_deeply $token, $expected,
-+  '... and the token should contain the correct data';
-+
-+# TODO tests
-+
-+$test = 'not ok 2 this is a test # TODO whee!';
-+like $test, $syntax_for{'test'}, 'Tests should match the test syntax';
-+
-+$stream->put($test);
-+ok $token = $grammar->tokenize,
-+  '... and calling it with data should return a token';
-+
-+$expected = {
-+    'ok'          => 'not ok',
-+    'explanation' => 'whee!',
-+    'type'        => 'test',
-+    'directive'   => 'TODO',
-+    'description' => 'this is a test',
-+    'test_num'    => '2',
-+    'raw'         => 'not ok 2 this is a test # TODO whee!'
-+};
-+is_deeply $token, $expected, '... and the TODO should be parsed';
-+
-+# false TODO tests
-+
-+# escaping that hash mark ('#') means this should *not* be a TODO test
-+$test = 'ok 22 this is a test \# TODO whee!';
-+like $test, $syntax_for{'test'}, 'Tests should match the test syntax';
-+
-+$stream->put($test);
-+ok $token = $grammar->tokenize,
-+  '... and calling it with data should return a token';
-+
-+$expected = {
-+    'ok'          => 'ok',
-+    'explanation' => '',
-+    'type'        => 'test',
-+    'directive'   => '',
-+    'description' => 'this is a test \# TODO whee!',
-+    'test_num'    => '22',
-+    'raw'         => 'ok 22 this is a test \# TODO whee!'
-+};
-+is_deeply $token, $expected,
-+  '... and the token should contain the correct data';
-+
-+# pragmas
-+
-+my $pragma = 'pragma +strict';
-+like $pragma, $syntax_for{'pragma'}, 'Pragmas should match the pragma syntax';
-+
-+$stream->put($pragma);
-+ok $token = $grammar->tokenize,
-+  '... and calling it with data should return a token';
-+
-+$expected = {
-+    'type'    => 'pragma',
-+    'raw'     => $pragma,
-+    'pragmas' => ['+strict'],
-+};
-+
-+is_deeply $token, $expected,
-+  '... and the token should contain the correct data';
-+
-+$pragma = 'pragma +strict,-foo';
-+like $pragma, $syntax_for{'pragma'}, 'Pragmas should match the pragma syntax';
-+
-+$stream->put($pragma);
-+ok $token = $grammar->tokenize,
-+  '... and calling it with data should return a token';
-+
-+$expected = {
-+    'type'    => 'pragma',
-+    'raw'     => $pragma,
-+    'pragmas' => [ '+strict', '-foo' ],
-+};
-+
-+is_deeply $token, $expected,
-+  '... and the token should contain the correct data';
-+
-+$pragma = 'pragma  +strict  ,  -foo ';
-+like $pragma, $syntax_for{'pragma'}, 'Pragmas should match the pragma syntax';
-+
-+$stream->put($pragma);
-+ok $token = $grammar->tokenize,
-+  '... and calling it with data should return a token';
-+
-+$expected = {
-+    'type'    => 'pragma',
-+    'raw'     => $pragma,
-+    'pragmas' => [ '+strict', '-foo' ],
-+};
-+
-+is_deeply $token, $expected,
-+  '... and the token should contain the correct data';
-+
-+# coverage tests
-+
-+# set_version
-+
-+{
-+    my @die;
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        $grammar->set_version('no_such_version');
-+    };
-+
-+    unless ( is @die, 1, 'set_version with bad version' ) {
-+        diag " >>> $_ <<<\n" for @die;
-+    }
-+
-+    like pop @die, qr/^Unsupported syntax version: no_such_version at /,
-+      '... and got expected message';
-+}
-+
-+# tokenize
-+{
-+    my $stream  = SS->new;
-+    my $parser  = EmptyParser->new;
-+    my $grammar = $GRAMMAR->new( { stream => $stream, parser => $parser } );
-+
-+    my $plan = '';
-+
-+    $stream->put($plan);
-+
-+    my $result = $grammar->tokenize();
-+
-+    isa_ok $result, 'TAP::Parser::Result::Unknown';
-+}
-+
-+# _make_plan_token
-+
-+{
-+    my $parser = EmptyParser->new;
-+    my $grammar = $GRAMMAR->new( { parser => $parser } );
-+
-+    my $plan
-+      = '1..1 # SKIP with explanation';  # trigger warning in _make_plan_token
-+
-+    my $method = $handler_for{'plan'};
-+
-+    $plan =~ $syntax_for{'plan'};        # perform regex to populate $1, $2
-+
-+    my @warn;
-+
-+    eval {
-+        local $SIG{__WARN__} = sub { push @warn, @_ };
-+
-+        $grammar->$method($plan);
-+    };
-+
-+    is @warn, 1, 'catch warning on inconsistent plan';
-+
-+    like pop @warn,
-+      qr/^Specified SKIP directive in plan but more than 0 tests [(]1\.\.1 # SKIP with explanation[)]/,
-+      '... and its what we expect';
-+}
-+
-+# _make_yaml_token
-+
-+{
-+    my $stream  = SS->new;
-+    my $parser  = EmptyParser->new;
-+    my $grammar = $GRAMMAR->new( { stream => $stream, parser => $parser } );
-+
-+    $grammar->set_version(13);
-+
-+    # now this is badly formed YAML that is missing the
-+    # leader padding - this is done for coverage testing
-+    # the $reader code sub in _make_yaml_token, that is
-+    # passed as the yaml consumer to T::P::YAMLish::Reader.
-+
-+    # because it isnt valid yaml, the yaml document is
-+    # not done, and the _peek in the YAMLish::Reader
-+    # code doesnt find the terminating '...' pattern.
-+    # but we dont care as this is coverage testing, so
-+    # if thats what we have to do to exercise that code,
-+    # so be it.
-+    my $yaml = [ '  ...  ', '- 2', '  ---  ', ];
-+
-+    sub iter {
-+        my $ar = shift;
-+        return sub {
-+            return shift @$ar;
-+        };
-+    }
-+
-+    my $iter = iter($yaml);
-+
-+    while ( my $line = $iter->() ) {
-+        $stream->put($line);
-+    }
-+
-+    # pad == '   ', marker == '--- '
-+    # length $pad == 3
-+    # strip == pad
-+
-+    my @die;
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+        $grammar->tokenize;
-+    };
-+
-+    is @die, 1, 'checking badly formed yaml for coverage testing';
-+
-+    like pop @die, qr/^Missing '[.][.][.]' at end of YAMLish/,
-+      '...and it died like we expect';
-+}
-+
-+{
-+
-+    # coverage testing for TAP::Parser::Iterator::Array
-+
-+    my $source = [qw( a b c )];
-+
-+    my $aiter = TAP::Parser::Iterator::Array->new($source);
-+
-+    my $first = $aiter->next_raw;
-+
-+    is $first, 'a', 'access raw iterator';
-+
-+    is $aiter->exit, undef, '... and note we didnt exhaust the source';
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/harness-bailout.t perl-5.10.0/ext/Test/Harness/t/harness-bailout.t
---- perl-5.10.0.orig/ext/Test/Harness/t/harness-bailout.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/harness-bailout.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,61 @@
-+#!perl
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        chdir '../ext/Test/Harness';
-+        #@INC = ( '../lib', '../ext/Test/Harness/t/lib' );
-+        @INC = ( '../../../lib', 't/lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+use File::Spec;
-+
-+BEGIN {
-+    *CORE::GLOBAL::exit = sub { die '!exit called!' };
-+}
-+
-+use TAP::Harness;
-+use Test::More;
-+
-+my @jobs = (
-+    {   name => 'sequential',
-+        args => { verbosity => -9 },
-+    },
-+    {   name => 'parallel',
-+        args => { verbosity => -9, jobs => 2 },
-+    },
-+);
-+
-+plan tests => @jobs * 2;
-+
-+for my $test (@jobs) {
-+    my $name    = $test->{name};
-+    my $args    = $test->{args};
-+    my $harness = TAP::Harness->new($args);
-+    eval {
-+        local ( *OLDERR, *OLDOUT );
-+        open OLDERR, '>&STDERR' or die $!;
-+        open OLDOUT, '>&STDOUT' or die $!;
-+        my $devnull = File::Spec->devnull;
-+        open STDERR, ">$devnull" or die $!;
-+        open STDOUT, ">$devnull" or die $!;
-+
-+        $harness->runtests(
-+            File::Spec->catfile( 't', 'sample-tests', 'bailout' ) );
-+
-+        open STDERR, '>&OLDERR' or die $!;
-+        open STDOUT, '>&OLDOUT' or die $!;
-+    };
-+    my $err = $@;
-+    unlike $err, qr{!exit called!}, "$name: didn't exit";
-+    like $err, qr{FAILED--Further testing stopped: GERONIMMMOOOOOO!!!},
-+      "$name: bailout message";
-+}
-+
-+# vim:ts=2:sw=2:et:ft=perl
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/harness-subclass.t perl-5.10.0/ext/Test/Harness/t/harness-subclass.t
---- perl-5.10.0.orig/ext/Test/Harness/t/harness-subclass.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/harness-subclass.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,75 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+use TAP::Harness;
-+use Test::More tests => 13;
-+
-+my %class_map = (
-+    aggregator_class  => 'My::TAP::Parser::Aggregator',
-+    formatter_class   => 'My::TAP::Formatter::Console',
-+    multiplexer_class => 'My::TAP::Parser::Multiplexer',
-+    parser_class      => 'My::TAP::Parser',
-+    scheduler_class   => 'My::TAP::Parser::Scheduler',
-+);
-+
-+my %loaded = ();
-+
-+# Synthesize our subclasses
-+for my $class ( values %class_map ) {
-+    ( my $base_class = $class ) =~ s/^My:://;
-+    use_ok($base_class);
-+
-+    no strict 'refs';
-+    @{"${class}::ISA"} = ($base_class);
-+    *{"${class}::new"} = sub {
-+        my $pkg = shift;
-+        $loaded{$pkg} = 1;
-+
-+        # Can't use SUPER outside a package
-+        return $base_class->can('new')->( $pkg, @_ );
-+    };
-+}
-+
-+{
-+    ok my $harness = TAP::Harness->new( { %class_map, verbosity => -9 } ),
-+      'created harness';
-+    isa_ok $harness, 'TAP::Harness';
-+
-+    # Test dynamic loading
-+    ok !$INC{'NOP.pm'}, 'NOP not loaded';
-+    ok my $nop = $harness->_construct('NOP'), 'loaded and created';
-+    isa_ok $nop, 'NOP';
-+    ok $INC{'NOP.pm'}, 'NOP loaded';
-+
-+    my $aggregate = $harness->runtests(
-+        File::Spec->catfile(
-+            (   $ENV{PERL_CORE}
-+                ? ( File::Spec->updir, 'ext', 'Test', 'Harness' )
-+                : ()
-+            ),
-+            't',
-+            'sample-tests',
-+            'simple'
-+        )
-+    );
-+
-+    isa_ok $aggregate, 'My::TAP::Parser::Aggregator';
-+
-+    is_deeply \%loaded,
-+      { 'My::TAP::Parser::Aggregator' => 1,
-+        'My::TAP::Formatter::Console' => 1,
-+        'My::TAP::Parser'             => 1,
-+        'My::TAP::Parser::Scheduler'  => 1,
-+      },
-+      'loaded our classes';
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/harness.t perl-5.10.0/ext/Test/Harness/t/harness.t
---- perl-5.10.0.orig/ext/Test/Harness/t/harness.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/harness.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,904 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+
-+use Test::More;
-+use IO::c55Capture;
-+
-+use TAP::Harness;
-+
-+my $HARNESS = 'TAP::Harness';
-+
-+my $source_tests
-+  = $ENV{PERL_CORE} ? '../ext/Test/Harness/t/source_tests' : 't/source_tests';
-+my $sample_tests
-+  = $ENV{PERL_CORE} ? '../ext/Test/Harness/t/sample-tests' : 't/sample-tests';
-+
-+plan tests => 113;
-+
-+# note that this test will always pass when run through 'prove'
-+ok $ENV{HARNESS_ACTIVE},  'HARNESS_ACTIVE env variable should be set';
-+ok $ENV{HARNESS_VERSION}, 'HARNESS_VERSION env variable should be set';
-+
-+#### For color tests ####
-+
-+package Colorizer;
-+
-+sub new { bless {}, shift }
-+sub can_color {1}
-+
-+sub set_color {
-+    my ( $self, $output, $color ) = @_;
-+    $output->("[[$color]]");
-+}
-+
-+package main;
-+
-+sub colorize {
-+    my $harness = shift;
-+    $harness->formatter->_colorizer( Colorizer->new );
-+}
-+
-+can_ok $HARNESS, 'new';
-+
-+eval { $HARNESS->new( { no_such_key => 1 } ) };
-+like $@, qr/\QUnknown arguments to TAP::Harness::new (no_such_key)/,
-+  '... and calling it with bad keys should fail';
-+
-+eval { $HARNESS->new( { lib => 'aint_no_such_lib' } ) };
-+is $@, '', '... and calling it with a non-existent lib is fine';
-+
-+eval { $HARNESS->new( { lib => [qw/bad_lib_1 bad_lib_2/] } ) };
-+is $@, '', '... and calling it with non-existent libs is fine';
-+
-+ok my $harness = $HARNESS->new,
-+  'Calling new() without arguments should succeed';
-+
-+foreach my $test_args ( get_arg_sets() ) {
-+    my %args = %$test_args;
-+    foreach my $key ( sort keys %args ) {
-+        $args{$key} = $args{$key}{in};
-+    }
-+    ok my $harness = $HARNESS->new( {%args} ),
-+      'Calling new() with valid arguments should succeed';
-+    isa_ok $harness, $HARNESS, '... and the object it returns';
-+
-+    while ( my ( $property, $test ) = each %$test_args ) {
-+        my $value = $test->{out};
-+        can_ok $harness, $property;
-+        is_deeply scalar $harness->$property(), $value, $test->{test_name};
-+    }
-+}
-+
-+{
-+    my @output;
-+    local $^W;
-+    local *TAP::Formatter::Base::_output = sub {
-+        my $self = shift;
-+        push @output => grep { $_ ne '' }
-+          map {
-+            local $_ = $_;
-+            chomp;
-+            trim($_)
-+          } @_;
-+    };
-+    my $harness = TAP::Harness->new(
-+        { verbosity => 1, formatter_class => "TAP::Formatter::Console" } );
-+    my $harness_whisper = TAP::Harness->new(
-+        { verbosity => -1, formatter_class => "TAP::Formatter::Console" } );
-+    my $harness_mute = TAP::Harness->new(
-+        { verbosity => -2, formatter_class => "TAP::Formatter::Console" } );
-+    my $harness_directives = TAP::Harness->new(
-+        { directives => 1, formatter_class => "TAP::Formatter::Console" } );
-+    my $harness_failures = TAP::Harness->new(
-+        { failures => 1, formatter_class => "TAP::Formatter::Console" } );
-+
-+    colorize($harness);
-+
-+    can_ok $harness, 'runtests';
-+
-+    # normal tests in verbose mode
-+
-+    ok my $aggregate = _runtests( $harness, "$source_tests/harness" ),
-+      '... runtests returns the aggregate';
-+
-+    isa_ok $aggregate, 'TAP::Parser::Aggregator';
-+
-+    chomp(@output);
-+
-+    my @expected = (
-+        "$source_tests/harness ..",
-+        '1..1',
-+        '[[reset]]',
-+        'ok 1 - this is a test',
-+        '[[reset]]',
-+        'ok',
-+        'All tests successful.',
-+    );
-+    my $status           = pop @output;
-+    my $expected_status  = qr{^Result: PASS$};
-+    my $summary          = pop @output;
-+    my $expected_summary = qr{^Files=1, Tests=1,  \d+ wallclock secs};
-+
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+    like $status, $expected_status,
-+      '... and the status line should be correct';
-+    like $summary, $expected_summary,
-+      '... and the report summary should look correct';
-+
-+    # use an alias for test name
-+
-+    @output = ();
-+    ok $aggregate
-+      = _runtests( $harness, [ "$source_tests/harness", 'My Nice Test' ] ),
-+      '... runtests returns the aggregate';
-+
-+    isa_ok $aggregate, 'TAP::Parser::Aggregator';
-+
-+    chomp(@output);
-+
-+    @expected = (
-+        'My Nice Test ..',
-+        '1..1',
-+        '[[reset]]',
-+        'ok 1 - this is a test',
-+        '[[reset]]',
-+        'ok',
-+        'All tests successful.',
-+    );
-+    $status           = pop @output;
-+    $expected_status  = qr{^Result: PASS$};
-+    $summary          = pop @output;
-+    $expected_summary = qr{^Files=1, Tests=1,  \d+ wallclock secs};
-+
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+    like $status, $expected_status,
-+      '... and the status line should be correct';
-+    like $summary, $expected_summary,
-+      '... and the report summary should look correct';
-+
-+    # run same test twice
-+
-+    @output = ();
-+    ok $aggregate = _runtests(
-+        $harness, [ "$source_tests/harness", 'My Nice Test' ],
-+        [ "$source_tests/harness", 'My Nice Test Again' ]
-+      ),
-+      '... runtests returns the aggregate';
-+
-+    isa_ok $aggregate, 'TAP::Parser::Aggregator';
-+
-+    chomp(@output);
-+
-+    @expected = (
-+        'My Nice Test ........',
-+        '1..1',
-+        '[[reset]]',
-+        'ok 1 - this is a test',
-+        '[[reset]]',
-+        'ok',
-+        'My Nice Test Again ..',
-+        '1..1',
-+        '[[reset]]',
-+        'ok 1 - this is a test',
-+        '[[reset]]',
-+        'ok',
-+        'All tests successful.',
-+    );
-+    $status           = pop @output;
-+    $expected_status  = qr{^Result: PASS$};
-+    $summary          = pop @output;
-+    $expected_summary = qr{^Files=2, Tests=2,  \d+ wallclock secs};
-+
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+    like $status, $expected_status,
-+      '... and the status line should be correct';
-+    like $summary, $expected_summary,
-+      '... and the report summary should look correct';
-+
-+    # normal tests in quiet mode
-+
-+    @output = ();
-+    _runtests( $harness_whisper, "$source_tests/harness" );
-+
-+    chomp(@output);
-+    @expected = (
-+        "$source_tests/harness ..",
-+        'ok',
-+        'All tests successful.',
-+    );
-+
-+    $status           = pop @output;
-+    $expected_status  = qr{^Result: PASS$};
-+    $summary          = pop @output;
-+    $expected_summary = qr/^Files=1, Tests=1,  \d+ wallclock secs/;
-+
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+    like $status, $expected_status,
-+      '... and the status line should be correct';
-+    like $summary, $expected_summary,
-+      '... and the report summary should look correct';
-+
-+    # normal tests in really_quiet mode
-+
-+    @output = ();
-+    _runtests( $harness_mute, "$source_tests/harness" );
-+
-+    chomp(@output);
-+    @expected = (
-+        'All tests successful.',
-+    );
-+
-+    $status           = pop @output;
-+    $expected_status  = qr{^Result: PASS$};
-+    $summary          = pop @output;
-+    $expected_summary = qr/^Files=1, Tests=1,  \d+ wallclock secs/;
-+
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+    like $status, $expected_status,
-+      '... and the status line should be correct';
-+    like $summary, $expected_summary,
-+      '... and the report summary should look correct';
-+
-+    # normal tests with failures
-+
-+    @output = ();
-+    _runtests( $harness, "$source_tests/harness_failure" );
-+
-+    $status  = pop @output;
-+    $summary = pop @output;
-+
-+    like $status, qr{^Result: FAIL$},
-+      '... and the status line should be correct';
-+
-+    my @summary = @output[ 10 .. $#output ];
-+    @output = @output[ 0 .. 9 ];
-+
-+    @expected = (
-+        "$source_tests/harness_failure ..",
-+        '1..2',
-+        '[[reset]]',
-+        'ok 1 - this is a test',
-+        '[[reset]]',
-+        '[[red]]',
-+        'not ok 2 - this is another test',
-+        '[[reset]]',
-+        '[[red]]',
-+        'Failed 1/2 subtests',
-+    );
-+
-+    is_deeply \@output, \@expected,
-+      '... and failing test output should be correct';
-+
-+    my @expected_summary = (
-+        '[[reset]]',
-+        'Test Summary Report',
-+        '-------------------',
-+        '[[red]]',
-+        "$source_tests/harness_failure (Wstat: 0 Tests: 2 Failed: 1)",
-+        '[[reset]]',
-+        '[[red]]',
-+        'Failed test:',
-+        '[[reset]]',
-+        '[[red]]',
-+        '2',
-+        '[[reset]]',
-+    );
-+
-+    is_deeply \@summary, \@expected_summary,
-+      '... and the failure summary should also be correct';
-+
-+    # quiet tests with failures
-+
-+    @output = ();
-+    _runtests( $harness_whisper, "$source_tests/harness_failure" );
-+
-+    $status   = pop @output;
-+    $summary  = pop @output;
-+    @expected = (
-+        "$source_tests/harness_failure ..",
-+        'Failed 1/2 subtests',
-+        'Test Summary Report',
-+        '-------------------',
-+        "$source_tests/harness_failure (Wstat: 0 Tests: 2 Failed: 1)",
-+        'Failed test:',
-+        '2',
-+    );
-+
-+    like $status, qr{^Result: FAIL$},
-+      '... and the status line should be correct';
-+
-+    is_deeply \@output, \@expected,
-+      '... and failing test output should be correct';
-+
-+    # really quiet tests with failures
-+
-+    @output = ();
-+    _runtests( $harness_mute, "$source_tests/harness_failure" );
-+
-+    $status   = pop @output;
-+    $summary  = pop @output;
-+    @expected = (
-+        'Test Summary Report',
-+        '-------------------',
-+        "$source_tests/harness_failure (Wstat: 0 Tests: 2 Failed: 1)",
-+        'Failed test:',
-+        '2',
-+    );
-+
-+    like $status, qr{^Result: FAIL$},
-+      '... and the status line should be correct';
-+
-+    is_deeply \@output, \@expected,
-+      '... and failing test output should be correct';
-+
-+    # only show directives
-+
-+    @output = ();
-+    _runtests(
-+        $harness_directives,
-+        "$source_tests/harness_directives"
-+    );
-+
-+    chomp(@output);
-+
-+    @expected = (
-+        "$source_tests/harness_directives ..",
-+        'not ok 2 - we have a something # TODO some output',
-+        "ok 3 houston, we don't have liftoff # SKIP no funding",
-+        'ok',
-+        'All tests successful.',
-+
-+        # ~TODO {{{ this should be an option
-+        #'Test Summary Report',
-+        #'-------------------',
-+        #"$source_tests/harness_directives (Wstat: 0 Tests: 3 Failed: 0)",
-+        #'Tests skipped:',
-+        #'3',
-+        # }}}
-+    );
-+
-+    $status           = pop @output;
-+    $summary          = pop @output;
-+    $expected_summary = qr/^Files=1, Tests=3,  \d+ wallclock secs/;
-+
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+    like $summary, $expected_summary,
-+      '... and the report summary should look correct';
-+
-+    like $status, qr{^Result: PASS$},
-+      '... and the status line should be correct';
-+
-+    # normal tests with bad tap
-+
-+    # install callback handler
-+    my $parser;
-+    my $callback_count = 0;
-+
-+    my @callback_log = ();
-+
-+    for my $evt (qw(parser_args made_parser before_runtests after_runtests)) {
-+        $harness->callback(
-+            $evt => sub {
-+                push @callback_log, $evt;
-+            }
-+        );
-+    }
-+
-+    $harness->callback(
-+        made_parser => sub {
-+            $parser = shift;
-+            $callback_count++;
-+        }
-+    );
-+
-+    @output = ();
-+    _runtests( $harness, "$source_tests/harness_badtap" );
-+    chomp(@output);
-+
-+    @output   = map { trim($_) } @output;
-+    $status   = pop @output;
-+    @summary  = @output[ 12 .. ( $#output - 1 ) ];
-+    @output   = @output[ 0 .. 11 ];
-+    @expected = (
-+        "$source_tests/harness_badtap ..",
-+        '1..2',
-+        '[[reset]]',
-+        'ok 1 - this is a test',
-+        '[[reset]]',
-+        '[[red]]',
-+        'not ok 2 - this is another test',
-+        '[[reset]]',
-+        '1..2',
-+        '[[reset]]',
-+        '[[red]]',
-+        'Failed 1/2 subtests',
-+    );
-+    is_deeply \@output, \@expected,
-+      '... and failing test output should be correct';
-+    like $status, qr{^Result: FAIL$},
-+      '... and the status line should be correct';
-+    @expected_summary = (
-+        '[[reset]]',
-+        'Test Summary Report',
-+        '-------------------',
-+        '[[red]]',
-+        "$source_tests/harness_badtap (Wstat: 0 Tests: 2 Failed: 1)",
-+        '[[reset]]',
-+        '[[red]]',
-+        'Failed test:',
-+        '[[reset]]',
-+        '[[red]]',
-+        '2',
-+        '[[reset]]',
-+        '[[red]]',
-+        'Parse errors: More than one plan found in TAP output',
-+        '[[reset]]',
-+    );
-+    is_deeply \@summary, \@expected_summary,
-+      '... and the badtap summary should also be correct';
-+
-+    cmp_ok( $callback_count, '==', 1, 'callback called once' );
-+    is_deeply(
-+        \@callback_log,
-+        [ 'before_runtests', 'parser_args', 'made_parser', 'after_runtests' ],
-+        'callback log matches'
-+    );
-+    isa_ok $parser, 'TAP::Parser';
-+
-+    # coverage testing for _should_show_failures
-+    # only show failures
-+
-+    @output = ();
-+    _runtests( $harness_failures, "$source_tests/harness_failure" );
-+
-+    chomp(@output);
-+
-+    @expected = (
-+        "$source_tests/harness_failure ..",
-+        'not ok 2 - this is another test',
-+        'Failed 1/2 subtests',
-+        'Test Summary Report',
-+        '-------------------',
-+        "$source_tests/harness_failure (Wstat: 0 Tests: 2 Failed: 1)",
-+        'Failed test:',
-+        '2',
-+    );
-+
-+    $status  = pop @output;
-+    $summary = pop @output;
-+
-+    like $status, qr{^Result: FAIL$},
-+      '... and the status line should be correct';
-+    $expected_summary = qr/^Files=1, Tests=2,  \d+ wallclock secs/;
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+
-+    # check the status output for no tests
-+
-+    @output = ();
-+    _runtests( $harness_failures, "$sample_tests/no_output" );
-+
-+    chomp(@output);
-+
-+    @expected = (
-+        "$sample_tests/no_output ..",
-+        'No subtests run',
-+        'Test Summary Report',
-+        '-------------------',
-+        "$sample_tests/no_output (Wstat: 0 Tests: 0 Failed: 0)",
-+        'Parse errors: No plan found in TAP output',
-+    );
-+
-+    $status  = pop @output;
-+    $summary = pop @output;
-+
-+    like $status, qr{^Result: FAIL$},
-+      '... and the status line should be correct';
-+    $expected_summary = qr/^Files=1, Tests=2,  \d+ wallclock secs/;
-+    is_deeply \@output, \@expected, '... and the output should be correct';
-+
-+    #XXXX
-+}
-+
-+# make sure we can exec something ... anything!
-+SKIP: {
-+
-+    my $cat = '/bin/cat';
-+    unless ( -e $cat ) {
-+        skip "no '$cat'", 2;
-+    }
-+
-+    my $capture = IO::c55Capture->new_handle;
-+    my $harness = TAP::Harness->new(
-+        {   verbosity => -2,
-+            stdout    => $capture,
-+            exec      => [$cat],
-+        }
-+    );
-+
-+    eval {
-+        _runtests(
-+            $harness,
-+            $ENV{PERL_CORE}
-+            ? '../ext/Test/Harness/t/data/catme.1'
-+            : 't/data/catme.1'
-+        );
-+    };
-+
-+    my @output = tied($$capture)->dump;
-+    my $status = pop @output;
-+    like $status, qr{^Result: PASS$},
-+      '... and the status line should be correct';
-+    pop @output;    # get rid of summary line
-+    my $answer = pop @output;
-+    is( $answer, "All tests successful.\n", 'cat meows' );
-+}
-+
-+# make sure that we can exec with a code ref.
-+{
-+    my $capture = IO::c55Capture->new_handle;
-+    my $harness = TAP::Harness->new(
-+        {   verbosity => -2,
-+            stdout    => $capture,
-+            exec      => sub {undef},
-+        }
-+    );
-+
-+    _runtests( $harness, "$source_tests/harness" );
-+
-+    my @output = tied($$capture)->dump;
-+    my $status = pop @output;
-+    like $status, qr{^Result: PASS$},
-+      '... and the status line should be correct';
-+    pop @output;    # get rid of summary line
-+    my $answer = pop @output;
-+    is( $answer, "All tests successful.\n", 'cat meows' );
-+}
-+
-+# catches "exec accumulates arguments" issue (r77)
-+{
-+    my $capture = IO::c55Capture->new_handle;
-+    my $harness = TAP::Harness->new(
-+        {   verbosity => -2,
-+            stdout    => $capture,
-+            exec      => [$^X]
-+        }
-+    );
-+
-+    _runtests(
-+        $harness,
-+        "$source_tests/harness_complain"
-+        ,    # will get mad if run with args
-+        "$source_tests/harness",
-+    );
-+
-+    my @output = tied($$capture)->dump;
-+    my $status = pop @output;
-+    like $status, qr{^Result: PASS$},
-+      '... and the status line should be correct';
-+    pop @output;    # get rid of summary line
-+    is( $output[-1], "All tests successful.\n",
-+        'No exec accumulation'
-+    );
-+}
-+
-+sub trim {
-+    $_[0] =~ s/^\s+|\s+$//g;
-+    return $_[0];
-+}
-+
-+sub liblist {
-+    return [ map {"-I$_"} @_ ];
-+}
-+
-+sub get_arg_sets {
-+
-+    # keys are keys to new()
-+    return {
-+        lib => {
-+            in        => 'lib',
-+            out       => liblist('lib'),
-+            test_name => '... a single lib switch should be correct'
-+        },
-+        verbosity => {
-+            in        => 1,
-+            out       => 1,
-+            test_name => '... and we should be able to set verbosity to 1'
-+        },
-+
-+        # verbose => {
-+        #     in        => 1,
-+        #     out       => 1,
-+        #     test_name => '... and we should be able to set verbose to true'
-+        # },
-+      },
-+      { lib => {
-+            in        => [ 'lib',        't' ],
-+            out       => liblist( 'lib', 't' ),
-+            test_name => '... multiple lib dirs should be correct'
-+        },
-+        verbosity => {
-+            in        => 0,
-+            out       => 0,
-+            test_name => '... and we should be able to set verbosity to 0'
-+        },
-+
-+        # verbose => {
-+        #     in        => 0,
-+        #     out       => 0,
-+        #     test_name => '... and we should be able to set verbose to false'
-+        # },
-+      },
-+      { switches => {
-+            in        => [ '-T', '-w', '-T' ],
-+            out       => [ '-T', '-w', '-T' ],
-+            test_name => '... duplicate switches should remain',
-+        },
-+        failures => {
-+            in  => 1,
-+            out => 1,
-+            test_name =>
-+              '... and we should be able to set failures to true',
-+        },
-+        verbosity => {
-+            in        => -1,
-+            out       => -1,
-+            test_name => '... and we should be able to set verbosity to -1'
-+        },
-+
-+        # quiet => {
-+        #     in        => 1,
-+        #     out       => 1,
-+        #     test_name => '... and we should be able to set quiet to false'
-+        # },
-+      },
-+
-+      { verbosity => {
-+            in        => -2,
-+            out       => -2,
-+            test_name => '... and we should be able to set verbosity to -2'
-+        },
-+
-+        # really_quiet => {
-+        #     in  => 1,
-+        #     out => 1,
-+        #     test_name =>
-+        #       '... and we should be able to set really_quiet to true',
-+        # },
-+        exec => {
-+            in  => $^X,
-+            out => $^X,
-+            test_name =>
-+              '... and we should be able to set the executable',
-+        },
-+      },
-+      { switches => {
-+            in  => 'T',
-+            out => ['T'],
-+            test_name =>
-+              '... leading dashes (-) on switches are not optional',
-+        },
-+      },
-+      { switches => {
-+            in        => '-T',
-+            out       => ['-T'],
-+            test_name => '... we should be able to set switches',
-+        },
-+        failures => {
-+            in        => 1,
-+            out       => 1,
-+            test_name => '... and we should be able to set failures to true'
-+        },
-+      };
-+}
-+
-+sub _runtests {
-+    my ( $harness, @tests ) = @_;
-+    local $ENV{PERL_TEST_HARNESS_DUMP_TAP} = 0;
-+    my $aggregate = $harness->runtests(@tests);
-+    return $aggregate;
-+}
-+
-+{
-+
-+    # coverage tests for ctor
-+
-+    my $harness = TAP::Harness->new(
-+        {   timer  => 0,
-+            errors => 1,
-+            merge  => 2,
-+
-+            # formatter => 3,
-+        }
-+    );
-+
-+    is $harness->timer(), 0, 'timer getter';
-+    is $harness->timer(10), 10, 'timer setter';
-+    is $harness->errors(), 1, 'errors getter';
-+    is $harness->errors(10), 10, 'errors setter';
-+    is $harness->merge(), 2, 'merge getter';
-+    is $harness->merge(10), 10, 'merge setter';
-+
-+    # jobs accessor
-+    is $harness->jobs(), 1, 'jobs';
-+}
-+
-+{
-+
-+# coverage tests for the stdout key of VALIDATON_FOR, used by _initialize() in the ctor
-+
-+    # the coverage tests are
-+    # 1. ref $ref => false
-+    # 2. ref => ! GLOB and ref->can(print)
-+    # 3. ref $ref => GLOB
-+
-+    # case 1
-+
-+    my @die;
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        my $harness = TAP::Harness->new(
-+            {   stdout => bless {}, '0',    # how evil is THAT !!!
-+            }
-+        );
-+    };
-+
-+    is @die, 1, 'bad filehandle to stdout';
-+    like pop @die, qr/option 'stdout' needs a filehandle/,
-+      '... and we died as expected';
-+
-+    # case 2
-+
-+    @die = ();
-+
-+    package Printable;
-+
-+    sub new { return bless {}, shift }
-+
-+    sub print {return}
-+
-+    package main;
-+
-+    my $harness = TAP::Harness->new(
-+        {   stdout => Printable->new(),
-+        }
-+    );
-+
-+    isa_ok $harness, 'TAP::Harness';
-+
-+    # case 3
-+
-+    @die = ();
-+
-+    $harness = TAP::Harness->new(
-+        {   stdout => bless {}, 'GLOB',    # again with the evil
-+        }
-+    );
-+
-+    isa_ok $harness, 'TAP::Harness';
-+}
-+
-+{
-+
-+    # coverage testing of lib/switches accessor
-+    my $harness = TAP::Harness->new;
-+
-+    my @die;
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        $harness->switches(qw( too many arguments));
-+    };
-+
-+    is @die, 1, 'too many arguments to accessor';
-+
-+    like pop @die, qr/Too many arguments to method 'switches'/,
-+      '...and we died as expected';
-+
-+    $harness->switches('simple scalar');
-+
-+    my $arrref = $harness->switches;
-+    is_deeply $arrref, ['simple scalar'], 'scalar wrapped in arr ref';
-+}
-+
-+{
-+
-+    # coverage tests for the basically untested T::H::_open_spool
-+
-+    my @spool = (
-+        (   $ENV{PERL_CORE}
-+            ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
-+            : ()
-+        ),
-+        ( 't', 'spool' )
-+    );
-+    $ENV{PERL_TEST_HARNESS_DUMP_TAP} = File::Spec->catfile(@spool);
-+
-+# now given that we're going to be writing stuff to the file system, make sure we have
-+# a cleanup hook
-+
-+    END {
-+        use File::Path;
-+
-+        # remove the tree if we made it this far
-+        rmtree( $ENV{PERL_TEST_HARNESS_DUMP_TAP} )
-+          if $ENV{PERL_TEST_HARNESS_DUMP_TAP};
-+    }
-+
-+    my $harness = TAP::Harness->new( { verbosity => -2 } );
-+
-+    can_ok $harness, 'runtests';
-+
-+    # normal tests in verbose mode
-+
-+    my $parser
-+      = $harness->runtests( File::Spec->catfile( $source_tests, 'harness' ) );
-+
-+    isa_ok $parser, 'TAP::Parser::Aggregator',
-+      '... runtests returns the aggregate';
-+
-+    ok -e File::Spec->catfile(
-+        $ENV{PERL_TEST_HARNESS_DUMP_TAP},
-+        $source_tests, 'harness'
-+    );
-+}
-+
-+{
-+
-+    # test name munging
-+    my @cases = (
-+        {   name   => 'all the same',
-+            input  => [ 'foo.t', 'bar.t', 'fletz.t' ],
-+            output => [
-+                [ 'foo.t', 'foo.t' ], [ 'bar.t', 'bar.t' ],
-+                [ 'fletz.t', 'fletz.t' ]
-+            ],
-+        },
-+        {   name   => 'all the same, already cooked',
-+            input  => [ 'foo.t', [ 'bar.t', 'brip' ], 'fletz.t' ],
-+            output => [
-+                [ 'foo.t', 'foo.t' ], [ 'bar.t', 'brip' ],
-+                [ 'fletz.t', 'fletz.t' ]
-+            ],
-+        },
-+        {   name   => 'different exts',
-+            input  => [ 'foo.t', 'bar.u', 'fletz.v' ],
-+            output => [
-+                [ 'foo.t', 'foo.t' ], [ 'bar.u', 'bar.u' ],
-+                [ 'fletz.v', 'fletz.v' ]
-+            ],
-+        },
-+        {   name   => 'different exts, one already cooked',
-+            input  => [ 'foo.t', [ 'bar.u', 'bam' ], 'fletz.v' ],
-+            output => [
-+                [ 'foo.t', 'foo.t' ], [ 'bar.u', 'bam' ],
-+                [ 'fletz.v', 'fletz.v' ]
-+            ],
-+        },
-+        {   name   => 'different exts, two already cooked',
-+            input  => [ 'foo.t', [ 'bar.u', 'bam.q' ], [ 'fletz.v', 'boo' ] ],
-+            output => [
-+                [ 'foo.t', 'foo.t' ], [ 'bar.u', 'bam.q' ],
-+                [ 'fletz.v', 'boo' ]
-+            ],
-+        },
-+    );
-+
-+    for my $case (@cases) {
-+        is_deeply [ TAP::Harness->_add_descriptions( @{ $case->{input} } ) ],
-+          $case->{output}, '_add_descriptions: ' . $case->{name};
-+    }
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/iterators.t perl-5.10.0/ext/Test/Harness/t/iterators.t
---- perl-5.10.0.orig/ext/Test/Harness/t/iterators.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/iterators.t	2009-03-10 17:38:43.000000000 +0100
-@@ -0,0 +1,219 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 76;
-+
-+use File::Spec;
-+use TAP::Parser;
-+use TAP::Parser::IteratorFactory;
-+use Config;
-+
-+sub array_ref_from {
-+    my $string = shift;
-+    my @lines = split /\n/ => $string;
-+    return \@lines;
-+}
-+
-+# we slurp __DATA__ and then reset it so we don't have to duplicate our TAP
-+my $offset = tell DATA;
-+my $tap = do { local $/; <DATA> };
-+seek DATA, $offset, 0;
-+
-+my $did_setup    = 0;
-+my $did_teardown = 0;
-+
-+my $setup    = sub { $did_setup++ };
-+my $teardown = sub { $did_teardown++ };
-+
-+package NoForkProcess;
-+use vars qw( @ISA );
-+@ISA = qw( TAP::Parser::Iterator::Process );
-+
-+sub _use_open3 {return}
-+
-+package main;
-+
-+my @schedule = (
-+    {   name     => 'Process',
-+        subclass => 'TAP::Parser::Iterator::Process',
-+        source   => {
-+            command => [
-+                $^X,
-+                File::Spec->catfile(
-+                    (   $ENV{PERL_CORE}
-+                        ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
-+                        : ()
-+                    ),
-+                    't',
-+                    'sample-tests',
-+                    'out_err_mix'
-+                )
-+            ],
-+            merge    => 1,
-+            setup    => $setup,
-+            teardown => $teardown,
-+        },
-+        after => sub {
-+            is $did_setup,    1, "setup called";
-+            is $did_teardown, 1, "teardown called";
-+        },
-+        need_open3 => 15,
-+    },
-+    {   name     => 'Array',
-+        subclass => 'TAP::Parser::Iterator::Array',
-+        source   => array_ref_from($tap),
-+    },
-+    {   name     => 'Stream',
-+        subclass => 'TAP::Parser::Iterator::Stream',
-+        source   => \*DATA,
-+    },
-+    {   name     => 'Process (Perl -e)',
-+        subclass => 'TAP::Parser::Iterator::Process',
-+        source =>
-+          { command => [ $^X, '-e', 'print qq/one\ntwo\n\nthree\n/' ] },
-+    },
-+    {   name     => 'Process (NoFork)',
-+        subclass => 'TAP::Parser::Iterator::Process',
-+        class    => 'NoForkProcess',
-+        source =>
-+          { command => [ $^X, '-e', 'print qq/one\ntwo\n\nthree\n/' ] },
-+    },
-+);
-+
-+sub _can_open3 {
-+    return $Config{d_fork};
-+}
-+
-+my $factory = TAP::Parser::IteratorFactory->new;
-+for my $test (@schedule) {
-+    SKIP: {
-+        my $name       = $test->{name};
-+        my $need_open3 = $test->{need_open3};
-+        skip "No open3", $need_open3 if $need_open3 && !_can_open3();
-+        my $subclass = $test->{subclass};
-+        my $source   = $test->{source};
-+        my $class    = $test->{class};
-+        my $iter
-+          = $class
-+          ? $class->new($source)
-+          : $factory->make_iterator($source);
-+        ok $iter,     "$name: We should be able to create a new iterator";
-+        isa_ok $iter, 'TAP::Parser::Iterator',
-+          '... and the object it returns';
-+        isa_ok $iter, $subclass, '... and the object it returns';
-+
-+        can_ok $iter, 'exit';
-+        ok !defined $iter->exit,
-+          "$name: ... and it should be undef before we are done ($subclass)";
-+
-+        can_ok $iter, 'next';
-+        is $iter->next, 'one', "$name: next() should return the first result";
-+
-+        is $iter->next, 'two',
-+          "$name: next() should return the second result";
-+
-+        is $iter->next, '', "$name: next() should return the third result";
-+
-+        is $iter->next, 'three',
-+          "$name: next() should return the fourth result";
-+
-+        ok !defined $iter->next,
-+          "$name: next() should return undef after it is empty";
-+
-+        is $iter->exit, 0,
-+          "$name: ... and exit should now return 0 ($subclass)";
-+
-+        is $iter->wait, 0, "$name: wait should also now return 0 ($subclass)";
-+
-+        if ( my $after = $test->{after} ) {
-+            $after->();
-+        }
-+    }
-+}
-+
-+{
-+
-+    # coverage tests for the ctor
-+
-+    my $stream = $factory->make_iterator( IO::Handle->new );
-+
-+    isa_ok $stream, 'TAP::Parser::Iterator::Stream';
-+
-+    my @die;
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        $factory->make_iterator( \1 );    # a ref to a scalar
-+    };
-+
-+    is @die, 1, 'coverage of error case';
-+
-+    like pop @die, qr/Can't iterate with a SCALAR/,
-+      '...and we died as expected';
-+}
-+
-+{
-+
-+    # coverage test for VMS case
-+
-+    my $stream = $factory->make_iterator(
-+        [   'not ',
-+            'ok 1 - I hate VMS',
-+        ]
-+    );
-+
-+    is $stream->next, 'not ok 1 - I hate VMS',
-+      'coverage of VMS line-splitting case';
-+
-+    # coverage test for VMS case - nothing after 'not'
-+
-+    $stream = $factory->make_iterator(
-+        [   'not ',
-+        ]
-+    );
-+
-+    is $stream->next, 'not ', '...and we find "not" by itself';
-+}
-+
-+SKIP: {
-+    skip "No open3", 4 unless _can_open3();
-+
-+    # coverage testing for TAP::Parser::Iterator::Process ctor
-+
-+    my @die;
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        $factory->make_iterator( {} );
-+    };
-+
-+    is @die, 1, 'coverage testing for TPI::Process';
-+
-+    like pop @die, qr/Must supply a command to execute/,
-+      '...and we died as expected';
-+
-+    my $parser = $factory->make_iterator(
-+        {   command => [
-+                $^X,
-+                File::Spec->catfile( 't', 'sample-tests', 'out_err_mix' )
-+            ],
-+            merge => 1,
-+        }
-+    );
-+
-+    is $parser->{err}, '',    'confirm we set err to empty string';
-+    is $parser->{sel}, undef, '...and selector to undef';
-+
-+    # And then we read from the parser to sidestep the Mac OS / open3
-+    # bug which frequently throws an error here otherwise.
-+    $parser->next;
-+}
-+__DATA__
-+one
-+two
-+
-+three
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/App/Prove/Plugin/Dummy.pm perl-5.10.0/ext/Test/Harness/t/lib/App/Prove/Plugin/Dummy.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/App/Prove/Plugin/Dummy.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/App/Prove/Plugin/Dummy.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,9 @@
-+package App::Prove::Plugin::Dummy;
-+
-+use strict;
-+
-+sub import {
-+    main::test_log_import(@_);
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/App/Prove/Plugin/Dummy2.pm perl-5.10.0/ext/Test/Harness/t/lib/App/Prove/Plugin/Dummy2.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/App/Prove/Plugin/Dummy2.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/App/Prove/Plugin/Dummy2.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,13 @@
-+package App::Prove::Plugin::Dummy2;
-+
-+use strict;
-+
-+sub import {
-+    main::test_log_import(@_);
-+}
-+
-+sub load {
-+    main::test_log_plugin_load(@_);
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/Dev/Null.pm perl-5.10.0/ext/Test/Harness/t/lib/Dev/Null.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/Dev/Null.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/Dev/Null.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,18 @@
-+# For shutting up Test::Harness.
-+# Has to work on 5.004 which doesn't have Tie::StdHandle.
-+package Dev::Null;
-+
-+sub WRITE  { }
-+sub PRINT  { }
-+sub PRINTF { }
-+
-+sub TIEHANDLE {
-+    my $class = shift;
-+    my $fh = do { local *HANDLE; \*HANDLE };
-+    return bless $fh, $class;
-+}
-+sub READ     { }
-+sub READLINE { }
-+sub GETC     { }
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/EmptyParser.pm perl-5.10.0/ext/Test/Harness/t/lib/EmptyParser.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/EmptyParser.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/EmptyParser.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,30 @@
-+package EmptyParser;
-+
-+use strict;
-+use vars qw(@ISA);
-+
-+use TAP::Parser ();
-+
-+@ISA = qw(TAP::Parser);
-+
-+sub _initialize {
-+    shift->_set_defaults;
-+}
-+
-+# this should really be in TAP::Parser itself...
-+sub _set_defaults {
-+    my $self = shift;
-+
-+    for my $key (
-+        qw( source_class perl_source_class grammar_class
-+        iterator_factory_class result_factory_class )
-+      )
-+    {
-+        my $default_method = "_default_$key";
-+        $self->$key( $self->$default_method() );
-+    }
-+
-+    return $self;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/IO/c55Capture.pm perl-5.10.0/ext/Test/Harness/t/lib/IO/c55Capture.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/IO/c55Capture.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/IO/c55Capture.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,120 @@
-+package IO::c55Capture;
-+
-+use IO::Handle;
-+
-+=head1 Name
-+
-+t/lib/IO::c55Capture - a wafer-thin test support package
-+
-+=head1 Why!?
-+
-+Compatibility with 5.5.3 and no external dependencies.
-+
-+=head1 Usage
-+
-+Works with a global filehandle:
-+
-+    # set a spool to write to
-+    tie local *STDOUT, 'IO::c55Capture';
-+    ...
-+    # clear and retrieve buffer list
-+    my @spooled = tied(*STDOUT)->dump();
-+
-+Or, a lexical (and autocreated) filehandle:
-+
-+    my $capture = IO::c55Capture->new_handle;
-+    ...
-+    my @output = tied($$capture)->dump;
-+
-+Note the '$$' dereference.
-+
-+=cut
-+
-+# XXX actually returns an IO::Handle :-/
-+sub new_handle {
-+    my $class  = shift;
-+    my $handle = IO::Handle->new;
-+    tie $$handle, $class;
-+    return ($handle);
-+}
-+
-+sub TIEHANDLE {
-+    return bless [], __PACKAGE__;
-+}
-+
-+sub PRINT {
-+    my $self = shift;
-+
-+    push @$self, @_;
-+}
-+
-+sub PRINTF {
-+    my $self = shift;
-+    push @$self, sprintf(@_);
-+}
-+
-+sub dump {
-+    my $self = shift;
-+    my @got  = @$self;
-+    @$self = ();
-+    return @got;
-+}
-+
-+package util;
-+
-+use IO::File;
-+
-+# mostly stolen from Module::Build MBTest.pm
-+
-+{    # backwards compatible temp filename recipe adapted from perlfaq
-+    my $tmp_count = 0;
-+    my $tmp_base_name = sprintf( "%d-%d", $$, time() );
-+
-+    sub temp_file_name {
-+        sprintf( "%s-%04d", $tmp_base_name, ++$tmp_count );
-+    }
-+}
-+########################################################################
-+
-+sub save_handle {
-+    my ( $handle, $subr ) = @_;
-+    my $outfile = temp_file_name();
-+
-+    local *SAVEOUT;
-+    open SAVEOUT, ">&" . fileno($handle)
-+      or die "Can't save output handle: $!";
-+    open $handle, "> $outfile" or die "Can't create $outfile: $!";
-+
-+    eval { $subr->() };
-+    my $err = $@;
-+    open $handle, ">&SAVEOUT" or die "Can't restore output: $!";
-+
-+    my $ret = slurp($outfile);
-+    1 while unlink $outfile;
-+    $err and die $err;
-+    return $ret;
-+}
-+
-+sub stdout_of { save_handle( \*STDOUT, @_ ) }
-+sub stderr_of { save_handle( \*STDERR, @_ ) }
-+
-+sub stdout_stderr_of {
-+    my $subr = shift;
-+    my ( $stdout, $stderr );
-+    $stdout = stdout_of(
-+        sub {
-+            $stderr = stderr_of($subr);
-+        }
-+    );
-+    return ( $stdout, $stderr );
-+}
-+
-+sub slurp {
-+    my $fh = IO::File->new( $_[0] ) or die "Can't open $_[0]: $!";
-+    local $/;
-+    return scalar <$fh>;
-+}
-+
-+1;
-+
-+# vim:ts=4:sw=4:et:sta
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/MyCustom.pm perl-5.10.0/ext/Test/Harness/t/lib/MyCustom.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/MyCustom.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/MyCustom.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,12 @@
-+# avoid cut-n-paste exhaustion with this mixin
-+
-+package MyCustom;
-+use strict;
-+
-+sub custom {
-+    my $self = shift;
-+    $main::CUSTOM{ ref($self) }++;
-+    return $self;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/MyGrammar.pm perl-5.10.0/ext/Test/Harness/t/lib/MyGrammar.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/MyGrammar.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/MyGrammar.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,21 @@
-+# subclass for testing customizing & subclassing
-+
-+package MyGrammar;
-+
-+use strict;
-+use vars '@ISA';
-+
-+use MyCustom;
-+use TAP::Parser::Grammar;
-+
-+@ISA = qw( TAP::Parser::Grammar MyCustom );
-+
-+sub _initialize {
-+    my $self = shift;
-+    $self->SUPER::_initialize(@_);
-+    $main::INIT{ ref($self) }++;
-+    $self->{initialized} = 1;
-+    return $self;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/MyIterator.pm perl-5.10.0/ext/Test/Harness/t/lib/MyIterator.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/MyIterator.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/MyIterator.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,26 @@
-+# subclass for testing customizing & subclassing
-+
-+package MyIterator;
-+
-+use strict;
-+use vars '@ISA';
-+
-+use MyCustom;
-+use TAP::Parser::Iterator;
-+
-+@ISA = qw( TAP::Parser::Iterator MyCustom );
-+
-+sub _initialize {
-+    my $self = shift;
-+    $self->SUPER::_initialize(@_);
-+    $main::INIT{ ref($self) }++;
-+    $self->{initialized} = 1;
-+    $self->{content} = [ 'whats TAP all about then?', '1..1', 'ok 1' ];
-+    return $self;
-+}
-+
-+sub next {
-+    return shift @{ $_[0]->{content} };
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/MyIteratorFactory.pm perl-5.10.0/ext/Test/Harness/t/lib/MyIteratorFactory.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/MyIteratorFactory.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/MyIteratorFactory.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,19 @@
-+# subclass for testing customizing & subclassing
-+
-+package MyIteratorFactory;
-+
-+use strict;
-+use vars '@ISA';
-+
-+use MyCustom;
-+use MyIterator;
-+use TAP::Parser::IteratorFactory;
-+
-+@ISA = qw( TAP::Parser::IteratorFactory MyCustom );
-+
-+sub make_iterator {
-+    my $class = shift;
-+    return MyIterator->new(@_);
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/MyPerlSource.pm perl-5.10.0/ext/Test/Harness/t/lib/MyPerlSource.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/MyPerlSource.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/MyPerlSource.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,27 @@
-+# subclass for testing customizing & subclassing
-+
-+package MyPerlSource;
-+
-+use strict;
-+use vars '@ISA';
-+
-+use MyCustom;
-+use TAP::Parser::Source::Perl;
-+
-+@ISA = qw( TAP::Parser::Source::Perl MyCustom );
-+
-+sub _initialize {
-+    my $self = shift;
-+    $self->SUPER::_initialize(@_);
-+    $main::INIT{ ref($self) }++;
-+    $self->{initialized} = 1;
-+    return $self;
-+}
-+
-+sub source {
-+    my $self = shift;
-+    return $self->SUPER::source(@_);
-+}
-+
-+1;
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/MyResult.pm perl-5.10.0/ext/Test/Harness/t/lib/MyResult.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/MyResult.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/MyResult.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,21 @@
-+# subclass for testing customizing & subclassing
-+
-+package MyResult;
-+
-+use strict;
-+use vars '@ISA';
-+
-+use MyCustom;
-+use TAP::Parser::Result;
-+
-+@ISA = qw( TAP::Parser::Result MyCustom );
-+
-+sub _initialize {
-+    my $self = shift;
-+    $self->SUPER::_initialize(@_);
-+    $main::INIT{ ref($self) }++;
-+    $self->{initialized} = 1;
-+    return $self;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/MyResultFactory.pm perl-5.10.0/ext/Test/Harness/t/lib/MyResultFactory.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/MyResultFactory.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/MyResultFactory.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,23 @@
-+# subclass for testing customizing & subclassing
-+
-+package MyResultFactory;
-+
-+use strict;
-+use vars '@ISA';
-+
-+use MyCustom;
-+use MyResult;
-+use TAP::Parser::ResultFactory;
-+
-+@ISA = qw( TAP::Parser::ResultFactory MyCustom );
-+
-+sub make_result {
-+    my $class = shift;
-+
-+    # I know, this is not really being initialized, but
-+    # for consistency's sake, deal with it :)
-+    $main::INIT{$class}++;
-+    return MyResult->new(@_);
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/MySource.pm perl-5.10.0/ext/Test/Harness/t/lib/MySource.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/MySource.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/MySource.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,34 @@
-+# subclass for testing customizing & subclassing
-+
-+package MySource;
-+
-+use strict;
-+use vars '@ISA';
-+
-+use MyCustom;
-+use TAP::Parser::Source;
-+
-+@ISA = qw( TAP::Parser::Source MyCustom );
-+
-+sub _initialize {
-+    my $self = shift;
-+    $self->SUPER::_initialize(@_);
-+    $main::INIT{ ref($self) }++;
-+    $self->{initialized} = 1;
-+    return $self;
-+}
-+
-+sub source {
-+    my $self = shift;
-+    return $self->SUPER::source(@_);
-+}
-+
-+sub get_stream {
-+    my $self   = shift;
-+    my $stream = $self->SUPER::get_stream(@_);
-+
-+    # re-bless it:
-+    bless $stream, 'MyIterator';
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/NOP.pm perl-5.10.0/ext/Test/Harness/t/lib/NOP.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/NOP.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/NOP.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,7 @@
-+package NOP;
-+
-+# Do nothing much
-+
-+sub new { bless {}, shift }
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/NoFork.pm perl-5.10.0/ext/Test/Harness/t/lib/NoFork.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/NoFork.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/NoFork.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,21 @@
-+package NoFork;
-+
-+BEGIN {
-+    *CORE::GLOBAL::fork = sub { die "you should not fork" };
-+}
-+use Config;
-+tied(%Config)->{d_fork} = 0;    # blatant lie
-+
-+=begin TEST
-+
-+Assuming not to much chdir:
-+
-+  PERL5OPT='-It/lib -MNoFork' perl -Ilib bin/prove -r t
-+
-+=end TEST
-+
-+=cut
-+
-+1;
-+
-+# vim:ts=4:sw=4:et:sta
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/TAP/Parser/SubclassTest.pm perl-5.10.0/ext/Test/Harness/t/lib/TAP/Parser/SubclassTest.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/TAP/Parser/SubclassTest.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/TAP/Parser/SubclassTest.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,39 @@
-+# subclass for testing subclassing
-+
-+package TAP::Parser::SubclassTest;
-+
-+use strict;
-+use vars qw(@ISA);
-+
-+use TAP::Parser;
-+
-+use MyCustom;
-+use MySource;
-+use MyPerlSource;
-+use MyGrammar;
-+use MyIteratorFactory;
-+use MyResultFactory;
-+
-+@ISA = qw( TAP::Parser MyCustom );
-+
-+sub _default_source_class           {'MySource'}
-+sub _default_perl_source_class      {'MyPerlSource'}
-+sub _default_grammar_class          {'MyGrammar'}
-+sub _default_iterator_factory_class {'MyIteratorFactory'}
-+sub _default_result_factory_class   {'MyResultFactory'}
-+
-+sub make_source      { shift->SUPER::make_source(@_)->custom }
-+sub make_perl_source { shift->SUPER::make_perl_source(@_)->custom }
-+sub make_grammar     { shift->SUPER::make_grammar(@_)->custom }
-+sub make_iterator    { shift->SUPER::make_iterator(@_)->custom }
-+sub make_result      { shift->SUPER::make_result(@_)->custom }
-+
-+sub _initialize {
-+    my $self = shift;
-+    $self->SUPER::_initialize(@_);
-+    $main::INIT{ ref($self) }++;
-+    $self->{initialized} = 1;
-+    return $self;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/lib/if.pm perl-5.10.0/ext/Test/Harness/t/lib/if.pm
---- perl-5.10.0.orig/ext/Test/Harness/t/lib/if.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/lib/if.pm	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,57 @@
-+package if;
-+
-+$VERSION = '0.05';
-+
-+sub work {
-+    my $method = shift() ? 'import' : 'unimport';
-+    die
-+      "Too few arguments to `use if' (some code returning an empty list in list context?)"
-+      unless @_ >= 2;
-+    return unless shift;    # CONDITION
-+
-+    my $p = $_[0];          # PACKAGE
-+    ( my $file = "$p.pm" ) =~ s!::!/!g;
-+    require $file;          # Works even if $_[0] is a keyword (like open)
-+    my $m = $p->can($method);
-+    goto &$m if $m;
-+}
-+
-+sub import   { shift; unshift @_, 1; goto &work }
-+sub unimport { shift; unshift @_, 0; goto &work }
-+
-+1;
-+__END__
-+
-+=head1 NAME
-+
-+if - C<use> a Perl module if a condition holds
-+
-+=head1 SYNOPSIS
-+
-+  use if CONDITION, MODULE => ARGUMENTS;
-+
-+=head1 DESCRIPTION
-+
-+The construct
-+
-+  use if CONDITION, MODULE => ARGUMENTS;
-+
-+has no effect unless C<CONDITION> is true.  In this case the effect is
-+the same as of
-+
-+  use MODULE ARGUMENTS;
-+
-+Above C<< => >> provides necessary quoting of C<MODULE>.  If not used (e.g.,
-+no ARGUMENTS to give), you'd better quote C<MODULE> yourselves.
-+
-+=head1 BUGS
-+
-+The current implementation does not allow specification of the
-+required version of the module.
-+
-+=head1 AUTHOR
-+
-+Ilya Zakharevich L<mailto:perl-module-if@ilyaz.org>.
-+
-+=cut
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/multiplexer.t perl-5.10.0/ext/Test/Harness/t/multiplexer.t
---- perl-5.10.0.orig/ext/Test/Harness/t/multiplexer.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/multiplexer.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,188 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More qw( no_plan );
-+
-+use File::Spec;
-+use TAP::Parser;
-+use TAP::Parser::Multiplexer;
-+use TAP::Parser::Iterator::Process;
-+
-+my $fork_desc
-+  = TAP::Parser::Iterator::Process->_use_open3
-+  ? 'fork'
-+  : 'nofork';
-+
-+my @schedule = (
-+    {   name => 'Single non-selectable source',
-+
-+        # Returns a list of parser, stash pairs. The stash contains the
-+        # TAP that we expect from this parser.
-+        sources => sub {
-+            my @tap = (
-+                '1..1',
-+                'ok 1 Just fine'
-+            );
-+
-+            return [
-+                TAP::Parser->new( { tap => join( "\n", @tap ) . "\n" } ),
-+                \@tap,
-+            ];
-+        },
-+    },
-+    {   name    => 'Two non-selectable sources',
-+        sources => sub {
-+            my @tap = (
-+                [   '1..1',
-+                    'ok 1 Just fine'
-+                ],
-+                [   '1..2',
-+                    'not ok 1 Oh dear',
-+                    'ok 2 Better'
-+                ]
-+            );
-+
-+            return map {
-+                [   TAP::Parser->new( { tap => join( "\n", @$_ ) . "\n" } ),
-+                    $_
-+                ]
-+            } @tap;
-+        },
-+    },
-+    {   name    => 'Single selectable source',
-+        sources => sub {
-+            return [
-+                TAP::Parser->new(
-+                    {   source => File::Spec->catfile(
-+                            (   $ENV{PERL_CORE}
-+                                ? ( File::Spec->updir(), 'ext', 'Test',
-+                                    'Harness'
-+                                  )
-+                                : ()
-+                            ),
-+                            't',
-+                            'sample-tests',
-+                            'simple'
-+                        ),
-+                    }
-+                ),
-+                [   '1..5',
-+                    'ok 1',
-+                    'ok 2',
-+                    'ok 3',
-+                    'ok 4',
-+                    'ok 5',
-+                ]
-+            ];
-+        },
-+    },
-+    {   name    => 'Three selectable sources',
-+        sources => sub {
-+            return map {
-+                [   TAP::Parser->new(
-+                        {   source => File::Spec->catfile(
-+                                (   $ENV{PERL_CORE}
-+                                    ? ( File::Spec->updir(), 'ext', 'Test',
-+                                        'Harness'
-+                                      )
-+                                    : ()
-+                                ),
-+                                't',
-+                                'sample-tests',
-+                                'simple'
-+                            ),
-+                        }
-+                    ),
-+                    [   '1..5',
-+                        'ok 1',
-+                        'ok 2',
-+                        'ok 3',
-+                        'ok 4',
-+                        'ok 5',
-+                    ]
-+                ]
-+            } 1 .. 3;
-+        },
-+    },
-+    {   name    => 'Three selectable sources, two non-selectable sources',
-+        sources => sub {
-+            my @tap = (
-+                [   '1..1',
-+                    'ok 1 Just fine'
-+                ],
-+                [   '1..2',
-+                    'not ok 1 Oh dear',
-+                    'ok 2 Better'
-+                ]
-+            );
-+
-+            return (
-+                map {
-+                    [   TAP::Parser->new(
-+                            { tap => join( "\n", @$_ ) . "\n" }
-+                        ),
-+                        $_
-+                    ]
-+                  } @tap
-+              ),
-+              ( map {
-+                    [   TAP::Parser->new(
-+                            {   source => File::Spec->catfile(
-+                                    (   $ENV{PERL_CORE}
-+                                        ? ( File::Spec->updir(), 'ext',
-+                                            'Test',              'Harness'
-+                                          )
-+                                        : ()
-+                                    ),
-+                                    't',
-+                                    'sample-tests',
-+                                    'simple'
-+                                ),
-+                            }
-+                        ),
-+                        [   '1..5',
-+                            'ok 1',
-+                            'ok 2',
-+                            'ok 3',
-+                            'ok 4',
-+                            'ok 5',
-+                        ]
-+                    ]
-+                  } 1 .. 3
-+              );
-+        },
-+    }
-+);
-+
-+for my $test (@schedule) {
-+    my $name    = "$test->{name} ($fork_desc)";
-+    my @sources = $test->{sources}->();
-+    my $mux     = TAP::Parser::Multiplexer->new;
-+
-+    my $count = @sources;
-+    $mux->add(@$_) for @sources;
-+
-+    is $mux->parsers, $count, "$name: count OK";
-+
-+    while ( my ( $parser, $stash, $result ) = $mux->next ) {
-+
-+        # use Data::Dumper;
-+        # diag Dumper( { stash => $stash, result => $result } );
-+        if ( defined $result ) {
-+            my $expect = ( shift @$stash ) || ' OOPS ';
-+            my $got = $result->raw;
-+            is $got, $expect, "$name: '$expect' OK";
-+        }
-+        else {
-+            ok @$stash == 0, "$name: EOF OK";
-+
-+            # Make sure we only get one EOF per stream
-+            push @$stash, ' expect no more ';
-+        }
-+    }
-+    is $mux->parsers, 0, "$name: All used up";
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/nofork-mux.t perl-5.10.0/ext/Test/Harness/t/nofork-mux.t
---- perl-5.10.0.orig/ext/Test/Harness/t/nofork-mux.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/nofork-mux.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,17 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
-+    }
-+    else {
-+        use lib 't/lib';
-+    }
-+}
-+
-+use strict;
-+
-+use NoFork;
-+require(
-+    ( $ENV{PERL_CORE} ? '../ext/Test/Harness/' : '' ) . 't/multiplexer.t' );
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/nofork.t perl-5.10.0/ext/Test/Harness/t/nofork.t
---- perl-5.10.0.orig/ext/Test/Harness/t/nofork.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/nofork.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,68 @@
-+#!/usr/bin/perl -w
-+
-+# check nofork logic on systems which *can* fork()
-+# NOTE maybe a good candidate for xt/author or something.
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
-+    }
-+    else {
-+        use lib 't/lib';
-+    }
-+}
-+
-+use strict;
-+
-+use Config;
-+use Test::More (
-+    $Config{d_fork}
-+    ? 'no_plan'
-+    : ( 'skip_all' => 'your system already has no fork' )
-+);
-+use IO::c55Capture;    # for util
-+
-+use TAP::Harness;
-+
-+sub backticks {
-+    my (@args) = @_;
-+
-+    util::stdout_of( sub { system(@args) and die "error $?" } );
-+}
-+
-+my @libs = map "-I$_", @INC;
-+my @perl = ( $^X, @libs );
-+my $mod = 'TAP::Parser::Iterator::Process';
-+
-+{    # just check the introspective method to start...
-+    my $code = qq(print $mod->_use_open3 ? 1 : 2);
-+    {
-+        my $ans = backticks( @perl, '-MNoFork', "-M$mod", '-e', $code );
-+        is( $ans, 2, 'says not to fork' );
-+    }
-+    {
-+        local $ENV{PERL5OPT};    # punt: prevent propogating -MNoFork
-+        my $ans = backticks( @perl, "-M$mod", '-e', $code );
-+        is( $ans, 1, 'says to fork' );
-+    }
-+}
-+
-+{                                # and make sure we can run a test
-+    my $capture = IO::c55Capture->new_handle;
-+    local *STDERR;
-+    my $harness = TAP::Harness->new(
-+        {   verbosity => -2,
-+            switches  => [ @libs, "-MNoFork" ],
-+            stdout    => $capture,
-+        }
-+    );
-+    $harness->runtests( ( $ENV{PERL_CORE} ? '../ext/Test/Harness/' : '' )
-+        . 't/sample-tests/simple' );
-+    my @output = tied($$capture)->dump;
-+    is pop @output, "Result: PASS\n", 'status OK';
-+    pop @output;    # get rid of summary line
-+    is( $output[-1], "All tests successful.\n", 'ran with no fork' );
-+}
-+
-+# vim:ts=4:sw=4:et:sta
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/object.t perl-5.10.0/ext/Test/Harness/t/object.t
---- perl-5.10.0.orig/ext/Test/Harness/t/object.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/object.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,37 @@
-+#!/usr/bin/perl -wT
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 7;
-+
-+use_ok('TAP::Object');
-+
-+can_ok( 'TAP::Object', 'new' );
-+can_ok( 'TAP::Object', '_initialize' );
-+can_ok( 'TAP::Object', '_croak' );
-+
-+{
-+
-+    package TAP::TestObj;
-+    use vars qw(@ISA);
-+    @ISA = qw(TAP::Object);
-+
-+    sub _initialize {
-+        my $self = shift;
-+        $self->{init} = 1;
-+        $self->{args} = [@_];
-+        return $self;
-+    }
-+}
-+
-+# I know these tests are simple, but they're documenting the base API, so
-+# necessary none-the-less...
-+my $obj = TAP::TestObj->new( 'foo', { bar => 'baz' } );
-+ok( $obj->{init}, '_initialize' );
-+is_deeply( $obj->{args}, [ 'foo', { bar => 'baz' } ], '_initialize: args' );
-+
-+eval { $obj->_croak('eek') };
-+my $err = $@;
-+like( $err, qr/^eek/, '_croak' );
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/parse.t perl-5.10.0/ext/Test/Harness/t/parse.t
---- perl-5.10.0.orig/ext/Test/Harness/t/parse.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/parse.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,1048 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
-+    }
-+    else {
-+        use lib 't/lib';
-+    }
-+}
-+
-+use Test::More tests => 282;
-+use IO::c55Capture;
-+
-+use File::Spec;
-+
-+use TAP::Parser;
-+use TAP::Parser::IteratorFactory;
-+
-+sub _get_results {
-+    my $parser = shift;
-+    my @results;
-+    while ( defined( my $result = $parser->next ) ) {
-+        push @results => $result;
-+    }
-+    return @results;
-+}
-+
-+my ( $PARSER, $PLAN, $PRAGMA, $TEST, $COMMENT, $BAILOUT, $UNKNOWN, $YAML, $VERSION ) = qw(
-+  TAP::Parser
-+  TAP::Parser::Result::Plan
-+  TAP::Parser::Result::Pragma
-+  TAP::Parser::Result::Test
-+  TAP::Parser::Result::Comment
-+  TAP::Parser::Result::Bailout
-+  TAP::Parser::Result::Unknown
-+  TAP::Parser::Result::YAML
-+  TAP::Parser::Result::Version
-+);
-+
-+my $factory = TAP::Parser::IteratorFactory->new;
-+
-+my $tap = <<'END_TAP';
-+TAP version 13
-+1..7
-+ok 1 - input file opened
-+... this is junk
-+not ok first line of the input valid # todo some data
-+# this is a comment
-+ok 3 - read the rest of the file
-+not ok 4 - this is a real failure
-+  --- YAML!
-+  ...
-+ok 5 # skip we have no description
-+ok 6 - you shall not pass! # TODO should have failed
-+not ok 7 - Gandalf wins.  Game over.  # TODO 'bout time!
-+END_TAP
-+
-+can_ok $PARSER, 'new';
-+my $parser = $PARSER->new( { tap => $tap } );
-+isa_ok $parser, $PARSER, '... and the object it returns';
-+
-+ok $ENV{TAP_VERSION}, 'TAP_VERSION env variable should be set';
-+
-+# results() is sane?
-+
-+my @results = _get_results($parser);
-+is scalar @results, 12, '... and there should be one for each line';
-+
-+my $version = shift @results;
-+isa_ok $version, $VERSION;
-+is $version->version, '13', '... and the version should be 13';
-+
-+# check the test plan
-+
-+my $result = shift @results;
-+isa_ok $result, $PLAN;
-+can_ok $result, 'type';
-+is $result->type, 'plan', '... and it should report the correct type';
-+ok $result->is_plan, '... and it should identify itself as a plan';
-+is $result->plan, '1..7', '... and identify the plan';
-+ok !$result->directive,   '... and this plan should not have a directive';
-+ok !$result->explanation, '... or a directive explanation';
-+is $result->as_string, '1..7',
-+  '... and have the correct string representation';
-+is $result->raw, '1..7', '... and raw() should return the original line';
-+
-+# a normal, passing test
-+
-+my $test = shift @results;
-+isa_ok $test, $TEST;
-+is $test->type, 'test', '... and it should report the correct type';
-+ok $test->is_test, '... and it should identify itself as a test';
-+is $test->ok,      'ok', '... and it should have the correct ok()';
-+ok $test->is_ok,   '... and the correct boolean version of is_ok()';
-+ok $test->is_actual_ok,
-+  '... and the correct boolean version of is_actual_ok()';
-+is $test->number, 1, '... and have the correct test number';
-+is $test->description, '- input file opened',
-+  '... and the correct description';
-+ok !$test->directive,   '... and not have a directive';
-+ok !$test->explanation, '... or a directive explanation';
-+ok !$test->has_skip,    '... and it is not a SKIPped test';
-+ok !$test->has_todo,    '... nor a TODO test';
-+is $test->as_string, 'ok 1 - input file opened',
-+  '... and its string representation should be correct';
-+is $test->raw, 'ok 1 - input file opened',
-+  '... and raw() should return the original line';
-+
-+# junk lines should be preserved
-+
-+my $unknown = shift @results;
-+isa_ok $unknown, $UNKNOWN;
-+is $unknown->type, 'unknown', '... and it should report the correct type';
-+ok $unknown->is_unknown, '... and it should identify itself as unknown';
-+is $unknown->as_string,  '... this is junk',
-+  '... and its string representation should be returned verbatim';
-+is $unknown->raw, '... this is junk',
-+  '... and raw() should return the original line';
-+
-+# a failing test, which also happens to have a directive
-+
-+my $failed = shift @results;
-+isa_ok $failed, $TEST;
-+is $failed->type, 'test', '... and it should report the correct type';
-+ok $failed->is_test, '... and it should identify itself as a test';
-+is $failed->ok,      'not ok', '... and it should have the correct ok()';
-+ok $failed->is_ok,   '... and TODO tests should always pass';
-+ok !$failed->is_actual_ok,
-+  '... and the correct boolean version of is_actual_ok ()';
-+is $failed->number, 2, '... and have the correct failed number';
-+is $failed->description, 'first line of the input valid',
-+  '... and the correct description';
-+is $failed->directive, 'TODO', '... and should have the correct directive';
-+is $failed->explanation, 'some data',
-+  '... and the correct directive explanation';
-+ok !$failed->has_skip, '... and it is not a SKIPped failed';
-+ok $failed->has_todo, '... but it is a TODO succeeded';
-+is $failed->as_string,
-+  'not ok 2 first line of the input valid # TODO some data',
-+  '... and its string representation should be correct';
-+is $failed->raw, 'not ok first line of the input valid # todo some data',
-+  '... and raw() should return the original line';
-+
-+# comments
-+
-+my $comment = shift @results;
-+isa_ok $comment, $COMMENT;
-+is $comment->type, 'comment', '... and it should report the correct type';
-+ok $comment->is_comment, '... and it should identify itself as a comment';
-+is $comment->comment,    'this is a comment',
-+  '... and you should be able to fetch the comment';
-+is $comment->as_string, '# this is a comment',
-+  '... and have the correct string representation';
-+is $comment->raw, '# this is a comment',
-+  '... and raw() should return the original line';
-+
-+# another normal, passing test
-+
-+$test = shift @results;
-+isa_ok $test, $TEST;
-+is $test->type, 'test', '... and it should report the correct type';
-+ok $test->is_test, '... and it should identify itself as a test';
-+is $test->ok,      'ok', '... and it should have the correct ok()';
-+ok $test->is_ok,   '... and the correct boolean version of is_ok()';
-+ok $test->is_actual_ok,
-+  '... and the correct boolean version of is_actual_ok()';
-+is $test->number, 3, '... and have the correct test number';
-+is $test->description, '- read the rest of the file',
-+  '... and the correct description';
-+ok !$test->directive,   '... and not have a directive';
-+ok !$test->explanation, '... or a directive explanation';
-+ok !$test->has_skip,    '... and it is not a SKIPped test';
-+ok !$test->has_todo,    '... nor a TODO test';
-+is $test->as_string, 'ok 3 - read the rest of the file',
-+  '... and its string representation should be correct';
-+is $test->raw, 'ok 3 - read the rest of the file',
-+  '... and raw() should return the original line';
-+
-+# a failing test
-+
-+$failed = shift @results;
-+isa_ok $failed, $TEST;
-+is $failed->type, 'test', '... and it should report the correct type';
-+ok $failed->is_test, '... and it should identify itself as a test';
-+is $failed->ok, 'not ok', '... and it should have the correct ok()';
-+ok !$failed->is_ok, '... and the tests should not have passed';
-+ok !$failed->is_actual_ok,
-+  '... and the correct boolean version of is_actual_ok ()';
-+is $failed->number, 4, '... and have the correct failed number';
-+is $failed->description, '- this is a real failure',
-+  '... and the correct description';
-+ok !$failed->directive,   '... and should have no directive';
-+ok !$failed->explanation, '... and no directive explanation';
-+ok !$failed->has_skip,    '... and it is not a SKIPped failed';
-+ok !$failed->has_todo,    '... and not a TODO test';
-+is $failed->as_string, 'not ok 4 - this is a real failure',
-+  '... and its string representation should be correct';
-+is $failed->raw, 'not ok 4 - this is a real failure',
-+  '... and raw() should return the original line';
-+
-+# Some YAML
-+my $yaml = shift @results;
-+isa_ok $yaml, $YAML;
-+is $yaml->type, 'yaml', '... and it should report the correct type';
-+ok $yaml->is_yaml, '... and it should identify itself as yaml';
-+is_deeply $yaml->data, 'YAML!', '... and data should be correct';
-+
-+# ok 5 # skip we have no description
-+# skipped test
-+
-+$test = shift @results;
-+isa_ok $test, $TEST;
-+is $test->type, 'test', '... and it should report the correct type';
-+ok $test->is_test, '... and it should identify itself as a test';
-+is $test->ok,      'ok', '... and it should have the correct ok()';
-+ok $test->is_ok,   '... and the correct boolean version of is_ok()';
-+ok $test->is_actual_ok,
-+  '... and the correct boolean version of is_actual_ok()';
-+is $test->number, 5, '... and have the correct test number';
-+ok !$test->description, '... and skipped tests have no description';
-+is $test->directive, 'SKIP', '... and the correct directive';
-+is $test->explanation, 'we have no description',
-+  '... but we should have an explanation';
-+ok $test->has_skip, '... and it is a SKIPped test';
-+ok !$test->has_todo, '... but not a TODO test';
-+is $test->as_string, 'ok 5 # SKIP we have no description',
-+  '... and its string representation should be correct';
-+is $test->raw, 'ok 5 # skip we have no description',
-+  '... and raw() should return the original line';
-+
-+# a failing test, which also happens to have a directive
-+# ok 6 - you shall not pass! # TODO should have failed
-+
-+my $bonus = shift @results;
-+isa_ok $bonus, $TEST;
-+can_ok $bonus, 'todo_passed';
-+is $bonus->type, 'test', 'TODO tests should parse correctly';
-+ok $bonus->is_test, '... and it should identify itself as a test';
-+is $bonus->ok,      'ok', '... and it should have the correct ok()';
-+ok $bonus->is_ok,   '... and TODO tests should not always pass';
-+ok $bonus->is_actual_ok,
-+  '... and the correct boolean version of is_actual_ok ()';
-+is $bonus->number, 6, '... and have the correct failed number';
-+is $bonus->description, '- you shall not pass!',
-+  '... and the correct description';
-+is $bonus->directive, 'TODO', '... and should have the correct directive';
-+is $bonus->explanation, 'should have failed',
-+  '... and the correct directive explanation';
-+ok !$bonus->has_skip, '... and it is not a SKIPped failed';
-+ok $bonus->has_todo,  '... but it is a TODO succeeded';
-+is $bonus->as_string, 'ok 6 - you shall not pass! # TODO should have failed',
-+  '... and its string representation should be correct';
-+is $bonus->raw, 'ok 6 - you shall not pass! # TODO should have failed',
-+  '... and raw() should return the original line';
-+ok $bonus->todo_passed,
-+  '... todo_bonus() should pass for TODO tests which unexpectedly succeed';
-+
-+# not ok 7 - Gandalf wins.  Game over.  # TODO 'bout time!
-+
-+my $passed = shift @results;
-+isa_ok $passed, $TEST;
-+can_ok $passed, 'todo_passed';
-+is $passed->type, 'test', 'TODO tests should parse correctly';
-+ok $passed->is_test, '... and it should identify itself as a test';
-+is $passed->ok,      'not ok', '... and it should have the correct ok()';
-+ok $passed->is_ok,   '... and TODO tests should always pass';
-+ok !$passed->is_actual_ok,
-+  '... and the correct boolean version of is_actual_ok ()';
-+is $passed->number, 7, '... and have the correct passed number';
-+is $passed->description, '- Gandalf wins.  Game over.',
-+  '... and the correct description';
-+is $passed->directive, 'TODO', '... and should have the correct directive';
-+is $passed->explanation, "'bout time!",
-+  '... and the correct directive explanation';
-+ok !$passed->has_skip, '... and it is not a SKIPped passed';
-+ok $passed->has_todo, '... but it is a TODO succeeded';
-+is $passed->as_string,
-+  "not ok 7 - Gandalf wins.  Game over. # TODO 'bout time!",
-+  '... and its string representation should be correct';
-+is $passed->raw, "not ok 7 - Gandalf wins.  Game over.  # TODO 'bout time!",
-+  '... and raw() should return the original line';
-+ok !$passed->todo_passed,
-+  '... todo_passed() should not pass for TODO tests which failed';
-+
-+# test parse results
-+
-+can_ok $parser, 'passed';
-+is $parser->passed, 6,
-+  '... and we should have the correct number of passed tests';
-+is_deeply [ $parser->passed ], [ 1, 2, 3, 5, 6, 7 ],
-+  '... and get a list of the passed tests';
-+
-+can_ok $parser, 'failed';
-+is $parser->failed, 1, '... and the correct number of failed tests';
-+is_deeply [ $parser->failed ], [4], '... and get a list of the failed tests';
-+
-+can_ok $parser, 'actual_passed';
-+is $parser->actual_passed, 4,
-+  '... and we should have the correct number of actually passed tests';
-+is_deeply [ $parser->actual_passed ], [ 1, 3, 5, 6 ],
-+  '... and get a list of the actually passed tests';
-+
-+can_ok $parser, 'actual_failed';
-+is $parser->actual_failed, 3,
-+  '... and the correct number of actually failed tests';
-+is_deeply [ $parser->actual_failed ], [ 2, 4, 7 ],
-+  '... or get a list of the actually failed tests';
-+
-+can_ok $parser, 'todo';
-+is $parser->todo, 3,
-+  '... and we should have the correct number of TODO tests';
-+is_deeply [ $parser->todo ], [ 2, 6, 7 ],
-+  '... and get a list of the TODO tests';
-+
-+can_ok $parser, 'skipped';
-+is $parser->skipped, 1,
-+  '... and we should have the correct number of skipped tests';
-+is_deeply [ $parser->skipped ], [5],
-+  '... and get a list of the skipped tests';
-+
-+# check the plan
-+
-+can_ok $parser, 'plan';
-+is $parser->plan,          '1..7', '... and we should have the correct plan';
-+is $parser->tests_planned, 7,      '... and the correct number of tests';
-+
-+# "Unexpectedly succeeded"
-+can_ok $parser, 'todo_passed';
-+is scalar $parser->todo_passed, 1,
-+  '... and it should report the number of tests which unexpectedly succeeded';
-+is_deeply [ $parser->todo_passed ], [6],
-+  '... or *which* tests unexpectedly succeeded';
-+
-+#
-+# Bug report from Torsten Schoenfeld
-+# Makes sure parser can handle blank lines
-+#
-+
-+$tap = <<'END_TAP';
-+1..2
-+ok 1 - input file opened
-+
-+
-+ok 2 - read the rest of the file
-+END_TAP
-+
-+my $aref = [ split /\n/ => $tap ];
-+
-+can_ok $PARSER, 'new';
-+$parser = $PARSER->new( { stream => $factory->make_iterator($aref) } );
-+isa_ok $parser, $PARSER, '... and calling it should succeed';
-+
-+# results() is sane?
-+
-+ok @results = _get_results($parser), 'The parser should return results';
-+is scalar @results, 5, '... and there should be one for each line';
-+
-+# check the test plan
-+
-+$result = shift @results;
-+isa_ok $result, $PLAN;
-+can_ok $result, 'type';
-+is $result->type, 'plan', '... and it should report the correct type';
-+ok $result->is_plan,   '... and it should identify itself as a plan';
-+is $result->plan,      '1..2', '... and identify the plan';
-+is $result->as_string, '1..2',
-+  '... and have the correct string representation';
-+is $result->raw, '1..2', '... and raw() should return the original line';
-+
-+# a normal, passing test
-+
-+$test = shift @results;
-+isa_ok $test, $TEST;
-+is $test->type, 'test', '... and it should report the correct type';
-+ok $test->is_test, '... and it should identify itself as a test';
-+is $test->ok,      'ok', '... and it should have the correct ok()';
-+ok $test->is_ok,   '... and the correct boolean version of is_ok()';
-+ok $test->is_actual_ok,
-+  '... and the correct boolean version of is_actual_ok()';
-+is $test->number, 1, '... and have the correct test number';
-+is $test->description, '- input file opened',
-+  '... and the correct description';
-+ok !$test->directive,   '... and not have a directive';
-+ok !$test->explanation, '... or a directive explanation';
-+ok !$test->has_skip,    '... and it is not a SKIPped test';
-+ok !$test->has_todo,    '... nor a TODO test';
-+is $test->as_string, 'ok 1 - input file opened',
-+  '... and its string representation should be correct';
-+is $test->raw, 'ok 1 - input file opened',
-+  '... and raw() should return the original line';
-+
-+# junk lines should be preserved
-+
-+$unknown = shift @results;
-+isa_ok $unknown, $UNKNOWN;
-+is $unknown->type, 'unknown', '... and it should report the correct type';
-+ok $unknown->is_unknown, '... and it should identify itself as unknown';
-+is $unknown->as_string,  '',
-+  '... and its string representation should be returned verbatim';
-+is $unknown->raw, '', '... and raw() should return the original line';
-+
-+# ... and the second empty line
-+
-+$unknown = shift @results;
-+isa_ok $unknown, $UNKNOWN;
-+is $unknown->type, 'unknown', '... and it should report the correct type';
-+ok $unknown->is_unknown, '... and it should identify itself as unknown';
-+is $unknown->as_string,  '',
-+  '... and its string representation should be returned verbatim';
-+is $unknown->raw, '', '... and raw() should return the original line';
-+
-+# a passing test
-+
-+$test = shift @results;
-+isa_ok $test, $TEST;
-+is $test->type, 'test', '... and it should report the correct type';
-+ok $test->is_test, '... and it should identify itself as a test';
-+is $test->ok,      'ok', '... and it should have the correct ok()';
-+ok $test->is_ok,   '... and the correct boolean version of is_ok()';
-+ok $test->is_actual_ok,
-+  '... and the correct boolean version of is_actual_ok()';
-+is $test->number, 2, '... and have the correct test number';
-+is $test->description, '- read the rest of the file',
-+  '... and the correct description';
-+ok !$test->directive,   '... and not have a directive';
-+ok !$test->explanation, '... or a directive explanation';
-+ok !$test->has_skip,    '... and it is not a SKIPped test';
-+ok !$test->has_todo,    '... nor a TODO test';
-+is $test->as_string, 'ok 2 - read the rest of the file',
-+  '... and its string representation should be correct';
-+is $test->raw, 'ok 2 - read the rest of the file',
-+  '... and raw() should return the original line';
-+
-+is scalar $parser->passed, 2,
-+  'Empty junk lines should not affect the correct number of tests passed';
-+
-+{
-+
-+    # set a spool to write to
-+    tie local *SPOOL, 'IO::c55Capture';
-+
-+    my $tap = <<'END_TAP';
-+TAP version 13
-+1..7
-+ok 1 - input file opened
-+... this is junk
-+not ok first line of the input valid # todo some data
-+# this is a comment
-+ok 3 - read the rest of the file
-+not ok 4 - this is a real failure
-+  --- YAML!
-+  ...
-+ok 5 # skip we have no description
-+ok 6 - you shall not pass! # TODO should have failed
-+not ok 7 - Gandalf wins.  Game over.  # TODO 'bout time!
-+END_TAP
-+
-+    {
-+        my $parser = $PARSER->new(
-+            {   tap   => $tap,
-+                spool => \*SPOOL,
-+            }
-+        );
-+
-+        _get_results($parser);
-+
-+        my @spooled = tied(*SPOOL)->dump();
-+
-+        is @spooled, 24, 'coverage testing for spool attribute of parser';
-+        is join( '', @spooled ), $tap, "spooled tap matches";
-+    }
-+
-+    {
-+        my $parser = $PARSER->new(
-+            {   tap   => $tap,
-+                spool => \*SPOOL,
-+            }
-+        );
-+
-+        $parser->callback( 'ALL', sub { } );
-+
-+        _get_results($parser);
-+
-+        my @spooled = tied(*SPOOL)->dump();
-+
-+        is @spooled, 24, 'coverage testing for spool attribute of parser';
-+        is join( '', @spooled ), $tap, "spooled tap matches";
-+    }
-+}
-+
-+{
-+
-+    # _initialize coverage
-+
-+    my $x = bless [], 'kjsfhkjsdhf';
-+
-+    my @die;
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        $PARSER->new();
-+    };
-+
-+    is @die, 1, 'coverage testing for _initialize';
-+
-+    like pop @die, qr/PANIC:\s+could not determine stream at/,
-+      '...and it failed as expected';
-+
-+    @die = ();
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        $PARSER->new(
-+            {   stream => 'stream',
-+                tap    => 'tap',
-+                source => 'source',    # only one of these is allowed
-+            }
-+        );
-+    };
-+
-+    is @die, 1, 'coverage testing for _initialize';
-+
-+    like pop @die,
-+      qr/You may only choose one of 'exec', 'stream', 'tap' or 'source'/,
-+      '...and it failed as expected';
-+}
-+
-+{
-+
-+    # coverage of todo_failed
-+
-+    my $tap = <<'END_TAP';
-+TAP version 13
-+1..7
-+ok 1 - input file opened
-+... this is junk
-+not ok first line of the input valid # todo some data
-+# this is a comment
-+ok 3 - read the rest of the file
-+not ok 4 - this is a real failure
-+  --- YAML!
-+  ...
-+ok 5 # skip we have no description
-+ok 6 - you shall not pass! # TODO should have failed
-+not ok 7 - Gandalf wins.  Game over.  # TODO 'bout time!
-+END_TAP
-+
-+    my $parser = $PARSER->new( { tap => $tap } );
-+
-+    _get_results($parser);
-+
-+    my @warn;
-+
-+    eval {
-+        local $SIG{__WARN__} = sub { push @warn, @_ };
-+
-+        $parser->todo_failed;
-+    };
-+
-+    is @warn, 1, 'coverage testing of todo_failed';
-+
-+    like pop @warn,
-+      qr/"todo_failed" is deprecated.  Please use "todo_passed".  See the docs[.]/,
-+      '..and failed as expected'
-+}
-+
-+{
-+
-+    # coverage testing for T::P::_initialize
-+
-+    # coverage of the source argument paths
-+
-+    # ref argument to source
-+
-+    my $parser = TAP::Parser->new( { source => [ split /$/, $tap ] } );
-+
-+    isa_ok $parser, 'TAP::Parser';
-+
-+    isa_ok $parser->_stream, 'TAP::Parser::Iterator::Array';
-+
-+    # uncategorisable argument to source
-+    my @die;
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        $parser = TAP::Parser->new( { source => 'nosuchfile' } );
-+    };
-+
-+    is @die, 1, 'uncategorisable source';
-+
-+    like pop @die, qr/Cannot determine source for nosuchfile/,
-+      '... and we died as expected';
-+}
-+
-+{
-+
-+    # coverage test of perl source with switches
-+
-+    my $parser = TAP::Parser->new(
-+        {   source => File::Spec->catfile(
-+                (   $ENV{PERL_CORE}
-+                    ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
-+                    : ()
-+                ),
-+                't',
-+                'sample-tests',
-+                'simple'
-+            ),
-+        }
-+    );
-+
-+    isa_ok $parser, 'TAP::Parser';
-+
-+    isa_ok $parser->_stream, 'TAP::Parser::Iterator::Process';
-+
-+    # Workaround for Mac OS X problem wrt closing the iterator without
-+    # reading from it.
-+    $parser->next;
-+}
-+
-+{
-+
-+    # coverage testing for TAP::Parser::has_problems
-+
-+    # we're going to need to test lots of fragments of tap
-+    # to cover all the different boolean tests
-+
-+    # currently covered are no problems and failed, so let's next test
-+    # todo_passed
-+
-+    my $tap = <<'END_TAP';
-+TAP version 13
-+1..2
-+ok 1 - input file opened
-+ok 2 - Gandalf wins.  Game over.  # TODO 'bout time!
-+END_TAP
-+
-+    my $parser = TAP::Parser->new( { tap => $tap } );
-+
-+    _get_results($parser);
-+
-+    ok !$parser->failed, 'parser didnt fail';
-+    ok $parser->todo_passed, '... and todo_passed is true';
-+
-+    ok !$parser->has_problems, '... and has_problems is false';
-+
-+    # now parse_errors
-+
-+    $tap = <<'END_TAP';
-+TAP version 13
-+1..2
-+SMACK
-+END_TAP
-+
-+    $parser = TAP::Parser->new( { tap => $tap } );
-+
-+    _get_results($parser);
-+
-+    ok !$parser->failed,      'parser didnt fail';
-+    ok !$parser->todo_passed, '... and todo_passed is false';
-+    ok $parser->parse_errors, '... and parse_errors is true';
-+
-+    ok $parser->has_problems, '... and has_problems';
-+
-+    # Now wait and exit are hard to do in an OS platform-independent way, so
-+    # we won't even bother
-+
-+    $tap = <<'END_TAP';
-+TAP version 13
-+1..2
-+ok 1 - input file opened
-+ok 2 - Gandalf wins
-+END_TAP
-+
-+    $parser = TAP::Parser->new( { tap => $tap } );
-+
-+    _get_results($parser);
-+
-+    $parser->wait(1);
-+
-+    ok !$parser->failed,       'parser didnt fail';
-+    ok !$parser->todo_passed,  '... and todo_passed is false';
-+    ok !$parser->parse_errors, '... and parse_errors is false';
-+
-+    ok $parser->wait, '... and wait is set';
-+
-+    ok $parser->has_problems, '... and has_problems';
-+
-+    # and use the same for exit
-+
-+    $parser->wait(0);
-+    $parser->exit(1);
-+
-+    ok !$parser->failed,       'parser didnt fail';
-+    ok !$parser->todo_passed,  '... and todo_passed is false';
-+    ok !$parser->parse_errors, '... and parse_errors is false';
-+    ok !$parser->wait,         '... and wait is not set';
-+
-+    ok $parser->exit, '... and exit is set';
-+
-+    ok $parser->has_problems, '... and has_problems';
-+}
-+
-+{
-+
-+    # coverage testing of the version states
-+
-+    my $tap = <<'END_TAP';
-+TAP version 12
-+1..2
-+ok 1 - input file opened
-+ok 2 - Gandalf wins
-+END_TAP
-+
-+    my $parser = TAP::Parser->new( { tap => $tap } );
-+
-+    _get_results($parser);
-+
-+    my @errors = $parser->parse_errors;
-+
-+    is @errors, 1, 'test too low version number';
-+
-+    like pop @errors,
-+      qr/Explicit TAP version must be at least 13. Got version 12/,
-+      '... and trapped expected version error';
-+
-+    # now too high a version
-+    $tap = <<'END_TAP';
-+TAP version 14
-+1..2
-+ok 1 - input file opened
-+ok 2 - Gandalf wins
-+END_TAP
-+
-+    $parser = TAP::Parser->new( { tap => $tap } );
-+
-+    _get_results($parser);
-+
-+    @errors = $parser->parse_errors;
-+
-+    is @errors, 1, 'test too high version number';
-+
-+    like pop @errors,
-+      qr/TAP specified version 14 but we don't know about versions later than 13/,
-+      '... and trapped expected version error';
-+}
-+
-+{
-+
-+    # coverage testing of TAP version in the wrong place
-+
-+    my $tap = <<'END_TAP';
-+1..2
-+ok 1 - input file opened
-+TAP version 12
-+ok 2 - Gandalf wins
-+END_TAP
-+
-+    my $parser = TAP::Parser->new( { tap => $tap } );
-+
-+    _get_results($parser);
-+
-+    my @errors = $parser->parse_errors;
-+
-+    is @errors, 1, 'test TAP version number in wrong place';
-+
-+    like pop @errors,
-+      qr/If TAP version is present it must be the first line of output/,
-+      '... and trapped expected version error';
-+
-+}
-+
-+{
-+
-+    # we're going to bash the internals a bit (but using the API as
-+    # much as possible) to force grammar->tokenise() to fail
-+
-+  # firstly we'll create a stream that dies when its next_raw method is called
-+
-+    package TAP::Parser::Iterator::Dies;
-+
-+    use strict;
-+    use vars qw(@ISA);
-+
-+    @ISA = qw(TAP::Parser::Iterator);
-+
-+    sub next_raw {
-+        die 'this is the dying iterator';
-+    }
-+
-+    # required as part of the TPI interface
-+    sub exit { }
-+    sub wait { }
-+
-+    package main;
-+
-+    # now build a standard parser
-+
-+    my $tap = <<'END_TAP';
-+1..2
-+ok 1 - input file opened
-+ok 2 - Gandalf wins
-+END_TAP
-+
-+    {
-+        my $parser = TAP::Parser->new( { tap => $tap } );
-+
-+        # build a dying stream
-+        my $stream = TAP::Parser::Iterator::Dies->new;
-+
-+        # now replace the stream - we're forced to us an T::P intenal
-+        # method for this
-+        $parser->_stream($stream);
-+
-+        # build a new grammar
-+        my $grammar = TAP::Parser::Grammar->new(
-+            {   stream => $stream,
-+                parser => $parser
-+            }
-+        );
-+
-+        # replace our grammar with this new one
-+        $parser->_grammar($grammar);
-+
-+        # now call next on the parser, and the grammar should die
-+        my $result = $parser->next;    # will die in iterator
-+
-+        is $result, undef, 'iterator dies';
-+
-+        my @errors = $parser->parse_errors;
-+        is @errors, 2, '...and caught expected errrors';
-+
-+        like shift @errors, qr/this is the dying iterator/,
-+          '...and it was what we expected';
-+    }
-+
-+    # Do it all again with callbacks to exercise the other code path in
-+    # the unrolled iterator
-+    {
-+        my $parser = TAP::Parser->new( { tap => $tap } );
-+
-+        $parser->callback( 'ALL', sub { } );
-+
-+        # build a dying stream
-+        my $stream = TAP::Parser::Iterator::Dies->new;
-+
-+        # now replace the stream - we're forced to us an T::P intenal
-+        # method for this
-+        $parser->_stream($stream);
-+
-+        # build a new grammar
-+        my $grammar = TAP::Parser::Grammar->new(
-+            {   stream => $stream,
-+                parser => $parser
-+            }
-+        );
-+
-+        # replace our grammar with this new one
-+        $parser->_grammar($grammar);
-+
-+        # now call next on the parser, and the grammar should die
-+        my $result = $parser->next;    # will die in iterator
-+
-+        is $result, undef, 'iterator dies';
-+
-+        my @errors = $parser->parse_errors;
-+        is @errors, 2, '...and caught expected errrors';
-+
-+        like shift @errors, qr/this is the dying iterator/,
-+          '...and it was what we expected';
-+    }
-+}
-+
-+{
-+
-+    # coverage testing of TAP::Parser::_next_state
-+
-+    package TAP::Parser::WithBrokenState;
-+    use vars qw(@ISA);
-+
-+    @ISA = qw( TAP::Parser );
-+
-+    sub _make_state_table {
-+        return { INIT => { plan => { goto => 'FOO' } } };
-+    }
-+
-+    package main;
-+
-+    my $tap = <<'END_TAP';
-+1..2
-+ok 1 - input file opened
-+ok 2 - Gandalf wins
-+END_TAP
-+
-+    my $parser = TAP::Parser::WithBrokenState->new( { tap => $tap } );
-+
-+    my @die;
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        $parser->next;
-+        $parser->next;
-+    };
-+
-+    is @die, 1, 'detect broken state machine';
-+
-+    like pop @die, qr/Illegal state: FOO/,
-+      '...and the message is as we expect';
-+}
-+
-+{
-+
-+    # coverage testing of TAP::Parser::_iter
-+
-+    package TAP::Parser::WithBrokenIter;
-+    use vars qw(@ISA);
-+
-+    @ISA = qw( TAP::Parser );
-+
-+    sub _iter {return}
-+
-+    package main;
-+
-+    my $tap = <<'END_TAP';
-+1..2
-+ok 1 - input file opened
-+ok 2 - Gandalf wins
-+END_TAP
-+
-+    my $parser = TAP::Parser::WithBrokenIter->new( { tap => $tap } );
-+
-+    my @die;
-+
-+    eval {
-+        local $SIG{__WARN__} = sub { };
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        $parser->next;
-+    };
-+
-+    is @die, 1, 'detect broken iter';
-+
-+    like pop @die, qr/Can't use/, '...and the message is as we expect';
-+}
-+
-+SKIP: {
-+
-+    # http://markmail.org/message/rkxbo6ft7yorgnzb
-+    skip "Crashes on older Perls", 2 if $] <= 5.008004 || $] == 5.009;
-+
-+    # coverage testing of TAP::Parser::_finish
-+
-+    my $tap = <<'END_TAP';
-+1..2
-+ok 1 - input file opened
-+ok 2 - Gandalf wins
-+END_TAP
-+
-+    my $parser = TAP::Parser->new( { tap => $tap } );
-+
-+    $parser->tests_run(999);
-+
-+    my @die;
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        _get_results $parser;
-+    };
-+
-+    is @die, 1, 'detect broken test counts';
-+
-+    like pop @die,
-+      qr/Panic: planned test count [(]1001[)] did not equal sum of passed [(]0[)] and failed [(]2[)] tests!/,
-+      '...and the message is as we expect';
-+}
-+
-+{
-+
-+    # Sanity check on state table
-+
-+    my $parser      = TAP::Parser->new( { tap => "1..1\nok 1\n" } );
-+    my $state_table = $parser->_make_state_table;
-+    my @states      = sort keys %$state_table;
-+    my @expect      = sort qw(
-+      bailout comment plan pragma test unknown version yaml
-+    );
-+
-+    my %reachable = ( INIT => 1 );
-+
-+    for my $name (@states) {
-+        my $state      = $state_table->{$name};
-+        my @can_handle = sort keys %$state;
-+        is_deeply \@can_handle, \@expect, "token types handled in $name";
-+        for my $type (@can_handle) {
-+            $reachable{$_}++
-+              for grep {defined}
-+              map      { $state->{$type}->{$_} } qw(goto continue);
-+        }
-+    }
-+
-+    is_deeply [ sort keys %reachable ], [@states], "all states reachable";
-+}
-+
-+{
-+
-+    # exit, wait, ignore_exit interactions
-+
-+    my @truth = (
-+        [ 0, 0, 0, 0 ],
-+        [ 0, 0, 1, 0 ],
-+        [ 1, 0, 0, 1 ],
-+        [ 1, 0, 1, 0 ],
-+        [ 1, 1, 0, 1 ],
-+        [ 1, 1, 1, 0 ],
-+        [ 0, 1, 0, 1 ],
-+        [ 0, 1, 1, 0 ],
-+    );
-+
-+    for my $t (@truth) {
-+        my ( $wait, $exit, $ignore_exit, $has_problems ) = @$t;
-+        my $test_parser = sub {
-+            my $parser = shift;
-+            $parser->wait($wait);
-+            $parser->exit($exit);
-+            ok $has_problems ? $parser->has_problems : !$parser->has_problems,
-+              "exit=$exit, wait=$wait, ignore=$ignore_exit";
-+        };
-+
-+        my $parser = TAP::Parser->new( { tap => "1..1\nok 1\n" } );
-+        $parser->ignore_exit($ignore_exit);
-+        $test_parser->($parser);
-+
-+        $test_parser->(
-+            TAP::Parser->new(
-+                { tap => "1..1\nok 1\n", ignore_exit => $ignore_exit }
-+            )
-+        );
-+    }
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/parser-config.t perl-5.10.0/ext/Test/Harness/t/parser-config.t
---- perl-5.10.0.orig/ext/Test/Harness/t/parser-config.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/parser-config.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,46 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+use vars qw(%INIT %CUSTOM);
-+
-+use Test::More tests => 11;
-+use File::Spec::Functions qw( catfile updir );
-+use TAP::Parser;
-+
-+use_ok('MySource');
-+use_ok('MyPerlSource');
-+use_ok('MyGrammar');
-+use_ok('MyIteratorFactory');
-+use_ok('MyResultFactory');
-+
-+my @t_path = $ENV{PERL_CORE} ? ( updir(), 'ext', 'Test', 'Harness' ) : ();
-+my $source = catfile( @t_path, 't', 'source_tests', 'source' );
-+my %customize = (
-+    source_class           => 'MySource',
-+    perl_source_class      => 'MyPerlSource',
-+    grammar_class          => 'MyGrammar',
-+    iterator_factory_class => 'MyIteratorFactory',
-+    result_factory_class   => 'MyResultFactory',
-+);
-+my $p = TAP::Parser->new(
-+    {   source => $source,
-+        %customize,
-+    }
-+);
-+ok( $p, 'new customized parser' );
-+
-+foreach my $key ( keys %customize ) {
-+    is( $p->$key(), $customize{$key}, "customized $key" );
-+}
-+
-+# TODO: make sure these things are propogated down through the parser...
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/parser-subclass.t perl-5.10.0/ext/Test/Harness/t/parser-subclass.t
---- perl-5.10.0.orig/ext/Test/Harness/t/parser-subclass.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/parser-subclass.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,88 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+use vars qw(%INIT %CUSTOM);
-+
-+use Test::More tests => 24;
-+use File::Spec::Functions qw( catfile updir );
-+
-+use_ok('TAP::Parser::SubclassTest');
-+
-+# TODO: foreach my $source ( ... )
-+my @t_path = $ENV{PERL_CORE} ? ( updir(), 'ext', 'Test', 'Harness' ) : ();
-+
-+{    # perl source
-+    %INIT = %CUSTOM = ();
-+    my $source = catfile( @t_path, 't', 'subclass_tests', 'perl_source' );
-+    my $p = TAP::Parser::SubclassTest->new( { source => $source } );
-+
-+    # The grammar is lazily constructed so we need to ask for it to
-+    # trigger it's creation.
-+    my $grammer = $p->_grammar;
-+
-+    ok( $p->{initialized}, 'new subclassed parser' );
-+
-+    is( $p->source_class      => 'MySource',     'source_class' );
-+    is( $p->perl_source_class => 'MyPerlSource', 'perl_source_class' );
-+    is( $p->grammar_class     => 'MyGrammar',    'grammar_class' );
-+    is( $p->iterator_factory_class => 'MyIteratorFactory',
-+        'iterator_factory_class'
-+    );
-+    is( $p->result_factory_class => 'MyResultFactory',
-+        'result_factory_class'
-+    );
-+
-+    is( $INIT{MyPerlSource},   1, 'initialized MyPerlSource' );
-+    is( $CUSTOM{MyPerlSource}, 1, '... and it was customized' );
-+    is( $INIT{MyGrammar},      1, 'initialized MyGrammar' );
-+    is( $CUSTOM{MyGrammar},    1, '... and it was customized' );
-+
-+    # make sure overrided make_* methods work...
-+    %CUSTOM = ();
-+    $p->make_source;
-+    is( $CUSTOM{MySource}, 1, 'make custom source' );
-+    $p->make_perl_source;
-+    is( $CUSTOM{MyPerlSource}, 1, 'make custom perl source' );
-+    $p->make_grammar;
-+    is( $CUSTOM{MyGrammar}, 1, 'make custom grammar' );
-+    $p->make_iterator;
-+    is( $CUSTOM{MyIterator}, 1, 'make custom iterator' );
-+    $p->make_result;
-+    is( $CUSTOM{MyResult}, 1, 'make custom result' );
-+
-+    # make sure parser helpers use overrided classes too (the parser should
-+    # be the central source of configuration/overriding functionality)
-+    # The source is already tested above (parser doesn't keep a copy of the
-+    # source currently).  So only one to check is the Grammar:
-+    %INIT = %CUSTOM = ();
-+    my $r = $p->_grammar->tokenize;
-+    isa_ok( $r, 'MyResult', 'i has results' );
-+    is( $INIT{MyResult},        1, 'initialized MyResult' );
-+    is( $CUSTOM{MyResult},      1, '... and it was customized' );
-+    is( $INIT{MyResultFactory}, 1, '"initialized" MyResultFactory' );
-+}
-+
-+SKIP: {    # non-perl source
-+    %INIT = %CUSTOM = ();
-+    my $cat = '/bin/cat';
-+    unless ( -e $cat ) {
-+        skip "no '$cat'", 4;
-+    }
-+    my $file = catfile( @t_path, 't', 'data', 'catme.1' );
-+    my $p = TAP::Parser::SubclassTest->new( { exec => [ $cat => $file ] } );
-+
-+    is( $INIT{MySource},     1, 'initialized MySource subclass' );
-+    is( $CUSTOM{MySource},   1, '... and it was customized' );
-+    is( $INIT{MyIterator},   1, 'initialized MyIterator subclass' );
-+    is( $CUSTOM{MyIterator}, 1, '... and it was customized' );
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/perl5lib.t perl-5.10.0/ext/Test/Harness/t/perl5lib.t
---- perl-5.10.0.orig/ext/Test/Harness/t/perl5lib.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/perl5lib.t	2009-03-10 17:38:43.000000000 +0100
-@@ -0,0 +1,48 @@
-+#!/usr/bin/perl -w
-+
-+# Test that PERL5LIB is propogated from the harness process to the test
-+# process.
-+
-+use strict;
-+use lib 't/lib';
-+use Config;
-+
-+my $path_sep = $Config{path_sep};
-+
-+sub has_crazy_patch {
-+    my $sentinel = 'blirpzoffle';
-+    local $ENV{PERL5LIB} = $sentinel;
-+    my $command = join ' ',
-+      map {qq{"$_"}} ( $^X, '-e', 'print join q(:), @INC' );
-+    my $path = `$command`;
-+    my @got = ( $path =~ /($sentinel)/g );
-+    return @got > 1;
-+}
-+
-+use Test::More (
-+      $^O eq 'VMS' ? ( skip_all => 'VMS' )
-+    : has_crazy_patch() ? ( skip_all => 'Incompatible @INC patch' )
-+    : ( tests => 1 )
-+);
-+
-+use Test::Harness;
-+use App::Prove;
-+
-+# Change PERL5LIB so we ensure it's preserved.
-+$ENV{PERL5LIB} = join( $path_sep, 'wibble', $ENV{PERL5LIB} );
-+
-+open TEST, ">perl5lib_check.t.tmp";
-+print TEST <<"END";
-+#!/usr/bin/perl
-+use strict;
-+use Test::More tests => 1;
-+like \$ENV{PERL5LIB}, qr/(^|${path_sep})wibble${path_sep}/;
-+END
-+close TEST;
-+
-+END { 1 while unlink 'perl5lib_check.t.tmp'; }
-+
-+my $h = TAP::Harness->new( { lib => ['something'], verbosity => -3 } );
-+ok( !$h->runtests('perl5lib_check.t.tmp')->has_errors );
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/premature-bailout.t perl-5.10.0/ext/Test/Harness/t/premature-bailout.t
---- perl-5.10.0.orig/ext/Test/Harness/t/premature-bailout.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/premature-bailout.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,125 @@
-+#!/usr/bin/perl -wT
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 14;
-+
-+use TAP::Parser;
-+use TAP::Parser::IteratorFactory;
-+
-+sub tap_to_lines {
-+    my $string = shift;
-+    my @lines = ( $string =~ /.*\n/g );
-+    return \@lines;
-+}
-+
-+my $tap = <<'END_TAP';
-+1..4
-+ok 1 - input file opened
-+... this is junk
-+not ok first line of the input valid # todo some data
-+# this is a comment
-+ok 3 - read the rest of the file
-+not ok 4 - this is a real failure
-+Bail out!  We ran out of foobar.
-+not ok 5
-+END_TAP
-+
-+my $factory = TAP::Parser::IteratorFactory->new;
-+my $parser  = TAP::Parser->new(
-+    {   stream => $factory->make_iterator( tap_to_lines($tap) ),
-+    }
-+);
-+
-+# results() is sane?
-+
-+# check the test plan
-+my $result = $parser->next();
-+
-+# TEST
-+ok $result->is_plan, 'We should have a plan';
-+
-+# a normal, passing test
-+
-+my $test = $parser->next();
-+
-+# TEST
-+ok $test->is_test, '... and a test';
-+
-+# junk lines should be preserved
-+
-+my $unknown = $parser->next();
-+
-+# TEST
-+ok $unknown->is_unknown, '... and an unknown line';
-+
-+# a failing test, which also happens to have a directive
-+
-+my $failed = $parser->next();
-+
-+# TEST
-+ok $failed->is_test, '... and another test';
-+
-+# comments
-+
-+my $comment = $parser->next();
-+
-+# TEST
-+ok $comment->is_comment, '... and a comment';
-+
-+# another normal, passing test
-+
-+$test = $parser->next();
-+
-+# TEST
-+ok $test->is_test, '... and another test';
-+
-+# a failing test
-+
-+$failed = $parser->next();
-+
-+# TEST
-+ok $failed->is_test, '... and yet another test';
-+
-+# ok 5 # skip we have no description
-+# skipped test
-+my $bailout = $parser->next();
-+
-+# TEST
-+ok $bailout->is_bailout, 'And finally we should have a bailout';
-+
-+# TEST
-+is $bailout->as_string, 'We ran out of foobar.',
-+  '... and as_string() should return the explanation';
-+
-+# TEST
-+is( $bailout->raw, 'Bail out!  We ran out of foobar.',
-+    '... and raw() should return the explanation'
-+);
-+
-+# TEST
-+is( $bailout->explanation, 'We ran out of foobar.',
-+    '... and it should have the correct explanation'
-+);
-+
-+my $more_tap = "1..1\nok 1 - input file opened\n";
-+
-+my $second_parser = TAP::Parser->new(
-+    {   stream => $factory->make_iterator( [ split( /\n/, $more_tap ) ] ),
-+    }
-+);
-+
-+$result = $second_parser->next();
-+
-+# TEST
-+ok $result->is_plan(), "Result is not the leftover line";
-+
-+$result = $second_parser->next();
-+
-+# TEST
-+ok $result->is_test(), "Result is a test";
-+
-+# TEST
-+ok $result->is_ok(), "The event has passed";
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/process.t perl-5.10.0/ext/Test/Harness/t/process.t
---- perl-5.10.0.orig/ext/Test/Harness/t/process.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/process.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,57 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+use lib 't/lib';
-+
-+my $hires;
-+
-+BEGIN {
-+    $hires = eval 'use Time::HiRes qw(sleep); 1';
-+}
-+
-+use Test::More (
-+      $^O eq 'VMS' ? ( skip_all => 'VMS' )
-+    : $hires ? ( tests => 9 * 3 )
-+    : ( skip_all => 'Need Time::HiRes' )
-+);
-+
-+use File::Spec;
-+use TAP::Parser::Iterator::Process;
-+
-+my @expect = (
-+    '1..5',
-+    'ok 1 00000',
-+    'ok 2',
-+    'not ok 3',
-+    'ok 4',
-+    'ok 5 00000',
-+);
-+
-+my $source = File::Spec->catfile(
-+    (   $ENV{PERL_CORE}
-+        ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
-+        : ()
-+    ),
-+    't',
-+    'sample-tests',
-+    'delayed'
-+);
-+
-+for my $chunk_size ( 1, 4, 65536 ) {
-+    for my $where ( 0 .. 8 ) {
-+
-+        my $proc = TAP::Parser::Iterator::Process->new(
-+            {   _chunk_size => $chunk_size,
-+                command     => [ $^X, $source, ( 1 << $where ) ]
-+            }
-+        );
-+
-+        my @got = ();
-+        while ( defined( my $line = $proc->next_raw ) ) {
-+            push @got, $line;
-+        }
-+
-+        is_deeply \@got, \@expect,
-+          "I/O ok with delay at position $where, chunk size $chunk_size";
-+    }
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/prove.t perl-5.10.0/ext/Test/Harness/t/prove.t
---- perl-5.10.0.orig/ext/Test/Harness/t/prove.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/prove.t	2009-03-10 17:38:43.000000000 +0100
-@@ -0,0 +1,1505 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+
-+use Test::More;
-+use File::Spec;
-+
-+use App::Prove;
-+
-+package FakeProve;
-+use vars qw( @ISA );
-+
-+@ISA = qw( App::Prove );
-+
-+sub new {
-+    my $class = shift;
-+    my $self  = $class->SUPER::new(@_);
-+    $self->{_log} = [];
-+    return $self;
-+}
-+
-+sub _color_default {0}
-+
-+sub _runtests {
-+    my $self = shift;
-+    push @{ $self->{_log} }, [ '_runtests', @_ ];
-+}
-+
-+sub get_log {
-+    my $self = shift;
-+    my @log  = @{ $self->{_log} };
-+    $self->{_log} = [];
-+    return @log;
-+}
-+
-+sub _shuffle {
-+    my $self = shift;
-+    s/^/xxx/ for @_;
-+}
-+
-+package main;
-+
-+sub mabs {
-+    my $ar = shift;
-+    return [ map { File::Spec->rel2abs($_) } @$ar ];
-+}
-+
-+{
-+    my @import_log = ();
-+    sub test_log_import { push @import_log, [@_] }
-+
-+    sub get_import_log {
-+        my @log = @import_log;
-+        @import_log = ();
-+        return @log;
-+    }
-+
-+    my @plugin_load_log = ();
-+    sub test_log_plugin_load { push @plugin_load_log, [@_] }
-+
-+    sub get_plugin_load_log {
-+        my @log = @plugin_load_log;
-+        @plugin_load_log = ();
-+        return @log;
-+    }
-+}
-+
-+my ( @ATTR, %DEFAULT_ASSERTION, @SCHEDULE );
-+
-+# see the "ACTUAL TEST" section at the bottom
-+
-+BEGIN {    # START PLAN
-+
-+    # list of attributes
-+    @ATTR = qw(
-+      archive argv blib color directives exec extension failures
-+      formatter harness includes lib merge parse quiet really_quiet
-+      recurse backwards shuffle taint_fail taint_warn verbose
-+      warnings_fail warnings_warn
-+    );
-+
-+    # what we expect if the 'expect' hash does not define it
-+    %DEFAULT_ASSERTION = map { $_ => undef } @ATTR;
-+
-+    $DEFAULT_ASSERTION{includes} = $DEFAULT_ASSERTION{argv}
-+      = sub { 'ARRAY' eq ref shift };
-+
-+    my @dummy_tests = map { File::Spec->catdir( 't', 'sample-tests', $_ ) }
-+      qw(simple simple_yaml);
-+    my $dummy_test = $dummy_tests[0];
-+
-+    ########################################################################
-+ # declarations - this drives all of the subtests.
-+ # The cheatsheet follows.
-+ # required: name, expect
-+ # optional:
-+ #   args       - arguments to constructor
-+ #   switches   - command-line switches
-+ #   runlog     - expected results of internal calls to _runtests, must
-+ #                match FakeProve's _log attr
-+ #   run_error  - depends on 'runlog' (if missing, asserts no error)
-+ #   extra      - follow-up check to handle exceptional cleanup / verification
-+ #   class      - The App::Prove subclass to test. Defaults to FakeProve
-+    @SCHEDULE = (
-+        {   name   => 'Create empty',
-+            expect => {}
-+        },
-+        {   name => 'Set all options via constructor',
-+            args => {
-+                archive       => 1,
-+                argv          => [qw(one two three)],
-+                blib          => 2,
-+                color         => 3,
-+                directives    => 4,
-+                exec          => 5,
-+                failures      => 7,
-+                formatter     => 8,
-+                harness       => 9,
-+                includes      => [qw(four five six)],
-+                lib           => 10,
-+                merge         => 11,
-+                parse         => 13,
-+                quiet         => 14,
-+                really_quiet  => 15,
-+                recurse       => 16,
-+                backwards     => 17,
-+                shuffle       => 18,
-+                taint_fail    => 19,
-+                taint_warn    => 20,
-+                verbose       => 21,
-+                warnings_fail => 22,
-+                warnings_warn => 23,
-+            },
-+            expect => {
-+                archive       => 1,
-+                argv          => [qw(one two three)],
-+                blib          => 2,
-+                color         => 3,
-+                directives    => 4,
-+                exec          => 5,
-+                failures      => 7,
-+                formatter     => 8,
-+                harness       => 9,
-+                includes      => [qw(four five six)],
-+                lib           => 10,
-+                merge         => 11,
-+                parse         => 13,
-+                quiet         => 14,
-+                really_quiet  => 15,
-+                recurse       => 16,
-+                backwards     => 17,
-+                shuffle       => 18,
-+                taint_fail    => 19,
-+                taint_warn    => 20,
-+                verbose       => 21,
-+                warnings_fail => 22,
-+                warnings_warn => 23,
-+            }
-+        },
-+        {   name   => 'Call with defaults',
-+            args   => { argv => [qw( one two three )] },
-+            expect => {},
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+
-+        # Test all options individually
-+
-+        # {   name => 'Just archive',
-+        #     args => {
-+        #         argv    => [qw( one two three )],
-+        #         archive => 1,
-+        #     },
-+        #     expect => {
-+        #         archive => 1,
-+        #     },
-+        #     runlog => [
-+        #         [   {   archive => 1,
-+        #             },
-+        #             'TAP::Harness',
-+        #             'one', 'two',
-+        #             'three'
-+        #         ]
-+        #     ],
-+        # },
-+        {   name => 'Just argv',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            expect => {
-+                argv => [qw( one two three )],
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    { verbosity => 0, show_count => 1 },
-+                    'TAP::Harness',
-+                    'one', 'two',
-+                    'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just blib',
-+            args => {
-+                argv => [qw( one two three )],
-+                blib => 1,
-+            },
-+            expect => {
-+                blib => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   lib => mabs( [ 'blib/lib', 'blib/arch' ] ),
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Just color',
-+            args => {
-+                argv  => [qw( one two three )],
-+                color => 1,
-+            },
-+            expect => {
-+                color => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   color      => 1,
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Just directives',
-+            args => {
-+                argv       => [qw( one two three )],
-+                directives => 1,
-+            },
-+            expect => {
-+                directives => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   directives => 1,
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just exec',
-+            args => {
-+                argv => [qw( one two three )],
-+                exec => 1,
-+            },
-+            expect => {
-+                exec => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   exec       => [1],
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just failures',
-+            args => {
-+                argv     => [qw( one two three )],
-+                failures => 1,
-+            },
-+            expect => {
-+                failures => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   failures   => 1,
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Just formatter',
-+            args => {
-+                argv      => [qw( one two three )],
-+                formatter => 'TAP::Harness',
-+            },
-+            expect => {
-+                formatter => 'TAP::Harness',
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   formatter_class => 'TAP::Harness',
-+                        verbosity       => 0,
-+                        show_count      => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Just includes',
-+            args => {
-+                argv     => [qw( one two three )],
-+                includes => [qw( four five six )],
-+            },
-+            expect => {
-+                includes => [qw( four five six )],
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   lib => mabs( [qw( four five six )] ),
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just lib',
-+            args => {
-+                argv => [qw( one two three )],
-+                lib  => 1,
-+            },
-+            expect => {
-+                lib => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   lib => mabs( ['lib'] ),
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just merge',
-+            args => {
-+                argv  => [qw( one two three )],
-+                merge => 1,
-+            },
-+            expect => {
-+                merge => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   merge      => 1,
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just parse',
-+            args => {
-+                argv  => [qw( one two three )],
-+                parse => 1,
-+            },
-+            expect => {
-+                parse => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   errors     => 1,
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just quiet',
-+            args => {
-+                argv  => [qw( one two three )],
-+                quiet => 1,
-+            },
-+            expect => {
-+                quiet => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => -1,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just really_quiet',
-+            args => {
-+                argv         => [qw( one two three )],
-+                really_quiet => 1,
-+            },
-+            expect => {
-+                really_quiet => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => -2,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just recurse',
-+            args => {
-+                argv    => [qw( one two three )],
-+                recurse => 1,
-+            },
-+            expect => {
-+                recurse => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just reverse',
-+            args => {
-+                argv      => [qw( one two three )],
-+                backwards => 1,
-+            },
-+            expect => {
-+                backwards => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'three', 'two', 'one'
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Just shuffle',
-+            args => {
-+                argv    => [qw( one two three )],
-+                shuffle => 1,
-+            },
-+            expect => {
-+                shuffle => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'xxxone', 'xxxtwo',
-+                    'xxxthree'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just taint_fail',
-+            args => {
-+                argv       => [qw( one two three )],
-+                taint_fail => 1,
-+            },
-+            expect => {
-+                taint_fail => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   switches   => ['-T'],
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just taint_warn',
-+            args => {
-+                argv       => [qw( one two three )],
-+                taint_warn => 1,
-+            },
-+            expect => {
-+                taint_warn => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   switches   => ['-t'],
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just verbose',
-+            args => {
-+                argv    => [qw( one two three )],
-+                verbose => 1,
-+            },
-+            expect => {
-+                verbose => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 1,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just warnings_fail',
-+            args => {
-+                argv          => [qw( one two three )],
-+                warnings_fail => 1,
-+            },
-+            expect => {
-+                warnings_fail => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   switches   => ['-W'],
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+        {   name => 'Just warnings_warn',
-+            args => {
-+                argv          => [qw( one two three )],
-+                warnings_warn => 1,
-+            },
-+            expect => {
-+                warnings_warn => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   switches   => ['-w'],
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    'one', 'two', 'three'
-+                ]
-+            ],
-+        },
-+
-+        # Command line parsing
-+        {   name => 'Switch -v',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '-v', $dummy_test ],
-+            expect   => {
-+                verbose => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 1,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch --verbose',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--verbose', $dummy_test ],
-+            expect   => {
-+                verbose => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 1,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch -f',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '-f', $dummy_test ],
-+            expect => { failures => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   failures   => 1,
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch --failures',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--failures', $dummy_test ],
-+            expect => { failures => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   failures   => 1,
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch -l',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '-l', $dummy_test ],
-+            expect => { lib => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   lib => mabs( ['lib'] ),
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch --lib',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--lib', $dummy_test ],
-+            expect => { lib => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   lib => mabs( ['lib'] ),
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch -b',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '-b', $dummy_test ],
-+            expect => { blib => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   lib => mabs( [ 'blib/lib', 'blib/arch' ] ),
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch --blib',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--blib', $dummy_test ],
-+            expect => { blib => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   lib => mabs( [ 'blib/lib', 'blib/arch' ] ),
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch -s',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '-s', $dummy_test ],
-+            expect => { shuffle => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    "xxx$dummy_test"
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch --shuffle',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--shuffle', $dummy_test ],
-+            expect => { shuffle => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    "xxx$dummy_test"
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch -c',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '-c', $dummy_test ],
-+            expect => { color => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   color      => 1,
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch -r',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '-r', $dummy_test ],
-+            expect => { recurse => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch --recurse',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--recurse', $dummy_test ],
-+            expect => { recurse => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch --reverse',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--reverse', @dummy_tests ],
-+            expect => { backwards => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    reverse @dummy_tests
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch -p',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '-p', $dummy_test ],
-+            expect   => {
-+                parse => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   errors     => 1,
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch --parse',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--parse', $dummy_test ],
-+            expect   => {
-+                parse => 1,
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   errors     => 1,
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch -q',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '-q', $dummy_test ],
-+            expect => { quiet => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => -1,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch --quiet',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--quiet', $dummy_test ],
-+            expect => { quiet => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => -1,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch -Q',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '-Q', $dummy_test ],
-+            expect => { really_quiet => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => -2,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch --QUIET',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--QUIET', $dummy_test ],
-+            expect => { really_quiet => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => -2,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch -m',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '-m', $dummy_test ],
-+            expect => { merge => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   merge      => 1,
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch --merge',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--merge', $dummy_test ],
-+            expect => { merge => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   merge      => 1,
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name => 'Switch --directives',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--directives', $dummy_test ],
-+            expect => { directives => 1 },
-+            runlog => [
-+                [   '_runtests',
-+                    {   directives => 1,
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        # Executing one word (why would it be a -s though?)
-+        {   name => 'Switch --exec -s',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--exec', '-s', $dummy_test ],
-+            expect => { exec => '-s' },
-+            runlog => [
-+                [   '_runtests',
-+                    {   exec       => ['-s'],
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        # multi-part exec
-+        {   name => 'Switch --exec "/foo/bar/perl -Ilib"',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '--exec', '/foo/bar/perl -Ilib', $dummy_test ],
-+            expect => { exec => '/foo/bar/perl -Ilib' },
-+            runlog => [
-+                [   '_runtests',
-+                    {   exec       => [qw(/foo/bar/perl -Ilib)],
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        # null exec (run tests as compiled binaries)
-+        {   name     => 'Switch --exec ""',
-+            switches => [ '--exec', '', $dummy_test ],
-+            expect   => {
-+                exec =>   # ick, must workaround the || default bit with a sub
-+                  sub { my $val = shift; defined($val) and !length($val) }
-+            },
-+            runlog => [
-+                [   '_runtests',
-+                    {   exec       => [],
-+                        verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        # Plugins
-+        {   name     => 'Load plugin',
-+            switches => [ '-P', 'Dummy', $dummy_test ],
-+            args     => {
-+                argv => [qw( one two three )],
-+            },
-+            expect => {
-+                plugins => ['Dummy'],
-+            },
-+            extra => sub {
-+                my @loaded = get_import_log();
-+                is_deeply \@loaded, [ ['App::Prove::Plugin::Dummy'] ],
-+                  "Plugin loaded OK";
-+            },
-+            plan   => 1,
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name     => 'Load plugin (args)',
-+            switches => [ '-P', 'Dummy=cracking,cheese,gromit', $dummy_test ],
-+            args     => {
-+                argv => [qw( one two three )],
-+            },
-+            expect => {
-+                plugins => ['Dummy'],
-+            },
-+            extra => sub {
-+                my @loaded = get_import_log();
-+                is_deeply \@loaded,
-+                  [ [   'App::Prove::Plugin::Dummy', 'cracking', 'cheese',
-+                        'gromit'
-+                    ]
-+                  ],
-+                  "Plugin loaded OK";
-+            },
-+            plan   => 1,
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name     => 'Load plugin (explicit path)',
-+            switches => [ '-P', 'App::Prove::Plugin::Dummy', $dummy_test ],
-+            args     => {
-+                argv => [qw( one two three )],
-+            },
-+            expect => {
-+                plugins => ['Dummy'],
-+            },
-+            extra => sub {
-+                my @loaded = get_import_log();
-+                is_deeply \@loaded, [ ['App::Prove::Plugin::Dummy'] ],
-+                  "Plugin loaded OK";
-+            },
-+            plan   => 1,
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name     => 'Load plugin (args + call load method)',
-+            switches => [ '-P', 'Dummy2=fou,du,fafa', $dummy_test ],
-+            args     => {
-+                argv => [qw( one two three )],
-+            },
-+            expect => {
-+                plugins => ['Dummy2'],
-+            },
-+            extra => sub {
-+                my @import = get_import_log();
-+                is_deeply \@import,
-+                  [ [ 'App::Prove::Plugin::Dummy2', 'fou', 'du', 'fafa' ] ],
-+                  "Plugin loaded OK";
-+
-+                my @loaded = get_plugin_load_log();
-+                is( scalar @loaded, 1, 'Plugin->load called OK' );
-+                my ( $plugin_class, $args ) = @{ shift @loaded };
-+                is( $plugin_class, 'App::Prove::Plugin::Dummy2',
-+                    'plugin_class passed'
-+                );
-+                isa_ok(
-+                    $args->{app_prove}, 'App::Prove',
-+                    'app_prove object passed'
-+                );
-+                is_deeply(
-+                    $args->{args}, [qw( fou du fafa )],
-+                    'expected args passed'
-+                );
-+            },
-+            plan   => 5,
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        {   name     => 'Load module',
-+            switches => [ '-M', 'App::Prove::Plugin::Dummy', $dummy_test ],
-+            args     => {
-+                argv => [qw( one two three )],
-+            },
-+            expect => {
-+                plugins => ['Dummy'],
-+            },
-+            extra => sub {
-+                my @loaded = get_import_log();
-+                is_deeply \@loaded, [ ['App::Prove::Plugin::Dummy'] ],
-+                  "Plugin loaded OK";
-+            },
-+            plan   => 1,
-+            runlog => [
-+                [   '_runtests',
-+                    {   verbosity  => 0,
-+                        show_count => 1,
-+                    },
-+                    'TAP::Harness',
-+                    $dummy_test
-+                ]
-+            ],
-+        },
-+
-+        # TODO
-+        # Hmm, that doesn't work...
-+        # {   name => 'Switch -h',
-+        #     args => {
-+        #         argv => [qw( one two three )],
-+        #     },
-+        #     switches => [ '-h', $dummy_test ],
-+        #     expect   => {},
-+        #     runlog   => [
-+        #         [   '_runtests',
-+        #             {},
-+        #             'TAP::Harness',
-+        #             $dummy_test
-+        #         ]
-+        #     ],
-+        # },
-+
-+        # {   name => 'Switch --help',
-+        #     args => {
-+        #         argv => [qw( one two three )],
-+        #     },
-+        #     switches => [ '--help', $dummy_test ],
-+        #     expect   => {},
-+        #     runlog   => [
-+        #         [   {},
-+        #             'TAP::Harness',
-+        #             $dummy_test
-+        #         ]
-+        #     ],
-+        # },
-+        # {   name => 'Switch -?',
-+        #     args => {
-+        #         argv => [qw( one two three )],
-+        #     },
-+        #     switches => [ '-?', $dummy_test ],
-+        #     expect   => {},
-+        #     runlog   => [
-+        #         [   {},
-+        #             'TAP::Harness',
-+        #             $dummy_test
-+        #         ]
-+        #     ],
-+        # },
-+        #
-+        # {   name => 'Switch -H',
-+        #     args => {
-+        #         argv => [qw( one two three )],
-+        #     },
-+        #     switches => [ '-H', $dummy_test ],
-+        #     expect   => {},
-+        #     runlog   => [
-+        #         [   {},
-+        #             'TAP::Harness',
-+        #             $dummy_test
-+        #         ]
-+        #     ],
-+        # },
-+        #
-+        # {   name => 'Switch --man',
-+        #     args => {
-+        #         argv => [qw( one two three )],
-+        #     },
-+        #     switches => [ '--man', $dummy_test ],
-+        #     expect   => {},
-+        #     runlog   => [
-+        #         [   {},
-+        #             'TAP::Harness',
-+        #             $dummy_test
-+        #         ]
-+        #     ],
-+        # },
-+        #
-+        # {   name => 'Switch -V',
-+        #     args => {
-+        #         argv => [qw( one two three )],
-+        #     },
-+        #     switches => [ '-V', $dummy_test ],
-+        #     expect   => {},
-+        #     runlog   => [
-+        #         [   {},
-+        #             'TAP::Harness',
-+        #             $dummy_test
-+        #         ]
-+        #     ],
-+        # },
-+        #
-+        # {   name => 'Switch --version',
-+        #     args => {
-+        #         argv => [qw( one two three )],
-+        #     },
-+        #     switches => [ '--version', $dummy_test ],
-+        #     expect   => {},
-+        #     runlog   => [
-+        #         [   {},
-+        #             'TAP::Harness',
-+        #             $dummy_test
-+        #         ]
-+        #     ],
-+        # },
-+        #
-+        # {   name => 'Switch --color!',
-+        #     args => {
-+        #         argv => [qw( one two three )],
-+        #     },
-+        #     switches => [ '--color!', $dummy_test ],
-+        #     expect   => {},
-+        #     runlog   => [
-+        #         [   {},
-+        #             'TAP::Harness',
-+        #             $dummy_test
-+        #         ]
-+        #     ],
-+        # },
-+        #
-+        {   name => 'Switch -I=s@',
-+            args => {
-+                argv => [qw( one two three )],
-+            },
-+            switches => [ '-Ilib', $dummy_test ],
-+            expect   => {
-+                includes => sub {
-+                    my ( $val, $attr ) = @_;
-+                    return
-+                         'ARRAY' eq ref $val
-+                      && 1 == @$val
-+                      && $val->[0] =~ /lib$/;
-+                },
-+            },
-+        },
-+
-+        # {   name => 'Switch -a',
-+        #     args => {
-+        #         argv => [qw( one two three )],
-+        #     },
-+        #     switches => [ '-a', $dummy_test ],
-+        #     expect   => {},
-+        #     runlog   => [
-+        #         [   {},
-+        #             'TAP::Harness',
-+        #             $dummy_test
-+        #         ]
-+        #     ],
-+        # },
-+        #
-+        # {   name => 'Switch --archive=-s',
-+        #     args => {
-+        #         argv => [qw( one two three )],
-+        #     },
-+        #     switches => [ '--archive=-s', $dummy_test ],
-+        #     expect   => {},
-+        #     runlog   => [
-+        #         [   {},
-+        #             'TAP::Harness',
-+        #             $dummy_test
-+        #         ]
-+        #     ],
-+        # },
-+        #
-+        # {   name => 'Switch --formatter=-s',
-+        #     args => {
-+        #         argv => [qw( one two three )],
-+        #     },
-+        #     switches => [ '--formatter=-s', $dummy_test ],
-+        #     expect   => {},
-+        #     runlog   => [
-+        #         [   {},
-+        #             'TAP::Harness',
-+        #             $dummy_test
-+        #         ]
-+        #     ],
-+        # },
-+        #
-+        # {   name => 'Switch -e',
-+        #     args => {
-+        #         argv => [qw( one two three )],
-+        #     },
-+        #     switches => [ '-e', $dummy_test ],
-+        #     expect   => {},
-+        #     runlog   => [
-+        #         [   {},
-+        #             'TAP::Harness',
-+        #             $dummy_test
-+        #         ]
-+        #     ],
-+        # },
-+        #
-+        # {   name => 'Switch --harness=-s',
-+        #     args => {
-+        #         argv => [qw( one two three )],
-+        #     },
-+        #     switches => [ '--harness=-s', $dummy_test ],
-+        #     expect   => {},
-+        #     runlog   => [
-+        #         [   {},
-+        #             'TAP::Harness',
-+        #             $dummy_test
-+        #         ]
-+        #     ],
-+        # },
-+
-+    );
-+
-+    # END SCHEDULE
-+    ########################################################################
-+
-+    my $extra_plan = 0;
-+    for my $test (@SCHEDULE) {
-+        $extra_plan += $test->{plan} || 0;
-+        $extra_plan += 2 if $test->{runlog};
-+        $extra_plan += 1 if $test->{switches};
-+    }
-+
-+    plan tests => @SCHEDULE * ( 3 + @ATTR ) + $extra_plan;
-+}    # END PLAN
-+
-+# ACTUAL TEST
-+for my $test (@SCHEDULE) {
-+    my $name = $test->{name};
-+    my $class = $test->{class} || 'FakeProve';
-+
-+    local $ENV{HARNESS_TIMER};
-+
-+    ok my $app = $class->new( exists $test->{args} ? $test->{args} : () ),
-+      "$name: App::Prove created OK";
-+
-+    isa_ok $app, 'App::Prove';
-+    isa_ok $app, $class;
-+
-+    # Optionally parse command args
-+    if ( my $switches = $test->{switches} ) {
-+        eval { $app->process_args( '--norc', @$switches ) };
-+        if ( my $err_pattern = $test->{parse_error} ) {
-+            like $@, $err_pattern, "$name: expected parse error";
-+        }
-+        else {
-+            ok !$@, "$name: no parse error";
-+        }
-+    }
-+
-+    my $expect = $test->{expect} || {};
-+    for my $attr ( sort @ATTR ) {
-+        my $val       = $app->$attr();
-+        my $assertion = $expect->{$attr} || $DEFAULT_ASSERTION{$attr};
-+        my $is_ok     = undef;
-+
-+        if ( 'CODE' eq ref $assertion ) {
-+            $is_ok = ok $assertion->( $val, $attr ),
-+              "$name: $attr has the expected value";
-+        }
-+        elsif ( 'Regexp' eq ref $assertion ) {
-+            $is_ok = like $val, $assertion, "$name: $attr matches $assertion";
-+        }
-+        else {
-+            $is_ok = is_deeply $val, $assertion,
-+              "$name: $attr has the expected value";
-+        }
-+
-+        unless ($is_ok) {
-+            diag "got $val for $attr";
-+        }
-+    }
-+
-+    if ( my $runlog = $test->{runlog} ) {
-+        eval { $app->run };
-+        if ( my $err_pattern = $test->{run_error} ) {
-+            like $@, $err_pattern, "$name: expected error OK";
-+            pass;
-+            pass for 1 .. $test->{plan};
-+        }
-+        else {
-+            unless ( ok !$@, "$name: no error OK" ) {
-+                diag "$name: error: $@\n";
-+            }
-+
-+            my $gotlog = [ $app->get_log ];
-+
-+            if ( my $extra = $test->{extra} ) {
-+                $extra->($gotlog);
-+            }
-+
-+            unless (
-+                is_deeply $gotlog, $runlog,
-+                "$name: run results match"
-+              )
-+            {
-+                use Data::Dumper;
-+                diag Dumper( { wanted => $runlog, got => $gotlog } );
-+            }
-+        }
-+    }
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/proveenv.t perl-5.10.0/ext/Test/Harness/t/proveenv.t
---- perl-5.10.0.orig/ext/Test/Harness/t/proveenv.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/proveenv.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,17 @@
-+#!perl
-+use strict;
-+use lib 't/lib';
-+use Test::More tests => 2;
-+use App::Prove;
-+
-+{
-+    local $ENV{HARNESS_TIMER} = 0;
-+    my $prv = App::Prove->new;
-+    ok !$prv->timer, 'timer set via HARNESS_TIMER';
-+}
-+
-+{
-+    local $ENV{HARNESS_TIMER} = 1;
-+    my $prv = App::Prove->new;
-+    ok $prv->timer, 'timer set via HARNESS_TIMER';
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/proverc.t perl-5.10.0/ext/Test/Harness/t/proverc.t
---- perl-5.10.0.orig/ext/Test/Harness/t/proverc.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/proverc.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,37 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', 'lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+use lib 't/lib';
-+use Test::More tests => 1;
-+use File::Spec;
-+use App::Prove;
-+
-+my $prove = App::Prove->new;
-+
-+$prove->add_rc_file(
-+    File::Spec->catfile(
-+        (   $ENV{PERL_CORE}
-+            ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
-+            : ()
-+        ),
-+        't', 'data',
-+        'proverc'
-+    )
-+);
-+
-+is_deeply $prove->{rc_opts},
-+  [ '--should', 'be', '--split', 'correctly', 'Can', 'quote things',
-+    'using single or', 'double quotes', '--this', 'is', 'OK?'
-+  ],
-+  'options parsed';
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/proverun.t perl-5.10.0/ext/Test/Harness/t/proverun.t
---- perl-5.10.0.orig/ext/Test/Harness/t/proverun.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/proverun.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,186 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', 'lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+use Test::More;
-+use File::Spec;
-+use App::Prove;
-+
-+my @SCHEDULE;
-+
-+BEGIN {
-+
-+    # to add a new test to proverun, just list the name of the file in
-+    # t/sample-tests and a name for the test.  The rest is handled
-+    # automatically.
-+    my @tests = (
-+        {   file => 'simple',
-+            name => 'Create empty',
-+        },
-+        {   file => 'todo_inline',
-+            name => 'Passing TODO',
-+        },
-+    );
-+    foreach my $test (@tests) {
-+
-+        # let's fully expand that filename
-+        $test->{file} = File::Spec->catfile(
-+            (   $ENV{PERL_CORE}
-+                ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
-+                : ()
-+            ),
-+            't',
-+            'sample-tests',
-+            $test->{file}
-+        );
-+    }
-+    @SCHEDULE = (
-+        map {
-+            {   name   => $_->{name},
-+                args   => [ $_->{file} ],
-+                expect => [
-+                    [   'new',
-+                        'TAP::Parser::Iterator::Process',
-+                        {   merge   => undef,
-+                            command => [
-+                                'PERL',
-+                                $_->{file},
-+                            ],
-+                            setup    => \'CODE',
-+                            teardown => \'CODE',
-+
-+                        }
-+                    ]
-+                ]
-+            }
-+          } @tests
-+    );
-+
-+    plan tests => @SCHEDULE * 3;
-+}
-+
-+# Waaaaay too much boilerplate
-+
-+package FakeProve;
-+use vars qw( @ISA );
-+
-+@ISA = qw( App::Prove );
-+
-+sub new {
-+    my $class = shift;
-+    my $self  = $class->SUPER::new(@_);
-+    $self->{_log} = [];
-+    return $self;
-+}
-+
-+sub get_log {
-+    my $self = shift;
-+    my @log  = @{ $self->{_log} };
-+    $self->{_log} = [];
-+    return @log;
-+}
-+
-+package main;
-+
-+{
-+    use TAP::Parser::Iterator::Process;
-+    use TAP::Formatter::Console;
-+
-+    # Patch TAP::Parser::Iterator::Process
-+    my @call_log = ();
-+
-+    local $^W;    # no warnings
-+
-+    my $orig_new = TAP::Parser::Iterator::Process->can('new');
-+
-+    # Avoid "used only once" warning
-+    *TAP::Parser::Iterator::Process::new
-+      = *TAP::Parser::Iterator::Process::new = sub {
-+        push @call_log, [ 'new', @_ ];
-+
-+        # And then new turns round and tramples on our args...
-+        $_[1] = { %{ $_[1] } };
-+        $orig_new->(@_);
-+      };
-+
-+    # Patch TAP::Formatter::Console;
-+    my $orig_output = \&TAP::Formatter::Console::_output;
-+    *TAP::Formatter::Console::_output = sub {
-+
-+        # push @call_log, [ '_output', @_ ];
-+    };
-+
-+    sub get_log {
-+        my @log = @call_log;
-+        @call_log = ();
-+        return @log;
-+    }
-+}
-+
-+sub _slacken {
-+    my $obj = shift;
-+    if ( my $ref = ref $obj ) {
-+        if ( 'HASH' eq ref $obj ) {
-+            return { map { $_ => _slacken( $obj->{$_} ) } keys %$obj };
-+        }
-+        elsif ( 'ARRAY' eq ref $obj ) {
-+            return [ map { _slacken($_) } @$obj ];
-+        }
-+        elsif ( 'SCALAR' eq ref $obj ) {
-+            return $obj;
-+        }
-+        else {
-+            return \$ref;
-+        }
-+    }
-+    else {
-+        return $obj;
-+    }
-+}
-+
-+sub is_slackly($$$) {
-+    my ( $got, $want, $msg ) = @_;
-+    return is_deeply _slacken($got), _slacken($want), $msg;
-+}
-+
-+# ACTUAL TEST
-+for my $test (@SCHEDULE) {
-+    my $name = $test->{name};
-+
-+    my $app = FakeProve->new;
-+    $app->process_args( '--norc', @{ $test->{args} } );
-+
-+    # Why does this make the output from the test spew out of
-+    # our STDOUT?
-+    ok eval { $app->run }, 'run returned true';
-+    ok !$@, 'no errors' or diag $@;
-+
-+    my @log = get_log();
-+
-+    # Bodge: we don't know what pathname will be used for the exe so we
-+    # obliterate it here. Need to test that it's sane.
-+    for my $call (@log) {
-+        if ( 'HASH' eq ref $call->[2] && exists $call->[2]->{command} ) {
-+            $call->[2]->{command}->[0] = 'PERL';
-+        }
-+    }
-+
-+    is_slackly \@log, $test->{expect}, "$name: command args OK";
-+
-+    # use Data::Dumper;
-+    # diag Dumper(
-+    #     {   got    => \@log,
-+    #         expect => $test->{expect}
-+    #     }
-+    # );
-+}
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/regression.t perl-5.10.0/ext/Test/Harness/t/regression.t
---- perl-5.10.0.orig/ext/Test/Harness/t/regression.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/regression.t	2009-03-10 17:38:43.000000000 +0100
-@@ -0,0 +1,3190 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = '../lib';
-+    }
-+    else {
-+        push @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+
-+use Test::More 'no_plan';
-+
-+use File::Spec;
-+use Config;
-+
-+use constant TRUE  => "__TRUE__";
-+use constant FALSE => "__FALSE__";
-+
-+# if wait() is non-zero, we cannot reliably predict its value
-+use constant NOT_ZERO => "__NOT_ZERO__";
-+
-+use TAP::Parser;
-+
-+my $IsVMS   = $^O eq 'VMS';
-+my $IsWin32 = $^O eq 'MSWin32';
-+
-+my $SAMPLE_TESTS = File::Spec->catdir(
-+    File::Spec->curdir,
-+    (   $ENV{PERL_CORE}
-+        ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
-+        : ()
-+    ),
-+    't',
-+    'sample-tests'
-+);
-+
-+my %deprecated = map { $_ => 1 } qw(
-+  TAP::Parser::good_plan
-+  TAP::Parser::Result::Plan::passed
-+  TAP::Parser::Result::Test::passed
-+  TAP::Parser::Result::Test::actual_passed
-+  TAP::Parser::Result::passed
-+);
-+$SIG{__WARN__} = sub {
-+    if ( $_[0] =~ /is deprecated/ ) {
-+        my @caller = caller(1);
-+        my $sub    = $caller[3];
-+        ok exists $deprecated{$sub},
-+          "... we should get a deprecated warning for $sub";
-+    }
-+    else {
-+        CORE::warn @_;
-+    }
-+};
-+
-+# the %samples keys are the names of test scripts in t/sample-tests
-+my %samples = (
-+    descriptive => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                raw           => '1..5',
-+                tests_planned => 5,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                description   => "Interlock activated",
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "Megathrusters are go",
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "Head formed",
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "Blazing sword formed",
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "Robeast destroyed",
-+                is_unplanned  => FALSE,
-+            }
-+        ],
-+        plan          => '1..5',
-+        passed        => [ 1 .. 5 ],
-+        actual_passed => [ 1 .. 5 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    descriptive_trailing => {
-+        results => [
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                description   => "Interlock activated",
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "Megathrusters are go",
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "Head formed",
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "Blazing sword formed",
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "Robeast destroyed",
-+                is_unplanned  => FALSE,
-+            },
-+            {   is_plan       => TRUE,
-+                raw           => '1..5',
-+                tests_planned => 5,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+        ],
-+        plan          => '1..5',
-+        passed        => [ 1 .. 5 ],
-+        actual_passed => [ 1 .. 5 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    empty => {
-+        results       => [],
-+        plan          => '',
-+        passed        => [],
-+        actual_passed => [],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => FALSE,
-+        is_good_plan  => FALSE,
-+        tests_planned => undef,
-+        tests_run     => 0,
-+        parse_errors  => ['No plan found in TAP output'],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    simple => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                raw           => '1..5',
-+                tests_planned => 5,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "",
-+            },
-+        ],
-+        plan          => '1..5',
-+        passed        => [ 1 .. 5 ],
-+        actual_passed => [ 1 .. 5 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    space_after_plan => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                raw           => '1..5 ',
-+                tests_planned => 5,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "",
-+            },
-+        ],
-+        plan          => '1..5',
-+        passed        => [ 1 .. 5 ],
-+        actual_passed => [ 1 .. 5 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    simple_yaml => {
-+        results => [
-+            {   is_version => TRUE,
-+                raw        => 'TAP version 13',
-+            },
-+            {   is_plan       => TRUE,
-+                raw           => '1..5',
-+                tests_planned => 5,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "",
-+            },
-+            {   is_yaml => TRUE,
-+                data    => [
-+                    { 'fnurk' => 'skib', 'ponk' => 'gleeb' },
-+                    { 'bar'   => 'krup', 'foo'  => 'plink' }
-+                ],
-+                raw =>
-+                  "  ---\n  -\n    fnurk: skib\n    ponk: gleeb\n  -\n    bar: krup\n    foo: plink\n  ...",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "",
-+            },
-+            {   is_yaml => TRUE,
-+                data    => {
-+                    'got'      => [ '1', 'pong', '4' ],
-+                    'expected' => [ '1', '2',    '4' ]
-+                },
-+                raw =>
-+                  "  ---\n  expected:\n    - 1\n    - 2\n    - 4\n  got:\n    - 1\n    - pong\n    - 4\n  ...",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "",
-+            },
-+        ],
-+        plan          => '1..5',
-+        passed        => [ 1 .. 5 ],
-+        actual_passed => [ 1 .. 5 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 13,
-+    },
-+    simple_fail => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                raw           => '1..5',
-+                tests_planned => 5,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => "",
-+            },
-+            {   actual_passed => FALSE,
-+                is_actual_ok  => FALSE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "",
-+            },
-+            {   actual_passed => FALSE,
-+                is_actual_ok  => FALSE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "",
-+            },
-+        ],
-+        plan          => '1..5',
-+        passed        => [ 1, 3, 4 ],
-+        actual_passed => [ 1, 3, 4 ],
-+        failed        => [ 2, 5 ],
-+        actual_failed => [ 2, 5 ],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    skip => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                raw           => '1..5',
-+                tests_planned => 5,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => TRUE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "",
-+                explanation   => 'rain delay',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "",
-+            },
-+        ],
-+        plan          => '1..5',
-+        passed        => [ 1 .. 5 ],
-+        actual_passed => [ 1 .. 5 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [2],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    skip_nomsg => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..1',
-+                tests_planned => 1,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => TRUE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => "",
-+                explanation   => '',
-+            },
-+        ],
-+        plan          => '1..1',
-+        passed        => [1],
-+        actual_passed => [1],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [1],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 1,
-+        tests_run     => TRUE,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    todo_inline => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..3',
-+                tests_planned => 3,
-+            },
-+            {   actual_passed => FALSE,
-+                is_actual_ok  => FALSE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => TRUE,
-+                number        => 1,
-+                description   => "- Foo",
-+                explanation   => 'Just testing the todo interface.',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => TRUE,
-+                number        => 2,
-+                description   => "- Unexpected success",
-+                explanation   => 'Just testing the todo interface.',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "- This is not todo",
-+                explanation   => '',
-+            },
-+        ],
-+        plan   => '1..3',
-+        passed => [ 1, 2, 3 ],
-+        actual_passed => [ 2, 3 ],
-+        failed        => [],
-+        actual_failed => [1],
-+        todo          => [ 1, 2 ],
-+        todo_passed   => [2],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 3,
-+        tests_run     => 3,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    todo => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..5 todo 3 2;',
-+                tests_planned => 5,
-+                todo_list     => [ 3, 2 ],
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => "",
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => TRUE,
-+                number        => 2,
-+                description   => "",
-+                explanation   => '',
-+            },
-+            {   actual_passed => FALSE,
-+                is_actual_ok  => FALSE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => TRUE,
-+                number        => 3,
-+                description   => "",
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "",
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "",
-+                explanation   => '',
-+            },
-+        ],
-+        plan   => '1..5',
-+        passed => [ 1, 2, 3, 4, 5 ],
-+        actual_passed => [ 1, 2, 4, 5 ],
-+        failed        => [],
-+        actual_failed => [3],
-+        todo          => [ 2, 3 ],
-+        todo_passed   => [2],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    duplicates => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..10',
-+                tests_planned => 10,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => '',
-+                explanation   => '',
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => '',
-+                explanation   => '',
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => '',
-+                explanation   => '',
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => '',
-+                explanation   => '',
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => '',
-+                explanation   => '',
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => '',
-+                explanation   => '',
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 6,
-+                description   => '',
-+                explanation   => '',
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 7,
-+                description   => '',
-+                explanation   => '',
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 8,
-+                description   => '',
-+                explanation   => '',
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 9,
-+                description   => '',
-+                explanation   => '',
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 10,
-+                description   => '',
-+                explanation   => '',
-+                is_unplanned  => TRUE,
-+            },
-+        ],
-+        plan          => '1..10',
-+        passed        => [ 1 .. 4, 4 .. 9 ],
-+        actual_passed => [ 1 .. 4, 4 .. 10 ],
-+        failed        => [10],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => FALSE,
-+        tests_planned => 10,
-+        tests_run     => 11,
-+        parse_errors  => [
-+            'Tests out of sequence.  Found (4) but expected (5)',
-+            'Tests out of sequence.  Found (5) but expected (6)',
-+            'Tests out of sequence.  Found (6) but expected (7)',
-+            'Tests out of sequence.  Found (7) but expected (8)',
-+            'Tests out of sequence.  Found (8) but expected (9)',
-+            'Tests out of sequence.  Found (9) but expected (10)',
-+            'Tests out of sequence.  Found (10) but expected (11)',
-+            'Bad plan.  You planned 10 tests but ran 11.',
-+        ],
-+        'exit' => 0,
-+        wait   => 0,
-+    },
-+    no_nums => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..5',
-+                tests_planned => 5,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                description   => "",
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "",
-+            },
-+            {   actual_passed => FALSE,
-+                is_actual_ok  => FALSE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "",
-+            }
-+        ],
-+        plan          => '1..5',
-+        passed        => [ 1, 2, 4, 5 ],
-+        actual_passed => [ 1, 2, 4, 5 ],
-+        failed        => [3],
-+        actual_failed => [3],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    bailout => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..5',
-+                tests_planned => 5,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                description   => "",
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "",
-+            },
-+            {   is_bailout  => TRUE,
-+                explanation => "GERONIMMMOOOOOO!!!",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "",
-+            }
-+        ],
-+        plan          => '1..5',
-+        passed        => [ 1 .. 5 ],
-+        actual_passed => [ 1 .. 5 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    no_output => {
-+        results       => [],
-+        plan          => '',
-+        passed        => [],
-+        actual_passed => [],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => FALSE,
-+        tests_planned => undef,
-+        tests_run     => 0,
-+        parse_errors  => [ 'No plan found in TAP output', ],
-+        'exit'        => 0,
-+        wait          => 0,
-+    },
-+    too_many => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..3',
-+                tests_planned => 3,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                description   => "",
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "",
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "",
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "",
-+                is_unplanned  => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "",
-+                is_unplanned  => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 6,
-+                description   => "",
-+                is_unplanned  => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 7,
-+                description   => "",
-+                is_unplanned  => TRUE,
-+            },
-+        ],
-+        plan          => '1..3',
-+        passed        => [ 1 .. 3 ],
-+        actual_passed => [ 1 .. 7 ],
-+        failed        => [ 4 .. 7 ],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => FALSE,
-+        tests_planned => 3,
-+        tests_run     => 7,
-+        parse_errors  => ['Bad plan.  You planned 3 tests but ran 7.'],
-+        'exit'        => 4,
-+        wait          => NOT_ZERO,
-+        skip_if       => sub {$IsVMS},
-+    },
-+    taint => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..1',
-+                tests_planned => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                description   => "- -T honored",
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+            },
-+        ],
-+        plan          => '1..1',
-+        passed        => [ 1 .. 1 ],
-+        actual_passed => [ 1 .. 1 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => TRUE,
-+        tests_run     => TRUE,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    'die' => {
-+        results       => [],
-+        plan          => '',
-+        passed        => [],
-+        actual_passed => [],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => FALSE,
-+        tests_planned => undef,
-+        tests_run     => 0,
-+        parse_errors  => [ 'No plan found in TAP output', ],
-+        'exit'        => NOT_ZERO,
-+        wait          => NOT_ZERO,
-+    },
-+    die_head_end => {
-+        results => [
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => '',
-+                explanation   => '',
-+            },
-+        ],
-+        plan          => '',
-+        passed        => [ 1 .. 4 ],
-+        actual_passed => [ 1 .. 4 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => FALSE,
-+        tests_planned => undef,
-+        tests_run     => 4,
-+        parse_errors  => [ 'No plan found in TAP output', ],
-+        'exit'        => NOT_ZERO,
-+        wait          => NOT_ZERO,
-+    },
-+    die_last_minute => {
-+        results => [
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..4',
-+                tests_planned => 4,
-+            },
-+        ],
-+        plan          => '1..4',
-+        passed        => [ 1 .. 4 ],
-+        actual_passed => [ 1 .. 4 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 4,
-+        tests_run     => 4,
-+        parse_errors  => [],
-+        'exit'        => NOT_ZERO,
-+        wait          => NOT_ZERO,
-+    },
-+    bignum => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..2',
-+                tests_planned => 2,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 136211425,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 136211426,
-+                description   => '',
-+                explanation   => '',
-+            },
-+        ],
-+        plan          => '1..2',
-+        passed        => [ 1, 2 ],
-+        actual_passed => [ 1, 2, 136211425, 136211426 ],
-+        failed        => [ 136211425, 136211426 ],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => FALSE,
-+        tests_planned => 2,
-+        tests_run     => 4,
-+        parse_errors  => [
-+            'Tests out of sequence.  Found (136211425) but expected (3)',
-+            'Tests out of sequence.  Found (136211426) but expected (4)',
-+            'Bad plan.  You planned 2 tests but ran 4.'
-+        ],
-+        'exit' => 0,
-+        wait   => 0,
-+    },
-+    bignum_many => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..2',
-+                tests_planned => 2,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 99997,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 99998,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 99999,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 100000,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 100001,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 100002,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 100003,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 100004,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 100005,
-+                description   => '',
-+                explanation   => '',
-+            },
-+        ],
-+        plan          => '1..2',
-+        passed        => [ 1, 2 ],
-+        actual_passed => [ 1, 2, 99997 .. 100005 ],
-+        failed        => [ 99997 .. 100005 ],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => FALSE,
-+        tests_planned => 2,
-+        tests_run     => 11,
-+        parse_errors  => [
-+            'Tests out of sequence.  Found (99997) but expected (3)',
-+            'Tests out of sequence.  Found (99998) but expected (4)',
-+            'Tests out of sequence.  Found (99999) but expected (5)',
-+            'Tests out of sequence.  Found (100000) but expected (6)',
-+            'Tests out of sequence.  Found (100001) but expected (7)',
-+            'Tests out of sequence.  Found (100002) but expected (8)',
-+            'Tests out of sequence.  Found (100003) but expected (9)',
-+            'Tests out of sequence.  Found (100004) but expected (10)',
-+            'Tests out of sequence.  Found (100005) but expected (11)',
-+            'Bad plan.  You planned 2 tests but ran 11.'
-+        ],
-+        'exit' => 0,
-+        wait   => 0,
-+    },
-+    combined => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..10',
-+                tests_planned => 10,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => 'basset hounds got long ears',
-+                explanation   => '',
-+            },
-+            {   actual_passed => FALSE,
-+                is_actual_ok  => FALSE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => 'all hell broke loose',
-+                explanation   => '',
-+            },
-+            {   actual_passed => FALSE,
-+                is_actual_ok  => FALSE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => TRUE,
-+                number        => 4,
-+                description   => '',
-+                explanation   => 'if I heard a voice from heaven ...',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => 'say "live without loving",',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 6,
-+                description   => "I'd beg off.",
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => '1',
-+                has_todo      => FALSE,
-+                number        => 7,
-+                description   => '',
-+                explanation   => 'contract negotiations',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 8,
-+                description   => 'Girls are such exquisite hell',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => TRUE,
-+                number        => 9,
-+                description   => 'Elegy 9B',
-+                explanation   => '',
-+            },
-+            {   actual_passed => FALSE,
-+                is_actual_ok  => FALSE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 10,
-+                description   => '',
-+                explanation   => '',
-+            },
-+        ],
-+        plan          => '1..10',
-+        passed        => [ 1 .. 2, 4 .. 9 ],
-+        actual_passed => [ 1 .. 2, 5 .. 9 ],
-+        failed        => [ 3, 10 ],
-+        actual_failed => [ 3, 4, 10 ],
-+        todo          => [ 4, 9 ],
-+        todo_passed   => [9],
-+        skipped       => [7],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 10,
-+        tests_run     => 10,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    head_end => {
-+        results => [
-+            {   is_comment => TRUE,
-+                passed     => TRUE,
-+                is_ok      => TRUE,
-+                comment    => 'comments',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   is_comment => TRUE,
-+                passed     => TRUE,
-+                is_ok      => TRUE,
-+                comment    => 'comment',
-+            },
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..4',
-+                tests_planned => 4,
-+            },
-+            {   is_comment => TRUE,
-+                passed     => TRUE,
-+                is_ok      => TRUE,
-+                comment    => 'more ignored stuff',
-+            },
-+            {   is_comment => TRUE,
-+                passed     => TRUE,
-+                is_ok      => TRUE,
-+                comment    => 'and yet more',
-+            },
-+        ],
-+        plan          => '1..4',
-+        passed        => [ 1 .. 4 ],
-+        actual_passed => [ 1 .. 4 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 4,
-+        tests_run     => 4,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    head_fail => {
-+        results => [
-+            {   is_comment => TRUE,
-+                passed     => TRUE,
-+                is_ok      => TRUE,
-+                comment    => 'comments',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => FALSE,
-+                is_actual_ok  => FALSE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   is_comment => TRUE,
-+                passed     => TRUE,
-+                is_ok      => TRUE,
-+                comment    => 'comment',
-+            },
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..4',
-+                tests_planned => 4,
-+            },
-+            {   is_comment => TRUE,
-+                passed     => TRUE,
-+                is_ok      => TRUE,
-+                comment    => 'more ignored stuff',
-+            },
-+            {   is_comment => TRUE,
-+                passed     => TRUE,
-+                is_ok      => TRUE,
-+                comment    => 'and yet more',
-+            },
-+        ],
-+        plan          => '1..4',
-+        passed        => [ 1, 3, 4 ],
-+        actual_passed => [ 1, 3, 4 ],
-+        failed        => [2],
-+        actual_failed => [2],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 4,
-+        tests_run     => 4,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    out_of_order => {
-+        results => [
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => '- Test that argument passing works',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description =>
-+                  '- Test that passing arguments as references work',
-+                explanation => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => '- Test a normal sub',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 6,
-+                description   => '- Detach test',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 8,
-+                description   => '- Nested thread test',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 9,
-+                description   => '- Nested thread test',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 10,
-+                description   => '- Wanted 7, got 7',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 11,
-+                description   => '- Wanted 7, got 7',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 12,
-+                description   => '- Wanted 8, got 8',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 13,
-+                description   => '- Wanted 8, got 8',
-+                explanation   => '',
-+            },
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..15',
-+                tests_planned => 15,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => '',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => '- Check that Config::threads is true',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 7,
-+                description   => '- Detach test',
-+                explanation   => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 14,
-+                description =>
-+                  '- Check so that tid for threads work for main thread',
-+                explanation => '',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 15,
-+                description =>
-+                  '- Check so that tid for threads work for main thread',
-+                explanation => '',
-+            },
-+        ],
-+        plan          => '1..15',
-+        passed        => [ 2 .. 4, 6, 8 .. 13, 1, 5, 7, 14, 15 ],
-+        actual_passed => [ 2 .. 4, 6, 8 .. 13, 1, 5, 7, 14, 15 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        is_good_plan  => FALSE,
-+        tests_planned => 15,
-+        tests_run     => 15,
-+
-+        # Note that tests 14 and 15 *are* in the correct sequence.
-+        parse_errors => [
-+            'Tests out of sequence.  Found (2) but expected (1)',
-+            'Tests out of sequence.  Found (3) but expected (2)',
-+            'Tests out of sequence.  Found (4) but expected (3)',
-+            'Tests out of sequence.  Found (6) but expected (4)',
-+            'Tests out of sequence.  Found (8) but expected (5)',
-+            'Tests out of sequence.  Found (9) but expected (6)',
-+            'Tests out of sequence.  Found (10) but expected (7)',
-+            'Tests out of sequence.  Found (11) but expected (8)',
-+            'Tests out of sequence.  Found (12) but expected (9)',
-+            'Tests out of sequence.  Found (13) but expected (10)',
-+            'Plan (1..15) must be at the beginning or end of the TAP output',
-+            'Tests out of sequence.  Found (1) but expected (11)',
-+            'Tests out of sequence.  Found (5) but expected (12)',
-+            'Tests out of sequence.  Found (7) but expected (13)',
-+        ],
-+        'exit' => 0,
-+        wait   => 0,
-+    },
-+    skipall => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                raw           => '1..0 # skipping: rope',
-+                tests_planned => 0,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                directive     => 'SKIP',
-+                explanation   => ''
-+            },
-+        ],
-+        plan          => '1..0',
-+        passed        => [],
-+        actual_passed => [],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 0,
-+        tests_run     => 0,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+        skip_all      => '(no reason given)',
-+    },
-+    skipall_v13 => {
-+        results => [
-+            {   is_version => TRUE,
-+                raw        => 'TAP version 13',
-+            },
-+            {   is_unknown => TRUE,
-+                raw        => '1..0 # skipping: rope',
-+            },
-+        ],
-+        plan          => '',
-+        passed        => [],
-+        actual_passed => [],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => FALSE,
-+        is_good_plan  => FALSE,
-+        tests_planned => FALSE,
-+        tests_run     => 0,
-+        parse_errors  => ['No plan found in TAP output'],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 13,
-+    },
-+    strict => {
-+        results => [
-+            {   is_version => TRUE,
-+                raw        => 'TAP version 13',
-+            },
-+            {   is_plan => TRUE,
-+                raw     => '1..1',
-+            },
-+            {   is_pragma => TRUE,
-+                raw       => 'pragma +strict',
-+                pragmas   => ['+strict'],
-+            },
-+            {   is_unknown => TRUE, raw => 'Nonsense!',
-+            },
-+            {   is_pragma => TRUE,
-+                raw       => 'pragma -strict',
-+                pragmas   => ['-strict'],
-+            },
-+            {   is_unknown => TRUE,
-+                raw        => "Doesn't matter.",
-+            },
-+            {   is_test => TRUE,
-+                raw     => 'ok 1 All OK',
-+            }
-+        ],
-+        plan          => '1..1',
-+        passed        => [1],
-+        actual_passed => [1],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 1,
-+        tests_run     => 1,
-+        parse_errors  => ['Unknown TAP token: "Nonsense!"'],
-+        'exit'  => 0,    # TODO: Is this right???
-+        wait    => 0,
-+        version => 13,
-+    },
-+    skipall_nomsg => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                raw           => '1..0',
-+                tests_planned => 0,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                directive     => 'SKIP',
-+                explanation   => ''
-+            },
-+        ],
-+        plan          => '1..0',
-+        passed        => [],
-+        actual_passed => [],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 0,
-+        tests_run     => 0,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+        skip_all      => '(no reason given)',
-+    },
-+    todo_misparse => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                raw           => '1..1',
-+                tests_planned => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   actual_passed => FALSE,
-+                is_actual_ok  => FALSE,
-+                passed        => FALSE,
-+                is_ok         => FALSE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => 'Hamlette # TODOORNOTTODO',
-+                explanation   => '',
-+            },
-+        ],
-+        plan          => '1..1',
-+        passed        => [],
-+        actual_passed => [],
-+        failed        => [1],
-+        actual_failed => [1],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => TRUE,
-+        tests_run     => 1,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    shbang_misparse => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                raw           => '1..2',
-+                tests_planned => 2,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                description   => "",
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "",
-+            },
-+        ],
-+        plan          => '1..2',
-+        passed        => [ 1 .. 2 ],
-+        actual_passed => [ 1 .. 2 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 2,
-+        tests_run     => 2,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    switches => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..1',
-+                tests_planned => 1,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => "",
-+                explanation   => '',
-+            },
-+        ],
-+        __ARGS__      => { switches => ['-Mstrict'] },
-+        plan          => '1..1',
-+        passed        => [1],
-+        actual_passed => [1],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 1,
-+        tests_run     => TRUE,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    inc_taint => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..1',
-+                tests_planned => 1,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => "",
-+                explanation   => '',
-+            },
-+        ],
-+        __ARGS__      => { switches => ['-Iexamples'] },
-+        plan          => '1..1',
-+        passed        => [1],
-+        actual_passed => [1],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 1,
-+        tests_run     => TRUE,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    sequence_misparse => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                raw           => '1..5',
-+                tests_planned => 5,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "\# skipped on foobar system",
-+            },
-+            {   is_comment => TRUE,
-+                comment    => '1234567890123456789012345678901234567890',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "",
-+            },
-+            {   is_comment => TRUE,
-+                comment    => '1234567890123456789012345678901234567890',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "",
-+            },
-+        ],
-+        plan          => '1..5',
-+        passed        => [ 1 .. 5 ],
-+        actual_passed => [ 1 .. 5 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+
-+    # For some reason mixing stdout with stderr is unreliable on Windows
-+    (   $IsWin32
-+        ? ()
-+        : ( stdout_stderr => {
-+                results => [
-+                    {   is_comment => TRUE,
-+                        passed     => TRUE,
-+                        is_ok      => TRUE,
-+                        comment    => 'comments',
-+                    },
-+                    {   actual_passed => TRUE,
-+                        is_actual_ok  => TRUE,
-+                        passed        => TRUE,
-+                        is_ok         => TRUE,
-+                        is_test       => TRUE,
-+                        has_skip      => FALSE,
-+                        has_todo      => FALSE,
-+                        number        => 1,
-+                        description   => '',
-+                        explanation   => '',
-+                    },
-+                    {   actual_passed => TRUE,
-+                        is_actual_ok  => TRUE,
-+                        passed        => TRUE,
-+                        is_ok         => TRUE,
-+                        is_test       => TRUE,
-+                        has_skip      => FALSE,
-+                        has_todo      => FALSE,
-+                        number        => 2,
-+                        description   => '',
-+                        explanation   => '',
-+                    },
-+                    {   actual_passed => TRUE,
-+                        is_actual_ok  => TRUE,
-+                        passed        => TRUE,
-+                        is_ok         => TRUE,
-+                        is_test       => TRUE,
-+                        has_skip      => FALSE,
-+                        has_todo      => FALSE,
-+                        number        => 3,
-+                        description   => '',
-+                        explanation   => '',
-+                    },
-+                    {   is_comment => TRUE,
-+                        passed     => TRUE,
-+                        is_ok      => TRUE,
-+                        comment    => 'comment',
-+                    },
-+                    {   actual_passed => TRUE,
-+                        is_actual_ok  => TRUE,
-+                        passed        => TRUE,
-+                        is_ok         => TRUE,
-+                        is_test       => TRUE,
-+                        has_skip      => FALSE,
-+                        has_todo      => FALSE,
-+                        number        => 4,
-+                        description   => '',
-+                        explanation   => '',
-+                    },
-+                    {   is_comment => TRUE,
-+                        passed     => TRUE,
-+                        is_ok      => TRUE,
-+                        comment    => 'more ignored stuff',
-+                    },
-+                    {   is_comment => TRUE,
-+                        passed     => TRUE,
-+                        is_ok      => TRUE,
-+                        comment    => 'and yet more',
-+                    },
-+                    {   is_plan       => TRUE,
-+                        passed        => TRUE,
-+                        is_ok         => TRUE,
-+                        raw           => '1..4',
-+                        tests_planned => 4,
-+                    },
-+                ],
-+                plan          => '1..4',
-+                passed        => [ 1 .. 4 ],
-+                actual_passed => [ 1 .. 4 ],
-+                failed        => [],
-+                actual_failed => [],
-+                todo          => [],
-+                todo_passed   => [],
-+                skipped       => [],
-+                good_plan     => TRUE,
-+                is_good_plan  => TRUE,
-+                tests_planned => 4,
-+                tests_run     => 4,
-+                parse_errors  => [],
-+                'exit'        => 0,
-+                wait          => 0,
-+                version       => 12,
-+                need_open3    => 1,
-+            }
-+        )
-+    ),
-+
-+    junk_before_plan => {
-+        results => [
-+            {   is_unknown => TRUE,
-+                raw        => 'this is junk',
-+            },
-+            {   is_comment => TRUE,
-+                comment    => "this is a comment",
-+            },
-+            {   is_plan       => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                raw           => '1..1',
-+                tests_planned => 1,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+            },
-+        ],
-+        plan          => '1..1',
-+        passed        => [ 1 .. 1 ],
-+        actual_passed => [ 1 .. 1 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 1,
-+        tests_run     => 1,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+    version_good => {
-+        results => [
-+            {   is_version => TRUE,
-+                raw        => 'TAP version 13',
-+            },
-+            {   is_plan       => TRUE,
-+                raw           => '1..5',
-+                tests_planned => 5,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "",
-+            },
-+        ],
-+        plan          => '1..5',
-+        passed        => [ 1 .. 5 ],
-+        actual_passed => [ 1 .. 5 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 13,
-+    },
-+    version_old => {
-+        results => [
-+            {   is_version => TRUE,
-+                raw        => 'TAP version 12',
-+            },
-+            {   is_plan       => TRUE,
-+                raw           => '1..5',
-+                tests_planned => 5,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "",
-+            },
-+        ],
-+        plan          => '1..5',
-+        passed        => [ 1 .. 5 ],
-+        actual_passed => [ 1 .. 5 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors =>
-+          ['Explicit TAP version must be at least 13. Got version 12'],
-+        'exit'  => 0,
-+        wait    => 0,
-+        version => 12,
-+    },
-+    version_late => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                raw           => '1..5',
-+                tests_planned => 5,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   is_version => TRUE,
-+                raw        => 'TAP version 13',
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 4,
-+                description   => "",
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 5,
-+                description   => "",
-+            },
-+        ],
-+        plan          => '1..5',
-+        passed        => [ 1 .. 5 ],
-+        actual_passed => [ 1 .. 5 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 5,
-+        tests_run     => 5,
-+        parse_errors =>
-+          ['If TAP version is present it must be the first line of output'],
-+        'exit'  => 0,
-+        wait    => 0,
-+        version => 12,
-+    },
-+
-+    escape_eol => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                raw           => '1..2',
-+                tests_planned => 2,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                description =>
-+                  'Should parse as literal backslash --> \\',
-+                passed       => TRUE,
-+                is_ok        => TRUE,
-+                is_test      => TRUE,
-+                has_skip     => FALSE,
-+                has_todo     => FALSE,
-+                number       => 1,
-+                is_unplanned => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => 'Not a continuation line',
-+                is_unplanned  => FALSE,
-+            },
-+        ],
-+        plan          => '1..2',
-+        passed        => [ 1 .. 2 ],
-+        actual_passed => [ 1 .. 2 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 2,
-+        tests_run     => 2,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+
-+    escape_hash => {
-+        results => [
-+            {   is_plan       => TRUE,
-+                raw           => '1..3',
-+                tests_planned => 3,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                description   => 'Not a \\# TODO',
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 1,
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 2,
-+                description   => 'Not a \\# SKIP',
-+                is_unplanned  => FALSE,
-+            },
-+            {   actual_passed => TRUE,
-+                is_actual_ok  => TRUE,
-+                passed        => TRUE,
-+                is_ok         => TRUE,
-+                is_test       => TRUE,
-+                has_skip      => FALSE,
-+                has_todo      => FALSE,
-+                number        => 3,
-+                description   => 'Escaped \\\\\\#',
-+                is_unplanned  => FALSE,
-+            },
-+        ],
-+        plan          => '1..3',
-+        passed        => [ 1 .. 3 ],
-+        actual_passed => [ 1 .. 3 ],
-+        failed        => [],
-+        actual_failed => [],
-+        todo          => [],
-+        todo_passed   => [],
-+        skipped       => [],
-+        good_plan     => TRUE,
-+        is_good_plan  => TRUE,
-+        tests_planned => 3,
-+        tests_run     => 3,
-+        parse_errors  => [],
-+        'exit'        => 0,
-+        wait          => 0,
-+        version       => 12,
-+    },
-+);
-+
-+my %HANDLER_FOR = (
-+    NOT_ZERO, sub { local $^W; 0 != shift },
-+    TRUE,     sub { local $^W; !!shift },
-+    FALSE,    sub { local $^W; !shift },
-+);
-+
-+my $can_open3 = ( $Config{d_fork} || $IsWin32 ) ? 1 : 0;
-+
-+for my $hide_fork ( 0 .. $can_open3 ) {
-+    if ($hide_fork) {
-+        no strict 'refs';
-+        local $^W = 0;
-+        *{'TAP::Parser::Iterator::Process::_use_open3'} = sub {return};
-+    }
-+
-+    TEST:
-+    for my $test ( sort keys %samples ) {
-+
-+        #next unless 'empty' eq $test;
-+        my %details = %{ $samples{$test} };
-+
-+        if ( my $skip_if = delete $details{skip_if} ) {
-+            next TEST if $skip_if->();
-+        }
-+
-+        my $results    = delete $details{results};
-+        my $args       = delete $details{__ARGS__};
-+        my $need_open3 = delete $details{need_open3};
-+
-+        next TEST if $need_open3 && ( $hide_fork || !$can_open3 );
-+
-+        # the following acrobatics are necessary to make it easy for the
-+        # Test::Builder::failure_output() method to be overridden when
-+        # TAP::Parser is not installed.  Otherwise, these tests will fail.
-+
-+        unshift @{ $args->{switches} },
-+          $ENV{PERL_CORE} ? ( map {"-I$_"} @INC ) : ('-It/lib');
-+
-+        $args->{source} = File::Spec->catfile( $SAMPLE_TESTS, $test );
-+        $args->{merge} = !$hide_fork;
-+
-+        my $parser = eval { analyze_test( $test, [@$results], $args ) };
-+        my $error = $@;
-+        ok !$error, "'$test' should parse successfully"
-+          or diag $error;
-+
-+        if ($error) {
-+            my $tests = 0;
-+            while ( my ( $method, $answer ) = each %details ) {
-+                $tests += ref $answer ? 2 : 1;
-+            }
-+            SKIP: {
-+                skip "$test did not parse successfully", $tests;
-+            }
-+        }
-+        else {
-+            while ( my ( $method, $answer ) = each %details ) {
-+                if ( my $handler = $HANDLER_FOR{ $answer || '' } ) {    # yuck
-+                    ok $handler->( $parser->$method() ),
-+                      "... and $method should return a reasonable value ($test)";
-+                }
-+                elsif ( !ref $answer ) {
-+                    local $^W;    # uninit warnings
-+
-+                    $answer = _vmsify_answer( $method, $answer );
-+
-+                    is $parser->$method(), $answer,
-+                      "... and $method should equal $answer ($test)";
-+                }
-+                else {
-+                    is scalar $parser->$method(), scalar @$answer,
-+                      "... and $method should be the correct amount ($test)";
-+                    is_deeply [ $parser->$method() ], $answer,
-+                      "... and $method should be the correct values ($test)";
-+                }
-+            }
-+        }
-+    }
-+}
-+
-+my %Unix2VMS_Exit_Codes = ( 1 => 4, );
-+
-+sub _vmsify_answer {
-+    my ( $method, $answer ) = @_;
-+
-+    return $answer unless $IsVMS;
-+
-+    if ( $method eq 'exit'
-+        and exists $Unix2VMS_Exit_Codes{$answer} )
-+    {
-+        $answer = $Unix2VMS_Exit_Codes{$answer};
-+    }
-+
-+    return $answer;
-+}
-+
-+sub analyze_test {
-+    my ( $test, $results, $args ) = @_;
-+
-+    my $parser = TAP::Parser->new($args);
-+    my $count  = 1;
-+    while ( defined( my $result = $parser->next ) ) {
-+
-+        my $expected = shift @$results;
-+        my $desc
-+          = $result->is_test
-+          ? $result->description
-+          : $result->raw;
-+        $desc = $result->plan
-+          if $result->is_plan && $desc =~ /SKIP/i;
-+        $desc =~ s/#/<hash>/g;
-+        $desc =~ s/\s+/ /g;      # Drop newlines
-+        ok defined $expected,
-+          "$test/$count We should have a result for $desc";
-+        while ( my ( $method, $answer ) = each %$expected ) {
-+
-+            if ( my $handler = $HANDLER_FOR{ $answer || '' } ) {    # yuck
-+                ok $handler->( $result->$method() ),
-+                  "... and $method should return a reasonable value ($test/$count)";
-+            }
-+            elsif ( ref $answer ) {
-+                is_deeply scalar( $result->$method() ), $answer,
-+                  "... and $method should return the correct structure ($test/$count)";
-+            }
-+            else {
-+                is $result->$method(), $answer,
-+                  "... and $method should return the correct answer ($test/$count)";
-+            }
-+        }
-+        $count++;
-+    }
-+    is @$results, 0,
-+      "... and we should have the correct number of results ($test)";
-+    return $parser;
-+}
-+
-+# vms_nit
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/results.t perl-5.10.0/ext/Test/Harness/t/results.t
---- perl-5.10.0.orig/ext/Test/Harness/t/results.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/results.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,295 @@
-+#!/usr/bin/perl -wT
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 227;
-+
-+use TAP::Parser::ResultFactory;
-+use TAP::Parser::Result;
-+
-+use constant RESULT  => 'TAP::Parser::Result';
-+use constant PLAN    => 'TAP::Parser::Result::Plan';
-+use constant TEST    => 'TAP::Parser::Result::Test';
-+use constant COMMENT => 'TAP::Parser::Result::Comment';
-+use constant BAILOUT => 'TAP::Parser::Result::Bailout';
-+use constant UNKNOWN => 'TAP::Parser::Result::Unknown';
-+
-+my $warning;
-+$SIG{__WARN__} = sub { $warning = shift };
-+
-+#
-+# Note that the are basic unit tests.  More comprehensive path coverage is
-+# found in the regression tests.
-+#
-+
-+my $factory           = TAP::Parser::ResultFactory->new;
-+my %inherited_methods = (
-+    is_plan    => '',
-+    is_test    => '',
-+    is_comment => '',
-+    is_bailout => '',
-+    is_unknown => '',
-+    is_ok      => 1,
-+);
-+
-+my $abstract_class = bless { type => 'no_such_type' },
-+  RESULT;    # you didn't see this
-+run_method_tests( $abstract_class, {} );    # check the defaults
-+
-+can_ok $abstract_class, 'type';
-+is $abstract_class->type, 'no_such_type',
-+  '... and &type should return the correct result';
-+
-+can_ok $abstract_class, 'passed';
-+$warning = '';
-+ok $abstract_class->passed, '... and it should default to true';
-+like $warning, qr/^\Qpassed() is deprecated.  Please use "is_ok()"/,
-+  '... but it should emit a deprecation warning';
-+
-+can_ok RESULT, 'new';
-+
-+can_ok $factory, 'make_result';
-+eval { $factory->make_result( { type => 'no_such_type' } ) };
-+ok my $error = $@, '... and calling it with an unknown class should fail';
-+like $error, qr/^Could not determine class for.*no_such_type/s,
-+  '... with an appropriate error message';
-+
-+# register new Result types:
-+can_ok $factory, 'class_for';
-+can_ok $factory, 'register_type';
-+{
-+
-+    package MyResult;
-+    use strict;
-+    use vars qw($VERSION @ISA);
-+    @ISA = 'TAP::Parser::Result';
-+    TAP::Parser::ResultFactory->register_type( 'my_type' => __PACKAGE__ );
-+}
-+
-+{
-+    my $r = eval { $factory->make_result( { type => 'my_type' } ) };
-+    my $error = $@;
-+    isa_ok( $r, 'MyResult', 'register custom type' );
-+    ok( !$error, '... and no error' );
-+}
-+
-+#
-+# test unknown tokens
-+#
-+
-+run_tests(
-+    {   class => UNKNOWN,
-+        data  => {
-+            type => 'unknown',
-+            raw  => '... this line is junk ... ',
-+        },
-+    },
-+    {   is_unknown    => 1,
-+        raw           => '... this line is junk ... ',
-+        as_string     => '... this line is junk ... ',
-+        type          => 'unknown',
-+        has_directive => '',
-+    }
-+);
-+
-+#
-+# test comment tokens
-+#
-+
-+run_tests(
-+    {   class => COMMENT,
-+        data  => {
-+            type    => 'comment',
-+            raw     => '#   this is a comment',
-+            comment => 'this is a comment',
-+        },
-+    },
-+    {   is_comment    => 1,
-+        raw           => '#   this is a comment',
-+        as_string     => '#   this is a comment',
-+        comment       => 'this is a comment',
-+        type          => 'comment',
-+        has_directive => '',
-+    }
-+);
-+
-+#
-+# test bailout tokens
-+#
-+
-+run_tests(
-+    {   class => BAILOUT,
-+        data  => {
-+            type    => 'bailout',
-+            raw     => 'Bailout!  This blows!',
-+            bailout => 'This blows!',
-+        },
-+    },
-+    {   is_bailout    => 1,
-+        raw           => 'Bailout!  This blows!',
-+        as_string     => 'This blows!',
-+        type          => 'bailout',
-+        has_directive => '',
-+    }
-+);
-+
-+#
-+# test plan tokens
-+#
-+
-+run_tests(
-+    {   class => PLAN,
-+        data  => {
-+            type          => 'plan',
-+            raw           => '1..20',
-+            tests_planned => 20,
-+            directive     => '',
-+            explanation   => '',
-+        },
-+    },
-+    {   is_plan       => 1,
-+        raw           => '1..20',
-+        tests_planned => 20,
-+        directive     => '',
-+        explanation   => '',
-+        has_directive => '',
-+    }
-+);
-+
-+run_tests(
-+    {   class => PLAN,
-+        data  => {
-+            type          => 'plan',
-+            raw           => '1..0 # SKIP help me, Rhonda!',
-+            tests_planned => 0,
-+            directive     => 'SKIP',
-+            explanation   => 'help me, Rhonda!',
-+        },
-+    },
-+    {   is_plan       => 1,
-+        raw           => '1..0 # SKIP help me, Rhonda!',
-+        tests_planned => 0,
-+        directive     => 'SKIP',
-+        explanation   => 'help me, Rhonda!',
-+        has_directive => 1,
-+    }
-+);
-+
-+#
-+# test 'test' tokens
-+#
-+
-+my $test = run_tests(
-+    {   class => TEST,
-+        data  => {
-+            ok          => 'ok',
-+            test_num    => 5,
-+            description => '... and this test is fine',
-+            directive   => '',
-+            explanation => '',
-+            raw         => 'ok 5 and this test is fine',
-+            type        => 'test',
-+        },
-+    },
-+    {   is_test       => 1,
-+        type          => 'test',
-+        ok            => 'ok',
-+        number        => 5,
-+        description   => '... and this test is fine',
-+        directive     => '',
-+        explanation   => '',
-+        is_ok         => 1,
-+        is_actual_ok  => 1,
-+        todo_passed   => '',
-+        has_skip      => '',
-+        has_todo      => '',
-+        as_string     => 'ok 5 ... and this test is fine',
-+        is_unplanned  => '',
-+        has_directive => '',
-+    }
-+);
-+
-+can_ok $test, 'actual_passed';
-+$warning = '';
-+is $test->actual_passed, $test->is_actual_ok,
-+  '... and it should return the correct value';
-+like $warning,
-+  qr/^\Qactual_passed() is deprecated.  Please use "is_actual_ok()"/,
-+  '... but issue a deprecation warning';
-+
-+can_ok $test, 'todo_failed';
-+$warning = '';
-+is $test->todo_failed, $test->todo_passed,
-+  '... and it should return the correct value';
-+like $warning,
-+  qr/^\Qtodo_failed() is deprecated.  Please use "todo_passed()"/,
-+  '... but issue a deprecation warning';
-+
-+# TODO directive
-+
-+$test = run_tests(
-+    {   class => TEST,
-+        data  => {
-+            ok          => 'not ok',
-+            test_num    => 5,
-+            description => '... and this test is fine',
-+            directive   => 'TODO',
-+            explanation => 'why not?',
-+            raw         => 'not ok 5 and this test is fine # TODO why not?',
-+            type        => 'test',
-+        },
-+    },
-+    {   is_test      => 1,
-+        type         => 'test',
-+        ok           => 'not ok',
-+        number       => 5,
-+        description  => '... and this test is fine',
-+        directive    => 'TODO',
-+        explanation  => 'why not?',
-+        is_ok        => 1,
-+        is_actual_ok => '',
-+        todo_passed  => '',
-+        has_skip     => '',
-+        has_todo     => 1,
-+        as_string =>
-+          'not ok 5 ... and this test is fine # TODO why not?',
-+        is_unplanned  => '',
-+        has_directive => 1,
-+    }
-+);
-+
-+sub run_tests {
-+    my ( $instantiated, $value_for ) = @_;
-+    my $result = instantiate($instantiated);
-+    run_method_tests( $result, $value_for );
-+    return $result;
-+}
-+
-+sub instantiate {
-+    my $instantiated = shift;
-+    my $class        = $instantiated->{class};
-+    ok my $result = $factory->make_result( $instantiated->{data} ),
-+      'Creating $class results should succeed';
-+    isa_ok $result, $class, '.. and the object it returns';
-+    return $result;
-+}
-+
-+sub run_method_tests {
-+    my ( $result, $value_for ) = @_;
-+    while ( my ( $method, $default ) = each %inherited_methods ) {
-+        can_ok $result, $method;
-+        if ( defined( my $value = delete $value_for->{$method} ) ) {
-+            is $result->$method(), $value,
-+              "... and $method should be correct";
-+        }
-+        else {
-+            is $result->$method(), $default,
-+              "... and $method default should be correct";
-+        }
-+    }
-+    while ( my ( $method, $value ) = each %$value_for ) {
-+        can_ok $result, $method;
-+        is $result->$method(), $value, "... and $method should be correct";
-+    }
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/bailout perl-5.10.0/ext/Test/Harness/t/sample-tests/bailout
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/bailout	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/bailout	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,11 @@
-+# Sleep makes Mac OS open3 race problem more repeatable
-+sleep 1;
-+print <<DUMMY_TEST;
-+1..5
-+ok 1
-+ok 2
-+ok 3
-+Bail out!  GERONIMMMOOOOOO!!!
-+ok 4
-+ok 5
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/bignum perl-5.10.0/ext/Test/Harness/t/sample-tests/bignum
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/bignum	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/bignum	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,7 @@
-+print <<DUMMY;
-+1..2
-+ok 1
-+ok 2
-+ok 136211425
-+ok 136211426
-+DUMMY
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/bignum_many perl-5.10.0/ext/Test/Harness/t/sample-tests/bignum_many
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/bignum_many	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/bignum_many	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,14 @@
-+print <<DUMMY;
-+1..2
-+ok 1
-+ok 2
-+ok 99997
-+ok 99998
-+ok 99999
-+ok 100000
-+ok 100001
-+ok 100002
-+ok 100003
-+ok 100004
-+ok 100005
-+DUMMY
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/combined perl-5.10.0/ext/Test/Harness/t/sample-tests/combined
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/combined	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/combined	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,13 @@
-+print <<DUMMY_TEST;
-+1..10
-+ok 1
-+ok 2 basset hounds got long ears
-+not ok 3        all hell broke loose
-+not ok 4  # TODO if I heard a voice from heaven ...
-+ok say "live without loving",
-+ok 6 I'd beg off.
-+ok 7            # Skip contract negotiations
-+ok 8 Girls are such exquisite hell
-+ok 9 Elegy 9B           # TOdO
-+not ok 10
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/combined_compat perl-5.10.0/ext/Test/Harness/t/sample-tests/combined_compat
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/combined_compat	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/combined_compat	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,13 @@
-+print <<DUMMY_TEST;
-+1..10 todo 4 10
-+ok 1
-+ok 2 basset hounds got long ears
-+not ok 3        all hell broke lose
-+ok 4
-+ok
-+ok 6
-+ok 7            # Skip contract negociations
-+ok 8
-+not ok 9
-+not ok 10
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/delayed perl-5.10.0/ext/Test/Harness/t/sample-tests/delayed
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/delayed	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/delayed	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,32 @@
-+# Used to test Process.pm
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        @INC = '../lib';
-+    }
-+}
-+
-+use Time::HiRes qw(sleep);
-+
-+my $delay = 0.01;
-+
-+$| = 1;
-+
-+my @parts = (
-+    "1.",
-+    ".5\n",
-+    "ok 1 00000\n",
-+    "ok 2\nnot",
-+    " ok 3",
-+    "\nok 4\nok ",
-+    "5 00000",
-+    ""
-+);
-+
-+my $delay_at = shift || 0;
-+
-+while (@parts) {
-+    sleep $delay if ( $delay_at & 1 );
-+    $delay_at >>= 1;
-+    print shift @parts;
-+}
-+sleep $delay if ( $delay_at & 1 );
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/descriptive perl-5.10.0/ext/Test/Harness/t/sample-tests/descriptive
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/descriptive	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/descriptive	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,8 @@
-+print <<DUMMY_TEST;
-+1..5
-+ok 1    Interlock activated
-+ok 2    Megathrusters are go
-+ok 3    Head formed
-+ok 4    Blazing sword formed
-+ok 5    Robeast destroyed
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/descriptive_trailing perl-5.10.0/ext/Test/Harness/t/sample-tests/descriptive_trailing
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/descriptive_trailing	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/descriptive_trailing	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,8 @@
-+print <<DUMMY_TEST;
-+ok 1    Interlock activated
-+ok 2    Megathrusters are go
-+ok 3    Head formed
-+ok 4    Blazing sword formed
-+ok 5    Robeast destroyed
-+1..5
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/die perl-5.10.0/ext/Test/Harness/t/sample-tests/die
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/die	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/die	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,2 @@
-+eval "use vmsish 'hushed'" if ($^O eq 'VMS');
-+exit 1;  # exit because die() can be noisy
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/die_head_end perl-5.10.0/ext/Test/Harness/t/sample-tests/die_head_end
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/die_head_end	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/die_head_end	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,9 @@
-+print <<DUMMY_TEST;
-+ok 1
-+ok 2
-+ok 3
-+ok 4
-+DUMMY_TEST
-+
-+eval "use vmsish 'hushed'" if ($^O eq 'VMS');
-+exit 1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/die_last_minute perl-5.10.0/ext/Test/Harness/t/sample-tests/die_last_minute
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/die_last_minute	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/die_last_minute	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,10 @@
-+print <<DUMMY_TEST;
-+ok 1
-+ok 2
-+ok 3
-+ok 4
-+1..4
-+DUMMY_TEST
-+
-+eval "use vmsish 'hushed'" if ($^O eq 'VMS');
-+exit 1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/die_unfinished perl-5.10.0/ext/Test/Harness/t/sample-tests/die_unfinished
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/die_unfinished	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/die_unfinished	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,9 @@
-+print <<DUMMY_TEST;
-+1..4
-+ok 1
-+ok 2
-+ok 3
-+DUMMY_TEST
-+
-+eval "use vmsish 'hushed'" if ($^O eq 'VMS');
-+exit 1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/duplicates perl-5.10.0/ext/Test/Harness/t/sample-tests/duplicates
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/duplicates	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/duplicates	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,14 @@
-+print <<DUMMY_TEST
-+1..10
-+ok 1
-+ok 2
-+ok 3
-+ok 4
-+ok 4
-+ok 5
-+ok 6
-+ok 7
-+ok 8
-+ok 9
-+ok 10
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/echo perl-5.10.0/ext/Test/Harness/t/sample-tests/echo
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/echo	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/echo	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,2 @@
-+print '1..', scalar(@ARGV), "\n";
-+print "ok $_ ", $ARGV[ $_ - 1 ], "\n" for 1 .. @ARGV;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/empty perl-5.10.0/ext/Test/Harness/t/sample-tests/empty
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/empty	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/empty	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,2 @@
-+__END__
-+Used to exercise the "empty test" case.
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/escape_eol perl-5.10.0/ext/Test/Harness/t/sample-tests/escape_eol
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/escape_eol	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/escape_eol	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,5 @@
-+print <<DUMMY_TEST;
-+1..2
-+ok 1    Should parse as literal backslash --> \\
-+ok 2    Not a continuation line
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/escape_hash perl-5.10.0/ext/Test/Harness/t/sample-tests/escape_hash
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/escape_hash	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/escape_hash	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,6 @@
-+print <<DUMMY_TEST;
-+1..3
-+ok 1    Not a \\# TODO
-+ok 2    Not a \\# SKIP
-+ok 3    Escaped \\\\\\#
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/head_end perl-5.10.0/ext/Test/Harness/t/sample-tests/head_end
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/head_end	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/head_end	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,11 @@
-+print <<DUMMY_TEST;
-+# comments
-+ok 1
-+ok 2
-+ok 3
-+ok 4
-+# comment
-+1..4
-+# more ignored stuff
-+# and yet more
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/head_fail perl-5.10.0/ext/Test/Harness/t/sample-tests/head_fail
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/head_fail	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/head_fail	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,11 @@
-+print <<DUMMY_TEST;
-+# comments
-+ok 1
-+not ok 2
-+ok 3
-+ok 4
-+# comment
-+1..4
-+# more ignored stuff
-+# and yet more
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/inc_taint perl-5.10.0/ext/Test/Harness/t/sample-tests/inc_taint
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/inc_taint	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/inc_taint	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,6 @@
-+#!/usr/bin/perl -Tw
-+
-+use Test::More tests => 1;
-+
-+ok( grep( /examples/, @INC ) );
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/junk_before_plan perl-5.10.0/ext/Test/Harness/t/sample-tests/junk_before_plan
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/junk_before_plan	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/junk_before_plan	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,6 @@
-+print <<DUMMY_TEST;
-+this is junk
-+# this is a comment
-+1..1
-+ok 1
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/lone_not_bug perl-5.10.0/ext/Test/Harness/t/sample-tests/lone_not_bug
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/lone_not_bug	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/lone_not_bug	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,9 @@
-+# There was a bug where the first test would be considered a
-+# 'lone not' failure.
-+print <<DUMMY;
-+ok 1
-+ok 2
-+ok 3
-+ok 4
-+1..4
-+DUMMY
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/no_nums perl-5.10.0/ext/Test/Harness/t/sample-tests/no_nums
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/no_nums	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/no_nums	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,8 @@
-+print <<DUMMY_TEST;
-+1..5
-+ok
-+ok
-+not ok
-+ok
-+ok
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/no_output perl-5.10.0/ext/Test/Harness/t/sample-tests/no_output
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/no_output	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/no_output	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,3 @@
-+#!/usr/bin/perl -w
-+
-+exit;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/out_err_mix perl-5.10.0/ext/Test/Harness/t/sample-tests/out_err_mix
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/out_err_mix	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/out_err_mix	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,13 @@
-+sub _autoflush {
-+    my $flushed = shift;
-+    my $old_fh  = select $flushed;
-+    $| = 1;
-+    select $old_fh;
-+}
-+
-+_autoflush( \*STDOUT );
-+_autoflush( \*STDERR );
-+
-+print STDOUT "one\n";
-+print STDERR "two\n\n";
-+print STDOUT "three\n";
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/out_of_order perl-5.10.0/ext/Test/Harness/t/sample-tests/out_of_order
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/out_of_order	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/out_of_order	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,22 @@
-+# From a bungled core thread test.
-+#
-+# The important thing here is that the last test is the right test.
-+# Test::Harness would misparse this as being a valid test.
-+print <<DUMMY;
-+ok 2 - Test that argument passing works
-+ok 3 - Test that passing arguments as references work
-+ok 4 - Test a normal sub
-+ok 6 - Detach test
-+ok 8 - Nested thread test
-+ok 9 - Nested thread test
-+ok 10 - Wanted 7, got 7
-+ok 11 - Wanted 7, got 7
-+ok 12 - Wanted 8, got 8
-+ok 13 - Wanted 8, got 8
-+1..15
-+ok 1
-+ok 5 - Check that Config::threads is true
-+ok 7 - Detach test
-+ok 14 - Check so that tid for threads work for main thread
-+ok 15 - Check so that tid for threads work for main thread
-+DUMMY
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/schwern perl-5.10.0/ext/Test/Harness/t/sample-tests/schwern
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/schwern	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/schwern	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,3 @@
-+use Test::More;
-+plan tests => 1;
-+ok 23, 42;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/schwern-todo-quiet perl-5.10.0/ext/Test/Harness/t/sample-tests/schwern-todo-quiet
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/schwern-todo-quiet	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/schwern-todo-quiet	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,13 @@
-+print <<DUMMY_TEST;
-+1..3
-+ok 1
-+not ok 2
-+#   Failed test at ../../andy/schwern.pl line 17.
-+#          got: '23'
-+#     expected: '42'
-+not ok 3 # TODO Roman numerials still not a built in type
-+#   Failed (TODO) test at ../../andy/schwern.pl line 20.
-+#          got: 'XXIII'
-+#     expected: '23'
-+# Looks like you failed 1 test of 3.
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/segfault perl-5.10.0/ext/Test/Harness/t/sample-tests/segfault
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/segfault	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/segfault	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,5 @@
-+#!/usr/bin/perl
-+
-+print "1..1\n";
-+print "ok 1\n";
-+kill 11, $$;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/sequence_misparse perl-5.10.0/ext/Test/Harness/t/sample-tests/sequence_misparse
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/sequence_misparse	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/sequence_misparse	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,14 @@
-+#
-+# This was causing parse failures due to an error in the TAP specification.
-+# Hash marks *are* allowed in the description.
-+#
-+print <<DUMMY;
-+1..5
-+ok 1
-+ok 2
-+ok 3 # skipped on foobar system
-+# 1234567890123456789012345678901234567890
-+ok 4
-+# 1234567890123456789012345678901234567890
-+ok 5
-+DUMMY
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/shbang_misparse perl-5.10.0/ext/Test/Harness/t/sample-tests/shbang_misparse
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/shbang_misparse	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/shbang_misparse	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,12 @@
-+#!/usr/bin/perl-latest
-+
-+# The above #! line was misparsed as having a -t.
-+# Pre-5.8 this will simply cause perl to choke, since there was no -t.
-+# Post-5.8 taint warnings will mistakenly be on.
-+
-+print "1..2\n";
-+print "ok 1\n";
-+my $warning = '';
-+$SIG{__WARN__} = sub { $warning .= $_[0] };
-+eval( "#" . substr( $0, 0, 0 ) );
-+print $warning ? "not ok 2\n" : "ok 2\n";
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/simple perl-5.10.0/ext/Test/Harness/t/sample-tests/simple
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/simple	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/simple	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,8 @@
-+print <<DUMMY_TEST;
-+1..5
-+ok 1
-+ok 2
-+ok 3
-+ok 4
-+ok 5
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/simple_fail perl-5.10.0/ext/Test/Harness/t/sample-tests/simple_fail
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/simple_fail	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/simple_fail	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,8 @@
-+print <<DUMMY_TEST;
-+1..5
-+ok 1
-+not ok 2
-+ok 3
-+ok 4
-+not ok 5
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/simple_yaml perl-5.10.0/ext/Test/Harness/t/sample-tests/simple_yaml
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/simple_yaml	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/simple_yaml	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,27 @@
-+print <<DUMMY_TEST;
-+TAP version 13
-+1..5
-+ok 1
-+ok 2
-+  ---
-+  -
-+    fnurk: skib
-+    ponk: gleeb
-+  -
-+    bar: krup
-+    foo: plink
-+  ...
-+ok 3
-+ok 4
-+  ---
-+  expected:
-+    - 1
-+    - 2
-+    - 4
-+  got:
-+    - 1
-+    - pong
-+    - 4
-+  ...
-+ok 5
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/skip perl-5.10.0/ext/Test/Harness/t/sample-tests/skip
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/skip	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/skip	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,8 @@
-+print <<DUMMY_TEST;
-+1..5
-+ok 1
-+ok 2    # skip rain delay
-+ok 3
-+ok 4
-+ok 5
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/skip_nomsg perl-5.10.0/ext/Test/Harness/t/sample-tests/skip_nomsg
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/skip_nomsg	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/skip_nomsg	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,4 @@
-+print <<DUMMY;
-+1..1
-+ok 1 # Skip
-+DUMMY
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/skipall perl-5.10.0/ext/Test/Harness/t/sample-tests/skipall
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/skipall	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/skipall	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,3 @@
-+print <<DUMMY_TEST;
-+1..0 # skipping: rope
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/skipall_nomsg perl-5.10.0/ext/Test/Harness/t/sample-tests/skipall_nomsg
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/skipall_nomsg	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/skipall_nomsg	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,2 @@
-+print "1..0\n";
-+exit 0;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/skipall_v13 perl-5.10.0/ext/Test/Harness/t/sample-tests/skipall_v13
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/skipall_v13	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/skipall_v13	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,4 @@
-+print <<DUMMY_TEST;
-+TAP version 13
-+1..0 # skipping: rope
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/space_after_plan perl-5.10.0/ext/Test/Harness/t/sample-tests/space_after_plan
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/space_after_plan	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/space_after_plan	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,3 @@
-+# gforth TAP generates a space after the plan. Should probably be allowed.
-+print "1..5 \n";
-+print "ok $_ \n" for 1..5;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/stdout_stderr perl-5.10.0/ext/Test/Harness/t/sample-tests/stdout_stderr
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/stdout_stderr	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/stdout_stderr	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,9 @@
-+use Test::More 'no_plan';
-+diag 'comments';
-+ok 1;
-+ok 1;
-+ok 1;
-+diag 'comment';
-+ok 1;
-+diag 'more ignored stuff';
-+diag 'and yet more';
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/strict perl-5.10.0/ext/Test/Harness/t/sample-tests/strict
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/strict	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/strict	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,9 @@
-+print <<DUMMY_TEST;
-+TAP version 13
-+1..1
-+pragma +strict
-+Nonsense!
-+pragma -strict
-+Doesn't matter.
-+ok 1 All OK
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/switches perl-5.10.0/ext/Test/Harness/t/sample-tests/switches
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/switches	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/switches	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,2 @@
-+print "1..1\n";
-+print $INC{'strict.pm'} ? "ok 1\n" : "not ok 1\n";
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/taint perl-5.10.0/ext/Test/Harness/t/sample-tests/taint
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/taint	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/taint	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,7 @@
-+#!/usr/bin/perl -Tw
-+
-+use lib qw(t/lib);
-+use Test::More tests => 1;
-+
-+eval { kill 0, $^X };
-+like( $@, '/^Insecure dependency/', '-T honored' );
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/taint_warn perl-5.10.0/ext/Test/Harness/t/sample-tests/taint_warn
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/taint_warn	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/taint_warn	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,11 @@
-+#!/usr/bin/perl -tw
-+
-+use lib qw(t/lib);
-+use Test::More tests => 1;
-+
-+my $warnings = '';
-+{
-+    local $SIG{__WARN__} = sub { $warnings .= join '', @_ };
-+    kill 0, $^X;
-+}
-+like( $warnings, '/^Insecure dependency/', '-t honored' );
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/todo perl-5.10.0/ext/Test/Harness/t/sample-tests/todo
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/todo	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/todo	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,8 @@
-+print <<DUMMY_TEST;
-+1..5 todo 3 2;
-+ok 1
-+ok 2
-+not ok 3
-+ok 4
-+ok 5
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/todo_inline perl-5.10.0/ext/Test/Harness/t/sample-tests/todo_inline
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/todo_inline	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/todo_inline	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,6 @@
-+print <<DUMMY_TEST;
-+1..3
-+not ok 1 - Foo # TODO Just testing the todo interface.
-+ok 2 - Unexpected success # TODO Just testing the todo interface.
-+ok 3 - This is not todo
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/todo_misparse perl-5.10.0/ext/Test/Harness/t/sample-tests/todo_misparse
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/todo_misparse	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/todo_misparse	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,5 @@
-+print <<'END';
-+1..1
-+not ok 1 Hamlette # TODOORNOTTODO
-+END
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/too_many perl-5.10.0/ext/Test/Harness/t/sample-tests/too_many
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/too_many	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/too_many	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,14 @@
-+print <<DUMMY;
-+1..3
-+ok 1
-+ok 2
-+ok 3
-+ok 4
-+ok 5
-+ok 6
-+ok 7
-+DUMMY
-+
-+exit 4;  # simulate Test::More's exit status
-+
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/version_good perl-5.10.0/ext/Test/Harness/t/sample-tests/version_good
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/version_good	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/version_good	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,9 @@
-+print <<DUMMY_TEST;
-+TAP version 13
-+1..5
-+ok 1
-+ok 2
-+ok 3
-+ok 4
-+ok 5
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/version_late perl-5.10.0/ext/Test/Harness/t/sample-tests/version_late
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/version_late	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/version_late	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,9 @@
-+print <<DUMMY_TEST;
-+1..5
-+TAP version 13
-+ok 1
-+ok 2
-+ok 3
-+ok 4
-+ok 5
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/version_old perl-5.10.0/ext/Test/Harness/t/sample-tests/version_old
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/version_old	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/version_old	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,9 @@
-+print <<DUMMY_TEST;
-+TAP version 12
-+1..5
-+ok 1
-+ok 2
-+ok 3
-+ok 4
-+ok 5
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/vms_nit perl-5.10.0/ext/Test/Harness/t/sample-tests/vms_nit
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/vms_nit	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/vms_nit	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,6 @@
-+print <<DUMMY;
-+1..2
-+not 
-+ok 1
-+ok 2
-+DUMMY
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/with_comments perl-5.10.0/ext/Test/Harness/t/sample-tests/with_comments
---- perl-5.10.0.orig/ext/Test/Harness/t/sample-tests/with_comments	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/sample-tests/with_comments	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,14 @@
-+print <<DUMMY_TEST;
-+# and stuff
-+1..5 todo 1 2 4 5;
-+# yeah, that
-+not ok 1
-+# Failed test 1 in t/todo.t at line 9 *TODO*
-+ok 2 # (t/todo.t at line 10 TODO?!)
-+ok 3
-+not ok 4
-+# Test 4 got: '0' (t/todo.t at line 12 *TODO*)
-+#   Expected: '1' (need more tuits)
-+ok 5 # (t/todo.t at line 13 TODO?!)
-+# woo
-+DUMMY_TEST
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/scheduler.t perl-5.10.0/ext/Test/Harness/t/scheduler.t
---- perl-5.10.0.orig/ext/Test/Harness/t/scheduler.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/scheduler.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,225 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More;
-+use TAP::Parser::Scheduler;
-+
-+my $perl_rules = {
-+    par => [
-+        { seq => '../ext/DB_File/t/*' },
-+        { seq => '../ext/IO_Compress_Zlib/t/*' },
-+        { seq => '../lib/CPANPLUS/*' },
-+        { seq => '../lib/ExtUtils/t/*' },
-+        '*'
-+    ]
-+};
-+
-+my $incomplete_rules = { par => [ { seq => [ '*A', '*D' ] } ] };
-+
-+my $some_tests = [
-+    '../ext/DB_File/t/A',
-+    'foo',
-+    '../ext/DB_File/t/B',
-+    '../ext/DB_File/t/C',
-+    '../lib/CPANPLUS/D',
-+    '../lib/CPANPLUS/E',
-+    'bar',
-+    '../lib/CPANPLUS/F',
-+    '../ext/DB_File/t/D',
-+    '../ext/DB_File/t/E',
-+    '../ext/DB_File/t/F',
-+];
-+
-+my @schedule = (
-+    {   name  => 'Sequential, no rules',
-+        tests => $some_tests,
-+        jobs  => 1,
-+    },
-+    {   name  => 'Sequential, Perl rules',
-+        rules => $perl_rules,
-+        tests => $some_tests,
-+        jobs  => 1,
-+    },
-+    {   name  => 'Two in parallel, Perl rules',
-+        rules => $perl_rules,
-+        tests => $some_tests,
-+        jobs  => 2,
-+    },
-+    {   name  => 'Massively parallel, Perl rules',
-+        rules => $perl_rules,
-+        tests => $some_tests,
-+        jobs  => 1000,
-+    },
-+    {   name  => 'Massively parallel, no rules',
-+        tests => $some_tests,
-+        jobs  => 1000,
-+    },
-+    {   name  => 'Sequential, incomplete rules',
-+        rules => $incomplete_rules,
-+        tests => $some_tests,
-+        jobs  => 1,
-+    },
-+    {   name  => 'Two in parallel, incomplete rules',
-+        rules => $incomplete_rules,
-+        tests => $some_tests,
-+        jobs  => 2,
-+    },
-+    {   name  => 'Massively parallel, incomplete rules',
-+        rules => $incomplete_rules,
-+        tests => $some_tests,
-+        jobs  => 1000,
-+    },
-+);
-+
-+plan tests => @schedule * 2 + 266;
-+
-+for my $test (@schedule) {
-+    test_scheduler(
-+        $test->{name},
-+        $test->{tests},
-+        $test->{rules},
-+        $test->{jobs}
-+    );
-+}
-+
-+# An ad-hoc test
-+
-+{
-+    my @tests = qw(
-+      A1 A2 A3 B1 C1 C8 C5 C7 C4 C6 C3 C2 C9 D1 D2 D3 E3 E2 E1
-+    );
-+
-+    my $rules = {
-+        par => [
-+            { seq => 'A*' },
-+            { par => 'B*' },
-+            { seq => [ 'C1', 'C2' ] },
-+            {   par => [
-+                    { seq => [ 'C3', 'C4', 'C5' ] },
-+                    { seq => [ 'C6', 'C7', 'C8' ] }
-+                ]
-+            },
-+            {   seq => [
-+                    { par => ['D*'] },
-+                    { par => ['E*'] }
-+                ]
-+            },
-+        ]
-+    };
-+
-+    my $scheduler = TAP::Parser::Scheduler->new(
-+        tests => \@tests,
-+        rules => $rules
-+    );
-+
-+    # diag $scheduler->as_string;
-+
-+    my $A1 = ok_job( $scheduler, 'A1' );
-+    my $B1 = ok_job( $scheduler, 'B1' );
-+    finish($A1);
-+    my $A2 = ok_job( $scheduler, 'A2' );
-+    my $C1 = ok_job( $scheduler, 'C1' );
-+    finish( $A2, $C1 );
-+    my $A3 = ok_job( $scheduler, 'A3' );
-+    my $C2 = ok_job( $scheduler, 'C2' );
-+    finish( $A3, $C2 );
-+    my $C3 = ok_job( $scheduler, 'C3' );
-+    my $C6 = ok_job( $scheduler, 'C6' );
-+    my $D1 = ok_job( $scheduler, 'D1' );
-+    my $D2 = ok_job( $scheduler, 'D2' );
-+    finish($C6);
-+    my $C7 = ok_job( $scheduler, 'C7' );
-+    my $D3 = ok_job( $scheduler, 'D3' );
-+    ok_job( $scheduler, '#' );
-+    ok_job( $scheduler, '#' );
-+    finish( $D3, $C3, $D1, $B1 );
-+    my $C4 = ok_job( $scheduler, 'C4' );
-+    finish( $C4, $C7 );
-+    my $C5 = ok_job( $scheduler, 'C5' );
-+    my $C8 = ok_job( $scheduler, 'C8' );
-+    ok_job( $scheduler, '#' );
-+    finish($D2);
-+    my $E3 = ok_job( $scheduler, 'E3' );
-+    my $E2 = ok_job( $scheduler, 'E2' );
-+    my $E1 = ok_job( $scheduler, 'E1' );
-+    finish( $E1, $E2, $E3, $C5, $C8 );
-+    my $C9 = ok_job( $scheduler, 'C9' );
-+    ok_job( $scheduler, undef );
-+}
-+
-+{
-+    my @tests = ();
-+    for my $t ( 'A' .. 'Z' ) {
-+        push @tests, map {"$t$_"} 1 .. 9;
-+    }
-+    my $rules = { par => [ map { { seq => "$_*" } } 'A' .. 'Z' ] };
-+
-+    my $scheduler = TAP::Parser::Scheduler->new(
-+        tests => \@tests,
-+        rules => $rules
-+    );
-+
-+    # diag $scheduler->as_string;
-+
-+    for my $n ( 1 .. 9 ) {
-+        my @got = ();
-+        push @got, ok_job( $scheduler, "$_$n" ) for 'A' .. 'Z';
-+        ok_job( $scheduler, $n == 9 ? undef : '#' );
-+        finish(@got);
-+    }
-+}
-+
-+sub finish { $_->finish for @_ }
-+
-+sub ok_job {
-+    my ( $scheduler, $want ) = @_;
-+    my $job = $scheduler->get_job;
-+    if ( !defined $want ) {
-+        ok !defined $job, 'undef';
-+    }
-+    elsif ( $want eq '#' ) {
-+        ok $job->is_spinner, 'spinner';
-+    }
-+    else {
-+        is $job->filename, $want, $want;
-+    }
-+    return $job;
-+}
-+
-+sub test_scheduler {
-+    my ( $name, $tests, $rules, $jobs ) = @_;
-+
-+    ok my $scheduler = TAP::Parser::Scheduler->new(
-+        tests => $tests,
-+        defined $rules ? ( rules => $rules ) : (),
-+      ),
-+      "$name: new";
-+
-+    # diag $scheduler->as_string;
-+
-+    my @pipeline = ();
-+    my @got      = ();
-+
-+    while ( defined( my $job = $scheduler->get_job ) ) {
-+
-+        # diag $scheduler->as_string;
-+        if ( $job->is_spinner || @pipeline >= $jobs ) {
-+            die "Oops! Spinner!" unless @pipeline;
-+            my $done = shift @pipeline;
-+            $done->finish;
-+
-+            # diag "Completed ", $done->filename;
-+        }
-+        next if $job->is_spinner;
-+
-+        # diag "      Got ", $job->filename;
-+        push @pipeline, $job;
-+
-+        push @got, $job->filename;
-+    }
-+
-+    is_deeply [ sort @got ], [ sort @$tests ], "$name: got all tests";
-+}
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/source.t perl-5.10.0/ext/Test/Harness/t/source.t
---- perl-5.10.0.orig/ext/Test/Harness/t/source.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/source.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,103 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+
-+use Test::More tests => 26;
-+
-+use File::Spec;
-+
-+use EmptyParser;
-+use TAP::Parser::Source;
-+use TAP::Parser::Source::Perl;
-+
-+my $parser = EmptyParser->new;
-+my $test   = File::Spec->catfile(
-+    (   $ENV{PERL_CORE}
-+        ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
-+        : ()
-+    ),
-+    't',
-+    'source_tests',
-+    'source'
-+);
-+
-+my $perl = $^X;
-+
-+can_ok 'TAP::Parser::Source', 'new';
-+my $source = TAP::Parser::Source->new;
-+isa_ok $source, 'TAP::Parser::Source';
-+
-+can_ok $source, 'source';
-+eval { $source->source("$perl -It/lib $test") };
-+ok my $error = $@, '... and calling it with a string should fail';
-+like $error, qr/^Argument to &source must be an array reference/,
-+  '... with an appropriate error message';
-+ok $source->source( [ $perl, '-It/lib', '-T', $test ] ),
-+  '... and calling it with valid args should succeed';
-+
-+can_ok $source, 'get_stream';
-+my $stream = $source->get_stream($parser);
-+
-+isa_ok $stream, 'TAP::Parser::Iterator::Process',
-+  'get_stream returns the right object';
-+can_ok $stream, 'next';
-+is $stream->next, '1..1', '... and the first line should be correct';
-+is $stream->next, 'ok 1', '... as should the second';
-+ok !$stream->next, '... and we should have no more results';
-+
-+can_ok 'TAP::Parser::Source::Perl', 'new';
-+$source = TAP::Parser::Source::Perl->new;
-+isa_ok $source, 'TAP::Parser::Source::Perl', '... and the object it returns';
-+
-+can_ok $source, 'source';
-+ok $source->source( [$test] ),
-+  '... and calling it with valid args should succeed';
-+
-+can_ok $source, 'get_stream';
-+$stream = $source->get_stream($parser);
-+
-+isa_ok $stream, 'TAP::Parser::Iterator::Process',
-+  '... and the object it returns';
-+can_ok $stream, 'next';
-+is $stream->next, '1..1', '... and the first line should be correct';
-+is $stream->next, 'ok 1', '... as should the second';
-+ok !$stream->next, '... and we should have no more results';
-+
-+# internals tests!
-+
-+can_ok $source, '_switches';
-+ok( grep( $_ =~ /^['"]?-T['"]?$/, $source->_switches ),
-+    '... and it should find the taint switch'
-+);
-+
-+# coverage test for TAP::PArser::Source
-+
-+{
-+
-+    # coverage for method get_steam
-+
-+    my $source = TAP::Parser::Source->new( { parser => $parser } );
-+
-+    my @die;
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        $source->get_stream;
-+    };
-+
-+    is @die, 1, 'coverage testing of get_stream';
-+
-+    like pop @die, qr/No command found!/, '...and it failed as expect';
-+}
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/source_tests/harness perl-5.10.0/ext/Test/Harness/t/source_tests/harness
---- perl-5.10.0.orig/ext/Test/Harness/t/source_tests/harness	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/source_tests/harness	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,6 @@
-+#!/usr/bin/perl
-+
-+print <<'END_TESTS';
-+1..1
-+ok 1 - this is a test
-+END_TESTS
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/source_tests/harness_badtap perl-5.10.0/ext/Test/Harness/t/source_tests/harness_badtap
---- perl-5.10.0.orig/ext/Test/Harness/t/source_tests/harness_badtap	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/source_tests/harness_badtap	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,8 @@
-+#!/usr/bin/perl
-+
-+print <<'END_TESTS';
-+1..2
-+ok 1 - this is a test
-+not ok 2 - this is another test
-+1..2
-+END_TESTS
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/source_tests/harness_complain perl-5.10.0/ext/Test/Harness/t/source_tests/harness_complain
---- perl-5.10.0.orig/ext/Test/Harness/t/source_tests/harness_complain	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/source_tests/harness_complain	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,7 @@
-+#!/usr/bin/perl
-+
-+print "1..1\n";
-+
-+die "I should have no args -- @ARGV" if (@ARGV);
-+print "ok 1 - this is a test\n";
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/source_tests/harness_directives perl-5.10.0/ext/Test/Harness/t/source_tests/harness_directives
---- perl-5.10.0.orig/ext/Test/Harness/t/source_tests/harness_directives	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/source_tests/harness_directives	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,8 @@
-+#!/usr/bin/perl
-+
-+print <<'END_TESTS';
-+1..3
-+ok 1 - this is a test
-+not ok 2 - we have a something # TODO some output
-+ok 3 houston, we don't have liftoff # SKIP no funding
-+END_TESTS
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/source_tests/harness_failure perl-5.10.0/ext/Test/Harness/t/source_tests/harness_failure
---- perl-5.10.0.orig/ext/Test/Harness/t/source_tests/harness_failure	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/source_tests/harness_failure	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,7 @@
-+#!/usr/bin/perl
-+
-+print <<'END_TESTS';
-+1..2
-+ok 1 - this is a test
-+not ok 2 - this is another test
-+END_TESTS
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/source_tests/source perl-5.10.0/ext/Test/Harness/t/source_tests/source
---- perl-5.10.0.orig/ext/Test/Harness/t/source_tests/source	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/source_tests/source	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,15 @@
-+#!/usr/bin/perl -wT
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', 'lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use Test::More tests => 1;
-+
-+ok 1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/spool.t perl-5.10.0/ext/Test/Harness/t/spool.t
---- perl-5.10.0.orig/ext/Test/Harness/t/spool.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/spool.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,145 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', 'lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+# test T::H::_open_spool and _close_spool - these are good examples
-+# of the 'Fragile Test' pattern - messing with I/O primitives breaks
-+# nearly everything
-+
-+use strict;
-+use Test::More;
-+
-+my $useOrigOpen;
-+my $useOrigClose;
-+
-+# setup replacements for core open and close - breaking these makes everything very fragile
-+BEGIN {
-+    $useOrigOpen = $useOrigClose = 1;
-+
-+    # taken from http://www.perl.com/pub/a/2002/06/11/threads.html?page=2
-+
-+    *CORE::GLOBAL::open = \&my_open;
-+
-+    sub my_open (*@) {
-+        if ($useOrigOpen) {
-+            if ( defined( $_[0] ) ) {
-+                use Symbol qw();
-+                my $handle = Symbol::qualify( $_[0], (caller)[0] );
-+                no strict 'refs';
-+                if ( @_ == 1 ) {
-+                    return CORE::open($handle);
-+                }
-+                elsif ( @_ == 2 ) {
-+                    return CORE::open( $handle, $_[1] );
-+                }
-+                else {
-+                    die "Can't open with more than two args";
-+                }
-+            }
-+        }
-+        else {
-+            return;
-+        }
-+    }
-+
-+    *CORE::GLOBAL::close = sub (*) {
-+        if   ($useOrigClose) { return CORE::close(shift) }
-+        else                 {return}
-+    };
-+
-+}
-+
-+use TAP::Harness;
-+use TAP::Parser;
-+
-+plan tests => 4;
-+
-+{
-+
-+    # coverage tests for the basically untested T::H::_open_spool
-+
-+    my @spool = ( $ENV{PERL_CORE} ? ('spool') : ( 't', 'spool' ) );
-+    $ENV{PERL_TEST_HARNESS_DUMP_TAP} = File::Spec->catfile(@spool);
-+
-+# now given that we're going to be writing stuff to the file system, make sure we have
-+# a cleanup hook
-+
-+    END {
-+        use File::Path;
-+
-+        $useOrigOpen = $useOrigClose = 1;
-+
-+        # remove the tree if we made it this far
-+        rmtree( $ENV{PERL_TEST_HARNESS_DUMP_TAP} )
-+          if $ENV{PERL_TEST_HARNESS_DUMP_TAP};
-+    }
-+
-+    my @die;
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        # use the broken open
-+        $useOrigOpen = 0;
-+
-+        TAP::Harness->_open_spool(
-+            File::Spec->catfile(qw (source_tests harness )) );
-+
-+        # restore universal sanity
-+        $useOrigOpen = 1;
-+    };
-+
-+    is @die, 1, 'open failed, die as expected';
-+
-+    my $spoolDir = quotemeta(
-+        File::Spec->catfile( @spool, qw( source_tests harness ) ) );
-+
-+    like pop @die, qr/ Can't write $spoolDir \( /, '...with expected message';
-+
-+    # now make close fail
-+
-+    use Symbol;
-+
-+    my $spoolHandle = gensym;
-+
-+    my $tap = <<'END_TAP';
-+1..1
-+ok 1 - input file opened
-+
-+END_TAP
-+
-+    my $parser = TAP::Parser->new(
-+        {   spool => $spoolHandle,
-+            stream =>
-+              TAP::Parser::IteratorFactory->new( [ split /\n/ => $tap ] )
-+        }
-+    );
-+
-+    @die = ();
-+
-+    eval {
-+        local $SIG{__DIE__} = sub { push @die, @_ };
-+
-+        # use the broken CORE::close
-+        $useOrigClose = 0;
-+
-+        TAP::Harness->_close_spool($parser);
-+
-+        $useOrigClose = 1;
-+    };
-+
-+    unless ( is @die, 1, 'close failed, die as expected' ) {
-+        diag " >>> $_ <<<\n" for @die;
-+    }
-+
-+    like pop @die, qr/ Error closing TAP spool file[(] /,
-+      '...with expected message';
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/state.t perl-5.10.0/ext/Test/Harness/t/state.t
---- perl-5.10.0.orig/ext/Test/Harness/t/state.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/state.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,262 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = '../lib';
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+use Test::More;
-+use App::Prove::State;
-+use App::Prove::State::Result;
-+
-+sub mn {
-+    my $pfx = $ENV{PERL_CORE} ? '../ext/Test/Harness/' : '';
-+    return map {"$pfx$_"} @_;
-+}
-+
-+my @schedule = (
-+    {   options        => 'all',
-+        get_tests_args => [],
-+        expect         => [
-+            't/compat/env.t',
-+            't/compat/failure.t',
-+            't/compat/inc_taint.t',
-+            't/compat/version.t',
-+            't/source.t',
-+            't/yamlish-writer.t',
-+        ],
-+    },
-+    {   options        => 'failed',
-+        get_tests_args => [],
-+        expect         => [
-+            't/compat/inc_taint.t',
-+            't/compat/version.t',
-+        ],
-+    },
-+    {   options        => 'passed',
-+        get_tests_args => [],
-+        expect         => [
-+            't/compat/env.t',
-+            't/compat/failure.t',
-+            't/source.t',
-+            't/yamlish-writer.t',
-+        ],
-+    },
-+    {   options        => 'last',
-+        get_tests_args => [],
-+        expect         => [
-+            't/compat/env.t',
-+            't/compat/failure.t',
-+            't/compat/inc_taint.t',
-+            't/compat/version.t',
-+            't/source.t',
-+        ],
-+    },
-+    {   options        => 'todo',
-+        get_tests_args => [],
-+        expect         => [
-+            't/compat/version.t',
-+            't/compat/failure.t',
-+        ],
-+
-+    },
-+    {   options        => 'hot',
-+        get_tests_args => [],
-+        expect         => [
-+            't/compat/version.t',
-+            't/yamlish-writer.t',
-+            't/compat/env.t',
-+        ],
-+    },
-+    {   options        => 'adrian',
-+        get_tests_args => [],
-+        expect         => [
-+            't/compat/version.t',
-+            't/yamlish-writer.t',
-+            't/compat/env.t',
-+            't/compat/failure.t',
-+            't/compat/inc_taint.t',
-+            't/source.t',
-+        ],
-+    },
-+    {   options        => 'failed,passed',
-+        get_tests_args => [],
-+        expect         => [
-+            't/compat/inc_taint.t',
-+            't/compat/version.t',
-+            't/compat/env.t',
-+            't/compat/failure.t',
-+            't/source.t',
-+            't/yamlish-writer.t',
-+        ],
-+    },
-+    {   options        => [ 'failed', 'passed' ],
-+        get_tests_args => [],
-+        expect         => [
-+            't/compat/inc_taint.t',
-+            't/compat/version.t',
-+            't/compat/env.t',
-+            't/compat/failure.t',
-+            't/source.t',
-+            't/yamlish-writer.t',
-+        ],
-+    },
-+    {   options        => 'slow',
-+        get_tests_args => [],
-+        expect         => [
-+            't/yamlish-writer.t',
-+            't/compat/env.t',
-+            't/compat/inc_taint.t',
-+            't/compat/version.t',
-+            't/compat/failure.t',
-+            't/source.t',
-+        ],
-+    },
-+    {   options        => 'fast',
-+        get_tests_args => [],
-+        expect         => [
-+            't/source.t',
-+            't/compat/failure.t',
-+            't/compat/version.t',
-+            't/compat/inc_taint.t',
-+            't/compat/env.t',
-+            't/yamlish-writer.t',
-+        ],
-+    },
-+    {   options        => 'old',
-+        get_tests_args => [],
-+        expect         => [
-+            't/source.t',
-+            't/compat/inc_taint.t',
-+            't/compat/version.t',
-+            't/yamlish-writer.t',
-+            't/compat/failure.t',
-+            't/compat/env.t',
-+        ],
-+    },
-+    {   options        => 'new',
-+        get_tests_args => [],
-+        expect         => [
-+            't/compat/env.t',
-+            't/compat/failure.t',
-+            't/yamlish-writer.t',
-+            't/compat/version.t',
-+            't/compat/inc_taint.t',
-+            't/source.t',
-+        ],
-+    },
-+    {   options        => 'fresh',
-+        get_tests_args => [],
-+        expect         => [
-+            't/compat/env.t',
-+            't/compat/failure.t',
-+        ],
-+    },
-+);
-+
-+plan tests => @schedule * 2;
-+
-+for my $test (@schedule) {
-+    my $state = App::Prove::State->new;
-+    isa_ok $state, 'App::Prove::State';
-+
-+    my $desc = $test->{options};
-+
-+    # Naughty
-+    $state->{_} = get_state();
-+    my $options = $test->{options};
-+    $options = [$options] unless 'ARRAY' eq ref $options;
-+    $state->apply_switch(@$options);
-+
-+    my @got    = $state->get_tests( @{ $test->{get_tests_args} } );
-+    my @expect = mn( @{ $test->{expect} } );
-+    unless ( is_deeply \@got, \@expect, "$desc: order OK" ) {
-+        use Data::Dumper;
-+        diag( Dumper( { got => \@got, want => \@expect } ) );
-+    }
-+}
-+
-+sub get_state {
-+    return App::Prove::State::Result->new(
-+        {   generation    => 51,
-+            last_run_time => 1196285439,
-+            tests         => {
-+                mn('t/compat/failure.t') => {
-+                    last_result    => 0,
-+                    last_run_time  => 1196371471.57738,
-+                    last_pass_time => 1196371471.57738,
-+                    total_passes   => 48,
-+                    seq            => 1549,
-+                    gen            => 51,
-+                    elapsed        => 0.1230,
-+                    last_todo      => 1,
-+                    mtime          => 1196285623,
-+                },
-+                mn('t/yamlish-writer.t') => {
-+                    last_result    => 0,
-+                    last_run_time  => 1196371480.5761,
-+                    last_pass_time => 1196371480.5761,
-+                    last_fail_time => 1196368609,
-+                    total_passes   => 41,
-+                    seq            => 1578,
-+                    gen            => 49,
-+                    elapsed        => 12.2983,
-+                    last_todo      => 0,
-+                    mtime          => 1196285400,
-+                },
-+                mn('t/compat/env.t') => {
-+                    last_result    => 0,
-+                    last_run_time  => 1196371471.42967,
-+                    last_pass_time => 1196371471.42967,
-+                    last_fail_time => 1196368608,
-+                    total_passes   => 48,
-+                    seq            => 1548,
-+                    gen            => 52,
-+                    elapsed        => 3.1290,
-+                    last_todo      => 0,
-+                    mtime          => 1196285739,
-+                },
-+                mn('t/compat/version.t') => {
-+                    last_result    => 2,
-+                    last_run_time  => 1196371472.96476,
-+                    last_pass_time => 1196371472.96476,
-+                    last_fail_time => 1196368609,
-+                    total_passes   => 47,
-+                    seq            => 1555,
-+                    gen            => 51,
-+                    elapsed        => 0.2363,
-+                    last_todo      => 4,
-+                    mtime          => 1196285239,
-+                },
-+                mn('t/compat/inc_taint.t') => {
-+                    last_result    => 3,
-+                    last_run_time  => 1196371471.89682,
-+                    last_pass_time => 1196371471.89682,
-+                    total_passes   => 47,
-+                    seq            => 1551,
-+                    gen            => 51,
-+                    elapsed        => 1.6938,
-+                    last_todo      => 0,
-+                    mtime          => 1196185639,
-+                },
-+                mn('t/source.t') => {
-+                    last_result    => 0,
-+                    last_run_time  => 1196371479.72508,
-+                    last_pass_time => 1196371479.72508,
-+                    total_passes   => 41,
-+                    seq            => 1570,
-+                    gen            => 51,
-+                    elapsed        => 0.0143,
-+                    last_todo      => 0,
-+                    mtime          => 1186285639,
-+                },
-+            }
-+        }
-+    );
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/state_results.t perl-5.10.0/ext/Test/Harness/t/state_results.t
---- perl-5.10.0.orig/ext/Test/Harness/t/state_results.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/state_results.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,154 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = '../lib';
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+use Test::More tests => 25;
-+use App::Prove::State;
-+
-+my $test_suite_data = test_suite_data();
-+
-+#
-+# Test test suite results
-+#
-+
-+can_ok 'App::Prove::State::Result', 'new';
-+isa_ok my $result = App::Prove::State::Result->new($test_suite_data),
-+  'App::Prove::State::Result', '... and the object it returns';
-+
-+ok $result, 'state_version';
-+ok defined $result->state_version, '... and it should be defined';
-+
-+can_ok $result, 'generation';
-+is $result->generation, $test_suite_data->{generation},
-+  '... and it should return the correct generation';
-+
-+can_ok $result, 'num_tests';
-+is $result->num_tests, scalar keys %{ $test_suite_data->{tests} },
-+  '... and it should return the number of tests run';
-+
-+can_ok $result, 'raw';
-+is_deeply $result->raw, $test_suite_data,
-+  '... and it should return the raw, unblessed data';
-+
-+#
-+# Check individual tests.
-+#
-+
-+can_ok $result, 'tests';
-+
-+can_ok $result, 'test';
-+eval { $result->test };
-+my $error = $@;
-+like $error, qr/^\Qtest() requires a test name/,
-+  '... and it should croak() if a test name is not supplied';
-+
-+my $name = 't/compat/failure.t';
-+ok my $test = $result->test('t/compat/failure.t'),
-+  'result() should succeed if the test name is found';
-+isa_ok $test, 'App::Prove::State::Result::Test',
-+  '... and the object it returns';
-+
-+can_ok $test, 'name';
-+is $test->name, $name, '... and it should return the test name';
-+
-+can_ok $test, 'last_pass_time';
-+like $test->last_pass_time, qr/^\d+\.\d+$/,
-+  '... and it should return a numeric value';
-+
-+can_ok $test, 'last_fail_time';
-+ok !defined $test->last_fail_time,
-+  '... and it should return undef if the test has never failed';
-+
-+can_ok $result, 'remove';
-+ok $result->remove($name), '... and calling it should succeed';
-+
-+ok $test = $result->test($name),
-+  '... and fetching the removed test should suceed';
-+ok !defined $test->last_pass_time, '... and it should have clean values';
-+
-+sub test_suite_data {
-+    return {
-+        'version'    => App::Prove::State::Result->state_version,
-+        'generation' => '51',
-+        'tests'      => {
-+            't/compat/failure.t' => {
-+                'last_result'    => '0',
-+                'last_run_time'  => '1196371471.57738',
-+                'last_pass_time' => '1196371471.57738',
-+                'total_passes'   => '48',
-+                'seq'            => '1549',
-+                'gen'            => '51',
-+                'elapsed'        => 0.1230,
-+                'last_todo'      => '1',
-+                'mtime'          => 1196285623,
-+            },
-+            't/yamlish-writer.t' => {
-+                'last_result'    => '0',
-+                'last_run_time'  => '1196371480.5761',
-+                'last_pass_time' => '1196371480.5761',
-+                'last_fail_time' => '1196368609',
-+                'total_passes'   => '41',
-+                'seq'            => '1578',
-+                'gen'            => '49',
-+                'elapsed'        => 12.2983,
-+                'last_todo'      => '0',
-+                'mtime'          => 1196285400,
-+            },
-+            't/compat/env.t' => {
-+                'last_result'    => '0',
-+                'last_run_time'  => '1196371471.42967',
-+                'last_pass_time' => '1196371471.42967',
-+                'last_fail_time' => '1196368608',
-+                'total_passes'   => '48',
-+                'seq'            => '1548',
-+                'gen'            => '52',
-+                'elapsed'        => 3.1290,
-+                'last_todo'      => '0',
-+                'mtime'          => 1196285739,
-+            },
-+            't/compat/version.t' => {
-+                'last_result'    => '2',
-+                'last_run_time'  => '1196371472.96476',
-+                'last_pass_time' => '1196371472.96476',
-+                'last_fail_time' => '1196368609',
-+                'total_passes'   => '47',
-+                'seq'            => '1555',
-+                'gen'            => '51',
-+                'elapsed'        => 0.2363,
-+                'last_todo'      => '4',
-+                'mtime'          => 1196285239,
-+            },
-+            't/compat/inc_taint.t' => {
-+                'last_result'    => '3',
-+                'last_run_time'  => '1196371471.89682',
-+                'last_pass_time' => '1196371471.89682',
-+                'total_passes'   => '47',
-+                'seq'            => '1551',
-+                'gen'            => '51',
-+                'elapsed'        => 1.6938,
-+                'last_todo'      => '0',
-+                'mtime'          => 1196185639,
-+            },
-+            't/source.t' => {
-+                'last_result'    => '0',
-+                'last_run_time'  => '1196371479.72508',
-+                'last_pass_time' => '1196371479.72508',
-+                'total_passes'   => '41',
-+                'seq'            => '1570',
-+                'gen'            => '51',
-+                'elapsed'        => 0.0143,
-+                'last_todo'      => '0',
-+                'mtime'          => 1186285639,
-+            },
-+        }
-+    };
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/streams.t perl-5.10.0/ext/Test/Harness/t/streams.t
---- perl-5.10.0.orig/ext/Test/Harness/t/streams.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/streams.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,171 @@
-+#!/usr/bin/perl -wT
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 47;
-+
-+use TAP::Parser;
-+use TAP::Parser::IteratorFactory;
-+
-+my $STREAMED   = 'TAP::Parser';
-+my $ITER       = 'TAP::Parser::Iterator';
-+my $ITER_FH    = "${ITER}::Stream";
-+my $ITER_ARRAY = "${ITER}::Array";
-+
-+my $factory = TAP::Parser::IteratorFactory->new;
-+my $stream  = $factory->make_iterator( \*DATA );
-+isa_ok $stream, 'TAP::Parser::Iterator';
-+my $parser = TAP::Parser->new( { stream => $stream } );
-+isa_ok $parser, 'TAP::Parser',
-+  '... and creating a streamed parser should succeed';
-+
-+can_ok $parser, '_stream';
-+is ref $parser->_stream, $ITER_FH,
-+  '... and it should return the proper iterator';
-+can_ok $parser, 'next';
-+is $parser->next->as_string, '1..5',
-+  '... and the plan should parse correctly';
-+is $parser->next->as_string, 'ok 1 - input file opened',
-+  '... and the first test should parse correctly';
-+is $parser->next->as_string, '... this is junk',
-+  '... and junk should parse correctly';
-+is $parser->next->as_string,
-+  'not ok 2 first line of the input valid # TODO some data',
-+  '... and the second test should parse correctly';
-+is $parser->next->as_string, '# this is a comment',
-+  '... and comments should parse correctly';
-+is $parser->next->as_string, 'ok 3 - read the rest of the file',
-+  '... and the third test should parse correctly';
-+is $parser->next->as_string, 'not ok 4 - this is a real failure',
-+  '... and the fourth test should parse correctly';
-+is $parser->next->as_string, 'ok 5 # SKIP we have no description',
-+  '... and fifth test should parse correctly';
-+
-+ok !$parser->parse_errors, '... and we should have no parse errors';
-+
-+# plan at end
-+
-+my $tap = <<'END_TAP';
-+ok 1 - input file opened
-+... this is junk
-+not ok first line of the input valid # todo some data
-+# this is a comment
-+ok 3 - read the rest of the file
-+not ok 4 - this is a real failure
-+ok 5 # skip we have no description
-+1..5
-+END_TAP
-+
-+$stream = $factory->make_iterator( [ split /\n/ => $tap ] );
-+ok $parser = TAP::Parser->new( { stream => $stream } ),
-+  'Now we create a parser with the plan at the end';
-+isa_ok $parser->_stream, $ITER_ARRAY,
-+  '... and now we should have an array iterator';
-+is $parser->next->as_string, 'ok 1 - input file opened',
-+  '... and the first test should parse correctly';
-+is $parser->next->as_string, '... this is junk',
-+  '... and junk should parse correctly';
-+is $parser->next->as_string,
-+  'not ok 2 first line of the input valid # TODO some data',
-+  '... and the second test should parse correctly';
-+is $parser->next->as_string, '# this is a comment',
-+  '... and comments should parse correctly';
-+is $parser->next->as_string, 'ok 3 - read the rest of the file',
-+  '... and the third test should parse correctly';
-+is $parser->next->as_string, 'not ok 4 - this is a real failure',
-+  '... and the fourth test should parse correctly';
-+is $parser->next->as_string, 'ok 5 # SKIP we have no description',
-+  '... and fifth test should parse correctly';
-+is $parser->next->as_string, '1..5',
-+  '... and the plan should parse correctly';
-+
-+ok !$parser->parse_errors, '... and we should have no parse errors';
-+
-+# misplaced plan (and one-off errors)
-+
-+$tap = <<'END_TAP';
-+ok 1 - input file opened
-+1..5
-+... this is junk
-+not ok first line of the input valid # todo some data
-+# this is a comment
-+ok 3 - read the rest of the file
-+not ok 4 - this is a real failure
-+ok 5 # skip we have no description
-+END_TAP
-+
-+$stream = $factory->make_iterator( [ split /\n/ => $tap ] );
-+
-+ok $parser = TAP::Parser->new( { stream => $stream } ),
-+  'Now we create a parser with a plan as the second line';
-+is $parser->next->as_string, 'ok 1 - input file opened',
-+  '... and the first test should parse correctly';
-+is $parser->next->as_string, '1..5',
-+  '... and the plan should parse correctly';
-+is $parser->next->as_string, '... this is junk',
-+  '... and junk should parse correctly';
-+is $parser->next->as_string,
-+  'not ok 2 first line of the input valid # TODO some data',
-+  '... and the second test should parse correctly';
-+is $parser->next->as_string, '# this is a comment',
-+  '... and comments should parse correctly';
-+is $parser->next->as_string, 'ok 3 - read the rest of the file',
-+  '... and the third test should parse correctly';
-+is $parser->next->as_string, 'not ok 4 - this is a real failure',
-+  '... and the fourth test should parse correctly';
-+is $parser->next->as_string, 'ok 5 # SKIP we have no description',
-+  '... and fifth test should parse correctly';
-+
-+ok $parser->parse_errors, '... and we should have one parse error';
-+is + ( $parser->parse_errors )[0],
-+  'Plan (1..5) must be at the beginning or end of the TAP output',
-+  '... telling us that our plan went awry';
-+
-+$tap = <<'END_TAP';
-+ok 1 - input file opened
-+... this is junk
-+not ok first line of the input valid # todo some data
-+# this is a comment
-+ok 3 - read the rest of the file
-+not ok 4 - this is a real failure
-+1..5
-+ok 5 # skip we have no description
-+END_TAP
-+
-+$stream = $factory->make_iterator( [ split /\n/ => $tap ] );
-+
-+ok $parser = TAP::Parser->new( { stream => $stream } ),
-+  'Now we create a parser with the plan as the second to last line';
-+is $parser->next->as_string, 'ok 1 - input file opened',
-+  '... and the first test should parse correctly';
-+is $parser->next->as_string, '... this is junk',
-+  '... and junk should parse correctly';
-+is $parser->next->as_string,
-+  'not ok 2 first line of the input valid # TODO some data',
-+  '... and the second test should parse correctly';
-+is $parser->next->as_string, '# this is a comment',
-+  '... and comments should parse correctly';
-+is $parser->next->as_string, 'ok 3 - read the rest of the file',
-+  '... and the third test should parse correctly';
-+is $parser->next->as_string, 'not ok 4 - this is a real failure',
-+  '... and the fourth test should parse correctly';
-+is $parser->next->as_string, '1..5',
-+  '... and the plan should parse correctly';
-+is $parser->next->as_string, 'ok 5 # SKIP we have no description',
-+  '... and fifth test should parse correctly';
-+
-+ok $parser->parse_errors, '... and we should have one parse error';
-+is + ( $parser->parse_errors )[0],
-+  'Plan (1..5) must be at the beginning or end of the TAP output',
-+  '... telling us that our plan went awry';
-+
-+__DATA__
-+1..5
-+ok 1 - input file opened
-+... this is junk
-+not ok first line of the input valid # todo some data
-+# this is a comment
-+ok 3 - read the rest of the file
-+not ok 4 - this is a real failure
-+ok 5 # skip we have no description
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/subclass_tests/non_perl_source perl-5.10.0/ext/Test/Harness/t/subclass_tests/non_perl_source
---- perl-5.10.0.orig/ext/Test/Harness/t/subclass_tests/non_perl_source	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/subclass_tests/non_perl_source	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+echo "1..1"
-+echo "ok 1 - this is a test"
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/subclass_tests/perl_source perl-5.10.0/ext/Test/Harness/t/subclass_tests/perl_source
---- perl-5.10.0.orig/ext/Test/Harness/t/subclass_tests/perl_source	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/subclass_tests/perl_source	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,6 @@
-+#!/usr/bin/perl
-+
-+print <<'END_TESTS';
-+1..1
-+ok 1 - this is a test
-+END_TESTS
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/taint.t perl-5.10.0/ext/Test/Harness/t/taint.t
---- perl-5.10.0.orig/ext/Test/Harness/t/taint.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/taint.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,55 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', 'lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+# Test that options in PERL5OPT are propogated to tainted tests
-+
-+use strict;
-+use Test::More ( $^O eq 'VMS' ? ( skip_all => 'VMS' ) : ( tests => 1 ) );
-+
-+use Config;
-+use TAP::Parser;
-+
-+my $lib_path = join( ', ', map "'$_'", grep !ref, grep defined, @INC );
-+
-+sub run_test_file {
-+    my ( $test_template, @args ) = @_;
-+
-+    my $test_file = 'temp_test.tmp';
-+
-+    open TEST, ">$test_file" or die $!;
-+    printf TEST $test_template, @args;
-+    close TEST;
-+
-+    my $p = TAP::Parser->new(
-+        {   source => $test_file,
-+
-+            # Test taint when there's spaces in a -I path
-+            switches => [q["-Ifoo bar"]],
-+        }
-+    );
-+    1 while $p->next;
-+    ok !$p->has_problems;
-+
-+    unlink $test_file;
-+}
-+
-+{
-+    local $ENV{PERL5OPT} = '-Mstrict';
-+    run_test_file(<<'END');
-+#!/usr/bin/perl -T
-+
-+print "1..1\n";
-+print $INC{'strict.pm'} ? "ok 1\n" : "not ok 1\n";
-+END
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/testargs.t perl-5.10.0/ext/Test/Harness/t/testargs.t
---- perl-5.10.0.orig/ext/Test/Harness/t/testargs.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/testargs.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,136 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    chdir 't' and @INC = '../lib' if $ENV{PERL_CORE};
-+}
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 19;
-+use File::Spec;
-+use TAP::Parser;
-+use TAP::Harness;
-+use App::Prove;
-+
-+my $test = File::Spec->catfile(
-+    (   $ENV{PERL_CORE}
-+        ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
-+        : ()
-+    ),
-+    't',
-+    'sample-tests',
-+    'echo'
-+);
-+
-+diag( "\n\n", bigness( join ' ', @ARGV ), "\n\n" ) if @ARGV;
-+
-+sub echo_ok {
-+    my $options = shift;
-+    my @args    = @_;
-+    my $parser  = TAP::Parser->new( { %$options, test_args => \@args } );
-+    my @got     = ();
-+    while ( my $result = $parser->next ) {
-+        push @got, $result;
-+    }
-+    my $plan = shift @got;
-+    ok $plan->is_plan;
-+    for (@got) {
-+        is $_->description, shift(@args),
-+          join( ', ', keys %$options ) . ": option passed OK";
-+    }
-+}
-+
-+for my $args ( [qw( yes no maybe )], [qw( 1 2 3 )] ) {
-+    echo_ok( { source => $test }, @$args );
-+    echo_ok( { exec => [ $^X, $test ] }, @$args );
-+}
-+
-+{
-+    my $harness = TAP::Harness->new(
-+        { verbosity => -9, test_args => [qw( magic hat brigade )] } );
-+    my $aggregate = $harness->runtests($test);
-+
-+    is $aggregate->total,  3, "ran the right number of tests";
-+    is $aggregate->passed, 3, "and they passed";
-+}
-+
-+package Test::Prove;
-+
-+use vars qw(@ISA);
-+@ISA = 'App::Prove';
-+
-+sub _runtests {
-+    my $self = shift;
-+    push @{ $self->{_log} }, [@_];
-+    return;
-+}
-+
-+sub get_run_log {
-+    my $self = shift;
-+    return $self->{_log};
-+}
-+
-+package main;
-+
-+{
-+    my $app = Test::Prove->new;
-+
-+    $app->process_args( '--norc', $test, '::', 'one', 'two', 'huh' );
-+    $app->run();
-+    my $log = $app->get_run_log;
-+    is_deeply $log->[0]->[0]->{test_args}, [ 'one', 'two', 'huh' ],
-+      "prove args match";
-+}
-+
-+sub bigness {
-+    my $str = join '', @_;
-+    my @cdef = (
-+        '0000000000000000', '1818181818001800', '6c6c6c0000000000',
-+        '36367f367f363600', '0c3f683e0b7e1800', '60660c1830660600',
-+        '386c6c386d663b00', '0c18300000000000', '0c18303030180c00',
-+        '30180c0c0c183000', '00187e3c7e180000', '0018187e18180000',
-+        '0000000000181830', '0000007e00000000', '0000000000181800',
-+        '00060c1830600000', '3c666e7e76663c00', '1838181818187e00',
-+        '3c66060c18307e00', '3c66061c06663c00', '0c1c3c6c7e0c0c00',
-+        '7e607c0606663c00', '1c30607c66663c00', '7e060c1830303000',
-+        '3c66663c66663c00', '3c66663e060c3800', '0000181800181800',
-+        '0000181800181830', '0c18306030180c00', '00007e007e000000',
-+        '30180c060c183000', '3c660c1818001800', '3c666e6a6e603c00',
-+        '3c66667e66666600', '7c66667c66667c00', '3c66606060663c00',
-+        '786c6666666c7800', '7e60607c60607e00', '7e60607c60606000',
-+        '3c66606e66663c00', '6666667e66666600', '7e18181818187e00',
-+        '3e0c0c0c0c6c3800', '666c7870786c6600', '6060606060607e00',
-+        '63777f6b6b636300', '6666767e6e666600', '3c66666666663c00',
-+        '7c66667c60606000', '3c6666666a6c3600', '7c66667c6c666600',
-+        '3c66603c06663c00', '7e18181818181800', '6666666666663c00',
-+        '66666666663c1800', '63636b6b7f776300', '66663c183c666600',
-+        '6666663c18181800', '7e060c1830607e00', '7c60606060607c00',
-+        '006030180c060000', '3e06060606063e00', '183c664200000000',
-+        '00000000000000ff', '1c36307c30307e00', '00003c063e663e00',
-+        '60607c6666667c00', '00003c6660663c00', '06063e6666663e00',
-+        '00003c667e603c00', '1c30307c30303000', '00003e66663e063c',
-+        '60607c6666666600', '1800381818183c00', '1800381818181870',
-+        '6060666c786c6600', '3818181818183c00', '0000367f6b6b6300',
-+        '00007c6666666600', '00003c6666663c00', '00007c66667c6060',
-+        '00003e66663e0607', '00006c7660606000', '00003e603c067c00',
-+        '30307c3030301c00', '0000666666663e00', '00006666663c1800',
-+        '0000636b6b7f3600', '0000663c183c6600', '00006666663e063c',
-+        '00007e0c18307e00', '0c18187018180c00', '1818180018181800',
-+        '3018180e18183000', '316b460000000000'
-+    );
-+    my @chars = unpack( 'C*', $str );
-+    my @out = ();
-+    for my $row ( 0 .. 7 ) {
-+        for my $char (@chars) {
-+            next if $char < 32 || $char > 126;
-+            my $size = scalar(@cdef);
-+            my $byte = hex( substr( $cdef[ $char - 32 ], $row * 2, 2 ) );
-+            my $bits = sprintf( '%08b', $byte );
-+            $bits =~ tr/01/ #/;
-+            push @out, $bits;
-+        }
-+        push @out, "\n";
-+    }
-+    return join '', @out;
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/unicode.t perl-5.10.0/ext/Test/Harness/t/unicode.t
---- perl-5.10.0.orig/ext/Test/Harness/t/unicode.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/unicode.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,125 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+use lib 't/lib';
-+use Test::More;
-+use TAP::Parser;
-+
-+my @schedule;
-+my %make_test;
-+
-+BEGIN {
-+
-+    # TODO: Investigate failure on 5.8.0
-+    plan skip_all => "unicode on Perl <= 5.8.0"
-+      unless $] > 5.008;
-+
-+    plan skip_all => "PERL_UNICODE set"
-+      if defined $ENV{PERL_UNICODE};
-+
-+    eval "use File::Temp";
-+    plan skip_all => "File::Temp unavailable"
-+      if $@;
-+
-+    eval "use Encode";
-+    plan skip_all => "Encode unavailable"
-+      if $@;
-+
-+    # Subs that take the supplied TAP and turn it into a set of args to
-+    # supply to TAP::Harness->new. The returned hash includes the
-+    # temporary file so that its reference count doesn't go to zero
-+    # until we're finished with it.
-+    %make_test = (
-+        file => sub {
-+            my $source = shift;
-+            my $tmp    = File::Temp->new;
-+            open my $fh, ">$tmp" or die "Can't write $tmp ($!)\n";
-+            eval 'binmode( $fh, ":utf8" )';
-+            print $fh join( "\n", @$source ), "\n";
-+            close $fh;
-+
-+            open my $taph, "<$tmp" or die "Can't read $tmp ($!)\n";
-+            eval 'binmode( $taph, ":utf8" )';
-+            return {
-+                temp => $tmp,
-+                args => { source => $taph },
-+            };
-+        },
-+        script => sub {
-+            my $source = shift;
-+            my $tmp    = File::Temp->new;
-+            open my $fh, ">$tmp" or die "Can't write $tmp ($!)\n";
-+            eval 'binmode( $fh, ":utf8" )';
-+            print $fh map {"print qq{$_\\n};\n"} @$source;
-+            close $fh;
-+
-+            open my $taph, "<$tmp" or die "Can't read $tmp ($!)\n";
-+            return {
-+                temp => $tmp,
-+                args => { exec => [ $^X, "$tmp" ] },
-+            };
-+        },
-+    );
-+
-+    @schedule = (
-+        {   name   => 'Non-unicode warm up',
-+            source => [
-+                'TAP version 13',
-+                '1..1',
-+                'ok 1 Everything is fine',
-+            ],
-+            expect => [
-+                { isa => 'TAP::Parser::Result::Version', },
-+                { isa => 'TAP::Parser::Result::Plan', },
-+                {   isa         => 'TAP::Parser::Result::Test',
-+                    description => "Everything is fine"
-+                },
-+            ],
-+        },
-+        {   name   => 'Unicode smiley',
-+            source => [
-+                'TAP version 13',
-+                '1..1',
-+
-+                # Funky quoting / eval to avoid errors on older Perls
-+                eval qq{"ok 1 Everything is fine \\x{263a}"},
-+            ],
-+            expect => [
-+                { isa => 'TAP::Parser::Result::Version', },
-+                { isa => 'TAP::Parser::Result::Plan', },
-+                {   isa         => 'TAP::Parser::Result::Test',
-+                    description => eval qq{"Everything is fine \\x{263a}"}
-+                },
-+            ],
-+        }
-+    );
-+
-+    plan 'no_plan';
-+}
-+
-+for my $test (@schedule) {
-+    for my $type ( sort keys %make_test ) {
-+        my $name = sprintf( "%s (%s)", $test->{name}, $type );
-+        my $args = $make_test{$type}->( $test->{source} );
-+
-+        my $parser = TAP::Parser->new( $args->{args} );
-+        isa_ok $parser, 'TAP::Parser';
-+        my @expect = @{ $test->{expect} };
-+        while ( my $tok = $parser->next ) {
-+            my $exp = shift @expect;
-+            for my $item ( sort keys %$exp ) {
-+                my $val = $exp->{$item};
-+                if ( 'isa' eq $item ) {
-+                    isa_ok $tok, $val;
-+                }
-+                elsif ( 'CODE' eq ref $val ) {
-+                    ok $val->($tok), "$name: assertion for $item";
-+                }
-+                else {
-+                    my $got = $tok->$item();
-+                    is $got, $val, "$name: value for $item matches";
-+                }
-+            }
-+        }
-+    }
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/utils.t perl-5.10.0/ext/Test/Harness/t/utils.t
---- perl-5.10.0.orig/ext/Test/Harness/t/utils.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/utils.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,65 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    chdir 't' and @INC = '../lib' if $ENV{PERL_CORE};
-+}
-+
-+use strict;
-+use lib 't/lib';
-+
-+use TAP::Parser::Utils qw( split_shell );
-+use Test::More;
-+
-+my @schedule = (
-+    {   name => 'Bare words',
-+        in   => 'bare words are here',
-+        out  => [ 'bare', 'words', 'are', 'here' ],
-+    },
-+    {   name => 'Single quotes',
-+        in   => "'bare' 'words' 'are' 'here'",
-+        out  => [ 'bare', 'words', 'are', 'here' ],
-+    },
-+    {   name => 'Double quotes',
-+        in   => '"bare" "words" "are" "here"',
-+        out  => [ 'bare', 'words', 'are', 'here' ],
-+    },
-+    {   name => 'Escapes',
-+        in   => '\  "ba\"re" \'wo\\\'rds\' \\\\"are" "here"',
-+        out  => [ ' ', 'ba"re', "wo'rds", '\\are', 'here' ],
-+    },
-+    {   name => 'Flag',
-+        in   => '-e "system(shift)"',
-+        out  => [ '-e', 'system(shift)' ],
-+    },
-+    {   name => 'Nada',
-+        in   => undef,
-+        out  => [],
-+    },
-+    {   name => 'Nada II',
-+        in   => '',
-+        out  => [],
-+    },
-+    {   name => 'Zero',
-+        in   => 0,
-+        out  => ['0'],
-+    },
-+    {   name => 'Empty',
-+        in   => '""',
-+        out  => [''],
-+    },
-+    {   name => 'Empty II',
-+        in   => "''",
-+        out  => [''],
-+    },
-+);
-+
-+plan tests => 1 * @schedule;
-+
-+for my $test (@schedule) {
-+    my $name = $test->{name};
-+    my @got  = split_shell( $test->{in} );
-+    unless ( is_deeply \@got, $test->{out}, "$name: parse OK" ) {
-+        use Data::Dumper;
-+        diag( Dumper( { want => $test->{out}, got => \@got } ) );
-+    }
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/yamlish-output.t perl-5.10.0/ext/Test/Harness/t/yamlish-output.t
---- perl-5.10.0.orig/ext/Test/Harness/t/yamlish-output.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/yamlish-output.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,100 @@
-+#!/usr/bin/perl -wT
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 9;
-+
-+use TAP::Parser::YAMLish::Writer;
-+
-+my $out = [
-+    "---",
-+    "bill-to:",
-+    "  address:",
-+    "    city: \"Royal Oak\"",
-+    "    lines: \"458 Walkman Dr.\\nSuite #292\\n\"",
-+    "    postal: 48046",
-+    "    state: MI",
-+    "  family: Dumars",
-+    "  given: Chris",
-+    "comments: \"Late afternoon is best. Backup contact is Nancy Billsmer \@ 338-4338\\n\"",
-+    "date: 2001-01-23",
-+    "invoice: 34843",
-+    "product:",
-+    "  -",
-+    "    description: Basketball",
-+    "    price: 450.00",
-+    "    quantity: 4",
-+    "    sku: BL394D",
-+    "  -",
-+    "    description: \"Super Hoop\"",
-+    "    price: 2392.00",
-+    "    quantity: 1",
-+    "    sku: BL4438H",
-+    "tax: 251.42",
-+    "total: 4443.52",
-+    "...",
-+];
-+
-+my $in = {
-+    'bill-to' => {
-+        'given'   => 'Chris',
-+        'address' => {
-+            'city'   => 'Royal Oak',
-+            'postal' => '48046',
-+            'lines'  => "458 Walkman Dr.\nSuite #292\n",
-+            'state'  => 'MI'
-+        },
-+        'family' => 'Dumars'
-+    },
-+    'invoice' => '34843',
-+    'date'    => '2001-01-23',
-+    'tax'     => '251.42',
-+    'product' => [
-+        {   'sku'         => 'BL394D',
-+            'quantity'    => '4',
-+            'price'       => '450.00',
-+            'description' => 'Basketball'
-+        },
-+        {   'sku'         => 'BL4438H',
-+            'quantity'    => '1',
-+            'price'       => '2392.00',
-+            'description' => 'Super Hoop'
-+        }
-+    ],
-+    'comments' =>
-+      "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338\n",
-+    'total' => '4443.52'
-+};
-+
-+my @buf1 = ();
-+my @buf2 = ();
-+my $buf3 = '';
-+
-+my @destination = (
-+    {   name        => 'Array reference',
-+        destination => \@buf1,
-+        normalise   => sub { return \@buf1 },
-+    },
-+    {   name        => 'Closure',
-+        destination => sub { push @buf2, shift },
-+        normalise => sub { return \@buf2 },
-+    },
-+    {   name        => 'Scalar',
-+        destination => \$buf3,
-+        normalise   => sub {
-+            my @ar = split( /\n/, $buf3 );
-+            return \@ar;
-+        },
-+    },
-+);
-+
-+for my $dest (@destination) {
-+    my $name = $dest->{name};
-+    ok my $yaml = TAP::Parser::YAMLish::Writer->new, "$name: Created";
-+    isa_ok $yaml, 'TAP::Parser::YAMLish::Writer';
-+
-+    $yaml->write( $in, $dest->{destination} );
-+    my $got = $dest->{normalise}->();
-+    is_deeply $got, $out, "$name: Result matches";
-+}
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/yamlish-writer.t perl-5.10.0/ext/Test/Harness/t/yamlish-writer.t
---- perl-5.10.0.orig/ext/Test/Harness/t/yamlish-writer.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/yamlish-writer.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,274 @@
-+#!/usr/bin/perl
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More;
-+
-+use TAP::Parser::YAMLish::Reader;
-+use TAP::Parser::YAMLish::Writer;
-+
-+my @SCHEDULE;
-+
-+BEGIN {
-+    @SCHEDULE = (
-+        {   name => 'Simple scalar',
-+            in   => 1,
-+            out  => [
-+                '--- 1',
-+                '...',
-+            ],
-+        },
-+        {   name => 'Undef',
-+            in   => undef,
-+            out  => [
-+                '--- ~',
-+                '...',
-+            ],
-+        },
-+        {   name => 'Unprintable',
-+            in   => "\x01\n\t",
-+            out  => [
-+                '--- "\x01\n\t"',
-+                '...',
-+            ],
-+        },
-+        {   name => 'Simple array',
-+            in   => [ 1, 2, 3 ],
-+            out  => [
-+                '---',
-+                '- 1',
-+                '- 2',
-+                '- 3',
-+                '...',
-+            ],
-+        },
-+        {   name => 'Empty array',
-+            in   => [],
-+            out  => [
-+                '--- []',
-+                '...'
-+            ],
-+        },
-+        {   name => 'Empty hash',
-+            in   => {},
-+            out  => [
-+                '--- {}',
-+                '...'
-+            ],
-+        },
-+        {   name => 'Array, two elements, undef',
-+            in   => [ undef, undef ],
-+            out  => [
-+                '---',
-+                '- ~',
-+                '- ~',
-+                '...',
-+            ],
-+        },
-+        {   name => 'Nested array',
-+            in   => [ 1, 2, [ 3, 4 ], 5 ],
-+            out  => [
-+                '---',
-+                '- 1',
-+                '- 2',
-+                '-',
-+                '  - 3',
-+                '  - 4',
-+                '- 5',
-+                '...',
-+            ],
-+        },
-+        {   name => 'Nested empty',
-+            in   => [ 1, 2, [], 5 ],
-+            out  => [
-+                '---',
-+                '- 1',
-+                '- 2',
-+                '- []',
-+                '- 5',
-+                '...',
-+            ],
-+        },
-+        {   name => 'Simple hash',
-+            in   => { one => '1', two => '2', three => '3' },
-+            out  => [
-+                '---',
-+                'one: 1',
-+                'three: 3',
-+                'two: 2',
-+                '...',
-+            ],
-+        },
-+        {   name => 'Nested hash',
-+            in   => {
-+                one => '1', two => '2',
-+                more => { three => '3', four => '4' }
-+            },
-+            out => [
-+                '---',
-+                'more:',
-+                '  four: 4',
-+                '  three: 3',
-+                'one: 1',
-+                'two: 2',
-+                '...',
-+            ],
-+        },
-+        {   name => 'Nested empty',
-+            in   => { one => '1', two => '2', more => {} },
-+            out  => [
-+                '---',
-+                'more: {}',
-+                'one: 1',
-+                'two: 2',
-+                '...',
-+            ],
-+        },
-+        {   name => 'Unprintable key',
-+            in   => { one => '1', "\x02" => '2', three => '3' },
-+            out  => [
-+                '---',
-+                '"\x02": 2',
-+                'one: 1',
-+                'three: 3',
-+                '...',
-+            ],
-+        },
-+        {   name => 'Empty key',
-+            in   => { '' => 'empty' },
-+            out  => [
-+                '---',
-+                "'': empty",
-+                '...',
-+            ],
-+        },
-+        {   name => 'Empty value',
-+            in   => { '' => '' },
-+            out  => [
-+                '---',
-+                "'': ''",
-+                '...',
-+            ],
-+        },
-+        {   name => 'Funky hash key',
-+            in   => { './frob' => 'is_frob' },
-+            out  => [
-+                '---',
-+                '"./frob": is_frob',
-+                '...',
-+            ]
-+        },
-+        {   name => 'Complex',
-+            in   => {
-+                'bill-to' => {
-+                    'given'   => 'Chris',
-+                    'address' => {
-+                        'city'   => 'Royal Oak',
-+                        'postal' => '48046',
-+                        'lines'  => "458 Walkman Dr.\nSuite #292\n",
-+                        'state'  => 'MI'
-+                    },
-+                    'family' => 'Dumars'
-+                },
-+                'invoice' => '34843',
-+                'date'    => '2001-01-23',
-+                'tax'     => '251.42',
-+                'product' => [
-+                    {   'sku'         => 'BL394D',
-+                        'quantity'    => '4',
-+                        'price'       => '450.00',
-+                        'description' => 'Basketball'
-+                    },
-+                    {   'sku'         => 'BL4438H',
-+                        'quantity'    => '1',
-+                        'price'       => '2392.00',
-+                        'description' => 'Super Hoop'
-+                    }
-+                ],
-+                'comments' =>
-+                  "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338\n",
-+                'total' => '4443.52'
-+            },
-+            out => [
-+                "---",
-+                "bill-to:",
-+                "  address:",
-+                "    city: \"Royal Oak\"",
-+                "    lines: \"458 Walkman Dr.\\nSuite #292\\n\"",
-+                "    postal: 48046",
-+                "    state: MI",
-+                "  family: Dumars",
-+                "  given: Chris",
-+                "comments: \"Late afternoon is best. Backup contact is Nancy Billsmer \@ 338-4338\\n\"",
-+                "date: 2001-01-23",
-+                "invoice: 34843",
-+                "product:",
-+                "  -",
-+                "    description: Basketball",
-+                "    price: 450.00",
-+                "    quantity: 4",
-+                "    sku: BL394D",
-+                "  -",
-+                "    description: \"Super Hoop\"",
-+                "    price: 2392.00",
-+                "    quantity: 1",
-+                "    sku: BL4438H",
-+                "tax: 251.42",
-+                "total: 4443.52",
-+                "...",
-+            ],
-+        },
-+    );
-+
-+    plan tests => @SCHEDULE * 6;
-+}
-+
-+sub iter {
-+    my $ar = shift;
-+    return sub {
-+        return shift @$ar;
-+    };
-+}
-+
-+for my $test (@SCHEDULE) {
-+    my $name = $test->{name};
-+    ok my $yaml = TAP::Parser::YAMLish::Writer->new, "$name: Created";
-+    isa_ok $yaml, 'TAP::Parser::YAMLish::Writer';
-+
-+    my $got = [];
-+    my $writer = sub { push @$got, shift };
-+
-+    my $data = $test->{in};
-+
-+    eval { $yaml->write( $data, $writer ) };
-+
-+    if ( my $err = $test->{error} ) {
-+        unless ( like $@, $err, "$name: Error message" ) {
-+            diag "Error: $@\n";
-+        }
-+        is_deeply $got, [], "$name: No result";
-+        pass;
-+    }
-+    else {
-+        my $want = $test->{out};
-+        unless ( ok !$@, "$name: No error" ) {
-+            diag "Error: $@\n";
-+        }
-+        unless ( is_deeply $got, $want, "$name: Result matches" ) {
-+            use Data::Dumper;
-+            diag Dumper($got);
-+            diag Dumper($want);
-+        }
-+
-+        my $yr = TAP::Parser::YAMLish::Reader->new;
-+
-+        # Now try parsing it
-+        my $reader = sub { shift @$got };
-+        my $parsed = eval { $yr->read($reader) };
-+        ok !$@, "$name: no error" or diag "$@";
-+
-+        is_deeply $parsed, $data, "$name: Reparse OK";
-+    }
-+}
-+
-diff -urN perl-5.10.0.orig/ext/Test/Harness/t/yamlish.t perl-5.10.0/ext/Test/Harness/t/yamlish.t
---- perl-5.10.0.orig/ext/Test/Harness/t/yamlish.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/ext/Test/Harness/t/yamlish.t	2009-03-10 17:20:31.000000000 +0100
-@@ -0,0 +1,529 @@
-+#!perl -w
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More;
-+
-+use TAP::Parser::YAMLish::Reader;
-+
-+my @SCHEDULE;
-+
-+BEGIN {
-+    @SCHEDULE = (
-+        {   name => 'Hello World',
-+            in   => [
-+                '--- Hello, World',
-+                '...',
-+            ],
-+            out => "Hello, World",
-+        },
-+        {   name => 'Hello World 2',
-+            in   => [
-+                '--- \'Hello, \'\'World\'',
-+                '...',
-+            ],
-+            out => "Hello, 'World",
-+        },
-+        {   name => 'Hello World 3',
-+            in   => [
-+                '--- "Hello, World"',
-+                '...',
-+            ],
-+            out => "Hello, World",
-+        },
-+        {   name => 'Hello World 4',
-+            in   => [
-+                '--- "Hello, World"',
-+                '...',
-+            ],
-+            out => "Hello, World",
-+        },
-+        {   name => 'Hello World 4',
-+            in   => [
-+                '--- >',
-+                '   Hello,',
-+                '      World',
-+                '...',
-+            ],
-+            out => "Hello, World\n",
-+        },
-+        {   name => 'Hello World Block',
-+            in   => [
-+                '--- |',
-+                '   Hello,',
-+                '      World',
-+                '...',
-+            ],
-+            out => "Hello,\n   World\n",
-+        },
-+        {   name => 'Hello World 5',
-+            in   => [
-+                '--- >',
-+                '   Hello,',
-+                '  World',
-+                '...',
-+            ],
-+            error => qr{Missing\s+'[.][.][.]'},
-+        },
-+        {   name => 'Simple array',
-+            in   => [
-+                '---',
-+                '- 1',
-+                '- 2',
-+                '- 3',
-+                '...',
-+            ],
-+            out => [ '1', '2', '3' ],
-+        },
-+        {   name => 'Mixed array',
-+            in   => [
-+                '---',
-+                '- 1',
-+                '- \'two\'',
-+                '- "three\n"',
-+                '...',
-+            ],
-+            out => [ '1', 'two', "three\n" ],
-+        },
-+        {   name => 'Hash in array',
-+            in   => [
-+                '---',
-+                '- 1',
-+                '- two: 2',
-+                '- 3',
-+                '...',
-+            ],
-+            out => [ '1', { two => '2' }, '3' ],
-+        },
-+        {   name => 'Hash in array 2',
-+            in   => [
-+                '---',
-+                '- 1',
-+                '- two: 2',
-+                '  three: 3',
-+                '- 4',
-+                '...',
-+            ],
-+            out => [ '1', { two => '2', three => '3' }, '4' ],
-+        },
-+        {   name => 'Nested array',
-+            in   => [
-+                '---',
-+                '- one',
-+                '-',
-+                '  - two',
-+                '  -',
-+                '    - three',
-+                '  - four',
-+                '- five',
-+                '...',
-+            ],
-+            out => [ 'one', [ 'two', ['three'], 'four' ], 'five' ],
-+        },
-+        {   name => 'Nested hash',
-+            in   => [
-+                '---',
-+                'one:',
-+                '  five: 5',
-+                '  two:',
-+                '    four: 4',
-+                '    three: 3',
-+                'six: 6',
-+                '...',
-+            ],
-+            out => {
-+                one => { two => { three => '3', four => '4' }, five => '5' },
-+                six => '6'
-+            },
-+        },
-+        {   name => 'Space after colon',
-+            in   => [ '---', 'spog: ', ' - 1', ' - 2', '...' ],
-+            out => { spog => [ 1, 2 ] },
-+        },
-+        {   name => 'Original YAML::Tiny test',
-+            in   => [
-+                '---',
-+                'invoice: 34843',
-+                'date   : 2001-01-23',
-+                'bill-to:',
-+                '    given  : Chris',
-+                '    family : Dumars',
-+                '    address:',
-+                '        lines: |',
-+                '            458 Walkman Dr.',
-+                '            Suite #292',
-+                '        city    : Royal Oak',
-+                '        state   : MI',
-+                '        postal  : 48046',
-+                'product:',
-+                '    - sku         : BL394D',
-+                '      quantity    : 4',
-+                '      description : Basketball',
-+                '      price       : 450.00',
-+                '    - sku         : BL4438H',
-+                '      quantity    : 1',
-+                '      description : Super Hoop',
-+                '      price       : 2392.00',
-+                'tax  : 251.42',
-+                'total: 4443.52',
-+                'comments: >',
-+                '    Late afternoon is best.',
-+                '    Backup contact is Nancy',
-+                '    Billsmer @ 338-4338',
-+                '...',
-+            ],
-+            out => {
-+                'bill-to' => {
-+                    'given'   => 'Chris',
-+                    'address' => {
-+                        'city'   => 'Royal Oak',
-+                        'postal' => '48046',
-+                        'lines'  => "458 Walkman Dr.\nSuite #292\n",
-+                        'state'  => 'MI'
-+                    },
-+                    'family' => 'Dumars'
-+                },
-+                'invoice' => '34843',
-+                'date'    => '2001-01-23',
-+                'tax'     => '251.42',
-+                'product' => [
-+                    {   'sku'         => 'BL394D',
-+                        'quantity'    => '4',
-+                        'price'       => '450.00',
-+                        'description' => 'Basketball'
-+                    },
-+                    {   'sku'         => 'BL4438H',
-+                        'quantity'    => '1',
-+                        'price'       => '2392.00',
-+                        'description' => 'Super Hoop'
-+                    }
-+                ],
-+                'comments' =>
-+                  "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338\n",
-+                'total' => '4443.52'
-+            }
-+        },
-+
-+        # Tests harvested from YAML::Tiny
-+        {   in    => ['...'],
-+            name  => 'Regression: empty',
-+            error => qr{document\s+header\s+not\s+found}
-+        },
-+        {   in => [
-+                '# comment',
-+                '...'
-+            ],
-+            name  => 'Regression: only_comment',
-+            error => qr{document\s+header\s+not\s+found}
-+        },
-+        {   out => undef,
-+            in  => [
-+                '---',
-+                '...'
-+            ],
-+            name  => 'Regression: only_header',
-+            error => qr{Premature\s+end}i,
-+        },
-+        {   out => undef,
-+            in  => [
-+                '---',
-+                '---',
-+                '...'
-+            ],
-+            name  => 'Regression: two_header',
-+            error => qr{Unexpected\s+start}i,
-+        },
-+        {   out => undef,
-+            in  => [
-+                '--- ~',
-+                '...'
-+            ],
-+            name => 'Regression: one_undef'
-+        },
-+        {   out => undef,
-+            in  => [
-+                '---  ~',
-+                '...'
-+            ],
-+            name => 'Regression: one_undef2'
-+        },
-+        {   in => [
-+                '--- ~',
-+                '---',
-+                '...'
-+            ],
-+            name  => 'Regression: two_undef',
-+            error => qr{Missing\s+'[.][.][.]'},
-+        },
-+        {   out => 'foo',
-+            in  => [
-+                '--- foo',
-+                '...'
-+            ],
-+            name => 'Regression: one_scalar',
-+        },
-+        {   out => 'foo',
-+            in  => [
-+                '---  foo',
-+                '...'
-+            ],
-+            name => 'Regression: one_scalar2',
-+        },
-+        {   in => [
-+                '--- foo',
-+                '--- bar',
-+                '...'
-+            ],
-+            name  => 'Regression: two_scalar',
-+            error => qr{Missing\s+'[.][.][.]'},
-+        },
-+        {   out => ['foo'],
-+            in  => [
-+                '---',
-+                '- foo',
-+                '...'
-+            ],
-+            name => 'Regression: one_list1'
-+        },
-+        {   out => [
-+                'foo',
-+                'bar'
-+            ],
-+            in => [
-+                '---',
-+                '- foo',
-+                '- bar',
-+                '...'
-+            ],
-+            name => 'Regression: one_list2'
-+        },
-+        {   out => [
-+                undef,
-+                'bar'
-+            ],
-+            in => [
-+                '---',
-+                '- ~',
-+                '- bar',
-+                '...'
-+            ],
-+            name => 'Regression: one_listundef'
-+        },
-+        {   out => { 'foo' => 'bar' },
-+            in  => [
-+                '---',
-+                'foo: bar',
-+                '...'
-+            ],
-+            name => 'Regression: one_hash1'
-+        },
-+        {   out => {
-+                'foo'  => 'bar',
-+                'this' => undef
-+            },
-+            in => [
-+                '---',
-+                'foo: bar',
-+                'this: ~',
-+                '...'
-+            ],
-+            name => 'Regression: one_hash2'
-+        },
-+        {   out => {
-+                'foo' => [
-+                    'bar',
-+                    undef,
-+                    'baz'
-+                ]
-+            },
-+            in => [
-+                '---',
-+                'foo:',
-+                '  - bar',
-+                '  - ~',
-+                '  - baz',
-+                '...'
-+            ],
-+            name => 'Regression: array_in_hash'
-+        },
-+        {   out => {
-+                'bar' => { 'foo' => 'bar' },
-+                'foo' => undef
-+            },
-+            in => [
-+                '---',
-+                'foo: ~',
-+                'bar:',
-+                '  foo: bar',
-+                '...'
-+            ],
-+            name => 'Regression: hash_in_hash'
-+        },
-+        {   out => [
-+                {   'foo'  => undef,
-+                    'this' => 'that'
-+                },
-+                'foo', undef,
-+                {   'foo'  => 'bar',
-+                    'this' => 'that'
-+                }
-+            ],
-+            in => [
-+                '---',
-+                '-',
-+                '  foo: ~',
-+                '  this: that',
-+                '- foo',
-+                '- ~',
-+                '-',
-+                '  foo: bar',
-+                '  this: that',
-+                '...'
-+            ],
-+            name => 'Regression: hash_in_array'
-+        },
-+        {   out => ['foo'],
-+            in  => [
-+                '---',
-+                '- \'foo\'',
-+                '...'
-+            ],
-+            name => 'Regression: single_quote1'
-+        },
-+        {   out => ['  '],
-+            in  => [
-+                '---',
-+                '- \'  \'',
-+                '...'
-+            ],
-+            name => 'Regression: single_spaces'
-+        },
-+        {   out => [''],
-+            in  => [
-+                '---',
-+                '- \'\'',
-+                '...'
-+            ],
-+            name => 'Regression: single_null'
-+        },
-+        {   out => '  ',
-+            in  => [
-+                '--- "  "',
-+                '...'
-+            ],
-+            name => 'Regression: only_spaces'
-+        },
-+        {   out => [
-+                undef,
-+                {   'foo'  => 'bar',
-+                    'this' => 'that'
-+                },
-+                'baz'
-+            ],
-+            in => [
-+                '---',
-+                '- ~',
-+                '- foo: bar',
-+                '  this: that',
-+                '- baz',
-+                '...'
-+            ],
-+            name => 'Regression: inline_nested_hash'
-+        },
-+        {   name => "Unprintables",
-+            in   => [
-+                "---",
-+                "- \"\\z\\x01\\x02\\x03\\x04\\x05\\x06\\a\\x08\\t\\n\\v\\f\\r\\x0e\\x0f\"",
-+                "- \"\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\e\\x1c\\x1d\\x1e\\x1f\"",
-+                "- \" !\\\"#\$%&'()*+,-./\"",
-+                "- 0123456789:;<=>?",
-+                "- '\@ABCDEFGHIJKLMNO'",
-+                "- 'PQRSTUVWXYZ[\\]^_'",
-+                "- '`abcdefghijklmno'",
-+                "- 'pqrstuvwxyz{|}~\177'",
-+                "- \200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217",
-+                "- \220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237",
-+                "- \240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257",
-+                "- \260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277",
-+                "- \300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317",
-+                "- \320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337",
-+                "- \340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357",
-+                "- \360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377",
-+                "..."
-+            ],
-+            out => [
-+                "\0\1\2\3\4\5\6\a\b\t\n\13\f\r\16\17",
-+                "\20\21\22\23\24\25\26\27\30\31\32\e\34\35\36\37",
-+                " !\"#\$%&'()*+,-./",
-+                "0123456789:;<=>?",
-+                "\@ABCDEFGHIJKLMNO",
-+                "PQRSTUVWXYZ[\\]^_",
-+                "`abcdefghijklmno",
-+                "pqrstuvwxyz{|}~\177",
-+                "\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217",
-+                "\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237",
-+                "\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257",
-+                "\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277",
-+                "\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317",
-+                "\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337",
-+                "\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357",
-+                "\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377"
-+            ],
-+        },
-+        {   name => 'Quoted hash keys',
-+            in   => [
-+                '---',
-+                '  "quoted": Magic!',
-+                '  "\n\t": newline, tab',
-+                '...',
-+            ],
-+            out => {
-+                quoted => 'Magic!',
-+                "\n\t" => 'newline, tab',
-+            },
-+        },
-+        {   name => 'Empty',
-+            in   => [],
-+            out  => undef,
-+        },
-+    );
-+
-+    plan tests => @SCHEDULE * 5;
-+}
-+
-+sub iter {
-+    my $ar = shift;
-+    return sub {
-+        return shift @$ar;
-+    };
-+}
-+
-+for my $test (@SCHEDULE) {
-+    my $name = $test->{name};
-+    ok my $yaml = TAP::Parser::YAMLish::Reader->new, "$name: Created";
-+    isa_ok $yaml, 'TAP::Parser::YAMLish::Reader';
-+
-+    my $source = join( "\n", @{ $test->{in} } ) . "\n";
-+
-+    my $iter = iter( $test->{in} );
-+    my $got = eval { $yaml->read($iter) };
-+
-+    my $raw = $yaml->get_raw;
-+
-+    if ( my $err = $test->{error} ) {
-+        unless ( like $@, $err, "$name: Error message" ) {
-+            diag "Error: $@\n";
-+        }
-+        ok !$got, "$name: No result";
-+        pass;
-+    }
-+    else {
-+        my $want = $test->{out};
-+        unless ( ok !$@, "$name: No error" ) {
-+            diag "Error: $@\n";
-+        }
-+        is_deeply $got, $want,   "$name: Result matches";
-+        is $raw,        $source, "$name: Captured source matches";
-+    }
-+}
-diff -urN perl-5.10.0.orig/lib/App/Prove/State/Result/Test.pm perl-5.10.0/lib/App/Prove/State/Result/Test.pm
---- perl-5.10.0.orig/lib/App/Prove/State/Result/Test.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/App/Prove/State/Result/Test.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,153 @@
-+package App::Prove::State::Result::Test;
-+
-+use strict;
-+
-+use vars qw($VERSION);
-+
-+=head1 NAME
-+
-+App::Prove::State::Result::Test - Individual test results.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+The C<prove> command supports a C<--state> option that instructs it to
-+store persistent state across runs. This module encapsulates the results for a
-+single test.
-+
-+=head1 SYNOPSIS
-+
-+    # Re-run failed tests
-+    $ prove --state=fail,save -rbv
-+
-+=cut
-+
-+my %methods = (
-+    name           => { method => 'name' },
-+    elapsed        => { method => 'elapsed', default => 0 },
-+    gen            => { method => 'generation', default => 1 },
-+    last_pass_time => { method => 'last_pass_time', default => undef },
-+    last_fail_time => { method => 'last_fail_time', default => undef },
-+    last_result    => { method => 'result', default => 0 },
-+    last_run_time  => { method => 'run_time', default => undef },
-+    last_todo      => { method => 'num_todo', default => 0 },
-+    mtime          => { method => 'mtime', default => undef },
-+    seq            => { method => 'sequence', default => 1 },
-+    total_passes   => { method => 'total_passes', default => 0 },
-+    total_failures => { method => 'total_failures', default => 0 },
-+    parser         => { method => 'parser' },
-+);
-+
-+while ( my ( $key, $description ) = each %methods ) {
-+    my $default = $description->{default};
-+    no strict 'refs';
-+    *{ $description->{method} } = sub {
-+        my $self = shift;
-+        if (@_) {
-+            $self->{$key} = shift;
-+            return $self;
-+        }
-+        return $self->{$key} || $default;
-+    };
-+}
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+=cut
-+
-+sub new {
-+    my ( $class, $arg_for ) = @_;
-+    $arg_for ||= {};
-+    bless $arg_for => $class;
-+}
-+
-+=head2 Instance Methods
-+
-+=head3 C<name>
-+
-+The name of the test.  Usually a filename.
-+
-+=head3 C<elapsed>
-+
-+The total elapsed times the test took to run, in seconds from the epoch..
-+
-+=head3 C<generation>
-+
-+The number for the "generation" of the test run.  The first generation is 1
-+(one) and subsequent generations are 2, 3, etc.
-+
-+=head3 C<last_pass_time>
-+
-+The last time the test program passed, in seconds from the epoch.
-+
-+Returns C<undef> if the program has never passed.
-+
-+=head3 C<last_fail_time>
-+
-+The last time the test suite failed, in seconds from the epoch.
-+
-+Returns C<undef> if the program has never failed.
-+
-+=head3 C<mtime>
-+
-+Returns the mtime of the test, in seconds from the epoch.
-+
-+=head3 C<raw>
-+
-+Returns a hashref of raw test data, suitable for serialization by YAML.
-+
-+=head3 C<result>
-+
-+Currently, whether or not the test suite passed with no 'problems' (such as
-+TODO passed).
-+
-+=head3 C<run_time>
-+
-+The total time it took for the test to run, in seconds.  If C<Time::HiRes> is
-+available, it will have finer granularity.
-+
-+=head3 C<num_todo>
-+
-+The number of tests with TODO directives.
-+
-+=head3 C<sequence>
-+
-+The order in which this test was run for the given test suite result. 
-+
-+=head3 C<total_passes>
-+
-+The number of times the test has passed.
-+
-+=head3 C<total_failures>
-+
-+The number of times the test has failed.
-+
-+=head3 C<parser>
-+
-+The underlying parser object.  This is useful if you need the full
-+information for the test program.
-+
-+=cut
-+
-+sub raw {
-+    my $self = shift;
-+    my %raw  = %$self;
-+
-+    # this is backwards-compatibility hack and is not guaranteed.
-+    delete $raw{name};
-+    delete $raw{parser};
-+    return \%raw;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/App/Prove/State/Result.pm perl-5.10.0/lib/App/Prove/State/Result.pm
---- perl-5.10.0.orig/lib/App/Prove/State/Result.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/App/Prove/State/Result.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,233 @@
-+package App::Prove::State::Result;
-+
-+use strict;
-+use Carp 'croak';
-+
-+use App::Prove::State::Result::Test;
-+use vars qw($VERSION);
-+
-+use constant STATE_VERSION => 1;
-+
-+=head1 NAME
-+
-+App::Prove::State::Result - Individual test suite results.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+The C<prove> command supports a C<--state> option that instructs it to
-+store persistent state across runs. This module encapsulates the results for a
-+single test suite run.
-+
-+=head1 SYNOPSIS
-+
-+    # Re-run failed tests
-+    $ prove --state=fail,save -rbv
-+
-+=cut
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+    my $result = App::Prove::State::Result->new({
-+        generation => $generation,
-+        tests      => \%tests,
-+    });
-+
-+Returns a new C<App::Prove::State::Result> instance.
-+
-+=cut
-+
-+sub new {
-+    my ( $class, $arg_for ) = @_;
-+    $arg_for ||= {};
-+    my %instance_data = %$arg_for;    # shallow copy
-+    $instance_data{version} = $class->state_version;
-+    my $tests = delete $instance_data{tests} || {};
-+    my $self = bless \%instance_data => $class;
-+    $self->_initialize($tests);
-+    return $self;
-+}
-+
-+sub _initialize {
-+    my ( $self, $tests ) = @_;
-+    my %tests;
-+    while ( my ( $name, $test ) = each %$tests ) {
-+        $tests{$name} = $self->test_class->new(
-+            {   %$test,
-+                name => $name
-+            }
-+        );
-+    }
-+    $self->tests( \%tests );
-+    return $self;
-+}
-+
-+=head2 C<state_version>
-+
-+Returns the current version of state storage.
-+
-+=cut
-+
-+sub state_version {STATE_VERSION}
-+
-+=head2 C<test_class>
-+
-+Returns the name of the class used for tracking individual tests.  This class
-+should either subclass from C<App::Prove::State::Result::Test> or provide an
-+identical interface.
-+
-+=cut
-+
-+sub test_class {
-+    return 'App::Prove::State::Result::Test';
-+}
-+
-+my %methods = (
-+    generation    => { method => 'generation',    default => 0 },
-+    last_run_time => { method => 'last_run_time', default => undef },
-+);
-+
-+while ( my ( $key, $description ) = each %methods ) {
-+    my $default = $description->{default};
-+    no strict 'refs';
-+    *{ $description->{method} } = sub {
-+        my $self = shift;
-+        if (@_) {
-+            $self->{$key} = shift;
-+            return $self;
-+        }
-+        return $self->{$key} || $default;
-+    };
-+}
-+
-+=head3 C<generation>
-+
-+Getter/setter for the "generation" of the test suite run. The first
-+generation is 1 (one) and subsequent generations are 2, 3, etc.
-+
-+=head3 C<last_run_time>
-+
-+Getter/setter for the time of the test suite run.
-+
-+=head3 C<tests>
-+
-+Returns the tests for a given generation. This is a hashref or a hash,
-+depending on context called. The keys to the hash are the individual
-+test names and the value is a hashref with various interesting values.
-+Each k/v pair might resemble something like this:
-+
-+ 't/foo.t' => {
-+    elapsed        => '0.0428488254547119',
-+    gen            => '7',
-+    last_pass_time => '1219328376.07815',
-+    last_result    => '0',
-+    last_run_time  => '1219328376.07815',
-+    last_todo      => '0',
-+    mtime          => '1191708862',
-+    seq            => '192',
-+    total_passes   => '6',
-+  }
-+
-+=cut
-+
-+sub tests {
-+    my $self = shift;
-+    if (@_) {
-+        $self->{tests} = shift;
-+        return $self;
-+    }
-+    my %tests = %{ $self->{tests} };
-+    my @tests = sort { $a->sequence <=> $b->sequence } values %tests;
-+    return wantarray ? @tests : \@tests;
-+}
-+
-+=head3 C<test>
-+
-+ my $test = $result->test('t/customer/create.t');
-+
-+Returns an individual C<App::Prove::State::Result::Test> instance for the
-+given test name (usually the filename).  Will return a new
-+C<App::Prove::State::Result::Test> instance if the name is not found.
-+
-+=cut
-+
-+sub test {
-+    my ( $self, $name ) = @_;
-+    croak("test() requires a test name") unless defined $name;
-+
-+    my $tests = $self->{tests} ||= {};
-+    if ( my $test = $tests->{$name} ) {
-+        return $test;
-+    }
-+    else {
-+        my $test = $self->test_class->new( { name => $name } );
-+        $self->{tests}->{$name} = $test;
-+        return $test;
-+    }
-+}
-+
-+=head3 C<test_names>
-+
-+Returns an list of test names, sorted by run order.
-+
-+=cut
-+
-+sub test_names {
-+    my $self = shift;
-+    return map { $_->name } $self->tests;
-+}
-+
-+=head3 C<remove>
-+
-+ $result->remove($test_name);            # remove the test
-+ my $test = $result->test($test_name);   # fatal error
-+
-+Removes a given test from results.  This is a no-op if the test name is not
-+found.
-+
-+=cut
-+
-+sub remove {
-+    my ( $self, $name ) = @_;
-+    delete $self->{tests}->{$name};
-+    return $self;
-+}
-+
-+=head3 C<num_tests>
-+
-+Returns the number of tests for a given test suite result.
-+
-+=cut
-+
-+sub num_tests { keys %{ shift->{tests} } }
-+
-+=head3 C<raw>
-+
-+Returns a hashref of raw results, suitable for serialization by YAML.
-+
-+=cut
-+
-+sub raw {
-+    my $self = shift;
-+    my %raw  = %$self;
-+
-+    my %tests;
-+    foreach my $test ( $self->tests ) {
-+        $tests{ $test->name } = $test->raw;
-+    }
-+    $raw{tests} = \%tests;
-+    return \%raw;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/App/Prove/State.pm perl-5.10.0/lib/App/Prove/State.pm
---- perl-5.10.0.orig/lib/App/Prove/State.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/App/Prove/State.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,510 @@
-+package App::Prove::State;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use File::Find;
-+use File::Spec;
-+use Carp;
-+
-+use App::Prove::State::Result;
-+use TAP::Parser::YAMLish::Reader ();
-+use TAP::Parser::YAMLish::Writer ();
-+use TAP::Base;
-+
-+BEGIN {
-+    @ISA = qw( TAP::Base );
-+    __PACKAGE__->mk_methods('result_class');
-+}
-+
-+use constant IS_WIN32 => ( $^O =~ /^(MS)?Win32$/ );
-+use constant NEED_GLOB => IS_WIN32;
-+
-+=head1 NAME
-+
-+App::Prove::State - State storage for the C<prove> command.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+The C<prove> command supports a C<--state> option that instructs it to
-+store persistent state across runs. This module implements that state
-+and the operations that may be performed on it.
-+
-+=head1 SYNOPSIS
-+
-+    # Re-run failed tests
-+    $ prove --state=fail,save -rbv
-+
-+=cut
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+Accepts a hashref with the following key/value pairs:
-+
-+=over 4
-+
-+=item * C<store>
-+
-+The filename of the data store holding the data that App::Prove::State reads.
-+
-+=item * C<extension> (optional)
-+
-+The test name extension.  Defaults to C<.t>.
-+
-+=item * C<result_class> (optional)
-+
-+The name of the C<result_class>.  Defaults to C<App::Prove::State::Result>.
-+
-+=back
-+
-+=cut
-+
-+# override TAP::Base::new:
-+sub new {
-+    my $class = shift;
-+    my %args = %{ shift || {} };
-+
-+    my $self = bless {
-+        select    => [],
-+        seq       => 1,
-+        store     => delete $args{store},
-+        extension => ( delete $args{extension} || '.t' ),
-+        result_class =>
-+          ( delete $args{result_class} || 'App::Prove::State::Result' ),
-+    }, $class;
-+
-+    $self->{_} = $self->result_class->new(
-+        {   tests      => {},
-+            generation => 1,
-+        }
-+    );
-+    my $store = $self->{store};
-+    $self->load($store)
-+      if defined $store && -f $store;
-+
-+    return $self;
-+}
-+
-+=head2 C<result_class>
-+
-+Getter/setter for the name of the class used for tracking test results.  This
-+class should either subclass from C<App::Prove::State::Result> or provide an
-+identical interface.
-+
-+=cut
-+
-+=head2 C<extension>
-+
-+Get or set the extension files must have in order to be considered
-+tests. Defaults to '.t'.
-+
-+=cut
-+
-+sub extension {
-+    my $self = shift;
-+    $self->{extension} = shift if @_;
-+    return $self->{extension};
-+}
-+
-+=head2 C<results>
-+
-+Get the results of the last test run.  Returns a C<result_class()> instance.
-+
-+=cut
-+
-+sub results {
-+    my $self = shift;
-+    $self->{_} || $self->result_class->new;
-+}
-+
-+=head2 C<commit>
-+
-+Save the test results. Should be called after all tests have run.
-+
-+=cut
-+
-+sub commit {
-+    my $self = shift;
-+    if ( $self->{should_save} ) {
-+        $self->save;
-+    }
-+}
-+
-+=head2 Instance Methods
-+
-+=head3 C<apply_switch>
-+
-+Apply a list of switch options to the state.
-+
-+=over
-+
-+=item C<last>
-+
-+Run in the same order as last time
-+
-+=item C<failed>
-+
-+Run only the failed tests from last time
-+
-+=item C<passed>
-+
-+Run only the passed tests from last time
-+
-+=item C<all>
-+
-+Run all tests in normal order
-+
-+=item C<hot>
-+
-+Run the tests that most recently failed first
-+
-+=item C<todo>
-+
-+Run the tests ordered by number of todos.
-+
-+=item C<slow>
-+
-+Run the tests in slowest to fastest order.
-+
-+=item C<fast>
-+
-+Run test tests in fastest to slowest order.
-+
-+=item C<new>
-+
-+Run the tests in newest to oldest order.
-+
-+=item C<old>
-+
-+Run the tests in oldest to newest order.
-+
-+=item C<save>
-+
-+Save the state on exit.
-+
-+=back
-+
-+=cut
-+
-+sub apply_switch {
-+    my $self = shift;
-+    my @opts = @_;
-+
-+    my $last_gen      = $self->results->generation - 1;
-+    my $last_run_time = $self->results->last_run_time;
-+    my $now           = $self->get_time;
-+
-+    my @switches = map { split /,/ } @opts;
-+
-+    my %handler = (
-+        last => sub {
-+            $self->_select(
-+                where => sub { $_->generation >= $last_gen },
-+                order => sub { $_->sequence }
-+            );
-+        },
-+        failed => sub {
-+            $self->_select(
-+                where => sub { $_->result != 0 },
-+                order => sub { -$_->result }
-+            );
-+        },
-+        passed => sub {
-+            $self->_select( where => sub { $_->result == 0 } );
-+        },
-+        all => sub {
-+            $self->_select();
-+        },
-+        todo => sub {
-+            $self->_select(
-+                where => sub { $_->num_todo != 0 },
-+                order => sub { -$_->num_todo; }
-+            );
-+        },
-+        hot => sub {
-+            $self->_select(
-+                where => sub { defined $_->last_fail_time },
-+                order => sub { $now - $_->last_fail_time }
-+            );
-+        },
-+        slow => sub {
-+            $self->_select( order => sub { -$_->elapsed } );
-+        },
-+        fast => sub {
-+            $self->_select( order => sub { $_->elapsed } );
-+        },
-+        new => sub {
-+            $self->_select( order => sub { -$_->mtime } );
-+        },
-+        old => sub {
-+            $self->_select( order => sub { $_->mtime } );
-+        },
-+        fresh => sub {
-+            $self->_select( where => sub { $_->mtime >= $last_run_time } );
-+        },
-+        save => sub {
-+            $self->{should_save}++;
-+        },
-+        adrian => sub {
-+            unshift @switches, qw( hot all save );
-+        },
-+    );
-+
-+    while ( defined( my $ele = shift @switches ) ) {
-+        my ( $opt, $arg )
-+          = ( $ele =~ /^([^:]+):(.*)/ )
-+          ? ( $1, $2 )
-+          : ( $ele, undef );
-+        my $code = $handler{$opt}
-+          || croak "Illegal state option: $opt";
-+        $code->($arg);
-+    }
-+}
-+
-+sub _select {
-+    my ( $self, %spec ) = @_;
-+    push @{ $self->{select} }, \%spec;
-+}
-+
-+=head3 C<get_tests>
-+
-+Given a list of args get the names of tests that should run
-+
-+=cut
-+
-+sub get_tests {
-+    my $self    = shift;
-+    my $recurse = shift;
-+    my @argv    = @_;
-+    my %seen;
-+
-+    my @selected = $self->_query;
-+
-+    unless ( @argv || @{ $self->{select} } ) {
-+        @argv = $recurse ? '.' : 't';
-+        croak qq{No tests named and '@argv' directory not found}
-+          unless -d $argv[0];
-+    }
-+
-+    push @selected, $self->_get_raw_tests( $recurse, @argv ) if @argv;
-+    return grep { !$seen{$_}++ } @selected;
-+}
-+
-+sub _query {
-+    my $self = shift;
-+    if ( my @sel = @{ $self->{select} } ) {
-+        warn "No saved state, selection will be empty\n"
-+          unless $self->results->num_tests;
-+        return map { $self->_query_clause($_) } @sel;
-+    }
-+    return;
-+}
-+
-+sub _query_clause {
-+    my ( $self, $clause ) = @_;
-+    my @got;
-+    my $results = $self->results;
-+    my $where = $clause->{where} || sub {1};
-+
-+    # Select
-+    for my $name ( $results->test_names ) {
-+        next unless -f $name;
-+        local $_ = $results->test($name);
-+        push @got, $name if $where->();
-+    }
-+
-+    # Sort
-+    if ( my $order = $clause->{order} ) {
-+        @got = map { $_->[0] }
-+          sort {
-+                 ( defined $b->[1] <=> defined $a->[1] )
-+              || ( ( $a->[1] || 0 ) <=> ( $b->[1] || 0 ) )
-+          } map {
-+            [   $_,
-+                do { local $_ = $results->test($_); $order->() }
-+            ]
-+          } @got;
-+    }
-+
-+    return @got;
-+}
-+
-+sub _get_raw_tests {
-+    my $self    = shift;
-+    my $recurse = shift;
-+    my @argv    = @_;
-+    my @tests;
-+
-+    # Do globbing on Win32.
-+    @argv = map { glob "$_" } @argv if NEED_GLOB;
-+    my $extension = $self->{extension};
-+
-+    for my $arg (@argv) {
-+        if ( '-' eq $arg ) {
-+            push @argv => <STDIN>;
-+            chomp(@argv);
-+            next;
-+        }
-+
-+        push @tests,
-+            sort -d $arg
-+          ? $recurse
-+              ? $self->_expand_dir_recursive( $arg, $extension )
-+              : glob( File::Spec->catfile( $arg, "*$extension" ) )
-+          : $arg;
-+    }
-+    return @tests;
-+}
-+
-+sub _expand_dir_recursive {
-+    my ( $self, $dir, $extension ) = @_;
-+
-+    my @tests;
-+    find(
-+        {   follow      => 1,      #21938
-+            follow_skip => 2,
-+            wanted      => sub {
-+                -f 
-+                  && /\Q$extension\E$/
-+                  && push @tests => $File::Find::name;
-+              }
-+        },
-+        $dir
-+    );
-+    return @tests;
-+}
-+
-+=head3 C<observe_test>
-+
-+Store the results of a test.
-+
-+=cut
-+
-+# Store:
-+#     last fail time
-+#     last pass time
-+#     last run time
-+#     most recent result
-+#     most recent todos
-+#     total failures
-+#     total passes
-+#     state generation
-+#     parser
-+
-+sub observe_test {
-+
-+    my ( $self, $test_info, $parser ) = @_;
-+    my $name = $test_info->[0];
-+    my $fail = scalar( $parser->failed ) + ( $parser->has_problems ? 1 : 0 );
-+    my $todo = scalar( $parser->todo );
-+    my $start_time = $parser->start_time;
-+    my $end_time   = $parser->end_time,
-+
-+      my $test = $self->results->test($name);
-+
-+    $test->sequence( $self->{seq}++ );
-+    $test->generation( $self->results->generation );
-+
-+    $test->run_time($end_time);
-+    $test->result($fail);
-+    $test->num_todo($todo);
-+    $test->elapsed( $end_time - $start_time );
-+
-+    $test->parser($parser);
-+
-+    if ($fail) {
-+        $test->total_failures( $test->total_failures + 1 );
-+        $test->last_fail_time($end_time);
-+    }
-+    else {
-+        $test->total_passes( $test->total_passes + 1 );
-+        $test->last_pass_time($end_time);
-+    }
-+}
-+
-+=head3 C<save>
-+
-+Write the state to a file.
-+
-+=cut
-+
-+sub save {
-+    my ($self) = @_;
-+
-+    my $store = $self->{store} or return;
-+    $self->results->last_run_time( $self->get_time );
-+
-+    my $writer = TAP::Parser::YAMLish::Writer->new;
-+    local *FH;
-+    open FH, ">$store" or croak "Can't write $store ($!)";
-+    $writer->write( $self->results->raw, \*FH );
-+    close FH;
-+}
-+
-+=head3 C<load>
-+
-+Load the state from a file
-+
-+=cut
-+
-+sub load {
-+    my ( $self, $name ) = @_;
-+    my $reader = TAP::Parser::YAMLish::Reader->new;
-+    local *FH;
-+    open FH, "<$name" or croak "Can't read $name ($!)";
-+
-+    # XXX this is temporary
-+    $self->{_} = $self->result_class->new(
-+        $reader->read(
-+            sub {
-+                my $line = <FH>;
-+                defined $line && chomp $line;
-+                return $line;
-+            }
-+        )
-+    );
-+
-+    # $writer->write( $self->{tests} || {}, \*FH );
-+    close FH;
-+    $self->_regen_seq;
-+    $self->_prune_and_stamp;
-+    $self->results->generation( $self->results->generation + 1 );
-+}
-+
-+sub _prune_and_stamp {
-+    my $self = shift;
-+
-+    my $results = $self->results;
-+    my @tests   = $self->results->tests;
-+    for my $test (@tests) {
-+        my $name = $test->name;
-+        if ( my @stat = stat $name ) {
-+            $test->mtime( $stat[9] );
-+        }
-+        else {
-+            $results->remove($name);
-+        }
-+    }
-+}
-+
-+sub _regen_seq {
-+    my $self = shift;
-+    for my $test ( $self->results->tests ) {
-+        $self->{seq} = $test->sequence + 1
-+          if defined $test->sequence && $test->sequence >= $self->{seq};
-+    }
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/App/Prove.pm perl-5.10.0/lib/App/Prove.pm
---- perl-5.10.0.orig/lib/App/Prove.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/App/Prove.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,775 @@
-+package App::Prove;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Object ();
-+use TAP::Harness;
-+use TAP::Parser::Utils qw( split_shell );
-+use File::Spec;
-+use Getopt::Long;
-+use App::Prove::State;
-+use Carp;
-+
-+=head1 NAME
-+
-+App::Prove - Implements the C<prove> command.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+L<Test::Harness> provides a command, C<prove>, which runs a TAP based
-+test suite and prints a report. The C<prove> command is a minimal
-+wrapper around an instance of this module.
-+
-+=head1 SYNOPSIS
-+
-+    use App::Prove;
-+
-+    my $app = App::Prove->new;
-+    $app->process_args(@ARGV);
-+    $app->run;
-+
-+=cut
-+
-+use constant IS_WIN32 => ( $^O =~ /^(MS)?Win32$/ );
-+use constant IS_VMS => $^O eq 'VMS';
-+use constant IS_UNIXY => !( IS_VMS || IS_WIN32 );
-+
-+use constant STATE_FILE => IS_UNIXY ? '.prove'   : '_prove';
-+use constant RC_FILE    => IS_UNIXY ? '.proverc' : '_proverc';
-+
-+use constant PLUGINS => 'App::Prove::Plugin';
-+
-+my @ATTR;
-+
-+BEGIN {
-+    @ISA = qw(TAP::Object);
-+
-+    @ATTR = qw(
-+      archive argv blib show_count color directives exec failures fork
-+      formatter harness includes modules plugins jobs lib merge parse quiet
-+      really_quiet recurse backwards shuffle taint_fail taint_warn timer
-+      verbose warnings_fail warnings_warn show_help show_man show_version
-+      state_class test_args state dry extension ignore_exit rules state_manager
-+    );
-+    __PACKAGE__->mk_methods(@ATTR);
-+}
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+Create a new C<App::Prove>. Optionally a hash ref of attribute
-+initializers may be passed.
-+
-+=cut
-+
-+# new() implementation supplied by TAP::Object
-+
-+sub _initialize {
-+    my $self = shift;
-+    my $args = shift || {};
-+
-+    # setup defaults:
-+    for my $key (qw( argv rc_opts includes modules state plugins rules )) {
-+        $self->{$key} = [];
-+    }
-+    $self->{harness_class} = 'TAP::Harness';
-+
-+    for my $attr (@ATTR) {
-+        if ( exists $args->{$attr} ) {
-+
-+            # TODO: Some validation here
-+            $self->{$attr} = $args->{$attr};
-+        }
-+    }
-+
-+    my %env_provides_default = (
-+        HARNESS_TIMER => 'timer',
-+    );
-+
-+    while ( my ( $env, $attr ) = each %env_provides_default ) {
-+        $self->{$attr} = 1 if $ENV{$env};
-+    }
-+    $self->state_class('App::Prove::State');
-+    return $self;
-+}
-+
-+=head3 C<state_class>
-+
-+Getter/setter for the name of the class used for maintaining state.  This
-+class should either subclass from C<App::Prove::State> or provide an identical
-+interface.
-+
-+=head3 C<state_manager>
-+
-+Getter/setter for the instance of the C<state_class>.
-+
-+=cut
-+
-+=head3 C<add_rc_file>
-+
-+    $prove->add_rc_file('myproj/.proverc');
-+
-+Called before C<process_args> to prepend the contents of an rc file to
-+the options.
-+
-+=cut
-+
-+sub add_rc_file {
-+    my ( $self, $rc_file ) = @_;
-+
-+    local *RC;
-+    open RC, "<$rc_file" or croak "Can't read $rc_file ($!)";
-+    while ( defined( my $line = <RC> ) ) {
-+        push @{ $self->{rc_opts} }, grep $_ && $_ !~ /^#/,
-+          $line =~ m{ ' ([^']*) ' | " ([^"]*) " | (\#.*) | (\S*) }xg;
-+    }
-+    close RC;
-+}
-+
-+=head3 C<process_args>
-+
-+    $prove->process_args(@args);
-+
-+Processes the command-line arguments. Attributes will be set
-+appropriately. Any filenames may be found in the C<argv> attribute.
-+
-+Dies on invalid arguments.
-+
-+=cut
-+
-+sub process_args {
-+    my $self = shift;
-+
-+    my @rc = RC_FILE;
-+    unshift @rc, glob '~/' . RC_FILE if IS_UNIXY;
-+
-+    # Preprocess meta-args.
-+    my @args;
-+    while ( defined( my $arg = shift ) ) {
-+        if ( $arg eq '--norc' ) {
-+            @rc = ();
-+        }
-+        elsif ( $arg eq '--rc' ) {
-+            defined( my $rc = shift )
-+              or croak "Missing argument to --rc";
-+            push @rc, $rc;
-+        }
-+        elsif ( $arg =~ m{^--rc=(.+)$} ) {
-+            push @rc, $1;
-+        }
-+        else {
-+            push @args, $arg;
-+        }
-+    }
-+
-+    # Everything after the arisdottle '::' gets passed as args to
-+    # test programs.
-+    if ( defined( my $stop_at = _first_pos( '::', @args ) ) ) {
-+        my @test_args = splice @args, $stop_at;
-+        shift @test_args;
-+        $self->{test_args} = \@test_args;
-+    }
-+
-+    # Grab options from RC files
-+    $self->add_rc_file($_) for grep -f, @rc;
-+    unshift @args, @{ $self->{rc_opts} };
-+
-+    if ( my @bad = map {"-$_"} grep {/^-(man|help)$/} @args ) {
-+        die "Long options should be written with two dashes: ",
-+          join( ', ', @bad ), "\n";
-+    }
-+
-+    # And finally...
-+
-+    {
-+        local @ARGV = @args;
-+        Getopt::Long::Configure( 'no_ignore_case', 'bundling' );
-+
-+        # Don't add coderefs to GetOptions
-+        GetOptions(
-+            'v|verbose'   => \$self->{verbose},
-+            'f|failures'  => \$self->{failures},
-+            'l|lib'       => \$self->{lib},
-+            'b|blib'      => \$self->{blib},
-+            's|shuffle'   => \$self->{shuffle},
-+            'color!'      => \$self->{color},
-+            'colour!'     => \$self->{color},
-+            'count!'      => \$self->{show_count},
-+            'c'           => \$self->{color},
-+            'D|dry'       => \$self->{dry},
-+            'ext=s'       => \$self->{extension},
-+            'harness=s'   => \$self->{harness},
-+            'ignore-exit' => \$self->{ignore_exit},
-+            'formatter=s' => \$self->{formatter},
-+            'r|recurse'   => \$self->{recurse},
-+            'reverse'     => \$self->{backwards},
-+            'fork'        => \$self->{fork},
-+            'p|parse'     => \$self->{parse},
-+            'q|quiet'     => \$self->{quiet},
-+            'Q|QUIET'     => \$self->{really_quiet},
-+            'e|exec=s'    => \$self->{exec},
-+            'm|merge'     => \$self->{merge},
-+            'I=s@'        => $self->{includes},
-+            'M=s@'        => $self->{modules},
-+            'P=s@'        => $self->{plugins},
-+            'state=s@'    => $self->{state},
-+            'directives'  => \$self->{directives},
-+            'h|help|?'    => \$self->{show_help},
-+            'H|man'       => \$self->{show_man},
-+            'V|version'   => \$self->{show_version},
-+            'a|archive=s' => \$self->{archive},
-+            'j|jobs=i'    => \$self->{jobs},
-+            'timer'       => \$self->{timer},
-+            'T'           => \$self->{taint_fail},
-+            't'           => \$self->{taint_warn},
-+            'W'           => \$self->{warnings_fail},
-+            'w'           => \$self->{warnings_warn},
-+            'rules=s@'    => $self->{rules},
-+        ) or croak('Unable to continue');
-+
-+        # Stash the remainder of argv for later
-+        $self->{argv} = [@ARGV];
-+    }
-+
-+    return;
-+}
-+
-+sub _first_pos {
-+    my $want = shift;
-+    for ( 0 .. $#_ ) {
-+        return $_ if $_[$_] eq $want;
-+    }
-+    return;
-+}
-+
-+sub _help {
-+    my ( $self, $verbosity ) = @_;
-+
-+    eval('use Pod::Usage 1.12 ()');
-+    if ( my $err = $@ ) {
-+        die 'Please install Pod::Usage for the --help option '
-+          . '(or try `perldoc prove`.)'
-+          . "\n ($@)";
-+    }
-+
-+    Pod::Usage::pod2usage( { -verbose => $verbosity } );
-+
-+    return;
-+}
-+
-+sub _color_default {
-+    my $self = shift;
-+
-+    return -t STDOUT && !IS_WIN32;
-+}
-+
-+sub _get_args {
-+    my $self = shift;
-+
-+    my %args;
-+
-+    if ( defined $self->color ? $self->color : $self->_color_default ) {
-+        $args{color} = 1;
-+    }
-+    if ( !defined $self->show_count ) {
-+        $args{show_count} = 1;
-+    }
-+    else {
-+        $args{show_count} = $self->show_count;
-+    }
-+
-+    if ( $self->archive ) {
-+        $self->require_harness( archive => 'TAP::Harness::Archive' );
-+        $args{archive} = $self->archive;
-+    }
-+
-+    if ( my $jobs = $self->jobs ) {
-+        $args{jobs} = $jobs;
-+    }
-+
-+    if ( my $fork = $self->fork ) {
-+        $args{fork} = $fork;
-+    }
-+
-+    if ( my $harness_opt = $self->harness ) {
-+        $self->require_harness( harness => $harness_opt );
-+    }
-+
-+    if ( my $formatter = $self->formatter ) {
-+        $args{formatter_class} = $formatter;
-+    }
-+
-+    if ( $self->ignore_exit ) {
-+        $args{ignore_exit} = 1;
-+    }
-+
-+    if ( $self->taint_fail && $self->taint_warn ) {
-+        die '-t and -T are mutually exclusive';
-+    }
-+
-+    if ( $self->warnings_fail && $self->warnings_warn ) {
-+        die '-w and -W are mutually exclusive';
-+    }
-+
-+    for my $a (qw( lib switches )) {
-+        my $method = "_get_$a";
-+        my $val    = $self->$method();
-+        $args{$a} = $val if defined $val;
-+    }
-+
-+    # Handle verbose, quiet, really_quiet flags
-+    my %verb_map = ( verbose => 1, quiet => -1, really_quiet => -2, );
-+
-+    my @verb_adj = grep {$_} map { $self->$_() ? $verb_map{$_} : 0 }
-+      keys %verb_map;
-+
-+    die "Only one of verbose, quiet or really_quiet should be specified\n"
-+      if @verb_adj > 1;
-+
-+    $args{verbosity} = shift @verb_adj || 0;
-+
-+    for my $a (qw( merge failures timer directives )) {
-+        $args{$a} = 1 if $self->$a();
-+    }
-+
-+    $args{errors} = 1 if $self->parse;
-+
-+    # defined but zero-length exec runs test files as binaries
-+    $args{exec} = [ split( /\s+/, $self->exec ) ]
-+      if ( defined( $self->exec ) );
-+
-+    if ( defined( my $test_args = $self->test_args ) ) {
-+        $args{test_args} = $test_args;
-+    }
-+
-+    if ( @{ $self->rules } ) {
-+        my @rules;
-+        for ( @{ $self->rules } ) {
-+            if (/^par=(.*)/) {
-+                push @rules, $1;
-+            }
-+            elsif (/^seq=(.*)/) {
-+                push @rules, { seq => $1 };
-+            }
-+        }
-+        $args{rules} = { par => [@rules] };
-+    }
-+
-+    return ( \%args, $self->{harness_class} );
-+}
-+
-+sub _find_module {
-+    my ( $self, $class, @search ) = @_;
-+
-+    croak "Bad module name $class"
-+      unless $class =~ /^ \w+ (?: :: \w+ ) *$/x;
-+
-+    for my $pfx (@search) {
-+        my $name = join( '::', $pfx, $class );
-+        eval "require $name";
-+        return $name unless $@;
-+    }
-+
-+    eval "require $class";
-+    return $class unless $@;
-+    return;
-+}
-+
-+sub _load_extension {
-+    my ( $self, $name, @search ) = @_;
-+
-+    my @args = ();
-+    if ( $name =~ /^(.*?)=(.*)/ ) {
-+        $name = $1;
-+        @args = split( /,/, $2 );
-+    }
-+
-+    if ( my $class = $self->_find_module( $name, @search ) ) {
-+        $class->import(@args);
-+        if ( $class->can('load') ) {
-+            $class->load( { app_prove => $self, args => [@args] } );
-+        }
-+    }
-+    else {
-+        croak "Can't load module $name";
-+    }
-+}
-+
-+sub _load_extensions {
-+    my ( $self, $ext, @search ) = @_;
-+    $self->_load_extension( $_, @search ) for @$ext;
-+}
-+
-+=head3 C<run>
-+
-+Perform whatever actions the command line args specified. The C<prove>
-+command line tool consists of the following code:
-+
-+    use App::Prove;
-+
-+    my $app = App::Prove->new;
-+    $app->process_args(@ARGV);
-+    exit( $app->run ? 0 : 1 );  # if you need the exit code
-+
-+=cut
-+
-+sub run {
-+    my $self = shift;
-+
-+    unless ( $self->state_manager ) {
-+        $self->state_manager(
-+            $self->state_class->new( { store => STATE_FILE } ) );
-+    }
-+
-+    if ( $self->show_help ) {
-+        $self->_help(1);
-+    }
-+    elsif ( $self->show_man ) {
-+        $self->_help(2);
-+    }
-+    elsif ( $self->show_version ) {
-+        $self->print_version;
-+    }
-+    elsif ( $self->dry ) {
-+        print "$_\n" for $self->_get_tests;
-+    }
-+    else {
-+
-+        $self->_load_extensions( $self->modules );
-+        $self->_load_extensions( $self->plugins, PLUGINS );
-+
-+        local $ENV{TEST_VERBOSE} = 1 if $self->verbose;
-+
-+        return $self->_runtests( $self->_get_args, $self->_get_tests );
-+    }
-+
-+    return 1;
-+}
-+
-+sub _get_tests {
-+    my $self = shift;
-+
-+    my $state = $self->state_manager;
-+    my $ext   = $self->extension;
-+    $state->extension($ext) if defined $ext;
-+    if ( defined( my $state_switch = $self->state ) ) {
-+        $state->apply_switch(@$state_switch);
-+    }
-+
-+    my @tests = $state->get_tests( $self->recurse, @{ $self->argv } );
-+
-+    $self->_shuffle(@tests) if $self->shuffle;
-+    @tests = reverse @tests if $self->backwards;
-+
-+    return @tests;
-+}
-+
-+sub _runtests {
-+    my ( $self, $args, $harness_class, @tests ) = @_;
-+    my $harness = $harness_class->new($args);
-+
-+    my $state = $self->state_manager;
-+
-+    $harness->callback(
-+        after_test => sub {
-+            $state->observe_test(@_);
-+        }
-+    );
-+
-+    $harness->callback(
-+        after_runtests => sub {
-+            $state->commit(@_);
-+        }
-+    );
-+
-+    my $aggregator = $harness->runtests(@tests);
-+
-+    return !$aggregator->has_errors;
-+}
-+
-+sub _get_switches {
-+    my $self = shift;
-+    my @switches;
-+
-+    # notes that -T or -t must be at the front of the switches!
-+    if ( $self->taint_fail ) {
-+        push @switches, '-T';
-+    }
-+    elsif ( $self->taint_warn ) {
-+        push @switches, '-t';
-+    }
-+    if ( $self->warnings_fail ) {
-+        push @switches, '-W';
-+    }
-+    elsif ( $self->warnings_warn ) {
-+        push @switches, '-w';
-+    }
-+
-+    push @switches, split_shell( $ENV{HARNESS_PERL_SWITCHES} );
-+
-+    return @switches ? \@switches : ();
-+}
-+
-+sub _get_lib {
-+    my $self = shift;
-+    my @libs;
-+    if ( $self->lib ) {
-+        push @libs, 'lib';
-+    }
-+    if ( $self->blib ) {
-+        push @libs, 'blib/lib', 'blib/arch';
-+    }
-+    if ( @{ $self->includes } ) {
-+        push @libs, @{ $self->includes };
-+    }
-+
-+    #24926
-+    @libs = map { File::Spec->rel2abs($_) } @libs;
-+
-+    # Huh?
-+    return @libs ? \@libs : ();
-+}
-+
-+sub _shuffle {
-+    my $self = shift;
-+
-+    # Fisher-Yates shuffle
-+    my $i = @_;
-+    while ($i) {
-+        my $j = rand $i--;
-+        @_[ $i, $j ] = @_[ $j, $i ];
-+    }
-+    return;
-+}
-+
-+=head3 C<require_harness>
-+
-+Load a harness replacement class.
-+
-+  $prove->require_harness($for => $class_name);
-+
-+=cut
-+
-+sub require_harness {
-+    my ( $self, $for, $class ) = @_;
-+
-+    my ($class_name) = $class =~ /^(\w+(?:::\w+)*)/;
-+
-+    # Emulate Perl's -MModule=arg1,arg2 behaviour
-+    $class =~ s!^(\w+(?:::\w+)*)=(.*)$!$1 split(/,/,q{$2})!;
-+
-+    eval("use $class;");
-+    die "$class_name is required to use the --$for feature: $@" if $@;
-+
-+    $self->{harness_class} = $class_name;
-+
-+    return;
-+}
-+
-+=head3 C<print_version>
-+
-+Display the version numbers of the loaded L<TAP::Harness> and the
-+current Perl.
-+
-+=cut
-+
-+sub print_version {
-+    my $self = shift;
-+    printf(
-+        "TAP::Harness v%s and Perl v%vd\n",
-+        $TAP::Harness::VERSION, $^V
-+    );
-+
-+    return;
-+}
-+
-+1;
-+
-+# vim:ts=4:sw=4:et:sta
-+
-+__END__
-+
-+=head2 Attributes
-+
-+After command line parsing the following attributes reflect the values
-+of the corresponding command line switches. They may be altered before
-+calling C<run>.
-+
-+=over
-+
-+=item C<archive>
-+
-+=item C<argv>
-+
-+=item C<backwards>
-+
-+=item C<blib>
-+
-+=item C<color>
-+
-+=item C<directives>
-+
-+=item C<dry>
-+
-+=item C<exec>
-+
-+=item C<extension>
-+
-+=item C<failures>
-+
-+=item C<fork>
-+
-+=item C<formatter>
-+
-+=item C<harness>
-+
-+=item C<ignore_exit>
-+
-+=item C<includes>
-+
-+=item C<jobs>
-+
-+=item C<lib>
-+
-+=item C<merge>
-+
-+=item C<modules>
-+
-+=item C<parse>
-+
-+=item C<plugins>
-+
-+=item C<quiet>
-+
-+=item C<really_quiet>
-+
-+=item C<recurse>
-+
-+=item C<rules>
-+
-+=item C<show_count>
-+
-+=item C<show_help>
-+
-+=item C<show_man>
-+
-+=item C<show_version>
-+
-+=item C<shuffle>
-+
-+=item C<state>
-+
-+=item C<state_class>
-+
-+=item C<taint_fail>
-+
-+=item C<taint_warn>
-+
-+=item C<test_args>
-+
-+=item C<timer>
-+
-+=item C<verbose>
-+
-+=item C<warnings_fail>
-+
-+=item C<warnings_warn>
-+
-+=back
-+
-+=head1 PLUGINS
-+
-+C<App::Prove> provides support for 3rd-party plugins.  These are currently
-+loaded at run-time, I<after> arguments have been parsed (so you can not
-+change the way arguments are processed, sorry), typically with the
-+C<< -PI<plugin> >> switch, eg:
-+
-+  prove -PMyPlugin
-+
-+This will search for a module named C<App::Prove::Plugin::MyPlugin>, or failing
-+that, C<MyPlugin>.  If the plugin can't be found, C<prove> will complain & exit.
-+
-+You can pass an argument to your plugin by appending an C<=> after the plugin
-+name, eg C<-PMyPlugin=foo>.  You can pass multiple arguments using commas:
-+
-+  prove -PMyPlugin=foo,bar,baz
-+
-+These are passed in to your plugin's C<load()> class method (if it has one),
-+along with a reference to the C<App::Prove> object that is invoking your plugin:
-+
-+  sub load {
-+      my ($class, $p) = @_;
-+
-+      my @args = @{ $p->{args} };
-+      # @args will contain ( 'foo', 'bar', 'baz' )
-+      $p->{app_prove}->do_something;
-+      ...
-+  }
-+
-+Note that the user's arguments are also passed to your plugin's C<import()>
-+function as a list, eg:
-+
-+  sub import {
-+      my ($class, @args) = @_;
-+      # @args will contain ( 'foo', 'bar', 'baz' )
-+      ...
-+  }
-+
-+This is for backwards compatibility, and may be deprecated in the future.
-+
-+=head2 Sample Plugin
-+
-+Here's a sample plugin, for your reference:
-+
-+  package App::Prove::Plugin::Foo;
-+
-+  # Sample plugin, try running with:
-+  # prove -PFoo=bar -r -j3
-+  # prove -PFoo -Q
-+  # prove -PFoo=bar,My::Formatter
-+
-+  use strict;
-+  use warnings;
-+
-+  sub load {
-+      my ($class, $p) = @_;
-+      my @args = @{ $p->{args} };
-+      my $app  = $p->{app_prove};
-+
-+      print "loading plugin: $class, args: ", join(', ', @args ), "\n";
-+
-+      # turn on verbosity
-+      $app->verbose( 1 );
-+
-+      # set the formatter?
-+      $app->formatter( $args[1] ) if @args > 1;
-+
-+      # print some of App::Prove's state:
-+      for my $attr (qw( jobs quiet really_quiet recurse verbose )) {
-+          my $val = $app->$attr;
-+          $val    = 'undef' unless defined( $val );
-+          print "$attr: $val\n";
-+      }
-+
-+      return 1;
-+  }
-+
-+  1;
-+
-+=head1 SEE ALSO
-+
-+L<prove>, L<TAP::Harness>
-+
-+=cut
-diff -urN perl-5.10.0.orig/lib/TAP/Base.pm perl-5.10.0/lib/TAP/Base.pm
---- perl-5.10.0.orig/lib/TAP/Base.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Base.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,131 @@
-+package TAP::Base;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Object;
-+
-+@ISA = qw(TAP::Object);
-+
-+=head1 NAME
-+
-+TAP::Base - Base class that provides common functionality to L<TAP::Parser>
-+and L<TAP::Harness>
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+my $GOT_TIME_HIRES;
-+
-+BEGIN {
-+    eval 'use Time::HiRes qw(time);';
-+    $GOT_TIME_HIRES = $@ ? 0 : 1;
-+}
-+
-+=head1 SYNOPSIS
-+
-+    package TAP::Whatever;
-+
-+    use TAP::Base;
-+    
-+    use vars qw($VERSION @ISA);
-+    @ISA = qw(TAP::Base);
-+
-+    # ... later ...
-+    
-+    my $thing = TAP::Whatever->new();
-+    
-+    $thing->callback( event => sub {
-+        # do something interesting
-+    } );
-+
-+=head1 DESCRIPTION
-+
-+C<TAP::Base> provides callback management.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=cut
-+
-+sub _initialize {
-+    my ( $self, $arg_for, $ok_callback ) = @_;
-+
-+    my %ok_map = map { $_ => 1 } @$ok_callback;
-+
-+    $self->{ok_callbacks} = \%ok_map;
-+
-+    if ( my $cb = delete $arg_for->{callbacks} ) {
-+        while ( my ( $event, $callback ) = each %$cb ) {
-+            $self->callback( $event, $callback );
-+        }
-+    }
-+
-+    return $self;
-+}
-+
-+=head3 C<callback>
-+
-+Install a callback for a named event.
-+
-+=cut
-+
-+sub callback {
-+    my ( $self, $event, $callback ) = @_;
-+
-+    my %ok_map = %{ $self->{ok_callbacks} };
-+
-+    $self->_croak('No callbacks may be installed')
-+      unless %ok_map;
-+
-+    $self->_croak( "Callback $event is not supported. Valid callbacks are "
-+          . join( ', ', sort keys %ok_map ) )
-+      unless exists $ok_map{$event};
-+
-+    push @{ $self->{code_for}{$event} }, $callback;
-+
-+    return;
-+}
-+
-+sub _has_callbacks {
-+    my $self = shift;
-+    return keys %{ $self->{code_for} } != 0;
-+}
-+
-+sub _callback_for {
-+    my ( $self, $event ) = @_;
-+    return $self->{code_for}{$event};
-+}
-+
-+sub _make_callback {
-+    my $self  = shift;
-+    my $event = shift;
-+
-+    my $cb = $self->_callback_for($event);
-+    return unless defined $cb;
-+    return map { $_->(@_) } @$cb;
-+}
-+
-+=head3 C<get_time>
-+
-+Return the current time using Time::HiRes if available.
-+
-+=cut
-+
-+sub get_time { return time() }
-+
-+=head3 C<time_is_hires>
-+
-+Return true if the time returned by get_time is high resolution (i.e. if Time::HiRes is available).
-+
-+=cut
-+
-+sub time_is_hires { return $GOT_TIME_HIRES }
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Formatter/Base.pm perl-5.10.0/lib/TAP/Formatter/Base.pm
---- perl-5.10.0.orig/lib/TAP/Formatter/Base.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Formatter/Base.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,438 @@
-+package TAP::Formatter::Base;
-+
-+use strict;
-+use TAP::Base ();
-+use POSIX qw(strftime);
-+
-+use vars qw($VERSION @ISA);
-+
-+my $MAX_ERRORS = 5;
-+my %VALIDATION_FOR;
-+
-+BEGIN {
-+    @ISA = qw(TAP::Base);
-+
-+    %VALIDATION_FOR = (
-+        directives => sub { shift; shift },
-+        verbosity  => sub { shift; shift },
-+        timer      => sub { shift; shift },
-+        failures   => sub { shift; shift },
-+        errors     => sub { shift; shift },
-+        color      => sub { shift; shift },
-+        jobs       => sub { shift; shift },
-+        show_count => sub { shift; shift },
-+        stdout     => sub {
-+            my ( $self, $ref ) = @_;
-+            $self->_croak("option 'stdout' needs a filehandle")
-+              unless ( ref $ref || '' ) eq 'GLOB'
-+              or eval { $ref->can('print') };
-+            return $ref;
-+        },
-+    );
-+
-+    my @getter_setters = qw(
-+      _longest
-+      _printed_summary_header
-+      _colorizer
-+    );
-+
-+    __PACKAGE__->mk_methods( @getter_setters, keys %VALIDATION_FOR );
-+}
-+
-+=head1 NAME
-+
-+TAP::Formatter::Console - Harness output delegate for default console output
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This provides console orientated output formatting for TAP::Harness.
-+
-+=head1 SYNOPSIS
-+
-+ use TAP::Formatter::Console;
-+ my $harness = TAP::Formatter::Console->new( \%args );
-+
-+=cut
-+
-+sub _initialize {
-+    my ( $self, $arg_for ) = @_;
-+    $arg_for ||= {};
-+
-+    $self->SUPER::_initialize($arg_for);
-+    my %arg_for = %$arg_for;    # force a shallow copy
-+
-+    $self->verbosity(0);
-+
-+    for my $name ( keys %VALIDATION_FOR ) {
-+        my $property = delete $arg_for{$name};
-+        if ( defined $property ) {
-+            my $validate = $VALIDATION_FOR{$name};
-+            $self->$name( $self->$validate($property) );
-+        }
-+    }
-+
-+    if ( my @props = keys %arg_for ) {
-+        $self->_croak(
-+            "Unknown arguments to " . __PACKAGE__ . "::new (@props)" );
-+    }
-+
-+    $self->stdout( \*STDOUT ) unless $self->stdout;
-+
-+    if ( $self->color ) {
-+        require TAP::Formatter::Color;
-+        $self->_colorizer( TAP::Formatter::Color->new );
-+    }
-+
-+    return $self;
-+}
-+
-+sub verbose      { shift->verbosity >= 1 }
-+sub quiet        { shift->verbosity <= -1 }
-+sub really_quiet { shift->verbosity <= -2 }
-+sub silent       { shift->verbosity <= -3 }
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+ my %args = (
-+    verbose => 1,
-+ )
-+ my $harness = TAP::Formatter::Console->new( \%args );
-+
-+The constructor returns a new C<TAP::Formatter::Console> object. If
-+a L<TAP::Harness> is created with no C<formatter> a
-+C<TAP::Formatter::Console> is automatically created. If any of the
-+following options were given to TAP::Harness->new they well be passed to
-+this constructor which accepts an optional hashref whose allowed keys are:
-+
-+=over 4
-+
-+=item * C<verbosity>
-+
-+Set the verbosity level.
-+
-+=item * C<verbose>
-+
-+Printing individual test results to STDOUT.
-+
-+=item * C<timer>
-+
-+Append run time for each test to output. Uses L<Time::HiRes> if available.
-+
-+=item * C<failures>
-+
-+Only show test failures (this is a no-op if C<verbose> is selected).
-+
-+=item * C<quiet>
-+
-+Suppressing some test output (mostly failures while tests are running).
-+
-+=item * C<really_quiet>
-+
-+Suppressing everything but the tests summary.
-+
-+=item * C<silent>
-+
-+Suppressing all output.
-+
-+=item * C<errors>
-+
-+If parse errors are found in the TAP output, a note of this will be made
-+in the summary report.  To see all of the parse errors, set this argument to
-+true:
-+
-+  errors => 1
-+
-+=item * C<directives>
-+
-+If set to a true value, only test results with directives will be displayed.
-+This overrides other settings such as C<verbose> or C<failures>.
-+
-+=item * C<stdout>
-+
-+A filehandle for catching standard output.
-+
-+=item * C<color>
-+
-+If defined specifies whether color output is desired. If C<color> is not
-+defined it will default to color output if color support is available on
-+the current platform and output is not being redirected.
-+
-+=item * C<jobs>
-+
-+The number of concurrent jobs this formatter will handle.
-+
-+=item * C<show_count>
-+
-+Boolean value.  If false, disables the C<X/Y> test count which shows up while
-+tests are running.
-+
-+=back
-+
-+Any keys for which the value is C<undef> will be ignored.
-+
-+=cut
-+
-+# new supplied by TAP::Base
-+
-+=head3 C<prepare>
-+
-+Called by Test::Harness before any test output is generated. 
-+
-+This is an advisory and may not be called in the case where tests are
-+being supplied to Test::Harness by an iterator.
-+
-+=cut
-+
-+sub prepare {
-+    my ( $self, @tests ) = @_;
-+
-+    my $longest = 0;
-+
-+    foreach my $test (@tests) {
-+        $longest = length $test if length $test > $longest;
-+    }
-+
-+    $self->_longest($longest);
-+}
-+
-+sub _format_now { strftime "[%H:%M:%S]", localtime }
-+
-+sub _format_name {
-+    my ( $self, $test ) = @_;
-+    my $name = $test;
-+    my $periods = '.' x ( $self->_longest + 2 - length $test );
-+    $periods = " $periods ";
-+
-+    if ( $self->timer ) {
-+        my $stamp = $self->_format_now();
-+        return "$stamp $name$periods";
-+    }
-+    else {
-+        return "$name$periods";
-+    }
-+
-+}
-+
-+=head3 C<open_test>
-+
-+Called to create a new test session. A test session looks like this:
-+
-+    my $session = $formatter->open_test( $test, $parser );
-+    while ( defined( my $result = $parser->next ) ) {
-+        $session->result($result);
-+        exit 1 if $result->is_bailout;
-+    }
-+    $session->close_test;
-+
-+=cut
-+
-+sub open_test {
-+    die "Unimplemented.";
-+}
-+
-+=head3 C<summary>
-+
-+  $harness->summary( $aggregate );
-+
-+C<summary> prints the summary report after all tests are run.  The argument is
-+an aggregate.
-+
-+=cut
-+
-+sub summary {
-+    my ( $self, $aggregate ) = @_;
-+
-+    return if $self->silent;
-+
-+    my @t     = $aggregate->descriptions;
-+    my $tests = \@t;
-+
-+    my $runtime = $aggregate->elapsed_timestr;
-+
-+    my $total  = $aggregate->total;
-+    my $passed = $aggregate->passed;
-+
-+    if ( $self->timer ) {
-+        $self->_output( $self->_format_now(), "\n" );
-+    }
-+
-+    # TODO: Check this condition still works when all subtests pass but
-+    # the exit status is nonzero
-+
-+    if ( $aggregate->all_passed ) {
-+        $self->_output("All tests successful.\n");
-+    }
-+
-+    # ~TODO option where $aggregate->skipped generates reports
-+    if ( $total != $passed or $aggregate->has_problems ) {
-+        $self->_output("\nTest Summary Report");
-+        $self->_output("\n-------------------\n");
-+        foreach my $test (@$tests) {
-+            $self->_printed_summary_header(0);
-+            my ($parser) = $aggregate->parsers($test);
-+            $self->_output_summary_failure(
-+                'failed',
-+                [ '  Failed test:  ', '  Failed tests:  ' ],
-+                $test, $parser
-+            );
-+            $self->_output_summary_failure(
-+                'todo_passed',
-+                "  TODO passed:   ", $test, $parser
-+            );
-+
-+            # ~TODO this cannot be the default
-+            #$self->_output_summary_failure( 'skipped', "  Tests skipped: " );
-+
-+            if ( my $exit = $parser->exit ) {
-+                $self->_summary_test_header( $test, $parser );
-+                $self->_failure_output("  Non-zero exit status: $exit\n");
-+            }
-+            elsif ( my $wait = $parser->wait ) {
-+                $self->_summary_test_header( $test, $parser );
-+                $self->_failure_output("  Non-zero wait status: $wait\n");
-+            }
-+
-+            if ( my @errors = $parser->parse_errors ) {
-+                my $explain;
-+                if ( @errors > $MAX_ERRORS && !$self->errors ) {
-+                    $explain
-+                      = "Displayed the first $MAX_ERRORS of "
-+                      . scalar(@errors)
-+                      . " TAP syntax errors.\n"
-+                      . "Re-run prove with the -p option to see them all.\n";
-+                    splice @errors, $MAX_ERRORS;
-+                }
-+                $self->_summary_test_header( $test, $parser );
-+                $self->_failure_output(
-+                    sprintf "  Parse errors: %s\n",
-+                    shift @errors
-+                );
-+                foreach my $error (@errors) {
-+                    my $spaces = ' ' x 16;
-+                    $self->_failure_output("$spaces$error\n");
-+                }
-+                $self->_failure_output($explain) if $explain;
-+            }
-+        }
-+    }
-+    my $files = @$tests;
-+    $self->_output("Files=$files, Tests=$total, $runtime\n");
-+    my $status = $aggregate->get_status;
-+    $self->_output("Result: $status\n");
-+}
-+
-+sub _output_summary_failure {
-+    my ( $self, $method, $name, $test, $parser ) = @_;
-+
-+    # ugly hack.  Must rethink this :(
-+    my $output = $method eq 'failed' ? '_failure_output' : '_output';
-+
-+    if ( my @r = $parser->$method() ) {
-+        $self->_summary_test_header( $test, $parser );
-+        my ( $singular, $plural )
-+          = 'ARRAY' eq ref $name ? @$name : ( $name, $name );
-+        $self->$output( @r == 1 ? $singular : $plural );
-+        my @results = $self->_balanced_range( 40, @r );
-+        $self->$output( sprintf "%s\n" => shift @results );
-+        my $spaces = ' ' x 16;
-+        while (@results) {
-+            $self->$output( sprintf "$spaces%s\n" => shift @results );
-+        }
-+    }
-+}
-+
-+sub _summary_test_header {
-+    my ( $self, $test, $parser ) = @_;
-+    return if $self->_printed_summary_header;
-+    my $spaces = ' ' x ( $self->_longest - length $test );
-+    $spaces = ' ' unless $spaces;
-+    my $output = $self->_get_output_method($parser);
-+    $self->$output(
-+        sprintf "$test$spaces(Wstat: %d Tests: %d Failed: %d)\n",
-+        $parser->wait, $parser->tests_run, scalar $parser->failed
-+    );
-+    $self->_printed_summary_header(1);
-+}
-+
-+sub _output {
-+    my $self = shift;
-+
-+    print { $self->stdout } @_;
-+}
-+
-+sub _failure_output {
-+    my $self = shift;
-+
-+    $self->_output(@_);
-+}
-+
-+sub _balanced_range {
-+    my ( $self, $limit, @range ) = @_;
-+    @range = $self->_range(@range);
-+    my $line = "";
-+    my @lines;
-+    my $curr = 0;
-+    while (@range) {
-+        if ( $curr < $limit ) {
-+            my $range = ( shift @range ) . ", ";
-+            $line .= $range;
-+            $curr += length $range;
-+        }
-+        elsif (@range) {
-+            $line =~ s/, $//;
-+            push @lines => $line;
-+            $line = '';
-+            $curr = 0;
-+        }
-+    }
-+    if ($line) {
-+        $line =~ s/, $//;
-+        push @lines => $line;
-+    }
-+    return @lines;
-+}
-+
-+sub _range {
-+    my ( $self, @numbers ) = @_;
-+
-+    # shouldn't be needed, but subclasses might call this
-+    @numbers = sort { $a <=> $b } @numbers;
-+    my ( $min, @range );
-+
-+    foreach my $i ( 0 .. $#numbers ) {
-+        my $num  = $numbers[$i];
-+        my $next = $numbers[ $i + 1 ];
-+        if ( defined $next && $next == $num + 1 ) {
-+            if ( !defined $min ) {
-+                $min = $num;
-+            }
-+        }
-+        elsif ( defined $min ) {
-+            push @range => "$min-$num";
-+            undef $min;
-+        }
-+        else {
-+            push @range => $num;
-+        }
-+    }
-+    return @range;
-+}
-+
-+sub _get_output_method {
-+    my ( $self, $parser ) = @_;
-+    return $parser->has_problems ? '_failure_output' : '_output';
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Formatter/Color.pm perl-5.10.0/lib/TAP/Formatter/Color.pm
---- perl-5.10.0.orig/lib/TAP/Formatter/Color.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Formatter/Color.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,148 @@
-+package TAP::Formatter::Color;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use constant IS_WIN32 => ( $^O =~ /^(MS)?Win32$/ );
-+
-+@ISA = qw(TAP::Object);
-+
-+my $NO_COLOR;
-+
-+BEGIN {
-+    $NO_COLOR = 0;
-+
-+    if (IS_WIN32) {
-+        eval 'use Win32::Console';
-+        if ($@) {
-+            $NO_COLOR = $@;
-+        }
-+        else {
-+            my $console = Win32::Console->new( STD_OUTPUT_HANDLE() );
-+
-+            # eval here because we might not know about these variables
-+            my $fg = eval '$FG_LIGHTGRAY';
-+            my $bg = eval '$BG_BLACK';
-+
-+            *set_color = sub {
-+                my ( $self, $output, $color ) = @_;
-+
-+                my $var;
-+                if ( $color eq 'reset' ) {
-+                    $fg = eval '$FG_LIGHTGRAY';
-+                    $bg = eval '$BG_BLACK';
-+                }
-+                elsif ( $color =~ /^on_(.+)$/ ) {
-+                    $bg = eval '$BG_' . uc($1);
-+                }
-+                else {
-+                    $fg = eval '$FG_' . uc($color);
-+                }
-+
-+                # In case of colors that aren't defined
-+                $self->set_color('reset')
-+                  unless defined $bg && defined $fg;
-+
-+                $console->Attr( $bg | $fg );
-+            };
-+        }
-+    }
-+    else {
-+        eval 'use Term::ANSIColor';
-+        if ($@) {
-+            $NO_COLOR = $@;
-+        }
-+        else {
-+            *set_color = sub {
-+                my ( $self, $output, $color ) = @_;
-+                $output->( color($color) );
-+            };
-+        }
-+    }
-+
-+    if ($NO_COLOR) {
-+        *set_color = sub { };
-+    }
-+}
-+
-+=head1 NAME
-+
-+TAP::Formatter::Color - Run Perl test scripts with color
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+Note that this harness is I<experimental>.  You may not like the colors I've
-+chosen and I haven't yet provided an easy way to override them.
-+
-+This test harness is the same as L<TAP::Harness>, but test results are output
-+in color.  Passing tests are printed in green.  Failing tests are in red.
-+Skipped tests are blue on a white background and TODO tests are printed in
-+white.
-+
-+If L<Term::ANSIColor> cannot be found (or L<Win32::Console> if running
-+under Windows) tests will be run without color.
-+
-+=head1 SYNOPSIS
-+
-+ use TAP::Formatter::Color;
-+ my $harness = TAP::Formatter::Color->new( \%args );
-+ $harness->runtests(@tests);
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+The constructor returns a new C<TAP::Formatter::Color> object. If
-+L<Term::ANSIColor> is not installed, returns undef.
-+
-+=cut
-+
-+# new() implementation supplied by TAP::Object
-+
-+sub _initialize {
-+    my $self = shift;
-+
-+    if ($NO_COLOR) {
-+
-+        # shorten that message a bit
-+        ( my $error = $NO_COLOR ) =~ s/ in \@INC .*//s;
-+        warn "Note: Cannot run tests in color: $error\n";
-+        return;    # abort object construction
-+    }
-+
-+    return $self;
-+}
-+
-+##############################################################################
-+
-+=head3 C<can_color>
-+
-+  Test::Formatter::Color->can_color()
-+
-+Returns a boolean indicating whether or not this module can actually
-+generate colored output. This will be false if it could not load the
-+modules needed for the current platform.
-+
-+=cut
-+
-+sub can_color {
-+    return !$NO_COLOR;
-+}
-+
-+=head3 C<set_color>
-+
-+Set the output color.
-+
-+=cut
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Formatter/Console/ParallelSession.pm perl-5.10.0/lib/TAP/Formatter/Console/ParallelSession.pm
---- perl-5.10.0.orig/lib/TAP/Formatter/Console/ParallelSession.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Formatter/Console/ParallelSession.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,202 @@
-+package TAP::Formatter::Console::ParallelSession;
-+
-+use strict;
-+use File::Spec;
-+use File::Path;
-+use TAP::Formatter::Console::Session;
-+use Carp;
-+
-+use constant WIDTH => 72;    # Because Eric says
-+use vars qw($VERSION @ISA);
-+
-+@ISA = qw(TAP::Formatter::Console::Session);
-+
-+my %shared;
-+
-+sub _initialize {
-+    my ( $self, $arg_for ) = @_;
-+
-+    $self->SUPER::_initialize($arg_for);
-+    my $formatter = $self->formatter;
-+
-+    # Horrid bodge. This creates our shared context per harness. Maybe
-+    # TAP::Harness should give us this?
-+    my $context = $shared{$formatter} ||= $self->_create_shared_context;
-+    push @{ $context->{active} }, $self;
-+
-+    return $self;
-+}
-+
-+sub _create_shared_context {
-+    my $self = shift;
-+    return {
-+        active => [],
-+        tests  => 0,
-+        fails  => 0,
-+    };
-+}
-+
-+=head1 NAME
-+
-+TAP::Formatter::Console::ParallelSession - Harness output delegate for parallel console output
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This provides console orientated output formatting for L<TAP::Harness>
-+when run with multiple L<TAP::Harness/jobs>.
-+
-+=head1 SYNOPSIS
-+
-+=cut
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<header>
-+
-+Output test preamble
-+
-+=cut
-+
-+sub header {
-+}
-+
-+sub _clear_ruler {
-+    my $self = shift;
-+    $self->formatter->_output( "\r" . ( ' ' x WIDTH ) . "\r" );
-+}
-+
-+my $now = 0;
-+my $start;
-+
-+my $trailer     = '... )===';
-+my $chop_length = WIDTH - length $trailer;
-+
-+sub _output_ruler {
-+    my ( $self, $refresh ) = @_;
-+    my $new_now = time;
-+    return if $new_now == $now and !$refresh;
-+    $now = $new_now;
-+    $start ||= $now;
-+    my $formatter = $self->formatter;
-+    return if $formatter->really_quiet;
-+
-+    my $context = $shared{$formatter};
-+
-+    my $ruler = sprintf '===( %7d;%d  ', $context->{tests}, $now - $start;
-+
-+    foreach my $active ( @{ $context->{active} } ) {
-+        my $parser  = $active->parser;
-+        my $tests   = $parser->tests_run;
-+        my $planned = $parser->tests_planned || '?';
-+
-+        $ruler .= sprintf '%' . length($planned) . "d/$planned  ", $tests;
-+    }
-+    chop $ruler;    # Remove a trailing space
-+    $ruler .= ')===';
-+
-+    if ( length $ruler > WIDTH ) {
-+        $ruler =~ s/(.{$chop_length}).*/$1$trailer/o;
-+    }
-+    else {
-+        $ruler .= '=' x ( WIDTH - length($ruler) );
-+    }
-+    $formatter->_output("\r$ruler");
-+}
-+
-+=head3 C<result>
-+
-+  Called by the harness for each line of TAP it receives .
-+
-+=cut
-+
-+sub result {
-+    my ( $self, $result ) = @_;
-+    my $formatter = $self->formatter;
-+
-+    # my $really_quiet = $formatter->really_quiet;
-+    # my $show_count   = $self->_should_show_count;
-+
-+    if ( $result->is_test ) {
-+        my $context = $shared{$formatter};
-+        $context->{tests}++;
-+
-+        my $active = $context->{active};
-+        if ( @$active == 1 ) {
-+
-+            # There is only one test, so use the serial output format.
-+            return $self->SUPER::result($result);
-+        }
-+
-+        $self->_output_ruler( $self->parser->tests_run == 1 );
-+    }
-+    elsif ( $result->is_bailout ) {
-+        $formatter->_failure_output(
-+                "Bailout called.  Further testing stopped:  "
-+              . $result->explanation
-+              . "\n" );
-+    }
-+}
-+
-+=head3 C<clear_for_close>
-+
-+=cut
-+
-+sub clear_for_close {
-+    my $self      = shift;
-+    my $formatter = $self->formatter;
-+    return if $formatter->really_quiet;
-+    my $context = $shared{$formatter};
-+    if ( @{ $context->{active} } == 1 ) {
-+        $self->SUPER::clear_for_close;
-+    }
-+    else {
-+        $self->_clear_ruler;
-+    }
-+}
-+
-+=head3 C<close_test>
-+
-+=cut
-+
-+sub close_test {
-+    my $self      = shift;
-+    my $name      = $self->name;
-+    my $parser    = $self->parser;
-+    my $formatter = $self->formatter;
-+    my $context   = $shared{$formatter};
-+
-+    $self->SUPER::close_test;
-+
-+    my $active = $context->{active};
-+
-+    my @pos = grep { $active->[$_]->name eq $name } 0 .. $#$active;
-+
-+    die "Can't find myself" unless @pos;
-+    splice @$active, $pos[0], 1;
-+
-+    if ( @$active > 1 ) {
-+        $self->_output_ruler(1);
-+    }
-+    elsif ( @$active == 1 ) {
-+
-+        # Print out "test/name.t ...."
-+        $active->[0]->SUPER::header;
-+    }
-+    else {
-+
-+        # $self->formatter->_output("\n");
-+        delete $shared{$formatter};
-+    }
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Formatter/Console/Session.pm perl-5.10.0/lib/TAP/Formatter/Console/Session.pm
---- perl-5.10.0.orig/lib/TAP/Formatter/Console/Session.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Formatter/Console/Session.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,217 @@
-+package TAP::Formatter::Console::Session;
-+
-+use strict;
-+use TAP::Formatter::Session;
-+
-+use vars qw($VERSION @ISA);
-+
-+@ISA = qw(TAP::Formatter::Session);
-+
-+my @ACCESSOR;
-+
-+BEGIN {
-+    my @CLOSURE_BINDING = qw( header result clear_for_close close_test );
-+
-+    for my $method (@CLOSURE_BINDING) {
-+        no strict 'refs';
-+        *$method = sub {
-+            my $self = shift;
-+            return ( $self->{_closures} ||= $self->_closures )->{$method}
-+              ->(@_);
-+        };
-+    }
-+}
-+
-+=head1 NAME
-+
-+TAP::Formatter::Console::Session - Harness output delegate for default console output
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This provides console orientated output formatting for TAP::Harness.
-+
-+=cut
-+
-+sub _get_output_result {
-+    my $self = shift;
-+
-+    my @color_map = (
-+        {   test => sub { $_->is_test && !$_->is_ok },
-+            colors => ['red'],
-+        },
-+        {   test => sub { $_->is_test && $_->has_skip },
-+            colors => [
-+                'white',
-+                'on_blue'
-+            ],
-+        },
-+        {   test => sub { $_->is_test && $_->has_todo },
-+            colors => ['yellow'],
-+        },
-+    );
-+
-+    my $formatter = $self->formatter;
-+    my $parser    = $self->parser;
-+
-+    return $formatter->_colorizer
-+      ? sub {
-+        my $result = shift;
-+        for my $col (@color_map) {
-+            local $_ = $result;
-+            if ( $col->{test}->() ) {
-+                $formatter->_set_colors( @{ $col->{colors} } );
-+                last;
-+            }
-+        }
-+        $formatter->_output( $result->as_string );
-+        $formatter->_set_colors('reset');
-+      }
-+      : sub {
-+        $formatter->_output( shift->as_string );
-+      };
-+}
-+
-+sub _closures {
-+    my $self = shift;
-+
-+    my $parser     = $self->parser;
-+    my $formatter  = $self->formatter;
-+    my $pretty     = $formatter->_format_name( $self->name );
-+    my $show_count = $self->show_count;
-+
-+    my $really_quiet = $formatter->really_quiet;
-+    my $quiet        = $formatter->quiet;
-+    my $verbose      = $formatter->verbose;
-+    my $directives   = $formatter->directives;
-+    my $failures     = $formatter->failures;
-+
-+    my $output_result = $self->_get_output_result;
-+
-+    my $output          = '_output';
-+    my $plan            = '';
-+    my $newline_printed = 0;
-+
-+    my $last_status_printed = 0;
-+
-+    return {
-+        header => sub {
-+            $formatter->_output($pretty)
-+              unless $really_quiet;
-+        },
-+
-+        result => sub {
-+            my $result = shift;
-+
-+            if ( $result->is_bailout ) {
-+                $formatter->_failure_output(
-+                        "Bailout called.  Further testing stopped:  "
-+                      . $result->explanation
-+                      . "\n" );
-+            }
-+
-+            return if $really_quiet;
-+
-+            my $is_test = $result->is_test;
-+
-+            # These are used in close_test - but only if $really_quiet
-+            # is false - so it's safe to only set them here unless that
-+            # relationship changes.
-+
-+            if ( !$plan ) {
-+                my $planned = $parser->tests_planned || '?';
-+                $plan = "/$planned ";
-+            }
-+            $output = $formatter->_get_output_method($parser);
-+
-+            if ( $show_count and $is_test ) {
-+                my $number = $result->number;
-+                my $now    = CORE::time;
-+
-+                # Print status roughly once per second.
-+                # We will always get the first number as a side effect of
-+                # $last_status_printed starting with the value 0, which $now
-+                # will never be. (Unless someone sets their clock to 1970)
-+                if ( $last_status_printed != $now ) {
-+                    $formatter->$output("\r$pretty$number$plan");
-+                    $last_status_printed = $now;
-+                }
-+            }
-+
-+            if (!$quiet
-+                && (   ( $verbose && !$failures )
-+                    || ( $is_test && $failures && !$result->is_ok )
-+                    || ( $result->has_directive && $directives ) )
-+              )
-+            {
-+                unless ($newline_printed) {
-+                    $formatter->_output("\n");
-+                    $newline_printed = 1;
-+                }
-+                $output_result->($result);
-+                $formatter->_output("\n");
-+            }
-+        },
-+
-+        clear_for_close => sub {
-+            my $spaces
-+              = ' ' x length( '.' . $pretty . $plan . $parser->tests_run );
-+            $formatter->$output("\r$spaces");
-+        },
-+
-+        close_test => sub {
-+            if ( $show_count && !$really_quiet ) {
-+                $self->clear_for_close;
-+                $formatter->$output("\r$pretty");
-+            }
-+
-+            # Avoid circular references
-+            $self->parser(undef);
-+            $self->{_closures} = {};
-+
-+            return if $really_quiet;
-+
-+            if ( my $skip_all = $parser->skip_all ) {
-+                $formatter->_output("skipped: $skip_all\n");
-+            }
-+            elsif ( $parser->has_problems ) {
-+                $self->_output_test_failure($parser);
-+            }
-+            else {
-+                my $time_report = '';
-+                if ( $formatter->timer ) {
-+                    my $start_time = $parser->start_time;
-+                    my $end_time   = $parser->end_time;
-+                    if ( defined $start_time and defined $end_time ) {
-+                        my $elapsed = $end_time - $start_time;
-+                        $time_report
-+                          = $self->time_is_hires
-+                          ? sprintf( ' %8d ms', $elapsed * 1000 )
-+                          : sprintf( ' %8s s', $elapsed || '<1' );
-+                    }
-+                }
-+
-+                $formatter->_output("ok$time_report\n");
-+            }
-+        },
-+    };
-+}
-+
-+=head2 C<< 	clear_for_close >>
-+
-+=head2 C<< 	close_test >>
-+
-+=head2 C<< 	header >>
-+
-+=head2 C<< 	result >>
-+
-+=cut
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Formatter/Console.pm perl-5.10.0/lib/TAP/Formatter/Console.pm
---- perl-5.10.0.orig/lib/TAP/Formatter/Console.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Formatter/Console.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,84 @@
-+package TAP::Formatter::Console;
-+
-+use strict;
-+use TAP::Formatter::Base ();
-+use POSIX qw(strftime);
-+
-+use vars qw($VERSION @ISA);
-+
-+@ISA = qw(TAP::Formatter::Base);
-+
-+=head1 NAME
-+
-+TAP::Formatter::Console - Harness output delegate for default console output
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This provides console orientated output formatting for TAP::Harness.
-+
-+=head1 SYNOPSIS
-+
-+ use TAP::Formatter::Console;
-+ my $harness = TAP::Formatter::Console->new( \%args );
-+
-+=head2 C<< open_test >>
-+
-+See L<TAP::Formatter::base>
-+
-+=cut
-+
-+sub open_test {
-+    my ( $self, $test, $parser ) = @_;
-+
-+    my $class
-+      = $self->jobs > 1
-+      ? 'TAP::Formatter::Console::ParallelSession'
-+      : 'TAP::Formatter::Console::Session';
-+
-+    eval "require $class";
-+    $self->_croak($@) if $@;
-+
-+    my $session = $class->new(
-+        {   name       => $test,
-+            formatter  => $self,
-+            parser     => $parser,
-+            show_count => $self->show_count,
-+        }
-+    );
-+
-+    $session->header;
-+
-+    return $session;
-+}
-+
-+# Use _colorizer delegate to set output color. NOP if we have no delegate
-+sub _set_colors {
-+    my ( $self, @colors ) = @_;
-+    if ( my $colorizer = $self->_colorizer ) {
-+        my $output_func = $self->{_output_func} ||= sub {
-+            $self->_output(@_);
-+        };
-+        $colorizer->set_color( $output_func, $_ ) for @colors;
-+    }
-+}
-+
-+sub _failure_output {
-+    my $self = shift;
-+    $self->_set_colors('red');
-+    my $out = join '', @_;
-+    my $has_newline = chomp $out;
-+    $self->_output($out);
-+    $self->_set_colors('reset');
-+    $self->_output($/)
-+      if $has_newline;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Formatter/File/Session.pm perl-5.10.0/lib/TAP/Formatter/File/Session.pm
---- perl-5.10.0.orig/lib/TAP/Formatter/File/Session.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Formatter/File/Session.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,109 @@
-+package TAP::Formatter::File::Session;
-+
-+use strict;
-+use TAP::Formatter::Session;
-+
-+use vars qw($VERSION @ISA);
-+
-+@ISA = qw(TAP::Formatter::Session);
-+
-+=head1 NAME
-+
-+TAP::Formatter::File::Session - Harness output delegate for file output
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This provides file orientated output formatting for L<TAP::Harness>.
-+It is particularly important when running with parallel tests, as it
-+ensures that test results are not interleaved, even when run
-+verbosely.
-+
-+=cut
-+
-+=head1 METHODS
-+
-+=head2 result
-+
-+Stores results for later output, all together.
-+
-+=cut
-+
-+sub result {
-+    my $self   = shift;
-+    my $result = shift;
-+
-+    my $parser    = $self->parser;
-+    my $formatter = $self->formatter;
-+
-+    if ( $result->is_bailout ) {
-+        $formatter->_failure_output(
-+                "Bailout called.  Further testing stopped:  "
-+              . $result->explanation
-+              . "\n" );
-+        return;
-+    }
-+
-+    if (!$formatter->quiet
-+        && (   ( $formatter->verbose && !$formatter->failures )
-+            || ( $result->is_test && $formatter->failures && !$result->is_ok )
-+            || ( $result->has_directive && $formatter->directives ) )
-+      )
-+    {
-+        $self->{results} .= $result->as_string . "\n";
-+    }
-+}
-+
-+=head2 close_test
-+
-+When the test file finishes, outputs the summary, together.
-+
-+=cut
-+
-+sub close_test {
-+    my $self = shift;
-+
-+    # Avoid circular references
-+    $self->parser(undef);
-+
-+    my $parser    = $self->parser;
-+    my $formatter = $self->formatter;
-+    my $pretty    = $formatter->_format_name( $self->name );
-+
-+    return if $formatter->really_quiet;
-+    if ( my $skip_all = $parser->skip_all ) {
-+        $formatter->_output( $pretty . "skipped: $skip_all\n" );
-+    }
-+    elsif ( $parser->has_problems ) {
-+        $formatter->_output(
-+            $pretty . ( $self->{results} ? "\n" . $self->{results} : "\n" ) );
-+        $self->_output_test_failure($parser);
-+    }
-+    else {
-+        my $time_report = '';
-+        if ( $formatter->timer ) {
-+            my $start_time = $parser->start_time;
-+            my $end_time   = $parser->end_time;
-+            if ( defined $start_time and defined $end_time ) {
-+                my $elapsed = $end_time - $start_time;
-+                $time_report
-+                  = $self->time_is_hires
-+                  ? sprintf( ' %8d ms', $elapsed * 1000 )
-+                  : sprintf( ' %8s s', $elapsed || '<1' );
-+            }
-+        }
-+
-+        $formatter->_output( $pretty
-+              . ( $self->{results} ? "\n" . $self->{results} : "" )
-+              . "ok$time_report\n" );
-+    }
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Formatter/File.pm perl-5.10.0/lib/TAP/Formatter/File.pm
---- perl-5.10.0.orig/lib/TAP/Formatter/File.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Formatter/File.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,58 @@
-+package TAP::Formatter::File;
-+
-+use strict;
-+use TAP::Formatter::Base ();
-+use TAP::Formatter::File::Session;
-+use POSIX qw(strftime);
-+
-+use vars qw($VERSION @ISA);
-+
-+@ISA = qw(TAP::Formatter::Base);
-+
-+=head1 NAME
-+
-+TAP::Formatter::File - Harness output delegate for file output
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This provides file orientated output formatting for TAP::Harness.
-+
-+=head1 SYNOPSIS
-+
-+ use TAP::Formatter::File;
-+ my $harness = TAP::Formatter::File->new( \%args );
-+
-+=head2 C<< open_test >>
-+
-+See L<TAP::Formatter::base>
-+
-+=cut
-+
-+sub open_test {
-+    my ( $self, $test, $parser ) = @_;
-+
-+    my $session = TAP::Formatter::File::Session->new(
-+        {   name      => $test,
-+            formatter => $self,
-+            parser    => $parser,
-+        }
-+    );
-+
-+    $session->header;
-+
-+    return $session;
-+}
-+
-+sub _should_show_count {
-+    return 0;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Formatter/Session.pm perl-5.10.0/lib/TAP/Formatter/Session.pm
---- perl-5.10.0.orig/lib/TAP/Formatter/Session.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Formatter/Session.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,175 @@
-+package TAP::Formatter::Session;
-+
-+use strict;
-+use TAP::Base;
-+
-+use vars qw($VERSION @ISA);
-+
-+@ISA = qw(TAP::Base);
-+
-+my @ACCESSOR;
-+
-+BEGIN {
-+
-+    @ACCESSOR = qw( name formatter parser show_count );
-+
-+    for my $method (@ACCESSOR) {
-+        no strict 'refs';
-+        *$method = sub { shift->{$method} };
-+    }
-+}
-+
-+=head1 NAME
-+
-+TAP::Formatter::Session - Abstract base class for harness output delegate 
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+ my %args = (
-+    formatter => $self,
-+ )
-+ my $harness = TAP::Formatter::Console::Session->new( \%args );
-+
-+The constructor returns a new C<TAP::Formatter::Console::Session> object.
-+
-+=over 4
-+
-+=item * C<formatter>
-+
-+=item * C<parser>
-+
-+=item * C<name>
-+
-+=item * C<show_count>
-+
-+=back
-+
-+=cut
-+
-+sub _initialize {
-+    my ( $self, $arg_for ) = @_;
-+    $arg_for ||= {};
-+
-+    $self->SUPER::_initialize($arg_for);
-+    my %arg_for = %$arg_for;    # force a shallow copy
-+
-+    for my $name (@ACCESSOR) {
-+        $self->{$name} = delete $arg_for{$name};
-+    }
-+
-+    if ( !defined $self->show_count ) {
-+        $self->{show_count} = 1;    # defaults to true
-+    }
-+    if ( $self->show_count ) {      # but may be a damned lie!
-+        $self->{show_count} = $self->_should_show_count;
-+    }
-+
-+    if ( my @props = sort keys %arg_for ) {
-+        $self->_croak(
-+            "Unknown arguments to " . __PACKAGE__ . "::new (@props)" );
-+    }
-+
-+    return $self;
-+}
-+
-+=head3 C<header>
-+
-+Output test preamble
-+
-+=head3 C<result>
-+
-+Called by the harness for each line of TAP it receives.
-+
-+=head3 C<close_test>
-+
-+Called to close a test session.
-+
-+=head3 C<clear_for_close>
-+
-+Called by C<close_test> to clear the line showing test progress, or the parallel
-+test ruler, prior to printing the final test result.
-+
-+=cut
-+
-+sub header { }
-+
-+sub result { }
-+
-+sub close_test { }
-+
-+sub clear_for_close { }
-+
-+sub _should_show_count {
-+    my $self = shift;
-+    return !$self->formatter->verbose && -t $self->formatter->stdout;
-+}
-+
-+sub _output_test_failure {
-+    my ( $self, $parser ) = @_;
-+    my $formatter = $self->formatter;
-+    return if $formatter->really_quiet;
-+
-+    my $tests_run     = $parser->tests_run;
-+    my $tests_planned = $parser->tests_planned;
-+
-+    my $total
-+      = defined $tests_planned
-+      ? $tests_planned
-+      : $tests_run;
-+
-+    my $passed = $parser->passed;
-+
-+    # The total number of fails includes any tests that were planned but
-+    # didn't run
-+    my $failed = $parser->failed + $total - $tests_run;
-+    my $exit   = $parser->exit;
-+
-+    if ( my $exit = $parser->exit ) {
-+        my $wstat = $parser->wait;
-+        my $status = sprintf( "%d (wstat %d, 0x%x)", $exit, $wstat, $wstat );
-+        $formatter->_failure_output("Dubious, test returned $status\n");
-+    }
-+
-+    if ( $failed == 0 ) {
-+        $formatter->_failure_output(
-+            $total
-+            ? "All $total subtests passed "
-+            : 'No subtests run '
-+        );
-+    }
-+    else {
-+        $formatter->_failure_output("Failed $failed/$total subtests ");
-+        if ( !$total ) {
-+            $formatter->_failure_output("\nNo tests run!");
-+        }
-+    }
-+
-+    if ( my $skipped = $parser->skipped ) {
-+        $passed -= $skipped;
-+        my $test = 'subtest' . ( $skipped != 1 ? 's' : '' );
-+        $formatter->_output(
-+            "\n\t(less $skipped skipped $test: $passed okay)");
-+    }
-+
-+    if ( my $failed = $parser->todo_passed ) {
-+        my $test = $failed > 1 ? 'tests' : 'test';
-+        $formatter->_output(
-+            "\n\t($failed TODO $test unexpectedly succeeded)");
-+    }
-+
-+    $formatter->_output("\n");
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Harness.pm perl-5.10.0/lib/TAP/Harness.pm
---- perl-5.10.0.orig/lib/TAP/Harness.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Harness.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,872 @@
-+package TAP::Harness;
-+
-+use strict;
-+use Carp;
-+
-+use File::Spec;
-+use File::Path;
-+use IO::Handle;
-+
-+use TAP::Base;
-+
-+use vars qw($VERSION @ISA);
-+
-+@ISA = qw(TAP::Base);
-+
-+=head1 NAME
-+
-+TAP::Harness - Run test scripts with statistics
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+$ENV{HARNESS_ACTIVE}  = 1;
-+$ENV{HARNESS_VERSION} = $VERSION;
-+
-+END {
-+
-+    # For VMS.
-+    delete $ENV{HARNESS_ACTIVE};
-+    delete $ENV{HARNESS_VERSION};
-+}
-+
-+=head1 DESCRIPTION
-+
-+This is a simple test harness which allows tests to be run and results
-+automatically aggregated and output to STDOUT.
-+
-+=head1 SYNOPSIS
-+
-+ use TAP::Harness;
-+ my $harness = TAP::Harness->new( \%args );
-+ $harness->runtests(@tests);
-+
-+=cut
-+
-+my %VALIDATION_FOR;
-+my @FORMATTER_ARGS;
-+
-+sub _error {
-+    my $self = shift;
-+    return $self->{error} unless @_;
-+    $self->{error} = shift;
-+}
-+
-+BEGIN {
-+
-+    @FORMATTER_ARGS = qw(
-+      directives verbosity timer failures errors stdout color show_count
-+    );
-+
-+    %VALIDATION_FOR = (
-+        lib => sub {
-+            my ( $self, $libs ) = @_;
-+            $libs = [$libs] unless 'ARRAY' eq ref $libs;
-+
-+            return [ map {"-I$_"} @$libs ];
-+        },
-+        switches          => sub { shift; shift },
-+        exec              => sub { shift; shift },
-+        merge             => sub { shift; shift },
-+        aggregator_class  => sub { shift; shift },
-+        formatter_class   => sub { shift; shift },
-+        multiplexer_class => sub { shift; shift },
-+        parser_class      => sub { shift; shift },
-+        scheduler_class   => sub { shift; shift },
-+        formatter         => sub { shift; shift },
-+        jobs              => sub { shift; shift },
-+        fork              => sub { shift; shift },
-+        test_args         => sub { shift; shift },
-+        ignore_exit       => sub { shift; shift },
-+        rules             => sub { shift; shift },
-+    );
-+
-+    for my $method ( sort keys %VALIDATION_FOR ) {
-+        no strict 'refs';
-+        if ( $method eq 'lib' || $method eq 'switches' ) {
-+            *{$method} = sub {
-+                my $self = shift;
-+                unless (@_) {
-+                    $self->{$method} ||= [];
-+                    return wantarray
-+                      ? @{ $self->{$method} }
-+                      : $self->{$method};
-+                }
-+                $self->_croak("Too many arguments to method '$method'")
-+                  if @_ > 1;
-+                my $args = shift;
-+                $args = [$args] unless ref $args;
-+                $self->{$method} = $args;
-+                return $self;
-+            };
-+        }
-+        else {
-+            *{$method} = sub {
-+                my $self = shift;
-+                return $self->{$method} unless @_;
-+                $self->{$method} = shift;
-+            };
-+        }
-+    }
-+
-+    for my $method (@FORMATTER_ARGS) {
-+        no strict 'refs';
-+        *{$method} = sub {
-+            my $self = shift;
-+            return $self->formatter->$method(@_);
-+        };
-+    }
-+}
-+
-+##############################################################################
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+ my %args = (
-+    verbosity => 1,
-+    lib     => [ 'lib', 'blib/lib' ],
-+ )
-+ my $harness = TAP::Harness->new( \%args );
-+
-+The constructor returns a new C<TAP::Harness> object. It accepts an
-+optional hashref whose allowed keys are:
-+
-+=over 4
-+
-+=item * C<verbosity>
-+
-+Set the verbosity level:
-+
-+     1   verbose        Print individual test results to STDOUT.
-+     0   normal
-+    -1   quiet          Suppress some test output (mostly failures 
-+                        while tests are running).
-+    -2   really quiet   Suppress everything but the tests summary.
-+    -3   silent         Suppress everything.
-+
-+=item * C<timer>
-+
-+Append run time for each test to output. Uses L<Time::HiRes> if
-+available.
-+
-+=item * C<failures>
-+
-+Only show test failures (this is a no-op if C<verbose> is selected).
-+
-+=item * C<show_count>
-+
-+Update the running test count during testing.
-+
-+=item * C<lib>
-+
-+Accepts a scalar value or array ref of scalar values indicating which
-+paths to allowed libraries should be included if Perl tests are
-+executed. Naturally, this only makes sense in the context of tests
-+written in Perl.
-+
-+=item * C<switches>
-+
-+Accepts a scalar value or array ref of scalar values indicating which
-+switches should be included if Perl tests are executed. Naturally, this
-+only makes sense in the context of tests written in Perl.
-+
-+=item * C<test_args>
-+
-+A reference to an C<@INC> style array of arguments to be passed to each
-+test program.
-+
-+=item * C<color>
-+
-+Attempt to produce color output.
-+
-+=item * C<exec>
-+
-+Typically, Perl tests are run through this. However, anything which
-+spits out TAP is fine. You can use this argument to specify the name of
-+the program (and optional switches) to run your tests with:
-+
-+  exec => ['/usr/bin/ruby', '-w']
-+
-+You can also pass a subroutine reference in order to determine and
-+return the proper program to run based on a given test script. The
-+subroutine reference should expect the TAP::Harness object itself as the
-+first argument, and the file name as the second argument. It should
-+return an array reference containing the command to be run and including
-+the test file name. It can also simply return C<undef>, in which case
-+TAP::Harness will fall back on executing the test script in Perl:
-+
-+    exec => sub {
-+        my ( $harness, $test_file ) = @_;
-+
-+        # Let Perl tests run.
-+        return undef if $test_file =~ /[.]t$/;
-+        return [ qw( /usr/bin/ruby -w ), $test_file ]
-+          if $test_file =~ /[.]rb$/;
-+      }
-+
-+=item * C<merge>
-+
-+If C<merge> is true the harness will create parsers that merge STDOUT
-+and STDERR together for any processes they start.
-+
-+=item * C<aggregator_class>
-+
-+The name of the class to use to aggregate test results. The default is
-+L<TAP::Parser::Aggregator>.
-+
-+=item * C<formatter_class>
-+
-+The name of the class to use to format output. The default is
-+L<TAP::Formatter::Console>, or L<TAP::Formatter::File> if the output
-+isn't a TTY.
-+
-+=item * C<multiplexer_class>
-+
-+The name of the class to use to multiplex tests during parallel testing.
-+The default is L<TAP::Parser::Multiplexer>.
-+
-+=item * C<parser_class>
-+
-+The name of the class to use to parse TAP. The default is
-+L<TAP::Parser>.
-+
-+=item * C<scheduler_class>
-+
-+The name of the class to use to schedule test execution. The default is
-+L<TAP::Parser::Scheduler>.
-+
-+=item * C<formatter>
-+
-+If set C<formatter> must be an object that is capable of formatting the
-+TAP output. See L<TAP::Formatter::Console> for an example.
-+
-+=item * C<errors>
-+
-+If parse errors are found in the TAP output, a note of this will be
-+made in the summary report. To see all of the parse errors, set this
-+argument to true:
-+
-+  errors => 1
-+
-+=item * C<directives>
-+
-+If set to a true value, only test results with directives will be
-+displayed. This overrides other settings such as C<verbose> or
-+C<failures>.
-+
-+=item * C<ignore_exit>
-+
-+If set to a true value instruct C<TAP::Parser> to ignore exit and wait
-+status from test scripts.
-+
-+=item * C<jobs>
-+
-+The maximum number of parallel tests to run at any time.  Which tests
-+can be run in parallel is controlled by C<rules>.  The default is to
-+run only one test at a time.
-+
-+=item * C<fork>
-+
-+If true the harness will attempt to fork and run the parser for each
-+test in a separate process. Currently this option requires
-+L<Parallel::Iterator> to be installed.
-+
-+=item * C<rules>
-+
-+A reference to a hash of rules that control which tests may be
-+executed in parallel. This is an experimental feature and the
-+interface may change.
-+
-+    $harness->rules(
-+        {   par => [
-+                { seq => '../ext/DB_File/t/*' },
-+                { seq => '../ext/IO_Compress_Zlib/t/*' },
-+                { seq => '../lib/CPANPLUS/*' },
-+                { seq => '../lib/ExtUtils/t/*' },
-+                '*'
-+            ]
-+        }
-+    );
-+
-+=item * C<stdout>
-+
-+A filehandle for catching standard output.
-+
-+=back
-+
-+Any keys for which the value is C<undef> will be ignored.
-+
-+=cut
-+
-+# new supplied by TAP::Base
-+
-+{
-+    my @legal_callback = qw(
-+      parser_args
-+      made_parser
-+      before_runtests
-+      after_runtests
-+      after_test
-+    );
-+
-+    my %default_class = (
-+        aggregator_class  => 'TAP::Parser::Aggregator',
-+        formatter_class   => 'TAP::Formatter::Console',
-+        multiplexer_class => 'TAP::Parser::Multiplexer',
-+        parser_class      => 'TAP::Parser',
-+        scheduler_class   => 'TAP::Parser::Scheduler',
-+    );
-+
-+    sub _initialize {
-+        my ( $self, $arg_for ) = @_;
-+        $arg_for ||= {};
-+
-+        $self->SUPER::_initialize( $arg_for, \@legal_callback );
-+        my %arg_for = %$arg_for;    # force a shallow copy
-+
-+        for my $name ( sort keys %VALIDATION_FOR ) {
-+            my $property = delete $arg_for{$name};
-+            if ( defined $property ) {
-+                my $validate = $VALIDATION_FOR{$name};
-+
-+                my $value = $self->$validate($property);
-+                if ( $self->_error ) {
-+                    $self->_croak;
-+                }
-+                $self->$name($value);
-+            }
-+        }
-+
-+        $self->jobs(1) unless defined $self->jobs;
-+
-+        local $default_class{formatter_class} = 'TAP::Formatter::File'
-+          unless -t ( $arg_for{stdout} || \*STDOUT );
-+
-+        while ( my ( $attr, $class ) = each %default_class ) {
-+            $self->$attr( $self->$attr() || $class );
-+        }
-+
-+        unless ( $self->formatter ) {
-+
-+            # This is a little bodge to preserve legacy behaviour. It's
-+            # pretty horrible that we know which args are destined for
-+            # the formatter.
-+            my %formatter_args = ( jobs => $self->jobs );
-+            for my $name (@FORMATTER_ARGS) {
-+                if ( defined( my $property = delete $arg_for{$name} ) ) {
-+                    $formatter_args{$name} = $property;
-+                }
-+            }
-+
-+            $self->formatter(
-+                $self->_construct( $self->formatter_class, \%formatter_args )
-+            );
-+        }
-+
-+        if ( my @props = sort keys %arg_for ) {
-+            $self->_croak("Unknown arguments to TAP::Harness::new (@props)");
-+        }
-+
-+        return $self;
-+    }
-+}
-+
-+##############################################################################
-+
-+=head2 Instance Methods
-+
-+=head3 C<runtests>
-+
-+    $harness->runtests(@tests);
-+
-+Accepts and array of C<@tests> to be run. This should generally be the
-+names of test files, but this is not required. Each element in C<@tests>
-+will be passed to C<TAP::Parser::new()> as a C<source>. See
-+L<TAP::Parser> for more information.
-+
-+It is possible to provide aliases that will be displayed in place of the
-+test name by supplying the test as a reference to an array containing
-+C<< [ $test, $alias ] >>:
-+
-+    $harness->runtests( [ 't/foo.t', 'Foo Once' ],
-+                        [ 't/foo.t', 'Foo Twice' ] );
-+
-+Normally it is an error to attempt to run the same test twice. Aliases
-+allow you to overcome this limitation by giving each run of the test a
-+unique name.
-+
-+Tests will be run in the order found.
-+
-+If the environment variable C<PERL_TEST_HARNESS_DUMP_TAP> is defined it
-+should name a directory into which a copy of the raw TAP for each test
-+will be written. TAP is written to files named for each test.
-+Subdirectories will be created as needed.
-+
-+Returns a L<TAP::Parser::Aggregator> containing the test results.
-+
-+=cut
-+
-+sub runtests {
-+    my ( $self, @tests ) = @_;
-+
-+    my $aggregate = $self->_construct( $self->aggregator_class );
-+
-+    $self->_make_callback( 'before_runtests', $aggregate );
-+    $aggregate->start;
-+    $self->aggregate_tests( $aggregate, @tests );
-+    $aggregate->stop;
-+    $self->summary($aggregate);
-+    $self->_make_callback( 'after_runtests', $aggregate );
-+
-+    return $aggregate;
-+}
-+
-+=head3 C<summary>
-+
-+Output the summary for a TAP::Parser::Aggregator.
-+
-+=cut
-+
-+sub summary {
-+    my ( $self, $aggregate ) = @_;
-+    $self->formatter->summary($aggregate);
-+}
-+
-+sub _after_test {
-+    my ( $self, $aggregate, $job, $parser ) = @_;
-+
-+    $self->_make_callback( 'after_test', $job->as_array_ref, $parser );
-+    $aggregate->add( $job->description, $parser );
-+}
-+
-+sub _aggregate_forked {
-+    my ( $self, $aggregate, $scheduler ) = @_;
-+
-+    eval { require Parallel::Iterator };
-+
-+    croak "Parallel::Iterator required for --fork option ($@)"
-+      if $@;
-+
-+    my $iter = Parallel::Iterator::iterate(
-+        { workers => $self->jobs || 0 },
-+        sub {
-+            my $job = shift;
-+
-+            return if $job->is_spinner;
-+
-+            my ( $parser, $session ) = $self->make_parser($job);
-+
-+            while ( defined( my $result = $parser->next ) ) {
-+                $self->_bailout($result) if $result->is_bailout;
-+            }
-+
-+            $self->finish_parser( $parser, $session );
-+
-+            # Can't serialise coderefs...
-+            delete $parser->{_iter};
-+            delete $parser->{_stream};
-+            delete $parser->{_grammar};
-+            return $parser;
-+        },
-+        sub { $scheduler->get_job }
-+    );
-+
-+    while ( my ( $job, $parser ) = $iter->() ) {
-+        next if $job->is_spinner;
-+        $self->_after_test( $aggregate, $job, $parser );
-+        $job->finish;
-+    }
-+
-+    return;
-+}
-+
-+sub _bailout {
-+    my ( $self, $result ) = @_;
-+    my $explanation = $result->explanation;
-+    die "FAILED--Further testing stopped"
-+      . ( $explanation ? ": $explanation\n" : ".\n" );
-+}
-+
-+sub _aggregate_parallel {
-+    my ( $self, $aggregate, $scheduler ) = @_;
-+
-+    my $jobs = $self->jobs;
-+    my $mux  = $self->_construct( $self->multiplexer_class );
-+
-+    RESULT: {
-+
-+        # Keep multiplexer topped up
-+        FILL:
-+        while ( $mux->parsers < $jobs ) {
-+            my $job = $scheduler->get_job;
-+
-+            # If we hit a spinner stop filling and start running.
-+            last FILL if !defined $job || $job->is_spinner;
-+
-+            my ( $parser, $session ) = $self->make_parser($job);
-+            $mux->add( $parser, [ $session, $job ] );
-+        }
-+
-+        if ( my ( $parser, $stash, $result ) = $mux->next ) {
-+            my ( $session, $job ) = @$stash;
-+            if ( defined $result ) {
-+                $session->result($result);
-+                $self->_bailout($result) if $result->is_bailout;
-+            }
-+            else {
-+
-+                # End of parser. Automatically removed from the mux.
-+                $self->finish_parser( $parser, $session );
-+                $self->_after_test( $aggregate, $job, $parser );
-+                $job->finish;
-+            }
-+            redo RESULT;
-+        }
-+    }
-+
-+    return;
-+}
-+
-+sub _aggregate_single {
-+    my ( $self, $aggregate, $scheduler ) = @_;
-+
-+    JOB:
-+    while ( my $job = $scheduler->get_job ) {
-+        next JOB if $job->is_spinner;
-+
-+        my ( $parser, $session ) = $self->make_parser($job);
-+
-+        while ( defined( my $result = $parser->next ) ) {
-+            $session->result($result);
-+            if ( $result->is_bailout ) {
-+
-+                # Keep reading until input is exhausted in the hope
-+                # of allowing any pending diagnostics to show up.
-+                1 while $parser->next;
-+                $self->_bailout($result);
-+            }
-+        }
-+
-+        $self->finish_parser( $parser, $session );
-+        $self->_after_test( $aggregate, $job, $parser );
-+        $job->finish;
-+    }
-+
-+    return;
-+}
-+
-+=head3 C<aggregate_tests>
-+
-+  $harness->aggregate_tests( $aggregate, @tests );
-+
-+Run the named tests and display a summary of result. Tests will be run
-+in the order found. 
-+
-+Test results will be added to the supplied L<TAP::Parser::Aggregator>.
-+C<aggregate_tests> may be called multiple times to run several sets of
-+tests. Multiple C<Test::Harness> instances may be used to pass results
-+to a single aggregator so that different parts of a complex test suite
-+may be run using different C<TAP::Harness> settings. This is useful, for
-+example, in the case where some tests should run in parallel but others
-+are unsuitable for parallel execution.
-+
-+    my $formatter   = TAP::Formatter::Console->new;
-+    my $ser_harness = TAP::Harness->new( { formatter => $formatter } );
-+    my $par_harness = TAP::Harness->new(
-+        {   formatter => $formatter,
-+            jobs      => 9
-+        }
-+    );
-+    my $aggregator = TAP::Parser::Aggregator->new;
-+
-+    $aggregator->start();
-+    $ser_harness->aggregate_tests( $aggregator, @ser_tests );
-+    $par_harness->aggregate_tests( $aggregator, @par_tests );
-+    $aggregator->stop();
-+    $formatter->summary($aggregator);
-+
-+Note that for simpler testing requirements it will often be possible to
-+replace the above code with a single call to C<runtests>.
-+
-+Each elements of the @tests array is either
-+
-+=over
-+
-+=item * the file name of a test script to run
-+
-+=item * a reference to a [ file name, display name ] array
-+
-+=back
-+
-+When you supply a separate display name it becomes possible to run a
-+test more than once; the display name is effectively the alias by which
-+the test is known inside the harness. The harness doesn't care if it
-+runs the same script more than once when each invocation uses a
-+different name.
-+
-+=cut
-+
-+sub aggregate_tests {
-+    my ( $self, $aggregate, @tests ) = @_;
-+
-+    my $jobs      = $self->jobs;
-+    my $scheduler = $self->make_scheduler(@tests);
-+
-+    # #12458
-+    local $ENV{HARNESS_IS_VERBOSE} = 1
-+      if $self->formatter->verbosity > 0;
-+
-+    # Formatter gets only names.
-+    $self->formatter->prepare( map { $_->description } $scheduler->get_all );
-+
-+    if ( $self->jobs > 1 ) {
-+        if ( $self->fork ) {
-+            $self->_aggregate_forked( $aggregate, $scheduler );
-+        }
-+        else {
-+            $self->_aggregate_parallel( $aggregate, $scheduler );
-+        }
-+    }
-+    else {
-+        $self->_aggregate_single( $aggregate, $scheduler );
-+    }
-+
-+    return;
-+}
-+
-+sub _add_descriptions {
-+    my $self = shift;
-+
-+    # Turn unwrapped scalars into anonymous arrays and copy the name as
-+    # the description for tests that have only a name.
-+    return map { @$_ == 1 ? [ $_->[0], $_->[0] ] : $_ }
-+      map { 'ARRAY' eq ref $_ ? $_ : [$_] } @_;
-+}
-+
-+=head3 C<make_scheduler>
-+
-+Called by the harness when it needs to create a
-+L<TAP::Parser::Scheduler>. Override in a subclass to provide an
-+alternative scheduler. C<make_scheduler> is passed the list of tests
-+that was passed to C<aggregate_tests>.
-+
-+=cut
-+
-+sub make_scheduler {
-+    my ( $self, @tests ) = @_;
-+    return $self->_construct(
-+        $self->scheduler_class,
-+        tests => [ $self->_add_descriptions(@tests) ],
-+        rules => $self->rules
-+    );
-+}
-+
-+=head3 C<jobs>
-+
-+Gets or sets the number of concurrent test runs the harness is
-+handling.  By default, this value is 1 -- for parallel testing, this
-+should be set higher.
-+
-+=head3 C<fork>
-+
-+If true the harness will attempt to fork and run the parser for each
-+test in a separate process. Currently this option requires
-+L<Parallel::Iterator> to be installed.
-+
-+=cut
-+
-+##############################################################################
-+
-+=head1 SUBCLASSING
-+
-+C<TAP::Harness> is designed to be (mostly) easy to subclass. If you
-+don't like how a particular feature functions, just override the
-+desired methods.
-+
-+=head2 Methods
-+
-+TODO: This is out of date
-+
-+The following methods are ones you may wish to override if you want to
-+subclass C<TAP::Harness>.
-+
-+=head3 C<summary>
-+
-+  $harness->summary( \%args );
-+
-+C<summary> prints the summary report after all tests are run. The
-+argument is a hashref with the following keys:
-+
-+=over 4
-+
-+=item * C<start>
-+
-+This is created with C<< Benchmark->new >> and it the time the tests
-+started. You can print a useful summary time, if desired, with:
-+
-+    $self->output(
-+        timestr( timediff( Benchmark->new, $start_time ), 'nop' ) );
-+
-+=item * C<tests>
-+
-+This is an array reference of all test names. To get the L<TAP::Parser>
-+object for individual tests:
-+
-+ my $aggregate = $args->{aggregate};
-+ my $tests     = $args->{tests};
-+
-+ for my $name ( @$tests ) {
-+     my ($parser) = $aggregate->parsers($test);
-+     ... do something with $parser
-+ }
-+
-+This is a bit clunky and will be cleaned up in a later release.
-+
-+=back
-+
-+=cut
-+
-+sub _get_parser_args {
-+    my ( $self, $job ) = @_;
-+    my $test_prog = $job->filename;
-+    my %args      = ();
-+    my @switches;
-+    @switches = $self->lib if $self->lib;
-+    push @switches => $self->switches if $self->switches;
-+    $args{switches}    = \@switches;
-+    $args{spool}       = $self->_open_spool($test_prog);
-+    $args{merge}       = $self->merge;
-+    $args{ignore_exit} = $self->ignore_exit;
-+
-+    if ( my $exec = $self->exec ) {
-+        $args{exec}
-+          = ref $exec eq 'CODE'
-+          ? $exec->( $self, $test_prog )
-+          : [ @$exec, $test_prog ];
-+        $args{source} = $test_prog unless $args{exec};
-+    }
-+    else {
-+        $args{source} = $test_prog;
-+    }
-+
-+    if ( defined( my $test_args = $self->test_args ) ) {
-+        $args{test_args} = $test_args;
-+    }
-+
-+    return \%args;
-+}
-+
-+=head3 C<make_parser>
-+
-+Make a new parser and display formatter session. Typically used and/or
-+overridden in subclasses.
-+
-+    my ( $parser, $session ) = $harness->make_parser;
-+
-+=cut
-+
-+sub make_parser {
-+    my ( $self, $job ) = @_;
-+
-+    my $args = $self->_get_parser_args($job);
-+    $self->_make_callback( 'parser_args', $args, $job->as_array_ref );
-+    my $parser = $self->_construct( $self->parser_class, $args );
-+
-+    $self->_make_callback( 'made_parser', $parser, $job->as_array_ref );
-+    my $session = $self->formatter->open_test( $job->description, $parser );
-+
-+    return ( $parser, $session );
-+}
-+
-+=head3 C<finish_parser>
-+
-+Terminate use of a parser. Typically used and/or overridden in
-+subclasses. The parser isn't destroyed as a result of this.
-+
-+=cut
-+
-+sub finish_parser {
-+    my ( $self, $parser, $session ) = @_;
-+
-+    $session->close_test;
-+    $self->_close_spool($parser);
-+
-+    return $parser;
-+}
-+
-+sub _open_spool {
-+    my $self = shift;
-+    my $test = shift;
-+
-+    if ( my $spool_dir = $ENV{PERL_TEST_HARNESS_DUMP_TAP} ) {
-+
-+        my $spool = File::Spec->catfile( $spool_dir, $test );
-+
-+        # Make the directory
-+        my ( $vol, $dir, undef ) = File::Spec->splitpath($spool);
-+        my $path = File::Spec->catpath( $vol, $dir, '' );
-+        eval { mkpath($path) };
-+        $self->_croak($@) if $@;
-+
-+        my $spool_handle = IO::Handle->new;
-+        open( $spool_handle, ">$spool" )
-+          or $self->_croak(" Can't write $spool ( $! ) ");
-+
-+        return $spool_handle;
-+    }
-+
-+    return;
-+}
-+
-+sub _close_spool {
-+    my $self = shift;
-+    my ($parser) = @_;
-+
-+    if ( my $spool_handle = $parser->delete_spool ) {
-+        close($spool_handle)
-+          or $self->_croak(" Error closing TAP spool file( $! ) \n ");
-+    }
-+
-+    return;
-+}
-+
-+sub _croak {
-+    my ( $self, $message ) = @_;
-+    unless ($message) {
-+        $message = $self->_error;
-+    }
-+    $self->SUPER::_croak($message);
-+
-+    return;
-+}
-+
-+=head1 REPLACING
-+
-+If you like the C<prove> utility and L<TAP::Parser> but you want your
-+own harness, all you need to do is write one and provide C<new> and
-+C<runtests> methods. Then you can use the C<prove> utility like so:
-+
-+ prove --harness My::Test::Harness
-+
-+Note that while C<prove> accepts a list of tests (or things to be
-+tested), C<new> has a fairly rich set of arguments. You'll probably want
-+to read over this code carefully to see how all of them are being used.
-+
-+=head1 SEE ALSO
-+
-+L<Test::Harness>
-+
-+=cut
-+
-+1;
-+
-+# vim:ts=4:sw=4:et:sta
-diff -urN perl-5.10.0.orig/lib/TAP/Object.pm perl-5.10.0/lib/TAP/Object.pm
---- perl-5.10.0.orig/lib/TAP/Object.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Object.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,139 @@
-+package TAP::Object;
-+
-+use strict;
-+use vars qw($VERSION);
-+
-+=head1 NAME
-+
-+TAP::Object - Base class that provides common functionality to all C<TAP::*> modules
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+    package TAP::Whatever;
-+
-+    use strict;
-+    use vars qw(@ISA);
-+
-+    use TAP::Object;
-+
-+    @ISA = qw(TAP::Object);
-+
-+    # new() implementation by TAP::Object
-+    sub _initialize {
-+        my ( $self, @args) = @_;
-+        # initialize your object
-+        return $self;
-+    }
-+
-+    # ... later ...
-+    my $obj = TAP::Whatever->new(@args);
-+
-+=head1 DESCRIPTION
-+
-+C<TAP::Object> provides a default constructor and exception model for all
-+C<TAP::*> classes.  Exceptions are raised using L<Carp>.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+Create a new object.  Any arguments passed to C<new> will be passed on to the
-+L</_initialize> method.  Returns a new object.
-+
-+=cut
-+
-+sub new {
-+    my $class = shift;
-+    my $self = bless {}, $class;
-+    return $self->_initialize(@_);
-+}
-+
-+=head2 Instance Methods
-+
-+=head3 C<_initialize>
-+
-+Initializes a new object.  This method is a stub by default, you should override
-+it as appropriate.
-+
-+I<Note:> L</new> expects you to return C<$self> or raise an exception.  See
-+L</_croak>, and L<Carp>.
-+
-+=cut
-+
-+sub _initialize {
-+    return $_[0];
-+}
-+
-+=head3 C<_croak>
-+
-+Raise an exception using C<croak> from L<Carp>, eg:
-+
-+    $self->_croak( 'why me?', 'aaarrgh!' );
-+
-+May also be called as a I<class> method.
-+
-+    $class->_croak( 'this works too' );
-+
-+=cut
-+
-+sub _croak {
-+    my $proto = shift;
-+    require Carp;
-+    Carp::croak(@_);
-+    return;
-+}
-+
-+=head3 C<_construct>
-+
-+Create a new instance of the specified class.
-+
-+=cut
-+
-+sub _construct {
-+    my ( $self, $class, @args ) = @_;
-+
-+    $self->_croak("Bad module name $class")
-+      unless $class =~ /^ \w+ (?: :: \w+ ) *$/x;
-+
-+    unless ( $class->can('new') ) {
-+        local $@;
-+        eval "require $class";
-+        $self->_croak("Can't load $class") if $@;
-+    }
-+
-+    return $class->new(@args);
-+}
-+
-+=head3 C<mk_methods>
-+
-+Create simple getter/setters.
-+
-+ __PACKAGE__->mk_methods(@method_names);
-+
-+=cut
-+
-+sub mk_methods {
-+    my ( $class, @methods ) = @_;
-+    foreach my $method_name (@methods) {
-+        my $method = "${class}::$method_name";
-+        no strict 'refs';
-+        *$method = sub {
-+            my $self = shift;
-+            $self->{$method_name} = shift if @_;
-+            return $self->{$method_name};
-+        };
-+    }
-+}
-+
-+1;
-+
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Aggregator.pm perl-5.10.0/lib/TAP/Parser/Aggregator.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Aggregator.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Aggregator.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,416 @@
-+package TAP::Parser::Aggregator;
-+
-+use strict;
-+use Benchmark;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Object ();
-+
-+@ISA = qw(TAP::Object);
-+
-+=head1 NAME
-+
-+TAP::Parser::Aggregator - Aggregate TAP::Parser results
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+    use TAP::Parser::Aggregator;
-+
-+    my $aggregate = TAP::Parser::Aggregator->new;
-+    $aggregate->add( 't/00-load.t', $load_parser );
-+    $aggregate->add( 't/10-lex.t',  $lex_parser  );
-+
-+    my $summary = <<'END_SUMMARY';
-+    Passed:  %s
-+    Failed:  %s
-+    Unexpectedly succeeded: %s
-+    END_SUMMARY
-+    printf $summary,
-+           scalar $aggregate->passed,
-+           scalar $aggregate->failed,
-+           scalar $aggregate->todo_passed;
-+
-+=head1 DESCRIPTION
-+
-+C<TAP::Parser::Aggregator> collects parser objects and allows
-+reporting/querying their aggregate results.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+ my $aggregate = TAP::Parser::Aggregator->new;
-+
-+Returns a new C<TAP::Parser::Aggregator> object.
-+
-+=cut
-+
-+# new() implementation supplied by TAP::Object
-+
-+my %SUMMARY_METHOD_FOR;
-+
-+BEGIN {    # install summary methods
-+    %SUMMARY_METHOD_FOR = map { $_ => $_ } qw(
-+      failed
-+      parse_errors
-+      passed
-+      skipped
-+      todo
-+      todo_passed
-+      total
-+      wait
-+      exit
-+    );
-+    $SUMMARY_METHOD_FOR{total}   = 'tests_run';
-+    $SUMMARY_METHOD_FOR{planned} = 'tests_planned';
-+
-+    foreach my $method ( keys %SUMMARY_METHOD_FOR ) {
-+        next if 'total' eq $method;
-+        no strict 'refs';
-+        *$method = sub {
-+            my $self = shift;
-+            return wantarray
-+              ? @{ $self->{"descriptions_for_$method"} }
-+              : $self->{$method};
-+        };
-+    }
-+}    # end install summary methods
-+
-+sub _initialize {
-+    my ($self) = @_;
-+    $self->{parser_for}  = {};
-+    $self->{parse_order} = [];
-+    foreach my $summary ( keys %SUMMARY_METHOD_FOR ) {
-+        $self->{$summary} = 0;
-+        next if 'total' eq $summary;
-+        $self->{"descriptions_for_$summary"} = [];
-+    }
-+    return $self;
-+}
-+
-+##############################################################################
-+
-+=head2 Instance Methods
-+
-+=head3 C<add>
-+
-+  $aggregate->add( $description => $parser );
-+
-+The C<$description> is usually a test file name (but only by
-+convention.)  It is used as a unique identifier (see e.g.
-+L<"parsers">.)  Reusing a description is a fatal error.
-+
-+The C<$parser> is a L<TAP::Parser|TAP::Parser> object.
-+
-+=cut
-+
-+sub add {
-+    my ( $self, $description, $parser ) = @_;
-+    if ( exists $self->{parser_for}{$description} ) {
-+        $self->_croak( "You already have a parser for ($description)."
-+              . " Perhaps you have run the same test twice." );
-+    }
-+    push @{ $self->{parse_order} } => $description;
-+    $self->{parser_for}{$description} = $parser;
-+
-+    while ( my ( $summary, $method ) = each %SUMMARY_METHOD_FOR ) {
-+
-+        # Slightly nasty. Instead we should maybe have 'cooked' accessors
-+        # for results that may be masked by the parser.
-+        next
-+          if ( $method eq 'exit' || $method eq 'wait' )
-+          && $parser->ignore_exit;
-+
-+        if ( my $count = $parser->$method() ) {
-+            $self->{$summary} += $count;
-+            push @{ $self->{"descriptions_for_$summary"} } => $description;
-+        }
-+    }
-+
-+    return $self;
-+}
-+
-+##############################################################################
-+
-+=head3 C<parsers>
-+
-+  my $count   = $aggregate->parsers;
-+  my @parsers = $aggregate->parsers;
-+  my @parsers = $aggregate->parsers(@descriptions);
-+
-+In scalar context without arguments, this method returns the number of parsers
-+aggregated.  In list context without arguments, returns the parsers in the
-+order they were added.
-+
-+If C<@descriptions> is given, these correspond to the keys used in each
-+call to the add() method.  Returns an array of the requested parsers (in
-+the requested order) in list context or an array reference in scalar
-+context.
-+
-+Requesting an unknown identifier is a fatal error.
-+
-+=cut
-+
-+sub parsers {
-+    my $self = shift;
-+    return $self->_get_parsers(@_) if @_;
-+    my $descriptions = $self->{parse_order};
-+    my @parsers      = @{ $self->{parser_for} }{@$descriptions};
-+
-+    # Note:  Because of the way context works, we must assign the parsers to
-+    # the @parsers array or else this method does not work as documented.
-+    return @parsers;
-+}
-+
-+sub _get_parsers {
-+    my ( $self, @descriptions ) = @_;
-+    my @parsers;
-+    foreach my $description (@descriptions) {
-+        $self->_croak("A parser for ($description) could not be found")
-+          unless exists $self->{parser_for}{$description};
-+        push @parsers => $self->{parser_for}{$description};
-+    }
-+    return wantarray ? @parsers : \@parsers;
-+}
-+
-+=head3 C<descriptions>
-+
-+Get an array of descriptions in the order in which they were added to
-+the aggregator.
-+
-+=cut
-+
-+sub descriptions { @{ shift->{parse_order} || [] } }
-+
-+=head3 C<start>
-+
-+Call C<start> immediately before adding any results to the aggregator.
-+Among other times it records the start time for the test run.
-+
-+=cut
-+
-+sub start {
-+    my $self = shift;
-+    $self->{start_time} = Benchmark->new;
-+}
-+
-+=head3 C<stop>
-+
-+Call C<stop> immediately after adding all test results to the aggregator.
-+
-+=cut
-+
-+sub stop {
-+    my $self = shift;
-+    $self->{end_time} = Benchmark->new;
-+}
-+
-+=head3 C<elapsed>
-+
-+Elapsed returns a L<Benchmark> object that represents the running time
-+of the aggregated tests. In order for C<elapsed> to be valid you must
-+call C<start> before running the tests and C<stop> immediately
-+afterwards.
-+
-+=cut
-+
-+sub elapsed {
-+    my $self = shift;
-+
-+    require Carp;
-+    Carp::croak
-+      q{Can't call elapsed without first calling start and then stop}
-+      unless defined $self->{start_time} && defined $self->{end_time};
-+    return timediff( $self->{end_time}, $self->{start_time} );
-+}
-+
-+=head3 C<elapsed_timestr>
-+
-+Returns a formatted string representing the runtime returned by
-+C<elapsed()>.  This lets the caller not worry about Benchmark.
-+
-+=cut
-+
-+sub elapsed_timestr {
-+    my $self = shift;
-+
-+    my $elapsed = $self->elapsed;
-+
-+    return timestr($elapsed);
-+}
-+
-+=head3 C<all_passed>
-+
-+Return true if all the tests passed and no parse errors were detected.
-+
-+=cut
-+
-+sub all_passed {
-+    my $self = shift;
-+    return
-+         $self->total
-+      && $self->total == $self->passed
-+      && !$self->has_errors;
-+}
-+
-+=head3 C<get_status>
-+
-+Get a single word describing the status of the aggregated tests.
-+Depending on the outcome of the tests returns 'PASS', 'FAIL' or
-+'NOTESTS'. This token is understood by L<CPAN::Reporter>.
-+
-+=cut
-+
-+sub get_status {
-+    my $self = shift;
-+
-+    my $total  = $self->total;
-+    my $passed = $self->passed;
-+
-+    return
-+        ( $self->has_errors || $total != $passed ) ? 'FAIL'
-+      : $total ? 'PASS'
-+      :          'NOTESTS';
-+}
-+
-+##############################################################################
-+
-+=head2 Summary methods
-+
-+Each of the following methods will return the total number of corresponding
-+tests if called in scalar context.  If called in list context, returns the
-+descriptions of the parsers which contain the corresponding tests (see C<add>
-+for an explanation of description.
-+
-+=over 4
-+
-+=item * failed
-+
-+=item * parse_errors
-+
-+=item * passed
-+
-+=item * planned
-+
-+=item * skipped
-+
-+=item * todo
-+
-+=item * todo_passed
-+
-+=item * wait
-+
-+=item * exit
-+
-+=back
-+
-+For example, to find out how many tests unexpectedly succeeded (TODO tests
-+which passed when they shouldn't):
-+
-+ my $count        = $aggregate->todo_passed;
-+ my @descriptions = $aggregate->todo_passed;
-+
-+Note that C<wait> and C<exit> are the totals of the wait and exit
-+statuses of each of the tests. These values are totalled only to provide
-+a true value if any of them are non-zero.
-+
-+=cut
-+
-+##############################################################################
-+
-+=head3 C<total>
-+
-+  my $tests_run = $aggregate->total;
-+
-+Returns the total number of tests run.
-+
-+=cut
-+
-+sub total { shift->{total} }
-+
-+##############################################################################
-+
-+=head3 C<has_problems>
-+
-+  if ( $parser->has_problems ) {
-+      ...
-+  }
-+
-+Identical to C<has_errors>, but also returns true if any TODO tests
-+unexpectedly succeeded.  This is more akin to "warnings".
-+
-+=cut
-+
-+sub has_problems {
-+    my $self = shift;
-+    return $self->todo_passed
-+      || $self->has_errors;
-+}
-+
-+##############################################################################
-+
-+=head3 C<has_errors>
-+
-+  if ( $parser->has_errors ) {
-+      ...
-+  }
-+
-+Returns true if I<any> of the parsers failed.  This includes:
-+
-+=over 4
-+
-+=item * Failed tests
-+
-+=item * Parse errors
-+
-+=item * Bad exit or wait status
-+
-+=back
-+
-+=cut
-+
-+sub has_errors {
-+    my $self = shift;
-+    return
-+         $self->failed
-+      || $self->parse_errors
-+      || $self->exit
-+      || $self->wait;
-+}
-+
-+##############################################################################
-+
-+=head3 C<todo_failed>
-+
-+  # deprecated in favor of 'todo_passed'.  This method was horribly misnamed.
-+
-+This was a badly misnamed method.  It indicates which TODO tests unexpectedly
-+succeeded.  Will now issue a warning and call C<todo_passed>.
-+
-+=cut
-+
-+sub todo_failed {
-+    warn
-+      '"todo_failed" is deprecated.  Please use "todo_passed".  See the docs.';
-+    goto &todo_passed;
-+}
-+
-+=head1 See Also
-+
-+L<TAP::Parser>
-+
-+L<TAP::Harness>
-+
-+=cut
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Grammar.pm perl-5.10.0/lib/TAP/Parser/Grammar.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Grammar.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Grammar.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,580 @@
-+package TAP::Parser::Grammar;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Object                  ();
-+use TAP::Parser::ResultFactory   ();
-+use TAP::Parser::YAMLish::Reader ();
-+
-+@ISA = qw(TAP::Object);
-+
-+=head1 NAME
-+
-+TAP::Parser::Grammar - A grammar for the Test Anything Protocol.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+  use TAP::Parser::Grammar;
-+  my $grammar = $self->make_grammar({
-+    stream  => $tap_parser_stream,
-+    parser  => $tap_parser,
-+    version => 12,
-+  });
-+
-+  my $result = $grammar->tokenize;
-+
-+=head1 DESCRIPTION
-+
-+C<TAP::Parser::Grammar> tokenizes lines from a TAP stream and constructs
-+L<TAP::Parser::Result> subclasses to represent the tokens.
-+
-+Do not attempt to use this class directly.  It won't make sense.  It's mainly
-+here to ensure that we will be able to have pluggable grammars when TAP is
-+expanded at some future date (plus, this stuff was really cluttering the
-+parser).
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+  my $grammar = TAP::Parser::Grammar->new({
-+      stream  => $stream,
-+      parser  => $parser,
-+      version => $version,
-+  });
-+
-+Returns L<TAP::Parser> grammar object that will parse the specified stream.
-+Both C<stream> and C<parser> are required arguments.  If C<version> is not set
-+it defaults to C<12> (see L</set_version> for more details).
-+
-+=cut
-+
-+# new() implementation supplied by TAP::Object
-+sub _initialize {
-+    my ( $self, $args ) = @_;
-+    $self->{stream} = $args->{stream};    # TODO: accessor
-+    $self->{parser} = $args->{parser};    # TODO: accessor
-+    $self->set_version( $args->{version} || 12 );
-+    return $self;
-+}
-+
-+my %language_for;
-+
-+{
-+
-+    # XXX the 'not' and 'ok' might be on separate lines in VMS ...
-+    my $ok  = qr/(?:not )?ok\b/;
-+    my $num = qr/\d+/;
-+
-+    my %v12 = (
-+        version => {
-+            syntax  => qr/^TAP\s+version\s+(\d+)\s*\z/i,
-+            handler => sub {
-+                my ( $self, $line ) = @_;
-+                my $version = $1;
-+                return $self->_make_version_token( $line, $version, );
-+            },
-+        },
-+        plan => {
-+            syntax  => qr/^1\.\.(\d+)\s*(.*)\z/,
-+            handler => sub {
-+                my ( $self, $line ) = @_;
-+                my ( $tests_planned, $tail ) = ( $1, $2 );
-+                my $explanation = undef;
-+                my $skip        = '';
-+
-+                if ( $tail =~ /^todo((?:\s+\d+)+)/ ) {
-+                    my @todo = split /\s+/, _trim($1);
-+                    return $self->_make_plan_token(
-+                        $line, $tests_planned, 'TODO',
-+                        '',    \@todo
-+                    );
-+                }
-+                elsif ( 0 == $tests_planned ) {
-+                    $skip = 'SKIP';
-+
-+                    # If we can't match # SKIP the directive should be undef.
-+                    ($explanation) = $tail =~ /^#\s*SKIP\s+(.*)/i;
-+                }
-+                elsif ( $tail !~ /^\s*$/ ) {
-+                    return $self->_make_unknown_token($line);
-+                }
-+
-+                $explanation = '' unless defined $explanation;
-+
-+                return $self->_make_plan_token(
-+                    $line, $tests_planned, $skip,
-+                    $explanation, []
-+                );
-+
-+            },
-+        },
-+
-+        # An optimization to handle the most common test lines without
-+        # directives.
-+        simple_test => {
-+            syntax  => qr/^($ok) \ ($num) (?:\ ([^#]+))? \z/x,
-+            handler => sub {
-+                my ( $self, $line ) = @_;
-+                my ( $ok, $num, $desc ) = ( $1, $2, $3 );
-+
-+                return $self->_make_test_token(
-+                    $line, $ok, $num,
-+                    $desc
-+                );
-+            },
-+        },
-+        test => {
-+            syntax  => qr/^($ok) \s* ($num)? \s* (.*) \z/x,
-+            handler => sub {
-+                my ( $self, $line ) = @_;
-+                my ( $ok, $num, $desc ) = ( $1, $2, $3 );
-+                my ( $dir, $explanation ) = ( '', '' );
-+                if ($desc =~ m/^ ( [^\\\#]* (?: \\. [^\\\#]* )* )
-+                       \# \s* (SKIP|TODO) \b \s* (.*) $/ix
-+                  )
-+                {
-+                    ( $desc, $dir, $explanation ) = ( $1, $2, $3 );
-+                }
-+                return $self->_make_test_token(
-+                    $line, $ok, $num, $desc,
-+                    $dir,  $explanation
-+                );
-+            },
-+        },
-+        comment => {
-+            syntax  => qr/^#(.*)/,
-+            handler => sub {
-+                my ( $self, $line ) = @_;
-+                my $comment = $1;
-+                return $self->_make_comment_token( $line, $comment );
-+            },
-+        },
-+        bailout => {
-+            syntax  => qr/^Bail out!\s*(.*)/,
-+            handler => sub {
-+                my ( $self, $line ) = @_;
-+                my $explanation = $1;
-+                return $self->_make_bailout_token(
-+                    $line,
-+                    $explanation
-+                );
-+            },
-+        },
-+    );
-+
-+    my %v13 = (
-+        %v12,
-+        plan => {
-+            syntax  => qr/^1\.\.(\d+)(?:\s*#\s*SKIP\b(.*))?\z/i,
-+            handler => sub {
-+                my ( $self, $line ) = @_;
-+                my ( $tests_planned, $explanation ) = ( $1, $2 );
-+                my $skip
-+                  = ( 0 == $tests_planned || defined $explanation )
-+                  ? 'SKIP'
-+                  : '';
-+                $explanation = '' unless defined $explanation;
-+                return $self->_make_plan_token(
-+                    $line, $tests_planned, $skip,
-+                    $explanation, []
-+                );
-+            },
-+        },
-+        yaml => {
-+            syntax  => qr/^ (\s+) (---.*) $/x,
-+            handler => sub {
-+                my ( $self, $line ) = @_;
-+                my ( $pad, $marker ) = ( $1, $2 );
-+                return $self->_make_yaml_token( $pad, $marker );
-+            },
-+        },
-+        pragma => {
-+            syntax =>
-+              qr/^ pragma \s+ ( [-+] \w+ \s* (?: , \s* [-+] \w+ \s* )* ) $/x,
-+            handler => sub {
-+                my ( $self, $line ) = @_;
-+                my $pragmas = $1;
-+                return $self->_make_pragma_token( $line, $pragmas );
-+            },
-+        },
-+    );
-+
-+    %language_for = (
-+        '12' => {
-+            tokens => \%v12,
-+        },
-+        '13' => {
-+            tokens => \%v13,
-+            setup  => sub {
-+                shift->{stream}->handle_unicode;
-+            },
-+        },
-+    );
-+}
-+
-+##############################################################################
-+
-+=head2 Instance Methods
-+
-+=head3 C<set_version>
-+
-+  $grammar->set_version(13);
-+
-+Tell the grammar which TAP syntax version to support. The lowest
-+supported version is 12. Although 'TAP version' isn't valid version 12
-+syntax it is accepted so that higher version numbers may be parsed.
-+
-+=cut
-+
-+sub set_version {
-+    my $self    = shift;
-+    my $version = shift;
-+
-+    if ( my $language = $language_for{$version} ) {
-+        $self->{version} = $version;
-+        $self->{tokens}  = $language->{tokens};
-+
-+        if ( my $setup = $language->{setup} ) {
-+            $self->$setup();
-+        }
-+
-+        $self->_order_tokens;
-+    }
-+    else {
-+        require Carp;
-+        Carp::croak("Unsupported syntax version: $version");
-+    }
-+}
-+
-+# Optimization to put the most frequent tokens first.
-+sub _order_tokens {
-+    my $self = shift;
-+
-+    my %copy = %{ $self->{tokens} };
-+    my @ordered_tokens = grep {defined}
-+      map { delete $copy{$_} } qw( simple_test test comment plan );
-+    push @ordered_tokens, values %copy;
-+
-+    $self->{ordered_tokens} = \@ordered_tokens;
-+}
-+
-+##############################################################################
-+
-+=head3 C<tokenize>
-+
-+  my $token = $grammar->tokenize;
-+
-+This method will return a L<TAP::Parser::Result> object representing the
-+current line of TAP.
-+
-+=cut
-+
-+sub tokenize {
-+    my $self = shift;
-+
-+    my $line = $self->{stream}->next;
-+    unless ( defined $line ) {
-+        delete $self->{parser};    # break circular ref
-+        return;
-+    }
-+
-+    my $token;
-+
-+    foreach my $token_data ( @{ $self->{ordered_tokens} } ) {
-+        if ( $line =~ $token_data->{syntax} ) {
-+            my $handler = $token_data->{handler};
-+            $token = $self->$handler($line);
-+            last;
-+        }
-+    }
-+
-+    $token = $self->_make_unknown_token($line) unless $token;
-+
-+    return $self->{parser}->make_result($token);
-+}
-+
-+##############################################################################
-+
-+=head3 C<token_types>
-+
-+  my @types = $grammar->token_types;
-+
-+Returns the different types of tokens which this grammar can parse.
-+
-+=cut
-+
-+sub token_types {
-+    my $self = shift;
-+    return keys %{ $self->{tokens} };
-+}
-+
-+##############################################################################
-+
-+=head3 C<syntax_for>
-+
-+  my $syntax = $grammar->syntax_for($token_type);
-+
-+Returns a pre-compiled regular expression which will match a chunk of TAP
-+corresponding to the token type.  For example (not that you should really pay
-+attention to this, C<< $grammar->syntax_for('comment') >> will return
-+C<< qr/^#(.*)/ >>.
-+
-+=cut
-+
-+sub syntax_for {
-+    my ( $self, $type ) = @_;
-+    return $self->{tokens}->{$type}->{syntax};
-+}
-+
-+##############################################################################
-+
-+=head3 C<handler_for>
-+
-+  my $handler = $grammar->handler_for($token_type);
-+
-+Returns a code reference which, when passed an appropriate line of TAP,
-+returns the lexed token corresponding to that line.  As a result, the basic
-+TAP parsing loop looks similar to the following:
-+
-+ my @tokens;
-+ my $grammar = TAP::Grammar->new;
-+ LINE: while ( defined( my $line = $parser->_next_chunk_of_tap ) ) {
-+     foreach my $type ( $grammar->token_types ) {
-+         my $syntax  = $grammar->syntax_for($type);
-+         if ( $line =~ $syntax ) {
-+             my $handler = $grammar->handler_for($type);
-+             push @tokens => $grammar->$handler($line);
-+             next LINE;
-+         }
-+     }
-+     push @tokens => $grammar->_make_unknown_token($line);
-+ }
-+
-+=cut
-+
-+sub handler_for {
-+    my ( $self, $type ) = @_;
-+    return $self->{tokens}->{$type}->{handler};
-+}
-+
-+sub _make_version_token {
-+    my ( $self, $line, $version ) = @_;
-+    return {
-+        type    => 'version',
-+        raw     => $line,
-+        version => $version,
-+    };
-+}
-+
-+sub _make_plan_token {
-+    my ( $self, $line, $tests_planned, $directive, $explanation, $todo ) = @_;
-+
-+    if (   $directive eq 'SKIP'
-+        && 0 != $tests_planned
-+        && $self->{version} < 13 )
-+    {
-+        warn
-+          "Specified SKIP directive in plan but more than 0 tests ($line)\n";
-+    }
-+
-+    return {
-+        type          => 'plan',
-+        raw           => $line,
-+        tests_planned => $tests_planned,
-+        directive     => $directive,
-+        explanation   => _trim($explanation),
-+        todo_list     => $todo,
-+    };
-+}
-+
-+sub _make_test_token {
-+    my ( $self, $line, $ok, $num, $desc, $dir, $explanation ) = @_;
-+    return {
-+        ok          => $ok,
-+        test_num    => $num,
-+        description => _trim($desc),
-+        directive   => ( defined $dir ? uc $dir : '' ),
-+        explanation => _trim($explanation),
-+        raw         => $line,
-+        type        => 'test',
-+    };
-+}
-+
-+sub _make_unknown_token {
-+    my ( $self, $line ) = @_;
-+    return {
-+        raw  => $line,
-+        type => 'unknown',
-+    };
-+}
-+
-+sub _make_comment_token {
-+    my ( $self, $line, $comment ) = @_;
-+    return {
-+        type    => 'comment',
-+        raw     => $line,
-+        comment => _trim($comment)
-+    };
-+}
-+
-+sub _make_bailout_token {
-+    my ( $self, $line, $explanation ) = @_;
-+    return {
-+        type    => 'bailout',
-+        raw     => $line,
-+        bailout => _trim($explanation)
-+    };
-+}
-+
-+sub _make_yaml_token {
-+    my ( $self, $pad, $marker ) = @_;
-+
-+    my $yaml = TAP::Parser::YAMLish::Reader->new;
-+
-+    my $stream = $self->{stream};
-+
-+    # Construct a reader that reads from our input stripping leading
-+    # spaces from each line.
-+    my $leader = length($pad);
-+    my $strip  = qr{ ^ (\s{$leader}) (.*) $ }x;
-+    my @extra  = ($marker);
-+    my $reader = sub {
-+        return shift @extra if @extra;
-+        my $line = $stream->next;
-+        return $2 if $line =~ $strip;
-+        return;
-+    };
-+
-+    my $data = $yaml->read($reader);
-+
-+    # Reconstitute input. This is convoluted. Maybe we should just
-+    # record it on the way in...
-+    chomp( my $raw = $yaml->get_raw );
-+    $raw =~ s/^/$pad/mg;
-+
-+    return {
-+        type => 'yaml',
-+        raw  => $raw,
-+        data => $data
-+    };
-+}
-+
-+sub _make_pragma_token {
-+    my ( $self, $line, $pragmas ) = @_;
-+    return {
-+        type    => 'pragma',
-+        raw     => $line,
-+        pragmas => [ split /\s*,\s*/, _trim($pragmas) ],
-+    };
-+}
-+
-+sub _trim {
-+    my $data = shift;
-+
-+    return '' unless defined $data;
-+
-+    $data =~ s/^\s+//;
-+    $data =~ s/\s+$//;
-+    return $data;
-+}
-+
-+1;
-+
-+=head1 TAP GRAMMAR
-+
-+B<NOTE:>  This grammar is slightly out of date.  There's still some discussion
-+about it and a new one will be provided when we have things better defined.
-+
-+The L<TAP::Parser> does not use a formal grammar because TAP is essentially a
-+stream-based protocol.  In fact, it's quite legal to have an infinite stream.
-+For the same reason that we don't apply regexes to streams, we're not using a
-+formal grammar here.  Instead, we parse the TAP in lines.
-+
-+For purposes for forward compatability, any result which does not match the
-+following grammar is currently referred to as
-+L<TAP::Parser::Result::Unknown>.  It is I<not> a parse error.
-+
-+A formal grammar would look similar to the following:
-+
-+ (*
-+     For the time being, I'm cheating on the EBNF by allowing
-+     certain terms to be defined by POSIX character classes by
-+     using the following syntax:
-+
-+       digit ::= [:digit:]
-+
-+     As far as I am aware, that's not valid EBNF.  Sue me.  I
-+     didn't know how to write "char" otherwise (Unicode issues).
-+     Suggestions welcome.
-+ *)
-+
-+ tap            ::= version? { comment | unknown } leading_plan lines
-+                    |
-+                    lines trailing_plan {comment}
-+
-+ version        ::= 'TAP version ' positiveInteger {positiveInteger} "\n"
-+
-+ leading_plan   ::= plan skip_directive? "\n"
-+
-+ trailing_plan  ::= plan "\n"
-+
-+ plan           ::= '1..' nonNegativeInteger
-+
-+ lines          ::= line {line}
-+
-+ line           ::= (comment | test | unknown | bailout ) "\n"
-+
-+ test           ::= status positiveInteger? description? directive?
-+
-+ status         ::= 'not '? 'ok '
-+
-+ description    ::= (character - (digit | '#')) {character - '#'}
-+
-+ directive      ::= todo_directive | skip_directive
-+
-+ todo_directive ::= hash_mark 'TODO' ' ' {character}
-+
-+ skip_directive ::= hash_mark 'SKIP' ' ' {character}
-+
-+ comment        ::= hash_mark {character}
-+
-+ hash_mark      ::= '#' {' '}
-+
-+ bailout        ::= 'Bail out!' {character}
-+
-+ unknown        ::= { (character - "\n") }
-+
-+ (* POSIX character classes and other terminals *)
-+
-+ digit              ::= [:digit:]
-+ character          ::= ([:print:] - "\n")
-+ positiveInteger    ::= ( digit - '0' ) {digit}
-+ nonNegativeInteger ::= digit {digit}
-+
-+=head1 SUBCLASSING
-+
-+Please see L<TAP::Parser/SUBCLASSING> for a subclassing overview.
-+
-+If you I<really> want to subclass L<TAP::Parser>'s grammar the best thing to
-+do is read through the code.  There's no easy way of summarizing it here.
-+
-+=head1 SEE ALSO
-+
-+L<TAP::Object>,
-+L<TAP::Parser>,
-+L<TAP::Parser::Iterator>,
-+L<TAP::Parser::Result>,
-+
-+=cut
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Iterator/Array.pm perl-5.10.0/lib/TAP/Parser/Iterator/Array.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Iterator/Array.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Iterator/Array.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,106 @@
-+package TAP::Parser::Iterator::Array;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Parser::Iterator ();
-+
-+@ISA = 'TAP::Parser::Iterator';
-+
-+=head1 NAME
-+
-+TAP::Parser::Iterator::Array - Internal TAP::Parser array Iterator
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+  # see TAP::Parser::IteratorFactory for preferred usage
-+
-+  # to use directly:
-+  use TAP::Parser::Iterator::Array;
-+  my @data = ('foo', 'bar', baz');
-+  my $it   = TAP::Parser::Iterator::Array->new(\@data);
-+  my $line = $it->next;
-+
-+=head1 DESCRIPTION
-+
-+This is a simple iterator wrapper for arrays of scalar content, used by
-+L<TAP::Parser>.  Unless you're subclassing, you probably won't need to use
-+this module directly.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+Create an iterator.  Takes one argument: an C<$array_ref>
-+
-+=head2 Instance Methods
-+
-+=head3 C<next>
-+
-+Iterate through it, of course.
-+
-+=head3 C<next_raw>
-+
-+Iterate raw input without applying any fixes for quirky input syntax.
-+
-+=head3 C<wait>
-+
-+Get the wait status for this iterator. For an array iterator this will always
-+be zero.
-+
-+=head3 C<exit>
-+
-+Get the exit status for this iterator. For an array iterator this will always
-+be zero.
-+
-+=cut
-+
-+# new() implementation supplied by TAP::Object
-+
-+sub _initialize {
-+    my ( $self, $thing ) = @_;
-+    chomp @$thing;
-+    $self->{idx}   = 0;
-+    $self->{array} = $thing;
-+    $self->{exit}  = undef;
-+    return $self;
-+}
-+
-+sub wait { shift->exit }
-+
-+sub exit {
-+    my $self = shift;
-+    return 0 if $self->{idx} >= @{ $self->{array} };
-+    return;
-+}
-+
-+sub next_raw {
-+    my $self = shift;
-+    return $self->{array}->[ $self->{idx}++ ];
-+}
-+
-+1;
-+
-+=head1 ATTRIBUTION
-+
-+Originally ripped off from L<Test::Harness>.
-+
-+=head1 SEE ALSO
-+
-+L<TAP::Object>,
-+L<TAP::Parser>,
-+L<TAP::Parser::Iterator>,
-+L<TAP::Parser::IteratorFactory>,
-+
-+=cut
-+
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Iterator/Process.pm perl-5.10.0/lib/TAP/Parser/Iterator/Process.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Iterator/Process.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Iterator/Process.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,377 @@
-+package TAP::Parser::Iterator::Process;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Parser::Iterator ();
-+use Config;
-+use IO::Handle;
-+
-+@ISA = 'TAP::Parser::Iterator';
-+
-+my $IS_WIN32 = ( $^O =~ /^(MS)?Win32$/ );
-+
-+=head1 NAME
-+
-+TAP::Parser::Iterator::Process - Internal TAP::Parser Iterator
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+  # see TAP::Parser::IteratorFactory for preferred usage
-+
-+  # to use directly:
-+  use TAP::Parser::Iterator::Process;
-+  my %args = (
-+   command  => ['python', 'setup.py', 'test'],
-+   merge    => 1,
-+   setup    => sub { ... },
-+   teardown => sub { ... },
-+  );
-+  my $it   = TAP::Parser::Iterator::Process->new(\%args);
-+  my $line = $it->next;
-+
-+=head1 DESCRIPTION
-+
-+This is a simple iterator wrapper for executing external processes, used by
-+L<TAP::Parser>.  Unless you're subclassing, you probably won't need to use
-+this module directly.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+Create an iterator.  Expects one argument containing a hashref of the form:
-+
-+   command  => \@command_to_execute
-+   merge    => $attempt_merge_stderr_and_stdout?
-+   setup    => $callback_to_setup_command
-+   teardown => $callback_to_teardown_command
-+
-+Tries to uses L<IPC::Open3> & L<IO::Select> to communicate with the spawned
-+process if they are available.  Falls back onto C<open()>.
-+
-+=head2 Instance Methods
-+
-+=head3 C<next>
-+
-+Iterate through the process output, of course.
-+
-+=head3 C<next_raw>
-+
-+Iterate raw input without applying any fixes for quirky input syntax.
-+
-+=head3 C<wait>
-+
-+Get the wait status for this iterator's process.
-+
-+=head3 C<exit>
-+
-+Get the exit status for this iterator's process.
-+
-+=cut
-+
-+eval { require POSIX; &POSIX::WEXITSTATUS(0) };
-+if ($@) {
-+    *_wait2exit = sub { $_[1] >> 8 };
-+}
-+else {
-+    *_wait2exit = sub { POSIX::WEXITSTATUS( $_[1] ) }
-+}
-+
-+sub _use_open3 {
-+    my $self = shift;
-+    return unless $Config{d_fork} || $IS_WIN32;
-+    for my $module (qw( IPC::Open3 IO::Select )) {
-+        eval "use $module";
-+        return if $@;
-+    }
-+    return 1;
-+}
-+
-+{
-+    my $got_unicode;
-+
-+    sub _get_unicode {
-+        return $got_unicode if defined $got_unicode;
-+        eval 'use Encode qw(decode_utf8);';
-+        $got_unicode = $@ ? 0 : 1;
-+
-+    }
-+}
-+
-+# new() implementation supplied by TAP::Object
-+
-+sub _initialize {
-+    my ( $self, $args ) = @_;
-+
-+    my @command = @{ delete $args->{command} || [] }
-+      or die "Must supply a command to execute";
-+
-+    # Private. Used to frig with chunk size during testing.
-+    my $chunk_size = delete $args->{_chunk_size} || 65536;
-+
-+    my $merge = delete $args->{merge};
-+    my ( $pid, $err, $sel );
-+
-+    if ( my $setup = delete $args->{setup} ) {
-+        $setup->(@command);
-+    }
-+
-+    my $out = IO::Handle->new;
-+
-+    if ( $self->_use_open3 ) {
-+
-+        # HOTPATCH {{{
-+        my $xclose = \&IPC::Open3::xclose;
-+        local $^W;    # no warnings
-+        local *IPC::Open3::xclose = sub {
-+            my $fh = shift;
-+            no strict 'refs';
-+            return if ( fileno($fh) == fileno(STDIN) );
-+            $xclose->($fh);
-+        };
-+
-+        # }}}
-+
-+        if ($IS_WIN32) {
-+            $err = $merge ? '' : '>&STDERR';
-+            eval {
-+                $pid = open3(
-+                    '<&STDIN', $out, $merge ? '' : $err,
-+                    @command
-+                );
-+            };
-+            die "Could not execute (@command): $@" if $@;
-+            if ( $] >= 5.006 ) {
-+
-+                # Kludge to avoid warning under 5.5
-+                eval 'binmode($out, ":crlf")';
-+            }
-+        }
-+        else {
-+            $err = $merge ? '' : IO::Handle->new;
-+            eval { $pid = open3( '<&STDIN', $out, $err, @command ); };
-+            die "Could not execute (@command): $@" if $@;
-+            $sel = $merge ? undef : IO::Select->new( $out, $err );
-+        }
-+    }
-+    else {
-+        $err = '';
-+        my $command
-+          = join( ' ', map { $_ =~ /\s/ ? qq{"$_"} : $_ } @command );
-+        open( $out, "$command|" )
-+          or die "Could not execute ($command): $!";
-+    }
-+
-+    $self->{out}        = $out;
-+    $self->{err}        = $err;
-+    $self->{sel}        = $sel;
-+    $self->{pid}        = $pid;
-+    $self->{exit}       = undef;
-+    $self->{chunk_size} = $chunk_size;
-+
-+    if ( my $teardown = delete $args->{teardown} ) {
-+        $self->{teardown} = sub {
-+            $teardown->(@command);
-+        };
-+    }
-+
-+    return $self;
-+}
-+
-+=head3 C<handle_unicode>
-+
-+Upgrade the input stream to handle UTF8.
-+
-+=cut
-+
-+sub handle_unicode {
-+    my $self = shift;
-+
-+    if ( $self->{sel} ) {
-+        if ( _get_unicode() ) {
-+
-+            # Make sure our iterator has been constructed and...
-+            my $next = $self->{_next} ||= $self->_next;
-+
-+            # ...wrap it to do UTF8 casting
-+            $self->{_next} = sub {
-+                my $line = $next->();
-+                return decode_utf8($line) if defined $line;
-+                return;
-+            };
-+        }
-+    }
-+    else {
-+        if ( $] >= 5.008 ) {
-+            eval 'binmode($self->{out}, ":utf8")';
-+        }
-+    }
-+
-+}
-+
-+##############################################################################
-+
-+sub wait { shift->{wait} }
-+sub exit { shift->{exit} }
-+
-+sub _next {
-+    my $self = shift;
-+
-+    if ( my $out = $self->{out} ) {
-+        if ( my $sel = $self->{sel} ) {
-+            my $err        = $self->{err};
-+            my @buf        = ();
-+            my $partial    = '';                    # Partial line
-+            my $chunk_size = $self->{chunk_size};
-+            return sub {
-+                return shift @buf if @buf;
-+
-+                READ:
-+                while ( my @ready = $sel->can_read ) {
-+                    for my $fh (@ready) {
-+                        my $got = sysread $fh, my ($chunk), $chunk_size;
-+
-+                        if ( $got == 0 ) {
-+                            $sel->remove($fh);
-+                        }
-+                        elsif ( $fh == $err ) {
-+                            print STDERR $chunk;    # echo STDERR
-+                        }
-+                        else {
-+                            $chunk   = $partial . $chunk;
-+                            $partial = '';
-+
-+                            # Make sure we have a complete line
-+                            unless ( substr( $chunk, -1, 1 ) eq "\n" ) {
-+                                my $nl = rindex $chunk, "\n";
-+                                if ( $nl == -1 ) {
-+                                    $partial = $chunk;
-+                                    redo READ;
-+                                }
-+                                else {
-+                                    $partial = substr( $chunk, $nl + 1 );
-+                                    $chunk = substr( $chunk, 0, $nl );
-+                                }
-+                            }
-+
-+                            push @buf, split /\n/, $chunk;
-+                            return shift @buf if @buf;
-+                        }
-+                    }
-+                }
-+
-+                # Return partial last line
-+                if ( length $partial ) {
-+                    my $last = $partial;
-+                    $partial = '';
-+                    return $last;
-+                }
-+
-+                $self->_finish;
-+                return;
-+            };
-+        }
-+        else {
-+            return sub {
-+                if ( defined( my $line = <$out> ) ) {
-+                    chomp $line;
-+                    return $line;
-+                }
-+                $self->_finish;
-+                return;
-+            };
-+        }
-+    }
-+    else {
-+        return sub {
-+            $self->_finish;
-+            return;
-+        };
-+    }
-+}
-+
-+sub next_raw {
-+    my $self = shift;
-+    return ( $self->{_next} ||= $self->_next )->();
-+}
-+
-+sub _finish {
-+    my $self = shift;
-+
-+    my $status = $?;
-+
-+    # Avoid circular refs
-+    $self->{_next} = sub {return}
-+      if $] >= 5.006;
-+
-+    # If we have a subprocess we need to wait for it to terminate
-+    if ( defined $self->{pid} ) {
-+        if ( $self->{pid} == waitpid( $self->{pid}, 0 ) ) {
-+            $status = $?;
-+        }
-+    }
-+
-+    ( delete $self->{out} )->close if $self->{out};
-+
-+    # If we have an IO::Select we also have an error handle to close.
-+    if ( $self->{sel} ) {
-+        ( delete $self->{err} )->close;
-+        delete $self->{sel};
-+    }
-+    else {
-+        $status = $?;
-+    }
-+
-+    # Sometimes we get -1 on Windows. Presumably that means status not
-+    # available.
-+    $status = 0 if $IS_WIN32 && $status == -1;
-+
-+    $self->{wait} = $status;
-+    $self->{exit} = $self->_wait2exit($status);
-+
-+    if ( my $teardown = $self->{teardown} ) {
-+        $teardown->();
-+    }
-+
-+    return $self;
-+}
-+
-+=head3 C<get_select_handles>
-+
-+Return a list of filehandles that may be used upstream in a select()
-+call to signal that this Iterator is ready. Iterators that are not
-+handle based should return an empty list.
-+
-+=cut
-+
-+sub get_select_handles {
-+    my $self = shift;
-+    return grep $_, ( $self->{out}, $self->{err} );
-+}
-+
-+1;
-+
-+=head1 ATTRIBUTION
-+
-+Originally ripped off from L<Test::Harness>.
-+
-+=head1 SEE ALSO
-+
-+L<TAP::Object>,
-+L<TAP::Parser>,
-+L<TAP::Parser::Iterator>,
-+L<TAP::Parser::IteratorFactory>,
-+
-+=cut
-+
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Iterator/Stream.pm perl-5.10.0/lib/TAP/Parser/Iterator/Stream.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Iterator/Stream.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Iterator/Stream.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,112 @@
-+package TAP::Parser::Iterator::Stream;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Parser::Iterator ();
-+
-+@ISA = 'TAP::Parser::Iterator';
-+
-+=head1 NAME
-+
-+TAP::Parser::Iterator::Stream - Internal TAP::Parser Iterator
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+  # see TAP::Parser::IteratorFactory for preferred usage
-+
-+  # to use directly:
-+  use TAP::Parser::Iterator::Stream;
-+  open( TEST, 'test.tap' );
-+  my $it   = TAP::Parser::Iterator::Stream->new(\*TEST);
-+  my $line = $it->next;
-+
-+=head1 DESCRIPTION
-+
-+This is a simple iterator wrapper for reading from filehandles, used by
-+L<TAP::Parser>.  Unless you're subclassing, you probably won't need to use
-+this module directly.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+Create an iterator.  Expects one argument containing a filehandle.
-+
-+=cut
-+
-+# new() implementation supplied by TAP::Object
-+
-+sub _initialize {
-+    my ( $self, $thing ) = @_;
-+    $self->{fh} = $thing;
-+    return $self;
-+}
-+
-+=head2 Instance Methods
-+
-+=head3 C<next>
-+
-+Iterate through it, of course.
-+
-+=head3 C<next_raw>
-+
-+Iterate raw input without applying any fixes for quirky input syntax.
-+
-+=head3 C<wait>
-+
-+Get the wait status for this iterator. Always returns zero.
-+
-+=head3 C<exit>
-+
-+Get the exit status for this iterator. Always returns zero.
-+
-+=cut
-+
-+sub wait { shift->exit }
-+sub exit { shift->{fh} ? () : 0 }
-+
-+sub next_raw {
-+    my $self = shift;
-+    my $fh   = $self->{fh};
-+
-+    if ( defined( my $line = <$fh> ) ) {
-+        chomp $line;
-+        return $line;
-+    }
-+    else {
-+        $self->_finish;
-+        return;
-+    }
-+}
-+
-+sub _finish {
-+    my $self = shift;
-+    close delete $self->{fh};
-+}
-+
-+1;
-+
-+=head1 ATTRIBUTION
-+
-+Originally ripped off from L<Test::Harness>.
-+
-+=head1 SEE ALSO
-+
-+L<TAP::Object>,
-+L<TAP::Parser>,
-+L<TAP::Parser::Iterator>,
-+L<TAP::Parser::IteratorFactory>,
-+
-+=cut
-+
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Iterator.pm perl-5.10.0/lib/TAP/Parser/Iterator.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Iterator.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Iterator.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,165 @@
-+package TAP::Parser::Iterator;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Object ();
-+
-+@ISA = qw(TAP::Object);
-+
-+=head1 NAME
-+
-+TAP::Parser::Iterator - Internal base class for TAP::Parser Iterators
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+  # see TAP::Parser::IteratorFactory for general usage
-+
-+  # to subclass:
-+  use vars qw(@ISA);
-+  use TAP::Parser::Iterator ();
-+  @ISA = qw(TAP::Parser::Iterator);
-+  sub _initialize {
-+    # see TAP::Object...
-+  }
-+
-+=head1 DESCRIPTION
-+
-+This is a simple iterator base class that defines L<TAP::Parser>'s iterator
-+API.  See C<TAP::Parser::IteratorFactory> for the preferred way of creating
-+iterators.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+Create an iterator.  Provided by L<TAP::Object>.
-+
-+=head2 Instance Methods
-+
-+=head3 C<next>
-+
-+ while ( my $item = $iter->next ) { ... }
-+
-+Iterate through it, of course.
-+
-+=head3 C<next_raw>
-+
-+B<Note:> this method is abstract and should be overridden.
-+
-+ while ( my $item = $iter->next_raw ) { ... }
-+
-+Iterate raw input without applying any fixes for quirky input syntax.
-+
-+=cut
-+
-+sub next {
-+    my $self = shift;
-+    my $line = $self->next_raw;
-+
-+    # vms nit:  When encountering 'not ok', vms often has the 'not' on a line
-+    # by itself:
-+    #   not
-+    #   ok 1 - 'I hate VMS'
-+    if ( defined($line) and $line =~ /^\s*not\s*$/ ) {
-+        $line .= ( $self->next_raw || '' );
-+    }
-+
-+    return $line;
-+}
-+
-+sub next_raw {
-+    require Carp;
-+    my $msg = Carp::longmess('abstract method called directly!');
-+    $_[0]->_croak($msg);
-+}
-+
-+=head3 C<handle_unicode>
-+
-+If necessary switch the input stream to handle unicode. This only has
-+any effect for I/O handle based streams.
-+
-+The default implementation does nothing.
-+
-+=cut
-+
-+sub handle_unicode { }
-+
-+=head3 C<get_select_handles>
-+
-+Return a list of filehandles that may be used upstream in a select()
-+call to signal that this Iterator is ready. Iterators that are not
-+handle-based should return an empty list.
-+
-+The default implementation does nothing.
-+
-+=cut
-+
-+sub get_select_handles {
-+    return;
-+}
-+
-+=head3 C<wait>
-+
-+B<Note:> this method is abstract and should be overridden.
-+
-+ my $wait_status = $iter->wait;
-+
-+Return the C<wait> status for this iterator.
-+
-+=head3 C<exit>
-+
-+B<Note:> this method is abstract and should be overridden.
-+
-+ my $wait_status = $iter->exit;
-+
-+Return the C<exit> status for this iterator.
-+
-+=cut
-+
-+sub wait {
-+    require Carp;
-+    my $msg = Carp::longmess('abstract method called directly!');
-+    $_[0]->_croak($msg);
-+}
-+
-+sub exit {
-+    require Carp;
-+    my $msg = Carp::longmess('abstract method called directly!');
-+    $_[0]->_croak($msg);
-+}
-+
-+1;
-+
-+=head1 SUBCLASSING
-+
-+Please see L<TAP::Parser/SUBCLASSING> for a subclassing overview.
-+
-+You must override the abstract methods as noted above.
-+
-+=head2 Example
-+
-+L<TAP::Parser::Iterator::Array> is probably the easiest example to follow.
-+There's not much point repeating it here.
-+
-+=head1 SEE ALSO
-+
-+L<TAP::Object>,
-+L<TAP::Parser>,
-+L<TAP::Parser::IteratorFactory>,
-+L<TAP::Parser::Iterator::Array>,
-+L<TAP::Parser::Iterator::Stream>,
-+L<TAP::Parser::Iterator::Process>,
-+
-+=cut
-+
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/IteratorFactory.pm perl-5.10.0/lib/TAP/Parser/IteratorFactory.pm
---- perl-5.10.0.orig/lib/TAP/Parser/IteratorFactory.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/IteratorFactory.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,171 @@
-+package TAP::Parser::IteratorFactory;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Object                    ();
-+use TAP::Parser::Iterator::Array   ();
-+use TAP::Parser::Iterator::Stream  ();
-+use TAP::Parser::Iterator::Process ();
-+
-+@ISA = qw(TAP::Object);
-+
-+=head1 NAME
-+
-+TAP::Parser::IteratorFactory - Internal TAP::Parser Iterator
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+  use TAP::Parser::IteratorFactory;
-+  my $factory = TAP::Parser::IteratorFactory->new;
-+  my $iter = $factory->make_iterator(\*TEST);
-+  my $iter = $factory->make_iterator(\@array);
-+  my $iter = $factory->make_iterator(\%hash);
-+
-+  my $line = $iter->next;
-+
-+=head1 DESCRIPTION
-+
-+This is a factory class for simple iterator wrappers for arrays, filehandles,
-+and hashes.  Unless you're subclassing, you probably won't need to use this
-+module directly.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+Creates a new factory class.
-+I<Note:> You currently don't need to instantiate a factory in order to use it.
-+
-+=head3 C<make_iterator>
-+
-+Create an iterator.  The type of iterator created depends on the arguments to
-+the constructor:
-+
-+  my $iter = TAP::Parser::Iterator->make_iterator( $filehandle );
-+
-+Creates a I<stream> iterator (see L</make_stream_iterator>).
-+
-+  my $iter = TAP::Parser::Iterator->make_iterator( $array_reference );
-+
-+Creates an I<array> iterator (see L</make_array_iterator>).
-+
-+  my $iter = TAP::Parser::Iterator->make_iterator( $hash_reference );
-+
-+Creates a I<process> iterator (see L</make_process_iterator>).
-+
-+=cut
-+
-+sub make_iterator {
-+    my ( $proto, $thing ) = @_;
-+
-+    my $ref = ref $thing;
-+    if ( $ref eq 'GLOB' || $ref eq 'IO::Handle' ) {
-+        return $proto->make_stream_iterator($thing);
-+    }
-+    elsif ( $ref eq 'ARRAY' ) {
-+        return $proto->make_array_iterator($thing);
-+    }
-+    elsif ( $ref eq 'HASH' ) {
-+        return $proto->make_process_iterator($thing);
-+    }
-+    else {
-+        die "Can't iterate with a $ref";
-+    }
-+}
-+
-+=head3 C<make_stream_iterator>
-+
-+Make a new stream iterator and return it.  Passes through any arguments given.
-+Defaults to a L<TAP::Parser::Iterator::Stream>.
-+
-+=head3 C<make_array_iterator>
-+
-+Make a new array iterator and return it.  Passes through any arguments given.
-+Defaults to a L<TAP::Parser::Iterator::Array>.
-+
-+=head3 C<make_process_iterator>
-+
-+Make a new process iterator and return it.  Passes through any arguments given.
-+Defaults to a L<TAP::Parser::Iterator::Process>.
-+
-+=cut
-+
-+sub make_stream_iterator {
-+    my $proto = shift;
-+    TAP::Parser::Iterator::Stream->new(@_);
-+}
-+
-+sub make_array_iterator {
-+    my $proto = shift;
-+    TAP::Parser::Iterator::Array->new(@_);
-+}
-+
-+sub make_process_iterator {
-+    my $proto = shift;
-+    TAP::Parser::Iterator::Process->new(@_);
-+}
-+
-+1;
-+
-+=head1 SUBCLASSING
-+
-+Please see L<TAP::Parser/SUBCLASSING> for a subclassing overview.
-+
-+There are a few things to bear in mind when creating your own
-+C<ResultFactory>:
-+
-+=over 4
-+
-+=item 1
-+
-+The factory itself is never instantiated (this I<may> change in the future).
-+This means that C<_initialize> is never called.
-+
-+=back
-+
-+=head2 Example
-+
-+  package MyIteratorFactory;
-+
-+  use strict;
-+  use vars '@ISA';
-+
-+  use MyStreamIterator;
-+  use TAP::Parser::IteratorFactory;
-+
-+  @ISA = qw( TAP::Parser::IteratorFactory );
-+
-+  # override stream iterator
-+  sub make_stream_iterator {
-+    my $proto = shift;
-+    MyStreamIterator->new(@_);
-+  }
-+
-+  1;
-+
-+=head1 ATTRIBUTION
-+
-+Originally ripped off from L<Test::Harness>.
-+
-+=head1 SEE ALSO
-+
-+L<TAP::Object>,
-+L<TAP::Parser>,
-+L<TAP::Parser::Iterator>,
-+L<TAP::Parser::Iterator::Array>,
-+L<TAP::Parser::Iterator::Stream>,
-+L<TAP::Parser::Iterator::Process>,
-+
-+=cut
-+
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Multiplexer.pm perl-5.10.0/lib/TAP/Parser/Multiplexer.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Multiplexer.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Multiplexer.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,195 @@
-+package TAP::Parser::Multiplexer;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use IO::Select;
-+use TAP::Object ();
-+
-+use constant IS_WIN32 => $^O =~ /^(MS)?Win32$/;
-+use constant IS_VMS => $^O eq 'VMS';
-+use constant SELECT_OK => !( IS_VMS || IS_WIN32 );
-+
-+@ISA = 'TAP::Object';
-+
-+=head1 NAME
-+
-+TAP::Parser::Multiplexer - Multiplex multiple TAP::Parsers
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+    use TAP::Parser::Multiplexer;
-+
-+    my $mux = TAP::Parser::Multiplexer->new;
-+    $mux->add( $parser1, $stash1 );
-+    $mux->add( $parser2, $stash2 );
-+    while ( my ( $parser, $stash, $result ) = $mux->next ) {
-+        # do stuff
-+    }
-+
-+=head1 DESCRIPTION
-+
-+C<TAP::Parser::Multiplexer> gathers input from multiple TAP::Parsers.
-+Internally it calls select on the input file handles for those parsers
-+to wait for one or more of them to have input available.
-+
-+See L<TAP::Harness> for an example of its use.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+    my $mux = TAP::Parser::Multiplexer->new;
-+
-+Returns a new C<TAP::Parser::Multiplexer> object.
-+
-+=cut
-+
-+# new() implementation supplied by TAP::Object
-+
-+sub _initialize {
-+    my $self = shift;
-+    $self->{select} = IO::Select->new;
-+    $self->{avid}   = [];                # Parsers that can't select
-+    $self->{count}  = 0;
-+    return $self;
-+}
-+
-+##############################################################################
-+
-+=head2 Instance Methods
-+
-+=head3 C<add>
-+
-+  $mux->add( $parser, $stash );
-+
-+Add a TAP::Parser to the multiplexer. C<$stash> is an optional opaque
-+reference that will be returned from C<next> along with the parser and
-+the next result.
-+
-+=cut
-+
-+sub add {
-+    my ( $self, $parser, $stash ) = @_;
-+
-+    if ( SELECT_OK && ( my @handles = $parser->get_select_handles ) ) {
-+        my $sel = $self->{select};
-+
-+        # We have to turn handles into file numbers here because by
-+        # the time we want to remove them from our IO::Select they
-+        # will already have been closed by the iterator.
-+        my @filenos = map { fileno $_ } @handles;
-+        for my $h (@handles) {
-+            $sel->add( [ $h, $parser, $stash, @filenos ] );
-+        }
-+
-+        $self->{count}++;
-+    }
-+    else {
-+        push @{ $self->{avid} }, [ $parser, $stash ];
-+    }
-+}
-+
-+=head3 C<parsers>
-+
-+  my $count   = $mux->parsers;
-+
-+Returns the number of parsers. Parsers are removed from the multiplexer
-+when their input is exhausted.
-+
-+=cut
-+
-+sub parsers {
-+    my $self = shift;
-+    return $self->{count} + scalar @{ $self->{avid} };
-+}
-+
-+sub _iter {
-+    my $self = shift;
-+
-+    my $sel   = $self->{select};
-+    my $avid  = $self->{avid};
-+    my @ready = ();
-+
-+    return sub {
-+
-+        # Drain all the non-selectable parsers first
-+        if (@$avid) {
-+            my ( $parser, $stash ) = @{ $avid->[0] };
-+            my $result = $parser->next;
-+            shift @$avid unless defined $result;
-+            return ( $parser, $stash, $result );
-+        }
-+
-+        unless (@ready) {
-+            return unless $sel->count;
-+            @ready = $sel->can_read;
-+        }
-+
-+        my ( $h, $parser, $stash, @handles ) = @{ shift @ready };
-+        my $result = $parser->next;
-+
-+        unless ( defined $result ) {
-+            $sel->remove(@handles);
-+            $self->{count}--;
-+
-+            # Force another can_read - we may now have removed a handle
-+            # thought to have been ready.
-+            @ready = ();
-+        }
-+
-+        return ( $parser, $stash, $result );
-+    };
-+}
-+
-+=head3 C<next>
-+
-+Return a result from the next available parser. Returns a list
-+containing the parser from which the result came, the stash that
-+corresponds with that parser and the result.
-+
-+    my ( $parser, $stash, $result ) = $mux->next;
-+
-+If C<$result> is undefined the corresponding parser has reached the end
-+of its input (and will automatically be removed from the multiplexer).
-+
-+When all parsers are exhausted an empty list will be returned.
-+
-+    if ( my ( $parser, $stash, $result ) = $mux->next ) {
-+        if ( ! defined $result ) {
-+            # End of this parser
-+        }
-+        else {
-+            # Process result
-+        }
-+    }
-+    else {
-+        # All parsers finished
-+    }
-+
-+=cut
-+
-+sub next {
-+    my $self = shift;
-+    return ( $self->{_iter} ||= $self->_iter )->();
-+}
-+
-+=head1 See Also
-+
-+L<TAP::Parser>
-+
-+L<TAP::Harness>
-+
-+=cut
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Result/Bailout.pm perl-5.10.0/lib/TAP/Parser/Result/Bailout.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Result/Bailout.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Bailout.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,63 @@
-+package TAP::Parser::Result::Bailout;
-+
-+use strict;
-+
-+use vars qw($VERSION @ISA);
-+use TAP::Parser::Result;
-+@ISA = 'TAP::Parser::Result';
-+
-+=head1 NAME
-+
-+TAP::Parser::Result::Bailout - Bailout result token.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This is a subclass of L<TAP::Parser::Result>.  A token of this class will be
-+returned if a bail out line is encountered.
-+
-+ 1..5
-+ ok 1 - woo hooo!
-+ Bail out! Well, so much for "woo hooo!"
-+
-+=head1 OVERRIDDEN METHODS
-+
-+Mainly listed here to shut up the pitiful screams of the pod coverage tests.
-+They keep me awake at night.
-+
-+=over 4
-+
-+=item * C<as_string>
-+
-+=back
-+
-+=cut
-+
-+##############################################################################
-+
-+=head2 Instance Methods
-+
-+=head3 C<explanation>
-+
-+  if ( $result->is_bailout ) {
-+      my $explanation = $result->explanation;
-+      print "We bailed out because ($explanation)";
-+  }
-+
-+If, and only if, a token is a bailout token, you can get an "explanation" via
-+this method.  The explanation is the text after the mystical "Bail out!" words
-+which appear in the tap output.
-+
-+=cut
-+
-+sub explanation { shift->{bailout} }
-+sub as_string   { shift->{bailout} }
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Result/Comment.pm perl-5.10.0/lib/TAP/Parser/Result/Comment.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Result/Comment.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Comment.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,61 @@
-+package TAP::Parser::Result::Comment;
-+
-+use strict;
-+
-+use vars qw($VERSION @ISA);
-+use TAP::Parser::Result;
-+@ISA = 'TAP::Parser::Result';
-+
-+=head1 NAME
-+
-+TAP::Parser::Result::Comment - Comment result token.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This is a subclass of L<TAP::Parser::Result>.  A token of this class will be
-+returned if a comment line is encountered.
-+
-+ 1..1
-+ ok 1 - woo hooo!
-+ # this is a comment
-+
-+=head1 OVERRIDDEN METHODS
-+
-+Mainly listed here to shut up the pitiful screams of the pod coverage tests.
-+They keep me awake at night.
-+
-+=over 4
-+
-+=item * C<as_string>
-+
-+Note that this method merely returns the comment preceded by a '# '.
-+
-+=back
-+
-+=cut
-+
-+##############################################################################
-+
-+=head2 Instance Methods
-+
-+=head3 C<comment> 
-+
-+  if ( $result->is_comment ) {
-+      my $comment = $result->comment;
-+      print "I have something to say:  $comment";
-+  }
-+
-+=cut
-+
-+sub comment   { shift->{comment} }
-+sub as_string { shift->{raw} }
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Result/Plan.pm perl-5.10.0/lib/TAP/Parser/Result/Plan.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Result/Plan.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Plan.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,120 @@
-+package TAP::Parser::Result::Plan;
-+
-+use strict;
-+
-+use vars qw($VERSION @ISA);
-+use TAP::Parser::Result;
-+@ISA = 'TAP::Parser::Result';
-+
-+=head1 NAME
-+
-+TAP::Parser::Result::Plan - Plan result token.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This is a subclass of L<TAP::Parser::Result>.  A token of this class will be
-+returned if a plan line is encountered.
-+
-+ 1..1
-+ ok 1 - woo hooo!
-+
-+C<1..1> is the plan.  Gotta have a plan.
-+
-+=head1 OVERRIDDEN METHODS
-+
-+Mainly listed here to shut up the pitiful screams of the pod coverage tests.
-+They keep me awake at night.
-+
-+=over 4
-+
-+=item * C<as_string>
-+
-+=item * C<raw>
-+
-+=back
-+
-+=cut
-+
-+##############################################################################
-+
-+=head2 Instance Methods
-+
-+=head3 C<plan> 
-+
-+  if ( $result->is_plan ) {
-+     print $result->plan;
-+  }
-+
-+This is merely a synonym for C<as_string>.
-+
-+=cut
-+
-+sub plan { '1..' . shift->{tests_planned} }
-+
-+##############################################################################
-+
-+=head3 C<tests_planned>
-+
-+  my $planned = $result->tests_planned;
-+
-+Returns the number of tests planned.  For example, a plan of C<1..17> will
-+cause this method to return '17'.
-+
-+=cut
-+
-+sub tests_planned { shift->{tests_planned} }
-+
-+##############################################################################
-+
-+=head3 C<directive>
-+
-+ my $directive = $plan->directive; 
-+
-+If a SKIP directive is included with the plan, this method will return it.
-+
-+ 1..0 # SKIP: why bother?
-+
-+=cut
-+
-+sub directive { shift->{directive} }
-+
-+##############################################################################
-+
-+=head3 C<has_skip>
-+
-+  if ( $result->has_skip ) { ... }
-+
-+Returns a boolean value indicating whether or not this test has a SKIP
-+directive.
-+
-+=head3 C<explanation>
-+
-+ my $explanation = $plan->explanation;
-+
-+If a SKIP directive was included with the plan, this method will return the
-+explanation, if any.
-+
-+=cut
-+
-+sub explanation { shift->{explanation} }
-+
-+=head3 C<todo_list>
-+
-+  my $todo = $result->todo_list;
-+  for ( @$todo ) {
-+      ...
-+  }
-+
-+=cut
-+
-+sub todo_list { shift->{todo_list} }
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Result/Pragma.pm perl-5.10.0/lib/TAP/Parser/Result/Pragma.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Result/Pragma.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Pragma.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,63 @@
-+package TAP::Parser::Result::Pragma;
-+
-+use strict;
-+
-+use vars qw($VERSION @ISA);
-+use TAP::Parser::Result;
-+@ISA = 'TAP::Parser::Result';
-+
-+=head1 NAME
-+
-+TAP::Parser::Result::Pragma - TAP pragma token.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This is a subclass of L<TAP::Parser::Result>.  A token of this class will be
-+returned if a pragma is encountered.
-+
-+ TAP version 13
-+ pragma +strict, -foo
-+
-+Pragmas are only supported from TAP version 13 onwards.
-+
-+=head1 OVERRIDDEN METHODS
-+
-+Mainly listed here to shut up the pitiful screams of the pod coverage tests.
-+They keep me awake at night.
-+
-+=over 4
-+
-+=item * C<as_string>
-+
-+=item * C<raw>
-+
-+=back
-+
-+=cut
-+
-+##############################################################################
-+
-+=head2 Instance Methods
-+
-+=head3 C<pragmas> 
-+
-+if ( $result->is_pragma ) {
-+    @pragmas = $result->pragmas;
-+}
-+
-+=cut
-+
-+sub pragmas {
-+    my @pragmas = @{ shift->{pragmas} };
-+    return wantarray ? @pragmas : \@pragmas;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Result/Test.pm perl-5.10.0/lib/TAP/Parser/Result/Test.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Result/Test.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Test.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,274 @@
-+package TAP::Parser::Result::Test;
-+
-+use strict;
-+
-+use vars qw($VERSION @ISA);
-+use TAP::Parser::Result;
-+@ISA = 'TAP::Parser::Result';
-+
-+use vars qw($VERSION);
-+
-+=head1 NAME
-+
-+TAP::Parser::Result::Test - Test result token.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This is a subclass of L<TAP::Parser::Result>.  A token of this class will be
-+returned if a test line is encountered.
-+
-+ 1..1
-+ ok 1 - woo hooo!
-+
-+=head1 OVERRIDDEN METHODS
-+
-+This class is the workhorse of the L<TAP::Parser> system.  Most TAP lines will
-+be test lines and if C<< $result->is_test >>, then you have a bunch of methods
-+at your disposal.
-+
-+=head2 Instance Methods
-+
-+=cut
-+
-+##############################################################################
-+
-+=head3 C<ok>
-+
-+  my $ok = $result->ok;
-+
-+Returns the literal text of the C<ok> or C<not ok> status.
-+
-+=cut
-+
-+sub ok { shift->{ok} }
-+
-+##############################################################################
-+
-+=head3 C<number>
-+
-+  my $test_number = $result->number;
-+
-+Returns the number of the test, even if the original TAP output did not supply
-+that number.
-+
-+=cut
-+
-+sub number { shift->{test_num} }
-+
-+sub _number {
-+    my ( $self, $number ) = @_;
-+    $self->{test_num} = $number;
-+}
-+
-+##############################################################################
-+
-+=head3 C<description>
-+
-+  my $description = $result->description;
-+
-+Returns the description of the test, if any.  This is the portion after the
-+test number but before the directive.
-+
-+=cut
-+
-+sub description { shift->{description} }
-+
-+##############################################################################
-+
-+=head3 C<directive>
-+
-+  my $directive = $result->directive;
-+
-+Returns either C<TODO> or C<SKIP> if either directive was present for a test
-+line.
-+
-+=cut
-+
-+sub directive { shift->{directive} }
-+
-+##############################################################################
-+
-+=head3 C<explanation>
-+
-+  my $explanation = $result->explanation;
-+
-+If a test had either a C<TODO> or C<SKIP> directive, this method will return
-+the accompanying explantion, if present.
-+
-+  not ok 17 - 'Pigs can fly' # TODO not enough acid
-+
-+For the above line, the explanation is I<not enough acid>.
-+
-+=cut
-+
-+sub explanation { shift->{explanation} }
-+
-+##############################################################################
-+
-+=head3 C<is_ok>
-+
-+  if ( $result->is_ok ) { ... }
-+
-+Returns a boolean value indicating whether or not the test passed.  Remember
-+that for TODO tests, the test always passes.
-+
-+If the test is unplanned, this method will always return false.  See
-+C<is_unplanned>.
-+
-+=cut
-+
-+sub is_ok {
-+    my $self = shift;
-+
-+    return if $self->is_unplanned;
-+
-+    # TODO directives reverse the sense of a test.
-+    return $self->has_todo ? 1 : $self->ok !~ /not/;
-+}
-+
-+##############################################################################
-+
-+=head3 C<is_actual_ok>
-+
-+  if ( $result->is_actual_ok ) { ... }
-+
-+Returns a boolean value indicating whether or not the test passed, regardless
-+of its TODO status.
-+
-+=cut
-+
-+sub is_actual_ok {
-+    my $self = shift;
-+    return $self->{ok} !~ /not/;
-+}
-+
-+##############################################################################
-+
-+=head3 C<actual_passed>
-+
-+Deprecated.  Please use C<is_actual_ok> instead.
-+
-+=cut
-+
-+sub actual_passed {
-+    warn 'actual_passed() is deprecated.  Please use "is_actual_ok()"';
-+    goto &is_actual_ok;
-+}
-+
-+##############################################################################
-+
-+=head3 C<todo_passed>
-+
-+  if ( $test->todo_passed ) {
-+     # test unexpectedly succeeded
-+  }
-+
-+If this is a TODO test and an 'ok' line, this method returns true.
-+Otherwise, it will always return false (regardless of passing status on
-+non-todo tests).
-+
-+This is used to track which tests unexpectedly succeeded.
-+
-+=cut
-+
-+sub todo_passed {
-+    my $self = shift;
-+    return $self->has_todo && $self->is_actual_ok;
-+}
-+
-+##############################################################################
-+
-+=head3 C<todo_failed>
-+
-+  # deprecated in favor of 'todo_passed'.  This method was horribly misnamed.
-+
-+This was a badly misnamed method.  It indicates which TODO tests unexpectedly
-+succeeded.  Will now issue a warning and call C<todo_passed>.
-+
-+=cut
-+
-+sub todo_failed {
-+    warn 'todo_failed() is deprecated.  Please use "todo_passed()"';
-+    goto &todo_passed;
-+}
-+
-+##############################################################################
-+
-+=head3 C<has_skip>
-+
-+  if ( $result->has_skip ) { ... }
-+
-+Returns a boolean value indicating whether or not this test has a SKIP
-+directive.
-+
-+=head3 C<has_todo>
-+
-+  if ( $result->has_todo ) { ... }
-+
-+Returns a boolean value indicating whether or not this test has a TODO
-+directive.
-+
-+=head3 C<as_string>
-+
-+  print $result->as_string;
-+
-+This method prints the test as a string.  It will probably be similar, but
-+not necessarily identical, to the original test line.  Directives are
-+capitalized, some whitespace may be trimmed and a test number will be added if
-+it was not present in the original line.  If you need the original text of the
-+test line, use the C<raw> method.
-+
-+=cut
-+
-+sub as_string {
-+    my $self   = shift;
-+    my $string = $self->ok . " " . $self->number;
-+    if ( my $description = $self->description ) {
-+        $string .= " $description";
-+    }
-+    if ( my $directive = $self->directive ) {
-+        my $explanation = $self->explanation;
-+        $string .= " # $directive $explanation";
-+    }
-+    return $string;
-+}
-+
-+##############################################################################
-+
-+=head3 C<is_unplanned>
-+
-+  if ( $test->is_unplanned ) { ... }
-+  $test->is_unplanned(1);
-+
-+If a test number is greater than the number of planned tests, this method will
-+return true.  Unplanned tests will I<always> return false for C<is_ok>,
-+regardless of whether or not the test C<has_todo>.
-+
-+Note that if tests have a trailing plan, it is not possible to set this
-+property for unplanned tests as we do not know it's unplanned until the plan
-+is reached:
-+
-+  print <<'END';
-+  ok 1
-+  ok 2
-+  1..1
-+  END
-+
-+=cut
-+
-+sub is_unplanned {
-+    my $self = shift;
-+    return ( $self->{unplanned} || '' ) unless @_;
-+    $self->{unplanned} = !!shift;
-+    return $self;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Result/Unknown.pm perl-5.10.0/lib/TAP/Parser/Result/Unknown.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Result/Unknown.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Unknown.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,51 @@
-+package TAP::Parser::Result::Unknown;
-+
-+use strict;
-+
-+use vars qw($VERSION @ISA);
-+use TAP::Parser::Result;
-+@ISA = 'TAP::Parser::Result';
-+
-+use vars qw($VERSION);
-+
-+=head1 NAME
-+
-+TAP::Parser::Result::Unknown - Unknown result token.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This is a subclass of L<TAP::Parser::Result>.  A token of this class will be
-+returned if the parser does not recognize the token line.  For example:
-+
-+ 1..5
-+ VERSION 7
-+ ok 1 - woo hooo!
-+ ... woo hooo! is cool!
-+
-+In the above "TAP", the second and fourth lines will generate "Unknown"
-+tokens.
-+
-+=head1 OVERRIDDEN METHODS
-+
-+Mainly listed here to shut up the pitiful screams of the pod coverage tests.
-+They keep me awake at night.
-+
-+=over 4
-+
-+=item * C<as_string>
-+
-+=item * C<raw>
-+
-+=back
-+
-+=cut
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Result/Version.pm perl-5.10.0/lib/TAP/Parser/Result/Version.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Result/Version.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Version.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,63 @@
-+package TAP::Parser::Result::Version;
-+
-+use strict;
-+
-+use vars qw($VERSION @ISA);
-+use TAP::Parser::Result;
-+@ISA = 'TAP::Parser::Result';
-+
-+=head1 NAME
-+
-+TAP::Parser::Result::Version - TAP syntax version token.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This is a subclass of L<TAP::Parser::Result>.  A token of this class will be
-+returned if a version line is encountered.
-+
-+ TAP version 13
-+ ok 1
-+ not ok 2
-+
-+The first version of TAP to include an explicit version number is 13.
-+
-+=head1 OVERRIDDEN METHODS
-+
-+Mainly listed here to shut up the pitiful screams of the pod coverage tests.
-+They keep me awake at night.
-+
-+=over 4
-+
-+=item * C<as_string>
-+
-+=item * C<raw>
-+
-+=back
-+
-+=cut
-+
-+##############################################################################
-+
-+=head2 Instance Methods
-+
-+=head3 C<version> 
-+
-+  if ( $result->is_version ) {
-+     print $result->version;
-+  }
-+
-+This is merely a synonym for C<as_string>.
-+
-+=cut
-+
-+sub version { shift->{version} }
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Result/YAML.pm perl-5.10.0/lib/TAP/Parser/Result/YAML.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Result/YAML.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/YAML.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,62 @@
-+package TAP::Parser::Result::YAML;
-+
-+use strict;
-+
-+use vars qw($VERSION @ISA);
-+use TAP::Parser::Result;
-+@ISA = 'TAP::Parser::Result';
-+
-+=head1 NAME
-+
-+TAP::Parser::Result::YAML - YAML result token.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 DESCRIPTION
-+
-+This is a subclass of L<TAP::Parser::Result>.  A token of this class will be
-+returned if a YAML block is encountered.
-+
-+ 1..1
-+ ok 1 - woo hooo!
-+
-+C<1..1> is the plan.  Gotta have a plan.
-+
-+=head1 OVERRIDDEN METHODS
-+
-+Mainly listed here to shut up the pitiful screams of the pod coverage tests.
-+They keep me awake at night.
-+
-+=over 4
-+
-+=item * C<as_string>
-+
-+=item * C<raw>
-+
-+=back
-+
-+=cut
-+
-+##############################################################################
-+
-+=head2 Instance Methods
-+
-+=head3 C<data> 
-+
-+  if ( $result->is_yaml ) {
-+     print $result->data;
-+  }
-+
-+Return the parsed YAML data for this result
-+
-+=cut
-+
-+sub data { shift->{data} }
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Result.pm perl-5.10.0/lib/TAP/Parser/Result.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Result.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,300 @@
-+package TAP::Parser::Result;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Object ();
-+
-+@ISA = 'TAP::Object';
-+
-+BEGIN {
-+
-+    # make is_* methods
-+    my @attrs = qw( plan pragma test comment bailout version unknown yaml );
-+    no strict 'refs';
-+    for my $token (@attrs) {
-+        my $method = "is_$token";
-+        *$method = sub { return $token eq shift->type };
-+    }
-+}
-+
-+##############################################################################
-+
-+=head1 NAME
-+
-+TAP::Parser::Result - Base class for TAP::Parser output objects
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+  # abstract class - not meany to be used directly
-+  # see TAP::Parser::ResultFactory for preferred usage
-+
-+  # directly:
-+  use TAP::Parser::Result;
-+  my $token  = {...};
-+  my $result = TAP::Parser::Result->new( $token );
-+
-+=head2 DESCRIPTION
-+
-+This is a simple base class used by L<TAP::Parser> to store objects that
-+represent the current bit of test output data from TAP (usually a single
-+line).  Unless you're subclassing, you probably won't need to use this module
-+directly.
-+
-+=head2 METHODS
-+
-+=head3 C<new>
-+
-+  # see TAP::Parser::ResultFactory for preferred usage
-+
-+  # to use directly:
-+  my $result = TAP::Parser::Result->new($token);
-+
-+Returns an instance the appropriate class for the test token passed in.
-+
-+=cut
-+
-+# new() implementation provided by TAP::Object
-+
-+sub _initialize {
-+    my ( $self, $token ) = @_;
-+    if ($token) {
-+
-+       # assign to a hash slice to make a shallow copy of the token.
-+       # I guess we could assign to the hash as (by default) there are not
-+       # contents, but that seems less helpful if someone wants to subclass us
-+        @{$self}{ keys %$token } = values %$token;
-+    }
-+    return $self;
-+}
-+
-+##############################################################################
-+
-+=head2 Boolean methods
-+
-+The following methods all return a boolean value and are to be overridden in
-+the appropriate subclass.
-+
-+=over 4
-+
-+=item * C<is_plan>
-+
-+Indicates whether or not this is the test plan line.
-+
-+ 1..3
-+
-+=item * C<is_pragma>
-+
-+Indicates whether or not this is a pragma line.
-+
-+ pragma +strict
-+
-+=item * C<is_test>
-+
-+Indicates whether or not this is a test line.
-+
-+ ok 1 Is OK!
-+
-+=item * C<is_comment>
-+
-+Indicates whether or not this is a comment.
-+
-+ # this is a comment
-+
-+=item * C<is_bailout>
-+
-+Indicates whether or not this is bailout line.
-+
-+ Bail out! We're out of dilithium crystals.
-+
-+=item * C<is_version>
-+
-+Indicates whether or not this is a TAP version line.
-+
-+ TAP version 4
-+
-+=item * C<is_unknown>
-+
-+Indicates whether or not the current line could be parsed.
-+
-+ ... this line is junk ...
-+
-+=item * C<is_yaml>
-+
-+Indicates whether or not this is a YAML chunk.
-+
-+=back
-+
-+=cut
-+
-+##############################################################################
-+
-+=head3 C<raw>
-+
-+  print $result->raw;
-+
-+Returns the original line of text which was parsed.
-+
-+=cut
-+
-+sub raw { shift->{raw} }
-+
-+##############################################################################
-+
-+=head3 C<type>
-+
-+  my $type = $result->type;
-+
-+Returns the "type" of a token, such as C<comment> or C<test>.
-+
-+=cut
-+
-+sub type { shift->{type} }
-+
-+##############################################################################
-+
-+=head3 C<as_string>
-+
-+  print $result->as_string;
-+
-+Prints a string representation of the token.  This might not be the exact
-+output, however.  Tests will have test numbers added if not present, TODO and
-+SKIP directives will be capitalized and, in general, things will be cleaned
-+up.  If you need the original text for the token, see the C<raw> method.
-+
-+=cut
-+
-+sub as_string { shift->{raw} }
-+
-+##############################################################################
-+
-+=head3 C<is_ok>
-+
-+  if ( $result->is_ok ) { ... }
-+
-+Reports whether or not a given result has passed.  Anything which is B<not> a
-+test result returns true.  This is merely provided as a convenient shortcut.
-+
-+=cut
-+
-+sub is_ok {1}
-+
-+##############################################################################
-+
-+=head3 C<passed>
-+
-+Deprecated.  Please use C<is_ok> instead.
-+
-+=cut
-+
-+sub passed {
-+    warn 'passed() is deprecated.  Please use "is_ok()"';
-+    shift->is_ok;
-+}
-+
-+##############################################################################
-+
-+=head3 C<has_directive>
-+
-+  if ( $result->has_directive ) {
-+     ...
-+  }
-+
-+Indicates whether or not the given result has a TODO or SKIP directive.
-+
-+=cut
-+
-+sub has_directive {
-+    my $self = shift;
-+    return ( $self->has_todo || $self->has_skip );
-+}
-+
-+##############################################################################
-+
-+=head3 C<has_todo>
-+
-+ if ( $result->has_todo ) {
-+     ...
-+ }
-+
-+Indicates whether or not the given result has a TODO directive.
-+
-+=cut
-+
-+sub has_todo { 'TODO' eq ( shift->{directive} || '' ) }
-+
-+##############################################################################
-+
-+=head3 C<has_skip>
-+
-+ if ( $result->has_skip ) {
-+     ...
-+ }
-+
-+Indicates whether or not the given result has a SKIP directive.
-+
-+=cut
-+
-+sub has_skip { 'SKIP' eq ( shift->{directive} || '' ) }
-+
-+=head3 C<set_directive>
-+
-+Set the directive associated with this token. Used internally to fake
-+TODO tests.
-+
-+=cut
-+
-+sub set_directive {
-+    my ( $self, $dir ) = @_;
-+    $self->{directive} = $dir;
-+}
-+
-+1;
-+
-+=head1 SUBCLASSING
-+
-+Please see L<TAP::Parser/SUBCLASSING> for a subclassing overview.
-+
-+Remember: if you want your subclass to be automatically used by the parser,
-+you'll have to register it with L<TAP::Parser::ResultFactory/register_type>.
-+
-+If you're creating a completely new result I<type>, you'll probably need to
-+subclass L<TAP::Parser::Grammar> too, or else it'll never get used.
-+
-+=head2 Example
-+
-+  package MyResult;
-+
-+  use strict;
-+  use vars '@ISA';
-+
-+  @ISA = 'TAP::Parser::Result';
-+
-+  # register with the factory:
-+  TAP::Parser::ResultFactory->register_type( 'my_type' => __PACKAGE__ );
-+
-+  sub as_string { 'My results all look the same' }
-+
-+=head1 SEE ALSO
-+
-+L<TAP::Object>,
-+L<TAP::Parser>,
-+L<TAP::Parser::ResultFactory>,
-+L<TAP::Parser::Result::Bailout>,
-+L<TAP::Parser::Result::Comment>,
-+L<TAP::Parser::Result::Plan>,
-+L<TAP::Parser::Result::Pragma>,
-+L<TAP::Parser::Result::Test>,
-+L<TAP::Parser::Result::Unknown>,
-+L<TAP::Parser::Result::Version>,
-+L<TAP::Parser::Result::YAML>,
-+
-+=cut
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/ResultFactory.pm perl-5.10.0/lib/TAP/Parser/ResultFactory.pm
---- perl-5.10.0.orig/lib/TAP/Parser/ResultFactory.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/ResultFactory.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,189 @@
-+package TAP::Parser::ResultFactory;
-+
-+use strict;
-+use vars qw($VERSION @ISA %CLASS_FOR);
-+
-+use TAP::Object                  ();
-+use TAP::Parser::Result::Bailout ();
-+use TAP::Parser::Result::Comment ();
-+use TAP::Parser::Result::Plan    ();
-+use TAP::Parser::Result::Pragma  ();
-+use TAP::Parser::Result::Test    ();
-+use TAP::Parser::Result::Unknown ();
-+use TAP::Parser::Result::Version ();
-+use TAP::Parser::Result::YAML    ();
-+
-+@ISA = 'TAP::Object';
-+
-+##############################################################################
-+
-+=head1 NAME
-+
-+TAP::Parser::ResultFactory - Factory for creating TAP::Parser output objects
-+
-+=head1 SYNOPSIS
-+
-+  use TAP::Parser::ResultFactory;
-+  my $token   = {...};
-+  my $factory = TAP::Parser::ResultFactory->new;
-+  my $result  = $factory->make_result( $token );
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head2 DESCRIPTION
-+
-+This is a simple factory class which returns a L<TAP::Parser::Result> subclass
-+representing the current bit of test data from TAP (usually a single line).
-+It is used primarily by L<TAP::Parser::Grammar>.  Unless you're subclassing,
-+you probably won't need to use this module directly.
-+
-+=head2 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+Creates a new factory class.
-+I<Note:> You currently don't need to instantiate a factory in order to use it.
-+
-+=head3 C<make_result>
-+
-+Returns an instance the appropriate class for the test token passed in.
-+
-+  my $result = TAP::Parser::ResultFactory->make_result($token);
-+
-+Can also be called as an instance method.
-+
-+=cut
-+
-+sub make_result {
-+    my ( $proto, $token ) = @_;
-+    my $type = $token->{type};
-+    return $proto->class_for($type)->new($token);
-+}
-+
-+=head3 C<class_for>
-+
-+Takes one argument: C<$type>.  Returns the class for this $type, or C<croak>s
-+with an error.
-+
-+=head3 C<register_type>
-+
-+Takes two arguments: C<$type>, C<$class>
-+
-+This lets you override an existing type with your own custom type, or register
-+a completely new type, eg:
-+
-+  # create a custom result type:
-+  package MyResult;
-+  use strict;
-+  use vars qw(@ISA);
-+  @ISA = 'TAP::Parser::Result';
-+
-+  # register with the factory:
-+  TAP::Parser::ResultFactory->register_type( 'my_type' => __PACKAGE__ );
-+
-+  # use it:
-+  my $r = TAP::Parser::ResultFactory->( { type => 'my_type' } );
-+
-+Your custom type should then be picked up automatically by the L<TAP::Parser>.
-+
-+=cut
-+
-+BEGIN {
-+    %CLASS_FOR = (
-+        plan    => 'TAP::Parser::Result::Plan',
-+        pragma  => 'TAP::Parser::Result::Pragma',
-+        test    => 'TAP::Parser::Result::Test',
-+        comment => 'TAP::Parser::Result::Comment',
-+        bailout => 'TAP::Parser::Result::Bailout',
-+        version => 'TAP::Parser::Result::Version',
-+        unknown => 'TAP::Parser::Result::Unknown',
-+        yaml    => 'TAP::Parser::Result::YAML',
-+    );
-+}
-+
-+sub class_for {
-+    my ( $class, $type ) = @_;
-+
-+    # return target class:
-+    return $CLASS_FOR{$type} if exists $CLASS_FOR{$type};
-+
-+    # or complain:
-+    require Carp;
-+    Carp::croak("Could not determine class for result type '$type'");
-+}
-+
-+sub register_type {
-+    my ( $class, $type, $rclass ) = @_;
-+
-+    # register it blindly, assume they know what they're doing
-+    $CLASS_FOR{$type} = $rclass;
-+    return $class;
-+}
-+
-+1;
-+
-+=head1 SUBCLASSING
-+
-+Please see L<TAP::Parser/SUBCLASSING> for a subclassing overview.
-+
-+There are a few things to bear in mind when creating your own
-+C<ResultFactory>:
-+
-+=over 4
-+
-+=item 1
-+
-+The factory itself is never instantiated (this I<may> change in the future).
-+This means that C<_initialize> is never called.
-+
-+=item 2
-+
-+C<TAP::Parser::Result-E<gt>new> is never called, $tokens are reblessed.
-+This I<will> change in a future version!
-+
-+=item 3
-+
-+L<TAP::Parser::Result> subclasses will register themselves with
-+L<TAP::Parser::ResultFactory> directly:
-+
-+  package MyFooResult;
-+  TAP::Parser::ResultFactory->register_type( foo => __PACKAGE__ );
-+
-+Of course, it's up to you to decide whether or not to ignore them.
-+
-+=back
-+
-+=head2 Example
-+
-+  package MyResultFactory;
-+
-+  use strict;
-+  use vars '@ISA';
-+
-+  use MyResult;
-+  use TAP::Parser::ResultFactory;
-+
-+  @ISA = qw( TAP::Parser::ResultFactory );
-+
-+  # force all results to be 'MyResult'
-+  sub class_for {
-+    return 'MyResult';
-+  }
-+
-+  1;
-+
-+=head1 SEE ALSO
-+
-+L<TAP::Parser>,
-+L<TAP::Parser::Result>,
-+L<TAP::Parser::Grammar>
-+
-+=cut
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Scheduler/Job.pm perl-5.10.0/lib/TAP/Parser/Scheduler/Job.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Scheduler/Job.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Scheduler/Job.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,107 @@
-+package TAP::Parser::Scheduler::Job;
-+
-+use strict;
-+use vars qw($VERSION);
-+use Carp;
-+
-+=head1 NAME
-+
-+TAP::Parser::Scheduler::Job - A single testing job.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+    use TAP::Parser::Scheduler::Job;
-+
-+=head1 DESCRIPTION
-+
-+Represents a single test 'job'.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+    my $job = TAP::Parser::Scheduler::Job->new(
-+        $name, $desc 
-+    );
-+
-+Returns a new C<TAP::Parser::Scheduler::Job> object.
-+
-+=cut
-+
-+sub new {
-+    my ( $class, $name, $desc, @ctx ) = @_;
-+    return bless {
-+        filename    => $name,
-+        description => $desc,
-+        @ctx ? ( context => \@ctx ) : (),
-+    }, $class;
-+}
-+
-+=head3 C<on_finish>
-+
-+Register a closure to be called when this job is destroyed.
-+
-+=cut
-+
-+sub on_finish {
-+    my ( $self, $cb ) = @_;
-+    $self->{on_finish} = $cb;
-+}
-+
-+=head3 C<finish>
-+
-+Called when a job is complete to unlock it.
-+
-+=cut
-+
-+sub finish {
-+    my $self = shift;
-+    if ( my $cb = $self->{on_finish} ) {
-+        $cb->($self);
-+    }
-+}
-+
-+=head3 C<filename>
-+
-+=head3 C<description>
-+
-+=head3 C<context>
-+
-+=cut
-+
-+sub filename    { shift->{filename} }
-+sub description { shift->{description} }
-+sub context     { @{ shift->{context} || [] } }
-+
-+=head3 C<as_array_ref>
-+
-+For backwards compatibility in callbacks.
-+
-+=cut
-+
-+sub as_array_ref {
-+    my $self = shift;
-+    return [ $self->filename, $self->description, $self->{context} ||= [] ];
-+}
-+
-+=head3 C<is_spinner>
-+
-+Returns false indicating that this is a real job rather than a
-+'spinner'. Spinners are returned when the scheduler still has pending
-+jobs but can't (because of locking) return one right now.
-+
-+=cut
-+
-+sub is_spinner {0}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Scheduler/Spinner.pm perl-5.10.0/lib/TAP/Parser/Scheduler/Spinner.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Scheduler/Spinner.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Scheduler/Spinner.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,53 @@
-+package TAP::Parser::Scheduler::Spinner;
-+
-+use strict;
-+use vars qw($VERSION);
-+use Carp;
-+
-+=head1 NAME
-+
-+TAP::Parser::Scheduler::Spinner - A no-op job.
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+    use TAP::Parser::Scheduler::Spinner;
-+
-+=head1 DESCRIPTION
-+
-+A no-op job. Returned by C<TAP::Parser::Scheduler> as an instruction to
-+the harness to spin (keep executing tests) while the scheduler can't
-+return a real job.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+    my $job = TAP::Parser::Scheduler::Spinner->new;
-+
-+Returns a new C<TAP::Parser::Scheduler::Spinner> object.
-+
-+=cut
-+
-+sub new { bless {}, shift }
-+
-+=head3 C<is_spinner>
-+
-+Returns true indicating that is a 'spinner' job. Spinners are returned
-+when the scheduler still has pending jobs but can't (because of locking)
-+return one right now.
-+
-+=cut
-+
-+sub is_spinner {1}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Scheduler.pm perl-5.10.0/lib/TAP/Parser/Scheduler.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Scheduler.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Scheduler.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,312 @@
-+package TAP::Parser::Scheduler;
-+
-+use strict;
-+use vars qw($VERSION);
-+use Carp;
-+use TAP::Parser::Scheduler::Job;
-+use TAP::Parser::Scheduler::Spinner;
-+
-+=head1 NAME
-+
-+TAP::Parser::Scheduler - Schedule tests during parallel testing
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+    use TAP::Parser::Scheduler;
-+
-+=head1 DESCRIPTION
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+    my $sched = TAP::Parser::Scheduler->new;
-+
-+Returns a new C<TAP::Parser::Scheduler> object.
-+
-+=cut
-+
-+sub new {
-+    my $class = shift;
-+
-+    croak "Need a number of key, value pairs" if @_ % 2;
-+
-+    my %args  = @_;
-+    my $tests = delete $args{tests} || croak "Need a 'tests' argument";
-+    my $rules = delete $args{rules} || { par => '**' };
-+
-+    croak "Unknown arg(s): ", join ', ', sort keys %args
-+      if keys %args;
-+
-+    # Turn any simple names into a name, description pair. TODO: Maybe
-+    # construct jobs here?
-+    my $self = bless {}, $class;
-+
-+    $self->_set_rules( $rules, $tests );
-+
-+    return $self;
-+}
-+
-+# Build the scheduler data structure.
-+#
-+# SCHEDULER-DATA ::= JOB
-+#                ||  ARRAY OF ARRAY OF SCHEDULER-DATA
-+#
-+# The nested arrays are the key to scheduling. The outer array contains
-+# a list of things that may be executed in parallel. Whenever an
-+# eligible job is sought any element of the outer array that is ready to
-+# execute can be selected. The inner arrays represent sequential
-+# execution. They can only proceed when the first job is ready to run.
-+
-+sub _set_rules {
-+    my ( $self, $rules, $tests ) = @_;
-+    my @tests = map { TAP::Parser::Scheduler::Job->new(@$_) }
-+      map { 'ARRAY' eq ref $_ ? $_ : [ $_, $_ ] } @$tests;
-+    my $schedule = $self->_rule_clause( $rules, \@tests );
-+
-+    # If any tests are left add them as a sequential block at the end of
-+    # the run.
-+    $schedule = [ [ $schedule, @tests ] ] if @tests;
-+
-+    $self->{schedule} = $schedule;
-+}
-+
-+sub _rule_clause {
-+    my ( $self, $rule, $tests ) = @_;
-+    croak 'Rule clause must be a hash'
-+      unless 'HASH' eq ref $rule;
-+
-+    my @type = keys %$rule;
-+    croak 'Rule clause must have exactly one key'
-+      unless @type == 1;
-+
-+    my %handlers = (
-+        par => sub {
-+            [ map { [$_] } @_ ];
-+        },
-+        seq => sub { [ [@_] ] },
-+    );
-+
-+    my $handler = $handlers{ $type[0] }
-+      || croak 'Unknown scheduler type: ', $type[0];
-+    my $val = $rule->{ $type[0] };
-+
-+    return $handler->(
-+        map {
-+            'HASH' eq ref $_
-+              ? $self->_rule_clause( $_, $tests )
-+              : $self->_expand( $_, $tests )
-+          } 'ARRAY' eq ref $val ? @$val : $val
-+    );
-+}
-+
-+sub _glob_to_regexp {
-+    my ( $self, $glob ) = @_;
-+    my $nesting;
-+    my $pattern;
-+
-+    while (1) {
-+        if ( $glob =~ /\G\*\*/gc ) {
-+
-+            # ** is any number of characters, including /, within a pathname
-+            $pattern .= '.*?';
-+        }
-+        elsif ( $glob =~ /\G\*/gc ) {
-+
-+            # * is zero or more characters within a filename/directory name
-+            $pattern .= '[^/]*';
-+        }
-+        elsif ( $glob =~ /\G\?/gc ) {
-+
-+            # ? is exactly one character within a filename/directory name
-+            $pattern .= '[^/]';
-+        }
-+        elsif ( $glob =~ /\G\{/gc ) {
-+
-+            # {foo,bar,baz} is any of foo, bar or baz.
-+            $pattern .= '(?:';
-+            ++$nesting;
-+        }
-+        elsif ( $nesting and $glob =~ /\G,/gc ) {
-+
-+            # , is only special inside {}
-+            $pattern .= '|';
-+        }
-+        elsif ( $nesting and $glob =~ /\G\}/gc ) {
-+
-+            # } that matches { is special. But unbalanced } are not.
-+            $pattern .= ')';
-+            --$nesting;
-+        }
-+        elsif ( $glob =~ /\G(\\.)/gc ) {
-+
-+            # A quoted literal
-+            $pattern .= $1;
-+        }
-+        elsif ( $glob =~ /\G([\},])/gc ) {
-+
-+            # Sometimes meta characters
-+            $pattern .= '\\' . $1;
-+        }
-+        else {
-+
-+            # Eat everything that is not a meta character.
-+            $glob =~ /\G([^{?*\\\},]*)/gc;
-+            $pattern .= quotemeta $1;
-+        }
-+        return $pattern if pos $glob == length $glob;
-+    }
-+}
-+
-+sub _expand {
-+    my ( $self, $name, $tests ) = @_;
-+
-+    my $pattern = $self->_glob_to_regexp($name);
-+    $pattern = qr/^ $pattern $/x;
-+    my @match = ();
-+
-+    for ( my $ti = 0; $ti < @$tests; $ti++ ) {
-+        if ( $tests->[$ti]->filename =~ $pattern ) {
-+            push @match, splice @$tests, $ti, 1;
-+            $ti--;
-+        }
-+    }
-+
-+    return @match;
-+}
-+
-+=head3 C<get_all>
-+
-+Get a list of all remaining tests.
-+
-+=cut
-+
-+sub get_all {
-+    my $self = shift;
-+    my @all  = $self->_gather( $self->{schedule} );
-+    $self->{count} = @all;
-+    @all;
-+}
-+
-+sub _gather {
-+    my ( $self, $rule ) = @_;
-+    return unless defined $rule;
-+    return $rule unless 'ARRAY' eq ref $rule;
-+    return map { defined() ? $self->_gather($_) : () } map {@$_} @$rule;
-+}
-+
-+=head3 C<get_job>
-+
-+Return the next available job or C<undef> if none are available. Returns
-+a C<TAP::Parser::Scheduler::Spinner> if the scheduler still has pending
-+jobs but none are available to run right now.
-+
-+=cut
-+
-+sub get_job {
-+    my $self = shift;
-+    $self->{count} ||= $self->get_all;
-+    my @jobs = $self->_find_next_job( $self->{schedule} );
-+    if (@jobs) {
-+        --$self->{count};
-+        return $jobs[0];
-+    }
-+
-+    return TAP::Parser::Scheduler::Spinner->new
-+      if $self->{count};
-+
-+    return;
-+}
-+
-+sub _not_empty {
-+    my $ar = shift;
-+    return 1 unless 'ARRAY' eq ref $ar;
-+    foreach (@$ar) {
-+        return 1 if _not_empty($_);
-+    }
-+    return;
-+}
-+
-+sub _is_empty { !_not_empty(@_) }
-+
-+sub _find_next_job {
-+    my ( $self, $rule ) = @_;
-+
-+    my @queue = ();
-+    my $index = 0;
-+    while ( $index < @$rule ) {
-+        my $seq = $rule->[$index];
-+
-+        # Prune any exhausted items.
-+        shift @$seq while @$seq && _is_empty( $seq->[0] );
-+        if (@$seq) {
-+            if ( defined $seq->[0] ) {
-+                if ( 'ARRAY' eq ref $seq->[0] ) {
-+                    push @queue, $seq;
-+                }
-+                else {
-+                    my $job = splice @$seq, 0, 1, undef;
-+                    $job->on_finish( sub { shift @$seq } );
-+                    return $job;
-+                }
-+            }
-+            ++$index;
-+        }
-+        else {
-+
-+            # Remove the empty sub-array from the array
-+            splice @$rule, $index, 1;
-+        }
-+    }
-+
-+    for my $seq (@queue) {
-+        if ( my @jobs = $self->_find_next_job( $seq->[0] ) ) {
-+            return @jobs;
-+        }
-+    }
-+
-+    return;
-+}
-+
-+=head3 C<as_string>
-+
-+Return a human readable representation of the scheduling tree.
-+
-+=cut
-+
-+sub as_string {
-+    my $self = shift;
-+    return $self->_as_string( $self->{schedule} );
-+}
-+
-+sub _as_string {
-+    my ( $self, $rule, $depth ) = ( shift, shift, shift || 0 );
-+    my $pad    = ' ' x 2;
-+    my $indent = $pad x $depth;
-+    if ( !defined $rule ) {
-+        return "$indent(undef)\n";
-+    }
-+    elsif ( 'ARRAY' eq ref $rule ) {
-+        return unless @$rule;
-+        my $type = ( 'par', 'seq' )[ $depth % 2 ];
-+        return join(
-+            '', "$indent$type:\n",
-+            map { $self->_as_string( $_, $depth + 1 ) } @$rule
-+        );
-+    }
-+    else {
-+        return "$indent'" . $rule->filename . "'\n";
-+    }
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Source/Perl.pm perl-5.10.0/lib/TAP/Parser/Source/Perl.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Source/Perl.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Source/Perl.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,326 @@
-+package TAP::Parser::Source::Perl;
-+
-+use strict;
-+use Config;
-+use vars qw($VERSION @ISA);
-+
-+use constant IS_WIN32 => ( $^O =~ /^(MS)?Win32$/ );
-+use constant IS_VMS => ( $^O eq 'VMS' );
-+
-+use TAP::Parser::Source;
-+use TAP::Parser::Utils qw( split_shell );
-+
-+@ISA = 'TAP::Parser::Source';
-+
-+=head1 NAME
-+
-+TAP::Parser::Source::Perl - Stream Perl output
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+  use TAP::Parser::Source::Perl;
-+  my $perl = TAP::Parser::Source::Perl->new;
-+  my $stream = $perl->source( [ $filename, @args ] )->get_stream;
-+
-+=head1 DESCRIPTION
-+
-+Takes a filename and hopefully returns a stream from it.  The filename should
-+be the name of a Perl program.
-+
-+Note that this is a subclass of L<TAP::Parser::Source>.  See that module for
-+more methods.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+ my $perl = TAP::Parser::Source::Perl->new;
-+
-+Returns a new C<TAP::Parser::Source::Perl> object.
-+
-+=head2 Instance Methods
-+
-+=head3 C<source>
-+
-+Getter/setter the name of the test program and any arguments it requires.
-+
-+  my ($filename, @args) = @{ $perl->source };
-+  $perl->source( [ $filename, @args ] );
-+
-+C<croak>s if C<$filename> could not be found.
-+
-+=cut
-+
-+sub source {
-+    my $self = shift;
-+    $self->_croak("Cannot find ($_[0][0])")
-+      if @_ && !-f $_[0][0];
-+    return $self->SUPER::source(@_);
-+}
-+
-+=head3 C<switches>
-+
-+  my $switches = $perl->switches;
-+  my @switches = $perl->switches;
-+  $perl->switches( \@switches );
-+
-+Getter/setter for the additional switches to pass to the perl executable.  One
-+common switch would be to set an include directory:
-+
-+  $perl->switches( ['-Ilib'] );
-+
-+=cut
-+
-+sub switches {
-+    my $self = shift;
-+    unless (@_) {
-+        return wantarray ? @{ $self->{switches} } : $self->{switches};
-+    }
-+    my $switches = shift;
-+    $self->{switches} = [@$switches];    # force a copy
-+    return $self;
-+}
-+
-+##############################################################################
-+
-+=head3 C<get_stream>
-+
-+  my $stream = $source->get_stream($parser);
-+
-+Returns a stream of the output generated by executing C<source>. Must be
-+passed an object that implements a C<make_iterator> method. Typically
-+this is a TAP::Parser instance.
-+
-+=cut
-+
-+sub get_stream {
-+    my ( $self, $factory ) = @_;
-+
-+    my @switches = $self->_switches;
-+    my $path_sep = $Config{path_sep};
-+    my $path_pat = qr{$path_sep};
-+
-+    # Filter out any -I switches to be handled as libs later.
-+    #
-+    # Nasty kludge. It might be nicer if we got the libs separately
-+    # although at least this way we find any -I switches that were
-+    # supplied other then as explicit libs.
-+    #
-+    # We filter out any names containing colons because they will break
-+    # PERL5LIB
-+    my @libs;
-+    my @filtered_switches;
-+    for (@switches) {
-+        if ( !/$path_pat/ && / ^ ['"]? -I ['"]? (.*?) ['"]? $ /x ) {
-+            push @libs, $1;
-+        }
-+        else {
-+            push @filtered_switches, $_;
-+        }
-+    }
-+    @switches = @filtered_switches;
-+
-+    my $setup = sub {
-+        if (@libs) {
-+            $ENV{PERL5LIB}
-+              = join( $path_sep, grep {defined} @libs, $ENV{PERL5LIB} );
-+        }
-+    };
-+
-+    # Cargo culted from comments seen elsewhere about VMS / environment
-+    # variables. I don't know if this is actually necessary.
-+    my $previous = $ENV{PERL5LIB};
-+    my $teardown = sub {
-+        if ( defined $previous ) {
-+            $ENV{PERL5LIB} = $previous;
-+        }
-+        else {
-+            delete $ENV{PERL5LIB};
-+        }
-+    };
-+
-+    # Taint mode ignores environment variables so we must retranslate
-+    # PERL5LIB as -I switches and place PERL5OPT on the command line
-+    # in order that it be seen.
-+    if ( grep { $_ eq "-T" || $_ eq "-t" } @switches ) {
-+        push @switches, $self->_libs2switches(@libs);
-+        push @switches, split_shell( $ENV{PERL5OPT} );
-+    }
-+
-+    my @command = $self->_get_command_for_switches(@switches)
-+      or $self->_croak("No command found!");
-+
-+    return $factory->make_iterator(
-+        {   command  => \@command,
-+            merge    => $self->merge,
-+            setup    => $setup,
-+            teardown => $teardown,
-+        }
-+    );
-+}
-+
-+sub _get_command_for_switches {
-+    my $self     = shift;
-+    my @switches = @_;
-+    my ( $file, @args ) = @{ $self->source };
-+    my $command = $self->_get_perl;
-+
-+# XXX we never need to quote if we treat the parts as atoms (except maybe vms)
-+#$file = qq["$file"] if ( $file =~ /\s/ ) && ( $file !~ /^".*"$/ );
-+    my @command = ( $command, @switches, $file, @args );
-+    return @command;
-+}
-+
-+sub _get_command {
-+    my $self = shift;
-+    return $self->_get_command_for_switches( $self->_switches );
-+}
-+
-+sub _libs2switches {
-+    my $self = shift;
-+    return map {"-I$_"} grep {$_} @_;
-+}
-+
-+=head3 C<shebang>
-+
-+Get the shebang line for a script file.
-+
-+  my $shebang = TAP::Parser::Source::Perl->shebang( $some_script );
-+
-+May be called as a class method
-+
-+=cut
-+
-+{
-+
-+    # Global shebang cache.
-+    my %shebang_for;
-+
-+    sub _read_shebang {
-+        my $file = shift;
-+        local *TEST;
-+        my $shebang;
-+        if ( open( TEST, $file ) ) {
-+            $shebang = <TEST>;
-+            close(TEST) or print "Can't close $file. $!\n";
-+        }
-+        else {
-+            print "Can't open $file. $!\n";
-+        }
-+        return $shebang;
-+    }
-+
-+    sub shebang {
-+        my ( $class, $file ) = @_;
-+        unless ( exists $shebang_for{$file} ) {
-+            $shebang_for{$file} = _read_shebang($file);
-+        }
-+        return $shebang_for{$file};
-+    }
-+}
-+
-+=head3 C<get_taint>
-+
-+Decode any taint switches from a Perl shebang line.
-+
-+  # $taint will be 't'
-+  my $taint = TAP::Parser::Source::Perl->get_taint( '#!/usr/bin/perl -t' );
-+
-+  # $untaint will be undefined
-+  my $untaint = TAP::Parser::Source::Perl->get_taint( '#!/usr/bin/perl' );
-+
-+=cut
-+
-+sub get_taint {
-+    my ( $class, $shebang ) = @_;
-+    return
-+      unless defined $shebang
-+          && $shebang =~ /^#!.*\bperl.*\s-\w*([Tt]+)/;
-+    return $1;
-+}
-+
-+sub _switches {
-+    my $self = shift;
-+    my ( $file, @args ) = @{ $self->source };
-+    my @switches = (
-+        $self->switches,
-+    );
-+
-+    my $shebang = $self->shebang($file);
-+    return unless defined $shebang;
-+
-+    my $taint = $self->get_taint($shebang);
-+    push @switches, "-$taint" if defined $taint;
-+
-+    # Quote the argument if we're VMS, since VMS will downcase anything
-+    # not quoted.
-+    if (IS_VMS) {
-+        for (@switches) {
-+            $_ = qq["$_"];
-+        }
-+    }
-+
-+    return @switches;
-+}
-+
-+sub _get_perl {
-+    my $self = shift;
-+    return $ENV{HARNESS_PERL} if defined $ENV{HARNESS_PERL};
-+    return Win32::GetShortPathName($^X) if IS_WIN32;
-+    return $^X;
-+}
-+
-+1;
-+
-+=head1 SUBCLASSING
-+
-+Please see L<TAP::Parser/SUBCLASSING> for a subclassing overview.
-+
-+=head2 Example
-+
-+  package MyPerlSource;
-+
-+  use strict;
-+  use vars '@ISA';
-+
-+  use Carp qw( croak );
-+  use TAP::Parser::Source::Perl;
-+
-+  @ISA = qw( TAP::Parser::Source::Perl );
-+
-+  sub source {
-+      my ($self, $args) = @_;
-+      if ($args) {
-+	  $self->{file} = $args->[0];
-+	  return $self->SUPER::source($args);
-+      }
-+      return $self->SUPER::source;
-+  }
-+
-+  # use the version of perl from the shebang line in the test file
-+  sub _get_perl {
-+      my $self = shift;
-+      if (my $shebang = $self->shebang( $self->{file} )) {
-+          $shebang =~ /^#!(.*\bperl.*?)(?:(?:\s)|(?:$))/;
-+	  return $1 if $1;
-+      }
-+      return $self->SUPER::_get_perl(@_);
-+  }
-+
-+=head1 SEE ALSO
-+
-+L<TAP::Object>,
-+L<TAP::Parser>,
-+L<TAP::Parser::Source>,
-+
-+=cut
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Source.pm perl-5.10.0/lib/TAP/Parser/Source.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Source.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Source.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,173 @@
-+package TAP::Parser::Source;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Object                  ();
-+use TAP::Parser::IteratorFactory ();
-+
-+@ISA = qw(TAP::Object);
-+
-+# Causes problem on MacOS and shouldn't be necessary anyway
-+#$SIG{CHLD} = sub { wait };
-+
-+=head1 NAME
-+
-+TAP::Parser::Source - Stream output from some source
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+  use TAP::Parser::Source;
-+  my $source = TAP::Parser::Source->new;
-+  my $stream = $source->source(['/usr/bin/ruby', 'mytest.rb'])->get_stream;
-+
-+=head1 DESCRIPTION
-+
-+Takes a command and hopefully returns a stream from it.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+ my $source = TAP::Parser::Source->new;
-+
-+Returns a new C<TAP::Parser::Source> object.
-+
-+=cut
-+
-+# new() implementation supplied by TAP::Object
-+
-+sub _initialize {
-+    my ( $self, $args ) = @_;
-+    $self->{switches} = [];
-+    _autoflush( \*STDOUT );
-+    _autoflush( \*STDERR );
-+    return $self;
-+}
-+
-+##############################################################################
-+
-+=head2 Instance Methods
-+
-+=head3 C<source>
-+
-+ my $source = $source->source;
-+ $source->source(['./some_prog some_test_file']);
-+
-+ # or
-+ $source->source(['/usr/bin/ruby', 't/ruby_test.rb']);
-+
-+Getter/setter for the source.  The source should generally consist of an array
-+reference of strings which, when executed via L<&IPC::Open3::open3|IPC::Open3>,
-+should return a filehandle which returns successive rows of TAP.  C<croaks> if
-+it doesn't get an arrayref.
-+
-+=cut
-+
-+sub source {
-+    my $self = shift;
-+    return $self->{source} unless @_;
-+    unless ( 'ARRAY' eq ref $_[0] ) {
-+        $self->_croak('Argument to &source must be an array reference');
-+    }
-+    $self->{source} = shift;
-+    return $self;
-+}
-+
-+##############################################################################
-+
-+=head3 C<get_stream>
-+
-+ my $stream = $source->get_stream;
-+
-+Returns a L<TAP::Parser::Iterator> stream of the output generated by executing
-+C<source>.  C<croak>s if there was no command found.
-+
-+Must be passed an object that implements a C<make_iterator> method.
-+Typically this is a TAP::Parser instance.
-+
-+=cut
-+
-+sub get_stream {
-+    my ( $self, $factory ) = @_;
-+    my @command = $self->_get_command
-+      or $self->_croak('No command found!');
-+
-+    return $factory->make_iterator(
-+        {   command => \@command,
-+            merge   => $self->merge
-+        }
-+    );
-+}
-+
-+sub _get_command { return @{ shift->source || [] } }
-+
-+##############################################################################
-+
-+=head3 C<merge>
-+
-+  my $merge = $source->merge;
-+
-+Sets or returns the flag that dictates whether STDOUT and STDERR are merged.
-+
-+=cut
-+
-+sub merge {
-+    my $self = shift;
-+    return $self->{merge} unless @_;
-+    $self->{merge} = shift;
-+    return $self;
-+}
-+
-+# Turns on autoflush for the handle passed
-+sub _autoflush {
-+    my $flushed = shift;
-+    my $old_fh  = select $flushed;
-+    $| = 1;
-+    select $old_fh;
-+}
-+
-+1;
-+
-+=head1 SUBCLASSING
-+
-+Please see L<TAP::Parser/SUBCLASSING> for a subclassing overview.
-+
-+=head2 Example
-+
-+  package MyRubySource;
-+
-+  use strict;
-+  use vars '@ISA';
-+
-+  use Carp qw( croak );
-+  use TAP::Parser::Source;
-+
-+  @ISA = qw( TAP::Parser::Source );
-+
-+  # expect $source->(['mytest.rb', 'cmdline', 'args']);
-+  sub source {
-+    my ($self, $args) = @_;
-+    my ($rb_file) = @$args;
-+    croak("error: Ruby file '$rb_file' not found!") unless (-f $rb_file);
-+    return $self->SUPER::source(['/usr/bin/ruby', @$args]);
-+  }
-+
-+=head1 SEE ALSO
-+
-+L<TAP::Object>,
-+L<TAP::Parser>,
-+L<TAP::Parser::Source::Perl>,
-+
-+=cut
-+
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/Utils.pm perl-5.10.0/lib/TAP/Parser/Utils.pm
---- perl-5.10.0.orig/lib/TAP/Parser/Utils.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Utils.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,72 @@
-+package TAP::Parser::Utils;
-+
-+use strict;
-+use Exporter;
-+use vars qw($VERSION @ISA @EXPORT_OK);
-+
-+@ISA       = qw( Exporter );
-+@EXPORT_OK = qw( split_shell );
-+
-+=head1 NAME
-+
-+TAP::Parser::Utils - Internal TAP::Parser utilities
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+=head1 SYNOPSIS
-+
-+  use TAP::Parser::Utils qw( split_shell )
-+  my @switches = split_shell( $arg );
-+
-+=head1 DESCRIPTION
-+
-+B<FOR INTERNAL USE ONLY!>
-+
-+=head2 INTERFACE
-+
-+=head3 C<split_shell>
-+
-+Shell style argument parsing. Handles backslash escaping, single and
-+double quoted strings but not shell substitutions.
-+
-+Pass one or more strings containing shell escaped arguments. The return
-+value is an array of arguments parsed from the input strings according
-+to (approximate) shell parsing rules. It's legal to pass C<undef> in
-+which case an empty array will be returned. That makes it possible to
-+
-+    my @args = split_shell( $ENV{SOME_ENV_VAR} );
-+
-+without worrying about whether the environment variable exists.
-+
-+This is used to split HARNESS_PERL_ARGS into individual switches.
-+
-+=cut
-+
-+sub split_shell {
-+    my @parts = ();
-+
-+    for my $switch ( grep defined && length, @_ ) {
-+        push @parts, $1 while $switch =~ /
-+        ( 
-+            (?:   [^\\"'\s]+
-+                | \\. 
-+                | " (?: \\. | [^"] )* "
-+                | ' (?: \\. | [^'] )* ' 
-+            )+
-+        ) /xg;
-+    }
-+
-+    for (@parts) {
-+        s/ \\(.) | ['"] /defined $1 ? $1 : ''/exg;
-+    }
-+
-+    return @parts;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/YAMLish/Reader.pm perl-5.10.0/lib/TAP/Parser/YAMLish/Reader.pm
---- perl-5.10.0.orig/lib/TAP/Parser/YAMLish/Reader.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/YAMLish/Reader.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,333 @@
-+package TAP::Parser::YAMLish::Reader;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Object ();
-+
-+@ISA     = 'TAP::Object';
-+$VERSION = '3.16';
-+
-+# TODO:
-+#   Handle blessed object syntax
-+
-+# Printable characters for escapes
-+my %UNESCAPES = (
-+    z => "\x00", a => "\x07", t    => "\x09",
-+    n => "\x0a", v => "\x0b", f    => "\x0c",
-+    r => "\x0d", e => "\x1b", '\\' => '\\',
-+);
-+
-+my $QQ_STRING    = qr{ " (?:\\. | [^"])* " }x;
-+my $HASH_LINE    = qr{ ^ ($QQ_STRING|\S+) \s* : \s* (?: (.+?) \s* )? $ }x;
-+my $IS_HASH_KEY  = qr{ ^ [\w\'\"] }x;
-+my $IS_END_YAML  = qr{ ^ \.\.\. \s* $ }x;
-+my $IS_QQ_STRING = qr{ ^ $QQ_STRING $ }x;
-+
-+# new() implementation supplied by TAP::Object
-+
-+sub read {
-+    my $self = shift;
-+    my $obj  = shift;
-+
-+    die "Must have a code reference to read input from"
-+      unless ref $obj eq 'CODE';
-+
-+    $self->{reader}  = $obj;
-+    $self->{capture} = [];
-+
-+    # Prime the reader
-+    $self->_next;
-+    return unless $self->{next};
-+
-+    my $doc = $self->_read;
-+
-+    # The terminator is mandatory otherwise we'd consume a line from the
-+    # iterator that doesn't belong to us. If we want to remove this
-+    # restriction we'll have to implement look-ahead in the iterators.
-+    # Which might not be a bad idea.
-+    my $dots = $self->_peek;
-+    die "Missing '...' at end of YAMLish"
-+      unless defined $dots
-+          and $dots =~ $IS_END_YAML;
-+
-+    delete $self->{reader};
-+    delete $self->{next};
-+
-+    return $doc;
-+}
-+
-+sub get_raw { join( "\n", grep defined, @{ shift->{capture} || [] } ) . "\n" }
-+
-+sub _peek {
-+    my $self = shift;
-+    return $self->{next} unless wantarray;
-+    my $line = $self->{next};
-+    $line =~ /^ (\s*) (.*) $ /x;
-+    return ( $2, length $1 );
-+}
-+
-+sub _next {
-+    my $self = shift;
-+    die "_next called with no reader"
-+      unless $self->{reader};
-+    my $line = $self->{reader}->();
-+    $self->{next} = $line;
-+    push @{ $self->{capture} }, $line;
-+}
-+
-+sub _read {
-+    my $self = shift;
-+
-+    my $line = $self->_peek;
-+
-+    # Do we have a document header?
-+    if ( $line =~ /^ --- (?: \s* (.+?) \s* )? $/x ) {
-+        $self->_next;
-+
-+        return $self->_read_scalar($1) if defined $1;    # Inline?
-+
-+        my ( $next, $indent ) = $self->_peek;
-+
-+        if ( $next =~ /^ - /x ) {
-+            return $self->_read_array($indent);
-+        }
-+        elsif ( $next =~ $IS_HASH_KEY ) {
-+            return $self->_read_hash( $next, $indent );
-+        }
-+        elsif ( $next =~ $IS_END_YAML ) {
-+            die "Premature end of YAMLish";
-+        }
-+        else {
-+            die "Unsupported YAMLish syntax: '$next'";
-+        }
-+    }
-+    else {
-+        die "YAMLish document header not found";
-+    }
-+}
-+
-+# Parse a double quoted string
-+sub _read_qq {
-+    my $self = shift;
-+    my $str  = shift;
-+
-+    unless ( $str =~ s/^ " (.*?) " $/$1/x ) {
-+        die "Internal: not a quoted string";
-+    }
-+
-+    $str =~ s/\\"/"/gx;
-+    $str =~ s/ \\ ( [tartan\\favez] | x([0-9a-fA-F]{2}) ) 
-+                 / (length($1) > 1) ? pack("H2", $2) : $UNESCAPES{$1} /gex;
-+    return $str;
-+}
-+
-+# Parse a scalar string to the actual scalar
-+sub _read_scalar {
-+    my $self   = shift;
-+    my $string = shift;
-+
-+    return undef if $string eq '~';
-+    return {} if $string eq '{}';
-+    return [] if $string eq '[]';
-+
-+    if ( $string eq '>' || $string eq '|' ) {
-+
-+        my ( $line, $indent ) = $self->_peek;
-+        die "Multi-line scalar content missing" unless defined $line;
-+
-+        my @multiline = ($line);
-+
-+        while (1) {
-+            $self->_next;
-+            my ( $next, $ind ) = $self->_peek;
-+            last if $ind < $indent;
-+
-+            my $pad = $string eq '|' ? ( ' ' x ( $ind - $indent ) ) : '';
-+            push @multiline, $pad . $next;
-+        }
-+
-+        return join( ( $string eq '>' ? ' ' : "\n" ), @multiline ) . "\n";
-+    }
-+
-+    if ( $string =~ /^ ' (.*) ' $/x ) {
-+        ( my $rv = $1 ) =~ s/''/'/g;
-+        return $rv;
-+    }
-+
-+    if ( $string =~ $IS_QQ_STRING ) {
-+        return $self->_read_qq($string);
-+    }
-+
-+    if ( $string =~ /^['"]/ ) {
-+
-+        # A quote with folding... we don't support that
-+        die __PACKAGE__ . " does not support multi-line quoted scalars";
-+    }
-+
-+    # Regular unquoted string
-+    return $string;
-+}
-+
-+sub _read_nested {
-+    my $self = shift;
-+
-+    my ( $line, $indent ) = $self->_peek;
-+
-+    if ( $line =~ /^ -/x ) {
-+        return $self->_read_array($indent);
-+    }
-+    elsif ( $line =~ $IS_HASH_KEY ) {
-+        return $self->_read_hash( $line, $indent );
-+    }
-+    else {
-+        die "Unsupported YAMLish syntax: '$line'";
-+    }
-+}
-+
-+# Parse an array
-+sub _read_array {
-+    my ( $self, $limit ) = @_;
-+
-+    my $ar = [];
-+
-+    while (1) {
-+        my ( $line, $indent ) = $self->_peek;
-+        last
-+          if $indent < $limit
-+              || !defined $line
-+              || $line =~ $IS_END_YAML;
-+
-+        if ( $indent > $limit ) {
-+            die "Array line over-indented";
-+        }
-+
-+        if ( $line =~ /^ (- \s+) \S+ \s* : (?: \s+ | $ ) /x ) {
-+            $indent += length $1;
-+            $line =~ s/-\s+//;
-+            push @$ar, $self->_read_hash( $line, $indent );
-+        }
-+        elsif ( $line =~ /^ - \s* (.+?) \s* $/x ) {
-+            die "Unexpected start of YAMLish" if $line =~ /^---/;
-+            $self->_next;
-+            push @$ar, $self->_read_scalar($1);
-+        }
-+        elsif ( $line =~ /^ - \s* $/x ) {
-+            $self->_next;
-+            push @$ar, $self->_read_nested;
-+        }
-+        elsif ( $line =~ $IS_HASH_KEY ) {
-+            $self->_next;
-+            push @$ar, $self->_read_hash( $line, $indent, );
-+        }
-+        else {
-+            die "Unsupported YAMLish syntax: '$line'";
-+        }
-+    }
-+
-+    return $ar;
-+}
-+
-+sub _read_hash {
-+    my ( $self, $line, $limit ) = @_;
-+
-+    my $indent;
-+    my $hash = {};
-+
-+    while (1) {
-+        die "Badly formed hash line: '$line'"
-+          unless $line =~ $HASH_LINE;
-+
-+        my ( $key, $value ) = ( $self->_read_scalar($1), $2 );
-+        $self->_next;
-+
-+        if ( defined $value ) {
-+            $hash->{$key} = $self->_read_scalar($value);
-+        }
-+        else {
-+            $hash->{$key} = $self->_read_nested;
-+        }
-+
-+        ( $line, $indent ) = $self->_peek;
-+        last
-+          if $indent < $limit
-+              || !defined $line
-+              || $line =~ $IS_END_YAML;
-+    }
-+
-+    return $hash;
-+}
-+
-+1;
-+
-+__END__
-+
-+=pod
-+
-+=head1 NAME
-+
-+TAP::Parser::YAMLish::Reader - Read YAMLish data from iterator
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=head1 SYNOPSIS
-+
-+=head1 DESCRIPTION
-+
-+Note that parts of this code were derived from L<YAML::Tiny> with the
-+permission of Adam Kennedy.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+The constructor C<new> creates and returns an empty
-+C<TAP::Parser::YAMLish::Reader> object.
-+
-+ my $reader = TAP::Parser::YAMLish::Reader->new; 
-+
-+=head2 Instance Methods
-+
-+=head3 C<read>
-+
-+ my $got = $reader->read($stream);
-+
-+Read YAMLish from a L<TAP::Parser::Iterator> and return the data structure it
-+represents.
-+
-+=head3 C<get_raw>
-+
-+ my $source = $reader->get_source;
-+
-+Return the raw YAMLish source from the most recent C<read>.
-+
-+=head1 AUTHOR
-+
-+Andy Armstrong, <andy@hexten.net>
-+
-+Adam Kennedy wrote L<YAML::Tiny> which provided the template and many of
-+the YAML matching regular expressions for this module.
-+
-+=head1 SEE ALSO
-+
-+L<YAML::Tiny>, L<YAML>, L<YAML::Syck>, L<Config::Tiny>, L<CSS::Tiny>,
-+L<http://use.perl.org/~Alias/journal/29427>
-+
-+=head1 COPYRIGHT
-+
-+Copyright 2007-2008 Andy Armstrong.
-+
-+Portions copyright 2006-2008 Adam Kennedy.
-+
-+This program is free software; you can redistribute
-+it and/or modify it under the same terms as Perl itself.
-+
-+The full text of the license can be found in the
-+LICENSE file included with this module.
-+
-+=cut
-+
-diff -urN perl-5.10.0.orig/lib/TAP/Parser/YAMLish/Writer.pm perl-5.10.0/lib/TAP/Parser/YAMLish/Writer.pm
---- perl-5.10.0.orig/lib/TAP/Parser/YAMLish/Writer.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/YAMLish/Writer.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,255 @@
-+package TAP::Parser::YAMLish::Writer;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Object ();
-+
-+@ISA     = 'TAP::Object';
-+$VERSION = '3.16';
-+
-+my $ESCAPE_CHAR = qr{ [ \x00-\x1f \" ] }x;
-+my $ESCAPE_KEY  = qr{ (?: ^\W ) | $ESCAPE_CHAR }x;
-+
-+my @UNPRINTABLE = qw(
-+  z    x01  x02  x03  x04  x05  x06  a
-+  x08  t    n    v    f    r    x0e  x0f
-+  x10  x11  x12  x13  x14  x15  x16  x17
-+  x18  x19  x1a  e    x1c  x1d  x1e  x1f
-+);
-+
-+# new() implementation supplied by TAP::Object
-+
-+sub write {
-+    my $self = shift;
-+
-+    die "Need something to write"
-+      unless @_;
-+
-+    my $obj = shift;
-+    my $out = shift || \*STDOUT;
-+
-+    die "Need a reference to something I can write to"
-+      unless ref $out;
-+
-+    $self->{writer} = $self->_make_writer($out);
-+
-+    $self->_write_obj( '---', $obj );
-+    $self->_put('...');
-+
-+    delete $self->{writer};
-+}
-+
-+sub _make_writer {
-+    my $self = shift;
-+    my $out  = shift;
-+
-+    my $ref = ref $out;
-+
-+    if ( 'CODE' eq $ref ) {
-+        return $out;
-+    }
-+    elsif ( 'ARRAY' eq $ref ) {
-+        return sub { push @$out, shift };
-+    }
-+    elsif ( 'SCALAR' eq $ref ) {
-+        return sub { $$out .= shift() . "\n" };
-+    }
-+    elsif ( 'GLOB' eq $ref || 'IO::Handle' eq $ref ) {
-+        return sub { print $out shift(), "\n" };
-+    }
-+
-+    die "Can't write to $out";
-+}
-+
-+sub _put {
-+    my $self = shift;
-+    $self->{writer}->( join '', @_ );
-+}
-+
-+sub _enc_scalar {
-+    my $self = shift;
-+    my $val  = shift;
-+    my $rule = shift;
-+
-+    return '~' unless defined $val;
-+
-+    if ( $val =~ /$rule/ ) {
-+        $val =~ s/\\/\\\\/g;
-+        $val =~ s/"/\\"/g;
-+        $val =~ s/ ( [\x00-\x1f] ) / '\\' . $UNPRINTABLE[ ord($1) ] /gex;
-+        return qq{"$val"};
-+    }
-+
-+    if ( length($val) == 0 or $val =~ /\s/ ) {
-+        $val =~ s/'/''/;
-+        return "'$val'";
-+    }
-+
-+    return $val;
-+}
-+
-+sub _write_obj {
-+    my $self   = shift;
-+    my $prefix = shift;
-+    my $obj    = shift;
-+    my $indent = shift || 0;
-+
-+    if ( my $ref = ref $obj ) {
-+        my $pad = '  ' x $indent;
-+        if ( 'HASH' eq $ref ) {
-+            if ( keys %$obj ) {
-+                $self->_put($prefix);
-+                for my $key ( sort keys %$obj ) {
-+                    my $value = $obj->{$key};
-+                    $self->_write_obj(
-+                        $pad . $self->_enc_scalar( $key, $ESCAPE_KEY ) . ':',
-+                        $value, $indent + 1
-+                    );
-+                }
-+            }
-+            else {
-+                $self->_put( $prefix, ' {}' );
-+            }
-+        }
-+        elsif ( 'ARRAY' eq $ref ) {
-+            if (@$obj) {
-+                $self->_put($prefix);
-+                for my $value (@$obj) {
-+                    $self->_write_obj(
-+                        $pad . '-', $value,
-+                        $indent + 1
-+                    );
-+                }
-+            }
-+            else {
-+                $self->_put( $prefix, ' []' );
-+            }
-+        }
-+        else {
-+            die "Don't know how to encode $ref";
-+        }
-+    }
-+    else {
-+        $self->_put( $prefix, ' ', $self->_enc_scalar( $obj, $ESCAPE_CHAR ) );
-+    }
-+}
-+
-+1;
-+
-+__END__
-+
-+=pod
-+
-+=head1 NAME
-+
-+TAP::Parser::YAMLish::Writer - Write YAMLish data
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=head1 SYNOPSIS
-+
-+    use TAP::Parser::YAMLish::Writer;
-+    
-+    my $data = {
-+        one => 1,
-+        two => 2,
-+        three => [ 1, 2, 3 ],
-+    };
-+    
-+    my $yw = TAP::Parser::YAMLish::Writer->new;
-+    
-+    # Write to an array...
-+    $yw->write( $data, \@some_array );
-+    
-+    # ...an open file handle...
-+    $yw->write( $data, $some_file_handle );
-+    
-+    # ...a string ...
-+    $yw->write( $data, \$some_string );
-+    
-+    # ...or a closure
-+    $yw->write( $data, sub {
-+        my $line = shift;
-+        print "$line\n";
-+    } );
-+
-+=head1 DESCRIPTION
-+
-+Encodes a scalar, hash reference or array reference as YAMLish.
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+ my $writer = TAP::Parser::YAMLish::Writer->new;
-+
-+The constructor C<new> creates and returns an empty
-+C<TAP::Parser::YAMLish::Writer> object.
-+
-+=head2 Instance Methods
-+
-+=head3 C<write>
-+
-+ $writer->write($obj, $output );
-+
-+Encode a scalar, hash reference or array reference as YAML.
-+
-+    my $writer = sub {
-+        my $line = shift;
-+        print SOMEFILE "$line\n";
-+    };
-+    
-+    my $data = {
-+        one => 1,
-+        two => 2,
-+        three => [ 1, 2, 3 ],
-+    };
-+    
-+    my $yw = TAP::Parser::YAMLish::Writer->new;
-+    $yw->write( $data, $writer );
-+
-+
-+The C< $output > argument may be:
-+
-+=over
-+
-+=item * a reference to a scalar to append YAML to
-+
-+=item * the handle of an open file
-+
-+=item * a reference to an array into which YAML will be pushed
-+
-+=item * a code reference
-+
-+=back
-+
-+If you supply a code reference the subroutine will be called once for
-+each line of output with the line as its only argument. Passed lines
-+will have no trailing newline.
-+
-+=head1 AUTHOR
-+
-+Andy Armstrong, <andy@hexten.net>
-+
-+=head1 SEE ALSO
-+
-+L<YAML::Tiny>, L<YAML>, L<YAML::Syck>, L<Config::Tiny>, L<CSS::Tiny>,
-+L<http://use.perl.org/~Alias/journal/29427>
-+
-+=head1 COPYRIGHT
-+
-+Copyright 2007-2008 Andy Armstrong.
-+
-+This program is free software; you can redistribute
-+it and/or modify it under the same terms as Perl itself.
-+
-+The full text of the license can be found in the
-+LICENSE file included with this module.
-+
-+=cut
-+
-diff -urN perl-5.10.0.orig/lib/TAP/Parser.pm perl-5.10.0/lib/TAP/Parser.pm
---- perl-5.10.0.orig/lib/TAP/Parser.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -0,0 +1,1869 @@
-+package TAP::Parser;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Base                    ();
-+use TAP::Parser::Grammar         ();
-+use TAP::Parser::Result          ();
-+use TAP::Parser::ResultFactory   ();
-+use TAP::Parser::Source          ();
-+use TAP::Parser::Source::Perl    ();
-+use TAP::Parser::Iterator        ();
-+use TAP::Parser::IteratorFactory ();
-+
-+use Carp qw( confess );
-+
-+=head1 NAME
-+
-+TAP::Parser - Parse L<TAP|Test::Harness::TAP> output
-+
-+=head1 VERSION
-+
-+Version 3.16
-+
-+=cut
-+
-+$VERSION = '3.16';
-+
-+my $DEFAULT_TAP_VERSION = 12;
-+my $MAX_TAP_VERSION     = 13;
-+
-+$ENV{TAP_VERSION} = $MAX_TAP_VERSION;
-+
-+END {
-+
-+    # For VMS.
-+    delete $ENV{TAP_VERSION};
-+}
-+
-+BEGIN {    # making accessors
-+    @ISA = qw(TAP::Base);
-+
-+    __PACKAGE__->mk_methods(
-+        qw(
-+          _stream
-+          _spool
-+          exec
-+          exit
-+          is_good_plan
-+          plan
-+          tests_planned
-+          tests_run
-+          wait
-+          version
-+          in_todo
-+          start_time
-+          end_time
-+          skip_all
-+          source_class
-+          perl_source_class
-+          grammar_class
-+          iterator_factory_class
-+          result_factory_class
-+          )
-+    );
-+}    # done making accessors
-+
-+=head1 SYNOPSIS
-+
-+    use TAP::Parser;
-+
-+    my $parser = TAP::Parser->new( { source => $source } );
-+
-+    while ( my $result = $parser->next ) {
-+        print $result->as_string;
-+    }
-+
-+=head1 DESCRIPTION
-+
-+C<TAP::Parser> is designed to produce a proper parse of TAP output. For
-+an example of how to run tests through this module, see the simple
-+harnesses C<examples/>.
-+
-+There's a wiki dedicated to the Test Anything Protocol:
-+
-+L<http://testanything.org>
-+
-+It includes the TAP::Parser Cookbook:
-+
-+L<http://testanything.org/wiki/index.php/TAP::Parser_Cookbook>
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<new>
-+
-+ my $parser = TAP::Parser->new(\%args);
-+
-+Returns a new C<TAP::Parser> object.
-+
-+The arguments should be a hashref with I<one> of the following keys:
-+
-+=over 4
-+
-+=item * C<source>
-+
-+This is the preferred method of passing arguments to the constructor.  To
-+determine how to handle the source, the following steps are taken.
-+
-+If the source contains a newline, it's assumed to be a string of raw TAP
-+output.
-+
-+If the source is a reference, it's assumed to be something to pass to
-+the L<TAP::Parser::Iterator::Stream> constructor. This is used
-+internally and you should not use it.
-+
-+Otherwise, the parser does a C<-e> check to see if the source exists.  If so,
-+it attempts to execute the source and read the output as a stream.  This is by
-+far the preferred method of using the parser.
-+
-+ foreach my $file ( @test_files ) {
-+     my $parser = TAP::Parser->new( { source => $file } );
-+     # do stuff with the parser
-+ }
-+
-+=item * C<tap>
-+
-+The value should be the complete TAP output.
-+
-+=item * C<exec>
-+
-+If passed an array reference, will attempt to create the iterator by
-+passing a L<TAP::Parser::Source> object to
-+L<TAP::Parser::Iterator::Source>, using the array reference strings as
-+the command arguments to L<IPC::Open3::open3|IPC::Open3>:
-+
-+ exec => [ '/usr/bin/ruby', 't/my_test.rb' ]
-+
-+Note that C<source> and C<exec> are mutually exclusive.
-+
-+=back
-+
-+The following keys are optional.
-+
-+=over 4
-+
-+=item * C<callback>
-+
-+If present, each callback corresponding to a given result type will be called
-+with the result as the argument if the C<run> method is used:
-+
-+ my %callbacks = (
-+     test    => \&test_callback,
-+     plan    => \&plan_callback,
-+     comment => \&comment_callback,
-+     bailout => \&bailout_callback,
-+     unknown => \&unknown_callback,
-+ );
-+
-+ my $aggregator = TAP::Parser::Aggregator->new;
-+ foreach my $file ( @test_files ) {
-+     my $parser = TAP::Parser->new(
-+         {
-+             source    => $file,
-+             callbacks => \%callbacks,
-+         }
-+     );
-+     $parser->run;
-+     $aggregator->add( $file, $parser );
-+ }
-+
-+=item * C<switches>
-+
-+If using a Perl file as a source, optional switches may be passed which will
-+be used when invoking the perl executable.
-+
-+ my $parser = TAP::Parser->new( {
-+     source   => $test_file,
-+     switches => '-Ilib',
-+ } );
-+
-+=item * C<test_args>
-+
-+Used in conjunction with the C<source> option to supply a reference to
-+an C<@ARGV> style array of arguments to pass to the test program.
-+
-+=item * C<spool>
-+
-+If passed a filehandle will write a copy of all parsed TAP to that handle.
-+
-+=item * C<merge>
-+
-+If false, STDERR is not captured (though it is 'relayed' to keep it
-+somewhat synchronized with STDOUT.)
-+
-+If true, STDERR and STDOUT are the same filehandle.  This may cause
-+breakage if STDERR contains anything resembling TAP format, but does
-+allow exact synchronization.
-+
-+Subtleties of this behavior may be platform-dependent and may change in
-+the future.
-+
-+=item * C<source_class>
-+
-+This option was introduced to let you easily customize which I<source> class
-+the parser should use.  It defaults to L<TAP::Parser::Source>.
-+
-+See also L</make_source>.
-+
-+=item * C<perl_source_class>
-+
-+This option was introduced to let you easily customize which I<perl source>
-+class the parser should use.  It defaults to L<TAP::Parser::Source::Perl>.
-+
-+See also L</make_perl_source>.
-+
-+=item * C<grammar_class>
-+
-+This option was introduced to let you easily customize which I<grammar> class
-+the parser should use.  It defaults to L<TAP::Parser::Grammar>.
-+
-+See also L</make_grammar>.
-+
-+=item * C<iterator_factory_class>
-+
-+This option was introduced to let you easily customize which I<iterator>
-+factory class the parser should use.  It defaults to
-+L<TAP::Parser::IteratorFactory>.
-+
-+See also L</make_iterator>.
-+
-+=item * C<result_factory_class>
-+
-+This option was introduced to let you easily customize which I<result>
-+factory class the parser should use.  It defaults to
-+L<TAP::Parser::ResultFactory>.
-+
-+See also L</make_result>.
-+
-+=back
-+
-+=cut
-+
-+# new() implementation supplied by TAP::Base
-+
-+# This should make overriding behaviour of the Parser in subclasses easier:
-+sub _default_source_class           {'TAP::Parser::Source'}
-+sub _default_perl_source_class      {'TAP::Parser::Source::Perl'}
-+sub _default_grammar_class          {'TAP::Parser::Grammar'}
-+sub _default_iterator_factory_class {'TAP::Parser::IteratorFactory'}
-+sub _default_result_factory_class   {'TAP::Parser::ResultFactory'}
-+
-+##############################################################################
-+
-+=head2 Instance Methods
-+
-+=head3 C<next>
-+
-+  my $parser = TAP::Parser->new( { source => $file } );
-+  while ( my $result = $parser->next ) {
-+      print $result->as_string, "\n";
-+  }
-+
-+This method returns the results of the parsing, one result at a time.  Note
-+that it is destructive.  You can't rewind and examine previous results.
-+
-+If callbacks are used, they will be issued before this call returns.
-+
-+Each result returned is a subclass of L<TAP::Parser::Result>.  See that
-+module and related classes for more information on how to use them.
-+
-+=cut
-+
-+sub next {
-+    my $self = shift;
-+    return ( $self->{_iter} ||= $self->_iter )->();
-+}
-+
-+##############################################################################
-+
-+=head3 C<run>
-+
-+  $parser->run;
-+
-+This method merely runs the parser and parses all of the TAP.
-+
-+=cut
-+
-+sub run {
-+    my $self = shift;
-+    while ( defined( my $result = $self->next ) ) {
-+
-+        # do nothing
-+    }
-+}
-+
-+##############################################################################
-+
-+=head3 C<make_source>
-+
-+Make a new L<TAP::Parser::Source> object and return it.  Passes through any
-+arguments given.
-+
-+The C<source_class> can be customized, as described in L</new>.
-+
-+=head3 C<make_perl_source>
-+
-+Make a new L<TAP::Parser::Source::Perl> object and return it.  Passes through
-+any arguments given.
-+
-+The C<perl_source_class> can be customized, as described in L</new>.
-+
-+=head3 C<make_grammar>
-+
-+Make a new L<TAP::Parser::Grammar> object and return it.  Passes through any
-+arguments given.
-+
-+The C<grammar_class> can be customized, as described in L</new>.
-+
-+=head3 C<make_iterator>
-+
-+Make a new L<TAP::Parser::Iterator> object using the parser's
-+L<TAP::Parser::IteratorFactory>, and return it.  Passes through any arguments
-+given.
-+
-+The C<iterator_factory_class> can be customized, as described in L</new>.
-+
-+=head3 C<make_result>
-+
-+Make a new L<TAP::Parser::Result> object using the parser's
-+L<TAP::Parser::ResultFactory>, and return it.  Passes through any arguments
-+given.
-+
-+The C<result_factory_class> can be customized, as described in L</new>.
-+
-+=cut
-+
-+# This should make overriding behaviour of the Parser in subclasses easier:
-+sub make_source      { shift->source_class->new(@_); }
-+sub make_perl_source { shift->perl_source_class->new(@_); }
-+sub make_grammar     { shift->grammar_class->new(@_); }
-+sub make_iterator    { shift->iterator_factory_class->make_iterator(@_); }
-+sub make_result      { shift->result_factory_class->make_result(@_); }
-+
-+sub _iterator_for_source {
-+    my ( $self, $source ) = @_;
-+
-+    # If the source has a get_stream method then use it. This makes it
-+    # possible to pass a pre-existing source object to the parser's
-+    # constructor.
-+    if ( UNIVERSAL::can( $source, 'can' ) && $source->can('get_stream') ) {
-+        return $source->get_stream($self);
-+    }
-+    else {
-+        return $self->iterator_factory_class->make_iterator($source);
-+    }
-+}
-+
-+{
-+
-+    # of the following, anything beginning with an underscore is strictly
-+    # internal and should not be exposed.
-+    my %initialize = (
-+        version       => $DEFAULT_TAP_VERSION,
-+        plan          => '',                    # the test plan (e.g., 1..3)
-+        tap           => '',                    # the TAP
-+        tests_run     => 0,                     # actual current test numbers
-+        results       => [],                    # TAP parser results
-+        skipped       => [],                    #
-+        todo          => [],                    #
-+        passed        => [],                    #
-+        failed        => [],                    #
-+        actual_failed => [],                    # how many tests really failed
-+        actual_passed => [],                    # how many tests really passed
-+        todo_passed  => [],    # tests which unexpectedly succeed
-+        parse_errors => [],    # perfect TAP should have none
-+    );
-+
-+    # We seem to have this list hanging around all over the place. We could
-+    # probably get it from somewhere else to avoid the repetition.
-+    my @legal_callback = qw(
-+      test
-+      version
-+      plan
-+      comment
-+      bailout
-+      unknown
-+      yaml
-+      ALL
-+      ELSE
-+      EOF
-+    );
-+
-+    my @class_overrides = qw(
-+      source_class
-+      perl_source_class
-+      grammar_class
-+      iterator_factory_class
-+      result_factory_class
-+    );
-+
-+    sub _initialize {
-+        my ( $self, $arg_for ) = @_;
-+
-+        # everything here is basically designed to convert any TAP source to a
-+        # stream.
-+
-+        # Shallow copy
-+        my %args = %{ $arg_for || {} };
-+
-+        $self->SUPER::_initialize( \%args, \@legal_callback );
-+
-+        # get any class overrides out first:
-+        for my $key (@class_overrides) {
-+            my $default_method = "_default_$key";
-+            my $val = delete $args{$key} || $self->$default_method();
-+            $self->$key($val);
-+        }
-+
-+        my $stream      = delete $args{stream};
-+        my $tap         = delete $args{tap};
-+        my $source      = delete $args{source};
-+        my $exec        = delete $args{exec};
-+        my $merge       = delete $args{merge};
-+        my $spool       = delete $args{spool};
-+        my $switches    = delete $args{switches};
-+        my $ignore_exit = delete $args{ignore_exit};
-+        my @test_args   = @{ delete $args{test_args} || [] };
-+
-+        if ( 1 < grep {defined} $stream, $tap, $source, $exec ) {
-+            $self->_croak(
-+                "You may only choose one of 'exec', 'stream', 'tap' or 'source'"
-+            );
-+        }
-+
-+        if ( my @excess = sort keys %args ) {
-+            $self->_croak("Unknown options: @excess");
-+        }
-+
-+        if ($tap) {
-+            $stream = $self->_iterator_for_source( [ split "\n" => $tap ] );
-+        }
-+        elsif ($exec) {
-+            my $source = $self->make_source;
-+            $source->source( [ @$exec, @test_args ] );
-+            $source->merge($merge);    # XXX should just be arguments?
-+            $stream = $source->get_stream($self);
-+        }
-+        elsif ($source) {
-+            if ( ref $source ) {
-+                $stream = $self->_iterator_for_source($source);
-+            }
-+            elsif ( -e $source ) {
-+                my $perl = $self->make_perl_source;
-+
-+                $perl->switches($switches)
-+                  if $switches;
-+
-+                $perl->merge($merge);    # XXX args to new()?
-+                $perl->source( [ $source, @test_args ] );
-+                $stream = $perl->get_stream($self);
-+            }
-+            else {
-+                $self->_croak("Cannot determine source for $source");
-+            }
-+        }
-+
-+        unless ($stream) {
-+            $self->_croak('PANIC: could not determine stream');
-+        }
-+
-+        while ( my ( $k, $v ) = each %initialize ) {
-+            $self->{$k} = 'ARRAY' eq ref $v ? [] : $v;
-+        }
-+
-+        $self->_stream($stream);
-+        $self->_spool($spool);
-+        $self->ignore_exit($ignore_exit);
-+
-+        return $self;
-+    }
-+}
-+
-+=head1 INDIVIDUAL RESULTS
-+
-+If you've read this far in the docs, you've seen this:
-+
-+    while ( my $result = $parser->next ) {
-+        print $result->as_string;
-+    }
-+
-+Each result returned is a L<TAP::Parser::Result> subclass, referred to as
-+I<result types>.
-+
-+=head2 Result types
-+
-+Basically, you fetch individual results from the TAP.  The six types, with
-+examples of each, are as follows:
-+
-+=over 4
-+
-+=item * Version
-+
-+ TAP version 12
-+
-+=item * Plan
-+
-+ 1..42
-+
-+=item * Pragma
-+
-+ pragma +strict
-+
-+=item * Test
-+
-+ ok 3 - We should start with some foobar!
-+
-+=item * Comment
-+
-+ # Hope we don't use up the foobar.
-+
-+=item * Bailout
-+
-+ Bail out!  We ran out of foobar!
-+
-+=item * Unknown
-+
-+ ... yo, this ain't TAP! ...
-+
-+=back
-+
-+Each result fetched is a result object of a different type.  There are common
-+methods to each result object and different types may have methods unique to
-+their type.  Sometimes a type method may be overridden in a subclass, but its
-+use is guaranteed to be identical.
-+
-+=head2 Common type methods
-+
-+=head3 C<type>
-+
-+Returns the type of result, such as C<comment> or C<test>.
-+
-+=head3 C<as_string>
-+
-+Prints a string representation of the token.  This might not be the exact
-+output, however.  Tests will have test numbers added if not present, TODO and
-+SKIP directives will be capitalized and, in general, things will be cleaned
-+up.  If you need the original text for the token, see the C<raw> method.
-+
-+=head3  C<raw>
-+
-+Returns the original line of text which was parsed.
-+
-+=head3 C<is_plan>
-+
-+Indicates whether or not this is the test plan line.
-+
-+=head3 C<is_test>
-+
-+Indicates whether or not this is a test line.
-+
-+=head3 C<is_comment>
-+
-+Indicates whether or not this is a comment. Comments will generally only
-+appear in the TAP stream if STDERR is merged to STDOUT. See the
-+C<merge> option.
-+
-+=head3 C<is_bailout>
-+
-+Indicates whether or not this is bailout line.
-+
-+=head3 C<is_yaml>
-+
-+Indicates whether or not the current item is a YAML block.
-+
-+=head3 C<is_unknown>
-+
-+Indicates whether or not the current line could be parsed.
-+
-+=head3 C<is_ok>
-+
-+  if ( $result->is_ok ) { ... }
-+
-+Reports whether or not a given result has passed.  Anything which is B<not> a
-+test result returns true.  This is merely provided as a convenient shortcut
-+which allows you to do this:
-+
-+ my $parser = TAP::Parser->new( { source => $source } );
-+ while ( my $result = $parser->next ) {
-+     # only print failing results
-+     print $result->as_string unless $result->is_ok;
-+ }
-+
-+=head2 C<plan> methods
-+
-+ if ( $result->is_plan ) { ... }
-+
-+If the above evaluates as true, the following methods will be available on the
-+C<$result> object.
-+
-+=head3 C<plan>
-+
-+  if ( $result->is_plan ) {
-+     print $result->plan;
-+  }
-+
-+This is merely a synonym for C<as_string>.
-+
-+=head3 C<directive>
-+
-+ my $directive = $result->directive;
-+
-+If a SKIP directive is included with the plan, this method will return it.
-+
-+ 1..0 # SKIP: why bother?
-+
-+=head3 C<explanation>
-+
-+ my $explanation = $result->explanation;
-+
-+If a SKIP directive was included with the plan, this method will return the
-+explanation, if any.
-+
-+=head2 C<pragma> methods
-+
-+ if ( $result->is_pragma ) { ... }
-+
-+If the above evaluates as true, the following methods will be available on the
-+C<$result> object.
-+
-+=head3 C<pragmas>
-+
-+Returns a list of pragmas each of which is a + or - followed by the
-+pragma name.
-+ 
-+=head2 C<commment> methods
-+
-+ if ( $result->is_comment ) { ... }
-+
-+If the above evaluates as true, the following methods will be available on the
-+C<$result> object.
-+
-+=head3 C<comment>
-+
-+  if ( $result->is_comment ) {
-+      my $comment = $result->comment;
-+      print "I have something to say:  $comment";
-+  }
-+
-+=head2 C<bailout> methods
-+
-+ if ( $result->is_bailout ) { ... }
-+
-+If the above evaluates as true, the following methods will be available on the
-+C<$result> object.
-+
-+=head3 C<explanation>
-+
-+  if ( $result->is_bailout ) {
-+      my $explanation = $result->explanation;
-+      print "We bailed out because ($explanation)";
-+  }
-+
-+If, and only if, a token is a bailout token, you can get an "explanation" via
-+this method.  The explanation is the text after the mystical "Bail out!" words
-+which appear in the tap output.
-+
-+=head2 C<unknown> methods
-+
-+ if ( $result->is_unknown ) { ... }
-+
-+There are no unique methods for unknown results.
-+
-+=head2 C<test> methods
-+
-+ if ( $result->is_test ) { ... }
-+
-+If the above evaluates as true, the following methods will be available on the
-+C<$result> object.
-+
-+=head3 C<ok>
-+
-+  my $ok = $result->ok;
-+
-+Returns the literal text of the C<ok> or C<not ok> status.
-+
-+=head3 C<number>
-+
-+  my $test_number = $result->number;
-+
-+Returns the number of the test, even if the original TAP output did not supply
-+that number.
-+
-+=head3 C<description>
-+
-+  my $description = $result->description;
-+
-+Returns the description of the test, if any.  This is the portion after the
-+test number but before the directive.
-+
-+=head3 C<directive>
-+
-+  my $directive = $result->directive;
-+
-+Returns either C<TODO> or C<SKIP> if either directive was present for a test
-+line.
-+
-+=head3 C<explanation>
-+
-+  my $explanation = $result->explanation;
-+
-+If a test had either a C<TODO> or C<SKIP> directive, this method will return
-+the accompanying explantion, if present.
-+
-+  not ok 17 - 'Pigs can fly' # TODO not enough acid
-+
-+For the above line, the explanation is I<not enough acid>.
-+
-+=head3 C<is_ok>
-+
-+  if ( $result->is_ok ) { ... }
-+
-+Returns a boolean value indicating whether or not the test passed.  Remember
-+that for TODO tests, the test always passes.
-+
-+B<Note:>  this was formerly C<passed>.  The latter method is deprecated and
-+will issue a warning.
-+
-+=head3 C<is_actual_ok>
-+
-+  if ( $result->is_actual_ok ) { ... }
-+
-+Returns a boolean value indicating whether or not the test passed, regardless
-+of its TODO status.
-+
-+B<Note:>  this was formerly C<actual_passed>.  The latter method is deprecated
-+and will issue a warning.
-+
-+=head3 C<is_unplanned>
-+
-+  if ( $test->is_unplanned ) { ... }
-+
-+If a test number is greater than the number of planned tests, this method will
-+return true.  Unplanned tests will I<always> return false for C<is_ok>,
-+regardless of whether or not the test C<has_todo> (see
-+L<TAP::Parser::Result::Test> for more information about this).
-+
-+=head3 C<has_skip>
-+
-+  if ( $result->has_skip ) { ... }
-+
-+Returns a boolean value indicating whether or not this test had a SKIP
-+directive.
-+
-+=head3 C<has_todo>
-+
-+  if ( $result->has_todo ) { ... }
-+
-+Returns a boolean value indicating whether or not this test had a TODO
-+directive.
-+
-+Note that TODO tests I<always> pass.  If you need to know whether or not
-+they really passed, check the C<is_actual_ok> method.
-+
-+=head3 C<in_todo>
-+
-+  if ( $parser->in_todo ) { ... }
-+
-+True while the most recent result was a TODO. Becomes true before the
-+TODO result is returned and stays true until just before the next non-
-+TODO test is returned.
-+
-+=head1 TOTAL RESULTS
-+
-+After parsing the TAP, there are many methods available to let you dig through
-+the results and determine what is meaningful to you.
-+
-+=head2 Individual Results
-+
-+These results refer to individual tests which are run.
-+
-+=head3 C<passed>
-+
-+ my @passed = $parser->passed; # the test numbers which passed
-+ my $passed = $parser->passed; # the number of tests which passed
-+
-+This method lets you know which (or how many) tests passed.  If a test failed
-+but had a TODO directive, it will be counted as a passed test.
-+
-+=cut
-+
-+sub passed { @{ shift->{passed} } }
-+
-+=head3 C<failed>
-+
-+ my @failed = $parser->failed; # the test numbers which failed
-+ my $failed = $parser->failed; # the number of tests which failed
-+
-+This method lets you know which (or how many) tests failed.  If a test passed
-+but had a TODO directive, it will B<NOT> be counted as a failed test.
-+
-+=cut
-+
-+sub failed { @{ shift->{failed} } }
-+
-+=head3 C<actual_passed>
-+
-+ # the test numbers which actually passed
-+ my @actual_passed = $parser->actual_passed;
-+
-+ # the number of tests which actually passed
-+ my $actual_passed = $parser->actual_passed;
-+
-+This method lets you know which (or how many) tests actually passed,
-+regardless of whether or not a TODO directive was found.
-+
-+=cut
-+
-+sub actual_passed { @{ shift->{actual_passed} } }
-+*actual_ok = \&actual_passed;
-+
-+=head3 C<actual_ok>
-+
-+This method is a synonym for C<actual_passed>.
-+
-+=head3 C<actual_failed>
-+
-+ # the test numbers which actually failed
-+ my @actual_failed = $parser->actual_failed;
-+
-+ # the number of tests which actually failed
-+ my $actual_failed = $parser->actual_failed;
-+
-+This method lets you know which (or how many) tests actually failed,
-+regardless of whether or not a TODO directive was found.
-+
-+=cut
-+
-+sub actual_failed { @{ shift->{actual_failed} } }
-+
-+##############################################################################
-+
-+=head3 C<todo>
-+
-+ my @todo = $parser->todo; # the test numbers with todo directives
-+ my $todo = $parser->todo; # the number of tests with todo directives
-+
-+This method lets you know which (or how many) tests had TODO directives.
-+
-+=cut
-+
-+sub todo { @{ shift->{todo} } }
-+
-+=head3 C<todo_passed>
-+
-+ # the test numbers which unexpectedly succeeded
-+ my @todo_passed = $parser->todo_passed;
-+
-+ # the number of tests which unexpectedly succeeded
-+ my $todo_passed = $parser->todo_passed;
-+
-+This method lets you know which (or how many) tests actually passed but were
-+declared as "TODO" tests.
-+
-+=cut
-+
-+sub todo_passed { @{ shift->{todo_passed} } }
-+
-+##############################################################################
-+
-+=head3 C<todo_failed>
-+
-+  # deprecated in favor of 'todo_passed'.  This method was horribly misnamed.
-+
-+This was a badly misnamed method.  It indicates which TODO tests unexpectedly
-+succeeded.  Will now issue a warning and call C<todo_passed>.
-+
-+=cut
-+
-+sub todo_failed {
-+    warn
-+      '"todo_failed" is deprecated.  Please use "todo_passed".  See the docs.';
-+    goto &todo_passed;
-+}
-+
-+=head3 C<skipped>
-+
-+ my @skipped = $parser->skipped; # the test numbers with SKIP directives
-+ my $skipped = $parser->skipped; # the number of tests with SKIP directives
-+
-+This method lets you know which (or how many) tests had SKIP directives.
-+
-+=cut
-+
-+sub skipped { @{ shift->{skipped} } }
-+
-+=head2 Pragmas
-+
-+=head3 C<pragma>
-+
-+Get or set a pragma. To get the state of a pragma:
-+
-+  if ( $p->pragma('strict') ) {
-+      # be strict
-+  }
-+
-+To set the state of a pragma:
-+
-+  $p->pragma('strict', 1); # enable strict mode
-+
-+=cut
-+
-+sub pragma {
-+    my ( $self, $pragma ) = splice @_, 0, 2;
-+
-+    return $self->{pragma}->{$pragma} unless @_;
-+
-+    if ( my $state = shift ) {
-+        $self->{pragma}->{$pragma} = 1;
-+    }
-+    else {
-+        delete $self->{pragma}->{$pragma};
-+    }
-+
-+    return;
-+}
-+
-+=head3 C<pragmas>
-+
-+Get a list of all the currently enabled pragmas:
-+
-+  my @pragmas_enabled = $p->pragmas;
-+
-+=cut
-+
-+sub pragmas { sort keys %{ shift->{pragma} || {} } }
-+
-+=head2 Summary Results
-+
-+These results are "meta" information about the total results of an individual
-+test program.
-+
-+=head3 C<plan>
-+
-+ my $plan = $parser->plan;
-+
-+Returns the test plan, if found.
-+
-+=head3 C<good_plan>
-+
-+Deprecated.  Use C<is_good_plan> instead.
-+
-+=cut
-+
-+sub good_plan {
-+    warn 'good_plan() is deprecated.  Please use "is_good_plan()"';
-+    goto &is_good_plan;
-+}
-+
-+##############################################################################
-+
-+=head3 C<is_good_plan>
-+
-+  if ( $parser->is_good_plan ) { ... }
-+
-+Returns a boolean value indicating whether or not the number of tests planned
-+matches the number of tests run.
-+
-+B<Note:>  this was formerly C<good_plan>.  The latter method is deprecated and
-+will issue a warning.
-+
-+And since we're on that subject ...
-+
-+=head3 C<tests_planned>
-+
-+  print $parser->tests_planned;
-+
-+Returns the number of tests planned, according to the plan.  For example, a
-+plan of '1..17' will mean that 17 tests were planned.
-+
-+=head3 C<tests_run>
-+
-+  print $parser->tests_run;
-+
-+Returns the number of tests which actually were run.  Hopefully this will
-+match the number of C<< $parser->tests_planned >>.
-+
-+=head3 C<skip_all>
-+
-+Returns a true value (actually the reason for skipping) if all tests
-+were skipped.
-+
-+=head3 C<start_time>
-+
-+Returns the time when the Parser was created.
-+
-+=head3 C<end_time>
-+
-+Returns the time when the end of TAP input was seen.
-+
-+=head3 C<has_problems>
-+
-+  if ( $parser->has_problems ) {
-+      ...
-+  }
-+
-+This is a 'catch-all' method which returns true if any tests have currently
-+failed, any TODO tests unexpectedly succeeded, or any parse errors occurred.
-+
-+=cut
-+
-+sub has_problems {
-+    my $self = shift;
-+    return
-+         $self->failed
-+      || $self->parse_errors
-+      || ( !$self->ignore_exit && ( $self->wait || $self->exit ) );
-+}
-+
-+=head3 C<version>
-+
-+  $parser->version;
-+
-+Once the parser is done, this will return the version number for the
-+parsed TAP. Version numbers were introduced with TAP version 13 so if no
-+version number is found version 12 is assumed.
-+
-+=head3 C<exit>
-+
-+  $parser->exit;
-+
-+Once the parser is done, this will return the exit status.  If the parser ran
-+an executable, it returns the exit status of the executable.
-+
-+=head3 C<wait>
-+
-+  $parser->wait;
-+
-+Once the parser is done, this will return the wait status.  If the parser ran
-+an executable, it returns the wait status of the executable.  Otherwise, this
-+mererely returns the C<exit> status.
-+
-+=head2 C<ignore_exit>
-+
-+  $parser->ignore_exit(1);
-+
-+Tell the parser to ignore the exit status from the test when determining
-+whether the test passed. Normally tests with non-zero exit status are
-+considered to have failed even if all individual tests passed. In cases
-+where it is not possible to control the exit value of the test script
-+use this option to ignore it.
-+
-+=cut
-+
-+sub ignore_exit { shift->pragma( 'ignore_exit', @_ ) }
-+
-+=head3 C<parse_errors>
-+
-+ my @errors = $parser->parse_errors; # the parser errors
-+ my $errors = $parser->parse_errors; # the number of parser_errors
-+
-+Fortunately, all TAP output is perfect.  In the event that it is not, this
-+method will return parser errors.  Note that a junk line which the parser does
-+not recognize is C<not> an error.  This allows this parser to handle future
-+versions of TAP.  The following are all TAP errors reported by the parser:
-+
-+=over 4
-+
-+=item * Misplaced plan
-+
-+The plan (for example, '1..5'), must only come at the beginning or end of the
-+TAP output.
-+
-+=item * No plan
-+
-+Gotta have a plan!
-+
-+=item * More than one plan
-+
-+ 1..3
-+ ok 1 - input file opened
-+ not ok 2 - first line of the input valid # todo some data
-+ ok 3 read the rest of the file
-+ 1..3
-+
-+Right.  Very funny.  Don't do that.
-+
-+=item * Test numbers out of sequence
-+
-+ 1..3
-+ ok 1 - input file opened
-+ not ok 2 - first line of the input valid # todo some data
-+ ok 2 read the rest of the file
-+
-+That last test line above should have the number '3' instead of '2'.
-+
-+Note that it's perfectly acceptable for some lines to have test numbers and
-+others to not have them.  However, when a test number is found, it must be in
-+sequence.  The following is also an error:
-+
-+ 1..3
-+ ok 1 - input file opened
-+ not ok - first line of the input valid # todo some data
-+ ok 2 read the rest of the file
-+
-+But this is not:
-+
-+ 1..3
-+ ok  - input file opened
-+ not ok - first line of the input valid # todo some data
-+ ok 3 read the rest of the file
-+
-+=back
-+
-+=cut
-+
-+sub parse_errors { @{ shift->{parse_errors} } }
-+
-+sub _add_error {
-+    my ( $self, $error ) = @_;
-+    push @{ $self->{parse_errors} } => $error;
-+    return $self;
-+}
-+
-+sub _make_state_table {
-+    my $self = shift;
-+    my %states;
-+    my %planned_todo = ();
-+
-+    # These transitions are defaults for all states
-+    my %state_globals = (
-+        comment => {},
-+        bailout => {},
-+        yaml    => {},
-+        version => {
-+            act => sub {
-+                $self->_add_error(
-+                    'If TAP version is present it must be the first line of output'
-+                );
-+            },
-+        },
-+        unknown => {
-+            act => sub {
-+                my $unk = shift;
-+                if ( $self->pragma('strict') ) {
-+                    $self->_add_error(
-+                        'Unknown TAP token: "' . $unk->raw . '"' );
-+                }
-+            },
-+        },
-+        pragma => {
-+            act => sub {
-+                my ($pragma) = @_;
-+                for my $pr ( $pragma->pragmas ) {
-+                    if ( $pr =~ /^ ([-+])(\w+) $/x ) {
-+                        $self->pragma( $2, $1 eq '+' );
-+                    }
-+                }
-+            },
-+        },
-+    );
-+
-+    # Provides default elements for transitions
-+    my %state_defaults = (
-+        plan => {
-+            act => sub {
-+                my ($plan) = @_;
-+                $self->tests_planned( $plan->tests_planned );
-+                $self->plan( $plan->plan );
-+                if ( $plan->has_skip ) {
-+                    $self->skip_all( $plan->explanation
-+                          || '(no reason given)' );
-+                }
-+
-+                $planned_todo{$_}++ for @{ $plan->todo_list };
-+            },
-+        },
-+        test => {
-+            act => sub {
-+                my ($test) = @_;
-+
-+                my ( $number, $tests_run )
-+                  = ( $test->number, ++$self->{tests_run} );
-+
-+                # Fake TODO state
-+                if ( defined $number && delete $planned_todo{$number} ) {
-+                    $test->set_directive('TODO');
-+                }
-+
-+                my $has_todo = $test->has_todo;
-+
-+                $self->in_todo($has_todo);
-+                if ( defined( my $tests_planned = $self->tests_planned ) ) {
-+                    if ( $tests_run > $tests_planned ) {
-+                        $test->is_unplanned(1);
-+                    }
-+                }
-+
-+                if ($number) {
-+                    if ( $number != $tests_run ) {
-+                        my $count = $tests_run;
-+                        $self->_add_error( "Tests out of sequence.  Found "
-+                              . "($number) but expected ($count)" );
-+                    }
-+                }
-+                else {
-+                    $test->_number( $number = $tests_run );
-+                }
-+
-+                push @{ $self->{todo} } => $number if $has_todo;
-+                push @{ $self->{todo_passed} } => $number
-+                  if $test->todo_passed;
-+                push @{ $self->{skipped} } => $number
-+                  if $test->has_skip;
-+
-+                push @{ $self->{ $test->is_ok ? 'passed' : 'failed' } } =>
-+                  $number;
-+                push @{
-+                    $self->{
-+                        $test->is_actual_ok
-+                        ? 'actual_passed'
-+                        : 'actual_failed'
-+                      }
-+                  } => $number;
-+            },
-+        },
-+        yaml => { act => sub { }, },
-+    );
-+
-+    # Each state contains a hash the keys of which match a token type. For
-+    # each token
-+    # type there may be:
-+    #   act      A coderef to run
-+    #   goto     The new state to move to. Stay in this state if
-+    #            missing
-+    #   continue Goto the new state and run the new state for the
-+    #            current token
-+    %states = (
-+        INIT => {
-+            version => {
-+                act => sub {
-+                    my ($version) = @_;
-+                    my $ver_num = $version->version;
-+                    if ( $ver_num <= $DEFAULT_TAP_VERSION ) {
-+                        my $ver_min = $DEFAULT_TAP_VERSION + 1;
-+                        $self->_add_error(
-+                                "Explicit TAP version must be at least "
-+                              . "$ver_min. Got version $ver_num" );
-+                        $ver_num = $DEFAULT_TAP_VERSION;
-+                    }
-+                    if ( $ver_num > $MAX_TAP_VERSION ) {
-+                        $self->_add_error(
-+                                "TAP specified version $ver_num but "
-+                              . "we don't know about versions later "
-+                              . "than $MAX_TAP_VERSION" );
-+                        $ver_num = $MAX_TAP_VERSION;
-+                    }
-+                    $self->version($ver_num);
-+                    $self->_grammar->set_version($ver_num);
-+                },
-+                goto => 'PLAN'
-+            },
-+            plan => { goto => 'PLANNED' },
-+            test => { goto => 'UNPLANNED' },
-+        },
-+        PLAN => {
-+            plan => { goto => 'PLANNED' },
-+            test => { goto => 'UNPLANNED' },
-+        },
-+        PLANNED => {
-+            test => { goto => 'PLANNED_AFTER_TEST' },
-+            plan => {
-+                act => sub {
-+                    my ($version) = @_;
-+                    $self->_add_error(
-+                        'More than one plan found in TAP output');
-+                },
-+            },
-+        },
-+        PLANNED_AFTER_TEST => {
-+            test => { goto => 'PLANNED_AFTER_TEST' },
-+            plan => { act  => sub { }, continue => 'PLANNED' },
-+            yaml => { goto => 'PLANNED' },
-+        },
-+        GOT_PLAN => {
-+            test => {
-+                act => sub {
-+                    my ($plan) = @_;
-+                    my $line = $self->plan;
-+                    $self->_add_error(
-+                            "Plan ($line) must be at the beginning "
-+                          . "or end of the TAP output" );
-+                    $self->is_good_plan(0);
-+                },
-+                continue => 'PLANNED'
-+            },
-+            plan => { continue => 'PLANNED' },
-+        },
-+        UNPLANNED => {
-+            test => { goto => 'UNPLANNED_AFTER_TEST' },
-+            plan => { goto => 'GOT_PLAN' },
-+        },
-+        UNPLANNED_AFTER_TEST => {
-+            test => { act  => sub { }, continue => 'UNPLANNED' },
-+            plan => { act  => sub { }, continue => 'UNPLANNED' },
-+            yaml => { goto => 'PLANNED' },
-+        },
-+    );
-+
-+    # Apply globals and defaults to state table
-+    for my $name ( keys %states ) {
-+
-+        # Merge with globals
-+        my $st = { %state_globals, %{ $states{$name} } };
-+
-+        # Add defaults
-+        for my $next ( sort keys %{$st} ) {
-+            if ( my $default = $state_defaults{$next} ) {
-+                for my $def ( sort keys %{$default} ) {
-+                    $st->{$next}->{$def} ||= $default->{$def};
-+                }
-+            }
-+        }
-+
-+        # Stuff back in table
-+        $states{$name} = $st;
-+    }
-+
-+    return \%states;
-+}
-+
-+=head3 C<get_select_handles>
-+
-+Get an a list of file handles which can be passed to C<select> to
-+determine the readiness of this parser.
-+
-+=cut
-+
-+sub get_select_handles { shift->_stream->get_select_handles }
-+
-+sub _grammar {
-+    my $self = shift;
-+    return $self->{_grammar} = shift if @_;
-+
-+    return $self->{_grammar} ||= $self->make_grammar(
-+        {   stream  => $self->_stream,
-+            parser  => $self,
-+            version => $self->version
-+        }
-+    );
-+}
-+
-+sub _iter {
-+    my $self        = shift;
-+    my $stream      = $self->_stream;
-+    my $grammar     = $self->_grammar;
-+    my $spool       = $self->_spool;
-+    my $state       = 'INIT';
-+    my $state_table = $self->_make_state_table;
-+
-+    $self->start_time( $self->get_time );
-+
-+    # Make next_state closure
-+    my $next_state = sub {
-+        my $token = shift;
-+        my $type  = $token->type;
-+        TRANS: {
-+            my $state_spec = $state_table->{$state}
-+              or die "Illegal state: $state";
-+
-+            if ( my $next = $state_spec->{$type} ) {
-+                if ( my $act = $next->{act} ) {
-+                    $act->($token);
-+                }
-+                if ( my $cont = $next->{continue} ) {
-+                    $state = $cont;
-+                    redo TRANS;
-+                }
-+                elsif ( my $goto = $next->{goto} ) {
-+                    $state = $goto;
-+                }
-+            }
-+            else {
-+                confess("Unhandled token type: $type\n");
-+            }
-+        }
-+        return $token;
-+    };
-+
-+    # Handle end of stream - which means either pop a block or finish
-+    my $end_handler = sub {
-+        $self->exit( $stream->exit );
-+        $self->wait( $stream->wait );
-+        $self->_finish;
-+        return;
-+    };
-+
-+    # Finally make the closure that we return. For performance reasons
-+    # there are two versions of the returned function: one that handles
-+    # callbacks and one that does not.
-+    if ( $self->_has_callbacks ) {
-+        return sub {
-+            my $result = eval { $grammar->tokenize };
-+            $self->_add_error($@) if $@;
-+
-+            if ( defined $result ) {
-+                $result = $next_state->($result);
-+
-+                if ( my $code = $self->_callback_for( $result->type ) ) {
-+                    $_->($result) for @{$code};
-+                }
-+                else {
-+                    $self->_make_callback( 'ELSE', $result );
-+                }
-+
-+                $self->_make_callback( 'ALL', $result );
-+
-+                # Echo TAP to spool file
-+                print {$spool} $result->raw, "\n" if $spool;
-+            }
-+            else {
-+                $result = $end_handler->();
-+                $self->_make_callback( 'EOF', $result )
-+                  unless defined $result;
-+            }
-+
-+            return $result;
-+        };
-+    }    # _has_callbacks
-+    else {
-+        return sub {
-+            my $result = eval { $grammar->tokenize };
-+            $self->_add_error($@) if $@;
-+
-+            if ( defined $result ) {
-+                $result = $next_state->($result);
-+
-+                # Echo TAP to spool file
-+                print {$spool} $result->raw, "\n" if $spool;
-+            }
-+            else {
-+                $result = $end_handler->();
-+            }
-+
-+            return $result;
-+        };
-+    }    # no callbacks
-+}
-+
-+sub _finish {
-+    my $self = shift;
-+
-+    $self->end_time( $self->get_time );
-+
-+    # Avoid leaks
-+    $self->_stream(undef);
-+    $self->_grammar(undef);
-+
-+    # If we just delete the iter we won't get a fault if it's recreated.
-+    # Instead we set it to a sub that returns an infinite
-+    # stream of undef. This segfaults on 5.5.4, presumably because
-+    # we're still executing the closure that gets replaced and it hasn't
-+    # been protected with a refcount.
-+    $self->{_iter} = sub {return}
-+      if $] >= 5.006;
-+
-+    # sanity checks
-+    if ( !$self->plan ) {
-+        $self->_add_error('No plan found in TAP output');
-+    }
-+    else {
-+        $self->is_good_plan(1) unless defined $self->is_good_plan;
-+    }
-+    if ( $self->tests_run != ( $self->tests_planned || 0 ) ) {
-+        $self->is_good_plan(0);
-+        if ( defined( my $planned = $self->tests_planned ) ) {
-+            my $ran = $self->tests_run;
-+            $self->_add_error(
-+                "Bad plan.  You planned $planned tests but ran $ran.");
-+        }
-+    }
-+    if ( $self->tests_run != ( $self->passed + $self->failed ) ) {
-+
-+        # this should never happen
-+        my $actual = $self->tests_run;
-+        my $passed = $self->passed;
-+        my $failed = $self->failed;
-+        $self->_croak( "Panic: planned test count ($actual) did not equal "
-+              . "sum of passed ($passed) and failed ($failed) tests!" );
-+    }
-+
-+    $self->is_good_plan(0) unless defined $self->is_good_plan;
-+    return $self;
-+}
-+
-+=head3 C<delete_spool>
-+
-+Delete and return the spool.
-+
-+  my $fh = $parser->delete_spool;
-+
-+=cut
-+
-+sub delete_spool {
-+    my $self = shift;
-+
-+    return delete $self->{_spool};
-+}
-+
-+##############################################################################
-+
-+=head1 CALLBACKS
-+
-+As mentioned earlier, a "callback" key may be added to the
-+C<TAP::Parser> constructor. If present, each callback corresponding to a
-+given result type will be called with the result as the argument if the
-+C<run> method is used. The callback is expected to be a subroutine
-+reference (or anonymous subroutine) which is invoked with the parser
-+result as its argument.
-+
-+ my %callbacks = (
-+     test    => \&test_callback,
-+     plan    => \&plan_callback,
-+     comment => \&comment_callback,
-+     bailout => \&bailout_callback,
-+     unknown => \&unknown_callback,
-+ );
-+
-+ my $aggregator = TAP::Parser::Aggregator->new;
-+ foreach my $file ( @test_files ) {
-+     my $parser = TAP::Parser->new(
-+         {
-+             source    => $file,
-+             callbacks => \%callbacks,
-+         }
-+     );
-+     $parser->run;
-+     $aggregator->add( $file, $parser );
-+ }
-+
-+Callbacks may also be added like this:
-+
-+ $parser->callback( test => \&test_callback );
-+ $parser->callback( plan => \&plan_callback );
-+
-+The following keys allowed for callbacks. These keys are case-sensitive.
-+
-+=over 4
-+
-+=item * C<test>
-+
-+Invoked if C<< $result->is_test >> returns true.
-+
-+=item * C<version>
-+
-+Invoked if C<< $result->is_version >> returns true.
-+
-+=item * C<plan>
-+
-+Invoked if C<< $result->is_plan >> returns true.
-+
-+=item * C<comment>
-+
-+Invoked if C<< $result->is_comment >> returns true.
-+
-+=item * C<bailout>
-+
-+Invoked if C<< $result->is_unknown >> returns true.
-+
-+=item * C<yaml>
-+
-+Invoked if C<< $result->is_yaml >> returns true.
-+
-+=item * C<unknown>
-+
-+Invoked if C<< $result->is_unknown >> returns true.
-+
-+=item * C<ELSE>
-+
-+If a result does not have a callback defined for it, this callback will
-+be invoked. Thus, if all of the previous result types are specified as
-+callbacks, this callback will I<never> be invoked.
-+
-+=item * C<ALL>
-+
-+This callback will always be invoked and this will happen for each
-+result after one of the above callbacks is invoked.  For example, if
-+L<Term::ANSIColor> is loaded, you could use the following to color your
-+test output:
-+
-+ my %callbacks = (
-+     test => sub {
-+         my $test = shift;
-+         if ( $test->is_ok && not $test->directive ) {
-+             # normal passing test
-+             print color 'green';
-+         }
-+         elsif ( !$test->is_ok ) {    # even if it's TODO
-+             print color 'white on_red';
-+         }
-+         elsif ( $test->has_skip ) {
-+             print color 'white on_blue';
-+
-+         }
-+         elsif ( $test->has_todo ) {
-+             print color 'white';
-+         }
-+     },
-+     ELSE => sub {
-+         # plan, comment, and so on (anything which isn't a test line)
-+         print color 'black on_white';
-+     },
-+     ALL => sub {
-+         # now print them
-+         print shift->as_string;
-+         print color 'reset';
-+         print "\n";
-+     },
-+ );
-+
-+=item * C<EOF>
-+
-+Invoked when there are no more lines to be parsed. Since there is no
-+accompanying L<TAP::Parser::Result> object the C<TAP::Parser> object is
-+passed instead.
-+
-+=back
-+
-+=head1 TAP GRAMMAR
-+
-+If you're looking for an EBNF grammar, see L<TAP::Parser::Grammar>.
-+
-+=head1 BACKWARDS COMPATABILITY
-+
-+The Perl-QA list attempted to ensure backwards compatability with
-+L<Test::Harness>.  However, there are some minor differences.
-+
-+=head2 Differences
-+
-+=over 4
-+
-+=item * TODO plans
-+
-+A little-known feature of L<Test::Harness> is that it supported TODO
-+lists in the plan:
-+
-+ 1..2 todo 2
-+ ok 1 - We have liftoff
-+ not ok 2 - Anti-gravity device activated
-+
-+Under L<Test::Harness>, test number 2 would I<pass> because it was
-+listed as a TODO test on the plan line. However, we are not aware of
-+anyone actually using this feature and hard-coding test numbers is
-+discouraged because it's very easy to add a test and break the test
-+number sequence. This makes test suites very fragile. Instead, the
-+following should be used:
-+
-+ 1..2
-+ ok 1 - We have liftoff
-+ not ok 2 - Anti-gravity device activated # TODO
-+
-+=item * 'Missing' tests
-+
-+It rarely happens, but sometimes a harness might encounter
-+'missing tests:
-+
-+ ok 1
-+ ok 2
-+ ok 15
-+ ok 16
-+ ok 17
-+
-+L<Test::Harness> would report tests 3-14 as having failed. For the
-+C<TAP::Parser>, these tests are not considered failed because they've
-+never run. They're reported as parse failures (tests out of sequence).
-+
-+=back
-+
-+=head1 SUBCLASSING
-+
-+If you find you need to provide custom functionality (as you would have using
-+L<Test::Harness::Straps>), you're in luck: C<TAP::Parser> and friends are
-+designed to be easily subclassed.
-+
-+Before you start, it's important to know a few things:
-+
-+=over 2
-+
-+=item 1
-+
-+All C<TAP::*> objects inherit from L<TAP::Object>.
-+
-+=item 2
-+
-+Most C<TAP::*> classes have a I<SUBCLASSING> section to guide you.
-+
-+=item 3
-+
-+Note that C<TAP::Parser> is designed to be the central 'maker' - ie: it is
-+responsible for creating new objects in the C<TAP::Parser::*> namespace.
-+
-+This makes it possible for you to have a single point of configuring what
-+subclasses should be used, which in turn means that in many cases you'll find
-+you only need to sub-class one of the parser's components.
-+
-+=item 4
-+
-+By subclassing, you may end up overriding undocumented methods.  That's not
-+a bad thing per se, but be forewarned that undocumented methods may change
-+without warning from one release to the next - we cannot guarantee backwards
-+compatability.  If any I<documented> method needs changing, it will be
-+deprecated first, and changed in a later release.
-+
-+=back
-+
-+=head2 Parser Components
-+
-+=head3 Sources
-+
-+A TAP parser consumes input from a I<source>.  There are currently two types
-+of sources: L<TAP::Parser::Source> for general non-perl commands, and
-+L<TAP::Parser::Source::Perl>.  You can subclass both of them.  You'll need to
-+customize your parser by setting the C<source_class> & C<perl_source_class>
-+parameters.  See L</new> for more details.
-+
-+If you need to customize the objects on creation, subclass L<TAP::Parser> and
-+override L</make_source> or L</make_perl_source>.
-+
-+=head3 Iterators
-+
-+A TAP parser uses I<iterators> to loop through the I<stream> provided by the
-+parser's I<source>.  There are quite a few types of Iterators available.
-+Choosing which class to use is the responsibility of the I<iterator factory>.
-+
-+To create your own iterators you'll have to subclass
-+L<TAP::Parser::IteratorFactory> and L<TAP::Parser::Iterator>.  Then you'll
-+need to customize the class used by your parser by setting the
-+C<iterator_factory_class> parameter.  See L</new> for more details.
-+
-+If you need to customize the objects on creation, subclass L<TAP::Parser> and
-+override L</make_iterator>.
-+
-+=head3 Results
-+
-+A TAP parser creates L<TAP::Parser::Result>s as it iterates through the
-+input I<stream>.  There are quite a few result types available; choosing
-+which class to use is the responsibility of the I<result factory>.
-+
-+To create your own result types you have two options:
-+
-+=over 2
-+
-+=item option 1
-+
-+Subclass L<TAP::Parser::Result> and register your new result type/class with
-+the default L<TAP::Parser::ResultFactory>.
-+
-+=item option 2
-+
-+Subclass L<TAP::Parser::ResultFactory> itself and implement your own
-+L<TAP::Parser::Result> creation logic.  Then you'll need to customize the
-+class used by your parser by setting the C<result_factory_class> parameter.
-+See L</new> for more details.
-+
-+=back
-+
-+If you need to customize the objects on creation, subclass L<TAP::Parser> and
-+override L</make_result>.
-+
-+=head3 Grammar
-+
-+L<TAP::Parser::Grammar> is the heart of the parser - it tokenizes the TAP
-+input I<stream> and produces results.  If you need to customize its behaviour
-+you should probably familiarize yourself with the source first.  Enough
-+lecturing.
-+
-+Subclass L<TAP::Parser::Grammar> and customize your parser by setting the
-+C<grammar_class> parameter.  See L</new> for more details.
-+
-+If you need to customize the objects on creation, subclass L<TAP::Parser> and
-+override L</make_grammar>
-+
-+=head1 ACKNOWLEDGEMENTS
-+
-+All of the following have helped. Bug reports, patches, (im)moral
-+support, or just words of encouragement have all been forthcoming.
-+
-+=over 4
-+
-+=item * Michael Schwern
-+
-+=item * Andy Lester
-+
-+=item * chromatic
-+
-+=item * GEOFFR
-+
-+=item * Shlomi Fish
-+
-+=item * Torsten Schoenfeld
-+
-+=item * Jerry Gay
-+
-+=item * Aristotle
-+
-+=item * Adam Kennedy
-+
-+=item * Yves Orton
-+
-+=item * Adrian Howard
-+
-+=item * Sean & Lil
-+
-+=item * Andreas J. Koenig
-+
-+=item * Florian Ragwitz
-+
-+=item * Corion
-+
-+=item * Mark Stosberg
-+
-+=item * Matt Kraai
-+
-+=item * David Wheeler
-+
-+=item * Alex Vandiver
-+
-+=back
-+
-+=head1 AUTHORS
-+
-+Curtis "Ovid" Poe <ovid@cpan.org>
-+
-+Andy Armstong <andy@hexten.net>
-+
-+Eric Wilhelm @ <ewilhelm at cpan dot org>
-+
-+Michael Peters <mpeters at plusthree dot com>
-+
-+Leif Eriksen <leif dot eriksen at bigpond dot com>
-+
-+Steve Purkis <spurkis@cpan.org>
-+
-+Nicholas Clark <nick@ccl4.org>
-+
-+=head1 BUGS
-+
-+Please report any bugs or feature requests to
-+C<bug-test-harness@rt.cpan.org>, or through the web interface at
-+L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Test-Harness>.
-+We will be notified, and then you'll automatically be notified of
-+progress on your bug as we make changes.
-+
-+Obviously, bugs which include patches are best. If you prefer, you can
-+patch against bleed by via anonymous checkout of the latest version:
-+
-+ svn checkout http://svn.hexten.net/tapx
-+
-+=head1 COPYRIGHT & LICENSE
-+
-+Copyright 2006-2008 Curtis "Ovid" Poe, all rights reserved.
-+
-+This program is free software; you can redistribute it and/or modify it
-+under the same terms as Perl itself.
-+
-+=cut
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/Test/Harness/Assert.pm perl-5.10.0/lib/Test/Harness/Assert.pm
---- perl-5.10.0.orig/lib/Test/Harness/Assert.pm	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/Assert.pm	1970-01-01 01:00:00.000000000 +0100
-@@ -1,64 +0,0 @@
--package Test::Harness::Assert;
--
--use strict;
--require Exporter;
--use vars qw($VERSION @EXPORT @ISA);
--
--$VERSION = '0.02';
--
--@ISA = qw(Exporter);
--@EXPORT = qw(assert);
--
--
--=head1 NAME
--
--Test::Harness::Assert - simple assert
--
--=head1 SYNOPSIS
--
--  ### FOR INTERNAL USE ONLY ###
--
--  use Test::Harness::Assert;
--
--  assert( EXPR, $name );
--
--=head1 DESCRIPTION
--
--A simple assert routine since we don't have Carp::Assert handy.
--
--B<For internal use by Test::Harness ONLY!>
--
--=head1 FUNCTIONS
--
--=head2 C<assert()>
--
--  assert( EXPR, $name );
--
--If the expression is false the program aborts.
--
--=cut
--
--sub assert ($;$) {
--    my($assert, $name) = @_;
--
--    unless( $assert ) {
--        require Carp;
--        my $msg = 'Assert failed';
--        $msg .= " - '$name'" if defined $name;
--        $msg .= '!';
--        Carp::croak($msg);
--    }
--
--}
--
--=head1 AUTHOR
--
--Michael G Schwern C<< <schwern at pobox.com> >>
--
--=head1 SEE ALSO
--
--L<Carp::Assert>
--
--=cut
--
--1;
-diff -urN perl-5.10.0.orig/lib/Test/Harness/Changes perl-5.10.0/lib/Test/Harness/Changes
---- perl-5.10.0.orig/lib/Test/Harness/Changes	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/Changes	2009-03-10 17:37:05.000000000 +0100
-@@ -1,5 +1,682 @@
-+Revision history for Test-Harness
-+
-+3.16    2009-02-19
-+        - Fix path splicing on platforms where the path separator
-+          is not ':'.
-+        - Fixes/skips for failing Win32 tests.
-+        - Don't break with older CPAN::Reporter versions.
-+
-+3.15    2009-02-17
-+        - Refactor getter/setter generation into TAP::Object.
-+        - The App::Prove::State::Result::Test now stores the parser object.
-+        - After discussion with Andy, agreed to clean up the test output
-+          somewhat.  t/foo.....ok becomes t/foo.t ... ok
-+        - Make Bail out! die instead of exiting. Dies with the same
-+          message as 2.64 for (belated) backwards compatibility.
-+        - Alex Vaniver's patch to refactor TAP::Formatter::Console into
-+          a new class, TAP::Formatter::File and a common base class: 
-+          TAP::Formatter::Base.
-+        - Fix a bug where PERL5LIB might be put in the wrong spot in @INC.
-+          #40257
-+        - Steve Purkis implemented a plugin mechanism for App::Prove.
-+
-+3.14    2008-09-13
-+        - Created a proper (ha!) API for prove state results and tests.
-+        - Added --count and --nocount options to prove to control X/Y display
-+          while running tests.
-+        - Added 'fresh' state option to run test scripts that have been
-+          touched since the test run.
-+        - fixed bug where PERL5OPT was not properly split  
-+        - fixed regex in _filtered_inc. Fixes #39248. Thanks Slaven.
-+
-+3.13    2008-07-27
-+        - fixed various closure related leaks
-+        - made prove honour HARNESS_TIMER
-+        - Applied patches supplied by Alex Vandiver
-+          - add 'rules' switch to prove: allows parallel execution rules
-+            to be specified on the command line.
-+          - allow '**' (any path) wildcard in parallel rules
-+          - fix bug report address
-+          - make tprove_gtk example work again.
-+
-+3.12    2008-06-22
-+        - applied Steve Purkis' huge refactoring patch which adds
-+          configurable factories for most of the major internal classes.
-+        - applied David Wheeler's patch to allow exec to be a code
-+          reference.
-+        - made tests more robust in the presence of -MFoo in PERL5OPT.
-+
-+3.11    2008-06-09
-+        - applied Jim Keenan's patch that makes App::Prove::run return a
-+          rather than exit (#33609)
-+        - prove -r now recurses cwd rather than 't' by default (#33007)
-+        - restored --ext switch to prove (#33848)
-+        - added ignore_exit option to TAP::Parser and corresponding
-+          interfaces to TAP::Harness and Test::Harness. Requested for
-+          Parrot.
-+        - Implemented rule based parallel scheduler.
-+        - Moved filename -> display name mapping out of formatter. This
-+          prevents the formatter's strip-extensions logic from stripping
-+          extensions from supplied descriptions.
-+        - Only strip extensions from test names if all tests have the
-+          same extension. Previously we stripped extensions if all names
-+          had /any/ extension making it impossible to distinguish tests
-+          whose name differed only in the extension.
-+        - Removed privacy test that made it impossible to subclass
-+          TAP::Parser.
-+        - Delayed initialisation of grammar making it easier to replace
-+          the TAP::Parser stream after instantiation.
-+        - Make it possible to supply import parameters to a replacement
-+          harness with prove.
-+        - Make it possible to replace either _grammar /or/ _stream
-+          before reading from a TAP::Parser.
-+
-+3.10    2008-02-26
-+        - fix undefined value warnings with bleadperl.
-+        - added pragma support.
-+        - fault unknown TAP tokens under strict pragma.
-+
-+3.09    2008-02-10
-+        - support for HARNESS_PERL_SWITCHES containing things like 
-+          '-e "system(shift)"'.
-+        - set HARNESS_IS_VERBOSE during verbose testing.
-+        - documentation fixes.
-+
-+3.08    2008-02-08
-+        - added support for 'out' option to
-+          Test::Harness::execute_tests. See #32476. Thanks RENEEB.
-+        - Fixed YAMLish handling of non-alphanumeric hash keys.
-+        - Added --dry option to prove for 2.64 compatibility.
-+
-+3.07    2008-01-13
-+        - prove now supports HARNESS_PERL_SWITCHES.
-+        - restored TEST_VERBOSE to prove.
-+
-+3.06    2008-01-01
-+        - Skip t/unicode.t if PERL_UNICODE set. Fixes #31731.
-+          Thanks Lukas.
-+        - App::Prove::State no longer complains about tests that
-+          are deleted.
-+        - --state=new and --state=old now consider the modification time
-+          of test scripts.
-+        - Made test suite core-compatible.
-+
-+3.05    2007-12-09
-+        - Skip unicode.t if Encode unavailable
-+        - Support for .proverc files.
-+        - Clarified prove documentation.
-+
-+3.04    2007-12-02
-+        - Fixed output leakage with really_quiet set.
-+        - Progress reports for tests without plans now show
-+          "143/?" instead of "143/0".
-+        - Made TAP::Harness::runtests support aliases for test names.
-+        - Made it possible to pass command line args to test programs
-+          from prove, TAP::Harness, TAP::Parser.
-+        - Added --state switch to prove.
-+
-+3.03    2007-11-17
-+        - Fixed some little bugs-waiting-to-happen inside
-+          TAP::Parser::Grammar.
-+        - Added parser_args callback to TAP::Harness.
-+        - Made @INC propagation even more compatible with 2.64 so that
-+          parrot still works *and* #30796 is fixed.
-+
-+3.02    2007-11-15
-+        - Process I/O now unbuffered, uses sysread, plays better with
-+          select. Fixes #30740.
-+        - Made Test::Harness @INC propagation more compatible with 2.64.
-+          Was breaking Parrot's test suite.
-+        - Added HARNESS_OPTIONS (#30676)
-+
-+3.01    2007-11-12
-+        - Fix for RHEL incpush.patch related failure.
-+        - Output real time of test completion with --timer
-+        - prove -b adds blib/auto to @INC
-+        - made SKIP plan parsing even more liberal for pre-v13 TAP
-+
-+3.00    2007-11-06
-+        - Non-dev release. No changes since 2.99_09.
-+
-+2.99_09 2007-11-05
-+        - Implemented TODO-in-PLAN syntax for TAP version 12 and earlier.
-+
-+2.99_08 2007-11-04
-+        - Tiny changes. New version pushed to get some smoke coverage.
-+
-+2.99_07 2007-11-01
-+        - Fix for #21938: Unable to handle circular links
-+        - Fix for #24926: prove -b and -l should use absolute paths
-+        - Fixed prove switches. Big oops. How the hell did we miss that?
-+        - Consolidated quiet, really_quiet, verbose into verbosity.
-+        - Various VMS related fixes to tests
-+
-+2.99_06 2007-10-30
-+        - Added skip_all method to TAP::Parser.
-+        - Display reason for skipped tests.
-+        - make test now self tests.
-+
-+2.99_05 2007-10-30
-+        - Fix for occasional rogue -1 exit code on Windows.
-+        - Fix for @INC handling under CPANPLUS.
-+        - Added real time to prove --timer output
-+        - Improved prove error message in case where 't' not found and
-+          no tests named.
-+
-+2.99_04 2007-10-11
-+        - Fixed bug where 'All tests successful' would not be printed if bonus
-+          tests are seen.
-+        - Fixed bug where 'Result: FAIL' would be printed at the end of a test
-+          run if there were unexpectedly succeeding tests.
-+        - Added -M, -P switches to allow arbitrary modules to be loaded
-+          by prove. We haven't yet defined what they'll do once they
-+          load but it's a start...
-+        - Added testing under simulated non-forking platforms.
-+
-+2.99_03 2007-10-06
-+        - Refactored all display specific code out of TAP::Harness.
-+        - Relaxed strict parsing of skip plan for pre v13 TAP.
-+        - Elapsed hi-res time is now displayed in integer milliseconds
-+          instead of fractional seconds.
-+        - prove stops running if any command-line switches are invalid.
-+        - prove -v would try to print an undef.
-+        - Added support for multiplexed and forked parallel tests. Use
-+          prove -j 9 to run tests in parallel and prove -j 9 --fork to
-+          fork. These features are experimental and currently
-+          unavailable on Windows.
-+        - Rationalized the management of the environment that we give to
-+          test scripts (PERL5LIB, PERL5OPT, switches).
-+        - Fixed handling of STDIN (we no longer close it) for test
-+          scripts.
-+        - Performance enhancements. Parser is now 30% - 40% faster.
-+
-+2.99_02 2007-09-07
-+        - Ensure prove (and App::Prove) sort any recursively
-+          discovered tests
-+        - It is now possible to register multiple callback handlers for
-+          a particular event.
-+        - Added before_runtests, after_runtests callbacks to
-+          TAP::Harness.
-+        - Moved logic of prove program into App::Prove.
-+        - Added simple machine readable summary.
-+        - Performance improvement: The processing pipeline within
-+          TAP::Parser is now a closure which speeds up access to the
-+          various attribtes it needs.
-+        - Performance improvement: Test count spinner now updates
-+          exponentially less frequently as the count increases which
-+          saves a lot of I/O on big tests.
-+        - More improvements in test coverage from Leif.
-+        - Fixes to TAP spooling - now captures YAML blocks correctly.
-+        - Fix YAMLish handling of empty arrays, hashes.
-+        - Renamed TAP::Harness::Compatible to Test::Harness,
-+          runtests to prove.
-+        - Fixes to @INC handling. We didn't always pass the correct path
-+          to subprocesses.
-+        - We now observe any switches in HARNESS_PERL_SWITCHES.
-+        - Changes to output formatting for greater compatibility with
-+          Test::Harness 2.64.
-+        - Added unicode test coverage and fixed a couple of
-+          unicode issues.
-+        - Additions to documentation.
-+        - Added support for non-forking Perls. If forking isn't
-+          available we fall back to open and disable stream merging.
-+        - Added support for simulating non-forking Perls to improve our
-+          test coverage.
-+
-+========================================================================
-+Version numbers below this point relate to TAP::Parser - which was the
-+name of this version of Test::Harness during its development.
-+========================================================================
-+
-+0.54
-+    - Optimized I/O for common case of 'runtests -l'
-+    - Croak if supplied an empty (0 lines) Perl script.
-+    - Made T::P::Result::YAML return literal input YAML correctly.
-+    - Merged speed-ups from speedy branch.
-+
-+0.53  18 August 2007
-+    - Fixed a few docs nits.
-+    - Added -V (--version) switch to runtests. Suggested by markjugg on
-+      Perlmonks.
-+    - Fixed failing t/030-grammer.t under 5.9.5. Exact cause still
-+      unknown; something to do with localisation of $1 et all I think.
-+    - Fixed use of three arg open in t/compat/test-harness-compat; was
-+      failing on 5.6.2.
-+    - Fixed runtests --exec option. T::H wasn't passing the exec option
-+      to T::P.
-+    - Merged Leif Eriksen's coverage enhancing changes to 
-+      t/080-aggregator.t, t/030-grammar.t
-+    - Made various changes so that we test cleanly on 5.0.5.
-+    - Many more coverage enhancements by Leif.
-+    - Applied Michael Peters' patch to add an EOF callback to
-+      TAP::Parser.
-+    - Added --reverse option to runtests to run tests in reverse order.
-+    - Made runtests exit with non-zero status if the test run had
-+      problems.
-+    - Stopped TAP::Parser::Iterator::Process from trampling on STDIN.
-+
-+0.52  14 July 2007
-+    - Incorporate Schwern's investigations into TAP versions.
-+      Unversioned TAP is now TAP v12. The lowest explicit version number
-+      that can be specified is 13.
-+    - Renumbered tests to eliminate gaps.
-+    - Killed execrc.  The '--exec' switch to runtests handles all of this for
-+      us.
-+    - Refactored T::P::Iterator into
-+      T::P::Iterator::(Array|Process|Stream) so that we have a
-+      process specific iterator with which to experiment with
-+      STDOUT/STDERR merging.
-+    - Removed vestigial exit status handling from T::P::I::Stream.
-+    - Removed unused pid interface from T::P::I::Process.
-+    - Fixed infinite recursion in T::P::I::Stream and added regression
-+      coverage for same.
-+    - Added tests for T::P::I::Process.
-+    - TAP::Harness now displays the first five TAP syntax errors and
-+      explains how to pass the -p flag to runtests to see them all.
-+    - Added merge option to TAP::Parser::Iterator::Process,
-+      TAP::Parser::Source, TAP::Parser and TAP::Harness.
-+    - Added --merge option to runtests to enable STDOUT/STDERR merging.
-+      This behaviour used to be the default.
-+    - Made T::P::I::Process use open3 for both merged and non-merged
-+      streams so that it works on Windows.
-+    - Implemented Eric Wilhelm's IO::Select based multiple stream
-+      handler so that STDERR is piped to us even if stream merging is
-+      turned off. This tends to reduce the temporal skew between the
-+      two streams so that error messages appear closer to their
-+      correct location.
-+    - Altered the T::P::Grammar interface so that it gets a stream
-+      rather than the next line from the stream in preparation for
-+      making it handle YAML diagnostics.
-+    - Implemented YAML syntax. Currently YAML may only follow a
-+      test result. The first line of YAML is '---' and the last
-+      line is '...'.
-+    - Made grammar version-aware. Different grammars may now be selected
-+      depending on the TAP version being parsed.
-+    - Added formatter delegate mechanism for test results.
-+    - Added prototype stream based YAML(ish) parser.
-+    - Added more tests for T::P::YAMLish
-+    - Altered T::P::Grammar to use T::P::YAMLish
-+    - Removed T::P::YAML
-+    - Added raw source capture to T::P::YAMLish
-+    - Added support for double quoted hash keys
-+    - Added TAP::Parser::YAMLish::Writer and renamed T::P::YAMLish as
-+      T::P::YAMLish::Reader.
-+    - Added extra TAP::Parser::YAMLish::Writer output options
-+    - Inline YAML documents must now be indented by at least one space
-+    - Fixed broken dependencies in bin/prove
-+    - Make library paths absolute before running tests in case tests
-+      chdir before loading modules.
-+    - Added libs and switches handling to T::H::Compatible. This and the
-+      previous change fix [24926]
-+    - Added PERLLIB to libraries stripped in _default_inc [12030]
-+    - Our version of prove now handles directories containing circular
-+      links correctly [21938]
-+    - Set TAP_VERSION env var in Parser [11595]
-+    - Added setup, teardown hooks to T::P::I::Process to facilitate the
-+      setup and cleanup of the test script's environment
-+    - Any additional libs added to the command line are also added to
-+      PERL5LIB for the duration of a test run so that any Perl children
-+      of the test script inherit the same library paths.
-+    - Fixed handling of single quoted hash keys in T::P::Y::Reader
-+    - Made runtests return the TAP::Parser::Aggregator
-+    - Fixed t/120-harness.t has failures if TAP::Harness::Color cannot
-+      load optional modules [27125] - thanks DROLSKY
-+    - Fixed parsing of \# in test description  
-+0.51 12 March 2007
-+    - 'execrc' file now allows 'regex' matches for tests.
-+    - rename 'TAPx' --> 'TAP'
-+    - Reimplemented the parse logic of TAP::Parser as a state machine.
-+    - Removed various ad-hoc state variables from TAP::Parser and moved
-+      their logic into the state machine.
-+    - Removed now-unused is_first / is_last methods from Iterator and
-+      simplified remaining logic to suit.
-+    - Removed now-redundant t/140-varsource.t.
-+    - Implemented TAP version syntax.
-+    - Tidied TAP::Harness::Compatible documentation
-+    - Removed redundant modules below TAP::Harness::Compatible
-+    - Removed unused compatibility tests
-+
-+0.50_07 5 March 2007
-+    - Fixed bug where we erroneously checked the test number instead of number
-+      of tests run to determine if we've run more tests than we planned.
-+    - Add a --directives switch to 'runtests' which only shows test results
-+      with directives (such as 'TODO' or 'SKIP').
-+    - Removed some dead code from TAPx::Parser.
-+    - Added color support for Windows using Win32::Console.
-+    - Made Color::failure_output reset colors before printing
-+      the trailing newline.
-+    - Corrected some issues with the 'runtests' docs and removed some
-+      performance notes which no longer seem accurate.
-+    - Fixed bug whereby if tests without file extensions were included then
-+      the spacing of the result leaders would be off.
-+    - execrc file is now a YAML file.
-+    - Removed white background on the test failures.  It was too garish for
-+      me.  Just more proof that we need better ways of overriding color
-+      support.
-+    - Started work on TAPx::Harness::Compatible. Right now it's mainly just
-+      a direct lift of Test::Harness to make sure the tests work.
-+    - Commented out use Data::Dumper::Simple in T::Harness.pm - it's not
-+      a core module.
-+    - Added next_raw to TAPx::Parser::Iterator which skips any fixes for
-+      quirky TAP that are implemented by next. Used to support
-+      TAPx::Harness::Compatible::Iterator
-+    - Applied our version number to all T::H::Compatible modules
-+    - Removed T::H::C::Assert. It's documented as being private to
-+      Test::Harness and we're not going to need it.
-+    - Refactored runtests to call aggregate_tests to expose the
-+      interface we need for the compatibility layer.
-+    - Make it possible to pass an end time to summary so that it needn't
-+      be called immediately after the tests complete.
-+    - Moved callback handling into TAPx::Base and altered TAPx::Parser
-+      to use it.
-+    - Made TAPx::Harness into a subclass of TAPx::Base and implemented
-+      made_parser callback.
-+    - Moved the dispatch of callbacks out of run and into next so that
-+      they're called when TAPx::Harness iterates through the results.
-+    - Implemented PERL_TEST_HARNESS_DUMP_TAP which names a directory
-+      into which the raw TAP of any tests run via TAPx::Harness will
-+      be written.
-+    - Rewrote the TAPx::Grammar->tokenize method to return a
-+      TAPx::Parser::Result object.  Code is much cleaner now.
-+    - Moved the official grammar from TAPx::Parser to TAPx::Parser::Grammar,
-+      provided a link and updated the grammar.
-+    - Fixed bug where a properly escaped '# TODO' line in a test description
-+      would still be reported as a TODO test.
-+    - Added patches/ExtUtils-MakeMaker-6.31.patch - a patch against EUMM
-+      that makes test_harness use TAPx::Harness instead of Test::Harness
-+      if PERL_EUMM_USE_TAPX is true and TAPx::Harness is installed. In
-+      other words cause 'make test' for EUMM based models to use
-+      TAPx::Harness.
-+    - Added support for timer option to TAPx::Harness which causes the
-+      elapsed time for each test to be displayed.
-+    - Setup tapx-dev@hexten.net mailing list.
-+    - Fixed accumulating @$exec bug in TAPx::Harness.
-+    - Made runtests pass '--exec' option as an array.
-+    - (#24679) TAPx::Harness now reports failure for tests that die
-+      after completing all subtests.
-+    - Added in_todo attribute on TAPx::Parser which is true while the
-+      most recently seen test was a TODO.
-+    - (#24728) TAPx::Harness now supresses diagnostics from failed
-+      TODOs. Not sure if the semantics of this are correct yet.
-+      
-+0.50_06 18 January 2007
-+    - Fixed doc typo in examples/README [rt.cpan.org #24409]
-+    - Colored test output is now the default for 'runtests' unless
-+      you're running under windows or -t STDOUT is false.
-+      [rt.cpan.org #24310]
-+    - Removed the .t extension from t/source_tests/*.t since those are
-+      'test tests' which caused false negatives when running recursive
-+      tests. [Adrian Howard]
-+    - Somewhere along the way, the exit status started working again.
-+      Go figure.
-+    - Factored color output so that disabling it under Windows is
-+      cleaner.
-+    - Added explicit switch to :crlf layer after open3 under Windows.
-+      open3 defaults to raw mode resulting in spurious \r characters input
-+      parsed input.
-+    - Made Iterator do an explicit wait for subprocess termination.
-+      Needed to get process status correctly on Windows.
-+    - Fixed bug which didn't allow t/010-regression.t to be run directly
-+      via Perl unless you specified Perl's full path.
-+    - Removed SIG{CHLD} handler (which we shouldn't need I think because
-+      we explicitly waitpid) and made binmode ':crlf' conditional on
-+      IS_WIN32. On Mac OS these two things combined to expose a problem
-+      which meant that output from test scripts was sometimes lost.
-+    - Made t/110-source.t use File::Spec->catfile to build path to
-+      test script.
-+    - Made Iterator::FH init is_first, is_last to 0 rather than undef
-+      for consistency with array iterator.
-+    - Added t/120-varsource.t to test is_first and is_last semantics
-+      over files with small numbers of lines.
-+    - Added check for valid callback keys.
-+    - Added t/130-results.t for Result classes.
-+
-+0.50_05 15 January 2007
-+    - Removed debugging code accidentally left in bin/runtests.
-+    - Removed 'local $/ = ...' from the iterator.  Hopefully that will fix the
-+      line ending bug, but I don't know about the wstat problem.
-+
-+0.50_04 14 January 2007
-+    - BACKWARDS IMCOMPATIBLE:  Renamed all '::Results' classes to '::Result'
-+      because they represent a single result.
-+    - Fixed bug where piping would break verbose output.
-+    - IPC::Open3::open3 now takes a @command list rather than a $command
-+      string.  This should make it work under Windows.
-+    - Added 'stdout_sterr' sample test back to regression tests.  IPC::Open3
-+      appears to make it work.
-+    - Bug fix:  don't print 'All tests successful' if no tests are run.
-+    - Refactored 'runtests' to make it a bit easier to follow.
-+    - Bug fix:  Junk and comments now allowed before a leading plan.
-+    - HARNESS_ACTIVE and HARNESS_VERSION environment variables now set.
-+    - Renamed 'problems' in TAPx::Parser and TAPx::Aggregator to
-+      'has_problems'.
-+
-+0.50_03 08 January 2007
-+
-+    - Fixed bug where '-q' or '-Q' with colored tests weren't suppressing all
-+      information.
-+    - Fixed an annoying MANIFEST nit.
-+    - Made '-h' for runtests now report help.  Using a new harness requires
-+      the full --harness switch.
-+    - Added 'problems' method to TAPx::Parser and TAPx::Parser::Aggregator.
-+    - Deprecatd 'todo_failed' in favor of 'todo_passed'
-+    - Add -I switch to runtests.
-+    - Fixed runtests doc nit (smylers)
-+    - Removed TAPx::Parser::Builder.
-+    - A few more POD nits taken care of.
-+    - Completely removed all traces of C<--merge> as IPC::Open3 seems to be
-+      working.
-+    - Moved the tprove* examples to examples/bin in hopes of them no longer
-+      showing up in CPAN's docs.
-+    - Made the 'unexpectedly succeeded' message clearer (Adam Kennedy)
-+
-+0.50_02 06 January 2007
-+    - Added some files I left out of the manifest (reported by Florian
-+      Ragwitz).
-+    - Added strict to Makefile.PL and changed @PROGRAM to @program (reported
-+      Florian Ragwitz).
-+
-+0.50_01 06 January 2007
-+    - Added a new example which shows to how test Perl, Ruby, and URLs all at
-+      the same time using 'execrc' files.
-+    - Fixed the diagnostic format mangling bug.
-+    - We no longer override Test::Builder to merge streams.  Instead, we go
-+      ahead and use IPC::Open3.  It remains to be seen whether or not this is
-+      a good idea.
-+    - Fixed vms nit:  for failing tests, vms often has the 'not' on a line by
-+      itself.
-+    - Fixed bugs where unplanned tests were not reporting as a failure (test
-+      number greater than tests planned).
-+    - TAPx::Parser constructor can now take an 'exec' option to tell it what
-+      to execute to create the stream (huge performance boost).
-+    - Added TAPx::Parser::Source.  This allows us to run tests in just about
-+      any programming language.
-+    - Renamed the filename() method to source() in TAPx::Parser::Source::Perl.
-+    - We now cache the @INC values found for TAPx::Parser::Source::Perl.
-+    - Added two test harnesses, TAPx::Harness and TAPx::Harness::Color.
-+    - Removed references to manual stream construction from TAPx::Parser
-+      documentation.  Users should not (usually) need to worry about streams.
-+    - Added bin/runtests utility.  This is very similar to 'prove'.
-+    - Renumbered tests to make it easier to add new ones.
-+    - Corrected some minor documentation nits.
-+    - Makefile.PL is no longer auto-generated (it's built by hand).
-+    - Fixed regression test bug where driving tests through the harness I'm
-+      testing caused things to break.
-+    - BUG:  exit() values are now broken.  I don't know how to capture them
-+      with IPC::Open3.  However, since no one appears to be using them, this
-+      might not be an issue.
-+
-+0.41  12 December 2006
-+    - Fixed (?) 10-regression.t test which failed on Windows.  Removed the
-+      segfault test as it has no meaning on Windows.  Reported by PSINNOTT
-+      <link@redbrick.dcu.ie> and fix recommended by Schwern based on his
-+      Test::Harness experience.
-+      http://rt.cpan.org/Ticket/Display.html?id=21624
-+
-+0.40  05 December 2006
-+    - Removed TAPx::Parser::Streamed and folded its functionality into
-+      TAPx::Parser.
-+    - Fixed bug where sometimes is_good_plan() would return a false positive
-+      (exposed by refactoring).
-+    - A number of tiny performance enhancements.
-+
-+0.33  22 September 2006
-+    - OK, I'm getting ticked off by some of the comments on Perl-QA so I
-+      rushed this out the door and broke it :(  I'm backing out one test and
-+      slowing down a bit.
-+
-+0.32  22 September 2006
-+    - Applied patch from Schwern which fixed the Builder package name (TAPx::
-+      instead of TAPX:: -- stupid case-insensitive package names!).
-+      [rt.cpan.org #21605]
-+
-+0.31  21 September 2006
-+    - Fixed bug where Carp::croak without parens could cause Perl to fail to
-+      compile on some platforms. [Andreas J. Koenig]
-+    - Eliminated the non-portable redirect of STDERR to STDOUT (2>&1) and
-+      fixed the synchronization issue.  This involves overridding
-+      Test::Builder::failure_output() in a very sneaky way.  I may have to
-+      back this out.
-+    - Renamed boolean methods to begin with 'is_'.  The methods they replace
-+      are documented, deprecated, and will not be removed prior to version
-+      1.00.
-+
-+0.30  17 September 2006
-+    - Fixed bug where no output would still claim to have a good plan.
-+    - Fixed bug where no output would cause parser to die.
-+    - Fixed bug where failing to specify a plan would be two parse errors
-+      instead of one.
-+    - Fixed bug where a correct plan count in an incorrect place would still
-+      report as a 'good_plan'.
-+    - Fixed bug where comments could accidently be misparsed as directives.
-+    - Eliminated testing of internal structure of result objects.  The other
-+      tests cover this.
-+    - Allow hash marks in descriptions.  This was causing a problem because
-+      many test suites (Regexp::Common and Perl core) allowed them to exist.
-+    - Added support for SKIP directives in plans.
-+    - Did some work simplifying &TAPx::Parser::_initialize.  It's not great,
-+      but it's better than it was.
-+    - TODO tests now always pass, regardless of actual_passed status.
-+    - Removed 'use warnings' and now use -w
-+    - 'switches' may now be passed to the TAPx::Parser constructor.
-+    - Added 'exit' status.
-+    - Added 'wait' status.
-+    - Eliminated 'use base'.  This is part of the plan to make TAPx::Parser
-+      compatible with older versions of Perl.
-+    - Added 'source' key to the TAPx::Parser constructor.  Making new parsers
-+      is now much easier.
-+    - Renamed iterator first() and last() methods to is_first() and is_last().
-+      Credit:  Aristotle.
-+    - Planned tests != tests run is now a parse error.  It was really stupid
-+      of me not to do that in the first place.
-+    - Added massive regression test suite in t/100-regression.t
-+    - Updated the grammar to show that comments are allowed.
-+    - Comments are now permitted after an ending plan.
-+
-+0.22  13 September 2006
-+    - Removed buggy support for multi-line chunks from streams.  If your
-+      streams or iterators return anything but single lines, this is a bug.
-+    - Fixed bug whereby blank lines in TAP would confuse the parser.  Reported
-+      by Torsten Schoenfeld.
-+    - Added first() and last() methods to the iterator.
-+    - TAPx::Parser::Source::Perl now has a 'switches' method which allows
-+      switches to be passed to the perl executable running the test file.
-+      This allows tprove to accept a '-l' argument to force lib/ to be
-+      included in Perl's @INC.
-+
-+0.21  8 September 2006
-+    - Included experimental GTK interface written by Torsten Schoenfeld.
-+    - Fixed bad docs in examples/tprove_color
-+    - Applied patch from Shlomi Fish fixing bug where runs from one stream
-+      could leak into another when bailing out.  [rt.cpan.org #21379] 
-+    - Fixed some typos in the POD.
-+    - Corrected the grammar to allow for a plan of "1..0" (infinite stream).
-+    - Started to add proper acknowledgements.
-+
-+0.20  2 September 2006
-+    - Fixed bug reported by GEOFFR.  When no tap output was found, an
-+      "Unitialized value" warning occurred.  [rt.cpan.org #21205]
-+    - Updated tprove to now report a test failure when no tap output found.
-+    - Removed examples/tprove_color2 as tprove_color now works.
-+    - Vastly improved callback system and updated the docs for how to use
-+      them.
-+    - Changed TAPx::Parser::Source::Perl to use Symbol::gensym() instead of a
-+      hard-to-guess filehandle name.
-+
-+0.12  30 July 2006
-+    - Added a test colorization script
-+    - Callback support added.
-+    - Added TAPx::Parser::Source::Perl.
-+    - Added TAPx::Parser::Aggregator. 
-+    - Added version numbers to all classes.
-+    - Added 'todo_failed' test result and parser.
-+    - 00-load.t now loads all classes instead of having individual tests load
-+      their supporting classes.
-+    - Changed $parser->results to $parser->next
-+
-+0.11  25 July, 2006
-+    - Renamed is_skip and is_todo to has_skip and has_todo.  Much less
-+      confusing since a result responding true to those also responded true to
-+      is_test.
-+    - Added simplistic bin/tprove to run tests.  Much harder than I thought
-+      and much code stolen from Test::Harness.
-+    - Modified stolen iterator to fix a bug with stream handling when extra
-+      newlines were encountered.
-+    - Added TAPx::Parser::Iterator (stolen from Test::Harness::Iterator)
-+    - Normalized internal structure of result objects.
-+    - All tokens now have a 'type' key.  This greatly simplifies internals.
-+    - Copied much result POD info into the main docs.
-+    - Corrected the bug report URLs.
-+    - Minor updates to the grammar listed in the POD.
-+
-+0.10  23 July, 2006
-+    - Oh my Larry, we gots docs!
-+    - _parse and _tap are now private methods.
-+    - Stream support has been added.
-+    - Moved the grammar into its own class.
-+    - Pulled remaining parser functionality out of lexer.
-+    - Added type() method to Results().
-+    - Parse errors no longer croak().  Instead, they are available through the
-+      parse_errors() method.
-+    - Added good_plan() method.
-+    - tests_planned != tests_run is no longer a parse error.
-+    - Renamed test_count() to tests_run().
-+    - Renamed num_tests() to tests_planned().
-+
-+0.03  17 July, 2006
-+    - 'Bail out!' is now handled.
-+    - The parser is now data driven, thus skipping a huge if/else chain
-+    - We now track all TODOs, SKIPs, passes and fails by test number.
-+    - Removed all non-core modules.
-+    - Store original line for each TAP line.  Available through
-+      $result->raw().
-+    - Renamed test is_ok() to passed() and added actual_passed().  The former
-+      method takes into account TODO tests and the latter returns the actual
-+      pass/fail status.
-+    - Fixed a bug where SKIP tests would not be identified correctly.
-+
-+0.02  8 July, 2006
-+    - Moved some lexer responsibility to the parser.  This will allow us to
-+      eventually parse streams.
-+    - Properly track passed/failed tests, even accounting for TODO.
-+    - Added support for comments and unknown lines.
-+    - Allow explicit and inferred test numbers to be mixed.
-+    - Allow escaped hashes in the test description.
-+    - Renamed to TAPx::Parser.  Will probably rename it again.
-+
-+0.01  Date/time
-+    - First version, unreleased on an unsuspecting world.
-+    - No, you'll never know when ...
-+
-+========================================================================
-+Changes-2.64:
-+
- Revision history for Perl extension Test::Harness
- 
-+This is the revision history for the previous version of Test::Harness
-+up to 2.64. The current version of test harness is a complete rewrite of
-+this code.
-+
- NEXT
-     [FIXES]
-     * prove's --perl=/path/to/file wasn't taking a value.
-diff -urN perl-5.10.0.orig/lib/Test/Harness/Iterator.pm perl-5.10.0/lib/Test/Harness/Iterator.pm
---- perl-5.10.0.orig/lib/Test/Harness/Iterator.pm	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/Iterator.pm	1970-01-01 01:00:00.000000000 +0100
-@@ -1,70 +0,0 @@
--package Test::Harness::Iterator;
--
--use strict;
--use vars qw($VERSION);
--$VERSION = 0.02;
--
--=head1 NAME
--
--Test::Harness::Iterator - Internal Test::Harness Iterator
--
--=head1 SYNOPSIS
--
--  use Test::Harness::Iterator;
--  my $it = Test::Harness::Iterator->new(\*TEST);
--  my $it = Test::Harness::Iterator->new(\@array);
--
--  my $line = $it->next;
--
--=head1 DESCRIPTION
--
--B<FOR INTERNAL USE ONLY!>
--
--This is a simple iterator wrapper for arrays and filehandles.
--
--=head2 new()
--
--Create an iterator.
--
--=head2 next()
--
--Iterate through it, of course.
--
--=cut
--
--sub new {
--    my($proto, $thing) = @_;
--
--    my $self = {};
--    if( ref $thing eq 'GLOB' ) {
--        bless $self, 'Test::Harness::Iterator::FH';
--        $self->{fh} = $thing;
--    }
--    elsif( ref $thing eq 'ARRAY' ) {
--        bless $self, 'Test::Harness::Iterator::ARRAY';
--        $self->{idx}   = 0;
--        $self->{array} = $thing;
--    }
--    else {
--        warn "Can't iterate with a ", ref $thing;
--    }
--
--    return $self;
--}
--
--package Test::Harness::Iterator::FH;
--sub next {
--    my $fh = $_[0]->{fh};
--
--    # readline() doesn't work so good on 5.5.4.
--    return scalar <$fh>;
--}
--
--
--package Test::Harness::Iterator::ARRAY;
--sub next {
--    my $self = shift;
--    return $self->{array}->[$self->{idx}++];
--}
--
--"Steve Peters, Master Of True Value Finding, was here.";
-diff -urN perl-5.10.0.orig/lib/Test/Harness/Point.pm perl-5.10.0/lib/Test/Harness/Point.pm
---- perl-5.10.0.orig/lib/Test/Harness/Point.pm	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/Point.pm	1970-01-01 01:00:00.000000000 +0100
-@@ -1,143 +0,0 @@
--# -*- Mode: cperl; cperl-indent-level: 4 -*-
--package Test::Harness::Point;
--
--use strict;
--use vars qw($VERSION);
--$VERSION = '0.01';
--
--=head1 NAME
--
--Test::Harness::Point - object for tracking a single test point
--
--=head1 SYNOPSIS
--
--One Test::Harness::Point object represents a single test point.
--
--=head1 CONSTRUCTION
--
--=head2 new()
--
--    my $point = new Test::Harness::Point;
--
--Create a test point object.
--
--=cut
--
--sub new {
--    my $class = shift;
--    my $self  = bless {}, $class;
--
--    return $self;
--}
--
--=head1 from_test_line( $line )
--
--Constructor from a TAP test line, or empty return if the test line
--is not a test line.
--
--=cut
--
--sub from_test_line  {
--    my $class = shift;
--    my $line = shift or return;
--
--    # We pulverize the line down into pieces in three parts.
--    my ($not, $number, $extra) = ($line =~ /^(not )?ok\b(?:\s+(\d+))?\s*(.*)/) or return;
--
--    my $point = $class->new;
--    $point->set_number( $number );
--    $point->set_ok( !$not );
--
--    if ( $extra ) {
--        my ($description,$directive) = split( /(?:[^\\]|^)#/, $extra, 2 );
--        $description =~ s/^- //; # Test::More puts it in there
--        $point->set_description( $description );
--        if ( $directive ) {
--            $point->set_directive( $directive );
--        }
--    } # if $extra
--
--    return $point;
--} # from_test_line()
--
--=head1 ACCESSORS
--
--Each of the following fields has a getter and setter method.
--
--=over 4
--
--=item * ok
--
--=item * number
--
--=cut
--
--sub ok              { my $self = shift; $self->{ok} }
--sub set_ok          {
--    my $self = shift;
--    my $ok = shift;
--    $self->{ok} = $ok ? 1 : 0;
--}
--sub pass {
--    my $self = shift;
--
--    return ($self->ok || $self->is_todo || $self->is_skip) ? 1 : 0;
--}
--
--sub number          { my $self = shift; $self->{number} }
--sub set_number      { my $self = shift; $self->{number} = shift }
--
--sub description     { my $self = shift; $self->{description} }
--sub set_description {
--    my $self = shift;
--    $self->{description} = shift;
--    $self->{name} = $self->{description}; # history
--}
--
--sub directive       { my $self = shift; $self->{directive} }
--sub set_directive   {
--    my $self = shift;
--    my $directive = shift;
--
--    $directive =~ s/^\s+//;
--    $directive =~ s/\s+$//;
--    $self->{directive} = $directive;
--
--    my ($type,$reason) = ($directive =~ /^\s*(\S+)(?:\s+(.*))?$/);
--    $self->set_directive_type( $type );
--    $reason = "" unless defined $reason;
--    $self->{directive_reason} = $reason;
--}
--sub set_directive_type {
--    my $self = shift;
--    $self->{directive_type} = lc shift;
--    $self->{type} = $self->{directive_type}; # History
--}
--sub set_directive_reason {
--    my $self = shift;
--    $self->{directive_reason} = shift;
--}
--sub directive_type  { my $self = shift; $self->{directive_type} }
--sub type            { my $self = shift; $self->{directive_type} }
--sub directive_reason{ my $self = shift; $self->{directive_reason} }
--sub reason          { my $self = shift; $self->{directive_reason} }
--sub is_todo {
--    my $self = shift;
--    my $type = $self->directive_type;
--    return $type && ( $type eq 'todo' );
--}
--sub is_skip {
--    my $self = shift;
--    my $type = $self->directive_type;
--    return $type && ( $type eq 'skip' );
--}
--
--sub diagnostics     {
--    my $self = shift;
--    return @{$self->{diagnostics}} if wantarray;
--    return join( "\n", @{$self->{diagnostics}} );
--}
--sub add_diagnostic  { my $self = shift; push @{$self->{diagnostics}}, @_ }
--
--
--1;
-diff -urN perl-5.10.0.orig/lib/Test/Harness/Results.pm perl-5.10.0/lib/Test/Harness/Results.pm
---- perl-5.10.0.orig/lib/Test/Harness/Results.pm	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/Results.pm	1970-01-01 01:00:00.000000000 +0100
-@@ -1,182 +0,0 @@
--# -*- Mode: cperl; cperl-indent-level: 4 -*-
--package Test::Harness::Results;
--
--use strict;
--use vars qw($VERSION);
--$VERSION = '0.01';
--
--=head1 NAME
--
--Test::Harness::Results - object for tracking results from a single test file
--
--=head1 SYNOPSIS
--
--One Test::Harness::Results object represents the results from one
--test file getting analyzed.
--
--=head1 CONSTRUCTION
--
--=head2 new()
--
--    my $results = new Test::Harness::Results;
--
--Create a test point object.  Typically, however, you'll not create
--one yourself, but access a Results object returned to you by
--Test::Harness::Results.
--
--=cut
--
--sub new {
--    my $class = shift;
--    my $self  = bless {}, $class;
--
--    return $self;
--}
--
--=head1 ACCESSORS
--
--The following data points are defined:
--
--  passing           true if the whole test is considered a pass 
--                    (or skipped), false if its a failure
--
--  exit              the exit code of the test run, if from a file
--  wait              the wait code of the test run, if from a file
--
--  max               total tests which should have been run
--  seen              total tests actually seen
--  skip_all          if the whole test was skipped, this will 
--                      contain the reason.
--
--  ok                number of tests which passed 
--                      (including todo and skips)
--
--  todo              number of todo tests seen
--  bonus             number of todo tests which 
--                      unexpectedly passed
--
--  skip              number of tests skipped
--
--So a successful test should have max == seen == ok.
--
--
--There is one final item, the details.
--
--  details           an array ref reporting the result of 
--                    each test looks like this:
--
--    $results{details}[$test_num - 1] = 
--            { ok          => is the test considered ok?
--              actual_ok   => did it literally say 'ok'?
--              name        => name of the test (if any)
--              diagnostics => test diagnostics (if any)
--              type        => 'skip' or 'todo' (if any)
--              reason      => reason for the above (if any)
--            };
--
--Element 0 of the details is test #1.  I tried it with element 1 being
--#1 and 0 being empty, this is less awkward.
--
--
--Each of the following fields has a getter and setter method.
--
--=over 4
--
--=item * wait
--
--=item * exit
--
--=cut
--
--sub set_wait { my $self = shift; $self->{wait} = shift }
--sub wait {
--    my $self = shift;
--    return $self->{wait} || 0;
--}
--
--sub set_skip_all { my $self = shift; $self->{skip_all} = shift }
--sub skip_all {
--    my $self = shift;
--    return $self->{skip_all};
--}
--
--sub inc_max { my $self = shift; $self->{max} += (@_ ? shift : 1) }
--sub max {
--    my $self = shift;
--    return $self->{max} || 0;
--}
--
--sub set_passing { my $self = shift; $self->{passing} = shift }
--sub passing {
--    my $self = shift;
--    return $self->{passing} || 0;
--}
--
--sub inc_ok { my $self = shift; $self->{ok} += (@_ ? shift : 1) }
--sub ok {
--    my $self = shift;
--    return $self->{ok} || 0;
--}
--
--sub set_exit { 
--    my $self = shift; 
--    if ($^O eq 'VMS') {
--        eval {
--            use vmsish q(status);
--            $self->{exit} = shift;  # must be in same scope as pragma
--        }
--    }
--    else {
--        $self->{exit} = shift;
--    }
--}
--sub exit {
--    my $self = shift;
--    return $self->{exit} || 0;
--}
--
--sub inc_bonus { my $self = shift; $self->{bonus}++ }
--sub bonus {
--    my $self = shift;
--    return $self->{bonus} || 0;
--}
--
--sub set_skip_reason { my $self = shift; $self->{skip_reason} = shift }
--sub skip_reason {
--    my $self = shift;
--    return $self->{skip_reason} || 0;
--}
--
--sub inc_skip { my $self = shift; $self->{skip}++ }
--sub skip {
--    my $self = shift;
--    return $self->{skip} || 0;
--}
--
--sub inc_todo { my $self = shift; $self->{todo}++ }
--sub todo {
--    my $self = shift;
--    return $self->{todo} || 0;
--}
--
--sub inc_seen { my $self = shift; $self->{seen}++ }
--sub seen {
--    my $self = shift;
--    return $self->{seen} || 0;
--}
--
--sub set_details {
--    my $self = shift;
--    my $index = shift;
--    my $details = shift;
--
--    my $array = ($self->{details} ||= []);
--    $array->[$index-1] = $details;
--}
--
--sub details {
--    my $self = shift;
--    return $self->{details} || [];
--}
--
--1;
-diff -urN perl-5.10.0.orig/lib/Test/Harness/Straps.pm perl-5.10.0/lib/Test/Harness/Straps.pm
---- perl-5.10.0.orig/lib/Test/Harness/Straps.pm	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/Straps.pm	1970-01-01 01:00:00.000000000 +0100
-@@ -1,648 +0,0 @@
--# -*- Mode: cperl; cperl-indent-level: 4 -*-
--package Test::Harness::Straps;
--
--use strict;
--use vars qw($VERSION);
--$VERSION = '0.26_01';
--
--use Config;
--use Test::Harness::Assert;
--use Test::Harness::Iterator;
--use Test::Harness::Point;
--use Test::Harness::Results;
--
--# Flags used as return values from our methods.  Just for internal 
--# clarification.
--my $YES   = (1==1);
--my $NO    = !$YES;
--
--=head1 NAME
--
--Test::Harness::Straps - detailed analysis of test results
--
--=head1 SYNOPSIS
--
--  use Test::Harness::Straps;
--
--  my $strap = Test::Harness::Straps->new;
--
--  # Various ways to interpret a test
--  my $results = $strap->analyze($name, \@test_output);
--  my $results = $strap->analyze_fh($name, $test_filehandle);
--  my $results = $strap->analyze_file($test_file);
--
--  # UNIMPLEMENTED
--  my %total = $strap->total_results;
--
--  # Altering the behavior of the strap  UNIMPLEMENTED
--  my $verbose_output = $strap->dump_verbose();
--  $strap->dump_verbose_fh($output_filehandle);
--
--
--=head1 DESCRIPTION
--
--B<THIS IS ALPHA SOFTWARE> in that the interface is subject to change
--in incompatible ways.  It is otherwise stable.
--
--Test::Harness is limited to printing out its results.  This makes
--analysis of the test results difficult for anything but a human.  To
--make it easier for programs to work with test results, we provide
--Test::Harness::Straps.  Instead of printing the results, straps
--provide them as raw data.  You can also configure how the tests are to
--be run.
--
--The interface is currently incomplete.  I<Please> contact the author
--if you'd like a feature added or something change or just have
--comments.
--
--=head1 CONSTRUCTION
--
--=head2 new()
--
--  my $strap = Test::Harness::Straps->new;
--
--Initialize a new strap.
--
--=cut
--
--sub new {
--    my $class = shift;
--    my $self  = bless {}, $class;
--
--    $self->_init;
--
--    return $self;
--}
--
--=for private $strap->_init
--
--  $strap->_init;
--
--Initialize the internal state of a strap to make it ready for parsing.
--
--=cut
--
--sub _init {
--    my($self) = shift;
--
--    $self->{_is_vms}   = ( $^O eq 'VMS' );
--    $self->{_is_win32} = ( $^O =~ /^(MS)?Win32$/ );
--    $self->{_is_macos} = ( $^O eq 'MacOS' );
--}
--
--=head1 ANALYSIS
--
--=head2 $strap->analyze( $name, \@output_lines )
--
--    my $results = $strap->analyze($name, \@test_output);
--
--Analyzes the output of a single test, assigning it the given C<$name>
--for use in the total report.  Returns the C<$results> of the test.
--See L<Results>.
--
--C<@test_output> should be the raw output from the test, including
--newlines.
--
--=cut
--
--sub analyze {
--    my($self, $name, $test_output) = @_;
--
--    my $it = Test::Harness::Iterator->new($test_output);
--    return $self->_analyze_iterator($name, $it);
--}
--
--
--sub _analyze_iterator {
--    my($self, $name, $it) = @_;
--
--    $self->_reset_file_state;
--    $self->{file} = $name;
--
--    my $results = Test::Harness::Results->new;
--
--    # Set them up here so callbacks can have them.
--    $self->{totals}{$name} = $results;
--    while( defined(my $line = $it->next) ) {
--        $self->_analyze_line($line, $results);
--        last if $self->{saw_bailout};
--    }
--
--    $results->set_skip_all( $self->{skip_all} ) if defined $self->{skip_all};
--
--    my $passed =
--        (($results->max == 0) && defined $results->skip_all) ||
--        ($results->max &&
--         $results->seen &&
--         $results->max == $results->seen &&
--         $results->max == $results->ok);
--
--    $results->set_passing( $passed ? 1 : 0 );
--
--    return $results;
--}
--
--
--sub _analyze_line {
--    my $self = shift;
--    my $line = shift;
--    my $results = shift;
--
--    $self->{line}++;
--
--    my $linetype;
--    my $point = Test::Harness::Point->from_test_line( $line );
--    if ( $point ) {
--        $linetype = 'test';
--
--        $results->inc_seen;
--        $point->set_number( $self->{'next'} ) unless $point->number;
--
--        # sometimes the 'not ' and the 'ok' are on different lines,
--        # happens often on VMS if you do:
--        #   print "not " unless $test;
--        #   print "ok $num\n";
--        if ( $self->{lone_not_line} && ($self->{lone_not_line} == $self->{line} - 1) ) {
--            $point->set_ok( 0 );
--        }
--
--        if ( $self->{todo}{$point->number} ) {
--            $point->set_directive_type( 'todo' );
--        }
--
--        if ( $point->is_todo ) {
--            $results->inc_todo;
--            $results->inc_bonus if $point->ok;
--        }
--        elsif ( $point->is_skip ) {
--            $results->inc_skip;
--        }
--
--        $results->inc_ok if $point->pass;
--
--        if ( ($point->number > 100_000) && ($point->number > ($self->{max}||100_000)) ) {
--            if ( !$self->{too_many_tests}++ ) {
--                warn "Enormous test number seen [test ", $point->number, "]\n";
--                warn "Can't detailize, too big.\n";
--            }
--        }
--        else {
--            my $details = {
--                ok          => $point->pass,
--                actual_ok   => $point->ok,
--                name        => _def_or_blank( $point->description ),
--                type        => _def_or_blank( $point->directive_type ),
--                reason      => _def_or_blank( $point->directive_reason ),
--            };
--
--            assert( defined( $details->{ok} ) && defined( $details->{actual_ok} ) );
--            $results->set_details( $point->number, $details );
--        }
--    } # test point
--    elsif ( $line =~ /^not\s+$/ ) {
--        $linetype = 'other';
--        # Sometimes the "not " and "ok" will be on separate lines on VMS.
--        # We catch this and remember we saw it.
--        $self->{lone_not_line} = $self->{line};
--    }
--    elsif ( $self->_is_header($line) ) {
--        $linetype = 'header';
--
--        $self->{saw_header}++;
--
--        $results->inc_max( $self->{max} );
--    }
--    elsif ( $self->_is_bail_out($line, \$self->{bailout_reason}) ) {
--        $linetype = 'bailout';
--        $self->{saw_bailout} = 1;
--    }
--    elsif (my $diagnostics = $self->_is_diagnostic_line( $line )) {
--        $linetype = 'other';
--        # XXX We can throw this away, really.
--        my $test = $results->details->[-1];
--        $test->{diagnostics} ||=  '';
--        $test->{diagnostics}  .= $diagnostics;
--    }
--    else {
--        $linetype = 'other';
--    }
--
--    $self->callback->($self, $line, $linetype, $results) if $self->callback;
--
--    $self->{'next'} = $point->number + 1 if $point;
--} # _analyze_line
--
--
--sub _is_diagnostic_line {
--    my ($self, $line) = @_;
--    return if index( $line, '# Looks like you failed' ) == 0;
--    $line =~ s/^#\s//;
--    return $line;
--}
--
--=for private $strap->analyze_fh( $name, $test_filehandle )
--
--    my $results = $strap->analyze_fh($name, $test_filehandle);
--
--Like C<analyze>, but it reads from the given filehandle.
--
--=cut
--
--sub analyze_fh {
--    my($self, $name, $fh) = @_;
--
--    my $it = Test::Harness::Iterator->new($fh);
--    return $self->_analyze_iterator($name, $it);
--}
--
--=head2 $strap->analyze_file( $test_file )
--
--    my $results = $strap->analyze_file($test_file);
--
--Like C<analyze>, but it runs the given C<$test_file> and parses its
--results.  It will also use that name for the total report.
--
--=cut
--
--sub analyze_file {
--    my($self, $file) = @_;
--
--    unless( -e $file ) {
--        $self->{error} = "$file does not exist";
--        return;
--    }
--
--    unless( -r $file ) {
--        $self->{error} = "$file is not readable";
--        return;
--    }
--
--    local $ENV{PERL5LIB} = $self->_INC2PERL5LIB;
--    if ( $Test::Harness::Debug ) {
--        local $^W=0; # ignore undef warnings
--        print "# PERL5LIB=$ENV{PERL5LIB}\n";
--    }
--
--    # *sigh* this breaks under taint, but open -| is unportable.
--    my $line = $self->_command_line($file);
--
--    unless ( open(FILE, "$line|" )) {
--        print "can't run $file. $!\n";
--        return;
--    }
--
--    my $results = $self->analyze_fh($file, \*FILE);
--    my $exit    = close FILE;
--
--    $results->set_wait($?);
--    if ( $? && $self->{_is_vms} ) {
--        $results->set_exit($?);
--    }
--    else {
--        $results->set_exit( _wait2exit($?) );
--    }
--    $results->set_passing(0) unless $? == 0;
--
--    $self->_restore_PERL5LIB();
--
--    return $results;
--}
--
--
--eval { require POSIX; &POSIX::WEXITSTATUS(0) };
--if( $@ ) {
--    *_wait2exit = sub { $_[0] >> 8 };
--}
--else {
--    *_wait2exit = sub { POSIX::WEXITSTATUS($_[0]) }
--}
--
--=for private $strap->_command_line( $file )
--
--Returns the full command line that will be run to test I<$file>.
--
--=cut
--
--sub _command_line {
--    my $self = shift;
--    my $file = shift;
--
--    my $command =  $self->_command();
--    my $switches = $self->_switches($file);
--
--    $file = qq["$file"] if ($file =~ /\s/) && ($file !~ /^".*"$/);
--    my $line = "$command $switches $file";
--
--    return $line;
--}
--
--
--=for private $strap->_command()
--
--Returns the command that runs the test.  Combine this with C<_switches()>
--to build a command line.
--
--Typically this is C<$^X>, but you can set C<$ENV{HARNESS_PERL}>
--to use a different Perl than what you're running the harness under.
--This might be to run a threaded Perl, for example.
--
--You can also overload this method if you've built your own strap subclass,
--such as a PHP interpreter for a PHP-based strap.
--
--=cut
--
--sub _command {
--    my $self = shift;
--
--    return $ENV{HARNESS_PERL}   if defined $ENV{HARNESS_PERL};
--    #return qq["$^X"]            if $self->{_is_win32} && ($^X =~ /[^\w\.\/\\]/);
--    return qq["$^X"]            if $^X =~ /\s/ and $^X !~ /^["']/;
--    return $^X;
--}
--
--
--=for private $strap->_switches( $file )
--
--Formats and returns the switches necessary to run the test.
--
--=cut
--
--sub _switches {
--    my($self, $file) = @_;
--
--    my @existing_switches = $self->_cleaned_switches( $Test::Harness::Switches, $ENV{HARNESS_PERL_SWITCHES} );
--    my @derived_switches;
--
--    local *TEST;
--    open(TEST, $file) or print "can't open $file. $!\n";
--    my $shebang = <TEST>;
--    close(TEST) or print "can't close $file. $!\n";
--
--    my $taint = ( $shebang =~ /^#!.*\bperl.*\s-\w*([Tt]+)/ );
--    push( @derived_switches, "-$1" ) if $taint;
--
--    # When taint mode is on, PERL5LIB is ignored.  So we need to put
--    # all that on the command line as -Is.
--    # MacPerl's putenv is broken, so it will not see PERL5LIB, tainted or not.
--    if ( $taint || $self->{_is_macos} ) {
--	my @inc = $self->_filtered_INC;
--	push @derived_switches, map { "-I$_" } @inc;
--    }
--
--    # Quote the argument if there's any whitespace in it, or if
--    # we're VMS, since VMS requires all parms quoted.  Also, don't quote
--    # it if it's already quoted.
--    for ( @derived_switches ) {
--	$_ = qq["$_"] if ((/\s/ || $self->{_is_vms}) && !/^".*"$/ );
--    }
--    return join( " ", @existing_switches, @derived_switches );
--}
--
--=for private $strap->_cleaned_switches( @switches_from_user )
--
--Returns only defined, non-blank, trimmed switches from the parms passed.
--
--=cut
--
--sub _cleaned_switches {
--    my $self = shift;
--
--    local $_;
--
--    my @switches;
--    for ( @_ ) {
--	my $switch = $_;
--	next unless defined $switch;
--	$switch =~ s/^\s+//;
--	$switch =~ s/\s+$//;
--	push( @switches, $switch ) if $switch ne "";
--    }
--
--    return @switches;
--}
--
--=for private $strap->_INC2PERL5LIB
--
--  local $ENV{PERL5LIB} = $self->_INC2PERL5LIB;
--
--Takes the current value of C<@INC> and turns it into something suitable
--for putting onto C<PERL5LIB>.
--
--=cut
--
--sub _INC2PERL5LIB {
--    my($self) = shift;
--
--    $self->{_old5lib} = $ENV{PERL5LIB};
--
--    return join $Config{path_sep}, $self->_filtered_INC;
--}
--
--=for private $strap->_filtered_INC()
--
--  my @filtered_inc = $self->_filtered_INC;
--
--Shortens C<@INC> by removing redundant and unnecessary entries.
--Necessary for OSes with limited command line lengths, like VMS.
--
--=cut
--
--sub _filtered_INC {
--    my($self, @inc) = @_;
--    @inc = @INC unless @inc;
--
--    if( $self->{_is_vms} ) {
--	# VMS has a 255-byte limit on the length of %ENV entries, so
--	# toss the ones that involve perl_root, the install location
--        @inc = grep !/perl_root/i, @inc;
--
--    }
--    elsif ( $self->{_is_win32} ) {
--	# Lose any trailing backslashes in the Win32 paths
--	s/[\\\/+]$// foreach @inc;
--    }
--
--    my %seen;
--    $seen{$_}++ foreach $self->_default_inc();
--    @inc = grep !$seen{$_}++, @inc;
--
--    return @inc;
--}
--
--
--{ # Without caching, _default_inc() takes a huge amount of time
--    my %cache;
--    sub _default_inc {
--        my $self = shift;
--        my $perl = $self->_command;
--        $cache{$perl} ||= [do {
--            local $ENV{PERL5LIB};
--            my @inc =`$perl -le "print join qq[\\n], \@INC"`;
--            chomp @inc;
--        }];
--        return @{$cache{$perl}};
--    }
--}
--
--
--=for private $strap->_restore_PERL5LIB()
--
--  $self->_restore_PERL5LIB;
--
--This restores the original value of the C<PERL5LIB> environment variable.
--Necessary on VMS, otherwise a no-op.
--
--=cut
--
--sub _restore_PERL5LIB {
--    my($self) = shift;
--
--    return unless $self->{_is_vms};
--
--    if (defined $self->{_old5lib}) {
--        $ENV{PERL5LIB} = $self->{_old5lib};
--    }
--}
--
--=head1 Parsing
--
--Methods for identifying what sort of line you're looking at.
--
--=for private _is_diagnostic
--
--    my $is_diagnostic = $strap->_is_diagnostic($line, \$comment);
--
--Checks if the given line is a comment.  If so, it will place it into
--C<$comment> (sans #).
--
--=cut
--
--sub _is_diagnostic {
--    my($self, $line, $comment) = @_;
--
--    if( $line =~ /^\s*\#(.*)/ ) {
--        $$comment = $1;
--        return $YES;
--    }
--    else {
--        return $NO;
--    }
--}
--
--=for private _is_header
--
--  my $is_header = $strap->_is_header($line);
--
--Checks if the given line is a header (1..M) line.  If so, it places how
--many tests there will be in C<< $strap->{max} >>, a list of which tests
--are todo in C<< $strap->{todo} >> and if the whole test was skipped
--C<< $strap->{skip_all} >> contains the reason.
--
--=cut
--
--# Regex for parsing a header.  Will be run with /x
--my $Extra_Header_Re = <<'REGEX';
--                       ^
--                        (?: \s+ todo \s+ ([\d \t]+) )?      # optional todo set
--                        (?: \s* \# \s* ([\w:]+\s?) (.*) )?     # optional skip with optional reason
--REGEX
--
--sub _is_header {
--    my($self, $line) = @_;
--
--    if( my($max, $extra) = $line =~ /^1\.\.(\d+)(.*)/ ) {
--        $self->{max}  = $max;
--        assert( $self->{max} >= 0,  'Max # of tests looks right' );
--
--        if( defined $extra ) {
--            my($todo, $skip, $reason) = $extra =~ /$Extra_Header_Re/xo;
--
--            $self->{todo} = { map { $_ => 1 } split /\s+/, $todo } if $todo;
--
--            if( $self->{max} == 0 ) {
--                $reason = '' unless defined $skip and $skip =~ /^Skip/i;
--            }
--
--            $self->{skip_all} = $reason;
--        }
--
--        return $YES;
--    }
--    else {
--        return $NO;
--    }
--}
--
--=for private _is_bail_out
--
--  my $is_bail_out = $strap->_is_bail_out($line, \$reason);
--
--Checks if the line is a "Bail out!".  Places the reason for bailing
--(if any) in $reason.
--
--=cut
--
--sub _is_bail_out {
--    my($self, $line, $reason) = @_;
--
--    if( $line =~ /^Bail out!\s*(.*)/i ) {
--        $$reason = $1 if $1;
--        return $YES;
--    }
--    else {
--        return $NO;
--    }
--}
--
--=for private _reset_file_state
--
--  $strap->_reset_file_state;
--
--Resets things like C<< $strap->{max} >> , C<< $strap->{skip_all} >>,
--etc. so it's ready to parse the next file.
--
--=cut
--
--sub _reset_file_state {
--    my($self) = shift;
--
--    delete @{$self}{qw(max skip_all todo too_many_tests)};
--    $self->{line}       = 0;
--    $self->{saw_header} = 0;
--    $self->{saw_bailout}= 0;
--    $self->{lone_not_line} = 0;
--    $self->{bailout_reason} = '';
--    $self->{'next'}       = 1;
--}
--
--=head1 EXAMPLES
--
--See F<examples/mini_harness.plx> for an example of use.
--
--=head1 AUTHOR
--
--Michael G Schwern C<< <schwern at pobox.com> >>, currently maintained by
--Andy Lester C<< <andy at petdance.com> >>.
--
--=head1 SEE ALSO
--
--L<Test::Harness>
--
--=cut
--
--sub _def_or_blank {
--    return $_[0] if defined $_[0];
--    return "";
--}
--
--sub set_callback {
--    my $self = shift;
--    $self->{callback} = shift;
--}
--
--sub callback {
--    my $self = shift;
--    return $self->{callback};
--}
--
--1;
-diff -urN perl-5.10.0.orig/lib/Test/Harness/TAP.pod perl-5.10.0/lib/Test/Harness/TAP.pod
---- perl-5.10.0.orig/lib/Test/Harness/TAP.pod	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/TAP.pod	1970-01-01 01:00:00.000000000 +0100
-@@ -1,492 +0,0 @@
--=head1 NAME
--
--Test::Harness::TAP - Documentation for the TAP format
--
--=head1 SYNOPSIS
--
--TAP, the Test Anything Protocol, is Perl's simple text-based interface
--between testing modules such as Test::More and the test harness
--Test::Harness.
--
--=head1 TODO
--
--Exit code of the process.
--
--=head1 THE TAP FORMAT
--
--TAP's general format is:
--
--    1..N
--    ok 1 Description # Directive
--    # Diagnostic
--    ....
--    ok 47 Description
--    ok 48 Description
--    more tests....
--
--For example, a test file's output might look like:
--
--    1..4
--    ok 1 - Input file opened
--    not ok 2 - First line of the input valid
--    ok 3 - Read the rest of the file
--    not ok 4 - Summarized correctly # TODO Not written yet
--
--=head1 HARNESS BEHAVIOR
--
--In this document, the "harness" is any program analyzing TAP output.
--Typically this will be Perl's I<prove> program, or the underlying
--C<Test::Harness::runtests> subroutine.
--
--A harness must only read TAP output from standard output and not
--from standard error.  Lines written to standard output matching
--C</^(not )?ok\b/> must be interpreted as test lines.  All other
--lines must not be considered test output.
--
--=head1 TESTS LINES AND THE PLAN
--
--=head2 The plan
--
--The plan tells how many tests will be run, or how many tests have
--run.  It's a check that the test file hasn't stopped prematurely.
--It must appear once, whether at the beginning or end of the output.
--
--The plan is usually the first line of TAP output and it specifies how
--many test points are to follow. For example,
--
--    1..10
--
--means you plan on running 10 tests. This is a safeguard in case your test
--file dies silently in the middle of its run.  The plan is optional but if
--there is a plan before the test points it must be the first non-diagnostic
--line output by the test file.
--
--In certain instances a test file may not know how many test points
--it will ultimately be running. In this case the plan can be the last
--non-diagnostic line in the output.
--
--The plan cannot appear in the middle of the output, nor can it appear more
--than once.
--
--=head2 The test line
--
--The core of TAP is the test line.  A test file prints one test line test
--point executed. There must be at least one test line in TAP output. Each
--test line comprises the following elements:
--
--=over 4
--
--=item * C<ok> or C<not ok>
--
--This tells whether the test point passed or failed. It must be
--at the beginning of the line. C</^not ok/> indicates a failed test
--point. C</^ok/> is a successful test point. This is the only mandatory
--part of the line.
--
--Note that unlike the Directives below, C<ok> and C<not ok> are
--case-sensitive.
--
--=item * Test number
--
--TAP expects the C<ok> or C<not ok> to be followed by a test point
--number. If there is no number the harness must maintain
--its own counter until the script supplies test numbers again. So
--the following test output
--
--    1..6
--    not ok
--    ok
--    not ok
--    ok
--    ok
--
--has five tests.  The sixth is missing.  Test::Harness will generate
--
--    FAILED tests 1, 3, 6
--    Failed 3/6 tests, 50.00% okay
--
--=item * Description
--
--Any text after the test number but before a C<#> is the description of
--the test point.
--
--    ok 42 this is the description of the test
--
--Descriptions should not begin with a digit so that they are not confused
--with the test point number.
--
--The harness may do whatever it wants with the description.
--
--=item * Directive
--
--The test point may include a directive, following a hash on the
--test line.  There are currently two directives allowed: C<TODO> and
--C<SKIP>.  These are discussed below.
--
--=back
--
--To summarize:
--
--=over 4
--
--=item * ok/not ok (required)
--
--=item * Test number (recommended)
--
--=item * Description (recommended)
--
--=item * Directive (only when necessary)
--
--=back
--
--=head1 DIRECTIVES
--
--Directives are special notes that follow a C<#> on the test line.
--Only two are currently defined: C<TODO> and C<SKIP>.  Note that
--these two keywords are not case-sensitive.
--
--=head2 TODO tests
--
--If the directive starts with C<# TODO>, the test is counted as a
--todo test, and the text after C<TODO> is the explanation.
--
--    not ok 13 # TODO bend space and time
--
--Note that if the TODO has an explanation it must be separated from
--C<TODO> by a space.
--
--These tests represent a feature to be implemented or a bug to be fixed
--and act as something of an executable "things to do" list.  They are
--B<not> expected to succeed.  Should a todo test point begin succeeding,
--the harness should report it as a bonus.  This indicates that whatever
--you were supposed to do has been done and you should promote this to a
--normal test point.
--
--=head2 Skipping tests
--
--If the directive starts with C<# SKIP>, the test is counted as having
--been skipped.  If the whole test file succeeds, the count of skipped
--tests is included in the generated output.  The harness should report
--the text after C< # SKIP\S*\s+> as a reason for skipping.
--
--    ok 23 # skip Insufficient flogiston pressure.
--
--Similarly, one can include an explanation in a plan line,
--emitted if the test file is skipped completely:
--
--    1..0 # Skipped: WWW::Mechanize not installed
--
--=head1 OTHER LINES
--
--=head2 Bail out!
--
--As an emergency measure a test script can decide that further tests
--are useless (e.g. missing dependencies) and testing should stop
--immediately. In that case the test script prints the magic words
--
--    Bail out!
--
--to standard output. Any message after these words must be displayed
--by the interpreter as the reason why testing must be stopped, as
--in
--
--    Bail out! MySQL is not running.
--
--=head2 Diagnostics
--
--Additional information may be put into the testing output on separate
--lines.  Diagnostic lines should begin with a C<#>, which the harness must
--ignore, at least as far as analyzing the test results.  The harness is
--free, however, to display the diagnostics.  Typically diagnostics are
--used to provide information about the environment in which test file is
--running, or to delineate a group of tests.
--
--    ...
--    ok 18 - Closed database connection
--    # End of database section.
--    # This starts the network part of the test.
--    # Daemon started on port 2112
--    ok 19 - Opened socket
--    ...
--    ok 47 - Closed socket
--    # End of network tests
--
--=head2 Anything else
--
--Any output line that is not a plan, a test line or a diagnostic is
--incorrect.  How a harness handles the incorrect line is undefined.
--Test::Harness silently ignores incorrect lines, but will become more
--stringent in the future.
--
--=head1 EXAMPLES
--
--All names, places, and events depicted in any example are wholly
--fictitious and bear no resemblance to, connection with, or relation to any
--real entity. Any such similarity is purely coincidental, unintentional,
--and unintended.
--
--=head2 Common with explanation
--
--The following TAP listing declares that six tests follow as well as
--provides handy feedback as to what the test is about to do. All six
--tests pass.
--
--    1..6
--    #
--    # Create a new Board and Tile, then place
--    # the Tile onto the board.
--    #
--    ok 1 - The object isa Board
--    ok 2 - Board size is zero
--    ok 3 - The object isa Tile
--    ok 4 - Get possible places to put the Tile
--    ok 5 - Placing the tile produces no error
--    ok 6 - Board size is 1
--
--=head2 Unknown amount and failures
--
--This hypothetical test program ensures that a handful of servers are
--online and network-accessible. Because it retrieves the hypothetical
--servers from a database, it doesn't know exactly how many servers it
--will need to ping. Thus, the test count is declared at the bottom after
--all the test points have run. Also, two of the tests fail.
--
--    ok 1 - retrieving servers from the database
--    # need to ping 6 servers
--    ok 2 - pinged diamond
--    ok 3 - pinged ruby
--    not ok 4 - pinged saphire
--    ok 5 - pinged onyx
--    not ok 6 - pinged quartz
--    ok 7 - pinged gold
--    1..7
--
--=head2 Giving up
--
--This listing reports that a pile of tests are going to be run. However,
--the first test fails, reportedly because a connection to the database
--could not be established. The program decided that continuing was
--pointless and exited.
--
--    1..573
--    not ok 1 - database handle
--    Bail out! Couldn't connect to database.
--
--=head2 Skipping a few
--
--The following listing plans on running 5 tests. However, our program
--decided to not run tests 2 thru 5 at all. To properly report this,
--the tests are marked as being skipped.
--
--    1..5
--    ok 1 - approved operating system
--    # $^0 is solaris
--    ok 2 - # SKIP no /sys directory
--    ok 3 - # SKIP no /sys directory
--    ok 4 - # SKIP no /sys directory
--    ok 5 - # SKIP no /sys directory
--
--=head2 Skipping everything
--
--This listing shows that the entire listing is a skip. No tests were run.
--
--    1..0 # skip because English-to-French translator isn't installed
--
--=head2 Got spare tuits?
--
--The following example reports that four tests are run and the last two
--tests failed. However, because the failing tests are marked as things
--to do later, they are considered successes. Thus, a harness should report
--this entire listing as a success.
--
--    1..4
--    ok 1 - Creating test program
--    ok 2 - Test program runs, no error
--    not ok 3 - infinite loop # TODO halting problem unsolved
--    not ok 4 - infinite loop 2 # TODO halting problem unsolved
--
--=head2 Creative liberties
--
--This listing shows an alternate output where the test numbers aren't
--provided. The test also reports the state of a ficticious board game in
--diagnostic form. Finally, the test count is reported at the end.
--
--    ok - created Board
--    ok
--    ok
--    ok
--    ok
--    ok
--    ok
--    ok
--    # +------+------+------+------+
--    # |      |16G   |      |05C   |
--    # |      |G N C |      |C C G |
--    # |      |  G   |      |  C  +|
--    # +------+------+------+------+
--    # |10C   |01G   |      |03C   |
--    # |R N G |G A G |      |C C C |
--    # |  R   |  G   |      |  C  +|
--    # +------+------+------+------+
--    # |      |01G   |17C   |00C   |
--    # |      |G A G |G N R |R N R |
--    # |      |  G   |  R   |  G   |
--    # +------+------+------+------+
--    ok - board has 7 tiles + starter tile
--    1..9
--
--=head1 Non-Perl TAP
--
--In Perl, we use Test::Simple and Test::More to generate TAP output.
--Other languages have solutions that generate TAP, so that they can take
--advantage of Test::Harness.
--
--The following sections are provided by their maintainers, and may not
--be up-to-date.
--
--=head2 C/C++
--
--libtap makes it easy to write test programs in C that produce
--TAP-compatible output.  Modeled on the Test::More API, libtap contains
--all the functions you need to:
--
--=over 4
--
--=item * Specify a test plan
--
--=item * Run tests
--
--=item * Skip tests in certain situations
--
--=item * Have TODO tests
--
--=item * Produce TAP compatible diagnostics
--
--=back
--
--More information about libtap, including download links, checksums,
--anonymous access to the Subersion repository, and a bug tracking
--system, can be found at:
--
--    http://jc.ngo.org.uk/trac-bin/trac.cgi/wiki/LibTap
--
--(Nik Clayton, April 17, 2006)
--
--=head2 Python
--
--PyTap will, when it's done, provide a simple, assertive (Test::More-like)
--interface for writing tests in Python.  It will output TAP and will
--include the functionality found in Test::Builder and Test::More.  It will
--try to make it easy to add more test code (so you can write your own
--C<TAP.StringDiff>, for example.
--
--Right now, it's got a fair bit of the basics needed to emulate Test::More,
--and I think it's easy to add more stuff -- just like Test::Builder,
--there's a singleton that you can get at easily.
--
--I need to better identify and finish implementing the most basic tests.
--I am not a Python guru, I just use it from time to time, so my aim may
--not be true.  I need to write tests for it, which means either relying
--on Perl for the tester tester, or writing one in Python.
--
--Here's a sample test, as found in my Subversion:
--
--    from TAP.Simple import *
--
--    plan(15)
--
--    ok(1)
--    ok(1, "everything is OK!")
--    ok(0, "always fails")
--
--    is_ok(10, 10, "is ten ten?")
--    is_ok(ok, ok, "even ok is ok!")
--    ok(id(ok),    "ok is not the null pointer")
--    ok(True,      "the Truth will set you ok")
--    ok(not False, "and nothing but the truth")
--    ok(False,     "and we'll know if you lie to us")
--
--    isa_ok(10, int, "10")
--    isa_ok('ok', str, "some string")
--
--    ok(0,    "zero is true", todo="be more like Ruby!")
--    ok(None, "none is true", skip="not possible in this universe")
--
--    eq_ok("not", "equal", "two strings are not equal");
--
--(Ricardo Signes, April 17, 2006)
--
--=head2 JavaScript
--
--Test.Simple looks and acts just like TAP, although in reality it's
--tracking test results in an object rather than scraping them from a
--print buffer.
--
--    http://openjsan.org/doc/t/th/theory/Test/Simple/
--
--(David Wheeler, April 17, 2006)
--
--=head2 PHP
--
--All the big PHP players now produce TAP
--
--=over
--
--=item * phpt
--
--Outputs TAP by default as of the yet-to-be-released PEAR 1.5.0
--
--    http://pear.php.net/PEAR
--
--=item * PHPUnit
--
--Has a TAP logger (since 2.3.4)
--
--    http://www.phpunit.de/wiki/Main_Page
--
--=item * SimpleTest
--
--There's a third-party TAP reporting extension for SimpleTest
--
--    http://www.digitalsandwich.com/archives/51-Updated-Simpletest+Apache-Test.html
--
--=item * Apache-Test
--
--Apache-Test's PHP writes TAP by default and includes the standalone
--test-more.php
--
--    http://search.cpan.org/dist/Apache-Test/
--
--=back
--
--(Geoffrey Young, April 17, 2006)
--
--=head1 AUTHORS
--
--Andy Lester, based on the original Test::Harness documentation by Michael Schwern.
--
--=head1 ACKNOWLEDGEMENTS
--
--Thanks to
--Pete Krawczyk,
--Paul Johnson,
--Ian Langworth
--and Nik Clayton
--for help and contributions on this document.
--
--The basis for the TAP format was created by Larry Wall in the
--original test script for Perl 1.  Tim Bunce and Andreas Koenig
--developed it further with their modifications to Test::Harness.
--
--=head1 COPYRIGHT
--
--Copyright 2003-2005 by
--Michael G Schwern C<< <schwern@pobox.com> >>,
--Andy Lester C<< <andy@petdance.com> >>.
--
--This program is free software; you can redistribute it and/or
--modify it under the same terms as Perl itself.
--
--See L<http://www.perl.com/perl/misc/Artistic.html>.
--
--=cut
-diff -urN perl-5.10.0.orig/lib/Test/Harness/Util.pm perl-5.10.0/lib/Test/Harness/Util.pm
---- perl-5.10.0.orig/lib/Test/Harness/Util.pm	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/Util.pm	1970-01-01 01:00:00.000000000 +0100
-@@ -1,133 +0,0 @@
--package Test::Harness::Util;
--
--use strict;
--use vars qw($VERSION);
--$VERSION = '0.01';
--
--use File::Spec;
--use Exporter;
--use vars qw( @ISA @EXPORT @EXPORT_OK );
--
--@ISA = qw( Exporter );
--@EXPORT = ();
--@EXPORT_OK = qw( all_in shuffle blibdirs );
--
--=head1 NAME
--
--Test::Harness::Util - Utility functions for Test::Harness::*
--
--=head1 SYNOPSIS
--
--Utility functions for Test::Harness::*
--
--=head1 PUBLIC FUNCTIONS
--
--The following are all available to be imported to your module.  No symbols
--are exported by default.
--
--=head2 all_in( {parm => value, parm => value} )
--
--Finds all the F<*.t> in a directory.  Knows to skip F<.svn> and F<CVS>
--directories.
--
--Valid parms are:
--
--=over
--
--=item start
--
--Starting point for the search.  Defaults to ".".
--
--=item recurse
--
--Flag to say whether it should recurse.  Default to true.
--
--=back
--
--=cut
--
--sub all_in {
--    my $parms = shift;
--    my %parms = (
--        start => ".",
--        recurse => 1,
--        %$parms,
--    );
--
--    my @hits = ();
--    my $start = $parms{start};
--
--    local *DH;
--    if ( opendir( DH, $start ) ) {
--        my @files = sort readdir DH;
--        closedir DH;
--        for my $file ( @files ) {
--            next if $file eq File::Spec->updir || $file eq File::Spec->curdir;
--            next if $file eq ".svn";
--            next if $file eq "CVS";
--
--            my $currfile = File::Spec->catfile( $start, $file );
--            if ( -d $currfile ) {
--                push( @hits, all_in( { %parms, start => $currfile } ) ) if $parms{recurse};
--            }
--            else {
--                push( @hits, $currfile ) if $currfile =~ /\.t$/;
--            }
--        }
--    }
--    else {
--        warn "$start: $!\n";
--    }
--
--    return @hits;
--}
--
--=head1 shuffle( @list )
--
--Returns a shuffled copy of I<@list>.
--
--=cut
--
--sub shuffle {
--    # Fisher-Yates shuffle
--    my $i = @_;
--    while ($i) {
--        my $j = rand $i--;
--        @_[$i, $j] = @_[$j, $i];
--    }
--}
--
--
--=head2 blibdir()
--
--Finds all the blib directories.  Stolen directly from blib.pm
--
--=cut
--
--sub blibdirs {
--    my $dir = File::Spec->curdir;
--    if ($^O eq 'VMS') {
--        ($dir = VMS::Filespec::unixify($dir)) =~ s-/\z--;
--    }
--    my $archdir = "arch";
--    if ( $^O eq "MacOS" ) {
--        # Double up the MP::A so that it's not used only once.
--        $archdir = $MacPerl::Architecture = $MacPerl::Architecture;
--    }
--
--    my $i = 5;
--    while ($i--) {
--        my $blib      = File::Spec->catdir( $dir, "blib" );
--        my $blib_lib  = File::Spec->catdir( $blib, "lib" );
--        my $blib_arch = File::Spec->catdir( $blib, $archdir );
--
--        if ( -d $blib && -d $blib_arch && -d $blib_lib ) {
--            return ($blib_arch,$blib_lib);
--        }
--        $dir = File::Spec->catdir($dir, File::Spec->updir);
--    }
--    warn "$0: Cannot find blib\n";
--    return;
--}
--
--1;
-diff -urN perl-5.10.0.orig/lib/Test/Harness/bin/prove perl-5.10.0/lib/Test/Harness/bin/prove
---- perl-5.10.0.orig/lib/Test/Harness/bin/prove	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/bin/prove	2009-03-10 17:20:32.000000000 +0100
-@@ -1,292 +1,290 @@
- #!/usr/bin/perl -w
- 
- use strict;
-+use App::Prove;
- 
--use Test::Harness;
--use Test::Harness::Util qw( all_in blibdirs shuffle );
--
--use Getopt::Long;
--use Pod::Usage 1.12;
--use File::Spec;
--
--use vars qw( $VERSION );
--$VERSION = '2.64';
--
--my $shuffle = 0;
--my $dry = 0;
--my $blib = 0;
--my $lib = 0;
--my $recurse = 0;
--my @includes = ();
--my @switches = ();
--
--# Allow cuddling the paths with the -I
--@ARGV = map { /^(-I)(.+)/ ? ($1,$2) : $_ } @ARGV;
--
--# Stick any default switches at the beginning, so they can be overridden
--# by the command line switches.
--unshift @ARGV, split( ' ', $ENV{PROVE_SWITCHES} ) if defined $ENV{PROVE_SWITCHES};
--
--Getopt::Long::Configure( 'no_ignore_case' );
--Getopt::Long::Configure( 'bundling' );
--GetOptions(
--    'b|blib'        => \$blib,
--    'd|debug'       => \$Test::Harness::debug,
--    'D|dry'         => \$dry,
--    'h|help|?'      => sub {pod2usage({-verbose => 1}); exit},
--    'H|man'         => sub {pod2usage({-verbose => 2}); exit},
--    'I=s@'          => \@includes,
--    'l|lib'         => \$lib,
--    'perl=s'        => \$ENV{HARNESS_PERL},
--    'r|recurse'     => \$recurse,
--    's|shuffle'     => \$shuffle,
--    't'             => sub { unshift @switches, '-t' }, # Always want -t up front
--    'T'             => sub { unshift @switches, '-T' }, # Always want -T up front
--    'w'             => sub { push @switches, '-w' },
--    'W'             => sub { push @switches, '-W' },
--    'strap=s'       => \$ENV{HARNESS_STRAP_CLASS},
--    'timer'         => \$Test::Harness::Timer,
--    'v|verbose'     => \$Test::Harness::verbose,
--    'V|version'     => sub { print_version(); exit; },
--) or exit 1;
--
--$ENV{TEST_VERBOSE} = 1 if $Test::Harness::verbose;
--
--# Handle blib includes
--if ( $blib ) {
--    my @blibdirs = blibdirs();
--    if ( @blibdirs ) {
--        unshift @includes, @blibdirs;
--    }
--    else {
--        warn "No blib directories found.\n";
--    }
--}
--
--# Handle lib includes
--if ( $lib ) {
--    unshift @includes, 'lib';
--}
--
--# Build up TH switches
--push( @switches, map { /\s/ && !/^".*"$/ ? qq["-I$_"] : "-I$_" } @includes );
--$Test::Harness::Switches = join( ' ', @switches );
--print "# \$Test::Harness::Switches: $Test::Harness::Switches\n" if $Test::Harness::debug;
--
--@ARGV = File::Spec->curdir unless @ARGV;
--my @argv_globbed;
--my @tests;
--if ( $] >= 5.006001 ) {
--    require File::Glob;
--    @argv_globbed = map { File::Glob::bsd_glob($_) } @ARGV;
--}
--else {
--    @argv_globbed = map { glob } @ARGV;
--}
--
--for ( @argv_globbed ) {
--    push( @tests, -d $_ ? all_in( { recurse => $recurse, start => $_ } ) : $_ )
--}
--
--if ( @tests ) {
--    shuffle(@tests) if $shuffle;
--    if ( $dry ) {
--        print join( "\n", @tests, '' );
--    }
--    else {
--        print "# ", scalar @tests, " tests to run\n" if $Test::Harness::debug;
--        runtests(@tests);
--    }
--}
--
--sub print_version {
--    printf( "prove v%s, using Test::Harness v%s and Perl v%vd\n",
--        $VERSION, $Test::Harness::VERSION, $^V );
--}
-+my $app = App::Prove->new;
-+$app->process_args(@ARGV);
-+exit( $app->run ? 0 : 1 );
- 
- __END__
- 
- =head1 NAME
- 
--prove -- A command-line tool for running tests against Test::Harness
-+prove - Run tests through a TAP harness.
- 
--=head1 SYNOPSIS
-+=head1 USAGE
- 
--prove [options] [files/directories]
-+ prove [options] [files or directories]
- 
- =head1 OPTIONS
- 
--    -b, --blib      Adds blib/lib to the path for your tests, a la "use blib"
--    -d, --debug     Includes extra debugging information
--    -D, --dry       Dry run: Show the tests to run, but don't run them
--    -h, --help      Display this help
--    -H, --man       Longer manpage for prove
--    -I              Add libraries to @INC, as Perl's -I
--    -l, --lib       Add lib to the path for your tests
--        --perl      Sets the name of the Perl executable to use
--    -r, --recurse   Recursively descend into directories
--    -s, --shuffle   Run the tests in a random order
--        --strap     Define strap class to use
--    -T              Enable tainting checks
--    -t              Enable tainting warnings
--        --timer     Print elapsed time after each test file
--    -v, --verbose   Display standard output of test scripts while running them
--    -V, --version   Display version info
-+Boolean options:
- 
--Single-character options may be stacked.  Default options may be set by
--specifying the PROVE_SWITCHES environment variable.
-+ -v,  --verbose     Print all test lines.
-+ -l,  --lib         Add 'lib' to the path for your tests (-Ilib).
-+ -b,  --blib        Add 'blib/lib' and 'blib/arch' to the path for your tests
-+ -s,  --shuffle     Run the tests in random order.
-+ -c,  --color       Colored test output (default).
-+      --nocolor     Do not color test output.
-+      --count       Show the X/Y test count when not verbose (default)
-+      --nocount     Disable the X/Y test count.
-+ -D   --dry         Dry run. Show test that would have run.
-+      --ext         Set the extension for tests (default '.t')
-+ -f,  --failures    Only show failed tests.
-+      --fork        Fork to run harness in multiple processes.
-+      --ignore-exit Ignore exit status from test scripts.
-+ -m,  --merge       Merge test scripts' STDERR with their STDOUT.
-+ -r,  --recurse     Recursively descend into directories.
-+      --reverse     Run the tests in reverse order.
-+ -q,  --quiet       Suppress some test output while running tests.
-+ -Q,  --QUIET       Only print summary results.
-+ -p,  --parse       Show full list of TAP parse errors, if any.
-+      --directives  Only show results with TODO or SKIP directives.
-+      --timer       Print elapsed time after each test.
-+ -T                 Enable tainting checks.
-+ -t                 Enable tainting warnings.
-+ -W                 Enable fatal warnings.
-+ -w                 Enable warnings.
-+ -h,  --help        Display this help
-+ -?,                Display this help
-+ -H,  --man         Longer manpage for prove
-+      --norc        Don't process default .proverc
- 
--=head1 OVERVIEW
-+Options that take arguments:
- 
--F<prove> is a command-line interface to the test-running functionality
--of C<Test::Harness>.  With no arguments, it will run all tests in the
--current directory.
-+ -I                 Library paths to include.
-+ -P                 Load plugin (searches App::Prove::Plugin::*.)
-+ -M                 Load a module.
-+ -e,  --exec        Interpreter to run the tests ('' for compiled tests.)
-+      --harness     Define test harness to use.  See TAP::Harness.
-+      --formatter   Result formatter to use. See TAP::Harness.
-+ -a,  --archive     Store the resulting TAP in an archive file.
-+ -j,  --jobs N      Run N test jobs in parallel (try 9.)
-+      --state=opts  Control prove's persistent state.
-+      --rc=rcfile   Process options from rcfile
- 
--Shell metacharacters may be used with command lines options and will be exanded 
--via C<File::Glob::bsd_glob>.
-+=head1 NOTES
- 
--=head1 PROVE VS. "MAKE TEST"
-+=head2 .proverc
- 
--F<prove> has a number of advantages over C<make test> when doing development.
-+If F<~/.proverc> or F<./.proverc> exist they will be read and any
-+options they contain processed before the command line options. Options
-+in F<.proverc> are specified in the same way as command line options:
- 
--=over 4
-+    # .proverc
-+    --state=hot,fast,save
-+    -j9 --fork
- 
--=item * F<prove> is designed as a development tool
-+Additional option files may be specified with the C<--rc> option.
-+Default option file processing is disabled by the C<--norc> option.
- 
--Perl users typically run the test harness through a makefile via
--C<make test>.  That's fine for module distributions, but it's
--suboptimal for a test/code/debug development cycle.
-+Under Windows and VMS the option file is named F<_proverc> rather than
-+F<.proverc> and is sought only in the current directory.
- 
--=item * F<prove> is granular 
-+=head2 Reading from C<STDIN>
- 
--F<prove> lets your run against only the files you want to check.
--Running C<prove t/live/ t/master.t> checks every F<*.t> in F<t/live>,
--plus F<t/master.t>.
-+If you have a list of tests (or URLs, or anything else you want to test) in a
-+file, you can add them to your tests by using a '-':
- 
--=item * F<prove> has an easy verbose mode
-+ prove - < my_list_of_things_to_test.txt
- 
--F<prove> has a C<-v> option to see the raw output from the tests.
--To do this with C<make test>, you must set C<HARNESS_VERBOSE=1> in
--the environment.
-+See the C<README> in the C<examples> directory of this distribution.
- 
--=item * F<prove> can run under taint mode
-+=head2 Default Test Directory
- 
--F<prove>'s C<-T> runs your tests under C<perl -T>, and C<-t> runs them
--under C<perl -t>.
-+If no files or directories are supplied, C<prove> looks for all files
-+matching the pattern C<t/*.t>.
- 
--=item * F<prove> can shuffle tests
-+=head2 Colored Test Output
- 
--You can use F<prove>'s C<--shuffle> option to try to excite problems
--that don't show up when tests are run in the same order every time.
-+Colored test output is the default, but if output is not to a
-+terminal, color is disabled. You can override this by adding the 
-+C<--color> switch.
- 
--=item * F<prove> doesn't rely on a make tool
-+Color support requires L<Term::ANSIColor> on Unix-like platforms and
-+L<Win32::Console> windows. If the necessary module is not installed
-+colored output will not be available.
- 
--Not everyone wants to write a makefile, or use L<ExtUtils::MakeMaker>
--to do so.  F<prove> has no external dependencies.
-+=head2 Arguments to Tests
- 
--=item * Not everything is a module
-+It is possible to supply arguments to tests. To do so separate them from
-+prove's own arguments with the arisdottle, '::'. For example
- 
--More and more users are using Perl's testing tools outside the
--context of a module distribution, and may not even use a makefile
--at all.
-+ prove -v t/mytest.t :: --url http://example.com
-+ 
-+would run F<t/mytest.t> with the options '--url http://example.com'.
-+When running multiple tests they will each receive the same arguments.
- 
--=back
-+=head2 C<--exec>
-+
-+Normally you can just pass a list of Perl tests and the harness will know how
-+to execute them.  However, if your tests are not written in Perl or if you
-+want all tests invoked exactly the same way, use the C<-e>, or C<--exec>
-+switch:
-+
-+ prove --exec '/usr/bin/ruby -w' t/
-+ prove --exec '/usr/bin/perl -Tw -mstrict -Ilib' t/
-+ prove --exec '/path/to/my/customer/exec'
-+
-+=head2 C<--merge>
-+
-+If you need to make sure your diagnostics are displayed in the correct
-+order relative to test results you can use the C<--merge> option to
-+merge the test scripts' STDERR into their STDOUT. 
-+
-+This guarantees that STDOUT (where the test results appear) and STDOUT
-+(where the diagnostics appear) will stay in sync. The harness will
-+display any diagnostics your tests emit on STDERR.
-+
-+Caveat: this is a bit of a kludge. In particular note that if anything
-+that appears on STDERR looks like a test result the test harness will
-+get confused. Use this option only if you understand the consequences
-+and can live with the risk.
-+
-+=head2 C<--state>
-+
-+You can ask C<prove> to remember the state of previous test runs and
-+select and/or order the tests to be run based on that saved state.
-+
-+The C<--state> switch requires an argument which must be a comma
-+separated list of one or more of the following options.
-+
-+=over
-+
-+=item C<last>
- 
--=head1 COMMAND LINE OPTIONS
-+Run the same tests as the last time the state was saved. This makes it
-+possible, for example, to recreate the ordering of a shuffled test.
- 
--=head2 -b, --blib
-+    # Run all tests in random order
-+    $ prove -b --state=save --shuffle
- 
--Adds blib/lib to the path for your tests, a la "use blib".
-+    # Run them again in the same order
-+    $ prove -b --state=last
- 
--=head2 -d, --debug
-+=item C<failed>
- 
--Include debug information about how F<prove> is being run.  This
--option doesn't show the output from the test scripts.  That's handled
--by -v,--verbose.
-+Run only the tests that failed on the last run.
- 
--=head2 -D, --dry
-+    # Run all tests
-+    $ prove -b --state=save
-+    
-+    # Run failures
-+    $ prove -b --state=failed
- 
--Dry run: Show the tests to run, but don't run them.
-+If you also specify the C<save> option newly passing tests will be
-+excluded from subsequent runs.
- 
--=head2 -I
-+    # Repeat until no more failures
-+    $ prove -b --state=failed,save
- 
--Add libraries to @INC, as Perl's -I.
-+=item C<passed>
- 
--=head2 -l, --lib
-+Run only the passed tests from last time. Useful to make sure that no
-+new problems have been introduced.
- 
--Add C<lib> to @INC.  Equivalent to C<-Ilib>.
-+=item C<all>
- 
--=head2 --perl
-+Run all tests in normal order. Multple options may be specified, so to
-+run all tests with the failures from last time first:
- 
--Sets the C<HARNESS_PERL> environment variable, which controls what
--Perl executable will run the tests.
-+    $ prove -b --state=failed,all,save
- 
--=head2 -r, --recurse
-+=item C<hot>
- 
--Descends into subdirectories of any directories specified, looking for tests.
-+Run the tests that most recently failed first. The last failure time of
-+each test is stored. The C<hot> option causes tests to be run in most-recent-
-+failure order.
- 
--=head2 -s, --shuffle
-+    $ prove -b --state=hot,save
- 
--Sometimes tests are accidentally dependent on tests that have been
--run before.  This switch will shuffle the tests to be run prior to
--running them, thus ensuring that hidden dependencies in the test
--order are likely to be revealed.  The author hopes the run the
--algorithm on the preceding sentence to see if he can produce something
--slightly less awkward.
-+Tests that have never failed will not be selected. To run all tests with
-+the most recently failed first use
- 
--=head2 --strap
-+    $ prove -b --state=hot,all,save
- 
--Sets the HARNESS_STRAP_CLASS variable to set which Test::Harness::Straps
--variable to use in running the tests.
-+This combination of options may also be specified thus
- 
--=head2 -t
-+    $ prove -b --state=adrian
- 
--Runs test programs under perl's -t taint warning mode.
-+=item C<todo>
- 
--=head2 -T
-+Run any tests with todos.
- 
--Runs test programs under perl's -T taint mode.
-+=item C<slow>
- 
--=head2 --timer
-+Run the tests in slowest to fastest order. This is useful in conjunction
-+with the C<-j> parallel testing switch to ensure that your slowest tests
-+start running first.
- 
--Print elapsed time after each test file
-+    $ prove -b --state=slow -j9 
- 
--=head2 -v, --verbose
-+=item C<fast>
- 
--Display standard output of test scripts while running them.  Also sets
--TEST_VERBOSE in case your tests rely on them.
-+Run test tests in fastest to slowest order.
- 
--=head2 -V, --version
-+=item C<new>
- 
--Display version info.
-+Run the tests in newest to oldest order based on the modification times
-+of the test scripts.
- 
--=head1 BUGS
-+=item C<old>
- 
--Please use the CPAN bug ticketing system at L<http://rt.cpan.org/>.
--You can also mail bugs, fixes and enhancements to 
--C<< <bug-test-harness@rt.cpan.org> >>.
-+Run the tests in oldest to newest order.
- 
--=head1 TODO
-+=item C<fresh>
- 
--=over 4
-+Run those test scripts that have been modified since the last test run.
- 
--=item *
-+=item C<save>
- 
--Shuffled tests must be recreatable
-+Save the state on exit. The state is stored in a file called F<.prove>
-+(F<_prove> on Windows and VMS) in the current directory.
- 
- =back
- 
--=head1 AUTHORS
-+The C<--state> switch may be used more than once.
- 
--Andy Lester C<< <andy at petdance.com> >>
-+    $ prove -b --state=hot --state=all,save
- 
--=head1 COPYRIGHT
-+=head2 Taint Mode
- 
--Copyright 2004-2006 by Andy Lester C<< <andy at petdance.com> >>.
-+Normally when a Perl program is run in taint mode the contents of the
-+C<PERL5LIB> environment variable do not appear in C<@INC>.
- 
--This program is free software; you can redistribute it and/or 
--modify it under the same terms as Perl itself.
-+Because C<PERL5LIB> is often used during testing to add build directories
-+to C<@INC> prove (actually L<TAP::Parser::Source::Perl>) passes the
-+names of any directories found in C<PERL5LIB> as -I switches. The net
-+effect of this is that C<PERL5LIB> is honoured even when prove is run in
-+taint mode.
- 
--See L<http://www.perl.com/perl/misc/Artistic.html>.
-+=head1 PLUGINS
-+
-+Plugins can be loaded using the C<< -PI<plugin> >> syntax, eg:
-+
-+  prove -PMyPlugin
-+
-+This will search for a module named C<App::Prove::Plugin::MyPlugin>, or failing
-+that, C<MyPlugin>.  If the plugin can't be found, C<prove> will complain & exit.
-+
-+You can pass arguments to your plugin by appending C<=arg1,arg2,etc> to the
-+plugin name:
-+
-+  prove -PMyPlugin=fou,du,fafa
-+
-+Please check individual plugin documentation for more details.
-+
-+=head2 Available Plugins
-+
-+For an up-to-date list of plugins available, please check CPAN:
-+
-+L<http://search.cpan.org/search?query=App%3A%3AProve+Plugin>
-+
-+=head2 Writing Plugins
-+
-+Please see L<App::Prove/PLUGINS>.
- 
- =cut
-+
-+# vim:ts=4:sw=4:et:sta
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/00compile.t perl-5.10.0/lib/Test/Harness/t/00compile.t
---- perl-5.10.0.orig/lib/Test/Harness/t/00compile.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/00compile.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,32 +0,0 @@
--#!/usr/bin/perl -w
--
--BEGIN {
--    if($ENV{PERL_CORE}) {
--        chdir 't';
--        @INC = '../lib';
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use Test::More tests => 8;
--
--BEGIN { use_ok 'Test::Harness' }
--BEGIN { diag( "Testing Test::Harness $Test::Harness::VERSION under Perl $] and Test::More $Test::More::VERSION" ) unless $ENV{PERL_CORE}}
--
--BEGIN { use_ok 'Test::Harness::Straps' }
--
--BEGIN { use_ok 'Test::Harness::Iterator' }
--
--BEGIN { use_ok 'Test::Harness::Assert' }
--
--BEGIN { use_ok 'Test::Harness::Point' }
--
--BEGIN { use_ok 'Test::Harness::Results' }
--
--BEGIN { use_ok 'Test::Harness::Util' }
--
--# If the $VERSION is set improperly, this will spew big warnings.
--BEGIN { use_ok 'Test::Harness', 1.1601 }
--
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/assert.t perl-5.10.0/lib/Test/Harness/t/assert.t
---- perl-5.10.0.orig/lib/Test/Harness/t/assert.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/assert.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,28 +0,0 @@
--#!/usr/bin/perl -w
--
--BEGIN {
--    if( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = ('../lib', 'lib');
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use strict;
--
--use Test::More tests => 7;
--
--BEGIN { use_ok( 'Test::Harness::Assert' ); }
--
--
--ok( defined &assert,                'assert() exported' );
--
--ok( !eval { assert( 0 ); 1 },       'assert( FALSE ) causes death' );
--like( $@, '/Assert failed/',        '  with the right message' );
--
--ok( eval { assert( 1 );  1 },       'assert( TRUE ) does nothing' );
--
--ok( !eval { assert( 0, 'some name' ); 1 },  'assert( FALSE, NAME )' );
--like( $@, '/some name/',                    '  has the name' );
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/base.t perl-5.10.0/lib/Test/Harness/t/base.t
---- perl-5.10.0.orig/lib/Test/Harness/t/base.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/base.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,15 +0,0 @@
--BEGIN {
--    if( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = '../lib';
--    }
--}
--
--
--print "1..1\n";
--
--unless (eval 'require Test::Harness') {
--  print "not ok 1\n";
--} else {
--  print "ok 1\n";
--}
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/callback.t perl-5.10.0/lib/Test/Harness/t/callback.t
---- perl-5.10.0.orig/lib/Test/Harness/t/callback.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/callback.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,69 +0,0 @@
--#!/usr/bin/perl -w
--
--BEGIN {
--    if( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = ('../lib', 'lib');
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use Test::More;
--use File::Spec;
--
--BEGIN {
--    use vars qw( %samples );
--    
--    %samples = (
--            bailout     => [qw( header test test test bailout )],
--            combined    => ['header', ('test') x 10],
--            descriptive => ['header', ('test') x 5 ],
--            duplicates  => ['header', ('test') x 11 ],
--            head_end    => [qw( other test test test test 
--                                other header other other )],
--            head_fail   => [qw( other test test test test
--                                other header other other )],
--            no_nums     => ['header', ('test') x 5 ],
--            out_of_order=> [('test') x 10, 'header', ('test') x 5],
--            simple      => [qw( header test test test test test )],
--            simple_fail => [qw( header test test test test test )],
--            'skip'      => [qw( header test test test test test )],
--            skipall     => [qw( header )],
--            skipall_nomsg => [qw( header )],
--            skip_nomsg  => [qw( header test )],
--            taint       => [qw( header test )],
--            'todo'      => [qw( header test test test test test )],
--            todo_inline => [qw( header test test test )],
--            vms_nit     => [qw( header other test test )],
--            with_comments => [qw( other header other test other test test
--                                  test other other test other )],
--           );
--    plan tests => 2 + scalar keys %samples;
--}
--
--BEGIN { use_ok( 'Test::Harness::Straps' ); }
--
--my $Curdir = File::Spec->curdir;
--my $SAMPLE_TESTS = $ENV{PERL_CORE}
--                    ? File::Spec->catdir($Curdir, 'lib', 'sample-tests')
--                    : File::Spec->catdir($Curdir, 't',   'sample-tests');
--
--my $strap = Test::Harness::Straps->new;
--isa_ok( $strap, 'Test::Harness::Straps' );
--$strap->set_callback(
--    sub {
--        my($self, $line, $type, $totals) = @_;
--        push @out, $type;
--    }
--);
--
--for my $test ( sort keys %samples ) {
--    my $expect = $samples{$test};
--
--    local @out = ();
--    $strap->analyze_file(File::Spec->catfile($SAMPLE_TESTS, $test));
--
--    is_deeply(\@out, $expect,   "$test callback");
--}
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/failure.t perl-5.10.0/lib/Test/Harness/t/failure.t
---- perl-5.10.0.orig/lib/Test/Harness/t/failure.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/failure.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,53 +0,0 @@
--#!/usr/bin/perl -w
--
--BEGIN {
--    if ($^O eq 'VMS') {
--        print '1..0 # Child test output confuses parent test counter';
--        exit;
--    }
--}
--
--BEGIN {
--    if ( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = ('../lib', 'lib');
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use strict;
--
--use Test::More tests => 6;
--use File::Spec;
--
--BEGIN {
--    use_ok( 'Test::Harness' );
--}
--
--my $died;
--sub prepare_for_death { $died = 0; }
--sub signal_death { $died = 1; }
--
--my $Curdir = File::Spec->curdir;
--my $SAMPLE_TESTS = $ENV{PERL_CORE}
--	? File::Spec->catdir($Curdir, 'lib', 'sample-tests')
--	: File::Spec->catdir($Curdir, 't',   'sample-tests');
--
--PASSING: {
--    local $SIG{__DIE__} = \&signal_death;
--    prepare_for_death();
--    eval { runtests( File::Spec->catfile( $SAMPLE_TESTS, "simple" ) ) };
--    ok( !$@, "simple lives" );
--    is( $died, 0, "Death never happened" );
--}
--
--FAILING: {
--    local $SIG{__DIE__} = \&signal_death;
--    prepare_for_death();
--    eval { runtests( File::Spec->catfile( $SAMPLE_TESTS, "too_many" ) ) };
--    ok( $@, "$@" );
--    ok( $@ =~ m[Failed 1/1], "too_many dies" );
--    is( $died, 1, "Death happened" );
--}
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/from_line.t perl-5.10.0/lib/Test/Harness/t/from_line.t
---- perl-5.10.0.orig/lib/Test/Harness/t/from_line.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/from_line.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,64 +0,0 @@
--#!perl -Tw
--
--BEGIN {
--    if ( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = '../lib';
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use strict;
--use Test::More tests => 23;
--
--BEGIN {
--    use_ok( 'Test::Harness::Point' );
--}
--
--BASIC_OK: {
--    my $line = "ok 14 - Blah blah";
--    my $point = Test::Harness::Point->from_test_line( $line );
--    isa_ok( $point, 'Test::Harness::Point', 'BASIC_OK' );
--    is( $point->number, 14 );
--    ok( $point->ok );
--    is( $point->description, 'Blah blah' );
--}
--
--BASIC_NOT_OK: {
--    my $line = "not ok 267   Yada";
--    my $point = Test::Harness::Point->from_test_line( $line );
--    isa_ok( $point, 'Test::Harness::Point', 'BASIC_NOT_OK' );
--    is( $point->number, 267 );
--    ok( !$point->ok );
--    is( $point->description, 'Yada' );
--}
--
--CRAP: {
--    my $point = Test::Harness::Point->from_test_line( 'ok14 - Blah' );
--    ok( !defined $point, 'CRAP 1' );
--
--    $point = Test::Harness::Point->from_test_line( 'notok 14' );
--    ok( !defined $point, 'CRAP 2' );
--}
--
--PARSE_TODO: {
--    my $point = Test::Harness::Point->from_test_line( 'not ok 14 - Calculate sqrt(-1) # TODO Still too rational' );
--    isa_ok( $point, 'Test::Harness::Point', 'PARSE_TODO' );
--    is( $point->description, 'Calculate sqrt(-1)' );
--    is( $point->directive_type, 'todo' );
--    is( $point->directive_reason, 'Still too rational' );
--    ok( !$point->is_skip );
--    ok( $point->is_todo );
--}
--
--PARSE_SKIP: {
--    my $point = Test::Harness::Point->from_test_line( 'ok 14 # skip Not on bucket #6' );
--    isa_ok( $point, 'Test::Harness::Point', 'PARSE_SKIP' );
--    is( $point->description, '' );
--    is( $point->directive_type, 'skip' );
--    is( $point->directive_reason, 'Not on bucket #6' );
--    ok( $point->is_skip );
--    ok( !$point->is_todo );
--}
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harness/t/harness.t
---- perl-5.10.0.orig/lib/Test/Harness/t/harness.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/harness.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,22 +0,0 @@
--#!/usr/bin/perl -Tw
--
--BEGIN {
--    if ( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = ('../lib', 'lib');
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use strict;
--
--use Test::More tests => 2;
--
--BEGIN {
--    use_ok( 'Test::Harness' );
--}
--
--my $strap = Test::Harness->strap;
--isa_ok( $strap, 'Test::Harness::Straps' );
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/inc_taint.t perl-5.10.0/lib/Test/Harness/t/inc_taint.t
---- perl-5.10.0.orig/lib/Test/Harness/t/inc_taint.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/inc_taint.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,26 +0,0 @@
--#!/usr/bin/perl -w
--
--BEGIN {
--    if( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = ('../lib', 'lib');
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use Test::Harness;
--use Test::More tests => 1;
--use Dev::Null;
--
--push @INC, 'we_added_this_lib';
--
--tie *NULL, 'Dev::Null' or die $!;
--select NULL;
--my($tot, $failed) = Test::Harness::execute_tests(
--    tests => [ $ENV{PERL_CORE} ? 'lib/sample-tests/inc_taint' : 't/sample-tests/inc_taint' ]
--);
--select STDOUT;
--
--ok( Test::Harness::_all_ok($tot), 'tests with taint on preserve @INC' );
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/nonumbers.t perl-5.10.0/lib/Test/Harness/t/nonumbers.t
---- perl-5.10.0.orig/lib/Test/Harness/t/nonumbers.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/nonumbers.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,14 +0,0 @@
--if( $ENV{PERL_CORE} && !$ENV{HARNESS_ACTIVE} ) {
--    print "1..0 # Skip: t/TEST needs numbers\n";
--    exit;
--}
--
--print <<END;
--1..6
--ok
--ok
--ok
--ok
--ok
--ok
--END
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/ok.t perl-5.10.0/lib/Test/Harness/t/ok.t
---- perl-5.10.0.orig/lib/Test/Harness/t/ok.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/ok.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,8 +0,0 @@
---f "core" and unlink "core";
--print <<END;
--1..4
--ok 1
--ok 2
--ok 3
--ok 4
--END
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/point-parse.t perl-5.10.0/lib/Test/Harness/t/point-parse.t
---- perl-5.10.0.orig/lib/Test/Harness/t/point-parse.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/point-parse.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,106 +0,0 @@
--#!/usr/bin/perl -w
--
--BEGIN {
--    if ( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = ('../lib', 'lib');
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use strict;
--
--use Test::More tests => 52;
--
--BEGIN {
--    use_ok( 'Test::Harness::Point' );
--    use_ok( 'Test::Harness::Straps' );
--}
--
--my $strap = Test::Harness::Straps->new;
--isa_ok( $strap, 'Test::Harness::Straps', 'new()' );
--
--
--my $testlines = {
--    'not ok' => {
--        ok => 0
--    },
--    'not ok # TODO' => {
--        ok => 0,
--        reason => '',
--        type => 'todo'
--    },
--    'not ok 1' => {
--        number => 1,
--        ok => 0
--    },
--    'not ok 11 - this is \\# all the name # skip this is not' => {
--        description => 'this is \\# all the name',
--        number => 11,
--        ok => 0,
--        reason => 'this is not',
--        type => 'skip'
--    },
--    'not ok 23 # TODO world peace' => {
--        number => 23,
--        ok => 0,
--        reason => 'world peace',
--        type => 'todo'
--    },
--    'not ok 42 - universal constant' => {
--        description => 'universal constant',
--        number => 42,
--        ok => 0
--    },
--    ok => {
--        ok => 1
--    },
--    'ok # skip' => {
--        ok => 1,
--        type => 'skip'
--    },
--    'ok 1' => {
--        number => 1,
--        ok => 1
--    },
--    'ok 1066 - and all that' => {
--        description => 'and all that',
--        number => 1066,
--        ok => 1
--    },
--    'ok 11 - have life # TODO get a life' => {
--        description => 'have life',
--        number => 11,
--        ok => 1,
--        reason => 'get a life',
--        type => 'todo'
--    },
--    'ok 2938' => {
--        number => 2938,
--        ok => 1
--    },
--    'ok 42 - _is_header() is a header \'1..192 todo 4 2 13 192 \\# Skip skip skip because' => {
--        description => '_is_header() is a header \'1..192 todo 4 2 13 192 \\# Skip skip skip because',
--        number => 42,
--        ok => 1
--    }
--};
--my @untests = (
--               ' ok',
--               'not',
--               'okay 23',
--              );
--
--for my $line ( sort keys %$testlines ) {
--    my $point = Test::Harness::Point->from_test_line( $line );
--    isa_ok( $point, 'Test::Harness::Point' );
--
--    my $fields = $testlines->{$line};
--    for my $property ( sort keys %$fields ) {
--        my $value = $fields->{$property};
--        is( eval "\$point->$property", $value, "$property on $line" );
--        # Perls pre-5.6 can't handle $point->$property, and must be eval()d
--    }
--}
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/point.t perl-5.10.0/lib/Test/Harness/t/point.t
---- perl-5.10.0.orig/lib/Test/Harness/t/point.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/point.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,58 +0,0 @@
--#!perl -Tw
--
--BEGIN {
--    if ( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = ('../lib', 'lib');
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use strict;
--use Test::More tests => 11;
--
--BEGIN {
--    use_ok( 'Test::Harness::Point' );
--}
--
--my $point = Test::Harness::Point->new;
--isa_ok( $point, 'Test::Harness::Point' );
--ok( !$point->ok, "Should start out not OK" );
--
--$point->set_ok( 1 );
--ok( $point->ok, "should have turned to true" );
--
--$point->set_ok( 0 );
--ok( !$point->ok, "should have turned false" );
--
--$point->set_number( 2112 );
--is( $point->number, 2112, "Number is set" );
--
--$point->set_description( "Blah blah" );
--is( $point->description, "Blah blah", "Description set" );
--
--$point->set_directive( "Go now" );
--is( $point->directive, "Go now", "Directive set" );
--
--$point->add_diagnostic( "# Line 1" );
--$point->add_diagnostic( "# Line two" );
--$point->add_diagnostic( "# Third line" );
--my @diags = $point->diagnostics;
--is( @diags, 3, "Three lines" );
--is_deeply(
--    \@diags,
--    [ "# Line 1", "# Line two", "# Third line" ],
--    "Diagnostics in list context"
--);
--
--my $diagstr = <<EOF;
--# Line 1
--# Line two
--# Third line
--EOF
--
--chomp $diagstr;
--my $string_diagnostics = $point->diagnostics;
--is( $string_diagnostics, $diagstr, "Diagnostics in scalar context" );
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/prove-globbing.t perl-5.10.0/lib/Test/Harness/t/prove-globbing.t
---- perl-5.10.0.orig/lib/Test/Harness/t/prove-globbing.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/prove-globbing.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,32 +0,0 @@
--BEGIN {
--    if( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = ('../lib', 'lib');
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use strict;
--use File::Spec;
--use Test::More;
--plan skip_all => "Not adapted to perl core" if $ENV{PERL_CORE};
--plan skip_all => "Not installing prove" if -e "t/SKIP-PROVE";
--
--plan tests => 1;
--
--my $tests = File::Spec->catfile( 't', 'prove*.t' );
--my $prove = File::Spec->catfile( File::Spec->curdir, "blib", "script", "prove" );
--$prove = "$^X $prove";
--
--GLOBBAGE: {
--    my @actual = sort qx/$prove --dry $tests/;
--    chomp @actual;
--
--    my @expected = (
--        File::Spec->catfile( "t", "prove-globbing.t" ),
--        File::Spec->catfile( "t", "prove-switches.t" ),
--    );
--    is_deeply( \@actual, \@expected, "Expands the wildcards" );
--}
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/prove-switches.t perl-5.10.0/lib/Test/Harness/t/prove-switches.t
---- perl-5.10.0.orig/lib/Test/Harness/t/prove-switches.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/prove-switches.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,71 +0,0 @@
--BEGIN {
--    if( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = ('../lib', 'lib');
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use strict;
--use File::Spec;
--use Test::More;
--plan skip_all => "Not adapted to perl core" if $ENV{PERL_CORE};
--plan skip_all => "Not installing prove" if -e "t/SKIP-PROVE";
--
--plan tests => 8;
--
--my $blib = File::Spec->catfile( File::Spec->curdir, "blib" );
--my $blib_lib = File::Spec->catfile( $blib, "lib" );
--my $blib_arch = File::Spec->catfile( $blib, "arch" );
--my $prove = File::Spec->catfile( $blib, "script", "prove" );
--$prove = "$^X $prove";
--
--CAPITAL_TAINT: {
--    local $ENV{PROVE_SWITCHES};
--
--    my @actual = qx/$prove -Ifirst -D -I second -Ithird -Tvdb/;
--    my @expected = ( "# \$Test::Harness::Switches: -T -I$blib_arch -I$blib_lib -Ifirst -Isecond -Ithird\n" );
--    is_deeply( \@actual, \@expected, "Capital taint flags OK" );
--}
--
--LOWERCASE_TAINT: {
--    local $ENV{PROVE_SWITCHES};
--
--    my @actual = qx/$prove -dD -Ifirst -I second -t -Ithird -vb/;
--    my @expected = ( "# \$Test::Harness::Switches: -t -I$blib_arch -I$blib_lib -Ifirst -Isecond -Ithird\n" );
--    is_deeply( \@actual, \@expected, "Lowercase taint OK" );
--}
--
--PROVE_SWITCHES: {
--    local $ENV{PROVE_SWITCHES} = "-dvb -I fark";
--
--    my @actual = qx/$prove -Ibork -Dd/;
--    my @expected = ( "# \$Test::Harness::Switches: -I$blib_arch -I$blib_lib -Ifark -Ibork\n" );
--    is_deeply( \@actual, \@expected, "PROVE_SWITCHES OK" );
--}
--
--PROVE_SWITCHES_L: {
--    my @actual = qx/$prove -l -Ibongo -Dd/;
--    my @expected = ( "# \$Test::Harness::Switches: -Ilib -Ibongo\n" );
--    is_deeply( \@actual, \@expected, "PROVE_SWITCHES OK" );
--}
--
--PROVE_SWITCHES_LB: {
--    my @actual = qx/$prove -lb -Dd/;
--    my @expected = ( "# \$Test::Harness::Switches: -Ilib -I$blib_arch -I$blib_lib\n" );
--    is_deeply( \@actual, \@expected, "PROVE_SWITCHES OK" );
--}
--
--PROVE_VERSION: {
--    # This also checks that the prove $VERSION is in sync with Test::Harness's $VERSION
--    local $/ = undef;
--
--    use_ok( 'Test::Harness' );
--
--    my $thv = $Test::Harness::VERSION;
--    my @actual = qx/$prove --version/;
--    is( scalar @actual, 1, 'Only 1 line returned' );
--    like( $actual[0], qq{/^\Qprove v$thv, using Test::Harness v$thv and Perl v5\E/} );
--}
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/strap-analyze.t perl-5.10.0/lib/Test/Harness/t/strap-analyze.t
---- perl-5.10.0.orig/lib/Test/Harness/t/strap-analyze.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/strap-analyze.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,599 +0,0 @@
--#!/usr/bin/perl -w
--
--BEGIN {
--    if( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = ('../lib', 'lib');
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use strict;
--use Test::More tests => 247;
--use File::Spec;
--
--my $Curdir = File::Spec->curdir;
--my $SAMPLE_TESTS = $ENV{PERL_CORE}
--                    ? File::Spec->catdir($Curdir, 'lib', 'sample-tests')
--                    : File::Spec->catdir($Curdir, 't',   'sample-tests');
--
--
--my $IsMacPerl = $^O eq 'MacOS';
--my $IsVMS     = $^O eq 'VMS';
--
--# VMS uses native, not POSIX, exit codes.
--my $die_exit = $IsVMS ? 44 : 1;
--
--# We can only predict that the wait status should be zero or not.
--my $wait_non_zero = 1;
--
--my %samples = (
--    bignum => {
--        bonus => 0,
--        details => [
--            {
--                actual_ok => 1,
--                ok => 1
--            },
--            {
--                actual_ok => 1,
--                ok => 1
--            }
--        ],
--        'exit' => 0,
--        max => 2,
--        ok => 4,
--        passing => 0,
--        seen => 4,
--        skip => 0,
--        todo => 0,
--        'wait' => 0
--    },
--    combined => {
--        bonus => 1,
--        details => [
--            {
--                actual_ok => 1,
--                ok => 1
--            },
--            {
--                actual_ok => 1,
--                name => "basset hounds got long ears",
--                ok => 1
--            },
--            {
--                actual_ok => 0,
--                name => "all hell broke lose",
--                ok => 0
--            },
--            {
--                actual_ok => 1,
--                ok => 1,
--                type => "todo"
--            },
--            {
--                actual_ok => 1,
--                ok => 1
--            },
--            {
--                actual_ok => 1,
--                ok => 1
--            },
--            {
--                actual_ok => 1,
--                ok => 1,
--                reason => "contract negociations",
--                type => "skip"
--            },
--            {
--                actual_ok => 1,
--                ok => 1
--            },
--            {
--                actual_ok => 0,
--                ok => 0
--            },
--            {
--                actual_ok => 0,
--                ok => 1,
--                type => "todo"
--            }
--        ],
--        'exit' => 0,
--        max => 10,
--        ok => 8,
--        passing => 0,
--        seen => 10,
--        skip => 1,
--        todo => 2,
--        'wait' => 0
--    },
--    descriptive => {
--        bonus => 0,
--        details => [
--            {
--                actual_ok => 1,
--                name => "Interlock activated",
--                ok => 1
--            },
--            {
--                actual_ok => 1,
--                name => "Megathrusters are go",
--                ok => 1
--            },
--            {
--                actual_ok => 1,
--                name => "Head formed",
--                ok => 1
--            },
--            {
--                actual_ok => 1,
--                name => "Blazing sword formed",
--                ok => 1
--            },
--            {
--                actual_ok => 1,
--                name => "Robeast destroyed",
--                ok => 1
--            }
--        ],
--        'exit' => 0,
--        max => 5,
--        ok => 5,
--        passing => 1,
--        seen => 5,
--        skip => 0,
--        todo => 0,
--        'wait' => 0
--    },
--    'die' => {
--        bonus => 0,
--        details => [],
--        'exit' => $die_exit,
--        max => 0,
--        ok => 0,
--        passing => 0,
--        seen => 0,
--        skip => 0,
--        todo => 0,
--        'wait' => $wait_non_zero
--    },
--    die_head_end => {
--        bonus => 0,
--        details => [
--            ({
--                actual_ok => 1,
--                ok => 1
--            }) x 4,
--        ],
--        'exit' => $die_exit,
--        max => 0,
--        ok => 4,
--        passing => 0,
--        seen => 4,
--        skip => 0,
--        todo => 0,
--        'wait' => $wait_non_zero
--    },
--    die_last_minute => {
--        bonus => 0,
--        details => [
--            ({
--                actual_ok => 1,
--                ok => 1
--            }) x 4,
--        ],
--        'exit' => $die_exit,
--        max => 4,
--        ok => 4,
--        passing => 0,
--        seen => 4,
--        skip => 0,
--        todo => 0,
--        'wait' => $wait_non_zero
--    },
--    duplicates => {
--        bonus => 0,
--        details => [
--            ({
--                actual_ok => 1,
--                ok => 1
--            }) x 10,
--        ],
--        'exit' => 0,
--        max => 10,
--        ok => 11,
--        passing => 0,
--        seen => 11,
--        skip => 0,
--        todo => 0,
--        'wait' => 0
--    },
--    head_end => {
--        bonus => 0,
--        details => [
--            ({
--                actual_ok => 1,
--                ok => 1
--            }) x 3,
--            {
--                actual_ok => 1,
--                diagnostics => "comment\nmore ignored stuff\nand yet more\n",
--                ok => 1
--            }
--        ],
--        'exit' => 0,
--        max => 4,
--        ok => 4,
--        passing => 1,
--        seen => 4,
--        skip => 0,
--        todo => 0,
--        'wait' => 0
--    },
--    head_fail => {
--        bonus => 0,
--        details => [
--            {
--                actual_ok => 1,
--                ok => 1
--            },
--            {
--                actual_ok => 0,
--                ok => 0
--            },
--            {
--                actual_ok => 1,
--                ok => 1
--            },
--            {
--                actual_ok => 1,
--                diagnostics => "comment\nmore ignored stuff\nand yet more\n",
--                ok => 1
--            }
--        ],
--        'exit' => 0,
--        max => 4,
--        ok => 3,
--        passing => 0,
--        seen => 4,
--        skip => 0,
--        todo => 0,
--        'wait' => 0
--    },
--    lone_not_bug => {
--        bonus => 0,
--        details => [
--            ({
--                actual_ok => 1,
--                ok => 1
--            }) x 4,
--        ],
--        'exit' => 0,
--        max => 4,
--        ok => 4,
--        passing => 1,
--        seen => 4,
--        skip => 0,
--        todo => 0,
--        'wait' => 0
--    },
--    no_output => {
--        bonus => 0,
--        details => [],
--        'exit' => 0,
--        max => 0,
--        ok => 0,
--        passing => 0,
--        seen => 0,
--        skip => 0,
--        todo => 0,
--        'wait' => 0
--    },
--    shbang_misparse => {
--        bonus => 0,
--        details => [
--            ({
--                actual_ok => 1,
--                ok => 1
--            }) x 2,
--        ],
--        'exit' => 0,
--        max => 2,
--        ok => 2,
--        passing => 1,
--        seen => 2,
--        skip => 0,
--        todo => 0,
--        'wait' => 0
--    },
--    simple => {
--        bonus => 0,
--        details => [
--            ({
--                actual_ok => 1,
--                ok => 1
--            }) x 5,
--        ],
--        'exit' => 0,
--        max => 5,
--        ok => 5,
--        passing => 1,
--        seen => 5,
--        skip => 0,
--        todo => 0,
--        'wait' => 0
--    },
--    simple_fail => {
--        bonus => 0,
--        details => [
--            {
--                actual_ok => 1,
--                ok => 1
--            },
--            {
--                actual_ok => 0,
--                ok => 0
--            },
--            {
--                actual_ok => 1,
--                ok => 1
--            },
--            {
--                actual_ok => 1,
--                ok => 1
--            },
--            {
--                actual_ok => 0,
--                ok => 0
--            }
--        ],
--        'exit' => 0,
--        max => 5,
--        ok => 3,
--        passing => 0,
--        seen => 5,
--        skip => 0,
--        todo => 0,
--        'wait' => 0
--    },
--    skip => {
--        bonus => 0,
--        details => [
--            {
--                actual_ok => 1,
--                ok => 1
--            },
--            {
--                actual_ok => 1,
--                ok => 1,
--                reason => "rain delay",
--                type => "skip"
--            },
--            ({
--                actual_ok => 1,
--                ok => 1
--            }) x 3,
--        ],
--        'exit' => 0,
--        max => 5,
--        ok => 5,
--        passing => 1,
--        seen => 5,
--        skip => 1,
--        todo => 0,
--        'wait' => 0
--    },
--    skip_nomsg => {
--        bonus => 0,
--        details => [
--            {
--                actual_ok => 1,
--                ok => 1,
--                reason => "",
--                type => "skip"
--            }
--        ],
--        'exit' => 0,
--        max => 1,
--        ok => 1,
--        passing => 1,
--        seen => 1,
--        skip => 1,
--        todo => 0,
--        'wait' => 0
--    },
--    skipall => {
--        bonus => 0,
--        details => [],
--        'exit' => 0,
--        max => 0,
--        ok => 0,
--        passing => 1,
--        seen => 0,
--        skip => 0,
--        skip_all => "rope",
--        todo => 0,
--        'wait' => 0
--    },
--    skipall_nomsg => {
--        bonus => 0,
--        details => [],
--        'exit' => 0,
--        max => 0,
--        ok => 0,
--        passing => 1,
--        seen => 0,
--        skip => 0,
--        skip_all => "",
--        todo => 0,
--        'wait' => 0
--    },
--    taint => {
--        bonus => 0,
--        details => [
--            {
--                actual_ok => 1,
--                name => "-T honored",
--                ok => 1
--            }
--        ],
--        'exit' => 0,
--        max => 1,
--        ok => 1,
--        passing => 1,
--        seen => 1,
--        skip => 0,
--        todo => 0,
--        'wait' => 0
--    },
--    todo => {
--        bonus => 1,
--        details => [
--            {
--                actual_ok => 1,
--                ok => 1
--            },
--            {
--                actual_ok => 1,
--                ok => 1,
--                type => "todo"
--            },
--            {
--                actual_ok => 0,
--                ok => 1,
--                type => "todo"
--            },
--            ({
--                actual_ok => 1,
--                ok => 1
--            }) x 2,
--        ],
--        'exit' => 0,
--        max => 5,
--        ok => 5,
--        passing => 1,
--        seen => 5,
--        skip => 0,
--        todo => 2,
--        'wait' => 0
--    },
--    vms_nit => {
--        bonus => 0,
--        details => [
--            {
--                actual_ok => 0,
--                ok => 0
--            },
--            {
--                actual_ok => 1,
--                ok => 1
--            }
--        ],
--        'exit' => 0,
--        max => 2,
--        ok => 1,
--        passing => 0,
--        seen => 2,
--        skip => 0,
--        todo => 0,
--        'wait' => 0
--    },
--    with_comments => {
--        bonus => 2,
--        details => [
--            {
--                actual_ok => 0,
--                diagnostics => "Failed test 1 in t/todo.t at line 9 *TODO*\n",
--                ok => 1,
--                type => "todo"
--            },
--            {
--                actual_ok => 1,
--                ok => 1,
--                reason => "at line 10 TODO?!)",
--                type => "todo"
--            },
--            {
--                actual_ok => 1,
--                ok => 1
--            },
--            {
--                actual_ok => 0,
--                diagnostics => "Test 4 got: '0' (t/todo.t at line 12 *TODO*)\n  Expected: '1' (need more tuits)\n",
--                ok => 1,
--                type => "todo"
--            },
--            {
--                actual_ok => 1,
--                diagnostics => "woo\n",
--                ok => 1,
--                reason => "at line 13 TODO?!)",
--                type => "todo"
--            }
--        ],
--        'exit' => 0,
--        max => 5,
--        ok => 5,
--        passing => 1,
--        seen => 5,
--        skip => 0,
--        todo => 4,
--        'wait' => 0
--    },
--);
--
--use Test::Harness::Straps;
--my @_INC = map { qq{"-I$_"} } @INC;
--$Test::Harness::Switches = "@_INC -Mstrict";
--
--$SIG{__WARN__} = sub { 
--    warn @_ unless $_[0] =~ /^Enormous test number/ ||
--                   $_[0] =~ /^Can't detailize/
--};
--
--for my $test ( sort keys %samples ) {
--    print "# Working on $test\n";
--    my $expect = $samples{$test};
--
--    for my $n ( 0..$#{$expect->{details}} ) {
--        for my $field ( qw( type name reason ) ) {
--            $expect->{details}[$n]{$field} = '' unless exists $expect->{details}[$n]{$field};
--        }
--    }
--
--    my $test_path = File::Spec->catfile($SAMPLE_TESTS, $test);
--    my $strap = Test::Harness::Straps->new;
--    isa_ok( $strap, 'Test::Harness::Straps' );
--    my $results = $strap->analyze_file($test_path);
--
--    is_deeply($results->details, $expect->{details}, qq{details of "$test"} );
--
--    delete $expect->{details};
--
--    SKIP: {
--        skip '$? unreliable in MacPerl', 2 if $IsMacPerl;
--
--        # We can only check if it's zero or non-zero.
--        is( !$results->wait, !$expect->{'wait'}, 'wait status' );
--        delete $expect->{'wait'};
--
--        # Have to check the exit status seperately so we can skip it
--        # in MacPerl.
--        is( $results->exit, $expect->{'exit'}, 'exit matches' );
--        delete $expect->{'exit'};
--    }
--
--    for my $field ( sort keys %$expect ) {
--        is( $results->$field(), $expect->{$field}, "Field $field" );
--    }
--} # for %samples
--
--NON_EXISTENT_FILE: {
--    my $strap = Test::Harness::Straps->new;
--    isa_ok( $strap, 'Test::Harness::Straps' );
--    ok( !$strap->analyze_file('I_dont_exist'), "Can't analyze a non-existant file" );
--    is( $strap->{error}, "I_dont_exist does not exist", "And there should be one error" );
--}
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/strap.t perl-5.10.0/lib/Test/Harness/t/strap.t
---- perl-5.10.0.orig/lib/Test/Harness/t/strap.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/strap.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,158 +0,0 @@
--#!/usr/bin/perl -Tw
--
--use strict;
--
--BEGIN {
--    if( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = ('../lib', 'lib');
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use Test::More tests => 89;
--
--BEGIN { use_ok('Test::Harness::Straps'); }
--
--my $strap = Test::Harness::Straps->new;
--isa_ok( $strap, 'Test::Harness::Straps', 'new()' );
--
--### Testing _is_diagnostic()
--
--my $comment;
--ok( !$strap->_is_diagnostic("foo", \$comment), '_is_diagnostic(), not a comment'  );
--ok( !defined $comment,                      '  no comment set'              );
--
--ok( !$strap->_is_diagnostic("f # oo", \$comment), '  not a comment with #'     );
--ok( !defined $comment,                         '  no comment set'           );
--
--my %comments = (
--                "# stuff and things # and stuff"    => 
--                                        ' stuff and things # and stuff',
--                "    # more things "                => ' more things ',
--                "#"                                 => '',
--               );
--
--for my $line ( sort keys %comments ) {
--    my $line_comment = $comments{$line};
--    my $strap = Test::Harness::Straps->new;
--    isa_ok( $strap, 'Test::Harness::Straps' );
--
--    my $name = substr($line, 0, 20);
--    ok( $strap->_is_diagnostic($line, \$comment),        "  comment '$name'"   );
--    is( $comment, $line_comment,                      '  right comment set' );
--}
--
--
--
--### Testing _is_header()
--
--my @not_headers = (' 1..2',
--                   '1..M',
--                   '1..-1',
--                   '2..2',
--                   '1..a',
--                   '',
--                  );
--
--foreach my $unheader (@not_headers) {
--    my $strap = Test::Harness::Straps->new;
--    isa_ok( $strap, 'Test::Harness::Straps' );
--
--    ok( !$strap->_is_header($unheader),     
--        "_is_header(), not a header '$unheader'" );
--
--    ok( (!grep { exists $strap->{$_} } qw(max todo skip_all)),
--        "  max, todo and skip_all are not set" );
--}
--
--
--my @attribs = qw(max skip_all todo);
--my %headers = (
--   '1..2'                               => { max => 2 },
--   '1..1'                               => { max => 1 },
--   '1..0'                               => { max => 0,
--                                             skip_all => '',
--                                           },
--   '1..0 # Skipped: no leverage found'  => { max      => 0,
--                                             skip_all => 'no leverage found',
--                                           },
--   '1..4 # Skipped: no leverage found'  => { max      => 4,
--                                             skip_all => 'no leverage found',
--                                           },
--   '1..0 # skip skip skip because'      => { max      => 0,
--                                             skip_all => 'skip skip because',
--                                           },
--   '1..10 todo 2 4 10'                  => { max        => 10,
--                                             'todo'       => { 2  => 1,
--                                                               4  => 1,
--                                                               10 => 1,
--                                                           },
--                                           },
--   '1..10 todo'                         => { max        => 10 },
--   '1..192 todo 4 2 13 192 # Skip skip skip because'   => 
--                                           { max     => 192,
--                                             'todo'    => { 4   => 1, 
--                                                            2   => 1, 
--                                                            13  => 1, 
--                                                            192 => 1,
--                                                        },
--                                             skip_all => 'skip skip because'
--                                           }
--);
--
--for my $header ( sort keys %headers ) {
--    my $expect = $headers{$header};
--    my $strap = Test::Harness::Straps->new;
--    isa_ok( $strap, 'Test::Harness::Straps' );
--
--    ok( $strap->_is_header($header),    "_is_header() is a header '$header'" );
--
--    is( $strap->{skip_all}, $expect->{skip_all},      '  skip_all set right' )
--      if defined $expect->{skip_all};
--
--    ok( eq_set( [map $strap->{$_},  grep defined $strap->{$_},  @attribs],
--                [map $expect->{$_}, grep defined $expect->{$_}, @attribs] ),
--        '  the right attributes are there' );
--}
--
--
--
--### Test _is_bail_out()
--
--my %bails = (
--             'Bail out!'                 =>  undef,
--             'Bail out!  Wing on fire.'  => 'Wing on fire.',
--             'BAIL OUT!'                 => undef,
--             'bail out! - Out of coffee' => '- Out of coffee',
--            );
--
--for my $line ( sort keys %bails ) {
--    my $expect = $bails{$line};
--    my $strap = Test::Harness::Straps->new;
--    isa_ok( $strap, 'Test::Harness::Straps' );
--
--    my $reason;
--    ok( $strap->_is_bail_out($line, \$reason), "_is_bail_out() spots '$line'");
--    is( $reason, $expect,                       '  with the right reason' );
--}
--
--my @unbails = (
--               '  Bail out!',
--               'BAIL OUT',
--               'frobnitz',
--               'ok 23 - BAIL OUT!',
--              );
--
--foreach my $line (@unbails) {
--    my $strap = Test::Harness::Straps->new;
--    isa_ok( $strap, 'Test::Harness::Straps' );
--
--    my $reason;
--
--    ok( !$strap->_is_bail_out($line, \$reason),  
--                                       "_is_bail_out() ignores '$line'" );
--    is( $reason, undef,                         '  and gives no reason' );
--}
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/test-harness.t perl-5.10.0/lib/Test/Harness/t/test-harness.t
---- perl-5.10.0.orig/lib/Test/Harness/t/test-harness.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/test-harness.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,562 +0,0 @@
--#!/usr/bin/perl -w
--
--BEGIN {
--    if( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = ('../lib', 'lib');
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use strict;
--use File::Spec;
--
--my $Curdir = File::Spec->curdir;
--my $SAMPLE_TESTS = $ENV{PERL_CORE}
--                    ? File::Spec->catdir($Curdir, 'lib', 'sample-tests')
--                    : File::Spec->catdir($Curdir, 't',   'sample-tests');
--
--
--use Test::More;
--use Dev::Null;
--
--my $IsMacPerl = $^O eq 'MacOS';
--my $IsVMS     = $^O eq 'VMS';
--
--# VMS uses native, not POSIX, exit codes.
--# MacPerl's exit codes are broken.
--my $die_estat = $IsVMS     ? 44 : 
--                $IsMacPerl ? 0  :
--                             1;
--
--my %samples = (
--            simple            => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 5,
--                                            'ok'       => 5,
--                                            files      => 1,
--                                            bad        => 0,
--                                            good       => 1,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--            simple_fail      => {
--                                 total => {
--                                           bonus       => 0,
--                                           max         => 5,
--                                           'ok'        => 3,
--                                           files       => 1,
--                                           bad         => 1,
--                                           good        => 0,
--                                           tests       => 1,
--                                           sub_skipped => 0,
--                                           'todo'      => 0,
--                                           skipped     => 0,
--                                          },
--                                 failed => {
--                                            canon      => '2 5',
--                                           },
--                                 all_ok => 0,
--                                },
--            descriptive       => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 5,
--                                            'ok'       => 5,
--                                            files      => 1,
--                                            bad        => 0,
--                                            good       => 1,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--            no_nums           => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 5,
--                                            'ok'       => 4,
--                                            files      => 1,
--                                            bad        => 1,
--                                            good       => 0,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => {
--                                             canon     => '3',
--                                            },
--                                  all_ok => 0,
--                                 },
--            'todo'            => {
--                                  total => {
--                                            bonus      => 1,
--                                            max        => 5,
--                                            'ok'       => 5,
--                                            files      => 1,
--                                            bad        => 0,
--                                            good       => 1,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 2,
--                                            skipped    => 0,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--            todo_inline       => {
--                                  total => {
--                                            bonus       => 1,
--                                            max         => 3,
--                                            'ok'        => 3,
--                                            files       => 1,
--                                            bad         => 0,
--                                            good        => 1,
--                                            tests       => 1,
--                                            sub_skipped => 0,
--                                            'todo'      => 2,
--                                            skipped     => 0,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--            'skip'            => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 5,
--                                            'ok'       => 5,
--                                            files      => 1,
--                                            bad        => 0,
--                                            good       => 1,
--                                            tests      => 1,
--                                            sub_skipped=> 1,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--            'skip_nomsg'      => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 1,
--                                            'ok'       => 1,
--                                            files      => 1,
--                                            bad        => 0,
--                                            good       => 1,
--                                            tests      => 1,
--                                            sub_skipped=> 1,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--            bailout           => 0,
--            combined          => {
--                                  total => {
--                                            bonus      => 1,
--                                            max        => 10,
--                                            'ok'       => 8,
--                                            files      => 1,
--                                            bad        => 1,
--                                            good       => 0,
--                                            tests      => 1,
--                                            sub_skipped=> 1,
--                                            'todo'     => 2,
--                                            skipped    => 0
--                                           },
--                                  failed => {
--                                             canon     => '3 9',
--                                            },
--                                  all_ok => 0,
--                                 },
--            duplicates        => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 10,
--                                            'ok'       => 11,
--                                            files      => 1,
--                                            bad        => 1,
--                                            good       => 0,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => {
--                                             canon     => '??',
--                                            },
--                                  all_ok => 0,
--                                 },
--            head_end          => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 4,
--                                            'ok'       => 4,
--                                            files      => 1,
--                                            bad        => 0,
--                                            good       => 1,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--            head_fail         => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 4,
--                                            'ok'       => 3,
--                                            files      => 1,
--                                            bad        => 1,
--                                            good       => 0,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => {
--                                             canon      => '2',
--                                            },
--                                  all_ok => 0,
--                                 },
--            no_output        => {
--                                 total => {
--                                           bonus       => 0,
--                                           max         => 0,
--                                           'ok'        => 0,
--                                           files       => 1,
--                                           bad         => 1,
--                                           good        => 0,
--                                           tests       => 1,
--                                           sub_skipped => 0,
--                                           'todo'      => 0,
--                                           skipped     => 0,
--                                          },
--                                 failed => {
--                                           },
--                                 all_ok => 0,
--                                },
--            skipall          => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 0,
--                                            'ok'       => 0,
--                                            files      => 1,
--                                            bad        => 0,
--                                            good       => 1,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 1,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--            skipall_nomsg   => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 0,
--                                            'ok'       => 0,
--                                            files      => 1,
--                                            bad        => 0,
--                                            good       => 1,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 1,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--            with_comments     => {
--                                  total => {
--                                            bonus      => 2,
--                                            max        => 5,
--                                            'ok'       => 5,
--                                            files      => 1,
--                                            bad        => 0,
--                                            good       => 1,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 4,
--                                            skipped    => 0,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--            taint             => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 1,
--                                            'ok'       => 1,
--                                            files      => 1,
--                                            bad        => 0,
--                                            good       => 1,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--
--            taint_warn        => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 1,
--                                            'ok'       => 1,
--                                            files      => 1,
--                                            bad        => 0,
--                                            good       => 1,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--
--            'die'             => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 0,
--                                            'ok'       => 0,
--                                            files      => 1,
--                                            bad        => 1,
--                                            good       => 0,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => {
--                                             estat      => $die_estat,
--                                             max        => '??',
--                                             failed     => '??',
--                                             canon      => '??',
--                                            },
--                                  all_ok => 0,
--                                 },
--
--            die_head_end      => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 0,
--                                            'ok'       => 4,
--                                            files      => 1,
--                                            bad        => 1,
--                                            good       => 0,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => {
--                                             estat      => $die_estat,
--                                             max        => '??',
--                                             failed     => '??',
--                                             canon      => '??',
--                                            },
--                                  all_ok => 0,
--                                 },
--
--            die_last_minute   => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 4,
--                                            'ok'       => 4,
--                                            files      => 1,
--                                            bad        => 1,
--                                            good       => 0,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => {
--                                             estat      => $die_estat,
--                                             max        => 4,
--                                             failed     => 0,
--                                             canon      => '??',
--                                            },
--                                  all_ok => 0,
--                                 },
--            bignum            => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 2,
--                                            'ok'       => 4,
--                                            files      => 1,
--                                            bad        => 1,
--                                            good       => 0,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => {
--                                             canon      => '??',
--                                            },
--                                  all_ok => 0,
--                                 },
--            bignum_many       => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 2,
--                                            'ok'       => 11,
--                                            files      => 1,
--                                            bad        => 1,
--                                            good       => 0,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => {
--                                             canon      => '3-100000',
--                                            },
--                                  all_ok => 0,
--                                 },
--            'shbang_misparse' => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 2,
--                                            'ok'       => 2,
--                                            files      => 1,
--                                            bad        => 0,
--                                            good       => 1,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--            too_many         => {
--                                 total => {
--                                           bonus       => 0,
--                                           max         => 3,
--                                           'ok'        => 7,
--                                           files       => 1,
--                                           bad         => 1,
--                                           good        => 0,
--                                           tests       => 1,
--                                           sub_skipped => 0,
--                                           'todo'      => 0,
--                                           skipped     => 0,
--                                          },
--                                 failed => {
--                                            canon      => '4-7',
--                                           },
--                                 all_ok => 0,
--                                },
--            switches         => {
--                                  total => {
--                                            bonus      => 0,
--                                            max        => 1,
--                                            'ok'       => 1,
--                                            files      => 1,
--                                            bad        => 0,
--                                            good       => 1,
--                                            tests      => 1,
--                                            sub_skipped=> 0,
--                                            'todo'     => 0,
--                                            skipped    => 0,
--                                           },
--                                  failed => { },
--                                  all_ok => 1,
--                                 },
--           );
--
--my $tests_per_loop = 8;
--plan tests => (keys(%samples) * $tests_per_loop);
--
--use Test::Harness;
--my @_INC = map { qq{"-I$_"} } @INC;
--$Test::Harness::Switches = "@_INC -Mstrict";
--
--tie *NULL, 'Dev::Null' or die $!;
--
--for my $test ( sort keys %samples ) {
--SKIP: {
--    skip "-t introduced in 5.8.0", $tests_per_loop
--        if ($test eq 'taint_warn') && ($] < 5.008);
--
--    my $expect = $samples{$test};
--
--    # execute_tests() runs the tests but skips the formatting.
--    my $test_path = File::Spec->catfile($SAMPLE_TESTS, $test);
--
--    print STDERR "# $test\n" if $ENV{TEST_VERBOSE};
--    my $totals;
--    my $failed;
--    my $warning = '';
--    eval {
--        local $SIG{__WARN__} = sub { $warning .= join '', @_; };
--        ($totals, $failed) = Test::Harness::execute_tests(tests => [$test_path], out => \*NULL);
--    };
--
--    # $? is unreliable in MacPerl, so we'll just fudge it.
--    $failed->{estat} = $die_estat if $IsMacPerl and $failed;
--
--    SKIP: {
--        skip "special tests for bailout", 1 unless $test eq 'bailout';
--        like( $@, '/Further testing stopped: GERONI/i' );
--    }
--
--    SKIP: {
--        skip "don't apply to a bailout", 6 if $test eq 'bailout';
--        is( $@, '', '$@ is empty' );
--        is( Test::Harness::_all_ok($totals), $expect->{all_ok},
--                                                  "$test - all ok" );
--        ok( defined $expect->{total},             "$test - has total" );
--        is_deeply( {map { $_=>$totals->{$_} } keys %{$expect->{total}}},
--                   $expect->{total},
--                                                  "$test - totals" );
--        is_deeply( {map { $_=>$failed->{$test_path}{$_} }
--                    keys %{$expect->{failed}}},
--                   $expect->{failed},
--                                                  "$test - failed" );
--
--        skip "No tests were run", 1 unless $totals->{max};
--
--        my $output = Test::Harness::get_results($totals, $failed);
--        like( $output, '/All tests successful|List of Failed/', 'Got what looks like a valid summary' );
--    }
--
--    my $expected_warnings = "";
--    if ( $test eq "bignum" ) {
--        $expected_warnings = <<WARN;
--Enormous test number seen [test 136211425]
--Can't detailize, too big.
--WARN
--    }
--    elsif ( $test eq 'bignum_many' ) {
--        $expected_warnings = <<WARN;
--Enormous test number seen [test 100001]
--Can't detailize, too big.
--WARN
--    }
--    my $desc = $expected_warnings ? 'Got proper warnings' : 'No warnings';
--    is( $warning, $expected_warnings, "$test - $desc" );
--} # taint SKIP block
--} # for tests
-diff -urN perl-5.10.0.orig/lib/Test/Harness/t/version.t perl-5.10.0/lib/Test/Harness/t/version.t
---- perl-5.10.0.orig/lib/Test/Harness/t/version.t	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/version.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,23 +0,0 @@
--#!/usr/bin/perl -Tw
--
--BEGIN {
--    if( $ENV{PERL_CORE} ) {
--        chdir 't';
--        @INC = ('../lib', 'lib');
--    }
--    else {
--        unshift @INC, 't/lib';
--    }
--}
--
--use strict;
--
--use Test::More tests => 3;
--
--BEGIN {
--    use_ok('Test::Harness');
--}
--
--my $ver = $ENV{HARNESS_VERSION} or die "HARNESS_VERSION not set";
--ok( $ver =~ /^2.\d\d(_\d\d)?$/, "Version is proper format" );
--is( $ver, $Test::Harness::VERSION );
-diff -urN perl-5.10.0.orig/lib/Test/Harness.pm perl-5.10.0/lib/Test/Harness.pm
---- perl-5.10.0.orig/lib/Test/Harness.pm	2009-02-20 11:39:19.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness.pm	2009-03-10 17:39:08.000000000 +0100
-@@ -1,28 +1,38 @@
--# -*- Mode: cperl; cperl-indent-level: 4 -*-
--
- package Test::Harness;
- 
- require 5.00405;
--use Test::Harness::Straps;
--use Test::Harness::Assert;
--use Exporter;
--use Benchmark;
--use Config;
-+
- use strict;
- 
-+use constant IS_WIN32 => ( $^O =~ /^(MS)?Win32$/ );
-+use constant IS_VMS => ( $^O eq 'VMS' );
-+
-+use TAP::Harness              ();
-+use TAP::Parser::Aggregator   ();
-+use TAP::Parser::Source::Perl ();
- 
-+use TAP::Parser::Utils qw( split_shell );
-+
-+use Config;
-+use Exporter;
-+
-+# TODO: Emulate at least some of these
- use vars qw(
--    $VERSION 
--    @ISA @EXPORT @EXPORT_OK 
--    $Verbose $Switches $Debug
--    $verbose $switches $debug
--    $Columns
--    $Timer
--    $ML $Last_ML_Print
--    $Strap
--    $has_time_hires
-+  $VERSION
-+  @ISA @EXPORT @EXPORT_OK
-+  $Verbose $Switches $Debug
-+  $verbose $switches $debug
-+  $Columns
-+  $Color
-+  $Directives
-+  $Timer
-+  $Strap
-+  $has_time_hires
-+  $IgnoreExit
- );
- 
-+# $ML $Last_ML_Print
-+
- BEGIN {
-     eval q{use Time::HiRes 'time'};
-     $has_time_hires = !$@;
-@@ -34,72 +44,39 @@
- 
- =head1 VERSION
- 
--Version 2.64
-+Version 3.16
- 
- =cut
- 
--$VERSION = '2.64';
-+$VERSION = '3.16';
- 
- # Backwards compatibility for exportable variable names.
- *verbose  = *Verbose;
- *switches = *Switches;
- *debug    = *Debug;
- 
--$ENV{HARNESS_ACTIVE} = 1;
-+$ENV{HARNESS_ACTIVE}  = 1;
- $ENV{HARNESS_VERSION} = $VERSION;
- 
- END {
-+
-     # For VMS.
-     delete $ENV{HARNESS_ACTIVE};
-     delete $ENV{HARNESS_VERSION};
- }
- 
--my $Files_In_Dir = $ENV{HARNESS_FILELEAK_IN_DIR};
--
--# Stolen from Params::Util
--sub _CLASS {
--    (defined $_[0] and ! ref $_[0] and $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*$/s) ? $_[0] : undef;
--}
--
--# Strap Overloading
--if ( $ENV{HARNESS_STRAPS_CLASS} ) {
--    die 'Set HARNESS_STRAP_CLASS, singular, not HARNESS_STRAPS_CLASS';
--}
--my $HARNESS_STRAP_CLASS  = $ENV{HARNESS_STRAP_CLASS} || 'Test::Harness::Straps';
--if ( $HARNESS_STRAP_CLASS =~ /\.pm$/ ) {
--    # "Class" is actually a filename, that should return the
--    # class name as its true return value.
--    $HARNESS_STRAP_CLASS = require $HARNESS_STRAP_CLASS;
--    if ( !_CLASS($HARNESS_STRAP_CLASS) ) {
--        die "HARNESS_STRAP_CLASS '$HARNESS_STRAP_CLASS' is not a valid class name";
--    }
--}
--else {
--    # It is a class name within the current @INC
--    if ( !_CLASS($HARNESS_STRAP_CLASS) ) {
--        die "HARNESS_STRAP_CLASS '$HARNESS_STRAP_CLASS' is not a valid class name";
--    }
--    eval "require $HARNESS_STRAP_CLASS";
--    die $@ if $@;
--}
--if ( !$HARNESS_STRAP_CLASS->isa('Test::Harness::Straps') ) {
--    die "HARNESS_STRAP_CLASS '$HARNESS_STRAP_CLASS' must be a Test::Harness::Straps subclass";
--}
--
--$Strap = $HARNESS_STRAP_CLASS->new;
--
--sub strap { return $Strap };
--
--@ISA = ('Exporter');
-+@ISA       = ('Exporter');
- @EXPORT    = qw(&runtests);
- @EXPORT_OK = qw(&execute_tests $verbose $switches);
- 
--$Verbose  = $ENV{HARNESS_VERBOSE} || 0;
--$Debug    = $ENV{HARNESS_DEBUG} || 0;
-+$Verbose = $ENV{HARNESS_VERBOSE} || 0;
-+$Debug   = $ENV{HARNESS_DEBUG}   || 0;
- $Switches = '-w';
--$Columns  = $ENV{HARNESS_COLUMNS} || $ENV{COLUMNS} || 80;
--$Columns--;             # Some shells have trouble with a full line of text.
--$Timer    = $ENV{HARNESS_TIMER} || 0;
-+$Columns = $ENV{HARNESS_COLUMNS} || $ENV{COLUMNS} || 80;
-+$Columns--;    # Some shells have trouble with a full line of text.
-+$Timer      = $ENV{HARNESS_TIMER}       || 0;
-+$Color      = $ENV{HARNESS_COLOR}       || 0;
-+$IgnoreExit = $ENV{HARNESS_IGNORE_EXIT} || 0;
- 
- =head1 SYNOPSIS
- 
-@@ -109,169 +86,353 @@
- 
- =head1 DESCRIPTION
- 
--B<STOP!> If all you want to do is write a test script, consider
--using Test::Simple.  Test::Harness is the module that reads the
--output from Test::Simple, Test::More and other modules based on
--Test::Builder.  You don't need to know about Test::Harness to use
--those modules.
-+Although, for historical reasons, the L<Test::Harness> distribution
-+takes its name from this module it now exists only to provide
-+L<TAP::Harness> with an interface that is somewhat backwards compatible
-+with L<Test::Harness> 2.xx. If you're writing new code consider using
-+L<TAP::Harness> directly instead.
-+
-+Emulation is provided for C<runtests> and C<execute_tests> but the
-+pluggable 'Straps' interface that previous versions of L<Test::Harness>
-+supported is not reproduced here. Straps is now available as a stand
-+alone module: L<Test::Harness::Straps>.
- 
--Test::Harness runs tests and expects output from the test in a
--certain format.  That format is called TAP, the Test Anything
--Protocol.  It is defined in L<Test::Harness::TAP>.
-+See L<TAP::Parser>, L<TAP::Harness> for the main documentation for this
-+distribution.
- 
--C<Test::Harness::runtests(@tests)> runs all the testscripts named
--as arguments and checks standard output for the expected strings
--in TAP format.
-+=head1 FUNCTIONS
- 
--The F<prove> utility is a thin wrapper around Test::Harness.
-+The following functions are available.
- 
--=head2 Taint mode
-+=head2 runtests( @test_files )
- 
--Test::Harness will honor the C<-T> or C<-t> in the #! line on your
--test files.  So if you begin a test with:
-+This runs all the given I<@test_files> and divines whether they passed
-+or failed based on their output to STDOUT (details above).  It prints
-+out each individual test which failed along with a summary report and
-+a how long it all took.
- 
--    #!perl -T
-+It returns true if everything was ok.  Otherwise it will C<die()> with
-+one of the messages in the DIAGNOSTICS section.
- 
--the test will be run with taint mode on.
-+=cut
- 
--=head2 Configuration variables.
-+sub _has_taint {
-+    my $test = shift;
-+    return TAP::Parser::Source::Perl->get_taint(
-+        TAP::Parser::Source::Perl->shebang($test) );
-+}
- 
--These variables can be used to configure the behavior of
--Test::Harness.  They are exported on request.
-+sub _aggregate {
-+    my ( $harness, $aggregate, @tests ) = @_;
- 
--=over 4
-+    # Don't propagate to our children
-+    local $ENV{HARNESS_OPTIONS};
- 
--=item C<$Test::Harness::Verbose>
-+    _apply_extra_INC($harness);
-+    _aggregate_tests( $harness, $aggregate, @tests );
-+}
- 
--The package variable C<$Test::Harness::Verbose> is exportable and can be
--used to let C<runtests()> display the standard output of the script
--without altering the behavior otherwise.  The F<prove> utility's C<-v>
--flag will set this.
-+# Make sure the child seens all the extra junk in @INC
-+sub _apply_extra_INC {
-+    my $harness = shift;
- 
--=item C<$Test::Harness::switches>
-+    $harness->callback(
-+        parser_args => sub {
-+            my ( $args, $test ) = @_;
-+            push @{ $args->{switches} }, map {"-I$_"} _filtered_inc();
-+        }
-+    );
-+}
- 
--The package variable C<$Test::Harness::switches> is exportable and can be
--used to set perl command line options used for running the test
--script(s). The default value is C<-w>. It overrides C<HARNESS_PERL_SWITCHES>.
-+sub _aggregate_tests {
-+    my ( $harness, $aggregate, @tests ) = @_;
-+    $aggregate->start();
-+    $harness->aggregate_tests( $aggregate, @tests );
-+    $aggregate->stop();
- 
--=item C<$Test::Harness::Timer>
-+}
- 
--If set to true, and C<Time::HiRes> is available, print elapsed seconds
--after each test file.
-+sub runtests {
-+    my @tests = @_;
- 
--=back
-+    # shield against -l
-+    local ( $\, $, );
- 
-+    my $harness   = _new_harness();
-+    my $aggregate = TAP::Parser::Aggregator->new();
- 
--=head2 Failure
-+    _aggregate( $harness, $aggregate, @tests );
- 
--When tests fail, analyze the summary report:
-+    $harness->formatter->summary($aggregate);
- 
--  t/base..............ok
--  t/nonumbers.........ok
--  t/ok................ok
--  t/test-harness......ok
--  t/waterloo..........dubious
--          Test returned status 3 (wstat 768, 0x300)
--  DIED. FAILED tests 1, 3, 5, 7, 9, 11, 13, 15, 17, 19
--          Failed 10/20 tests, 50.00% okay
--  Failed Test  Stat Wstat Total Fail  List of Failed
--  ---------------------------------------------------------------
--  t/waterloo.t    3   768    20   10  1 3 5 7 9 11 13 15 17 19
--  Failed 1/5 test scripts, 80.00% okay. 10/44 subtests failed, 77.27% okay.
-+    my $total  = $aggregate->total;
-+    my $passed = $aggregate->passed;
-+    my $failed = $aggregate->failed;
- 
--Everything passed but F<t/waterloo.t>.  It failed 10 of 20 tests and
--exited with non-zero status indicating something dubious happened.
-+    my @parsers = $aggregate->parsers;
- 
--The columns in the summary report mean:
-+    my $num_bad = 0;
-+    for my $parser (@parsers) {
-+        $num_bad++ if $parser->has_problems;
-+    }
- 
--=over 4
-+    die(sprintf(
-+            "Failed %d/%d test programs. %d/%d subtests failed.\n",
-+            $num_bad, scalar @parsers, $failed, $total
-+        )
-+    ) if $num_bad;
- 
--=item B<Failed Test>
-+    return $total && $total == $passed;
-+}
- 
--The test file which failed.
-+sub _canon {
-+    my @list   = sort { $a <=> $b } @_;
-+    my @ranges = ();
-+    my $count  = scalar @list;
-+    my $pos    = 0;
- 
--=item B<Stat>
-+    while ( $pos < $count ) {
-+        my $end = $pos + 1;
-+        $end++ while $end < $count && $list[$end] <= $list[ $end - 1 ] + 1;
-+        push @ranges, ( $end == $pos + 1 )
-+          ? $list[$pos]
-+          : join( '-', $list[$pos], $list[ $end - 1 ] );
-+        $pos = $end;
-+    }
- 
--If the test exited with non-zero, this is its exit status.
-+    return join( ' ', @ranges );
-+}
- 
--=item B<Wstat>
-+sub _new_harness {
-+    my $sub_args = shift || {};
- 
--The wait status of the test.
-+    my ( @lib, @switches );
-+    for my $opt ( split_shell( $Switches, $ENV{HARNESS_PERL_SWITCHES} ) ) {
-+        if ( $opt =~ /^ -I (.*) $ /x ) {
-+            push @lib, $1;
-+        }
-+        else {
-+            push @switches, $opt;
-+        }
-+    }
- 
--=item B<Total>
-+    # Do things the old way on VMS...
-+    push @lib, _filtered_inc() if IS_VMS;
- 
--Total number of tests expected to run.
-+    # If $Verbose isn't numeric default to 1. This helps core.
-+    my $verbosity = ( $Verbose ? ( $Verbose !~ /\d/ ) ? 1 : $Verbose : 0 );
- 
--=item B<Fail>
-+    my $args = {
-+        timer       => $Timer,
-+        directives  => $Directives,
-+        lib         => \@lib,
-+        switches    => \@switches,
-+        color       => $Color,
-+        verbosity   => $verbosity,
-+        ignore_exit => $IgnoreExit,
-+    };
- 
--Number which failed, either from "not ok" or because they never ran.
-+    $args->{stdout} = $sub_args->{out}
-+      if exists $sub_args->{out};
- 
--=item B<List of Failed>
-+    if ( defined( my $env_opt = $ENV{HARNESS_OPTIONS} ) ) {
-+        for my $opt ( split /:/, $env_opt ) {
-+            if ( $opt =~ /^j(\d*)$/ ) {
-+                $args->{jobs} = $1 || 9;
-+            }
-+            elsif ( $opt eq 'f' ) {
-+                $args->{fork} = 1;
-+            }
-+            elsif ( $opt eq 'c' ) {
-+                $args->{color} = 1;
-+            }
-+            else {
-+                die "Unknown HARNESS_OPTIONS item: $opt\n";
-+            }
-+        }
-+    }
- 
--A list of the tests which failed.  Successive failures may be
--abbreviated (ie. 15-20 to indicate that tests 15, 16, 17, 18, 19 and
--20 failed).
-+    return TAP::Harness->new($args);
-+}
- 
--=back
-+# Get the parts of @INC which are changed from the stock list AND
-+# preserve reordering of stock directories.
-+sub _filtered_inc {
-+    my @inc = grep { !ref } @INC;    #28567
- 
-+    if (IS_VMS) {
- 
--=head1 FUNCTIONS
-+        # VMS has a 255-byte limit on the length of %ENV entries, so
-+        # toss the ones that involve perl_root, the install location
-+        @inc = grep !/perl_root/i, @inc;
- 
--The following functions are available.
-+    }
-+    elsif (IS_WIN32) {
- 
--=head2 runtests( @test_files )
-+        # Lose any trailing backslashes in the Win32 paths
-+        s/[\\\/]+$// foreach @inc;
-+    }
- 
--This runs all the given I<@test_files> and divines whether they passed
--or failed based on their output to STDOUT (details above).  It prints
--out each individual test which failed along with a summary report and
--a how long it all took.
-+    my @default_inc = _default_inc();
- 
--It returns true if everything was ok.  Otherwise it will C<die()> with
--one of the messages in the DIAGNOSTICS section.
-+    my @new_inc;
-+    my %seen;
-+    for my $dir (@inc) {
-+        next if $seen{$dir}++;
- 
--=cut
-+        if ( $dir eq ( $default_inc[0] || '' ) ) {
-+            shift @default_inc;
-+        }
-+        else {
-+            push @new_inc, $dir;
-+        }
- 
--sub runtests {
--    my(@tests) = @_;
-+        shift @default_inc while @default_inc and $seen{ $default_inc[0] };
-+    }
-+
-+    return @new_inc;
-+}
- 
--    local ($\, $,);
-+{
- 
--    my ($tot, $failedtests,$todo_passed) = execute_tests(tests => \@tests);
--    print get_results($tot, $failedtests,$todo_passed);
-+    # Cache this to avoid repeatedly shelling out to Perl.
-+    my @inc;
- 
--    my $ok = _all_ok($tot);
-+    sub _default_inc {
-+        return @inc if @inc;
- 
--    assert(($ok xor keys %$failedtests), 
--           q{ok status jives with $failedtests});
-+        local $ENV{PERL5LIB};
-+        local $ENV{PERLLIB};
- 
--    if (! $ok) {
--        die("Failed $tot->{bad}/$tot->{tests} test programs. " .
--            "@{[$tot->{max} - $tot->{ok}]}/$tot->{max} subtests failed.\n");
-+        my $perl = $ENV{HARNESS_PERL} || $^X;
-+
-+        # Avoid using -l for the benefit of Perl 6
-+        chomp( @inc = `$perl -e "print join qq[\\n], \@INC, q[]"` );
-+        return @inc;
-     }
-+}
- 
--    return $ok;
-+sub _check_sequence {
-+    my @list = @_;
-+    my $prev;
-+    while ( my $next = shift @list ) {
-+        return if defined $prev && $next <= $prev;
-+        $prev = $next;
-+    }
-+
-+    return 1;
- }
- 
--# my $ok = _all_ok(\%tot);
--# Tells you if this test run is overall successful or not.
-+sub execute_tests {
-+    my %args = @_;
-+
-+    my $harness   = _new_harness( \%args );
-+    my $aggregate = TAP::Parser::Aggregator->new();
- 
--sub _all_ok {
--    my($tot) = shift;
-+    my %tot = (
-+        bonus       => 0,
-+        max         => 0,
-+        ok          => 0,
-+        bad         => 0,
-+        good        => 0,
-+        files       => 0,
-+        tests       => 0,
-+        sub_skipped => 0,
-+        todo        => 0,
-+        skipped     => 0,
-+        bench       => undef,
-+    );
-+
-+    # Install a callback so we get to see any plans the
-+    # harness executes.
-+    $harness->callback(
-+        made_parser => sub {
-+            my $parser = shift;
-+            $parser->callback(
-+                plan => sub {
-+                    my $plan = shift;
-+                    if ( $plan->directive eq 'SKIP' ) {
-+                        $tot{skipped}++;
-+                    }
-+                }
-+            );
-+        }
-+    );
- 
--    return $tot->{bad} == 0 && ($tot->{max} || $tot->{skipped}) ? 1 : 0;
--}
-+    _aggregate( $harness, $aggregate, @{ $args{tests} } );
- 
--# Returns all the files in a directory.  This is shorthand for backwards
--# compatibility on systems where C<glob()> doesn't work right.
-+    $tot{bench} = $aggregate->elapsed;
-+    my @tests = $aggregate->descriptions;
- 
--sub _globdir {
--    local *DIRH;
-+    # TODO: Work out the circumstances under which the files
-+    # and tests totals can differ.
-+    $tot{files} = $tot{tests} = scalar @tests;
-+
-+    my %failedtests = ();
-+    my %todo_passed = ();
-+
-+    for my $test (@tests) {
-+        my ($parser) = $aggregate->parsers($test);
-+
-+        my @failed = $parser->failed;
-+
-+        my $wstat         = $parser->wait;
-+        my $estat         = $parser->exit;
-+        my $planned       = $parser->tests_planned;
-+        my @errors        = $parser->parse_errors;
-+        my $passed        = $parser->passed;
-+        my $actual_passed = $parser->actual_passed;
-+
-+        my $ok_seq = _check_sequence( $parser->actual_passed );
-+
-+        # Duplicate exit, wait status semantics of old version
-+        $estat ||= '' unless $wstat;
-+        $wstat ||= '';
-+
-+        $tot{max} += ( $planned || 0 );
-+        $tot{bonus} += $parser->todo_passed;
-+        $tot{ok} += $passed > $actual_passed ? $passed : $actual_passed;
-+        $tot{sub_skipped} += $parser->skipped;
-+        $tot{todo}        += $parser->todo;
-+
-+        if ( @failed || $estat || @errors ) {
-+            $tot{bad}++;
-+
-+            my $huh_planned = $planned ? undef : '??';
-+            my $huh_errors  = $ok_seq  ? undef : '??';
-+
-+            $failedtests{$test} = {
-+                'canon' => $huh_planned
-+                  || $huh_errors
-+                  || _canon(@failed)
-+                  || '??',
-+                'estat'  => $estat,
-+                'failed' => $huh_planned
-+                  || $huh_errors
-+                  || scalar @failed,
-+                'max' => $huh_planned || $planned,
-+                'name'  => $test,
-+                'wstat' => $wstat
-+            };
-+        }
-+        else {
-+            $tot{good}++;
-+        }
- 
--    opendir DIRH, shift;
--    my @f = readdir DIRH;
--    closedir DIRH;
-+        my @todo = $parser->todo_passed;
-+        if (@todo) {
-+            $todo_passed{$test} = {
-+                'canon'  => _canon(@todo),
-+                'estat'  => $estat,
-+                'failed' => scalar @todo,
-+                'max'    => scalar $parser->todo,
-+                'name'   => $test,
-+                'wstat'  => $wstat
-+            };
-+        }
-+    }
- 
--    return @f;
-+    return ( \%tot, \%failedtests, \%todo_passed );
- }
- 
- =head2 execute_tests( tests => \@test_files, out => \*FH )
-@@ -316,624 +477,19 @@
- 
- =cut
- 
--sub execute_tests {
--    my %args = @_;
--    my @tests = @{$args{tests}};
--    my $out = $args{out} || select();
--
--    # We allow filehandles that are symbolic refs
--    no strict 'refs';
--    _autoflush($out);
--    _autoflush(\*STDERR);
--
--    my %failedtests;
--    my %todo_passed;
--
--    # Test-wide totals.
--    my(%tot) = (
--                bonus    => 0,
--                max      => 0,
--                ok       => 0,
--                files    => 0,
--                bad      => 0,
--                good     => 0,
--                tests    => scalar @tests,
--                sub_skipped  => 0,
--                todo     => 0,
--                skipped  => 0,
--                bench    => 0,
--               );
--
--    my @dir_files;
--    @dir_files = _globdir $Files_In_Dir if defined $Files_In_Dir;
--    my $run_start_time = new Benchmark;
--
--    my $width = _leader_width(@tests);
--    foreach my $tfile (@tests) {
--        $Last_ML_Print = 0;  # so each test prints at least once
--        my($leader, $ml) = _mk_leader($tfile, $width);
--        local $ML = $ml;
--
--        print $out $leader;
--
--        $tot{files}++;
--
--        $Strap->{_seen_header} = 0;
--        if ( $Test::Harness::Debug ) {
--            print $out "# Running: ", $Strap->_command_line($tfile), "\n";
--        }
--        my $test_start_time = $Timer ? time : 0;
--        my $results = $Strap->analyze_file($tfile) or
--          do { warn $Strap->{error}, "\n";  next };
--        my $elapsed;
--        if ( $Timer ) {
--            $elapsed = time - $test_start_time;
--            if ( $has_time_hires ) {
--                $elapsed = sprintf( " %8d ms", $elapsed*1000 );
--            }
--            else {
--                $elapsed = sprintf( " %8s s", $elapsed ? $elapsed : "<1" );
--            }
--        }
--        else {
--            $elapsed = "";
--        }
--
--        # state of the current test.
--        my @failed = grep { !$results->details->[$_-1]{ok} }
--                     1..@{$results->details};
--        my @todo_pass = grep { $results->details->[$_-1]{actual_ok} &&
--                               $results->details->[$_-1]{type} eq 'todo' }
--                        1..@{$results->details};
--
--        my %test = (
--            ok          => $results->ok,
--            'next'      => $Strap->{'next'},
--            max         => $results->max,
--            failed      => \@failed,
--            todo_pass   => \@todo_pass,
--            todo        => $results->todo,
--            bonus       => $results->bonus,
--            skipped     => $results->skip,
--            skip_reason => $results->skip_reason,
--            skip_all    => $Strap->{skip_all},
--            ml          => $ml,
--        );
--
--        $tot{bonus}       += $results->bonus;
--        $tot{max}         += $results->max;
--        $tot{ok}          += $results->ok;
--        $tot{todo}        += $results->todo;
--        $tot{sub_skipped} += $results->skip;
--
--        my $estatus = $results->exit;
--        my $wstatus = $results->wait;
--
--        if ( $results->passing ) {
--            # XXX Combine these first two
--            if ($test{max} and $test{skipped} + $test{bonus}) {
--                my @msg;
--                push(@msg, "$test{skipped}/$test{max} skipped: $test{skip_reason}")
--                    if $test{skipped};
--                if ($test{bonus}) {
--                    my ($txt, $canon) = _canondetail($test{todo},0,'TODO passed',
--                                                    @{$test{todo_pass}});
--                    $todo_passed{$tfile} = {
--                        canon   => $canon,
--                        max     => $test{todo},
--                        failed  => $test{bonus},
--                        name    => $tfile,
--                        estat   => '',
--                        wstat   => '',
--                    };
--
--                    push(@msg, "$test{bonus}/$test{max} unexpectedly succeeded\n$txt");
--                }
--                print $out "$test{ml}ok$elapsed\n        ".join(', ', @msg)."\n";
--            }
--            elsif ( $test{max} ) {
--                print $out "$test{ml}ok$elapsed\n";
--            }
--            elsif ( defined $test{skip_all} and length $test{skip_all} ) {
--                print $out "skipped\n        all skipped: $test{skip_all}\n";
--                $tot{skipped}++;
--            }
--            else {
--                print $out "skipped\n        all skipped: no reason given\n";
--                $tot{skipped}++;
--            }
--            $tot{good}++;
--        }
--        else {
--            # List unrun tests as failures.
--            if ($test{'next'} <= $test{max}) {
--                push @{$test{failed}}, $test{'next'}..$test{max};
--            }
--            # List overruns as failures.
--            else {
--                my $details = $results->details;
--                foreach my $overrun ($test{max}+1..@$details) {
--                    next unless ref $details->[$overrun-1];
--                    push @{$test{failed}}, $overrun
--                }
--            }
--
--            if ($wstatus) {
--                $failedtests{$tfile} = _dubious_return(\%test, \%tot, 
--                                                       $estatus, $wstatus);
--                $failedtests{$tfile}{name} = $tfile;
--            }
--            elsif ( $results->seen ) {
--                if (@{$test{failed}} and $test{max}) {
--                    my ($txt, $canon) = _canondetail($test{max},$test{skipped},'Failed',
--                                                    @{$test{failed}});
--                    print $out "$test{ml}$txt";
--                    $failedtests{$tfile} = { canon   => $canon,
--                                             max     => $test{max},
--                                             failed  => scalar @{$test{failed}},
--                                             name    => $tfile, 
--                                             estat   => '',
--                                             wstat   => '',
--                                           };
--                }
--                else {
--                    print $out "Don't know which tests failed: got $test{ok} ok, ".
--                          "expected $test{max}\n";
--                    $failedtests{$tfile} = { canon   => '??',
--                                             max     => $test{max},
--                                             failed  => '??',
--                                             name    => $tfile, 
--                                             estat   => '', 
--                                             wstat   => '',
--                                           };
--                }
--                $tot{bad}++;
--            }
--            else {
--                print $out "FAILED before any test output arrived\n";
--                $tot{bad}++;
--                $failedtests{$tfile} = { canon       => '??',
--                                         max         => '??',
--                                         failed      => '??',
--                                         name        => $tfile,
--                                         estat       => '', 
--                                         wstat       => '',
--                                       };
--            }
--        }
--
--        if (defined $Files_In_Dir) {
--            my @new_dir_files = _globdir $Files_In_Dir;
--            if (@new_dir_files != @dir_files) {
--                my %f;
--                @f{@new_dir_files} = (1) x @new_dir_files;
--                delete @f{@dir_files};
--                my @f = sort keys %f;
--                print $out "LEAKED FILES: @f\n";
--                @dir_files = @new_dir_files;
--            }
--        }
--    } # foreach test
--    $tot{bench} = timediff(new Benchmark, $run_start_time);
--
--    $Strap->_restore_PERL5LIB;
--
--    return(\%tot, \%failedtests, \%todo_passed);
--}
--
--# Turns on autoflush for the handle passed
--sub _autoflush {
--    my $flushy_fh = shift;
--    my $old_fh = select $flushy_fh;
--    $| = 1;
--    select $old_fh;
--}
--
--=for private _mk_leader
--
--    my($leader, $ml) = _mk_leader($test_file, $width);
--
--Generates the 't/foo........' leader for the given C<$test_file> as well
--as a similar version which will overwrite the current line (by use of
--\r and such).  C<$ml> may be empty if Test::Harness doesn't think you're
--on TTY.
--
--The C<$width> is the width of the "yada/blah.." string.
--
--=cut
--
--sub _mk_leader {
--    my($te, $width) = @_;
--    chomp($te);
--    $te =~ s/\.\w+$/./;
--
--    if ($^O eq 'VMS') {
--        $te =~ s/^.*\.t\./\[.t./s;
--    }
--    my $leader = "$te" . '.' x ($width - length($te));
--    my $ml = "";
--
--    if ( -t STDOUT and not $ENV{HARNESS_NOTTY} and not $Verbose ) {
--        $ml = "\r" . (' ' x 77) . "\r$leader"
--    }
--
--    return($leader, $ml);
--}
--
--=for private _leader_width
--
--  my($width) = _leader_width(@test_files);
--
--Calculates how wide the leader should be based on the length of the
--longest test name.
--
--=cut
--
--sub _leader_width {
--    my $maxlen = 0;
--    my $maxsuflen = 0;
--    foreach (@_) {
--        my $suf    = /\.(\w+)$/ ? $1 : '';
--        my $len    = length;
--        my $suflen = length $suf;
--        $maxlen    = $len    if $len    > $maxlen;
--        $maxsuflen = $suflen if $suflen > $maxsuflen;
--    }
--    # + 3 : we want three dots between the test name and the "ok"
--    return $maxlen + 3 - $maxsuflen;
--}
--
--sub get_results {
--    my $tot = shift;
--    my $failedtests = shift;
--    my $todo_passed = shift;
--
--    my $out = '';
--
--    my $bonusmsg = _bonusmsg($tot);
--
--    if (_all_ok($tot)) {
--        $out .= "All tests successful$bonusmsg.\n";
--        if ($tot->{bonus}) {
--            my($fmt_top, $fmt) = _create_fmts("Passed TODO",$todo_passed);
--            # Now write to formats
--            $out .= swrite( $fmt_top );
--            for my $script (sort keys %{$todo_passed||{}}) {
--                my $Curtest = $todo_passed->{$script};
--                $out .= swrite( $fmt, @{ $Curtest }{qw(name estat wstat max failed canon)} );
--            }
--        }
--    }
--    elsif (!$tot->{tests}){
--        die "FAILED--no tests were run for some reason.\n";
--    }
--    elsif (!$tot->{max}) {
--        my $blurb = $tot->{tests}==1 ? "script" : "scripts";
--        die "FAILED--$tot->{tests} test $blurb could be run, ".
--            "alas--no output ever seen\n";
--    }
--    else {
--        my $subresults = sprintf( " %d/%d subtests failed.",
--                              $tot->{max} - $tot->{ok}, $tot->{max} );
--
--        my($fmt_top, $fmt1, $fmt2) = _create_fmts("Failed Test",$failedtests);
--
--        # Now write to formats
--        $out .= swrite( $fmt_top );
--        for my $script (sort keys %$failedtests) {
--            my $Curtest = $failedtests->{$script};
--            $out .= swrite( $fmt1, @{ $Curtest }{qw(name estat wstat max failed canon)} );
--            $out .= swrite( $fmt2, $Curtest->{canon} );
--        }
--        if ($tot->{bad}) {
--            $bonusmsg =~ s/^,\s*//;
--            $out .= "$bonusmsg.\n" if $bonusmsg;
--            $out .= "Failed $tot->{bad}/$tot->{tests} test scripts.$subresults\n";
--        }
--    }
--
--    $out .= sprintf("Files=%d, Tests=%d, %s\n",
--           $tot->{files}, $tot->{max}, timestr($tot->{bench}, 'nop'));
--    return $out;
--}
--
--sub swrite {
--    my $format = shift;
--    $^A = '';
--    formline($format,@_);
--    my $out = $^A;
--    $^A = '';
--    return $out;
--}
--
--
--my %Handlers = (
--    header  => \&header_handler,
--    test    => \&test_handler,
--    bailout => \&bailout_handler,
--);
--
--$Strap->set_callback(\&strap_callback);
--sub strap_callback {
--    my($self, $line, $type, $totals) = @_;
--    print $line if $Verbose;
--
--    my $meth = $Handlers{$type};
--    $meth->($self, $line, $type, $totals) if $meth;
--};
--
--
--sub header_handler {
--    my($self, $line, $type, $totals) = @_;
--
--    warn "Test header seen more than once!\n" if $self->{_seen_header};
--
--    $self->{_seen_header}++;
--
--    warn "1..M can only appear at the beginning or end of tests\n"
--      if $totals->seen && ($totals->max < $totals->seen);
--};
--
--sub test_handler {
--    my($self, $line, $type, $totals) = @_;
--
--    my $curr = $totals->seen;
--    my $next = $self->{'next'};
--    my $max  = $totals->max;
--    my $detail = $totals->details->[-1];
--
--    if( $detail->{ok} ) {
--        _print_ml_less("ok $curr/$max");
--
--        if( $detail->{type} eq 'skip' ) {
--            $totals->set_skip_reason( $detail->{reason} )
--              unless defined $totals->skip_reason;
--            $totals->set_skip_reason( 'various reasons' )
--              if $totals->skip_reason ne $detail->{reason};
--        }
--    }
--    else {
--        _print_ml("NOK $curr/$max");
--    }
--
--    if( $curr > $next ) {
--        print "Test output counter mismatch [test $curr]\n";
--    }
--    elsif( $curr < $next ) {
--        print "Confused test output: test $curr answered after ".
--              "test ", $next - 1, "\n";
--    }
--
--};
--
--sub bailout_handler {
--    my($self, $line, $type, $totals) = @_;
--
--    die "FAILED--Further testing stopped" .
--      ($self->{bailout_reason} ? ": $self->{bailout_reason}\n" : ".\n");
--};
--
--
--sub _print_ml {
--    print join '', $ML, @_ if $ML;
--}
--
--
--# Print updates only once per second.
--sub _print_ml_less {
--    my $now = CORE::time;
--    if ( $Last_ML_Print != $now ) {
--        _print_ml(@_);
--        $Last_ML_Print = $now;
--    }
--}
--
--sub _bonusmsg {
--    my($tot) = @_;
--
--    my $bonusmsg = '';
--    $bonusmsg = (" ($tot->{bonus} subtest".($tot->{bonus} > 1 ? 's' : '').
--               " UNEXPECTEDLY SUCCEEDED)")
--        if $tot->{bonus};
--
--    if ($tot->{skipped}) {
--        $bonusmsg .= ", $tot->{skipped} test"
--                     . ($tot->{skipped} != 1 ? 's' : '');
--        if ($tot->{sub_skipped}) {
--            $bonusmsg .= " and $tot->{sub_skipped} subtest"
--                         . ($tot->{sub_skipped} != 1 ? 's' : '');
--        }
--        $bonusmsg .= ' skipped';
--    }
--    elsif ($tot->{sub_skipped}) {
--        $bonusmsg .= ", $tot->{sub_skipped} subtest"
--                     . ($tot->{sub_skipped} != 1 ? 's' : '')
--                     . " skipped";
--    }
--    return $bonusmsg;
--}
--
--# Test program go boom.
--sub _dubious_return {
--    my($test, $tot, $estatus, $wstatus) = @_;
--
--    my $failed = '??';
--    my $canon  = '??';
--
--    printf "$test->{ml}dubious\n\tTest returned status $estatus ".
--           "(wstat %d, 0x%x)\n",
--           $wstatus,$wstatus;
--    print "\t\t(VMS status is $estatus)\n" if $^O eq 'VMS';
--
--    $tot->{bad}++;
--
--    if ($test->{max}) {
--        if ($test->{'next'} == $test->{max} + 1 and not @{$test->{failed}}) {
--            print "\tafter all the subtests completed successfully\n";
--            $failed = 0;        # But we do not set $canon!
--        }
--        else {
--            push @{$test->{failed}}, $test->{'next'}..$test->{max};
--            $failed = @{$test->{failed}};
--            (my $txt, $canon) = _canondetail($test->{max},$test->{skipped},'Failed',@{$test->{failed}});
--            print "DIED. ",$txt;
--        }
--    }
--
--    return { canon => $canon,  max => $test->{max} || '??',
--             failed => $failed, 
--             estat => $estatus, wstat => $wstatus,
--           };
--}
--
--
--sub _create_fmts {
--    my $failed_str = shift;
--    my $failedtests = shift;
--
--    my ($type) = split /\s/,$failed_str;
--    my $short = substr($type,0,4);
--    my $total = $short eq 'Pass' ? 'TODOs' : 'Total';
--    my $middle_str = " Stat Wstat $total $short  ";
--    my $list_str = "List of $type";
--
--    # Figure out our longest name string for formatting purposes.
--    my $max_namelen = length($failed_str);
--    foreach my $script (keys %$failedtests) {
--        my $namelen = length $failedtests->{$script}->{name};
--        $max_namelen = $namelen if $namelen > $max_namelen;
--    }
--
--    my $list_len = $Columns - length($middle_str) - $max_namelen;
--    if ($list_len < length($list_str)) {
--        $list_len = length($list_str);
--        $max_namelen = $Columns - length($middle_str) - $list_len;
--        if ($max_namelen < length($failed_str)) {
--            $max_namelen = length($failed_str);
--            $Columns = $max_namelen + length($middle_str) + $list_len;
--        }
--    }
--
--    my $fmt_top =   sprintf("%-${max_namelen}s", $failed_str)
--                  . $middle_str
--                  . $list_str . "\n"
--                  . "-" x $Columns
--                  . "\n";
--
--    my $fmt1 =  "@" . "<" x ($max_namelen - 1)
--              . "  @>> @>>>> @>>>> @>>>  "
--              . "^" . "<" x ($list_len - 1) . "\n";
--    my $fmt2 =  "~~" . " " x ($Columns - $list_len - 2) . "^"
--              . "<" x ($list_len - 1) . "\n";
--
--    return($fmt_top, $fmt1, $fmt2);
--}
--
--sub _canondetail {
--    my $max = shift;
--    my $skipped = shift;
--    my $type = shift;
--    my @detail = @_;
--    my %seen;
--    @detail = sort {$a <=> $b} grep !$seen{$_}++, @detail;
--    my $detail = @detail;
--    my @result = ();
--    my @canon = ();
--    my $min;
--    my $last = $min = shift @detail;
--    my $canon;
--    my $uc_type = uc($type);
--    if (@detail) {
--        for (@detail, $detail[-1]) { # don't forget the last one
--            if ($_ > $last+1 || $_ == $last) {
--                push @canon, ($min == $last) ? $last : "$min-$last";
--                $min = $_;
--            }
--            $last = $_;
--        }
--        local $" = ", ";
--        push @result, "$uc_type tests @canon\n";
--        $canon = join ' ', @canon;
--    }
--    else {
--        push @result, "$uc_type test $last\n";
--        $canon = $last;
--    }
--
--    return (join("", @result), $canon)
--        if $type=~/todo/i;
--    push @result, "\t$type $detail/$max tests, ";
--    if ($max) {
--	push @result, sprintf("%.2f",100*(1-$detail/$max)), "% okay";
--    }
--    else {
--	push @result, "?% okay";
--    }
--    my $ender = 's' x ($skipped > 1);
--    if ($skipped) {
--        my $good = $max - $detail - $skipped;
--	my $skipmsg = " (less $skipped skipped test$ender: $good okay, ";
--	if ($max) {
--	    my $goodper = sprintf("%.2f",100*($good/$max));
--	    $skipmsg .= "$goodper%)";
--        }
--        else {
--	    $skipmsg .= "?%)";
--	}
--	push @result, $skipmsg;
--    }
--    push @result, "\n";
--    my $txt = join "", @result;
--    return ($txt, $canon);
--}
--
- 1;
- __END__
- 
--
- =head1 EXPORT
- 
--C<&runtests> is exported by Test::Harness by default.
-+C<&runtests> is exported by C<Test::Harness> by default.
- 
- C<&execute_tests>, C<$verbose>, C<$switches> and C<$debug> are
- exported upon request.
- 
--=head1 DIAGNOSTICS
--
--=over 4
--
--=item C<All tests successful.\nFiles=%d,  Tests=%d, %s>
--
--If all tests are successful some statistics about the performance are
--printed.
--
--=item C<FAILED tests %s\n\tFailed %d/%d tests, %.2f%% okay.>
--
--For any single script that has failing subtests statistics like the
--above are printed.
--
--=item C<Test returned status %d (wstat %d)>
--
--Scripts that return a non-zero exit status, both C<$? E<gt>E<gt> 8>
--and C<$?> are printed in a message similar to the above.
-+=head1 ENVIRONMENT VARIABLES THAT TAP::HARNESS::COMPATIBLE SETS
- 
--=item C<Failed 1 test, %.2f%% okay. %s>
--
--=item C<Failed %d/%d tests, %.2f%% okay. %s>
--
--If not all tests were successful, the script dies with one of the
--above messages.
--
--=item C<FAILED--Further testing stopped: %s>
--
--If a single subtest decides that further testing will not make sense,
--the script dies with this message.
--
--=back
--
--=head1 ENVIRONMENT VARIABLES THAT TEST::HARNESS SETS
--
--Test::Harness sets these before executing the individual tests.
-+C<Test::Harness> sets these before executing the individual tests.
- 
- =over 4
- 
-@@ -944,7 +500,7 @@
- 
- =item C<HARNESS_VERSION>
- 
--This is the version of Test::Harness.
-+This is the version of C<Test::Harness>.
- 
- =back
- 
-@@ -952,61 +508,6 @@
- 
- =over 4
- 
--=item C<HARNESS_COLUMNS>
--
--This value will be used for the width of the terminal. If it is not
--set then it will default to C<COLUMNS>. If this is not set, it will
--default to 80. Note that users of Bourne-sh based shells will need to
--C<export COLUMNS> for this module to use that variable.
--
--=item C<HARNESS_COMPILE_TEST>
--
--When true it will make harness attempt to compile the test using
--C<perlcc> before running it.
--
--B<NOTE> This currently only works when sitting in the perl source
--directory!
--
--=item C<HARNESS_DEBUG>
--
--If true, Test::Harness will print debugging information about itself as
--it runs the tests.  This is different from C<HARNESS_VERBOSE>, which prints
--the output from the test being run.  Setting C<$Test::Harness::Debug> will
--override this, or you can use the C<-d> switch in the F<prove> utility.
--
--=item C<HARNESS_FILELEAK_IN_DIR>
--
--When set to the name of a directory, harness will check after each
--test whether new files appeared in that directory, and report them as
--
--  LEAKED FILES: scr.tmp 0 my.db
--
--If relative, directory name is with respect to the current directory at
--the moment runtests() was called.  Putting absolute path into 
--C<HARNESS_FILELEAK_IN_DIR> may give more predictable results.
--
--=item C<HARNESS_NOTTY>
--
--When set to a true value, forces it to behave as though STDOUT were
--not a console.  You may need to set this if you don't want harness to
--output more frequent progress messages using carriage returns.  Some
--consoles may not handle carriage returns properly (which results in a
--somewhat messy output).
--
--=item C<HARNESS_PERL>
--
--Usually your tests will be run by C<$^X>, the currently-executing Perl.
--However, you may want to have it run by a different executable, such as
--a threading perl, or a different version.
--
--If you're using the F<prove> utility, you can use the C<--perl> switch.
--
--=item C<HARNESS_PERL_SWITCHES>
--
--Its value will be prepended to the switches used to invoke perl on
--each test.  For example, setting C<HARNESS_PERL_SWITCHES> to C<-W> will
--run all tests with all warnings enabled.
--
- =item C<HARNESS_TIMER>
- 
- Setting this to true will make the harness display the number of
-@@ -1015,155 +516,72 @@
- 
- =item C<HARNESS_VERBOSE>
- 
--If true, Test::Harness will output the verbose results of running
--its tests.  Setting C<$Test::Harness::verbose> will override this,
--or you can use the C<-v> switch in the F<prove> utility.
--
--If true, Test::Harness will output the verbose results of running
-+If true, C<Test::Harness> will output the verbose results of running
- its tests.  Setting C<$Test::Harness::verbose> will override this,
- or you can use the C<-v> switch in the F<prove> utility.
- 
--=item C<HARNESS_STRAP_CLASS>
-+=item C<HARNESS_OPTIONS>
- 
--Defines the Test::Harness::Straps subclass to use.  The value may either
--be a filename or a class name.
-+Provide additional options to the harness. Currently supported options are:
- 
--If HARNESS_STRAP_CLASS is a class name, the class must be in C<@INC>
--like any other class.
-+=over
- 
--If HARNESS_STRAP_CLASS is a filename, the .pm file must return the name
--of the class, instead of the canonical "1".
-+=item C<< j<n> >>
- 
--=back
--
--=head1 EXAMPLE
--
--Here's how Test::Harness tests itself
--
--  $ cd ~/src/devel/Test-Harness
--  $ perl -Mblib -e 'use Test::Harness qw(&runtests $verbose);
--    $verbose=0; runtests @ARGV;' t/*.t
--  Using /home/schwern/src/devel/Test-Harness/blib
--  t/base..............ok
--  t/nonumbers.........ok
--  t/ok................ok
--  t/test-harness......ok
--  All tests successful.
--  Files=4, Tests=24, 2 wallclock secs ( 0.61 cusr + 0.41 csys = 1.02 CPU)
--
--=head1 SEE ALSO
--
--The included F<prove> utility for running test scripts from the command line,
--L<Test> and L<Test::Simple> for writing test scripts, L<Benchmark> for
--the underlying timing routines, and L<Devel::Cover> for test coverage
--analysis.
--
--=head1 TODO
--
--Provide a way of running tests quietly (ie. no printing) for automated
--validation of tests.  This will probably take the form of a version
--of runtests() which rather than printing its output returns raw data
--on the state of the tests.  (Partially done in Test::Harness::Straps)
--
--Document the format.
-+Run <n> (default 9) parallel jobs.
- 
--Fix HARNESS_COMPILE_TEST without breaking its core usage.
-+=item C<< f >>
- 
--Figure a way to report test names in the failure summary.
-+Use forked parallelism.
- 
--Rework the test summary so long test names are not truncated as badly.
--(Partially done with new skip test styles)
--
--Add option for coverage analysis.
--
--Trap STDERR.
--
--Implement Straps total_results()
--
--Remember exit code
--
--Completely redo the print summary code.
-+=back
- 
--Straps->analyze_file() not taint clean, don't know if it can be
-+Multiple options may be separated by colons:
- 
--Fix that damned VMS nit.
-+    HARNESS_OPTIONS=j9:f make test
- 
--Add a test for verbose.
-+=back
- 
--Change internal list of test results to a hash.
-+=head1 Taint Mode
- 
--Fix stats display when there's an overrun.
-+Normally when a Perl program is run in taint mode the contents of the
-+C<PERL5LIB> environment variable do not appear in C<@INC>.
- 
--Fix so perls with spaces in the filename work.
-+Because C<PERL5LIB> is often used during testing to add build
-+directories to C<@INC> C<Test::Harness> (actually
-+L<TAP::Parser::Source::Perl>) passes the names of any directories found
-+in C<PERL5LIB> as -I switches. The net effect of this is that
-+C<PERL5LIB> is honoured even in taint mode.
- 
--Keeping whittling away at _run_all_tests()
-+=head1 SEE ALSO
- 
--Clean up how the summary is printed.  Get rid of those damned formats.
-+L<TAP::Harness>
- 
- =head1 BUGS
- 
- Please report any bugs or feature requests to
- C<bug-test-harness at rt.cpan.org>, or through the web interface at
--L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Test-Harness>.
--I will be notified, and then you'll automatically be notified of progress on
--your bug as I make changes.
--
--=head1 SUPPORT
--
--You can find documentation for this module with the F<perldoc> command.
--
--    perldoc Test::Harness
--
--You can get docs for F<prove> with
--
--    prove --man
--
--You can also look for information at:
--
--=over 4
--
--=item * AnnoCPAN: Annotated CPAN documentation
--
--L<http://annocpan.org/dist/Test-Harness>
--
--=item * CPAN Ratings
--
--L<http://cpanratings.perl.org/d/Test-Harness>
--
--=item * RT: CPAN's request tracker
--
--L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=Test-Harness>
--
--=item * Search CPAN
--
--L<http://search.cpan.org/dist/Test-Harness>
--
--=back
--
--=head1 SOURCE CODE
--
--The source code repository for Test::Harness is at
--L<http://svn.perl.org/modules/Test-Harness>.
-+L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Test-Harness>.  I will be 
-+notified, and then you'll automatically be notified of progress on your bug 
-+as I make changes.
- 
- =head1 AUTHORS
- 
--Either Tim Bunce or Andreas Koenig, we don't know. What we know for
--sure is, that it was inspired by Larry Wall's F<TEST> script that came
--with perl distributions for ages. Numerous anonymous contributors
--exist.  Andreas Koenig held the torch for many years, and then
--Michael G Schwern.
-+Andy Armstrong  C<< <andy@hexten.net> >>
- 
--Current maintainer is Andy Lester C<< <andy at petdance.com> >>.
-+L<Test::Harness> 2.64 (maintained by Andy Lester and on which this
-+module is based) has this attribution:
- 
--=head1 COPYRIGHT
-+    Either Tim Bunce or Andreas Koenig, we don't know. What we know for
-+    sure is, that it was inspired by Larry Wall's F<TEST> script that came
-+    with perl distributions for ages. Numerous anonymous contributors
-+    exist.  Andreas Koenig held the torch for many years, and then
-+    Michael G Schwern.
- 
--Copyright 2002-2006
--by Michael G Schwern C<< <schwern at pobox.com> >>,
--Andy Lester C<< <andy at petdance.com> >>.
-+=head1 LICENCE AND COPYRIGHT
- 
--This program is free software; you can redistribute it and/or 
--modify it under the same terms as Perl itself.
-+Copyright (c) 2007-2008, Andy Armstrong C<< <andy@hexten.net> >>. All rights reserved.
- 
--See L<http://www.perl.com/perl/misc/Artistic.html>.
-+This module is free software; you can redistribute it and/or
-+modify it under the same terms as Perl itself. See L<perlartistic>.
- 
--=cut
diff --git a/perl-update-Test-Simple.patch b/perl-update-Test-Simple.patch
deleted file mode 100644
index 87b34fe..0000000
--- a/perl-update-Test-Simple.patch
+++ /dev/null
@@ -1,8177 +0,0 @@
-Update to 0.92; patch by Iain Arnell <iarnell@gmail.com> (BZ#519417)
-
-diff -urN perl-5.10.0.orig/lib/Test/Builder/Module.pm perl-5.10.0/lib/Test/Builder/Module.pm
---- perl-5.10.0.orig/lib/Test/Builder/Module.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Module.pm	2009-08-26 06:14:11.000000000 +0200
-@@ -1,24 +1,24 @@
- package Test::Builder::Module;
- 
-+use strict;
-+
- use Test::Builder;
- 
- require Exporter;
--@ISA = qw(Exporter);
-+our @ISA = qw(Exporter);
- 
--$VERSION = '0.72';
--
--use strict;
-+our $VERSION = '0.92';
-+$VERSION = eval $VERSION;      ## no critic (BuiltinFunctions::ProhibitStringyEval)
- 
- # 5.004's Exporter doesn't have export_to_level.
- my $_export_to_level = sub {
--      my $pkg = shift;
--      my $level = shift;
--      (undef) = shift;                  # redundant arg
--      my $callpkg = caller($level);
--      $pkg->export($callpkg, @_);
-+    my $pkg   = shift;
-+    my $level = shift;
-+    (undef) = shift;    # redundant arg
-+    my $callpkg = caller($level);
-+    $pkg->export( $callpkg, @_ );
- };
- 
--
- =head1 NAME
- 
- Test::Builder::Module - Base class for test modules
-@@ -84,33 +84,35 @@
- sub import {
-     my($class) = shift;
- 
-+    # Don't run all this when loading ourself.
-+    return 1 if $class eq 'Test::Builder::Module';
-+
-     my $test = $class->builder;
- 
-     my $caller = caller;
- 
-     $test->exported_to($caller);
- 
--    $class->import_extra(\@_);
--    my(@imports) = $class->_strip_imports(\@_);
-+    $class->import_extra( \@_ );
-+    my(@imports) = $class->_strip_imports( \@_ );
- 
-     $test->plan(@_);
- 
--    $class->$_export_to_level(1, $class, @imports);
-+    $class->$_export_to_level( 1, $class, @imports );
- }
- 
--
- sub _strip_imports {
-     my $class = shift;
-     my $list  = shift;
- 
-     my @imports = ();
-     my @other   = ();
--    my $idx = 0;
-+    my $idx     = 0;
-     while( $idx <= $#{$list} ) {
-         my $item = $list->[$idx];
- 
-         if( defined $item and $item eq 'import' ) {
--            push @imports, @{$list->[$idx+1]};
-+            push @imports, @{ $list->[ $idx + 1 ] };
-             $idx++;
-         }
-         else {
-@@ -125,7 +127,6 @@
-     return @imports;
- }
- 
--
- =head3 import_extra
- 
-     Your::Module->import_extra(\@import_args);
-@@ -143,8 +144,7 @@
- 
- =cut
- 
--sub import_extra {}
--
-+sub import_extra { }
- 
- =head2 Builder
- 
-@@ -178,5 +178,4 @@
-     return Test::Builder->new;
- }
- 
--
- 1;
-diff -urN perl-5.10.0.orig/lib/Test/Builder/Tester/Color.pm perl-5.10.0/lib/Test/Builder/Tester/Color.pm
---- perl-5.10.0.orig/lib/Test/Builder/Tester/Color.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Tester/Color.pm	2009-08-26 06:14:11.000000000 +0200
-@@ -1,9 +1,11 @@
- package Test::Builder::Tester::Color;
- 
- use strict;
-+our $VERSION = "1.18";
- 
- require Test::Builder::Tester;
- 
-+
- =head1 NAME
- 
- Test::Builder::Tester::Color - turn on colour in Test::Builder::Tester
-@@ -25,8 +27,7 @@
- 
- =cut
- 
--sub import
--{
-+sub import {
-     Test::Builder::Tester::color(1);
- }
- 
-diff -urN perl-5.10.0.orig/lib/Test/Builder/Tester.pm perl-5.10.0/lib/Test/Builder/Tester.pm
---- perl-5.10.0.orig/lib/Test/Builder/Tester.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Tester.pm	2009-08-26 06:14:11.000000000 +0200
-@@ -1,8 +1,7 @@
- package Test::Builder::Tester;
- 
- use strict;
--use vars qw(@EXPORT $VERSION @ISA);
--$VERSION = "1.09";
-+our $VERSION = "1.18";
- 
- use Test::Builder;
- use Symbol;
-@@ -56,21 +55,20 @@
- ###
- 
- use Exporter;
--@ISA = qw(Exporter);
-+our @ISA = qw(Exporter);
- 
--@EXPORT = qw(test_out test_err test_fail test_diag test_test line_num);
-+our @EXPORT = qw(test_out test_err test_fail test_diag test_test line_num);
- 
- # _export_to_level and import stolen directly from Test::More.  I am
- # the king of cargo cult programming ;-)
- 
- # 5.004's Exporter doesn't have export_to_level.
--sub _export_to_level
--{
--      my $pkg = shift;
--      my $level = shift;
--      (undef) = shift;                  # XXX redundant arg
--      my $callpkg = caller($level);
--      $pkg->export($callpkg, @_);
-+sub _export_to_level {
-+    my $pkg   = shift;
-+    my $level = shift;
-+    (undef) = shift;    # XXX redundant arg
-+    my $callpkg = caller($level);
-+    $pkg->export( $callpkg, @_ );
- }
- 
- sub import {
-@@ -83,14 +81,14 @@
-     $t->plan(@plan);
- 
-     my @imports = ();
--    foreach my $idx (0..$#plan) {
-+    foreach my $idx ( 0 .. $#plan ) {
-         if( $plan[$idx] eq 'import' ) {
--            @imports = @{$plan[$idx+1]};
-+            @imports = @{ $plan[ $idx + 1 ] };
-             last;
-         }
-     }
- 
--    __PACKAGE__->_export_to_level(1, __PACKAGE__, @imports);
-+    __PACKAGE__->_export_to_level( 1, __PACKAGE__, @imports );
- }
- 
- ###
-@@ -124,8 +122,7 @@
- my $original_harness_env;
- 
- # function that starts testing and redirects the filehandles for now
--sub _start_testing
--{
-+sub _start_testing {
-     # even if we're running under Test::Harness pretend we're not
-     # for now.  This needed so Test::Builder doesn't add extra spaces
-     $original_harness_env = $ENV{HARNESS_ACTIVE} || 0;
-@@ -146,7 +143,7 @@
-     $err->reset();
- 
-     # remeber that we're testing
--    $testing = 1;
-+    $testing     = 1;
-     $testing_num = $t->current_test;
-     $t->current_test(0);
- 
-@@ -188,20 +185,18 @@
- 
- =cut
- 
--sub test_out(@)
--{
-+sub test_out {
-     # do we need to do any setup?
-     _start_testing() unless $testing;
- 
--    $out->expect(@_)
-+    $out->expect(@_);
- }
- 
--sub test_err(@)
--{
-+sub test_err {
-     # do we need to do any setup?
-     _start_testing() unless $testing;
- 
--    $err->expect(@_)
-+    $err->expect(@_);
- }
- 
- =item test_fail
-@@ -230,14 +225,13 @@
- 
- =cut
- 
--sub test_fail
--{
-+sub test_fail {
-     # do we need to do any setup?
-     _start_testing() unless $testing;
- 
-     # work out what line we should be on
--    my ($package, $filename, $line) = caller;
--    $line = $line + (shift() || 0); # prevent warnings
-+    my( $package, $filename, $line ) = caller;
-+    $line = $line + ( shift() || 0 );    # prevent warnings
- 
-     # expect that on stderr
-     $err->expect("#     Failed test ($0 at line $line)");
-@@ -273,14 +267,13 @@
- 
- =cut
- 
--sub test_diag
--{
-+sub test_diag {
-     # do we need to do any setup?
-     _start_testing() unless $testing;
- 
-     # expect the same thing, but prepended with "#     "
-     local $_;
--    $err->expect(map {"# $_"} @_)
-+    $err->expect( map { "# $_" } @_ );
- }
- 
- =item test_test
-@@ -322,24 +315,23 @@
- 
- =cut
- 
--sub test_test
--{
--   # decode the arguements as described in the pod
--   my $mess;
--   my %args;
--   if (@_ == 1)
--     { $mess = shift }
--   else
--   {
--     %args = @_;
--     $mess = $args{name} if exists($args{name});
--     $mess = $args{title} if exists($args{title});
--     $mess = $args{label} if exists($args{label});
--   }
-+sub test_test {
-+    # decode the arguements as described in the pod
-+    my $mess;
-+    my %args;
-+    if( @_ == 1 ) {
-+        $mess = shift
-+    }
-+    else {
-+        %args = @_;
-+        $mess = $args{name} if exists( $args{name} );
-+        $mess = $args{title} if exists( $args{title} );
-+        $mess = $args{label} if exists( $args{label} );
-+    }
- 
-     # er, are we testing?
-     croak "Not testing.  You must declare output with a test function first."
--	unless $testing;
-+      unless $testing;
- 
-     # okay, reconnect the test suite back to the saved handles
-     $t->output($original_output_handle);
-@@ -354,20 +346,20 @@
-     $ENV{HARNESS_ACTIVE} = $original_harness_env;
- 
-     # check the output we've stashed
--    unless ($t->ok(    ($args{skip_out} || $out->check)
--                    && ($args{skip_err} || $err->check),
--                   $mess))
-+    unless( $t->ok( ( $args{skip_out} || $out->check ) &&
-+                    ( $args{skip_err} || $err->check ), $mess ) 
-+    )
-     {
--      # print out the diagnostic information about why this
--      # test failed
-+        # print out the diagnostic information about why this
-+        # test failed
- 
--      local $_;
-+        local $_;
- 
--      $t->diag(map {"$_\n"} $out->complaint)
--	unless $args{skip_out} || $out->check;
-+        $t->diag( map { "$_\n" } $out->complaint )
-+          unless $args{skip_out} || $out->check;
- 
--      $t->diag(map {"$_\n"} $err->complaint)
--	unless $args{skip_err} || $err->check;
-+        $t->diag( map { "$_\n" } $err->complaint )
-+          unless $args{skip_err} || $err->check;
-     }
- }
- 
-@@ -383,10 +375,9 @@
- 
- =cut
- 
--sub line_num
--{
--    my ($package, $filename, $line) = caller;
--    return $line + (shift() || 0); # prevent warnings
-+sub line_num {
-+    my( $package, $filename, $line ) = caller;
-+    return $line + ( shift() || 0 );    # prevent warnings
- }
- 
- =back
-@@ -432,10 +423,10 @@
- =cut
- 
- my $color;
--sub color
--{
--  $color = shift if @_;
--  $color;
-+
-+sub color {
-+    $color = shift if @_;
-+    $color;
- }
- 
- =back
-@@ -490,21 +481,18 @@
- ##
- # add line(s) to be expected
- 
--sub expect
--{
-+sub expect {
-     my $self = shift;
- 
-     my @checks = @_;
-     foreach my $check (@checks) {
-         $check = $self->_translate_Failed_check($check);
--        push @{$self->{wanted}}, ref $check ? $check : "$check\n";
-+        push @{ $self->{wanted} }, ref $check ? $check : "$check\n";
-     }
- }
- 
--
--sub _translate_Failed_check
--{
--    my($self, $check) = @_;
-+sub _translate_Failed_check {
-+    my( $self, $check ) = @_;
- 
-     if( $check =~ /\A(.*)#     (Failed .*test) \((.*?) at line (\d+)\)\Z(?!\n)/ ) {
-         $check = "/\Q$1\E#\\s+\Q$2\E.*?\\n?.*?\Qat $3\E line \Q$4\E.*\\n?/";
-@@ -513,21 +501,19 @@
-     return $check;
- }
- 
--
- ##
- # return true iff the expected data matches the got data
- 
--sub check
--{
-+sub check {
-     my $self = shift;
- 
-     # turn off warnings as these might be undef
-     local $^W = 0;
- 
--    my @checks = @{$self->{wanted}};
--    my $got = $self->{got};
-+    my @checks = @{ $self->{wanted} };
-+    my $got    = $self->{got};
-     foreach my $check (@checks) {
--        $check = "\Q$check\E" unless ($check =~ s,^/(.*)/$,$1, or ref $check);
-+        $check = "\Q$check\E" unless( $check =~ s,^/(.*)/$,$1, or ref $check );
-         return 0 unless $got =~ s/^$check//;
-     }
- 
-@@ -538,82 +524,71 @@
- # a complaint message about the inputs not matching (to be
- # used for debugging messages)
- 
--sub complaint
--{
--    my $self = shift;
-+sub complaint {
-+    my $self   = shift;
-     my $type   = $self->type;
-     my $got    = $self->got;
--    my $wanted = join "\n", @{$self->wanted};
-+    my $wanted = join "\n", @{ $self->wanted };
- 
-     # are we running in colour mode?
--    if (Test::Builder::Tester::color)
--    {
--      # get color
--      eval "require Term::ANSIColor";
--      unless ($@)
--      {
--	# colours
--
--	my $green = Term::ANSIColor::color("black").
--	            Term::ANSIColor::color("on_green");
--        my $red   = Term::ANSIColor::color("black").
--                    Term::ANSIColor::color("on_red");
--	my $reset = Term::ANSIColor::color("reset");
--
--	# work out where the two strings start to differ
--	my $char = 0;
--	$char++ while substr($got, $char, 1) eq substr($wanted, $char, 1);
--
--	# get the start string and the two end strings
--	my $start     = $green . substr($wanted, 0,   $char);
--	my $gotend    = $red   . substr($got   , $char) . $reset;
--	my $wantedend = $red   . substr($wanted, $char) . $reset;
--
--	# make the start turn green on and off
--	$start =~ s/\n/$reset\n$green/g;
--
--	# make the ends turn red on and off
--	$gotend    =~ s/\n/$reset\n$red/g;
--	$wantedend =~ s/\n/$reset\n$red/g;
--
--	# rebuild the strings
--	$got    = $start . $gotend;
--	$wanted = $start . $wantedend;
--      }
-+    if(Test::Builder::Tester::color) {
-+        # get color
-+        eval { require Term::ANSIColor };
-+        unless($@) {
-+            # colours
-+
-+            my $green = Term::ANSIColor::color("black") . Term::ANSIColor::color("on_green");
-+            my $red   = Term::ANSIColor::color("black") . Term::ANSIColor::color("on_red");
-+            my $reset = Term::ANSIColor::color("reset");
-+
-+            # work out where the two strings start to differ
-+            my $char = 0;
-+            $char++ while substr( $got, $char, 1 ) eq substr( $wanted, $char, 1 );
-+
-+            # get the start string and the two end strings
-+            my $start = $green . substr( $wanted, 0, $char );
-+            my $gotend    = $red . substr( $got,    $char ) . $reset;
-+            my $wantedend = $red . substr( $wanted, $char ) . $reset;
-+
-+            # make the start turn green on and off
-+            $start =~ s/\n/$reset\n$green/g;
-+
-+            # make the ends turn red on and off
-+            $gotend    =~ s/\n/$reset\n$red/g;
-+            $wantedend =~ s/\n/$reset\n$red/g;
-+
-+            # rebuild the strings
-+            $got    = $start . $gotend;
-+            $wanted = $start . $wantedend;
-+        }
-     }
- 
--    return "$type is:\n" .
--           "$got\nnot:\n$wanted\nas expected"
-+    return "$type is:\n" . "$got\nnot:\n$wanted\nas expected";
- }
- 
- ##
- # forget all expected and got data
- 
--sub reset
--{
-+sub reset {
-     my $self = shift;
-     %$self = (
--              type   => $self->{type},
--              got    => '',
--              wanted => [],
--             );
-+        type   => $self->{type},
-+        got    => '',
-+        wanted => [],
-+    );
- }
- 
--
--sub got
--{
-+sub got {
-     my $self = shift;
-     return $self->{got};
- }
- 
--sub wanted
--{
-+sub wanted {
-     my $self = shift;
-     return $self->{wanted};
- }
- 
--sub type
--{
-+sub type {
-     my $self = shift;
-     return $self->{type};
- }
-@@ -622,26 +597,24 @@
- # tie interface
- ###
- 
--sub PRINT  {
-+sub PRINT {
-     my $self = shift;
-     $self->{got} .= join '', @_;
- }
- 
- sub TIEHANDLE {
--    my($class, $type) = @_;
-+    my( $class, $type ) = @_;
- 
--    my $self = bless {
--                   type => $type
--               }, $class;
-+    my $self = bless { type => $type }, $class;
- 
-     $self->reset;
- 
-     return $self;
- }
- 
--sub READ {}
--sub READLINE {}
--sub GETC {}
--sub FILENO {}
-+sub READ     { }
-+sub READLINE { }
-+sub GETC     { }
-+sub FILENO   { }
- 
- 1;
-diff -urN perl-5.10.0.orig/lib/Test/Builder.pm perl-5.10.0/lib/Test/Builder.pm
---- perl-5.10.0.orig/lib/Test/Builder.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder.pm	2009-08-26 06:14:11.000000000 +0200
-@@ -1,25 +1,28 @@
- package Test::Builder;
- 
--use 5.004;
-+use 5.006;
-+use strict;
-+use warnings;
- 
--# $^C was only introduced in 5.005-ish.  We do this to prevent
--# use of uninitialized value warnings in older perls.
--$^C ||= 0;
-+our $VERSION = '0.92';
-+$VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
-+
-+BEGIN {
-+    if( $] < 5.008 ) {
-+        require Test::Builder::IO::Scalar;
-+    }
-+}
- 
--use strict;
--use vars qw($VERSION);
--$VERSION = '0.72';
--$VERSION = eval $VERSION;    # make the alpha version come out as a number
- 
- # Make Test::Builder thread-safe for ithreads.
- BEGIN {
-     use Config;
-     # Load threads::shared when threads are turned on.
-     # 5.8.0's threads are so busted we no longer support them.
--    if( $] >= 5.008001 && $Config{useithreads} && $INC{'threads.pm'}) {
-+    if( $] >= 5.008001 && $Config{useithreads} && $INC{'threads.pm'} ) {
-         require threads::shared;
- 
--        # Hack around YET ANOTHER threads::shared bug.  It would 
-+        # Hack around YET ANOTHER threads::shared bug.  It would
-         # occassionally forget the contents of the variable when sharing it.
-         # So we first copy the data, then share, then put our copy back.
-         *share = sub (\[$@%]) {
-@@ -27,31 +30,31 @@
-             my $data;
- 
-             if( $type eq 'HASH' ) {
--                %$data = %{$_[0]};
-+                %$data = %{ $_[0] };
-             }
-             elsif( $type eq 'ARRAY' ) {
--                @$data = @{$_[0]};
-+                @$data = @{ $_[0] };
-             }
-             elsif( $type eq 'SCALAR' ) {
--                $$data = ${$_[0]};
-+                $$data = ${ $_[0] };
-             }
-             else {
--                die("Unknown type: ".$type);
-+                die( "Unknown type: " . $type );
-             }
- 
--            $_[0] = &threads::shared::share($_[0]);
-+            $_[0] = &threads::shared::share( $_[0] );
- 
-             if( $type eq 'HASH' ) {
--                %{$_[0]} = %$data;
-+                %{ $_[0] } = %$data;
-             }
-             elsif( $type eq 'ARRAY' ) {
--                @{$_[0]} = @$data;
-+                @{ $_[0] } = @$data;
-             }
-             elsif( $type eq 'SCALAR' ) {
--                ${$_[0]} = $$data;
-+                ${ $_[0] } = $$data;
-             }
-             else {
--                die("Unknown type: ".$type);
-+                die( "Unknown type: " . $type );
-             }
- 
-             return $_[0];
-@@ -65,7 +68,6 @@
-     }
- }
- 
--
- =head1 NAME
- 
- Test::Builder - Backend for building test libraries
-@@ -73,28 +75,15 @@
- =head1 SYNOPSIS
- 
-   package My::Test::Module;
--  use Test::Builder;
--  require Exporter;
--  @ISA = qw(Exporter);
--  @EXPORT = qw(ok);
-+  use base 'Test::Builder::Module';
- 
--  my $Test = Test::Builder->new;
--  $Test->output('my_logfile');
--
--  sub import {
--      my($self) = shift;
--      my $pack = caller;
--
--      $Test->exported_to($pack);
--      $Test->plan(@_);
--
--      $self->export_to_level(1, $self, 'ok');
--  }
-+  my $CLASS = __PACKAGE__;
- 
-   sub ok {
-       my($test, $name) = @_;
-+      my $tb = $CLASS->builder;
- 
--      $Test->ok($test, $name);
-+      $tb->ok($test, $name);
-   }
- 
- 
-@@ -117,7 +106,7 @@
- test.
- 
- Since you only run one test per program C<new> always returns the same
--Test::Builder object.  No matter how many times you call new(), you're
-+Test::Builder object.  No matter how many times you call C<new()>, you're
- getting the same object.  This is called a singleton.  This is done so that
- multiple modules share such global information as the test counter and
- where test output is going.
-@@ -128,13 +117,13 @@
- =cut
- 
- my $Test = Test::Builder->new;
-+
- sub new {
-     my($class) = shift;
-     $Test ||= $class->create;
-     return $Test;
- }
- 
--
- =item B<create>
- 
-   my $Test = Test::Builder->create;
-@@ -168,37 +157,43 @@
- 
- =cut
- 
--use vars qw($Level);
-+our $Level;
- 
--sub reset {
--    my ($self) = @_;
-+sub reset {    ## no critic (Subroutines::ProhibitBuiltinHomonyms)
-+    my($self) = @_;
- 
-     # We leave this a global because it has to be localized and localizing
-     # hash keys is just asking for pain.  Also, it was documented.
-     $Level = 1;
- 
--    $self->{Test_Died}    = 0;
-     $self->{Have_Plan}    = 0;
-     $self->{No_Plan}      = 0;
-+    $self->{Have_Output_Plan} = 0;
-+
-     $self->{Original_Pid} = $$;
- 
--    share($self->{Curr_Test});
--    $self->{Curr_Test}    = 0;
--    $self->{Test_Results} = &share([]);
-+    share( $self->{Curr_Test} );
-+    $self->{Curr_Test} = 0;
-+    $self->{Test_Results} = &share( [] );
- 
-     $self->{Exported_To}    = undef;
-     $self->{Expected_Tests} = 0;
- 
--    $self->{Skip_All}   = 0;
-+    $self->{Skip_All} = 0;
-+
-+    $self->{Use_Nums} = 1;
- 
--    $self->{Use_Nums}   = 1;
-+    $self->{No_Header} = 0;
-+    $self->{No_Ending} = 0;
- 
--    $self->{No_Header}  = 0;
--    $self->{No_Ending}  = 0;
-+    $self->{Todo}       = undef;
-+    $self->{Todo_Stack} = [];
-+    $self->{Start_Todo} = 0;
-+    $self->{Opened_Testhandles} = 0;
- 
--    $self->_dup_stdhandles unless $^C;
-+    $self->_dup_stdhandles;
- 
--    return undef;
-+    return;
- }
- 
- =back
-@@ -210,25 +205,6 @@
- 
- =over 4
- 
--=item B<exported_to>
--
--  my $pack = $Test->exported_to;
--  $Test->exported_to($pack);
--
--Tells Test::Builder what package you exported your functions to.
--This is important for getting TODO tests right.
--
--=cut
--
--sub exported_to {
--    my($self, $pack) = @_;
--
--    if( defined $pack ) {
--        $self->{Exported_To} = $pack;
--    }
--    return $self->{Exported_To};
--}
--
- =item B<plan>
- 
-   $Test->plan('no_plan');
-@@ -238,53 +214,62 @@
- A convenient way to set up your tests.  Call this and Test::Builder
- will print the appropriate headers and take the appropriate actions.
- 
--If you call plan(), don't call any of the other methods below.
-+If you call C<plan()>, don't call any of the other methods below.
- 
- =cut
- 
-+my %plan_cmds = (
-+    no_plan     => \&no_plan,
-+    skip_all    => \&skip_all,
-+    tests       => \&_plan_tests,
-+);
-+
- sub plan {
--    my($self, $cmd, $arg) = @_;
-+    my( $self, $cmd, $arg ) = @_;
- 
-     return unless $cmd;
- 
-     local $Level = $Level + 1;
- 
--    if( $self->{Have_Plan} ) {
--        $self->croak("You tried to plan twice");
--    }
-+    $self->croak("You tried to plan twice") if $self->{Have_Plan};
- 
--    if( $cmd eq 'no_plan' ) {
--        $self->no_plan;
--    }
--    elsif( $cmd eq 'skip_all' ) {
--        return $self->skip_all($arg);
--    }
--    elsif( $cmd eq 'tests' ) {
--        if( $arg ) {
--            local $Level = $Level + 1;
--            return $self->expected_tests($arg);
--        }
--        elsif( !defined $arg ) {
--            $self->croak("Got an undefined number of tests");
--        }
--        elsif( !$arg ) {
--            $self->croak("You said to run 0 tests");
--        }
-+    if( my $method = $plan_cmds{$cmd} ) {
-+        local $Level = $Level + 1;
-+        $self->$method($arg);
-     }
-     else {
--        my @args = grep { defined } ($cmd, $arg);
-+        my @args = grep { defined } ( $cmd, $arg );
-         $self->croak("plan() doesn't understand @args");
-     }
- 
-     return 1;
- }
- 
-+
-+sub _plan_tests {
-+    my($self, $arg) = @_;
-+
-+    if($arg) {
-+        local $Level = $Level + 1;
-+        return $self->expected_tests($arg);
-+    }
-+    elsif( !defined $arg ) {
-+        $self->croak("Got an undefined number of tests");
-+    }
-+    else {
-+        $self->croak("You said to run 0 tests");
-+    }
-+
-+    return;
-+}
-+
-+
- =item B<expected_tests>
- 
-     my $max = $Test->expected_tests;
-     $Test->expected_tests($max);
- 
--Gets/sets the # of tests we expect this test to run and prints out
-+Gets/sets the number of tests we expect this test to run and prints out
- the appropriate headers.
- 
- =cut
-@@ -293,73 +278,204 @@
-     my $self = shift;
-     my($max) = @_;
- 
--    if( @_ ) {
-+    if(@_) {
-         $self->croak("Number of tests must be a positive integer.  You gave it '$max'")
--          unless $max =~ /^\+?\d+$/ and $max > 0;
-+          unless $max =~ /^\+?\d+$/;
- 
-         $self->{Expected_Tests} = $max;
-         $self->{Have_Plan}      = 1;
- 
--        $self->_print("1..$max\n") unless $self->no_header;
-+        $self->_output_plan($max) unless $self->no_header;
-     }
-     return $self->{Expected_Tests};
- }
- 
--
- =item B<no_plan>
- 
-   $Test->no_plan;
- 
--Declares that this test will run an indeterminate # of tests.
-+Declares that this test will run an indeterminate number of tests.
- 
- =cut
- 
- sub no_plan {
--    my $self = shift;
-+    my($self, $arg) = @_;
-+
-+    $self->carp("no_plan takes no arguments") if $arg;
- 
-     $self->{No_Plan}   = 1;
-     $self->{Have_Plan} = 1;
-+
-+    return 1;
- }
- 
-+
-+=begin private
-+
-+=item B<_output_plan>
-+
-+  $tb->_output_plan($max);
-+  $tb->_output_plan($max, $directive);
-+  $tb->_output_plan($max, $directive => $reason);
-+
-+Handles displaying the test plan.
-+
-+If a C<$directive> and/or C<$reason> are given they will be output with the
-+plan.  So here's what skipping all tests looks like:
-+
-+    $tb->_output_plan(0, "SKIP", "Because I said so");
-+
-+It sets C<< $tb->{Have_Output_Plan} >> and will croak if the plan was already
-+output.
-+
-+=end private
-+
-+=cut
-+
-+sub _output_plan {
-+    my($self, $max, $directive, $reason) = @_;
-+
-+    $self->carp("The plan was already output") if $self->{Have_Output_Plan};
-+
-+    my $plan = "1..$max";
-+    $plan .= " # $directive" if defined $directive;
-+    $plan .= " $reason"      if defined $reason;
-+
-+    $self->_print("$plan\n");
-+
-+    $self->{Have_Output_Plan} = 1;
-+
-+    return;
-+}
-+
-+=item B<done_testing>
-+
-+  $Test->done_testing();
-+  $Test->done_testing($num_tests);
-+
-+Declares that you are done testing, no more tests will be run after this point.
-+
-+If a plan has not yet been output, it will do so.
-+
-+$num_tests is the number of tests you planned to run.  If a numbered
-+plan was already declared, and if this contradicts, a failing test
-+will be run to reflect the planning mistake.  If C<no_plan> was declared,
-+this will override.
-+
-+If C<done_testing()> is called twice, the second call will issue a
-+failing test.
-+
-+If C<$num_tests> is omitted, the number of tests run will be used, like
-+no_plan.
-+
-+C<done_testing()> is, in effect, used when you'd want to use C<no_plan>, but
-+safer. You'd use it like so:
-+
-+    $Test->ok($a == $b);
-+    $Test->done_testing();
-+
-+Or to plan a variable number of tests:
-+
-+    for my $test (@tests) {
-+        $Test->ok($test);
-+    }
-+    $Test->done_testing(@tests);
-+
-+=cut
-+
-+sub done_testing {
-+    my($self, $num_tests) = @_;
-+
-+    # If done_testing() specified the number of tests, shut off no_plan.
-+    if( defined $num_tests ) {
-+        $self->{No_Plan} = 0;
-+    }
-+    else {
-+        $num_tests = $self->current_test;
-+    }
-+
-+    if( $self->{Done_Testing} ) {
-+        my($file, $line) = @{$self->{Done_Testing}}[1,2];
-+        $self->ok(0, "done_testing() was already called at $file line $line");
-+        return;
-+    }
-+
-+    $self->{Done_Testing} = [caller];
-+
-+    if( $self->expected_tests && $num_tests != $self->expected_tests ) {
-+        $self->ok(0, "planned to run @{[ $self->expected_tests ]} ".
-+                     "but done_testing() expects $num_tests");
-+    }
-+    else {
-+        $self->{Expected_Tests} = $num_tests;
-+    }
-+
-+    $self->_output_plan($num_tests) unless $self->{Have_Output_Plan};
-+
-+    $self->{Have_Plan} = 1;
-+
-+    return 1;
-+}
-+
-+
- =item B<has_plan>
- 
-   $plan = $Test->has_plan
- 
--Find out whether a plan has been defined. $plan is either C<undef> (no plan has been set), C<no_plan> (indeterminate # of tests) or an integer (the number of expected tests).
-+Find out whether a plan has been defined. C<$plan> is either C<undef> (no plan
-+has been set), C<no_plan> (indeterminate # of tests) or an integer (the number
-+of expected tests).
- 
- =cut
- 
- sub has_plan {
-     my $self = shift;
- 
--    return($self->{Expected_Tests}) if $self->{Expected_Tests};
-+    return( $self->{Expected_Tests} ) if $self->{Expected_Tests};
-     return('no_plan') if $self->{No_Plan};
-     return(undef);
--};
--
-+}
- 
- =item B<skip_all>
- 
-   $Test->skip_all;
-   $Test->skip_all($reason);
- 
--Skips all the tests, using the given $reason.  Exits immediately with 0.
-+Skips all the tests, using the given C<$reason>.  Exits immediately with 0.
- 
- =cut
- 
- sub skip_all {
--    my($self, $reason) = @_;
--
--    my $out = "1..0";
--    $out .= " # Skip $reason" if $reason;
--    $out .= "\n";
-+    my( $self, $reason ) = @_;
- 
-     $self->{Skip_All} = 1;
- 
--    $self->_print($out) unless $self->no_header;
-+    $self->_output_plan(0, "SKIP", $reason) unless $self->no_header;
-     exit(0);
- }
- 
-+=item B<exported_to>
-+
-+  my $pack = $Test->exported_to;
-+  $Test->exported_to($pack);
-+
-+Tells Test::Builder what package you exported your functions to.
-+
-+This method isn't terribly useful since modules which share the same
-+Test::Builder object might get exported to different packages and only
-+the last one will be honored.
-+
-+=cut
-+
-+sub exported_to {
-+    my( $self, $pack ) = @_;
-+
-+    if( defined $pack ) {
-+        $self->{Exported_To} = $pack;
-+    }
-+    return $self->{Exported_To};
-+}
-+
- =back
- 
- =head2 Running tests
-@@ -368,7 +484,7 @@
- 
- They all return true if the test passed, false if the test failed.
- 
--$name is always optional.
-+C<$name> is always optional.
- 
- =over 4
- 
-@@ -376,42 +492,43 @@
- 
-   $Test->ok($test, $name);
- 
--Your basic test.  Pass if $test is true, fail if $test is false.  Just
--like Test::Simple's ok().
-+Your basic test.  Pass if C<$test> is true, fail if $test is false.  Just
-+like Test::Simple's C<ok()>.
- 
- =cut
- 
- sub ok {
--    my($self, $test, $name) = @_;
-+    my( $self, $test, $name ) = @_;
- 
-     # $test might contain an object which we don't want to accidentally
-     # store, so we turn it into a boolean.
-     $test = $test ? 1 : 0;
- 
--    $self->_plan_check;
--
-     lock $self->{Curr_Test};
-     $self->{Curr_Test}++;
- 
-     # In case $name is a string overloaded object, force it to stringify.
--    $self->_unoverload_str(\$name);
-+    $self->_unoverload_str( \$name );
- 
--    $self->diag(<<ERR) if defined $name and $name =~ /^[\d\s]+$/;
-+    $self->diag(<<"ERR") if defined $name and $name =~ /^[\d\s]+$/;
-     You named your test '$name'.  You shouldn't use numbers for your test names.
-     Very confusing.
- ERR
- 
--    my($pack, $file, $line) = $self->caller;
-+    # Capture the value of $TODO for the rest of this ok() call
-+    # so it can more easily be found by other routines.
-+    my $todo    = $self->todo();
-+    my $in_todo = $self->in_todo;
-+    local $self->{Todo} = $todo if $in_todo;
- 
--    my $todo = $self->todo($pack);
--    $self->_unoverload_str(\$todo);
-+    $self->_unoverload_str( \$todo );
- 
-     my $out;
--    my $result = &share({});
-+    my $result = &share( {} );
- 
--    unless( $test ) {
-+    unless($test) {
-         $out .= "not ";
--        @$result{ 'ok', 'actual_ok' } = ( ( $todo ? 1 : 0 ), 0 );
-+        @$result{ 'ok', 'actual_ok' } = ( ( $self->in_todo ? 1 : 0 ), 0 );
-     }
-     else {
-         @$result{ 'ok', 'actual_ok' } = ( 1, $test );
-@@ -421,16 +538,16 @@
-     $out .= " $self->{Curr_Test}" if $self->use_numbers;
- 
-     if( defined $name ) {
--        $name =~ s|#|\\#|g;     # # in a name can confuse Test::Harness.
--        $out   .= " - $name";
-+        $name =~ s|#|\\#|g;    # # in a name can confuse Test::Harness.
-+        $out .= " - $name";
-         $result->{name} = $name;
-     }
-     else {
-         $result->{name} = '';
-     }
- 
--    if( $todo ) {
--        $out   .= " # TODO $todo";
-+    if( $self->in_todo ) {
-+        $out .= " # TODO $todo";
-         $result->{reason} = $todo;
-         $result->{type}   = 'todo';
-     }
-@@ -439,309 +556,341 @@
-         $result->{type}   = '';
-     }
- 
--    $self->{Test_Results}[$self->{Curr_Test}-1] = $result;
-+    $self->{Test_Results}[ $self->{Curr_Test} - 1 ] = $result;
-     $out .= "\n";
- 
-     $self->_print($out);
- 
--    unless( $test ) {
--        my $msg = $todo ? "Failed (TODO)" : "Failed";
--        $self->_print_diag("\n") if $ENV{HARNESS_ACTIVE};
--
--	if( defined $name ) {
--	    $self->diag(qq[  $msg test '$name'\n]);
--	    $self->diag(qq[  at $file line $line.\n]);
--	}
--	else {
--	    $self->diag(qq[  $msg test at $file line $line.\n]);
--	}
--    } 
-+    unless($test) {
-+        my $msg = $self->in_todo ? "Failed (TODO)" : "Failed";
-+        $self->_print_to_fh( $self->_diag_fh, "\n" ) if $ENV{HARNESS_ACTIVE};
-+
-+        my( undef, $file, $line ) = $self->caller;
-+        if( defined $name ) {
-+            $self->diag(qq[  $msg test '$name'\n]);
-+            $self->diag(qq[  at $file line $line.\n]);
-+        }
-+        else {
-+            $self->diag(qq[  $msg test at $file line $line.\n]);
-+        }
-+    }
- 
-     return $test ? 1 : 0;
- }
- 
--
- sub _unoverload {
--    my $self  = shift;
--    my $type  = shift;
-+    my $self = shift;
-+    my $type = shift;
- 
--    $self->_try(sub { require overload } ) || return;
-+    $self->_try(sub { require overload; }, die_on_fail => 1);
- 
-     foreach my $thing (@_) {
-         if( $self->_is_object($$thing) ) {
--            if( my $string_meth = overload::Method($$thing, $type) ) {
-+            if( my $string_meth = overload::Method( $$thing, $type ) ) {
-                 $$thing = $$thing->$string_meth();
-             }
-         }
-     }
--}
- 
-+    return;
-+}
- 
- sub _is_object {
--    my($self, $thing) = @_;
-+    my( $self, $thing ) = @_;
- 
--    return $self->_try(sub { ref $thing && $thing->isa('UNIVERSAL') }) ? 1 : 0;
-+    return $self->_try( sub { ref $thing && $thing->isa('UNIVERSAL') } ) ? 1 : 0;
- }
- 
--
- sub _unoverload_str {
-     my $self = shift;
- 
--    $self->_unoverload(q[""], @_);
--}    
-+    return $self->_unoverload( q[""], @_ );
-+}
- 
- sub _unoverload_num {
-     my $self = shift;
- 
--    $self->_unoverload('0+', @_);
-+    $self->_unoverload( '0+', @_ );
- 
-     for my $val (@_) {
-         next unless $self->_is_dualvar($$val);
--        $$val = $$val+0;
-+        $$val = $$val + 0;
-     }
--}
- 
-+    return;
-+}
- 
- # This is a hack to detect a dualvar such as $!
- sub _is_dualvar {
--    my($self, $val) = @_;
--
--    local $^W = 0;
--    my $numval = $val+0;
--    return 1 if $numval != 0 and $numval ne $val;
--}
-+    my( $self, $val ) = @_;
- 
-+    # Objects are not dualvars.
-+    return 0 if ref $val;
- 
-+    no warnings 'numeric';
-+    my $numval = $val + 0;
-+    return $numval != 0 and $numval ne $val ? 1 : 0;
-+}
- 
- =item B<is_eq>
- 
-   $Test->is_eq($got, $expected, $name);
- 
--Like Test::More's is().  Checks if $got eq $expected.  This is the
-+Like Test::More's C<is()>.  Checks if C<$got eq $expected>.  This is the
- string version.
- 
- =item B<is_num>
- 
-   $Test->is_num($got, $expected, $name);
- 
--Like Test::More's is().  Checks if $got == $expected.  This is the
-+Like Test::More's C<is()>.  Checks if C<$got == $expected>.  This is the
- numeric version.
- 
- =cut
- 
- sub is_eq {
--    my($self, $got, $expect, $name) = @_;
-+    my( $self, $got, $expect, $name ) = @_;
-     local $Level = $Level + 1;
- 
--    $self->_unoverload_str(\$got, \$expect);
-+    $self->_unoverload_str( \$got, \$expect );
- 
-     if( !defined $got || !defined $expect ) {
-         # undef only matches undef and nothing else
-         my $test = !defined $got && !defined $expect;
- 
--        $self->ok($test, $name);
--        $self->_is_diag($got, 'eq', $expect) unless $test;
-+        $self->ok( $test, $name );
-+        $self->_is_diag( $got, 'eq', $expect ) unless $test;
-         return $test;
-     }
- 
--    return $self->cmp_ok($got, 'eq', $expect, $name);
-+    return $self->cmp_ok( $got, 'eq', $expect, $name );
- }
- 
- sub is_num {
--    my($self, $got, $expect, $name) = @_;
-+    my( $self, $got, $expect, $name ) = @_;
-     local $Level = $Level + 1;
- 
--    $self->_unoverload_num(\$got, \$expect);
-+    $self->_unoverload_num( \$got, \$expect );
- 
-     if( !defined $got || !defined $expect ) {
-         # undef only matches undef and nothing else
-         my $test = !defined $got && !defined $expect;
- 
--        $self->ok($test, $name);
--        $self->_is_diag($got, '==', $expect) unless $test;
-+        $self->ok( $test, $name );
-+        $self->_is_diag( $got, '==', $expect ) unless $test;
-         return $test;
-     }
- 
--    return $self->cmp_ok($got, '==', $expect, $name);
-+    return $self->cmp_ok( $got, '==', $expect, $name );
- }
- 
--sub _is_diag {
--    my($self, $got, $type, $expect) = @_;
-+sub _diag_fmt {
-+    my( $self, $type, $val ) = @_;
- 
--    foreach my $val (\$got, \$expect) {
--        if( defined $$val ) {
--            if( $type eq 'eq' ) {
--                # quote and force string context
--                $$val = "'$$val'"
--            }
--            else {
--                # force numeric context
--                $self->_unoverload_num($val);
--            }
-+    if( defined $$val ) {
-+        if( $type eq 'eq' or $type eq 'ne' ) {
-+            # quote and force string context
-+            $$val = "'$$val'";
-         }
-         else {
--            $$val = 'undef';
-+            # force numeric context
-+            $self->_unoverload_num($val);
-         }
-     }
-+    else {
-+        $$val = 'undef';
-+    }
-+
-+    return;
-+}
-+
-+sub _is_diag {
-+    my( $self, $got, $type, $expect ) = @_;
-+
-+    $self->_diag_fmt( $type, $_ ) for \$got, \$expect;
- 
--    return $self->diag(sprintf <<DIAGNOSTIC, $got, $expect);
--         got: %s
--    expected: %s
-+    local $Level = $Level + 1;
-+    return $self->diag(<<"DIAGNOSTIC");
-+         got: $got
-+    expected: $expect
- DIAGNOSTIC
- 
--}    
-+}
-+
-+sub _isnt_diag {
-+    my( $self, $got, $type ) = @_;
-+
-+    $self->_diag_fmt( $type, \$got );
-+
-+    local $Level = $Level + 1;
-+    return $self->diag(<<"DIAGNOSTIC");
-+         got: $got
-+    expected: anything else
-+DIAGNOSTIC
-+}
- 
- =item B<isnt_eq>
- 
-   $Test->isnt_eq($got, $dont_expect, $name);
- 
--Like Test::More's isnt().  Checks if $got ne $dont_expect.  This is
-+Like Test::More's C<isnt()>.  Checks if C<$got ne $dont_expect>.  This is
- the string version.
- 
- =item B<isnt_num>
- 
-   $Test->isnt_num($got, $dont_expect, $name);
- 
--Like Test::More's isnt().  Checks if $got ne $dont_expect.  This is
-+Like Test::More's C<isnt()>.  Checks if C<$got ne $dont_expect>.  This is
- the numeric version.
- 
- =cut
- 
- sub isnt_eq {
--    my($self, $got, $dont_expect, $name) = @_;
-+    my( $self, $got, $dont_expect, $name ) = @_;
-     local $Level = $Level + 1;
- 
-     if( !defined $got || !defined $dont_expect ) {
-         # undef only matches undef and nothing else
-         my $test = defined $got || defined $dont_expect;
- 
--        $self->ok($test, $name);
--        $self->_cmp_diag($got, 'ne', $dont_expect) unless $test;
-+        $self->ok( $test, $name );
-+        $self->_isnt_diag( $got, 'ne' ) unless $test;
-         return $test;
-     }
- 
--    return $self->cmp_ok($got, 'ne', $dont_expect, $name);
-+    return $self->cmp_ok( $got, 'ne', $dont_expect, $name );
- }
- 
- sub isnt_num {
--    my($self, $got, $dont_expect, $name) = @_;
-+    my( $self, $got, $dont_expect, $name ) = @_;
-     local $Level = $Level + 1;
- 
-     if( !defined $got || !defined $dont_expect ) {
-         # undef only matches undef and nothing else
-         my $test = defined $got || defined $dont_expect;
- 
--        $self->ok($test, $name);
--        $self->_cmp_diag($got, '!=', $dont_expect) unless $test;
-+        $self->ok( $test, $name );
-+        $self->_isnt_diag( $got, '!=' ) unless $test;
-         return $test;
-     }
- 
--    return $self->cmp_ok($got, '!=', $dont_expect, $name);
-+    return $self->cmp_ok( $got, '!=', $dont_expect, $name );
- }
- 
--
- =item B<like>
- 
-   $Test->like($this, qr/$regex/, $name);
-   $Test->like($this, '/$regex/', $name);
- 
--Like Test::More's like().  Checks if $this matches the given $regex.
-+Like Test::More's C<like()>.  Checks if $this matches the given C<$regex>.
- 
--You'll want to avoid qr// if you want your tests to work before 5.005.
-+You'll want to avoid C<qr//> if you want your tests to work before 5.005.
- 
- =item B<unlike>
- 
-   $Test->unlike($this, qr/$regex/, $name);
-   $Test->unlike($this, '/$regex/', $name);
- 
--Like Test::More's unlike().  Checks if $this B<does not match> the
--given $regex.
-+Like Test::More's C<unlike()>.  Checks if $this B<does not match> the
-+given C<$regex>.
- 
- =cut
- 
- sub like {
--    my($self, $this, $regex, $name) = @_;
-+    my( $self, $this, $regex, $name ) = @_;
- 
-     local $Level = $Level + 1;
--    $self->_regex_ok($this, $regex, '=~', $name);
-+    return $self->_regex_ok( $this, $regex, '=~', $name );
- }
- 
- sub unlike {
--    my($self, $this, $regex, $name) = @_;
-+    my( $self, $this, $regex, $name ) = @_;
- 
-     local $Level = $Level + 1;
--    $self->_regex_ok($this, $regex, '!~', $name);
-+    return $self->_regex_ok( $this, $regex, '!~', $name );
- }
- 
--
- =item B<cmp_ok>
- 
-   $Test->cmp_ok($this, $type, $that, $name);
- 
--Works just like Test::More's cmp_ok().
-+Works just like Test::More's C<cmp_ok()>.
- 
-     $Test->cmp_ok($big_num, '!=', $other_big_num);
- 
- =cut
- 
--
--my %numeric_cmps = map { ($_, 1) } 
--                       ("<",  "<=", ">",  ">=", "==", "!=", "<=>");
-+my %numeric_cmps = map { ( $_, 1 ) } ( "<", "<=", ">", ">=", "==", "!=", "<=>" );
- 
- sub cmp_ok {
--    my($self, $got, $type, $expect, $name) = @_;
--
--    # Treat overloaded objects as numbers if we're asked to do a
--    # numeric comparison.
--    my $unoverload = $numeric_cmps{$type} ? '_unoverload_num'
--                                          : '_unoverload_str';
--
--    $self->$unoverload(\$got, \$expect);
--
-+    my( $self, $got, $type, $expect, $name ) = @_;
- 
-     my $test;
-+    my $error;
-     {
--        local($@,$!,$SIG{__DIE__});  # isolate eval
-+        ## no critic (BuiltinFunctions::ProhibitStringyEval)
- 
--        my $code = $self->_caller_context;
-+        local( $@, $!, $SIG{__DIE__} );    # isolate eval
- 
--        # Yes, it has to look like this or 5.4.5 won't see the #line directive.
--        # Don't ask me, man, I just work here.
--        $test = eval "
--$code" . "\$got $type \$expect;";
-+        my($pack, $file, $line) = $self->caller();
- 
-+        $test = eval qq[
-+#line 1 "cmp_ok [from $file line $line]"
-+\$got $type \$expect;
-+];
-+        $error = $@;
-     }
-     local $Level = $Level + 1;
--    my $ok = $self->ok($test, $name);
-+    my $ok = $self->ok( $test, $name );
-+
-+    # Treat overloaded objects as numbers if we're asked to do a
-+    # numeric comparison.
-+    my $unoverload
-+      = $numeric_cmps{$type}
-+      ? '_unoverload_num'
-+      : '_unoverload_str';
-+
-+    $self->diag(<<"END") if $error;
-+An error occurred while using $type:
-+------------------------------------
-+$error
-+------------------------------------
-+END
-+
-+    unless($ok) {
-+        $self->$unoverload( \$got, \$expect );
- 
--    unless( $ok ) {
-         if( $type =~ /^(eq|==)$/ ) {
--            $self->_is_diag($got, $type, $expect);
-+            $self->_is_diag( $got, $type, $expect );
-+        }
-+        elsif( $type =~ /^(ne|!=)$/ ) {
-+            $self->_isnt_diag( $got, $type );
-         }
-         else {
--            $self->_cmp_diag($got, $type, $expect);
-+            $self->_cmp_diag( $got, $type, $expect );
-         }
-     }
-     return $ok;
- }
- 
- sub _cmp_diag {
--    my($self, $got, $type, $expect) = @_;
--    
-+    my( $self, $got, $type, $expect ) = @_;
-+
-     $got    = defined $got    ? "'$got'"    : 'undef';
-     $expect = defined $expect ? "'$expect'" : 'undef';
--    return $self->diag(sprintf <<DIAGNOSTIC, $got, $type, $expect);
--    %s
--        %s
--    %s
-+
-+    local $Level = $Level + 1;
-+    return $self->diag(<<"DIAGNOSTIC");
-+    $got
-+        $type
-+    $expect
- DIAGNOSTIC
- }
- 
--
- sub _caller_context {
-     my $self = shift;
- 
--    my($pack, $file, $line) = $self->caller(1);
-+    my( $pack, $file, $line ) = $self->caller(1);
- 
-     my $code = '';
-     $code .= "#line $line $file\n" if defined $file and defined $line;
-@@ -771,7 +920,7 @@
- =cut
- 
- sub BAIL_OUT {
--    my($self, $reason) = @_;
-+    my( $self, $reason ) = @_;
- 
-     $self->{Bailed_Out} = 1;
-     $self->_print("Bail out!  $reason");
-@@ -785,52 +934,50 @@
- 
- *BAILOUT = \&BAIL_OUT;
- 
--
- =item B<skip>
- 
-     $Test->skip;
-     $Test->skip($why);
- 
--Skips the current test, reporting $why.
-+Skips the current test, reporting C<$why>.
- 
- =cut
- 
- sub skip {
--    my($self, $why) = @_;
-+    my( $self, $why ) = @_;
-     $why ||= '';
--    $self->_unoverload_str(\$why);
--
--    $self->_plan_check;
-+    $self->_unoverload_str( \$why );
- 
--    lock($self->{Curr_Test});
-+    lock( $self->{Curr_Test} );
-     $self->{Curr_Test}++;
- 
--    $self->{Test_Results}[$self->{Curr_Test}-1] = &share({
--        'ok'      => 1,
--        actual_ok => 1,
--        name      => '',
--        type      => 'skip',
--        reason    => $why,
--    });
-+    $self->{Test_Results}[ $self->{Curr_Test} - 1 ] = &share(
-+        {
-+            'ok'      => 1,
-+            actual_ok => 1,
-+            name      => '',
-+            type      => 'skip',
-+            reason    => $why,
-+        }
-+    );
- 
-     my $out = "ok";
--    $out   .= " $self->{Curr_Test}" if $self->use_numbers;
--    $out   .= " # skip";
--    $out   .= " $why"       if length $why;
--    $out   .= "\n";
-+    $out .= " $self->{Curr_Test}" if $self->use_numbers;
-+    $out .= " # skip";
-+    $out .= " $why"               if length $why;
-+    $out .= "\n";
- 
-     $self->_print($out);
- 
-     return 1;
- }
- 
--
- =item B<todo_skip>
- 
-   $Test->todo_skip;
-   $Test->todo_skip($why);
- 
--Like skip(), only it will declare the test as failing and TODO.  Similar
-+Like C<skip()>, only it will declare the test as failing and TODO.  Similar
- to
- 
-     print "not ok $tnum # TODO $why\n";
-@@ -838,32 +985,31 @@
- =cut
- 
- sub todo_skip {
--    my($self, $why) = @_;
-+    my( $self, $why ) = @_;
-     $why ||= '';
- 
--    $self->_plan_check;
--
--    lock($self->{Curr_Test});
-+    lock( $self->{Curr_Test} );
-     $self->{Curr_Test}++;
- 
--    $self->{Test_Results}[$self->{Curr_Test}-1] = &share({
--        'ok'      => 1,
--        actual_ok => 0,
--        name      => '',
--        type      => 'todo_skip',
--        reason    => $why,
--    });
-+    $self->{Test_Results}[ $self->{Curr_Test} - 1 ] = &share(
-+        {
-+            'ok'      => 1,
-+            actual_ok => 0,
-+            name      => '',
-+            type      => 'todo_skip',
-+            reason    => $why,
-+        }
-+    );
- 
-     my $out = "not ok";
--    $out   .= " $self->{Curr_Test}" if $self->use_numbers;
--    $out   .= " # TODO & SKIP $why\n";
-+    $out .= " $self->{Curr_Test}" if $self->use_numbers;
-+    $out .= " # TODO & SKIP $why\n";
- 
-     $self->_print($out);
- 
-     return 1;
- }
- 
--
- =begin _unimplemented
- 
- =item B<skip_rest>
-@@ -871,10 +1017,10 @@
-   $Test->skip_rest;
-   $Test->skip_rest($reason);
- 
--Like skip(), only it skips all the rest of the tests you plan to run
-+Like C<skip()>, only it skips all the rest of the tests you plan to run
- and terminates the test.
- 
--If you're running under no_plan, it skips once and terminates the
-+If you're running under C<no_plan>, it skips once and terminates the
- test.
- 
- =end _unimplemented
-@@ -896,13 +1042,13 @@
- Convenience method for building testing functions that take regular
- expressions as arguments, but need to work before perl 5.005.
- 
--Takes a quoted regular expression produced by qr//, or a string
-+Takes a quoted regular expression produced by C<qr//>, or a string
- representing a regular expression.
- 
- Returns a Perl value which may be used instead of the corresponding
--regular expression, or undef if it's argument is not recognised.
-+regular expression, or C<undef> if its argument is not recognised.
- 
--For example, a version of like(), sans the useful diagnostic messages,
-+For example, a version of C<like()>, sans the useful diagnostic messages,
- could be written as:
- 
-   sub laconic_like {
-@@ -915,48 +1061,60 @@
- 
- =cut
- 
--
- sub maybe_regex {
--    my ($self, $regex) = @_;
-+    my( $self, $regex ) = @_;
-     my $usable_regex = undef;
- 
-     return $usable_regex unless defined $regex;
- 
--    my($re, $opts);
-+    my( $re, $opts );
- 
-     # Check for qr/foo/
--    if( ref $regex eq 'Regexp' ) {
-+    if( _is_qr($regex) ) {
-         $usable_regex = $regex;
-     }
-     # Check for '/foo/' or 'm,foo,'
--    elsif( ($re, $opts)        = $regex =~ m{^ /(.*)/ (\w*) $ }sx           or
--           (undef, $re, $opts) = $regex =~ m,^ m([^\w\s]) (.+) \1 (\w*) $,sx
--         )
-+    elsif(( $re, $opts )        = $regex =~ m{^ /(.*)/ (\w*) $ }sx              or
-+          ( undef, $re, $opts ) = $regex =~ m,^ m([^\w\s]) (.+) \1 (\w*) $,sx
-+    )
-     {
-         $usable_regex = length $opts ? "(?$opts)$re" : $re;
-     }
- 
-     return $usable_regex;
--};
-+}
-+
-+sub _is_qr {
-+    my $regex = shift;
-+
-+    # is_regexp() checks for regexes in a robust manner, say if they're
-+    # blessed.
-+    return re::is_regexp($regex) if defined &re::is_regexp;
-+    return ref $regex eq 'Regexp';
-+}
- 
- sub _regex_ok {
--    my($self, $this, $regex, $cmp, $name) = @_;
-+    my( $self, $this, $regex, $cmp, $name ) = @_;
- 
--    my $ok = 0;
-+    my $ok           = 0;
-     my $usable_regex = $self->maybe_regex($regex);
--    unless (defined $usable_regex) {
-+    unless( defined $usable_regex ) {
-+        local $Level = $Level + 1;
-         $ok = $self->ok( 0, $name );
-         $self->diag("    '$regex' doesn't look much like a regex to me.");
-         return $ok;
-     }
- 
-     {
-+        ## no critic (BuiltinFunctions::ProhibitStringyEval)
-+
-         my $test;
-         my $code = $self->_caller_context;
- 
--        local($@, $!, $SIG{__DIE__}); # isolate eval
-+        local( $@, $!, $SIG{__DIE__} );    # isolate eval
- 
--        # Yes, it has to look like this or 5.4.5 won't see the #line directive.
-+        # Yes, it has to look like this or 5.4.5 won't see the #line
-+        # directive.
-         # Don't ask me, man, I just work here.
-         $test = eval "
- $code" . q{$test = $this =~ /$usable_regex/ ? 1 : 0};
-@@ -967,10 +1125,12 @@
-         $ok = $self->ok( $test, $name );
-     }
- 
--    unless( $ok ) {
-+    unless($ok) {
-         $this = defined $this ? "'$this'" : 'undef';
-         my $match = $cmp eq '=~' ? "doesn't match" : "matches";
--        $self->diag(sprintf <<DIAGNOSTIC, $this, $match, $regex);
-+
-+        local $Level = $Level + 1;
-+        $self->diag( sprintf <<'DIAGNOSTIC', $this, $match, $regex );
-                   %s
-     %13s '%s'
- DIAGNOSTIC
-@@ -980,7 +1140,6 @@
-     return $ok;
- }
- 
--
- # I'm not ready to publish this.  It doesn't deal with array return
- # values from the code or context.
- 
-@@ -991,23 +1150,33 @@
-     my $return_from_code          = $Test->try(sub { code });
-     my($return_from_code, $error) = $Test->try(sub { code });
- 
--Works like eval BLOCK except it ensures it has no effect on the rest of the test (ie. $@ is not set) nor is effected by outside interference (ie. $SIG{__DIE__}) and works around some quirks in older Perls.
-+Works like eval BLOCK except it ensures it has no effect on the rest
-+of the test (ie. C<$@> is not set) nor is effected by outside
-+interference (ie. C<$SIG{__DIE__}>) and works around some quirks in older
-+Perls.
- 
--$error is what would normally be in $@.
-+C<$error> is what would normally be in C<$@>.
- 
- It is suggested you use this in place of eval BLOCK.
- 
- =cut
- 
- sub _try {
--    my($self, $code) = @_;
--    
--    local $!;               # eval can mess up $!
--    local $@;               # don't set $@ in the test
--    local $SIG{__DIE__};    # don't trip an outside DIE handler.
--    my $return = eval { $code->() };
--    
--    return wantarray ? ($return, $@) : $return;
-+    my( $self, $code, %opts ) = @_;
-+
-+    my $error;
-+    my $return;
-+    {
-+        local $!;               # eval can mess up $!
-+        local $@;               # don't set $@ in the test
-+        local $SIG{__DIE__};    # don't trip an outside DIE handler.
-+        $return = eval { $code->() };
-+        $error = $@;
-+    }
-+
-+    die $error if $error and $opts{die_on_fail};
-+
-+    return wantarray ? ( $return, $error ) : $return;
- }
- 
- =end private
-@@ -1017,24 +1186,23 @@
- 
-     my $is_fh = $Test->is_fh($thing);
- 
--Determines if the given $thing can be used as a filehandle.
-+Determines if the given C<$thing> can be used as a filehandle.
- 
- =cut
- 
- sub is_fh {
--    my $self = shift;
-+    my $self     = shift;
-     my $maybe_fh = shift;
-     return 0 unless defined $maybe_fh;
- 
--    return 1 if ref $maybe_fh  eq 'GLOB'; # its a glob ref
--    return 1 if ref \$maybe_fh eq 'GLOB'; # its a glob
-+    return 1 if ref $maybe_fh  eq 'GLOB';    # its a glob ref
-+    return 1 if ref \$maybe_fh eq 'GLOB';    # its a glob
- 
-     return eval { $maybe_fh->isa("IO::Handle") } ||
-            # 5.5.4's tied() and can() doesn't like getting undef
--           eval { (tied($maybe_fh) || '')->can('TIEHANDLE') };
-+           eval { ( tied($maybe_fh) || '' )->can('TIEHANDLE') };
- }
- 
--
- =back
- 
- 
-@@ -1047,7 +1215,7 @@
- 
-     $Test->level($how_high);
- 
--How far up the call stack should $Test look when reporting where the
-+How far up the call stack should C<$Test> look when reporting where the
- test failed.
- 
- Defaults to 1.
-@@ -1067,7 +1235,7 @@
- =cut
- 
- sub level {
--    my($self, $level) = @_;
-+    my( $self, $level ) = @_;
- 
-     if( defined $level ) {
-         $Level = $level;
-@@ -1075,7 +1243,6 @@
-     return $Level;
- }
- 
--
- =item B<use_numbers>
- 
-     $Test->use_numbers($on_or_off);
-@@ -1100,7 +1267,7 @@
- =cut
- 
- sub use_numbers {
--    my($self, $use_nums) = @_;
-+    my( $self, $use_nums ) = @_;
- 
-     if( defined $use_nums ) {
-         $self->{Use_Nums} = $use_nums;
-@@ -1108,13 +1275,12 @@
-     return $self->{Use_Nums};
- }
- 
--
- =item B<no_diag>
- 
-     $Test->no_diag($no_diag);
- 
- If set true no diagnostics will be printed.  This includes calls to
--diag().
-+C<diag()>.
- 
- =item B<no_ending>
- 
-@@ -1137,7 +1303,7 @@
-     my $method = lc $attribute;
- 
-     my $code = sub {
--        my($self, $no) = @_;
-+        my( $self, $no ) = @_;
- 
-         if( defined $no ) {
-             $self->{$attribute} = $no;
-@@ -1145,11 +1311,10 @@
-         return $self->{$attribute};
-     };
- 
--    no strict 'refs';
--    *{__PACKAGE__.'::'.$method} = $code;
-+    no strict 'refs';    ## no critic
-+    *{ __PACKAGE__ . '::' . $method } = $code;
- }
- 
--
- =back
- 
- =head2 Output
-@@ -1165,11 +1330,11 @@
- 
-     $Test->diag(@msgs);
- 
--Prints out the given @msgs.  Like C<print>, arguments are simply
-+Prints out the given C<@msgs>.  Like C<print>, arguments are simply
- appended together.
- 
--Normally, it uses the failure_output() handle, but if this is for a
--TODO test, the todo_output() handle is used.
-+Normally, it uses the C<failure_output()> handle, but if this is for a
-+TODO test, the C<todo_output()> handle is used.
- 
- Output will be indented and marked with a # so as not to interfere
- with test output.  A newline will be put on the end if there isn't one
-@@ -1177,7 +1342,7 @@
- 
- We encourage using this rather than calling print directly.
- 
--Returns false.  Why?  Because diag() is often used in conjunction with
-+Returns false.  Why?  Because C<diag()> is often used in conjunction with
- a failing test (C<ok() || diag()>) it "passes through" the failure.
- 
-     return ok(...) || diag(...);
-@@ -1188,7 +1353,35 @@
- =cut
- 
- sub diag {
--    my($self, @msgs) = @_;
-+    my $self = shift;
-+
-+    $self->_print_comment( $self->_diag_fh, @_ );
-+}
-+
-+=item B<note>
-+
-+    $Test->note(@msgs);
-+
-+Like C<diag()>, but it prints to the C<output()> handle so it will not
-+normally be seen by the user except in verbose mode.
-+
-+=cut
-+
-+sub note {
-+    my $self = shift;
-+
-+    $self->_print_comment( $self->output, @_ );
-+}
-+
-+sub _diag_fh {
-+    my $self = shift;
-+
-+    local $Level = $Level + 1;
-+    return $self->in_todo ? $self->todo_output : $self->failure_output;
-+}
-+
-+sub _print_comment {
-+    my( $self, $fh, @msgs ) = @_;
- 
-     return if $self->no_diag;
-     return unless @msgs;
-@@ -1200,32 +1393,66 @@
-     # Convert undef to 'undef' so its readable.
-     my $msg = join '', map { defined($_) ? $_ : 'undef' } @msgs;
- 
--    # Escape each line with a #.
--    $msg =~ s/^/# /gm;
--
--    # Stick a newline on the end if it needs it.
--    $msg .= "\n" unless $msg =~ /\n\Z/;
-+    # Escape the beginning, _print will take care of the rest.
-+    $msg =~ s/^/# /;
- 
-     local $Level = $Level + 1;
--    $self->_print_diag($msg);
-+    $self->_print_to_fh( $fh, $msg );
- 
-     return 0;
- }
- 
-+=item B<explain>
-+
-+    my @dump = $Test->explain(@msgs);
-+
-+Will dump the contents of any references in a human readable format.
-+Handy for things like...
-+
-+    is_deeply($have, $want) || diag explain $have;
-+
-+or
-+
-+    is_deeply($have, $want) || note explain $have;
-+
-+=cut
-+
-+sub explain {
-+    my $self = shift;
-+
-+    return map {
-+        ref $_
-+          ? do {
-+            $self->_try(sub { require Data::Dumper }, die_on_fail => 1);
-+
-+            my $dumper = Data::Dumper->new( [$_] );
-+            $dumper->Indent(1)->Terse(1);
-+            $dumper->Sortkeys(1) if $dumper->can("Sortkeys");
-+            $dumper->Dump;
-+          }
-+          : $_
-+    } @_;
-+}
-+
- =begin _private
- 
- =item B<_print>
- 
-     $Test->_print(@msgs);
- 
--Prints to the output() filehandle.
-+Prints to the C<output()> filehandle.
- 
- =end _private
- 
- =cut
- 
- sub _print {
--    my($self, @msgs) = @_;
-+    my $self = shift;
-+    return $self->_print_to_fh( $self->output, @_ );
-+}
-+
-+sub _print_to_fh {
-+    my( $self, $fh, @msgs ) = @_;
- 
-     # Prevent printing headers when only compiling.  Mostly for when
-     # tests are deparsed with B::Deparse
-@@ -1233,70 +1460,53 @@
- 
-     my $msg = join '', @msgs;
- 
--    local($\, $", $,) = (undef, ' ', '');
--    my $fh = $self->output;
-+    local( $\, $", $, ) = ( undef, ' ', '' );
- 
-     # Escape each line after the first with a # so we don't
-     # confuse Test::Harness.
--    $msg =~ s/\n(.)/\n# $1/sg;
-+    $msg =~ s{\n(?!\z)}{\n# }sg;
- 
-     # Stick a newline on the end if it needs it.
--    $msg .= "\n" unless $msg =~ /\n\Z/;
-+    $msg .= "\n" unless $msg =~ /\n\z/;
- 
--    print $fh $msg;
-+    return print $fh $msg;
- }
- 
--=begin private
--
--=item B<_print_diag>
--
--    $Test->_print_diag(@msg);
--
--Like _print, but prints to the current diagnostic filehandle.
--
--=end private
--
--=cut
--
--sub _print_diag {
--    my $self = shift;
--
--    local($\, $", $,) = (undef, ' ', '');
--    my $fh = $self->todo ? $self->todo_output : $self->failure_output;
--    print $fh @_;
--}    
--
- =item B<output>
- 
--    $Test->output($fh);
--    $Test->output($file);
-+=item B<failure_output>
- 
--Where normal "ok/not ok" test output should go.
-+=item B<todo_output>
- 
--Defaults to STDOUT.
-+    my $filehandle = $Test->output;
-+    $Test->output($filehandle);
-+    $Test->output($filename);
-+    $Test->output(\$scalar);
-+
-+These methods control where Test::Builder will print its output.
-+They take either an open C<$filehandle>, a C<$filename> to open and write to
-+or a C<$scalar> reference to append to.  It will always return a C<$filehandle>.
- 
--=item B<failure_output>
-+B<output> is where normal "ok/not ok" test output goes.
- 
--    $Test->failure_output($fh);
--    $Test->failure_output($file);
-+Defaults to STDOUT.
- 
--Where diagnostic output on test failures and diag() should go.
-+B<failure_output> is where diagnostic output on test failures and
-+C<diag()> goes.  It is normally not read by Test::Harness and instead is
-+displayed to the user.
- 
- Defaults to STDERR.
- 
--=item B<todo_output>
--
--    $Test->todo_output($fh);
--    $Test->todo_output($file);
--
--Where diagnostics about todo test failures and diag() should go.
-+C<todo_output> is used instead of C<failure_output()> for the
-+diagnostics of a failing TODO test.  These will not be seen by the
-+user.
- 
- Defaults to STDOUT.
- 
- =cut
- 
- sub output {
--    my($self, $fh) = @_;
-+    my( $self, $fh ) = @_;
- 
-     if( defined $fh ) {
-         $self->{Out_FH} = $self->_new_fh($fh);
-@@ -1305,7 +1515,7 @@
- }
- 
- sub failure_output {
--    my($self, $fh) = @_;
-+    my( $self, $fh ) = @_;
- 
-     if( defined $fh ) {
-         $self->{Fail_FH} = $self->_new_fh($fh);
-@@ -1314,7 +1524,7 @@
- }
- 
- sub todo_output {
--    my($self, $fh) = @_;
-+    my( $self, $fh ) = @_;
- 
-     if( defined $fh ) {
-         $self->{Todo_FH} = $self->_new_fh($fh);
-@@ -1322,7 +1532,6 @@
-     return $self->{Todo_FH};
- }
- 
--
- sub _new_fh {
-     my $self = shift;
-     my($file_or_fh) = shift;
-@@ -1331,24 +1540,37 @@
-     if( $self->is_fh($file_or_fh) ) {
-         $fh = $file_or_fh;
-     }
-+    elsif( ref $file_or_fh eq 'SCALAR' ) {
-+        # Scalar refs as filehandles was added in 5.8.
-+        if( $] >= 5.008 ) {
-+            open $fh, ">>", $file_or_fh
-+              or $self->croak("Can't open scalar ref $file_or_fh: $!");
-+        }
-+        # Emulate scalar ref filehandles with a tie.
-+        else {
-+            $fh = Test::Builder::IO::Scalar->new($file_or_fh)
-+              or $self->croak("Can't tie scalar ref $file_or_fh");
-+        }
-+    }
-     else {
--        $fh = do { local *FH };
--        open $fh, ">$file_or_fh" or
--            $self->croak("Can't open test output log $file_or_fh: $!");
--	_autoflush($fh);
-+        open $fh, ">", $file_or_fh
-+          or $self->croak("Can't open test output log $file_or_fh: $!");
-+        _autoflush($fh);
-     }
- 
-     return $fh;
- }
- 
--
- sub _autoflush {
-     my($fh) = shift;
-     my $old_fh = select $fh;
-     $| = 1;
-     select $old_fh;
-+
-+    return;
- }
- 
-+my( $Testout, $Testerr );
- 
- sub _dup_stdhandles {
-     my $self = shift;
-@@ -1357,41 +1579,80 @@
- 
-     # Set everything to unbuffered else plain prints to STDOUT will
-     # come out in the wrong order from our own prints.
--    _autoflush(\*TESTOUT);
--    _autoflush(\*STDOUT);
--    _autoflush(\*TESTERR);
--    _autoflush(\*STDERR);
-+    _autoflush($Testout);
-+    _autoflush( \*STDOUT );
-+    _autoflush($Testerr);
-+    _autoflush( \*STDERR );
- 
--    $self->output(\*TESTOUT);
--    $self->failure_output(\*TESTERR);
--    $self->todo_output(\*TESTOUT);
--}
-+    $self->reset_outputs;
- 
-+    return;
-+}
- 
--my $Opened_Testhandles = 0;
- sub _open_testhandles {
--    return if $Opened_Testhandles;
-+    my $self = shift;
-+
-+    return if $self->{Opened_Testhandles};
-+
-     # We dup STDOUT and STDERR so people can change them in their
-     # test suites while still getting normal test output.
--    open(TESTOUT, ">&STDOUT") or die "Can't dup STDOUT:  $!";
--    open(TESTERR, ">&STDERR") or die "Can't dup STDERR:  $!";
--    $Opened_Testhandles = 1;
-+    open( $Testout, ">&STDOUT" ) or die "Can't dup STDOUT:  $!";
-+    open( $Testerr, ">&STDERR" ) or die "Can't dup STDERR:  $!";
-+
-+    #    $self->_copy_io_layers( \*STDOUT, $Testout );
-+    #    $self->_copy_io_layers( \*STDERR, $Testerr );
-+
-+    $self->{Opened_Testhandles} = 1;
-+
-+    return;
-+}
-+
-+sub _copy_io_layers {
-+    my( $self, $src, $dst ) = @_;
-+
-+    $self->_try(
-+        sub {
-+            require PerlIO;
-+            my @src_layers = PerlIO::get_layers($src);
-+
-+            binmode $dst, join " ", map ":$_", @src_layers if @src_layers;
-+        }
-+    );
-+
-+    return;
- }
- 
-+=item reset_outputs
-+
-+  $tb->reset_outputs;
-+
-+Resets all the output filehandles back to their defaults.
-+
-+=cut
-+
-+sub reset_outputs {
-+    my $self = shift;
-+
-+    $self->output        ($Testout);
-+    $self->failure_output($Testerr);
-+    $self->todo_output   ($Testout);
-+
-+    return;
-+}
- 
- =item carp
- 
-   $tb->carp(@message);
- 
- Warns with C<@message> but the message will appear to come from the
--point where the original test function was called (C<$tb->caller>).
-+point where the original test function was called (C<< $tb->caller >>).
- 
- =item croak
- 
-   $tb->croak(@message);
- 
- Dies with C<@message> but the message will appear to come from the
--point where the original test function was called (C<$tb->caller>).
-+point where the original test function was called (C<< $tb->caller >>).
- 
- =cut
- 
-@@ -1399,28 +1660,20 @@
-     my $self = shift;
- 
-     local $Level = $Level + 1;
--    my($pack, $file, $line) = $self->caller;
--    return join("", @_) . " at $file line $line.\n";
-+    my( $pack, $file, $line ) = $self->caller;
-+    return join( "", @_ ) . " at $file line $line.\n";
- }
- 
- sub carp {
-     my $self = shift;
--    warn $self->_message_at_caller(@_);
-+    return warn $self->_message_at_caller(@_);
- }
- 
- sub croak {
-     my $self = shift;
--    die $self->_message_at_caller(@_);
-+    return die $self->_message_at_caller(@_);
- }
- 
--sub _plan_check {
--    my $self = shift;
--
--    unless( $self->{Have_Plan} ) {
--        local $Level = $Level + 2;
--        $self->croak("You tried to run a test without a plan");
--    }
--}
- 
- =back
- 
-@@ -1444,28 +1697,26 @@
- =cut
- 
- sub current_test {
--    my($self, $num) = @_;
-+    my( $self, $num ) = @_;
- 
--    lock($self->{Curr_Test});
-+    lock( $self->{Curr_Test} );
-     if( defined $num ) {
--        unless( $self->{Have_Plan} ) {
--            $self->croak("Can't change the current test number without a plan!");
--        }
--
-         $self->{Curr_Test} = $num;
- 
-         # If the test counter is being pushed forward fill in the details.
-         my $test_results = $self->{Test_Results};
-         if( $num > @$test_results ) {
-             my $start = @$test_results ? @$test_results : 0;
--            for ($start..$num-1) {
--                $test_results->[$_] = &share({
--                    'ok'      => 1, 
--                    actual_ok => undef, 
--                    reason    => 'incrementing test number', 
--                    type      => 'unknown', 
--                    name      => undef 
--                });
-+            for( $start .. $num - 1 ) {
-+                $test_results->[$_] = &share(
-+                    {
-+                        'ok'      => 1,
-+                        actual_ok => undef,
-+                        reason    => 'incrementing test number',
-+                        type      => 'unknown',
-+                        name      => undef
-+                    }
-+                );
-             }
-         }
-         # If backward, wipe history.  Its their funeral.
-@@ -1476,7 +1727,6 @@
-     return $self->{Curr_Test};
- }
- 
--
- =item B<summary>
- 
-     my @tests = $Test->summary;
-@@ -1498,7 +1748,7 @@
- 
-     my @tests = $Test->details;
- 
--Like summary(), but with a lot more detail.
-+Like C<summary()>, but with a lot more detail.
- 
-     $tests[$test_num - 1] = 
-             { 'ok'       => is the test considered a pass?
-@@ -1512,7 +1762,7 @@
- 
- 'actual_ok' is a reflection of whether or not the test literally
- printed 'ok' or 'not ok'.  This is for examining the result of 'todo'
--tests.  
-+tests.
- 
- 'name' is the name of the test.
- 
-@@ -1525,16 +1775,16 @@
-     unknown     see below
- 
- Sometimes the Test::Builder test counter is incremented without it
--printing any test output, for example, when current_test() is changed.
-+printing any test output, for example, when C<current_test()> is changed.
- In these cases, Test::Builder doesn't know the result of the test, so
--it's type is 'unkown'.  These details for these tests are filled in.
--They are considered ok, but the name and actual_ok is left undef.
-+its type is 'unknown'.  These details for these tests are filled in.
-+They are considered ok, but the name and actual_ok is left C<undef>.
- 
- For example "not ok 23 - hole count # TODO insufficient donuts" would
- result in this structure:
- 
-     $tests[22] =    # 23 - 1, since arrays start from 0.
--      { ok        => 1,   # logically, the test passed since it's todo
-+      { ok        => 1,   # logically, the test passed since its todo
-         actual_ok => 0,   # in absolute terms, it failed
-         name      => 'hole count',
-         type      => 'todo',
-@@ -1553,30 +1803,154 @@
-     my $todo_reason = $Test->todo;
-     my $todo_reason = $Test->todo($pack);
- 
--todo() looks for a $TODO variable in your tests.  If set, all tests
--will be considered 'todo' (see Test::More and Test::Harness for
--details).  Returns the reason (ie. the value of $TODO) if running as
--todo tests, false otherwise.
--
--todo() is about finding the right package to look for $TODO in.  It
--uses the exported_to() package to find it.  If that's not set, it's
--pretty good at guessing the right package to look at based on $Level.
-+If the current tests are considered "TODO" it will return the reason,
-+if any.  This reason can come from a C<$TODO> variable or the last call
-+to C<todo_start()>.
-+
-+Since a TODO test does not need a reason, this function can return an
-+empty string even when inside a TODO block.  Use C<< $Test->in_todo >>
-+to determine if you are currently inside a TODO block.
-+
-+C<todo()> is about finding the right package to look for C<$TODO> in.  It's
-+pretty good at guessing the right package to look at.  It first looks for
-+the caller based on C<$Level + 1>, since C<todo()> is usually called inside
-+a test function.  As a last resort it will use C<exported_to()>.
- 
- Sometimes there is some confusion about where todo() should be looking
--for the $TODO variable.  If you want to be sure, tell it explicitly
-+for the C<$TODO> variable.  If you want to be sure, tell it explicitly
- what $pack to use.
- 
- =cut
- 
- sub todo {
--    my($self, $pack) = @_;
-+    my( $self, $pack ) = @_;
-+
-+    return $self->{Todo} if defined $self->{Todo};
- 
--    $pack = $pack || $self->exported_to || $self->caller($Level);
--    return 0 unless $pack;
-+    local $Level = $Level + 1;
-+    my $todo = $self->find_TODO($pack);
-+    return $todo if defined $todo;
- 
--    no strict 'refs';
--    return defined ${$pack.'::TODO'} ? ${$pack.'::TODO'}
--                                     : 0;
-+    return '';
-+}
-+
-+=item B<find_TODO>
-+
-+    my $todo_reason = $Test->find_TODO();
-+    my $todo_reason = $Test->find_TODO($pack):
-+
-+Like C<todo()> but only returns the value of C<$TODO> ignoring
-+C<todo_start()>.
-+
-+=cut
-+
-+sub find_TODO {
-+    my( $self, $pack ) = @_;
-+
-+    $pack = $pack || $self->caller(1) || $self->exported_to;
-+    return unless $pack;
-+
-+    no strict 'refs';    ## no critic
-+    return ${ $pack . '::TODO' };
-+}
-+
-+=item B<in_todo>
-+
-+    my $in_todo = $Test->in_todo;
-+
-+Returns true if the test is currently inside a TODO block.
-+
-+=cut
-+
-+sub in_todo {
-+    my $self = shift;
-+
-+    local $Level = $Level + 1;
-+    return( defined $self->{Todo} || $self->find_TODO ) ? 1 : 0;
-+}
-+
-+=item B<todo_start>
-+
-+    $Test->todo_start();
-+    $Test->todo_start($message);
-+
-+This method allows you declare all subsequent tests as TODO tests, up until
-+the C<todo_end> method has been called.
-+
-+The C<TODO:> and C<$TODO> syntax is generally pretty good about figuring out
-+whether or not we're in a TODO test.  However, often we find that this is not
-+possible to determine (such as when we want to use C<$TODO> but
-+the tests are being executed in other packages which can't be inferred
-+beforehand).
-+
-+Note that you can use this to nest "todo" tests
-+
-+ $Test->todo_start('working on this');
-+ # lots of code
-+ $Test->todo_start('working on that');
-+ # more code
-+ $Test->todo_end;
-+ $Test->todo_end;
-+
-+This is generally not recommended, but large testing systems often have weird
-+internal needs.
-+
-+We've tried to make this also work with the TODO: syntax, but it's not
-+guaranteed and its use is also discouraged:
-+
-+ TODO: {
-+     local $TODO = 'We have work to do!';
-+     $Test->todo_start('working on this');
-+     # lots of code
-+     $Test->todo_start('working on that');
-+     # more code
-+     $Test->todo_end;
-+     $Test->todo_end;
-+ }
-+
-+Pick one style or another of "TODO" to be on the safe side.
-+
-+=cut
-+
-+sub todo_start {
-+    my $self = shift;
-+    my $message = @_ ? shift : '';
-+
-+    $self->{Start_Todo}++;
-+    if( $self->in_todo ) {
-+        push @{ $self->{Todo_Stack} } => $self->todo;
-+    }
-+    $self->{Todo} = $message;
-+
-+    return;
-+}
-+
-+=item C<todo_end>
-+
-+ $Test->todo_end;
-+
-+Stops running tests as "TODO" tests.  This method is fatal if called without a
-+preceding C<todo_start> method call.
-+
-+=cut
-+
-+sub todo_end {
-+    my $self = shift;
-+
-+    if( !$self->{Start_Todo} ) {
-+        $self->croak('todo_end() called without todo_start()');
-+    }
-+
-+    $self->{Start_Todo}--;
-+
-+    if( $self->{Start_Todo} && @{ $self->{Todo_Stack} } ) {
-+        $self->{Todo} = pop @{ $self->{Todo_Stack} };
-+    }
-+    else {
-+        delete $self->{Todo};
-+    }
-+
-+    return;
- }
- 
- =item B<caller>
-@@ -1585,15 +1959,24 @@
-     my($pack, $file, $line) = $Test->caller;
-     my($pack, $file, $line) = $Test->caller($height);
- 
--Like the normal caller(), except it reports according to your level().
-+Like the normal C<caller()>, except it reports according to your C<level()>.
-+
-+C<$height> will be added to the C<level()>.
-+
-+If C<caller()> winds up off the top of the stack it report the highest context.
- 
- =cut
- 
--sub caller {
--    my($self, $height) = @_;
-+sub caller {    ## no critic (Subroutines::ProhibitBuiltinHomonyms)
-+    my( $self, $height ) = @_;
-     $height ||= 0;
- 
--    my @caller = CORE::caller($self->level + $height + 1);
-+    my $level = $self->level + $height + 1;
-+    my @caller;
-+    do {
-+        @caller = CORE::caller( $level );
-+        $level--;
-+    } until @caller;
-     return wantarray ? @caller : $caller[0];
- }
- 
-@@ -1619,126 +2002,116 @@
- sub _sanity_check {
-     my $self = shift;
- 
--    $self->_whoa($self->{Curr_Test} < 0,  'Says here you ran a negative number of tests!');
--    $self->_whoa(!$self->{Have_Plan} and $self->{Curr_Test}, 
--          'Somehow your tests ran without a plan!');
--    $self->_whoa($self->{Curr_Test} != @{ $self->{Test_Results} },
--          'Somehow you got a different number of results than tests ran!');
-+    $self->_whoa( $self->{Curr_Test} < 0, 'Says here you ran a negative number of tests!' );
-+    $self->_whoa( $self->{Curr_Test} != @{ $self->{Test_Results} },
-+        'Somehow you got a different number of results than tests ran!' );
-+
-+    return;
- }
- 
- =item B<_whoa>
- 
-   $self->_whoa($check, $description);
- 
--A sanity check, similar to assert().  If the $check is true, something
--has gone horribly wrong.  It will die with the given $description and
-+A sanity check, similar to C<assert()>.  If the C<$check> is true, something
-+has gone horribly wrong.  It will die with the given C<$description> and
- a note to contact the author.
- 
- =cut
- 
- sub _whoa {
--    my($self, $check, $desc) = @_;
--    if( $check ) {
-+    my( $self, $check, $desc ) = @_;
-+    if($check) {
-         local $Level = $Level + 1;
-         $self->croak(<<"WHOA");
- WHOA!  $desc
- This should never happen!  Please contact the author immediately!
- WHOA
-     }
-+
-+    return;
- }
- 
- =item B<_my_exit>
- 
-   _my_exit($exit_num);
- 
--Perl seems to have some trouble with exiting inside an END block.  5.005_03
--and 5.6.1 both seem to do odd things.  Instead, this function edits $?
--directly.  It should ONLY be called from inside an END block.  It
-+Perl seems to have some trouble with exiting inside an C<END> block.  5.005_03
-+and 5.6.1 both seem to do odd things.  Instead, this function edits C<$?>
-+directly.  It should B<only> be called from inside an C<END> block.  It
- doesn't actually exit, that's your job.
- 
- =cut
- 
- sub _my_exit {
--    $? = $_[0];
-+    $? = $_[0];    ## no critic (Variables::RequireLocalizedPunctuationVars)
- 
-     return 1;
- }
- 
--
- =back
- 
- =end _private
- 
- =cut
- 
--$SIG{__DIE__} = sub {
--    # We don't want to muck with death in an eval, but $^S isn't
--    # totally reliable.  5.005_03 and 5.6.1 both do the wrong thing
--    # with it.  Instead, we use caller.  This also means it runs under
--    # 5.004!
--    my $in_eval = 0;
--    for( my $stack = 1;  my $sub = (CORE::caller($stack))[3];  $stack++ ) {
--        $in_eval = 1 if $sub =~ /^\(eval\)/;
--    }
--    $Test->{Test_Died} = 1 unless $in_eval;
--};
--
- sub _ending {
-     my $self = shift;
- 
--    $self->_sanity_check();
-+    my $real_exit_code = $?;
- 
-     # Don't bother with an ending if this is a forked copy.  Only the parent
-     # should do the ending.
--    # Exit if plan() was never called.  This is so "require Test::Simple" 
-+    if( $self->{Original_Pid} != $$ ) {
-+        return;
-+    }
-+
-+    # Ran tests but never declared a plan or hit done_testing
-+    if( !$self->{Have_Plan} and $self->{Curr_Test} ) {
-+        $self->diag("Tests were run but no plan was declared and done_testing() was not seen.");
-+    }
-+
-+    # Exit if plan() was never called.  This is so "require Test::Simple"
-     # doesn't puke.
-+    if( !$self->{Have_Plan} ) {
-+        return;
-+    }
-+
-     # Don't do an ending if we bailed out.
--    if( ($self->{Original_Pid} != $$) 			or
--	(!$self->{Have_Plan} && !$self->{Test_Died}) 	or
--	$self->{Bailed_Out}
--      )
--    {
--	_my_exit($?);
--	return;
-+    if( $self->{Bailed_Out} ) {
-+        return;
-     }
- 
-     # Figure out if we passed or failed and print helpful messages.
-     my $test_results = $self->{Test_Results};
--    if( @$test_results ) {
-+    if(@$test_results) {
-         # The plan?  We have no plan.
-         if( $self->{No_Plan} ) {
--            $self->_print("1..$self->{Curr_Test}\n") unless $self->no_header;
-+            $self->_output_plan($self->{Curr_Test}) unless $self->no_header;
-             $self->{Expected_Tests} = $self->{Curr_Test};
-         }
- 
-         # Auto-extended arrays and elements which aren't explicitly
-         # filled in with a shared reference will puke under 5.8.0
-         # ithreads.  So we have to fill them in by hand. :(
--        my $empty_result = &share({});
--        for my $idx ( 0..$self->{Expected_Tests}-1 ) {
-+        my $empty_result = &share( {} );
-+        for my $idx ( 0 .. $self->{Expected_Tests} - 1 ) {
-             $test_results->[$idx] = $empty_result
-               unless defined $test_results->[$idx];
-         }
- 
--        my $num_failed = grep !$_->{'ok'}, 
--                              @{$test_results}[0..$self->{Curr_Test}-1];
-+        my $num_failed = grep !$_->{'ok'}, @{$test_results}[ 0 .. $self->{Curr_Test} - 1 ];
- 
-         my $num_extra = $self->{Curr_Test} - $self->{Expected_Tests};
- 
--        if( $num_extra < 0 ) {
--            my $s = $self->{Expected_Tests} == 1 ? '' : 's';
--            $self->diag(<<"FAIL");
--Looks like you planned $self->{Expected_Tests} test$s but only ran $self->{Curr_Test}.
--FAIL
--        }
--        elsif( $num_extra > 0 ) {
-+        if( $num_extra != 0 ) {
-             my $s = $self->{Expected_Tests} == 1 ? '' : 's';
-             $self->diag(<<"FAIL");
--Looks like you planned $self->{Expected_Tests} test$s but ran $num_extra extra.
-+Looks like you planned $self->{Expected_Tests} test$s but ran $self->{Curr_Test}.
- FAIL
-         }
- 
--        if ( $num_failed ) {
-+        if($num_failed) {
-             my $num_tests = $self->{Curr_Test};
-             my $s = $num_failed == 1 ? '' : 's';
- 
-@@ -1749,16 +2122,16 @@
- FAIL
-         }
- 
--        if( $self->{Test_Died} ) {
-+        if($real_exit_code) {
-             $self->diag(<<"FAIL");
--Looks like your test died just after $self->{Curr_Test}.
-+Looks like your test exited with $real_exit_code just after $self->{Curr_Test}.
- FAIL
- 
--            _my_exit( 255 ) && return;
-+            _my_exit($real_exit_code) && return;
-         }
- 
-         my $exit_code;
--        if( $num_failed ) {
-+        if($num_failed) {
-             $exit_code = $num_failed <= 254 ? $num_failed : 254;
-         }
-         elsif( $num_extra != 0 ) {
-@@ -1768,21 +2141,23 @@
-             $exit_code = 0;
-         }
- 
--        _my_exit( $exit_code ) && return;
-+        _my_exit($exit_code) && return;
-     }
--    elsif ( $self->{Skip_All} ) {
--        _my_exit( 0 ) && return;
-+    elsif( $self->{Skip_All} ) {
-+        _my_exit(0) && return;
-     }
--    elsif ( $self->{Test_Died} ) {
--        $self->diag(<<'FAIL');
--Looks like your test died before it could output anything.
-+    elsif($real_exit_code) {
-+        $self->diag(<<"FAIL");
-+Looks like your test exited with $real_exit_code before it could output anything.
- FAIL
--        _my_exit( 255 ) && return;
-+        _my_exit($real_exit_code) && return;
-     }
-     else {
-         $self->diag("No tests run!\n");
--        _my_exit( 255 ) && return;
-+        _my_exit(255) && return;
-     }
-+
-+    $self->_whoa( 1, "We fell off the end of _ending()" );
- }
- 
- END {
-@@ -1807,12 +2182,11 @@
- 
- If you fail more than 254 tests, it will be reported as 254.
- 
--
- =head1 THREADS
- 
- In perl 5.8.1 and later, Test::Builder is thread-safe.  The test
- number is shared amongst all threads.  This means if one thread sets
--the test number using current_test() they will all be effected.
-+the test number using C<current_test()> they will all be effected.
- 
- While versions earlier than 5.8.1 had threads they contain too many
- bugs to support.
-@@ -1820,6 +2194,21 @@
- Test::Builder is only thread-aware if threads.pm is loaded I<before>
- Test::Builder.
- 
-+=head1 MEMORY
-+
-+An informative hash, accessable via C<<details()>>, is stored for each
-+test you perform.  So memory usage will scale linearly with each test
-+run. Although this is not a problem for most test suites, it can
-+become an issue if you do large (hundred thousands to million)
-+combinatorics tests in the same run.
-+
-+In such cases, you are advised to either split the test file into smaller
-+ones, or use a reverse approach, doing "normal" (code) compares and
-+triggering fail() should anything go unexpected.
-+
-+Future versions of Test::Builder will have a way to turn history off.
-+
-+
- =head1 EXAMPLES
- 
- CPAN can provide the best examples.  Test::Simple, Test::More,
-@@ -1836,10 +2225,10 @@
- 
- =head1 COPYRIGHT
- 
--Copyright 2002, 2004 by chromatic E<lt>chromatic@wgz.orgE<gt> and
--                        Michael G Schwern E<lt>schwern@pobox.comE<gt>.
-+Copyright 2002-2008 by chromatic E<lt>chromatic@wgz.orgE<gt> and
-+                       Michael G Schwern E<lt>schwern@pobox.comE<gt>.
- 
--This program is free software; you can redistribute it and/or 
-+This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
- 
- See F<http://www.perl.com/perl/misc/Artistic.html>
-@@ -1847,3 +2236,4 @@
- =cut
- 
- 1;
-+
-diff -urN perl-5.10.0.orig/lib/Test/More.pm perl-5.10.0/lib/Test/More.pm
---- perl-5.10.0.orig/lib/Test/More.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/More.pm	2009-08-26 06:14:11.000000000 +0200
-@@ -1,39 +1,40 @@
- package Test::More;
- 
--use 5.004;
--
-+use 5.006;
- use strict;
-+use warnings;
-+
-+#---- perlcritic exemptions. ----#
- 
-+# We use a lot of subroutine prototypes
-+## no critic (Subroutines::ProhibitSubroutinePrototypes)
- 
- # Can't use Carp because it might cause use_ok() to accidentally succeed
- # even though the module being used forgot to use Carp.  Yes, this
- # actually happened.
- sub _carp {
--    my($file, $line) = (caller(1))[1,2];
--    warn @_, " at $file line $line\n";
-+    my( $file, $line ) = ( caller(1) )[ 1, 2 ];
-+    return warn @_, " at $file line $line\n";
- }
- 
--
--
--use vars qw($VERSION @ISA @EXPORT %EXPORT_TAGS $TODO);
--$VERSION = '0.72';
--$VERSION = eval $VERSION;    # make the alpha version come out as a number
-+our $VERSION = '0.92';
-+$VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
- 
- use Test::Builder::Module;
--@ISA    = qw(Test::Builder::Module);
--@EXPORT = qw(ok use_ok require_ok
--             is isnt like unlike is_deeply
--             cmp_ok
--             skip todo todo_skip
--             pass fail
--             eq_array eq_hash eq_set
--             $TODO
--             plan
--             can_ok  isa_ok
--             diag
--	     BAIL_OUT
--            );
--
-+our @ISA    = qw(Test::Builder::Module);
-+our @EXPORT = qw(ok use_ok require_ok
-+  is isnt like unlike is_deeply
-+  cmp_ok
-+  skip todo todo_skip
-+  pass fail
-+  eq_array eq_hash eq_set
-+  $TODO
-+  plan
-+  done_testing
-+  can_ok isa_ok new_ok
-+  diag note explain
-+  BAIL_OUT
-+);
- 
- =head1 NAME
- 
-@@ -43,9 +44,9 @@
- 
-   use Test::More tests => 23;
-   # or
--  use Test::More qw(no_plan);
--  # or
-   use Test::More skip_all => $reason;
-+  # or
-+  use Test::More;   # see done_testing()
- 
-   BEGIN { use_ok( 'Some::Module' ); }
-   require_ok( 'Some::Module' );
-@@ -95,7 +96,7 @@
- =head1 DESCRIPTION
- 
- B<STOP!> If you're just getting started writing tests, have a look at
--Test::Simple first.  This is a drop in replacement for Test::Simple
-+L<Test::Simple> first.  This is a drop in replacement for Test::Simple
- which you can switch to once you get the hang of basic testing.
- 
- The purpose of this module is to provide a wide range of testing
-@@ -115,14 +116,19 @@
- 
-   use Test::More tests => 23;
- 
--There are rare cases when you will not know beforehand how many tests
--your script is going to run.  In this case, you can declare that you
--have no plan.  (Try to avoid using this as it weakens your test.)
-+There are cases when you will not know beforehand how many tests your
-+script is going to run.  In this case, you can declare your tests at
-+the end.
-+
-+  use Test::More;
-+
-+  ... run your tests ...
- 
--  use Test::More qw(no_plan);
-+  done_testing( $number_of_tests_run );
- 
--B<NOTE>: using no_plan requires a Test::Harness upgrade else it will
--think everything has failed.  See L<CAVEATS and NOTES>).
-+Sometimes you really don't know how many tests were run, or it's too
-+difficult to calculate.  In which case you can leave off
-+$number_of_tests_run.
- 
- In some cases, you'll want to completely skip an entire testing script.
- 
-@@ -159,10 +165,9 @@
- sub plan {
-     my $tb = Test::More->builder;
- 
--    $tb->plan(@_);
-+    return $tb->plan(@_);
- }
- 
--
- # This implements "use Test::More 'no_diag'" but the behavior is
- # deprecated.
- sub import_extra {
-@@ -170,7 +175,7 @@
-     my $list  = shift;
- 
-     my @other = ();
--    my $idx = 0;
-+    my $idx   = 0;
-     while( $idx <= $#{$list} ) {
-         my $item = $list->[$idx];
- 
-@@ -185,8 +190,35 @@
-     }
- 
-     @$list = @other;
-+
-+    return;
- }
- 
-+=over 4
-+
-+=item B<done_testing>
-+
-+    done_testing();
-+    done_testing($number_of_tests);
-+
-+If you don't know how many tests you're going to run, you can issue
-+the plan when you're done running tests.
-+
-+$number_of_tests is the same as plan(), it's the number of tests you
-+expected to run.  You can omit this, in which case the number of tests
-+you ran doesn't matter, just the fact that your tests ran to
-+conclusion.
-+
-+This is safer than and replaces the "no_plan" plan.
-+
-+=back
-+
-+=cut
-+
-+sub done_testing {
-+    my $tb = Test::More->builder;
-+    $tb->done_testing(@_);
-+}
- 
- =head2 Test names
- 
-@@ -257,10 +289,10 @@
- =cut
- 
- sub ok ($;$) {
--    my($test, $name) = @_;
-+    my( $test, $name ) = @_;
-     my $tb = Test::More->builder;
- 
--    $tb->ok($test, $name);
-+    return $tb->ok( $test, $name );
- }
- 
- =item B<is>
-@@ -318,6 +350,17 @@
- 
-   ok( exists $brooklyn{tree},    'A tree grows in Brooklyn' );
- 
-+A simple call to isnt() usually does not provide a strong test but there
-+are cases when you cannot say much more about a value than that it is
-+different from some other value:
-+
-+  new_ok $obj, "Foo";
-+
-+  my $clone = $obj->clone;
-+  isa_ok $obj, "Foo", "Foo->clone";
-+
-+  isnt $obj, $clone, "clone() produces a different object";
-+
- For those grammatical pedants out there, there's an C<isn't()>
- function which is an alias of isnt().
- 
-@@ -326,18 +369,17 @@
- sub is ($$;$) {
-     my $tb = Test::More->builder;
- 
--    $tb->is_eq(@_);
-+    return $tb->is_eq(@_);
- }
- 
- sub isnt ($$;$) {
-     my $tb = Test::More->builder;
- 
--    $tb->isnt_eq(@_);
-+    return $tb->isnt_eq(@_);
- }
- 
- *isn't = \&isnt;
- 
--
- =item B<like>
- 
-   like( $got, qr/expected/, $test_name );
-@@ -371,10 +413,9 @@
- sub like ($$;$) {
-     my $tb = Test::More->builder;
- 
--    $tb->like(@_);
-+    return $tb->like(@_);
- }
- 
--
- =item B<unlike>
- 
-   unlike( $got, qr/expected/, $test_name );
-@@ -387,10 +428,9 @@
- sub unlike ($$;$) {
-     my $tb = Test::More->builder;
- 
--    $tb->unlike(@_);
-+    return $tb->unlike(@_);
- }
- 
--
- =item B<cmp_ok>
- 
-   cmp_ok( $got, $op, $expected, $test_name );
-@@ -422,15 +462,20 @@
- 
-     cmp_ok( $big_hairy_number, '==', $another_big_hairy_number );
- 
-+It's especially useful when comparing greater-than or smaller-than 
-+relation between values:
-+
-+    cmp_ok( $some_value, '<=', $upper_limit );
-+
-+
- =cut
- 
- sub cmp_ok($$$;$) {
-     my $tb = Test::More->builder;
- 
--    $tb->cmp_ok(@_);
-+    return $tb->cmp_ok(@_);
- }
- 
--
- =item B<can_ok>
- 
-   can_ok($module, @methods);
-@@ -461,17 +506,17 @@
- =cut
- 
- sub can_ok ($@) {
--    my($proto, @methods) = @_;
-+    my( $proto, @methods ) = @_;
-     my $class = ref $proto || $proto;
-     my $tb = Test::More->builder;
- 
--    unless( $class ) {
-+    unless($class) {
-         my $ok = $tb->ok( 0, "->can(...)" );
-         $tb->diag('    can_ok() called with empty class or reference');
-         return $ok;
-     }
- 
--    unless( @methods ) {
-+    unless(@methods) {
-         my $ok = $tb->ok( 0, "$class->can(...)" );
-         $tb->diag('    can_ok() called with no methods');
-         return $ok;
-@@ -479,24 +524,24 @@
- 
-     my @nok = ();
-     foreach my $method (@methods) {
--        $tb->_try(sub { $proto->can($method) }) or push @nok, $method;
-+        $tb->_try( sub { $proto->can($method) } ) or push @nok, $method;
-     }
- 
--    my $name;
--    $name = @methods == 1 ? "$class->can('$methods[0]')" 
--                          : "$class->can(...)";
-+    my $name = (@methods == 1) ? "$class->can('$methods[0]')" :
-+                                 "$class->can(...)"           ;
- 
-     my $ok = $tb->ok( !@nok, $name );
- 
--    $tb->diag(map "    $class->can('$_') failed\n", @nok);
-+    $tb->diag( map "    $class->can('$_') failed\n", @nok );
- 
-     return $ok;
- }
- 
- =item B<isa_ok>
- 
--  isa_ok($object, $class, $object_name);
--  isa_ok($ref,    $type,  $ref_name);
-+  isa_ok($object,   $class, $object_name);
-+  isa_ok($subclass, $class, $object_name);
-+  isa_ok($ref,      $type,  $ref_name);
- 
- Checks to see if the given C<< $object->isa($class) >>.  Also checks to make
- sure the object was defined in the first place.  Handy for this sort
-@@ -512,6 +557,10 @@
- 
- to safeguard against your test script blowing up.
- 
-+You can also test a class, to make sure that it has the right ancestor:
-+
-+    isa_ok( 'Vole', 'Rodent' );
-+
- It works on references, too:
- 
-     isa_ok( $array_ref, 'ARRAY' );
-@@ -523,46 +572,52 @@
- =cut
- 
- sub isa_ok ($$;$) {
--    my($object, $class, $obj_name) = @_;
-+    my( $object, $class, $obj_name ) = @_;
-     my $tb = Test::More->builder;
- 
-     my $diag;
--    $obj_name = 'The object' unless defined $obj_name;
--    my $name = "$obj_name isa $class";
-+
-     if( !defined $object ) {
-+        $obj_name = 'The thing' unless defined $obj_name;
-         $diag = "$obj_name isn't defined";
-     }
--    elsif( !ref $object ) {
--        $diag = "$obj_name isn't a reference";
--    }
-     else {
-+        my $whatami = ref $object ? 'object' : 'class';
-         # We can't use UNIVERSAL::isa because we want to honor isa() overrides
--        my($rslt, $error) = $tb->_try(sub { $object->isa($class) });
--        if( $error ) {
-+        my( $rslt, $error ) = $tb->_try( sub { $object->isa($class) } );
-+        if($error) {
-             if( $error =~ /^Can't call method "isa" on unblessed reference/ ) {
-                 # Its an unblessed reference
--                if( !UNIVERSAL::isa($object, $class) ) {
-+                $obj_name = 'The reference' unless defined $obj_name;
-+                if( !UNIVERSAL::isa( $object, $class ) ) {
-                     my $ref = ref $object;
-                     $diag = "$obj_name isn't a '$class' it's a '$ref'";
-                 }
--            } else {
-+            }
-+            elsif( $error =~ /Can't call method "isa" without a package/ ) {
-+                # It's something that can't even be a class
-+                $diag = "$obj_name isn't a class or reference";
-+            }
-+            else {
-                 die <<WHOA;
--WHOA! I tried to call ->isa on your object and got some weird error.
-+WHOA! I tried to call ->isa on your $whatami and got some weird error.
- Here's the error.
- $error
- WHOA
-             }
-         }
--        elsif( !$rslt ) {
--            my $ref = ref $object;
--            $diag = "$obj_name isn't a '$class' it's a '$ref'";
-+        else {
-+            $obj_name = "The $whatami" unless defined $obj_name;
-+            if( !$rslt ) {
-+                my $ref = ref $object;
-+                $diag = "$obj_name isn't a '$class' it's a '$ref'";
-+            }
-         }
-     }
--            
--      
- 
-+    my $name = "$obj_name isa $class";
-     my $ok;
--    if( $diag ) {
-+    if($diag) {
-         $ok = $tb->ok( 0, $name );
-         $tb->diag("    $diag\n");
-     }
-@@ -573,6 +628,49 @@
-     return $ok;
- }
- 
-+=item B<new_ok>
-+
-+  my $obj = new_ok( $class );
-+  my $obj = new_ok( $class => \@args );
-+  my $obj = new_ok( $class => \@args, $object_name );
-+
-+A convenience function which combines creating an object and calling
-+isa_ok() on that object.
-+
-+It is basically equivalent to:
-+
-+    my $obj = $class->new(@args);
-+    isa_ok $obj, $class, $object_name;
-+
-+If @args is not given, an empty list will be used.
-+
-+This function only works on new() and it assumes new() will return
-+just a single object which isa C<$class>.
-+
-+=cut
-+
-+sub new_ok {
-+    my $tb = Test::More->builder;
-+    $tb->croak("new_ok() must be given at least a class") unless @_;
-+
-+    my( $class, $args, $object_name ) = @_;
-+
-+    $args ||= [];
-+    $object_name = "The object" unless defined $object_name;
-+
-+    my $obj;
-+    my( $success, $error ) = $tb->_try( sub { $obj = $class->new(@$args); 1 } );
-+    if($success) {
-+        local $Test::Builder::Level = $Test::Builder::Level + 1;
-+        isa_ok $obj, $class, $object_name;
-+    }
-+    else {
-+        $tb->ok( 0, "new() died" );
-+        $tb->diag("    Error was:  $error");
-+    }
-+
-+    return $obj;
-+}
- 
- =item B<pass>
- 
-@@ -593,12 +691,14 @@
- 
- sub pass (;$) {
-     my $tb = Test::More->builder;
--    $tb->ok(1, @_);
-+
-+    return $tb->ok( 1, @_ );
- }
- 
- sub fail (;$) {
-     my $tb = Test::More->builder;
--    $tb->ok(0, @_);
-+
-+    return $tb->ok( 0, @_ );
- }
- 
- =back
-@@ -653,38 +753,40 @@
- =cut
- 
- sub use_ok ($;@) {
--    my($module, @imports) = @_;
-+    my( $module, @imports ) = @_;
-     @imports = () unless @imports;
-     my $tb = Test::More->builder;
- 
--    my($pack,$filename,$line) = caller;
--
--    local($@,$!,$SIG{__DIE__});   # isolate eval
-+    my( $pack, $filename, $line ) = caller;
- 
-+    my $code;
-     if( @imports == 1 and $imports[0] =~ /^\d+(?:\.\d+)?$/ ) {
-         # probably a version check.  Perl needs to see the bare number
-         # for it to work with non-Exporter based modules.
--        eval <<USE;
-+        $code = <<USE;
- package $pack;
- use $module $imports[0];
-+1;
- USE
-     }
-     else {
--        eval <<USE;
-+        $code = <<USE;
- package $pack;
--use $module \@imports;
-+use $module \@{\$args[0]};
-+1;
- USE
-     }
- 
--    my $ok = $tb->ok( !$@, "use $module;" );
-+    my( $eval_result, $eval_error ) = _eval( $code, \@imports );
-+    my $ok = $tb->ok( $eval_result, "use $module;" );
- 
--    unless( $ok ) {
--        chomp $@;
-+    unless($ok) {
-+        chomp $eval_error;
-         $@ =~ s{^BEGIN failed--compilation aborted at .*$}
-                 {BEGIN failed--compilation aborted at $filename line $line.}m;
-         $tb->diag(<<DIAGNOSTIC);
-     Tried to use '$module'.
--    Error:  $@
-+    Error:  $eval_error
- DIAGNOSTIC
- 
-     }
-@@ -692,6 +794,24 @@
-     return $ok;
- }
- 
-+sub _eval {
-+    my( $code, @args ) = @_;
-+
-+    # Work around oddities surrounding resetting of $@ by immediately
-+    # storing it.
-+    my( $sigdie, $eval_result, $eval_error );
-+    {
-+        local( $@, $!, $SIG{__DIE__} );    # isolate eval
-+        $eval_result = eval $code;              ## no critic (BuiltinFunctions::ProhibitStringyEval)
-+        $eval_error  = $@;
-+        $sigdie      = $SIG{__DIE__} || undef;
-+    }
-+    # make sure that $code got a chance to set $SIG{__DIE__}
-+    $SIG{__DIE__} = $sigdie if defined $sigdie;
-+
-+    return( $eval_result, $eval_error );
-+}
-+
- =item B<require_ok>
- 
-    require_ok($module);
-@@ -711,20 +831,20 @@
-     # Module names must be barewords, files not.
-     $module = qq['$module'] unless _is_module_name($module);
- 
--    local($!, $@, $SIG{__DIE__}); # isolate eval
--    local $SIG{__DIE__};
--    eval <<REQUIRE;
-+    my $code = <<REQUIRE;
- package $pack;
- require $module;
-+1;
- REQUIRE
- 
--    my $ok = $tb->ok( !$@, "require $module;" );
-+    my( $eval_result, $eval_error ) = _eval($code);
-+    my $ok = $tb->ok( $eval_result, "require $module;" );
- 
--    unless( $ok ) {
--        chomp $@;
-+    unless($ok) {
-+        chomp $eval_error;
-         $tb->diag(<<DIAGNOSTIC);
-     Tried to require '$module'.
--    Error:  $@
-+    Error:  $eval_error
- DIAGNOSTIC
- 
-     }
-@@ -732,7 +852,6 @@
-     return $ok;
- }
- 
--
- sub _is_module_name {
-     my $module = shift;
- 
-@@ -740,7 +859,8 @@
-     # End with an alphanumeric.
-     # The rest is an alphanumeric or ::
-     $module =~ s/\b::\b//g;
--    $module =~ /^[a-zA-Z]\w*$/;
-+
-+    return $module =~ /^[a-zA-Z]\w*$/ ? 1 : 0;
- }
- 
- =back
-@@ -769,59 +889,59 @@
- references themselves (except for their type) are ignored.  This means
- aspects such as blessing and ties are not considered "different".
- 
--is_deeply() current has very limited handling of function reference
-+is_deeply() currently has very limited handling of function reference
- and globs.  It merely checks if they have the same referent.  This may
- improve in the future.
- 
--Test::Differences and Test::Deep provide more in-depth functionality
-+L<Test::Differences> and L<Test::Deep> provide more in-depth functionality
- along these lines.
- 
- =cut
- 
--use vars qw(@Data_Stack %Refs_Seen);
-+our( @Data_Stack, %Refs_Seen );
- my $DNE = bless [], 'Does::Not::Exist';
- 
- sub _dne {
--    ref $_[0] eq ref $DNE;
-+    return ref $_[0] eq ref $DNE;
- }
- 
--
-+## no critic (Subroutines::RequireArgUnpacking)
- sub is_deeply {
-     my $tb = Test::More->builder;
- 
-     unless( @_ == 2 or @_ == 3 ) {
--        my $msg = <<WARNING;
-+        my $msg = <<'WARNING';
- is_deeply() takes two or three args, you gave %d.
- This usually means you passed an array or hash instead 
- of a reference to it
- WARNING
--        chop $msg;   # clip off newline so carp() will put in line/file
-+        chop $msg;    # clip off newline so carp() will put in line/file
- 
-         _carp sprintf $msg, scalar @_;
- 
--	return $tb->ok(0);
-+        return $tb->ok(0);
-     }
- 
--    my($got, $expected, $name) = @_;
-+    my( $got, $expected, $name ) = @_;
- 
--    $tb->_unoverload_str(\$expected, \$got);
-+    $tb->_unoverload_str( \$expected, \$got );
- 
-     my $ok;
--    if( !ref $got and !ref $expected ) {  		# neither is a reference
--        $ok = $tb->is_eq($got, $expected, $name);
-+    if( !ref $got and !ref $expected ) {    # neither is a reference
-+        $ok = $tb->is_eq( $got, $expected, $name );
-     }
--    elsif( !ref $got xor !ref $expected ) {  	# one's a reference, one isn't
--        $ok = $tb->ok(0, $name);
--	$tb->diag( _format_stack({ vals => [ $got, $expected ] }) );
-+    elsif( !ref $got xor !ref $expected ) {    # one's a reference, one isn't
-+        $ok = $tb->ok( 0, $name );
-+        $tb->diag( _format_stack({ vals => [ $got, $expected ] }) );
-     }
--    else {			       		# both references
-+    else {                                     # both references
-         local @Data_Stack = ();
--        if( _deep_check($got, $expected) ) {
--            $ok = $tb->ok(1, $name);
-+        if( _deep_check( $got, $expected ) ) {
-+            $ok = $tb->ok( 1, $name );
-         }
-         else {
--            $ok = $tb->ok(0, $name);
--            $tb->diag(_format_stack(@Data_Stack));
-+            $ok = $tb->ok( 0, $name );
-+            $tb->diag( _format_stack(@Data_Stack) );
-         }
-     }
- 
-@@ -831,11 +951,11 @@
- sub _format_stack {
-     my(@Stack) = @_;
- 
--    my $var = '$FOO';
-+    my $var       = '$FOO';
-     my $did_arrow = 0;
-     foreach my $entry (@Stack) {
-         my $type = $entry->{type} || '';
--        my $idx  = $entry->{'idx'};
-+        my $idx = $entry->{'idx'};
-         if( $type eq 'HASH' ) {
-             $var .= "->" unless $did_arrow++;
-             $var .= "{$idx}";
-@@ -849,18 +969,19 @@
-         }
-     }
- 
--    my @vals = @{$Stack[-1]{vals}}[0,1];
-+    my @vals = @{ $Stack[-1]{vals} }[ 0, 1 ];
-     my @vars = ();
--    ($vars[0] = $var) =~ s/\$FOO/     \$got/;
--    ($vars[1] = $var) =~ s/\$FOO/\$expected/;
-+    ( $vars[0] = $var ) =~ s/\$FOO/     \$got/;
-+    ( $vars[1] = $var ) =~ s/\$FOO/\$expected/;
- 
-     my $out = "Structures begin differing at:\n";
--    foreach my $idx (0..$#vals) {
-+    foreach my $idx ( 0 .. $#vals ) {
-         my $val = $vals[$idx];
--        $vals[$idx] = !defined $val ? 'undef'          :
--                      _dne($val)    ? "Does not exist" :
--                      ref $val      ? "$val"           :
--                                      "'$val'";
-+        $vals[$idx]
-+          = !defined $val ? 'undef'
-+          : _dne($val)    ? "Does not exist"
-+          : ref $val      ? "$val"
-+          :                 "'$val'";
-     }
- 
-     $out .= "$vars[0] = $vals[0]\n";
-@@ -870,14 +991,13 @@
-     return $out;
- }
- 
--
- sub _type {
-     my $thing = shift;
- 
-     return '' if !ref $thing;
- 
-     for my $type (qw(ARRAY HASH REF SCALAR GLOB CODE Regexp)) {
--        return $type if UNIVERSAL::isa($thing, $type);
-+        return $type if UNIVERSAL::isa( $thing, $type );
-     }
- 
-     return '';
-@@ -903,6 +1023,8 @@
- test output.  Like C<print> @diagnostic_message is simply concatenated
- together.
- 
-+Returns false, so as to preserve failure.
-+
- Handy for this sort of thing:
- 
-     ok( grep(/foo/, @users), "There's a foo user" ) or
-@@ -922,14 +1044,49 @@
- changing, but it is guaranteed that whatever you throw at it it won't
- interfere with the test.
- 
-+=item B<note>
-+
-+  note(@diagnostic_message);
-+
-+Like diag(), except the message will not be seen when the test is run
-+in a harness.  It will only be visible in the verbose TAP stream.
-+
-+Handy for putting in notes which might be useful for debugging, but
-+don't indicate a problem.
-+
-+    note("Tempfile is $tempfile");
-+
- =cut
- 
- sub diag {
--    my $tb = Test::More->builder;
-+    return Test::More->builder->diag(@_);
-+}
- 
--    $tb->diag(@_);
-+sub note {
-+    return Test::More->builder->note(@_);
- }
- 
-+=item B<explain>
-+
-+  my @dump = explain @diagnostic_message;
-+
-+Will dump the contents of any references in a human readable format.
-+Usually you want to pass this into C<note> or C<diag>.
-+
-+Handy for things like...
-+
-+    is_deeply($have, $want) || diag explain $have;
-+
-+or
-+
-+    note explain \%args;
-+    Some::Class->method(%args);
-+
-+=cut
-+
-+sub explain {
-+    return Test::More->builder->explain(@_);
-+}
- 
- =back
- 
-@@ -993,9 +1150,9 @@
- 
- =cut
- 
--#'#
-+## no critic (Subroutines::RequireFinalReturn)
- sub skip {
--    my($why, $how_many) = @_;
-+    my( $why, $how_many ) = @_;
-     my $tb = Test::More->builder;
- 
-     unless( defined $how_many ) {
-@@ -1006,19 +1163,19 @@
-     }
- 
-     if( defined $how_many and $how_many =~ /\D/ ) {
--        _carp "skip() was passed a non-numeric number of tests.  Did you get the arguments backwards?";
-+        _carp
-+          "skip() was passed a non-numeric number of tests.  Did you get the arguments backwards?";
-         $how_many = 1;
-     }
- 
--    for( 1..$how_many ) {
-+    for( 1 .. $how_many ) {
-         $tb->skip($why);
-     }
- 
--    local $^W = 0;
-+    no warnings 'exiting';
-     last SKIP;
- }
- 
--
- =item B<TODO: BLOCK>
- 
-     TODO: {
-@@ -1081,7 +1238,7 @@
- =cut
- 
- sub todo_skip {
--    my($why, $how_many) = @_;
-+    my( $why, $how_many ) = @_;
-     my $tb = Test::More->builder;
- 
-     unless( defined $how_many ) {
-@@ -1091,11 +1248,11 @@
-         $how_many = 1;
-     }
- 
--    for( 1..$how_many ) {
-+    for( 1 .. $how_many ) {
-         $tb->todo_skip($why);
-     }
- 
--    local $^W = 0;
-+    no warnings 'exiting';
-     last TODO;
- }
- 
-@@ -1131,11 +1288,13 @@
- 
- The test will exit with 255.
- 
-+For even better control look at L<Test::Most>.
-+
- =cut
- 
- sub BAIL_OUT {
-     my $reason = shift;
--    my $tb = Test::More->builder;
-+    my $tb     = Test::More->builder;
- 
-     $tb->BAIL_OUT($reason);
- }
-@@ -1174,14 +1333,14 @@
- 
- #'#
- sub eq_array {
--    local @Data_Stack;
-+    local @Data_Stack = ();
-     _deep_check(@_);
- }
- 
--sub _eq_array  {
--    my($a1, $a2) = @_;
-+sub _eq_array {
-+    my( $a1, $a2 ) = @_;
- 
--    if( grep !_type($_) eq 'ARRAY', $a1, $a2 ) {
-+    if( grep _type($_) ne 'ARRAY', $a1, $a2 ) {
-         warn "eq_array passed a non-array ref";
-         return 0;
-     }
-@@ -1190,12 +1349,12 @@
- 
-     my $ok = 1;
-     my $max = $#$a1 > $#$a2 ? $#$a1 : $#$a2;
--    for (0..$max) {
-+    for( 0 .. $max ) {
-         my $e1 = $_ > $#$a1 ? $DNE : $a1->[$_];
-         my $e2 = $_ > $#$a2 ? $DNE : $a2->[$_];
- 
--        push @Data_Stack, { type => 'ARRAY', idx => $_, vals => [$e1, $e2] };
--        $ok = _deep_check($e1,$e2);
-+        push @Data_Stack, { type => 'ARRAY', idx => $_, vals => [ $e1, $e2 ] };
-+        $ok = _deep_check( $e1, $e2 );
-         pop @Data_Stack if $ok;
- 
-         last unless $ok;
-@@ -1205,7 +1364,7 @@
- }
- 
- sub _deep_check {
--    my($e1, $e2) = @_;
-+    my( $e1, $e2 ) = @_;
-     my $tb = Test::More->builder;
- 
-     my $ok = 0;
-@@ -1217,27 +1376,31 @@
- 
-     {
-         # Quiet uninitialized value warnings when comparing undefs.
--        local $^W = 0; 
-+        no warnings 'uninitialized';
- 
--        $tb->_unoverload_str(\$e1, \$e2);
-+        $tb->_unoverload_str( \$e1, \$e2 );
- 
-         # Either they're both references or both not.
--        my $same_ref = !(!ref $e1 xor !ref $e2);
--	my $not_ref  = (!ref $e1 and !ref $e2);
-+        my $same_ref = !( !ref $e1 xor !ref $e2 );
-+        my $not_ref = ( !ref $e1 and !ref $e2 );
- 
-         if( defined $e1 xor defined $e2 ) {
-             $ok = 0;
-         }
--        elsif ( _dne($e1) xor _dne($e2) ) {
-+        elsif( !defined $e1 and !defined $e2 ) {
-+            # Shortcut if they're both defined.
-+            $ok = 1;
-+        }
-+        elsif( _dne($e1) xor _dne($e2) ) {
-             $ok = 0;
-         }
--        elsif ( $same_ref and ($e1 eq $e2) ) {
-+        elsif( $same_ref and( $e1 eq $e2 ) ) {
-             $ok = 1;
-         }
--	elsif ( $not_ref ) {
--	    push @Data_Stack, { type => '', vals => [$e1, $e2] };
--	    $ok = 0;
--	}
-+        elsif($not_ref) {
-+            push @Data_Stack, { type => '', vals => [ $e1, $e2 ] };
-+            $ok = 0;
-+        }
-         else {
-             if( $Refs_Seen{$e1} ) {
-                 return $Refs_Seen{$e1} eq $e2;
-@@ -1250,50 +1413,48 @@
-             $type = 'DIFFERENT' unless _type($e2) eq $type;
- 
-             if( $type eq 'DIFFERENT' ) {
--                push @Data_Stack, { type => $type, vals => [$e1, $e2] };
-+                push @Data_Stack, { type => $type, vals => [ $e1, $e2 ] };
-                 $ok = 0;
-             }
-             elsif( $type eq 'ARRAY' ) {
--                $ok = _eq_array($e1, $e2);
-+                $ok = _eq_array( $e1, $e2 );
-             }
-             elsif( $type eq 'HASH' ) {
--                $ok = _eq_hash($e1, $e2);
-+                $ok = _eq_hash( $e1, $e2 );
-             }
-             elsif( $type eq 'REF' ) {
--                push @Data_Stack, { type => $type, vals => [$e1, $e2] };
--                $ok = _deep_check($$e1, $$e2);
-+                push @Data_Stack, { type => $type, vals => [ $e1, $e2 ] };
-+                $ok = _deep_check( $$e1, $$e2 );
-                 pop @Data_Stack if $ok;
-             }
-             elsif( $type eq 'SCALAR' ) {
--                push @Data_Stack, { type => 'REF', vals => [$e1, $e2] };
--                $ok = _deep_check($$e1, $$e2);
-+                push @Data_Stack, { type => 'REF', vals => [ $e1, $e2 ] };
-+                $ok = _deep_check( $$e1, $$e2 );
-                 pop @Data_Stack if $ok;
-             }
--            elsif( $type ) {
--                push @Data_Stack, { type => $type, vals => [$e1, $e2] };
-+            elsif($type) {
-+                push @Data_Stack, { type => $type, vals => [ $e1, $e2 ] };
-                 $ok = 0;
-             }
--	    else {
--		_whoa(1, "No type in _deep_check");
--	    }
-+            else {
-+                _whoa( 1, "No type in _deep_check" );
-+            }
-         }
-     }
- 
-     return $ok;
- }
- 
--
- sub _whoa {
--    my($check, $desc) = @_;
--    if( $check ) {
--        die <<WHOA;
-+    my( $check, $desc ) = @_;
-+    if($check) {
-+        die <<"WHOA";
- WHOA!  $desc
- This should never happen!  Please contact the author immediately!
- WHOA
-     }
- }
- 
--
- =item B<eq_hash>
- 
-   my $is_eq = eq_hash(\%got, \%expected);
-@@ -1304,14 +1465,14 @@
- =cut
- 
- sub eq_hash {
--    local @Data_Stack;
-+    local @Data_Stack = ();
-     return _deep_check(@_);
- }
- 
- sub _eq_hash {
--    my($a1, $a2) = @_;
-+    my( $a1, $a2 ) = @_;
- 
--    if( grep !_type($_) eq 'HASH', $a1, $a2 ) {
-+    if( grep _type($_) ne 'HASH', $a1, $a2 ) {
-         warn "eq_hash passed a non-hash ref";
-         return 0;
-     }
-@@ -1320,12 +1481,12 @@
- 
-     my $ok = 1;
-     my $bigger = keys %$a1 > keys %$a2 ? $a1 : $a2;
--    foreach my $k (keys %$bigger) {
-+    foreach my $k ( keys %$bigger ) {
-         my $e1 = exists $a1->{$k} ? $a1->{$k} : $DNE;
-         my $e2 = exists $a2->{$k} ? $a2->{$k} : $DNE;
- 
--        push @Data_Stack, { type => 'HASH', idx => $k, vals => [$e1, $e2] };
--        $ok = _deep_check($e1, $e2);
-+        push @Data_Stack, { type => 'HASH', idx => $k, vals => [ $e1, $e2 ] };
-+        $ok = _deep_check( $e1, $e2 );
-         pop @Data_Stack if $ok;
- 
-         last unless $ok;
-@@ -1356,18 +1517,17 @@
- 
-     eq_set([\1, \2], [\2, \1]);
- 
--Test::Deep contains much better set comparison functions.
-+L<Test::Deep> contains much better set comparison functions.
- 
- =cut
- 
--sub eq_set  {
--    my($a1, $a2) = @_;
-+sub eq_set {
-+    my( $a1, $a2 ) = @_;
-     return 0 unless @$a1 == @$a2;
- 
--    # There's faster ways to do this, but this is easiest.
--    local $^W = 0;
-+    no warnings 'uninitialized';
- 
--    # It really doesn't matter how we sort them, as long as both arrays are 
-+    # It really doesn't matter how we sort them, as long as both arrays are
-     # sorted with the same algorithm.
-     #
-     # Ensure that references are not accidentally treated the same as a
-@@ -1379,8 +1539,8 @@
-     # I don't know how references would be sorted so we just don't sort
-     # them.  This means eq_set doesn't really work with refs.
-     return eq_array(
--           [grep(ref, @$a1), sort( grep(!ref, @$a1) )],
--           [grep(ref, @$a2), sort( grep(!ref, @$a2) )],
-+        [ grep( ref, @$a1 ), sort( grep( !ref, @$a1 ) ) ],
-+        [ grep( ref, @$a2 ), sort( grep( !ref, @$a2 ) ) ],
-     );
- }
- 
-@@ -1438,7 +1598,25 @@
- 
- =item Backwards compatibility
- 
--Test::More works with Perls as old as 5.004_05.
-+Test::More works with Perls as old as 5.6.0.
-+
-+
-+=item utf8 / "Wide character in print"
-+
-+If you use utf8 or other non-ASCII characters with Test::More you
-+might get a "Wide character in print" warning.  Using C<binmode
-+STDOUT, ":utf8"> will not fix it.  Test::Builder (which powers
-+Test::More) duplicates STDOUT and STDERR.  So any changes to them,
-+including changing their output disciplines, will not be seem by
-+Test::More.
-+
-+The work around is to change the filehandles used by Test::Builder
-+directly.
-+
-+    my $builder = Test::More->builder;
-+    binmode $builder->output,         ":utf8";
-+    binmode $builder->failure_output, ":utf8";
-+    binmode $builder->todo_output,    ":utf8";
- 
- 
- =item Overloaded objects
-@@ -1452,7 +1630,7 @@
- 
- However, it does mean that functions like is_deeply() cannot be used to
- test the internals of string overloaded objects.  In this case I would
--suggest Test::Deep which contains more flexible testing functions for
-+suggest L<Test::Deep> which contains more flexible testing functions for
- complex data structures.
- 
- 
-@@ -1474,11 +1652,11 @@
- 
- =item Test::Harness upgrade
- 
--no_plan and todo depend on new Test::Harness features and fixes.  If
--you're going to distribute tests that use no_plan or todo your
--end-users will have to upgrade Test::Harness to the latest one on
--CPAN.  If you avoid no_plan and TODO tests, the stock Test::Harness
--will work fine.
-+no_plan, todo and done_testing() depend on new Test::Harness features
-+and fixes.  If you're going to distribute tests that use no_plan or
-+todo your end-users will have to upgrade Test::Harness to the latest
-+one on CPAN.  If you avoid no_plan and TODO tests, the stock
-+Test::Harness will work fine.
- 
- Installing Test::More should also upgrade Test::Harness.
- 
-@@ -1506,21 +1684,21 @@
- some tests.  You can upgrade to Test::More later (it's forward
- compatible).
- 
--L<Test> is the old testing module.  Its main benefit is that it has
--been distributed with Perl since 5.004_05.
--
--L<Test::Harness> for details on how your test results are interpreted
--by Perl.
-+L<Test::Harness> is the test runner and output interpreter for Perl.
-+It's the thing that powers C<make test> and where the C<prove> utility
-+comes from.
-+
-+L<Test::Legacy> tests written with Test.pm, the original testing
-+module, do not play well with other testing libraries.  Test::Legacy
-+emulates the Test.pm interface and does play well with others.
- 
- L<Test::Differences> for more ways to test complex data structures.
- And it plays well with Test::More.
- 
--L<Test::Class> is like XUnit but more perlish.
-+L<Test::Class> is like xUnit but more perlish.
- 
- L<Test::Deep> gives you more powerful complex data structure testing.
- 
--L<Test::Unit> is XUnit style testing.
--
- L<Test::Inline> shows the idea of embedded testing.
- 
- L<Bundle::Test> installs a whole bunch of useful test modules.
-@@ -1539,9 +1717,15 @@
- See F<http://rt.cpan.org> to report and view bugs.
- 
- 
-+=head1 SOURCE
-+
-+The source code repository for Test::More can be found at
-+F<http://github.com/schwern/test-more/>.
-+
-+
- =head1 COPYRIGHT
- 
--Copyright 2001-2002, 2004-2006 by Michael G Schwern E<lt>schwern@pobox.comE<gt>.
-+Copyright 2001-2008 by Michael G Schwern E<lt>schwern@pobox.comE<gt>.
- 
- This program is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself.
-diff -urN perl-5.10.0.orig/lib/Test/Simple/Changes perl-5.10.0/lib/Test/Simple/Changes
---- perl-5.10.0.orig/lib/Test/Simple/Changes	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/Changes	2009-08-26 06:14:11.000000000 +0200
-@@ -1,8 +1,226 @@
-+0.92  Fri Jul  3 11:08:56 PDT 2009
-+    Test Fixes
-+    * Silence noise on VMS in exit.t (Craig Berry)
-+    * Skip Builder/fork_with_new_stdout.t on systems without fork (Craig Berry)
-+    
-+
-+0.90  Thu Jul  2 13:18:25 PDT 2009
-+    Docs
-+    * Finally added a note about the "Wide character in print" warning and
-+      how to work around it.
-+    * Note the IO::Stringy license in our copy of it.
-+      [test-more.googlecode.com 47]
-+
-+    Test Fixes
-+    * Small fixes for integration with the Perl core
-+      [bleadperl eaa0815147e13cd4ab5b3d6ca8f26544a9f0c3b4]
-+    * exit code tests could be effected by errno when PERLIO=stdio
-+      [bleadperl c76230386fc5e6fba9fdbeab473abbf4f4adcbe3]
-+
-+    Other
-+    * This is a stable release for 5.10.1.  It does not include
-+      the subtest() work in 0.89_01.
-+
-+
-+0.88  Sat May 30 12:31:24 PDT 2009
-+    Turing 0.87_03 into a stable release.
-+
-+
-+0.87_03  Sun May 24 13:41:40 PDT 2009
-+    New Features
-+    * isa_ok() now works on classes. (Peter Scott)
-+
-+
-+0.87_02  Sat Apr 11 12:54:14 PDT 2009
-+    Test Fixes
-+    * Some filesystems don't like it when you open a file for writing multiple
-+      times.  Fixes t/Builder/reset.t. [rt.cpan.org 17298]
-+    * Check how an operating system is going to map exit codes.  Some OS'
-+      will map them... sometimes.  [rt.cpan.org 42148]
-+    * Fix Test::Builder::NoOutput on 5.6.2.
-+
-+
-+0.87_01  Sun Mar 29 09:56:52 BST 2009
-+    New Features
-+    * done_testing() allows you to declare that you have finished running tests,
-+      and how many you ran.  It is a safer no_plan and effectively replaces it.
-+    * output() now supports scalar references.
-+
-+    Feature Changes
-+    * You can now run a test without first declaring a plan.  This allows
-+      done_testing() to work.
-+    * You can now call current_test() without first declaring a plan.
-+
-+    Bug Fixes
-+    * skip_all() with no reason would output "1..0" which is invalid TAP.  It will
-+      now always include the SKIP directive.
-+
-+    Other
-+    * Repository moved to github.
-+
-+
-+0.86  Sun Nov  9 01:09:05 PST 2008
-+    Same as 0.85_01
-+
-+
-+0.85_01  Thu Oct 23 18:57:38 PDT 2008
-+    New Features
-+    * cmp_ok() now displays the error if the comparison throws one.
-+      For example, broken overloaded objects.
-+
-+    Bug Fixes
-+    * cmp_ok() no longer stringifies or numifies its arguments before comparing.
-+      This makes cmp_ok() properly test overloaded ops.
-+      [rt.cpan.org 24186] [code.google.com 16]
-+    * diag() properly escapes blank lines.
-+
-+    Feature Changes
-+    * cmp_ok() now reports warnings and errors as coming from inside cmp_ok,
-+      as well as reporting the caller's file and line.  This let's the user
-+      know where cmp_ok() was called from while reminding them that it is
-+      being run in a different context.
-+
-+    Other
-+    * Dependency on ExtUtils::MakeMaker 6.27 only on Windows otherwise the
-+      nested tests won't run.
-+
-+
-+0.84  Wed Oct 15 09:06:12 EDT 2008
-+    Other
-+    * 0.82 accidentally shipped with experimental Mouse dependency.
-+
-+
-+0.82  Tue Oct 14 23:06:56 EDT 2008
-+    Bug Fixes
-+    - 0.81_01 broke $TODO such that $TODO = '' was considered todo.
-+
-+
-+0.81_02  Tue Sep  9 04:35:40 PDT 2008
-+    New Features
-+    * Test::Builder->reset_outputs() to reset all the output methods back to
-+      their defaults.
-+
-+    Bug Fixes
-+    - Fixed the file and line number reported by like when it gets a bad
-+      regex.
-+
-+    Features Changed
-+    - Now preserves the tests' exit code if it exits abnormally, rather than
-+      setting it to 255.
-+    - Changed the "Looks like your test died" message to
-+      "Looks like your test exited with $exit_code"
-+    - no_plan now only warns if given an argument.  There were a lot of people
-+      doing that, and it's a sensible mistake.  [test-more.googlecode.com 13]
-+
-+
-+0.81_01  Sat Sep  6 15:13:50 PDT 2008
-+    New Features
-+    * Adam Kennedy bribed me to add new_ok().  The price was one DEFCON license key.
-+      [rt.cpan.org 8891]
-+    * TODO tests can now start and end with 'todo_start' and 'todo_end'
-+      Test::Builder methods. [rt.cpan.org 38018]
-+    * Added Test::Builder->in_todo() for a safe way to check if a test is inside a
-+      TODO block.  This allows TODO tests with no reason.
-+    * Added note() and explain() to both Test::More and Test::Builder.
-+      [rt.cpan.org 14764] [test-more.googlecode.com 3]
-+
-+    Features Changed
-+    * Changed the message for extra tests run to show the number of tests run rather than
-+      the number extra to avoid the user having to do mental math.
-+      [rt.cpan.org 7022]    
-+
-+    Bug fixes
-+    - using a relative path to perl broke tests              [rt.cpan.org 34050]
-+    - use_ok() broke $SIG{__DIE__} in the used module        [rt.cpan.org 34065]
-+    - diagnostics for isnt() were confusing on failure       [rt.cpan.org 33642]
-+    - warnings when MakeMaker's version contained _          [rt.cpan.org 33626]
-+    - add explicit test that non-integer plans die correctly [rt.cpan.org 28836]
-+      (Thanks to Hans Dieter Pearcey [confound] for fixing the above)
-+    - die if no_plan is given an argument                    [rt.cpan.org 27429]
-+
-+
-+0.80  Sun Apr  6 17:25:01 CEST 2008
-+    Test fixes
-+    - Completely disable the utf8 test.  It was causing perl to panic on some OS's.
-+
-+
-+0.79_01  Wed Feb 27 03:04:54 PST 2008
-+    Bug fixes
-+    - Let's try the IO layer copying again, this time with the test
-+      fixed for 5.10.
-+
-+
-+0.78  Wed Feb 27 01:59:09 PST 2008
-+    Bug fixes
-+    * Whoops, the version of Test::Builder::Tester got moved backwards.
-+
-+
-+0.77  Wed Feb 27 01:55:55 PST 2008
-+    Bug fixes
-+    - "use Test::Builder::Module" no longer sets exported_to() or does
-+      any other importing.
-+    - Fix the $TODO finding code so it can find $TODO without the benefit
-+      of exported_to(), which is often wrong.
-+    - Turn off the filehandle locale stuff for the moment, there's a 
-+      problem on 5.10.  We'll try it again next release.
-+      
-+    Doc improvements
-+    - Improve the Test::Builder SYNOPSIS to use Test::Builder::Module
-+      rather than write it's own import().
-+
-+
-+0.76_02  Sun Feb 24 13:12:55 PST 2008
-+    Bug fixes
-+    * The default test output filehandles will NOT use utf8.
-+      They will now copy the IO layers from STDOUT and STDERR.
-+      This means if :utf8 is on then it will honor it and not
-+      warn about wide characters.
-+
-+
-+0.76_01  Sat Feb 23 20:44:32 PST 2008
-+    Bug fixes
-+    * Test::Builder no longer uses a __DIE__ handler.  This resolves a number
-+      of problems with exit codes being swallowed or other module's handlers
-+      being interfered with.  [rt.cpan.org 25294]
-+    - Allow maybe_regex() to detect blessed regexes.  [bleadperl @32880]
-+    - The default test output filehandles will now use utf8.
-+      [rt.cpan.org 21091]
-+
-+    Test fixes
-+    - Remove the signature test.  Adds no security and just generates
-+      failures.
-+
-+
-+0.75  Sat Feb 23 19:03:38 PST 2008
-+    Incompatibilities
-+    * The minimum version is now 5.6.0.
-+
-+    Bug fixes
-+    - Turns out require_ok() had the same bug as use_ok() in a BEGIN block.
-+    - ok() was not honoring exported_to() when looking for $TODO as it
-+      should be.
-+    
-+    Test fixes
-+    * is_deeply_with_threads.t will not run unless AUTHOR_TESTING is set.
-+      This is because it tickles intermittent threading bugs in many perls
-+      and causes a lot of bug reports about which I can do nothing.
-+    
-+    Misc
-+    - Ran through perlcritic and did some cleaning.
-+
-+0.74  Thu Nov 29 15:39:57 PST 2007
-+    Misc
-+    - Add abstract and author to the meta information.
-+
-+0.73_01  Mon Oct 15 20:35:15 EDT 2007
-+    Bug fixes
-+    * Put the use_ok() fix from 0.71 back.
-+
- 0.72  Wed Sep 19 20:08:07 PDT 2007
-     Bug unfixes
-     * The BEGIN { use_ok } fix for [rt.cpan.org 28345] revealed a small pile of 
--      mistakes in CPAN module test suites.  Rolling the fix back to give the authors
--      a bit of time to fix their tests.
-+      mistakes in CPAN module test suites.  Rolling the fix back to give the
-+      authors a bit of time to fix their tests.
- 
- 0.71  Thu Sep 13 20:42:36 PDT 2007
-     Bug fixes
-@@ -15,8 +233,8 @@
-     - Removed dependency on Text::Soundex [rt.cpan.org 25022]
-     - Fixed a 5.5.x failure in fail-more.t
-     * Got rid of the annoying sort_bug.t test that revealed problems with some
--      threaded perls.  It was testing the deprecated eq_* functions and not worth the
--      bother.  Now it tests is_deeply().  [rt.cpan.org 17791]
-+      threaded perls.  It was testing the deprecated eq_* functions and not
-+      worth the bother.  Now it tests is_deeply().  [rt.cpan.org 17791]
- 
-     Doc fixes
-     - Minor POD mistake in Test::Builder [rt.cpan.org 28869]
-diff -urN perl-5.10.0.orig/lib/Test/Simple/README perl-5.10.0/lib/Test/Simple/README
---- perl-5.10.0.orig/lib/Test/Simple/README	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/README	2009-08-26 06:14:11.000000000 +0200
-@@ -13,3 +13,10 @@
- make
- make test
- make install
-+
-+It requires Perl version 5.6.0 or newer and Test::Harness 2.03 or newer.
-+
-+
-+* More Info
-+
-+More information can be found at http://test-more.googlecode.com/
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/bad_plan.t perl-5.10.0/lib/Test/Simple/t/bad_plan.t
---- perl-5.10.0.orig/lib/Test/Simple/t/bad_plan.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/bad_plan.t	2009-08-26 06:14:11.000000000 +0200
-@@ -7,32 +7,17 @@
-     }
- }
- 
--my $test_num = 1;
--# Utility testing functions.
--sub ok ($;$) {
--    my($test, $name) = @_;
--    my $ok = '';
--    $ok .= "not " unless $test;
--    $ok .= "ok $test_num";
--    $ok .= " - $name" if defined $name;
--    $ok .= "\n";
--    print $ok;
--    $test_num++;
--
--    return $test;
--}
--
--
- use Test::Builder;
- my $Test = Test::Builder->new;
-+$Test->plan( tests => 2 );
-+$Test->level(0);
- 
--print "1..2\n";
-+my $tb = Test::Builder->create;
- 
--eval { $Test->plan(7); };
--ok( $@ =~ /^plan\(\) doesn't understand 7/, 'bad plan()' ) ||
-+eval { $tb->plan(7); };
-+$Test->like( $@, qr/^plan\(\) doesn't understand 7/, 'bad plan()' ) ||
-     print STDERR "# $@";
- 
--eval { $Test->plan(wibble => 7); };
--ok( $@ =~ /^plan\(\) doesn't understand wibble 7/, 'bad plan()' ) ||
-+eval { $tb->plan(wibble => 7); };
-+$Test->like( $@, qr/^plan\(\) doesn't understand wibble 7/, 'bad plan()' ) ||
-     print STDERR "# $@";
--
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/bail_out.t perl-5.10.0/lib/Test/Simple/t/bail_out.t
---- perl-5.10.0.orig/lib/Test/Simple/t/bail_out.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/bail_out.t	2009-08-26 06:14:11.000000000 +0200
-@@ -18,30 +18,22 @@
- 
- use Test::Builder;
- use Test::More;
--use TieOut;
- 
--my $output = tie *FAKEOUT, 'TieOut';
-+my $output;
- my $TB = Test::More->builder;
--$TB->output(\*FAKEOUT);
-+$TB->output(\$output);
- 
- my $Test = Test::Builder->create;
- $Test->level(0);
- 
--if( $] >= 5.005 ) {
--    $Test->plan(tests => 3);
--}
--else {
--    $Test->plan(skip_all => 
--          'CORE::GLOBAL::exit, introduced in 5.005, is needed for testing');
--}
--
-+$Test->plan(tests => 3);
- 
- plan tests => 4;
- 
- BAIL_OUT("ROCKS FALL! EVERYONE DIES!");
- 
- 
--$Test->is_eq( $output->read, <<'OUT' );
-+$Test->is_eq( $output, <<'OUT' );
- 1..4
- Bail out!  ROCKS FALL! EVERYONE DIES!
- OUT
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/BEGIN_require_ok.t perl-5.10.0/lib/Test/Simple/t/BEGIN_require_ok.t
---- perl-5.10.0.orig/lib/Test/Simple/t/BEGIN_require_ok.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/BEGIN_require_ok.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,27 @@
-+#!/usr/bin/perl -w
-+
-+# Fixed a problem with BEGIN { use_ok or require_ok } silently failing when there's no
-+# plan set.  [rt.cpan.org 28345]  Thanks Adriano Ferreira and Yitzchak.
-+
-+use strict;
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ('../lib', 'lib');
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use Test::More;
-+
-+my $result;
-+BEGIN {
-+    $result = require_ok("strict");
-+}
-+
-+ok $result, "require_ok ran";
-+
-+done_testing(2);
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/BEGIN_use_ok.t perl-5.10.0/lib/Test/Simple/t/BEGIN_use_ok.t
---- perl-5.10.0.orig/lib/Test/Simple/t/BEGIN_use_ok.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/BEGIN_use_ok.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,26 @@
-+#!/usr/bin/perl -w
-+
-+# [rt.cpan.org 28345]
-+#
-+# A use_ok() inside a BEGIN block lacking a plan would be silently ignored.
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ('../lib', 'lib');
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use Test::More;
-+
-+my $result;
-+BEGIN {
-+    $result = use_ok("strict");
-+}
-+
-+ok( $result, "use_ok() ran" );
-+done_testing(2);
-+
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/c_flag.t perl-5.10.0/lib/Test/Simple/t/c_flag.t
---- perl-5.10.0.orig/lib/Test/Simple/t/c_flag.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/c_flag.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,21 @@
-+#!/usr/bin/perl -w
-+
-+# Test::More should not print anything when Perl is only doing
-+# a compile as with the -c flag or B::Deparse or perlcc.
-+
-+# HARNESS_ACTIVE=1 was causing an error with -c
-+{
-+    local $ENV{HARNESS_ACTIVE} = 1;
-+    local $^C = 1;
-+
-+    require Test::More;
-+    Test::More->import(tests => 1);
-+
-+    fail("This should not show up");
-+}
-+
-+Test::More->builder->no_ending(1);
-+
-+print "1..1\n";
-+print "ok 1\n";
-+
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/cmp_ok.t perl-5.10.0/lib/Test/Simple/t/cmp_ok.t
---- perl-5.10.0.orig/lib/Test/Simple/t/cmp_ok.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/cmp_ok.t	2009-08-26 06:14:11.000000000 +0200
-@@ -3,7 +3,7 @@
- BEGIN {
-     if( $ENV{PERL_CORE} ) {
-         chdir 't';
--        @INC = ('../lib', 'lib');
-+        @INC = ('../lib', 'lib', '../lib/Test/Simple/t/lib');
-     }
-     else {
-         unshift @INC, 't/lib';
-@@ -29,19 +29,19 @@
-     $expect{error} =~ s/ at .*\n?//;
- 
-     local $Test::Builder::Level = $Test::Builder::Level + 1;
--    my $ok = cmp_ok($left, $cmp, $right);
--    $TB->is_num(!!$ok, !!$expect{ok});
-+    my $ok = cmp_ok($left, $cmp, $right, "cmp_ok");
-+    $TB->is_num(!!$ok, !!$expect{ok}, "  right return");
-     
-     my $diag = $err->read;
-     if( !$ok and $expect{error} ) {
-         $diag =~ s/^# //mg;
--        $TB->like( $diag, "/\Q$expect{error}\E/" );
-+        $TB->like( $diag, qr/\Q$expect{error}\E/, "  expected error" );
-     }
-     elsif( $ok ) {
--        $TB->is_eq( $diag, '' );
-+        $TB->is_eq( $diag, '', "  passed without diagnostic" );
-     }
-     else {
--        $TB->ok(1);
-+        $TB->ok(1, "  failed without diagnostic");
-     }
- }
- 
-@@ -49,6 +49,10 @@
- use Test::More;
- Test::More->builder->no_ending(1);
- 
-+require MyOverload;
-+my $cmp = Overloaded::Compare->new("foo", 42);
-+my $ify = Overloaded::Ify->new("bar", 23);
-+
- my @Tests = (
-     [1, '==', 1],
-     [1, '==', 2],
-@@ -56,23 +60,12 @@
-     ["a", "eq", "a"],
-     [1, "+", 1],
-     [1, "-", 1],
--);
- 
--# These don't work yet.
--if( 0 ) {
--#if( eval { require overload } ) {
--    require MyOverload;
--    
--    my $cmp = Overloaded::Compare->new("foo", 42);
--    my $ify = Overloaded::Ify->new("bar", 23);
--    
--    push @Tests, (
--        [$cmp, '==', 42],
--        [$cmp, 'eq', "foo"],
--        [$ify, 'eq', "bar"],
--        [$ify, "==", 23],
--    );
--}
-+    [$cmp, '==', 42],
-+    [$cmp, 'eq', "foo"],
-+    [$ify, 'eq', "bar"],
-+    [$ify, "==", 23],
-+);
- 
- plan tests => scalar @Tests;
- $TB->plan(tests => @Tests * 2);
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/create.t perl-5.10.0/lib/Test/Simple/t/create.t
---- perl-5.10.0.orig/lib/Test/Simple/t/create.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/create.t	2009-08-26 06:14:11.000000000 +0200
-@@ -12,8 +12,9 @@
-     }
- }
- 
--use Test::More tests => 8;
-+use Test::More tests => 7;
- use Test::Builder;
-+use Test::Builder::NoOutput;
- 
- my $more_tb = Test::More->builder;
- isa_ok $more_tb, 'Test::Builder';
-@@ -22,24 +23,18 @@
- is $more_tb, Test::Builder->new,  '       does not interfere with ->new';
- 
- {
--    my $new_tb  = Test::Builder->create;
-+    my $new_tb = Test::Builder::NoOutput->create;
- 
-     isa_ok $new_tb,  'Test::Builder';
-     isnt $more_tb, $new_tb, 'Test::Builder->create makes a new object';
- 
--    $new_tb->output("some_file");
--    END { 1 while unlink "some_file" }
--
-     $new_tb->plan(tests => 1);
--    $new_tb->ok(1);
--}
--
--pass("Changing output() of new TB doesn't interfere with singleton");
-+    $new_tb->ok(1, "a test");
- 
--ok open FILE, "some_file";
--is join("", <FILE>), <<OUT;
-+    is $new_tb->read, <<'OUT';
- 1..1
--ok 1
-+ok 1 - a test
- OUT
-+}
- 
--close FILE;
-+pass("Changing output() of new TB doesn't interfere with singleton");
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/current_test.t perl-5.10.0/lib/Test/Simple/t/current_test.t
---- perl-5.10.0.orig/lib/Test/Simple/t/current_test.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/current_test.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,11 @@
-+#!/usr/bin/perl -w
-+
-+# Dave Rolsky found a bug where if current_test() is used and no
-+# tests are run via Test::Builder it will blow up.
-+
-+use Test::Builder;
-+$TB = Test::Builder->new;
-+$TB->plan(tests => 2);
-+print "ok 1\n";
-+print "ok 2\n";
-+$TB->current_test(2);
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/current_test_without_plan.t perl-5.10.0/lib/Test/Simple/t/current_test_without_plan.t
---- perl-5.10.0.orig/lib/Test/Simple/t/current_test_without_plan.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/current_test_without_plan.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,16 @@
-+#!/usr/bin/perl -w
-+
-+# Test that current_test() will work without a declared plan.
-+
-+use Test::Builder;
-+
-+my $tb = Test::Builder->new;
-+$tb->current_test(2);
-+print <<'END';
-+ok 1
-+ok 2
-+END
-+
-+$tb->ok(1, "Third test");
-+
-+$tb->done_testing(3);
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/curr_test.t perl-5.10.0/lib/Test/Simple/t/curr_test.t
---- perl-5.10.0.orig/lib/Test/Simple/t/curr_test.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/curr_test.t	1970-01-01 01:00:00.000000000 +0100
-@@ -1,11 +0,0 @@
--#!/usr/bin/perl -w
--
--# Dave Rolsky found a bug where if current_test() is used and no
--# tests are run via Test::Builder it will blow up.
--
--use Test::Builder;
--$TB = Test::Builder->new;
--$TB->plan(tests => 2);
--print "ok 1\n";
--print "ok 2\n";
--$TB->current_test(2);
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/details.t perl-5.10.0/lib/Test/Simple/t/details.t
---- perl-5.10.0.orig/lib/Test/Simple/t/details.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/details.t	2009-08-26 06:14:11.000000000 +0200
-@@ -29,13 +29,11 @@
- 
- # Inline TODO tests will confuse pre 1.20 Test::Harness, so we
- # should just avoid the problem and not print it out.
--my $out_fh  = $Test->output;
--my $todo_fh = $Test->todo_output;
- my $start_test = $Test->current_test + 1;
--require TieOut;
--tie *FH, 'TieOut';
--$Test->output(\*FH);
--$Test->todo_output(\*FH);
-+
-+my $output = '';
-+$Test->output(\$output);
-+$Test->todo_output(\$output);
- 
- SKIP: {
-     $Test->skip( 'just testing skip' );
-@@ -68,8 +66,7 @@
-                         };
- 
- for ($start_test..$Test->current_test) { print "ok $_\n" }
--$Test->output($out_fh);
--$Test->todo_output($todo_fh);
-+$Test->reset_outputs;
- 
- $Test->is_num( scalar $Test->summary(), 4,   'summary' );
- push @Expected_Details, { 'ok'      => 1,
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/diag.t perl-5.10.0/lib/Test/Simple/t/diag.t
---- perl-5.10.0.orig/lib/Test/Simple/t/diag.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/diag.t	2009-08-26 06:14:11.000000000 +0200
-@@ -24,49 +24,58 @@
- 
- use strict;
- 
--use Test::More tests => 5;
-+use Test::Builder::NoOutput;
-+use Test::More tests => 7;
- 
--my $Test = Test::More->builder;
-+my $test = Test::Builder::NoOutput->create;
- 
--# now make a filehandle where we can send data
--use TieOut;
--my $output = tie *FAKEOUT, 'TieOut';
--
--# force diagnostic output to a filehandle, glad I added this to
--# Test::Builder :)
--my $ret;
-+# Test diag() goes to todo_output() in a todo test.
- {
--    local $TODO = 1;
--    $Test->todo_output(\*FAKEOUT);
--
--    diag("a single line");
--
--    $ret = diag("multiple\n", "lines");
--}
-+    $test->todo_start();
- 
--is( $output->read, <<'DIAG',   'diag() with todo_output set' );
-+    $test->diag("a single line");
-+    is( $test->read('todo'), <<'DIAG',   'diag() with todo_output set' );
- # a single line
-+DIAG
-+
-+    my $ret = $test->diag("multiple\n", "lines");
-+    is( $test->read('todo'), <<'DIAG',   '  multi line' );
- # multiple
- # lines
- DIAG
-+    ok( !$ret, 'diag returns false' );
-+
-+    $test->todo_end();
-+}
- 
--ok( !$ret, 'diag returns false' );
- 
-+# Test diagnostic formatting
- {
--    $Test->failure_output(\*FAKEOUT);
--    $ret = diag("# foo");
-+    $test->diag("# foo");
-+    is( $test->read('err'), "# # foo\n", "diag() adds # even if there's one already" );
-+
-+    $test->diag("foo\n\nbar");
-+    is( $test->read('err'), <<'DIAG', "  blank lines get escaped" );
-+# foo
-+# 
-+# bar
-+DIAG
-+
-+    $test->diag("foo\n\nbar\n\n");
-+    is( $test->read('err'), <<'DIAG', "  even at the end" );
-+# foo
-+# 
-+# bar
-+# 
-+DIAG
- }
--$Test->failure_output(\*STDERR);
--is( $output->read, "# # foo\n", "diag() adds # even if there's one already" );
--ok( !$ret,  'diag returns false' );
- 
- 
--# [rt.cpan.org 8392]
-+# [rt.cpan.org 8392] diag(@list) emulates print
- {
--    $Test->failure_output(\*FAKEOUT);
--    diag(qw(one two));
--}
--$Test->failure_output(\*STDERR);
--is( $output->read, <<'DIAG' );
-+    $test->diag(qw(one two));
-+
-+    is( $test->read('err'), <<'DIAG' );
- # onetwo
- DIAG
-+}
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/died.t perl-5.10.0/lib/Test/Simple/t/died.t
---- perl-5.10.0.orig/lib/Test/Simple/t/died.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/died.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,45 @@
-+#!perl -w
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = '../lib';
-+    }
-+}
-+
-+# Can't use Test.pm, that's a 5.005 thing.
-+package My::Test;
-+
-+# This has to be a require or else the END block below runs before
-+# Test::Builder's own and the ending diagnostics don't come out right.
-+require Test::Builder;
-+my $TB = Test::Builder->create;
-+$TB->plan(tests => 3);
-+
-+
-+package main;
-+
-+require Test::Simple;
-+
-+chdir 't';
-+push @INC, '../t/lib/';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+local $ENV{HARNESS_ACTIVE} = 0;
-+
-+Test::Simple->import(tests => 1);
-+exit 250;
-+
-+END {
-+    $TB->is_eq($out->read, <<OUT);
-+1..1
-+OUT
-+
-+    $TB->is_eq($err->read, <<ERR);
-+# Looks like your test exited with 250 before it could output anything.
-+ERR
-+
-+    $TB->is_eq($?, 250, "exit code");
-+
-+    exit grep { !$_ } $TB->summary;
-+}
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/done_testing_double.t perl-5.10.0/lib/Test/Simple/t/done_testing_double.t
---- perl-5.10.0.orig/lib/Test/Simple/t/done_testing_double.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/done_testing_double.t	2009-08-26 06:14:40.000000000 +0200
-@@ -0,0 +1,46 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = qw(../lib lib ../lib/Test/Simple/t/lib);
-+    }
-+}
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::Builder;
-+use Test::Builder::NoOutput;
-+
-+my $tb = Test::Builder::NoOutput->create;
-+
-+{
-+    # Normalize test output
-+    local $ENV{HARNESS_ACTIVE};
-+
-+    $tb->ok(1);
-+    $tb->ok(1);
-+    $tb->ok(1);
-+
-+#line 24
-+    $tb->done_testing(3);
-+    $tb->done_testing;
-+    $tb->done_testing;
-+}
-+
-+my $Test = Test::Builder->new;
-+$Test->plan( tests => 1 );
-+$Test->level(0);
-+$Test->is_eq($tb->read, <<"END", "multiple done_testing");
-+ok 1
-+ok 2
-+ok 3
-+1..3
-+not ok 4 - done_testing() was already called at $0 line 24
-+#   Failed test 'done_testing() was already called at $0 line 24'
-+#   at $0 line 25.
-+not ok 5 - done_testing() was already called at $0 line 24
-+#   Failed test 'done_testing() was already called at $0 line 24'
-+#   at $0 line 26.
-+END
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/done_testing_plan_mismatch.t perl-5.10.0/lib/Test/Simple/t/done_testing_plan_mismatch.t
---- perl-5.10.0.orig/lib/Test/Simple/t/done_testing_plan_mismatch.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/done_testing_plan_mismatch.t	2009-08-26 06:14:43.000000000 +0200
-@@ -0,0 +1,44 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = qw(../lib lib ../lib/Test/Simple/t/lib);
-+    }
-+}
-+
-+# What if there's a plan and done_testing but they don't match?
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::Builder;
-+use Test::Builder::NoOutput;
-+
-+my $tb = Test::Builder::NoOutput->create;
-+
-+{
-+    # Normalize test output
-+    local $ENV{HARNESS_ACTIVE};
-+
-+    $tb->plan( tests => 3 );
-+    $tb->ok(1);
-+    $tb->ok(1);
-+    $tb->ok(1);
-+
-+#line 24
-+    $tb->done_testing(2);
-+}
-+
-+my $Test = Test::Builder->new;
-+$Test->plan( tests => 1 );
-+$Test->level(0);
-+$Test->is_eq($tb->read, <<"END");
-+1..3
-+ok 1
-+ok 2
-+ok 3
-+not ok 4 - planned to run 3 but done_testing() expects 2
-+#   Failed test 'planned to run 3 but done_testing() expects 2'
-+#   at $0 line 24.
-+END
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/done_testing.t perl-5.10.0/lib/Test/Simple/t/done_testing.t
---- perl-5.10.0.orig/lib/Test/Simple/t/done_testing.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/done_testing.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,12 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+
-+use Test::Builder;
-+
-+my $tb = Test::Builder->new;
-+$tb->level(0);
-+
-+$tb->ok(1, "testing done_testing() with no arguments");
-+$tb->ok(1, "  another test so we're not testing just one");
-+$tb->done_testing();
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/done_testing_with_no_plan.t perl-5.10.0/lib/Test/Simple/t/done_testing_with_no_plan.t
---- perl-5.10.0.orig/lib/Test/Simple/t/done_testing_with_no_plan.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/done_testing_with_no_plan.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,11 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+
-+use Test::Builder;
-+
-+my $tb = Test::Builder->new;
-+$tb->plan( "no_plan" );
-+$tb->ok(1);
-+$tb->ok(1);
-+$tb->done_testing(2);
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/done_testing_with_number.t perl-5.10.0/lib/Test/Simple/t/done_testing_with_number.t
---- perl-5.10.0.orig/lib/Test/Simple/t/done_testing_with_number.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/done_testing_with_number.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,12 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+
-+use Test::Builder;
-+
-+my $tb = Test::Builder->new;
-+$tb->level(0);
-+
-+$tb->ok(1, "testing done_testing() with no arguments");
-+$tb->ok(1, "  another test so we're not testing just one");
-+$tb->done_testing(2);
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/done_testing_with_plan.t perl-5.10.0/lib/Test/Simple/t/done_testing_with_plan.t
---- perl-5.10.0.orig/lib/Test/Simple/t/done_testing_with_plan.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/done_testing_with_plan.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,11 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+
-+use Test::Builder;
-+
-+my $tb = Test::Builder->new;
-+$tb->plan( tests => 2 );
-+$tb->ok(1);
-+$tb->ok(1);
-+$tb->done_testing(2);
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/dont_overwrite_die_handler.t perl-5.10.0/lib/Test/Simple/t/dont_overwrite_die_handler.t
---- perl-5.10.0.orig/lib/Test/Simple/t/dont_overwrite_die_handler.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/dont_overwrite_die_handler.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,19 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = '../lib';
-+    }
-+}
-+
-+# Make sure this is in place before Test::More is loaded.
-+my $handler_called;
-+BEGIN {
-+    $SIG{__DIE__} = sub { $handler_called++ };
-+}
-+
-+use Test::More tests => 2;
-+
-+ok !eval { die };
-+is $handler_called, 1, 'existing DIE handler not overridden';
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/exit.t perl-5.10.0/lib/Test/Simple/t/exit.t
---- perl-5.10.0.orig/lib/Test/Simple/t/exit.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/exit.t	2009-08-26 06:14:11.000000000 +0200
-@@ -10,59 +10,27 @@
-     }
- }
- 
--unless( eval { require File::Spec } ) {
--    print "1..0 # Skip Need File::Spec to run this test\n";
--    exit 0;
--}
--
--if( $^O eq 'VMS' && $] <= 5.00503 ) {
--    print "1..0 # Skip test will hang on older VMS perls\n";
--    exit 0;
--}
--
--if( $^O eq 'MacOS' ) {
--    print "1..0 # Skip exit status broken on Mac OS\n";
--    exit 0;
--}
--
--my $test_num = 1;
--# Utility testing functions.
--sub ok ($;$) {
--    my($test, $name) = @_;
--    my $ok = '';
--    $ok .= "not " unless $test;
--    $ok .= "ok $test_num";
--    $ok .= " - $name" if defined $name;
--    $ok .= "\n";
--    print $ok;
--    $test_num++;
--}
-+require Test::Builder;
-+my $TB = Test::Builder->create();
-+$TB->level(0);
- 
- 
- package main;
- 
--my $IsVMS = $^O eq 'VMS';
-+use Cwd;
-+use File::Spec;
- 
--print "# Ahh!  I see you're running VMS.\n" if $IsVMS;
-+my $Orig_Dir = cwd;
- 
--my %Tests = (
--             #                      Everyone Else   VMS
--             'success.plx'              => [0,      0],
--             'one_fail.plx'             => [1,      4],
--             'two_fail.plx'             => [2,      4],
--             'five_fail.plx'            => [5,      4],
--             'extras.plx'               => [2,      4],
--             'too_few.plx'              => [255,    4],
--             'too_few_fail.plx'         => [2,      4],
--             'death.plx'                => [255,    4],
--             'last_minute_death.plx'    => [255,    4],
--             'pre_plan_death.plx'       => ['not zero',    'not zero'],
--             'death_in_eval.plx'        => [0,      0],
--             'require.plx'              => [0,      0],
--	     'exit.plx'                 => [1,      4],
--            );
-+my $Perl = File::Spec->rel2abs($^X);
-+if( $^O eq 'VMS' ) {
-+    # VMS can't use its own $^X in a system call until almost 5.8
-+    $Perl = "MCR $^X" if $] < 5.007003;
-+
-+    # Quiet noisy 'SYS$ABORT'
-+    $Perl .= q{ -"Mvmsish=hushed"};
-+}
- 
--print "1..".keys(%Tests)."\n";
- 
- eval { require POSIX; &POSIX::WEXITSTATUS(0) };
- if( $@ ) {
-@@ -72,34 +40,74 @@
-     *exitstatus = sub { POSIX::WEXITSTATUS($_[0]) }
- }
- 
--chdir 't';
--my $lib = File::Spec->catdir(qw(lib Test Simple sample_tests));
--while( my($test_name, $exit_codes) = each %Tests ) {
--    my($exit_code) = $exit_codes->[$IsVMS ? 1 : 0];
- 
--    my $Perl = $^X;
-+# Some OS' will alter the exit code to their own native sense...
-+# sometimes.  Rather than deal with the exception we'll just
-+# build up the mapping.
-+print "# Building up a map of exit codes.  May take a while.\n";
-+my %Exit_Map;
-+
-+open my $fh, ">", "exit_map_test" or die $!;
-+print $fh <<'DONE';
-+if ($^O eq 'VMS') {
-+    require vmsish;
-+    import vmsish qw(hushed);
-+}
-+my $exit = shift;
-+print "exit $exit\n";
-+END { $? = $exit };
-+DONE
-+
-+close $fh;
-+END { 1 while unlink "exit_map_test" }
-+
-+for my $exit (0..255) {
-+    # This correctly emulates Test::Builder's behavior.
-+    my $out = qx[$Perl exit_map_test $exit];
-+    $TB->like( $out, qr/^exit $exit\n/, "exit map test for $exit" );
-+    $Exit_Map{$exit} = exitstatus($?);
-+}
-+print "# Done.\n";
-+
- 
--    if( $^O eq 'VMS' ) {
--        # VMS can't use its own $^X in a system call until almost 5.8
--        $Perl = "MCR $^X" if $] < 5.007003;
--
--        # Quiet noisy 'SYS$ABORT'.  'hushed' only exists in 5.6 and up,
--        # but it doesn't do any harm on eariler perls.
--        $Perl .= q{ -"Mvmsish=hushed"};
--    }
-+my %Tests = (
-+             # File                        Exit Code
-+             'success.plx'              => 0,
-+             'one_fail.plx'             => 1,
-+             'two_fail.plx'             => 2,
-+             'five_fail.plx'            => 5,
-+             'extras.plx'               => 2,
-+             'too_few.plx'              => 255,
-+             'too_few_fail.plx'         => 2,
-+             'death.plx'                => 255,
-+             'last_minute_death.plx'    => 255,
-+             'pre_plan_death.plx'       => 'not zero',
-+             'death_in_eval.plx'        => 0,
-+             'require.plx'              => 0,
-+             'death_with_handler.plx'   => 255,
-+             'exit.plx'                 => 1,
-+            );
- 
-+chdir 't';
-+my $lib = File::Spec->catdir(qw(lib Test Simple sample_tests));
-+while( my($test_name, $exit_code) = each %Tests ) {
-     my $file = File::Spec->catfile($lib, $test_name);
-     my $wait_stat = system(qq{$Perl -"I../blib/lib" -"I../lib" -"I../t/lib" $file});
-     my $actual_exit = exitstatus($wait_stat);
- 
-     if( $exit_code eq 'not zero' ) {
--        My::Test::ok( $actual_exit != 0,
-+        $TB->isnt_num( $actual_exit, $Exit_Map{0},
-                       "$test_name exited with $actual_exit ".
--                      "(expected $exit_code)");
-+                      "(expected non-zero)");
-     }
-     else {
--        My::Test::ok( $actual_exit == $exit_code, 
-+        $TB->is_num( $actual_exit, $Exit_Map{$exit_code}, 
-                       "$test_name exited with $actual_exit ".
--                      "(expected $exit_code)");
-+                      "(expected $Exit_Map{$exit_code})");
-     }
- }
-+
-+$TB->done_testing( scalar keys(%Tests) + 256 );
-+
-+# So any END block file cleanup works.
-+chdir $Orig_Dir;
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/explain.t perl-5.10.0/lib/Test/Simple/t/explain.t
---- perl-5.10.0.orig/lib/Test/Simple/t/explain.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/explain.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,27 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ('../lib', 'lib');
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+use warnings;
-+
-+use Test::More tests => 5;
-+
-+can_ok "main", "explain";
-+
-+is_deeply [explain("foo")],             ["foo"];
-+is_deeply [explain("foo", "bar")],      ["foo", "bar"];
-+
-+# Avoid future dump formatting changes from breaking tests by just eval'ing
-+# the dump
-+is_deeply [map { eval $_ } explain([], {})],           [[], {}];
-+
-+is_deeply [map { eval $_ } explain(23, [42,91], 99)],  [23, [42, 91], 99];
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/extra_one.t perl-5.10.0/lib/Test/Simple/t/extra_one.t
---- perl-5.10.0.orig/lib/Test/Simple/t/extra_one.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/extra_one.t	2009-08-26 06:14:11.000000000 +0200
-@@ -44,7 +44,7 @@
- OUT
- 
-     My::Test::is($$err, <<ERR);
--# Looks like you planned 1 test but ran 2 extra.
-+# Looks like you planned 1 test but ran 3.
- ERR
- 
-     # Prevent Test::Simple from existing with non-zero
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/extra.t perl-5.10.0/lib/Test/Simple/t/extra.t
---- perl-5.10.0.orig/lib/Test/Simple/t/extra.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/extra.t	2009-08-26 06:14:11.000000000 +0200
-@@ -51,7 +51,7 @@
- #   at $0 line 31.
- #   Failed test 'Sar'
- #   at $0 line 34.
--# Looks like you planned 3 tests but ran 2 extra.
-+# Looks like you planned 3 tests but ran 5.
- # Looks like you failed 2 tests of 5 run.
- ERR
- 
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/fail-like.t perl-5.10.0/lib/Test/Simple/t/fail-like.t
---- perl-5.10.0.orig/lib/Test/Simple/t/fail-like.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/fail-like.t	2009-08-26 06:14:11.000000000 +0200
-@@ -1,11 +1,4 @@
--# qr// was introduced in 5.004-devel.  Skip this test if we're not
--# of high enough version.
--BEGIN { 
--    if( $] < 5.005 ) {
--        print "1..0 # Skipped Test requires qr//\n";
--        exit(0);
--    }
--}
-+#!/usr/bin/perl -w
- 
- BEGIN {
-     if( $ENV{PERL_CORE} ) {
-@@ -30,7 +23,7 @@
- # Test::Builder's own and the ending diagnostics don't come out right.
- require Test::Builder;
- my $TB = Test::Builder->create;
--$TB->plan(tests => 2);
-+$TB->plan(tests => 4);
- 
- 
- require Test::Simple::Catch;
-@@ -43,11 +36,10 @@
- require Test::More;
- Test::More->import(tests => 1);
- 
--eval q{ like( "foo", qr/that/, 'is foo like that' ); };
--
-+{
-+    eval q{ like( "foo", qr/that/, 'is foo like that' ); };
- 
--END {
--    $TB->is_eq($$out, <<OUT, 'failing output');
-+    $TB->is_eq($out->read, <<OUT, 'failing output');
- 1..1
- not ok 1 - is foo like that
- OUT
-@@ -57,11 +49,26 @@
- #   at .* line 1\.
- #                   'foo'
- #     doesn't match '\\(\\?-xism:that\\)'
--# Looks like you failed 1 test of 1\\.
- ERR
- 
-+    $TB->like($err->read, qr/^$err_re$/, 'failing errors');
-+}
- 
--    $TB->like($$err, qr/^$err_re$/, 'failing errors');
-+{
-+    # line 59 
-+    like("foo", "not a regex");
-+    $TB->is_eq($out->read, <<OUT);
-+not ok 2
-+OUT
- 
--    exit(0);
-+    $TB->is_eq($err->read, <<OUT);
-+#   Failed test at $0 line 59.
-+#     'not a regex' doesn't look much like a regex to me.
-+OUT
-+
-+}
-+
-+END {
-+    # Test::More thinks it failed.  Override that.
-+    exit(scalar grep { !$_ } $TB->summary);
- }
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/fail-more.t perl-5.10.0/lib/Test/Simple/t/fail-more.t
---- perl-5.10.0.orig/lib/Test/Simple/t/fail-more.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/fail-more.t	2009-08-26 06:14:11.000000000 +0200
-@@ -24,7 +24,7 @@
- # Test::Builder's own and the ending diagnostics don't come out right.
- require Test::Builder;
- my $TB = Test::Builder->create;
--$TB->plan(tests => 17);
-+$TB->plan(tests => 78);
- 
- sub like ($$;$) {
-     $TB->like(@_);
-@@ -34,19 +34,26 @@
-     $TB->is_eq(@_);
- }
- 
--sub main::err_ok ($) {
--    my($expect) = @_;
--    my $got = $err->read;
-+sub main::out_ok ($$) {
-+    $TB->is_eq( $out->read, shift );
-+    $TB->is_eq( $err->read, shift );
-+}
-+
-+sub main::out_like ($$) {
-+    my($output, $failure) = @_;
- 
--    return $TB->is_eq( $got, $expect );
-+    $TB->like( $out->read, qr/$output/ );
-+    $TB->like( $err->read, qr/$failure/ );
- }
- 
- 
- package main;
- 
- require Test::More;
--my $Total = 30;
-+our $TODO;
-+my $Total = 37;
- Test::More->import(tests => $Total);
-+$out->read;  # clear the plan from $out
- 
- # This should all work in the presence of a __DIE__ handler.
- local $SIG{__DIE__} = sub { $TB->ok(0, "DIE handler called: ".join "", @_); };
-@@ -57,184 +64,387 @@
- 
- my $Filename = quotemeta $0;
- 
--# Preserve the line numbers.
-+
- #line 38
- ok( 0, 'failing' );
--err_ok( <<ERR );
-+out_ok( <<OUT, <<ERR );
-+not ok - failing
-+OUT
- #   Failed test 'failing'
- #   at $0 line 38.
- ERR
- 
-+
- #line 40
- is( "foo", "bar", 'foo is bar?');
--is( undef, '',    'undef is empty string?');
--is( undef, 0,     'undef is 0?');
--is( '',    0,     'empty string is 0?' );
--err_ok( <<ERR );
-+out_ok( <<OUT, <<ERR );
-+not ok - foo is bar?
-+OUT
- #   Failed test 'foo is bar?'
- #   at $0 line 40.
- #          got: 'foo'
- #     expected: 'bar'
-+ERR
-+
-+#line 89
-+is( undef, '',    'undef is empty string?');
-+out_ok( <<OUT, <<ERR );
-+not ok - undef is empty string?
-+OUT
- #   Failed test 'undef is empty string?'
--#   at $0 line 41.
-+#   at $0 line 89.
- #          got: undef
- #     expected: ''
-+ERR
-+
-+#line 99
-+is( undef, 0,     'undef is 0?');
-+out_ok( <<OUT, <<ERR );
-+not ok - undef is 0?
-+OUT
- #   Failed test 'undef is 0?'
--#   at $0 line 42.
-+#   at $0 line 99.
- #          got: undef
- #     expected: '0'
-+ERR
-+
-+#line 110
-+is( '',    0,     'empty string is 0?' );
-+out_ok( <<OUT, <<ERR );
-+not ok - empty string is 0?
-+OUT
- #   Failed test 'empty string is 0?'
--#   at $0 line 43.
-+#   at $0 line 110.
- #          got: ''
- #     expected: '0'
- ERR
- 
--#line 45
-+#line 121
- isnt("foo", "foo", 'foo isnt foo?' );
--isn't("foo", "foo",'foo isn\'t foo?' );
--isnt(undef, undef, 'undef isnt undef?');
--err_ok( <<ERR );
-+out_ok( <<OUT, <<ERR );
-+not ok - foo isnt foo?
-+OUT
- #   Failed test 'foo isnt foo?'
--#   at $0 line 45.
--#     'foo'
--#         ne
--#     'foo'
-+#   at $0 line 121.
-+#          got: 'foo'
-+#     expected: anything else
-+ERR
-+
-+#line 132
-+isn't("foo", "foo",'foo isn\'t foo?' );
-+out_ok( <<OUT, <<ERR );
-+not ok - foo isn't foo?
-+OUT
- #   Failed test 'foo isn\'t foo?'
--#   at $0 line 46.
--#     'foo'
--#         ne
--#     'foo'
-+#   at $0 line 132.
-+#          got: 'foo'
-+#     expected: anything else
-+ERR
-+
-+#line 143
-+isnt(undef, undef, 'undef isnt undef?');
-+out_ok( <<OUT, <<ERR );
-+not ok - undef isnt undef?
-+OUT
- #   Failed test 'undef isnt undef?'
--#   at $0 line 47.
--#     undef
--#         ne
--#     undef
-+#   at $0 line 143.
-+#          got: undef
-+#     expected: anything else
- ERR
- 
--#line 48
-+#line 154
- like( "foo", '/that/',  'is foo like that' );
--unlike( "foo", '/foo/', 'is foo unlike foo' );
--err_ok( <<ERR );
-+out_ok( <<OUT, <<ERR );
-+not ok - is foo like that
-+OUT
- #   Failed test 'is foo like that'
--#   at $0 line 48.
-+#   at $0 line 154.
- #                   'foo'
- #     doesn't match '/that/'
-+ERR
-+
-+#line 165
-+unlike( "foo", '/foo/', 'is foo unlike foo' );
-+out_ok( <<OUT, <<ERR );
-+not ok - is foo unlike foo
-+OUT
- #   Failed test 'is foo unlike foo'
--#   at $0 line 49.
-+#   at $0 line 165.
- #                   'foo'
- #           matches '/foo/'
- ERR
- 
- # Nick Clark found this was a bug.  Fixed in 0.40.
--# line 60
-+# line 177
- like( "bug", '/(%)/',   'regex with % in it' );
--err_ok( <<ERR );
-+out_ok( <<OUT, <<ERR );
-+not ok - regex with % in it
-+OUT
- #   Failed test 'regex with % in it'
--#   at $0 line 60.
-+#   at $0 line 177.
- #                   'bug'
- #     doesn't match '/(%)/'
- ERR
- 
--#line 67
-+#line 188
- fail('fail()');
--err_ok( <<ERR );
-+out_ok( <<OUT, <<ERR );
-+not ok - fail()
-+OUT
- #   Failed test 'fail()'
--#   at $0 line 67.
-+#   at $0 line 188.
- ERR
- 
--#line 52
-+#line 197
- can_ok('Mooble::Hooble::Yooble', qw(this that));
--can_ok('Mooble::Hooble::Yooble', ());
--can_ok(undef, undef);
--can_ok([], "foo");
--err_ok( <<ERR );
-+out_ok( <<OUT, <<ERR );
-+not ok - Mooble::Hooble::Yooble->can(...)
-+OUT
- #   Failed test 'Mooble::Hooble::Yooble->can(...)'
--#   at $0 line 52.
-+#   at $0 line 197.
- #     Mooble::Hooble::Yooble->can('this') failed
- #     Mooble::Hooble::Yooble->can('that') failed
-+ERR
-+
-+#line 208
-+can_ok('Mooble::Hooble::Yooble', ());
-+out_ok( <<OUT, <<ERR );
-+not ok - Mooble::Hooble::Yooble->can(...)
-+OUT
- #   Failed test 'Mooble::Hooble::Yooble->can(...)'
--#   at $0 line 53.
-+#   at $0 line 208.
- #     can_ok() called with no methods
-+ERR
-+
-+#line 218
-+can_ok(undef, undef);
-+out_ok( <<OUT, <<ERR );
-+not ok - ->can(...)
-+OUT
- #   Failed test '->can(...)'
--#   at $0 line 54.
-+#   at $0 line 218.
- #     can_ok() called with empty class or reference
-+ERR
-+
-+#line 228
-+can_ok([], "foo");
-+out_ok( <<OUT, <<ERR );
-+not ok - ARRAY->can('foo')
-+OUT
- #   Failed test 'ARRAY->can('foo')'
--#   at $0 line 55.
-+#   at $0 line 228.
- #     ARRAY->can('foo') failed
- ERR
- 
--#line 55
-+#line 238
- isa_ok(bless([], "Foo"), "Wibble");
--isa_ok(42,    "Wibble", "My Wibble");
--isa_ok(undef, "Wibble", "Another Wibble");
--isa_ok([],    "HASH");
--err_ok( <<ERR );
-+out_ok( <<OUT, <<ERR );
-+not ok - The object isa Wibble
-+OUT
- #   Failed test 'The object isa Wibble'
--#   at $0 line 55.
-+#   at $0 line 238.
- #     The object isn't a 'Wibble' it's a 'Foo'
-+ERR
-+
-+#line 248
-+isa_ok(42,    "Wibble", "My Wibble");
-+out_ok( <<OUT, <<ERR );
-+not ok - My Wibble isa Wibble
-+OUT
- #   Failed test 'My Wibble isa Wibble'
--#   at $0 line 56.
--#     My Wibble isn't a reference
-+#   at $0 line 248.
-+#     My Wibble isn't a class or reference
-+ERR
-+
-+#line 258
-+isa_ok(undef, "Wibble", "Another Wibble");
-+out_ok( <<OUT, <<ERR );
-+not ok - Another Wibble isa Wibble
-+OUT
- #   Failed test 'Another Wibble isa Wibble'
--#   at $0 line 57.
-+#   at $0 line 258.
- #     Another Wibble isn't defined
--#   Failed test 'The object isa HASH'
--#   at $0 line 58.
--#     The object isn't a 'HASH' it's a 'ARRAY'
- ERR
- 
--#line 68
-+#line 268
-+isa_ok([],    "HASH");
-+out_ok( <<OUT, <<ERR );
-+not ok - The reference isa HASH
-+OUT
-+#   Failed test 'The reference isa HASH'
-+#   at $0 line 268.
-+#     The reference isn't a 'HASH' it's a 'ARRAY'
-+ERR
-+
-+#line 278
-+new_ok(undef);
-+out_like( <<OUT, <<ERR );
-+not ok - new\\(\\) died
-+OUT
-+#   Failed test 'new\\(\\) died'
-+#   at $Filename line 278.
-+#     Error was:  Can't call method "new" on an undefined value at .*
-+ERR
-+
-+#line 288
-+new_ok( "Does::Not::Exist" );
-+out_like( <<OUT, <<ERR );
-+not ok - new\\(\\) died
-+OUT
-+#   Failed test 'new\\(\\) died'
-+#   at $Filename line 288.
-+#     Error was:  Can't locate object method "new" via package "Does::Not::Exist" .*
-+ERR
-+
-+
-+{ package Foo; sub new { } }
-+{ package Bar; sub new { {} } }
-+{ package Baz; sub new { bless {}, "Wibble" } }
-+
-+#line 303
-+new_ok( "Foo" );
-+out_ok( <<OUT, <<ERR );
-+not ok - The object isa Foo
-+OUT
-+#   Failed test 'The object isa Foo'
-+#   at $0 line 303.
-+#     The object isn't defined
-+ERR
-+
-+# line 313
-+new_ok( "Bar" );
-+out_ok( <<OUT, <<ERR );
-+not ok - The object isa Bar
-+OUT
-+#   Failed test 'The object isa Bar'
-+#   at $0 line 313.
-+#     The object isn't a 'Bar' it's a 'HASH'
-+ERR
-+
-+#line 323
-+new_ok( "Baz" );
-+out_ok( <<OUT, <<ERR );
-+not ok - The object isa Baz
-+OUT
-+#   Failed test 'The object isa Baz'
-+#   at $0 line 323.
-+#     The object isn't a 'Baz' it's a 'Wibble'
-+ERR
-+
-+#line 333
-+new_ok( "Baz", [], "no args" );
-+out_ok( <<OUT, <<ERR );
-+not ok - no args isa Baz
-+OUT
-+#   Failed test 'no args isa Baz'
-+#   at $0 line 333.
-+#     no args isn't a 'Baz' it's a 'Wibble'
-+ERR
-+
-+#line 343
- cmp_ok( 'foo', 'eq', 'bar', 'cmp_ok eq' );
--cmp_ok( 42.1,  '==', 23,  , '       ==' );
--cmp_ok( 42,    '!=', 42   , '       !=' );
--cmp_ok( 1,     '&&', 0    , '       &&' );
--err_ok( <<ERR );
-+out_ok( <<OUT, <<ERR );
-+not ok - cmp_ok eq
-+OUT
- #   Failed test 'cmp_ok eq'
--#   at $0 line 68.
-+#   at $0 line 343.
- #          got: 'foo'
- #     expected: 'bar'
-+ERR
-+
-+#line 354
-+cmp_ok( 42.1,  '==', 23,  , '       ==' );
-+out_ok( <<OUT, <<ERR );
-+not ok -        ==
-+OUT
- #   Failed test '       =='
--#   at $0 line 69.
-+#   at $0 line 354.
- #          got: 42.1
- #     expected: 23
-+ERR
-+
-+#line 365
-+cmp_ok( 42,    '!=', 42   , '       !=' );
-+out_ok( <<OUT, <<ERR );
-+not ok -        !=
-+OUT
- #   Failed test '       !='
--#   at $0 line 70.
--#     '42'
--#         !=
--#     '42'
-+#   at $0 line 365.
-+#          got: 42
-+#     expected: anything else
-+ERR
-+
-+#line 376
-+cmp_ok( 1,     '&&', 0    , '       &&' );
-+out_ok( <<OUT, <<ERR );
-+not ok -        &&
-+OUT
- #   Failed test '       &&'
--#   at $0 line 71.
-+#   at $0 line 376.
- #     '1'
- #         &&
- #     '0'
- ERR
- 
--
--# line 196
-+# line 388
- cmp_ok( 42,    'eq', "foo", '       eq with numbers' );
--err_ok( <<ERR );
-+out_ok( <<OUT, <<ERR );
-+not ok -        eq with numbers
-+OUT
- #   Failed test '       eq with numbers'
--#   at $0 line 196.
-+#   at $0 line 388.
- #          got: '42'
- #     expected: 'foo'
- ERR
- 
--
- {
--    my $warnings;
-+    my $warnings = '';
-     local $SIG{__WARN__} = sub { $warnings .= join '', @_ };
- 
--# line 211
-+# line 404
-     cmp_ok( 42,    '==', "foo", '       == with strings' );
--    err_ok( <<ERR );
-+    out_ok( <<OUT, <<ERR );
-+not ok -        == with strings
-+OUT
- #   Failed test '       == with strings'
--#   at $0 line 211.
-+#   at $0 line 404.
- #          got: 42
- #     expected: foo
- ERR
--    My::Test::like $warnings,
--     qq[/^Argument "foo" isn't numeric in .* at $Filename line 211\\\.\n\$/];
-+    My::Test::like(
-+        $warnings,
-+        qr/^Argument "foo" isn't numeric in .* at cmp_ok \[from $Filename line 404\] line 1\.\n$/
-+    );
-+    $warnings = '';
-+}
-+
-+
-+{
-+    my $warnings = '';
-+    local $SIG{__WARN__} = sub { $warnings .= join '', @_ };
- 
-+#line 426
-+    cmp_ok( undef, "ne", "", "undef ne empty string" );
-+
-+    $TB->is_eq( $out->read, <<OUT );
-+not ok - undef ne empty string
-+OUT
-+
-+    TODO: {
-+        local $::TODO = 'cmp_ok() gives the wrong "expected" for undef';
-+
-+        $TB->is_eq( $err->read, <<ERR );
-+#   Failed test 'undef ne empty string'
-+#   at $0 line 426.
-+#          got: undef
-+#     expected: ''
-+ERR
-+    }
-+
-+    My::Test::like(
-+        $warnings,
-+        qr/^Use of uninitialized value.* in string ne at cmp_ok \[from $Filename line 426\] line 1\.\n\z/
-+    );
- }
- 
- 
-@@ -242,82 +452,58 @@
- -e "wibblehibble";
- my $Errno_Number = $!+0;
- my $Errno_String = $!.'';
--#line 80
-+#line 425
- cmp_ok( $!,    'eq', '',    '       eq with stringified errno' );
--cmp_ok( $!,    '==', -1,    '       eq with numerified errno' );
--err_ok( <<ERR );
-+out_ok( <<OUT, <<ERR );
-+not ok -        eq with stringified errno
-+OUT
- #   Failed test '       eq with stringified errno'
--#   at $0 line 80.
-+#   at $0 line 425.
- #          got: '$Errno_String'
- #     expected: ''
-+ERR
-+
-+#line 436
-+cmp_ok( $!,    '==', -1,    '       eq with numerified errno' );
-+out_ok( <<OUT, <<ERR );
-+not ok -        eq with numerified errno
-+OUT
- #   Failed test '       eq with numerified errno'
--#   at $0 line 81.
-+#   at $0 line 436.
- #          got: $Errno_Number
- #     expected: -1
- ERR
- 
--#line 84
-+#line 447
- use_ok('Hooble::mooble::yooble');
--
- my $more_err_re = <<ERR;
- #   Failed test 'use Hooble::mooble::yooble;'
--#   at $Filename line 84\\.
-+#   at $Filename line 447\\.
- #     Tried to use 'Hooble::mooble::yooble'.
- #     Error:  Can't locate Hooble.* in \\\@INC .*
- ERR
-+out_like(
-+    qr/^\Qnot ok - use Hooble::mooble::yooble;\E\n\z/,
-+    qr/^$more_err_re/
-+);
- 
--My::Test::like($err->read, "/^$more_err_re/");
--
--
--#line 85
-+#line 460
- require_ok('ALL::YOUR::BASE::ARE::BELONG::TO::US::wibble');
- $more_err_re = <<ERR;
- #   Failed test 'require ALL::YOUR::BASE::ARE::BELONG::TO::US::wibble;'
--#   at $Filename line 85\\.
-+#   at $Filename line 460\\.
- #     Tried to require 'ALL::YOUR::BASE::ARE::BELONG::TO::US::wibble'.
- #     Error:  Can't locate ALL.* in \\\@INC .*
- ERR
--
--My::Test::like($err->read, "/^$more_err_re/");
-+out_like(
-+    qr/^\Qnot ok - require ALL::YOUR::BASE::ARE::BELONG::TO::US::wibble;\E\n\z/,
-+    qr/^$more_err_re/
-+);
- 
- 
--#line 88
- END {
--    $TB->is_eq($$out, <<OUT, 'failing output');
--1..$Total
--not ok - failing
--not ok - foo is bar?
--not ok - undef is empty string?
--not ok - undef is 0?
--not ok - empty string is 0?
--not ok - foo isnt foo?
--not ok - foo isn't foo?
--not ok - undef isnt undef?
--not ok - is foo like that
--not ok - is foo unlike foo
--not ok - regex with % in it
--not ok - fail()
--not ok - Mooble::Hooble::Yooble->can(...)
--not ok - Mooble::Hooble::Yooble->can(...)
--not ok - ->can(...)
--not ok - ARRAY->can('foo')
--not ok - The object isa Wibble
--not ok - My Wibble isa Wibble
--not ok - Another Wibble isa Wibble
--not ok - The object isa HASH
--not ok - cmp_ok eq
--not ok -        ==
--not ok -        !=
--not ok -        &&
--not ok -        eq with numbers
--not ok -        == with strings
--not ok -        eq with stringified errno
--not ok -        eq with numerified errno
--not ok - use Hooble::mooble::yooble;
--not ok - require ALL::YOUR::BASE::ARE::BELONG::TO::US::wibble;
-+    out_like( <<OUT, <<ERR );
- OUT
--
--err_ok( <<ERR );
- # Looks like you failed $Total tests of $Total.
- ERR
- 
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/fail_one.t perl-5.10.0/lib/Test/Simple/t/fail_one.t
---- perl-5.10.0.orig/lib/Test/Simple/t/fail_one.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/fail_one.t	2009-08-26 06:14:11.000000000 +0200
-@@ -12,51 +12,32 @@
- 
- use strict;
- 
--require Test::Simple::Catch;
--my($out, $err) = Test::Simple::Catch::caught();
-+# Normalize the output whether we're running under Test::Harness or not.
- local $ENV{HARNESS_ACTIVE} = 0;
- 
-+use Test::Builder;
-+use Test::Builder::NoOutput;
- 
--# Can't use Test.pm, that's a 5.005 thing.
--package My::Test;
-+my $Test = Test::Builder->new;
- 
--print "1..2\n";
-+{
-+    my $tb = Test::Builder::NoOutput->create;
- 
--my $test_num = 1;
--# Utility testing functions.
--sub ok ($;$) {
--    my($test, $name) = @_;
--    my $ok = '';
--    $ok .= "not " unless $test;
--    $ok .= "ok $test_num";
--    $ok .= " - $name" if defined $name;
--    $ok .= "\n";
--    print $ok;
--    $test_num++;
-+    $tb->plan( tests => 1 );
- 
--    return $test ? 1 : 0;
--}
--
--
--package main;
--
--require Test::Simple;
--Test::Simple->import(tests => 1);
--
--#line 45
--ok(0);
-+#line 28
-+    $tb->ok(0);
-+    $tb->_ending;
- 
--END {
--    My::Test::ok($$out eq <<OUT);
-+    $Test->is_eq($tb->read('out'), <<OUT);
- 1..1
- not ok 1
- OUT
- 
--    My::Test::ok($$err eq <<ERR) || print $$err;
--#   Failed test at $0 line 45.
-+    $Test->is_eq($tb->read('err'), <<ERR);
-+#   Failed test at $0 line 28.
- # Looks like you failed 1 test of 1.
- ERR
- 
--    # Prevent Test::Simple from existing with non-zero
--    exit 0;
-+    $Test->done_testing(2);
- }
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/fail.t perl-5.10.0/lib/Test/Simple/t/fail.t
---- perl-5.10.0.orig/lib/Test/Simple/t/fail.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/fail.t	2009-08-26 06:14:11.000000000 +0200
-@@ -1,5 +1,7 @@
- #!perl -w
- 
-+# Simple test of what failure output looks like
-+
- BEGIN {
-     if( $ENV{PERL_CORE} ) {
-         chdir 't';
-@@ -12,45 +14,28 @@
- 
- use strict;
- 
--require Test::Simple::Catch;
--my($out, $err) = Test::Simple::Catch::caught();
-+# Normalize the output whether we're running under Test::Harness or not.
- local $ENV{HARNESS_ACTIVE} = 0;
- 
-+use Test::Builder;
-+use Test::Builder::NoOutput;
- 
--# Can't use Test.pm, that's a 5.005 thing.
--package My::Test;
--
--print "1..2\n";
--
--my $test_num = 1;
--# Utility testing functions.
--sub ok ($;$) {
--    my($test, $name) = @_;
--    my $ok = '';
--    $ok .= "not " unless $test;
--    $ok .= "ok $test_num";
--    $ok .= " - $name" if defined $name;
--    $ok .= "\n";
--    print $ok;
--    $test_num++;
--}
--
--
--package main;
--
--require Test::Simple;
--Test::Simple->import(tests => 5);
--
--#line 35
--ok( 1, 'passing' );
--ok( 2, 'passing still' );
--ok( 3, 'still passing' );
--ok( 0, 'oh no!' );
--ok( 0, 'damnit' );
-+my $Test = Test::Builder->new;
- 
-+# Set up a builder to record some failing tests.
-+{
-+    my $tb = Test::Builder::NoOutput->create;
-+    $tb->plan( tests => 5 );
-+
-+#line 28
-+    $tb->ok( 1, 'passing' );
-+    $tb->ok( 2, 'passing still' );
-+    $tb->ok( 3, 'still passing' );
-+    $tb->ok( 0, 'oh no!' );
-+    $tb->ok( 0, 'damnit' );
-+    $tb->_ending;
- 
--END {
--    My::Test::ok($$out eq <<OUT);
-+    $Test->is_eq($tb->read('out'), <<OUT);
- 1..5
- ok 1 - passing
- ok 2 - passing still
-@@ -59,14 +44,13 @@
- not ok 5 - damnit
- OUT
- 
--    My::Test::ok($$err eq <<ERR);
-+    $Test->is_eq($tb->read('err'), <<ERR);
- #   Failed test 'oh no!'
--#   at $0 line 38.
-+#   at $0 line 31.
- #   Failed test 'damnit'
--#   at $0 line 39.
-+#   at $0 line 32.
- # Looks like you failed 2 tests of 5.
- ERR
- 
--    # Prevent Test::Simple from exiting with non zero
--    exit 0;
-+    $Test->done_testing(2);
- }
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/filehandles.t perl-5.10.0/lib/Test/Simple/t/filehandles.t
---- perl-5.10.0.orig/lib/Test/Simple/t/filehandles.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/filehandles.t	2009-08-26 06:14:11.000000000 +0200
-@@ -3,19 +3,16 @@
- BEGIN {
-     if( $ENV{PERL_CORE} ) {
-         chdir 't';
--        @INC = '../lib';
-+        @INC = ('../lib', 'lib');
-     }
- }
- 
-+use lib 't/lib';
- use Test::More tests => 1;
-+use Dev::Null;
- 
- tie *STDOUT, "Dev::Null" or die $!;
- 
- print "not ok 1\n";     # this should not print.
- pass 'STDOUT can be mucked with';
- 
--
--package Dev::Null;
--
--sub TIEHANDLE { bless {} }
--sub PRINT { 1 }
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/fork_with_new_stdout.t perl-5.10.0/lib/Test/Simple/t/fork_with_new_stdout.t
---- perl-5.10.0.orig/lib/Test/Simple/t/fork_with_new_stdout.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/fork_with_new_stdout.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,54 @@
-+#!perl -w
-+use strict;
-+use warnings;
-+use IO::Pipe;
-+use Test::Builder;
-+use Config;
-+
-+my $b = Test::Builder->new;
-+$b->reset;
-+
-+my $Can_Fork = $Config{d_fork} ||
-+               (($^O eq 'MSWin32' || $^O eq 'NetWare') and
-+                $Config{useithreads} and
-+                $Config{ccflags} =~ /-DPERL_IMPLICIT_SYS/
-+               );
-+
-+if( !$Can_Fork ) {
-+    $b->plan('skip_all' => "This system cannot fork");
-+}
-+else {
-+    $b->plan('tests' => 2);
-+}
-+
-+my $pipe = IO::Pipe->new;
-+if ( my $pid = fork ) {
-+  $pipe->reader;
-+  $b->ok((<$pipe> =~ /FROM CHILD: ok 1/), "ok 1 from child");
-+  $b->ok((<$pipe> =~ /FROM CHILD: 1\.\.1/), "1..1 from child");
-+  waitpid($pid, 0);
-+}
-+else {
-+  $pipe->writer;
-+  my $pipe_fd = $pipe->fileno;
-+  close STDOUT;
-+  open(STDOUT, ">&$pipe_fd");
-+  my $b = Test::Builder->new;
-+  $b->reset;
-+  $b->no_plan;
-+  $b->ok(1);
-+} 
-+
-+
-+=pod
-+#actual
-+1..2
-+ok 1
-+1..1
-+ok 1
-+ok 2
-+#expected
-+1..2
-+ok 1
-+ok 2
-+=cut
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/is_deeply_dne_bug.t perl-5.10.0/lib/Test/Simple/t/is_deeply_dne_bug.t
---- perl-5.10.0.orig/lib/Test/Simple/t/is_deeply_dne_bug.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/is_deeply_dne_bug.t	2009-08-26 06:14:11.000000000 +0200
-@@ -16,16 +16,7 @@
- }
- 
- use strict;
--use Test::More;
--
--BEGIN {
--    if( !eval "require overload" ) {
--        plan skip_all => "needs overload.pm";
--    }
--    else {
--        plan tests => 2;
--    }
--}
-+use Test::More tests => 2;
- 
- {
-     package Foo;
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/is_deeply_fail.t perl-5.10.0/lib/Test/Simple/t/is_deeply_fail.t
---- perl-5.10.0.orig/lib/Test/Simple/t/is_deeply_fail.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/is_deeply_fail.t	2009-08-26 06:14:11.000000000 +0200
-@@ -317,7 +317,8 @@
- ERR
- 
- 
--    if( eval { require overload } ) {
-+    # Overloaded object tests
-+    {
- 	my $foo = bless [], "Foo";
- 	my $bar = bless {}, "Bar";
- 
-@@ -337,9 +338,6 @@
- ERR
- 
-     }
--    else {
--	$TB->skip("Needs overload.pm") for 1..3;
--    }
- }
- 
- 
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/is_deeply_with_threads.t perl-5.10.0/lib/Test/Simple/t/is_deeply_with_threads.t
---- perl-5.10.0.orig/lib/Test/Simple/t/is_deeply_with_threads.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/is_deeply_with_threads.t	2009-08-26 06:14:11.000000000 +0200
-@@ -19,7 +19,12 @@
-     unless ( $] >= 5.008001 && $Config{'useithreads'} && 
-              eval { require threads; 'threads'->import; 1; }) 
-     {
--        print "1..0 # Skip: no working threads\n";
-+        print "1..0 # Skip no working threads\n";
-+        exit 0;
-+    }
-+    
-+    unless ( $ENV{AUTHOR_TESTING} ) {
-+        print "1..0 # Skip many perls have broken threads.  Enable with AUTHOR_TESTING.\n";
-         exit 0;
-     }
- }
-@@ -27,7 +32,7 @@
- 
- my $Num_Threads = 5;
- 
--plan tests => $Num_Threads * 100 + 5;
-+plan tests => $Num_Threads * 100 + 6;
- 
- 
- sub do_one_thread {
-@@ -56,3 +61,5 @@
-     my $rc = $t->join();
-     cmp_ok( $rc, '==', 42, "threads exit status is $rc" );
- }
-+
-+pass("End of test");
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/lib/Dev/Null.pm perl-5.10.0/lib/Test/Simple/t/lib/Dev/Null.pm
---- perl-5.10.0.orig/lib/Test/Simple/t/lib/Dev/Null.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Dev/Null.pm	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,8 @@
-+package Dev::Null;
-+
-+use strict;
-+
-+sub TIEHANDLE { bless {}, shift }
-+sub PRINT { 1 }
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/lib/Dummy.pm perl-5.10.0/lib/Test/Simple/t/lib/Dummy.pm
---- perl-5.10.0.orig/lib/Test/Simple/t/lib/Dummy.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Dummy.pm	2009-08-26 06:14:11.000000000 +0200
-@@ -1,5 +1,6 @@
- package Dummy;
- 
--$VERSION = '0.01';
-+use strict;
-+our $VERSION = '0.01';
- 
--1;
-\ No newline at end of file
-+1;
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/lib/MyOverload.pm perl-5.10.0/lib/Test/Simple/t/lib/MyOverload.pm
---- perl-5.10.0.orig/lib/Test/Simple/t/lib/MyOverload.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/MyOverload.pm	2009-08-26 06:14:11.000000000 +0200
-@@ -1,29 +1,30 @@
--package Overloaded;
-+package Overloaded;  ##no critic (Modules::RequireFilenameMatchesPackage)
-+
-+use strict;
- 
- sub new {
-     my $class = shift;
-     bless { string => shift, num => shift }, $class;
- }
- 
--
- package Overloaded::Compare;
--use vars qw(@ISA);
--@ISA = qw(Overloaded);
-+
-+use strict;
-+our @ISA = qw(Overloaded);
- 
- # Sometimes objects have only comparison ops overloaded and nothing else.
- # For example, DateTime objects.
- use overload
--        q{eq}   => sub { $_[0]->{string} eq $_[1] },
--        q{==}   => sub { $_[0]->{num}    == $_[1] };
--
--
-+  q{eq} => sub { $_[0]->{string} eq $_[1] },
-+  q{==} => sub { $_[0]->{num} == $_[1] };
- 
- package Overloaded::Ify;
--use vars qw(@ISA);
--@ISA = qw(Overloaded);
-+
-+use strict;
-+our @ISA = qw(Overloaded);
- 
- use overload
--        q{""}    => sub { $_[0]->{string} },
--        q{0+}    => sub { $_[0]->{num} };
-+  q{""} => sub { $_[0]->{string} },
-+  q{0+} => sub { $_[0]->{num} };
- 
--1;
-\ No newline at end of file
-+1;
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/lib/SigDie.pm perl-5.10.0/lib/Test/Simple/t/lib/SigDie.pm
---- perl-5.10.0.orig/lib/Test/Simple/t/lib/SigDie.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/SigDie.pm	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,8 @@
-+package SigDie;
-+
-+use strict;
-+
-+our $DIE;
-+$SIG{__DIE__} = sub { $DIE = $@ };
-+
-+1;
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/maybe_regex.t perl-5.10.0/lib/Test/Simple/t/maybe_regex.t
---- perl-5.10.0.orig/lib/Test/Simple/t/maybe_regex.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/maybe_regex.t	2009-08-26 06:14:11.000000000 +0200
-@@ -11,22 +11,24 @@
- }
- 
- use strict;
--use Test::More tests => 13;
-+use Test::More tests => 16;
- 
- use Test::Builder;
- my $Test = Test::Builder->new;
- 
--SKIP: {
--    skip "qr// added in 5.005", 3 if $] < 5.005;
-+my $r = $Test->maybe_regex(qr/^FOO$/i);
-+ok(defined $r, 'qr// detected');
-+ok(('foo' =~ /$r/), 'qr// good match');
-+ok(('bar' !~ /$r/), 'qr// bad match');
- 
--    # 5.004 can't even see qr// or it pukes in compile.
--    eval q{
--           my $r = $Test->maybe_regex(qr/^FOO$/i);
--           ok(defined $r, 'qr// detected');
--           ok(('foo' =~ /$r/), 'qr// good match');
--           ok(('bar' !~ /$r/), 'qr// bad match');
--          };
--    die $@ if $@;
-+SKIP: {
-+    skip "blessed regex checker added in 5.10", 3 if $] < 5.010;
-+    
-+    my $obj = bless qr/foo/, 'Wibble';
-+    my $re = $Test->maybe_regex($obj);
-+    ok( defined $re, "blessed regex detected" );
-+    ok( ('foo' =~ /$re/), 'blessed qr/foo/ good match' );
-+    ok( ('bar' !~ /$re/), 'blessed qr/foo/ bad math' );
- }
- 
- {
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/missing.t perl-5.10.0/lib/Test/Simple/t/missing.t
---- perl-5.10.0.orig/lib/Test/Simple/t/missing.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/missing.t	2009-08-26 06:14:11.000000000 +0200
-@@ -33,19 +33,23 @@
- #line 30
- ok(1, 'Foo');
- ok(0, 'Bar');
-+ok(1, '1 2 3');
- 
- END {
-     My::Test::is($$out, <<OUT);
- 1..5
- ok 1 - Foo
- not ok 2 - Bar
-+ok 3 - 1 2 3
- OUT
- 
-     My::Test::is($$err, <<ERR);
- #   Failed test 'Bar'
- #   at $0 line 31.
--# Looks like you planned 5 tests but only ran 2.
--# Looks like you failed 1 test of 2 run.
-+#     You named your test '1 2 3'.  You shouldn't use numbers for your test names.
-+#     Very confusing.
-+# Looks like you planned 5 tests but ran 3.
-+# Looks like you failed 1 test of 3 run.
- ERR
- 
-     exit 0;
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/More.t perl-5.10.0/lib/Test/Simple/t/More.t
---- perl-5.10.0.orig/lib/Test/Simple/t/More.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/More.t	2009-08-26 06:14:11.000000000 +0200
-@@ -3,12 +3,12 @@
- BEGIN {
-     if( $ENV{PERL_CORE} ) {
-         chdir 't';
--        @INC = qw(../lib lib);
-+        @INC = qw(../lib lib ../lib/Test/Simple/t/lib);
-     }
- }
- 
- use lib 't/lib';
--use Test::More tests => 52;
-+use Test::More tests => 53;
- 
- # Make sure we don't mess with $@ or $!.  Test at bottom.
- my $Err   = "this should not be touched";
-@@ -47,6 +47,11 @@
- isa_ok(bless([], "Foo"), "Foo");
- isa_ok([], 'ARRAY');
- isa_ok(\42, 'SCALAR');
-+{
-+    local %Bar::;
-+    local @Foo::ISA = 'Bar';
-+    isa_ok( "Foo", "Bar" );
-+}
- 
- 
- # can_ok() & isa_ok should call can() & isa() on the given object, not 
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/new_ok.t perl-5.10.0/lib/Test/Simple/t/new_ok.t
---- perl-5.10.0.orig/lib/Test/Simple/t/new_ok.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/new_ok.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,42 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+
-+use Test::More tests => 13;
-+
-+{
-+    package Bar;
-+
-+    sub new {
-+        my $class = shift;
-+        return bless {@_}, $class;
-+    }
-+
-+
-+    package Foo;
-+    our @ISA = qw(Bar);
-+}
-+
-+{
-+    my $obj = new_ok("Foo");
-+    is_deeply $obj, {};
-+    isa_ok $obj, "Foo";
-+
-+    $obj = new_ok("Bar");
-+    is_deeply $obj, {};
-+    isa_ok $obj, "Bar";
-+
-+    $obj = new_ok("Foo", [this => 42]);
-+    is_deeply $obj, { this => 42 };
-+    isa_ok $obj, "Foo";
-+
-+    $obj = new_ok("Foo", [], "Foo");
-+    is_deeply $obj, {};
-+    isa_ok $obj, "Foo";
-+}
-+
-+# And what if we give it nothing?
-+eval {
-+    new_ok();
-+};
-+is $@, sprintf "new_ok() must be given at least a class at %s line %d.\n", $0, __LINE__ - 2;
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/no_plan_at_all.t perl-5.10.0/lib/Test/Simple/t/no_plan_at_all.t
---- perl-5.10.0.orig/lib/Test/Simple/t/no_plan_at_all.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/no_plan_at_all.t	2009-08-26 06:14:44.000000000 +0200
-@@ -0,0 +1,35 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = qw(../lib lib ../lib/Test/Simple/t/lib);
-+    }
-+}
-+
-+# Test what happens when no plan is delcared and done_testing() is not seen
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::Builder;
-+use Test::Builder::NoOutput;
-+
-+my $Test = Test::Builder->new;
-+$Test->level(0);
-+$Test->plan( tests => 1 );
-+
-+my $tb = Test::Builder::NoOutput->create;
-+
-+{
-+    $tb->level(0);
-+    $tb->ok(1, "just a test");
-+    $tb->ok(1, "  and another");
-+    $tb->_ending;
-+}
-+
-+$Test->is_eq($tb->read, <<'END', "proper behavior when no plan is seen");
-+ok 1 - just a test
-+ok 2 -   and another
-+# Tests were run but no plan was declared and done_testing() was not seen.
-+END
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/no_plan.t perl-5.10.0/lib/Test/Simple/t/no_plan.t
---- perl-5.10.0.orig/lib/Test/Simple/t/no_plan.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/no_plan.t	2009-08-26 06:14:11.000000000 +0200
-@@ -10,19 +10,24 @@
-     }
- }
- 
--use Test::More tests => 6;
-+use Test::More tests => 7;
- 
- my $tb = Test::Builder->create;
--$tb->level(0);
- 
--#line 19
-+#line 20
- ok !eval { $tb->plan(tests => undef) };
--is($@, "Got an undefined number of tests at $0 line 19.\n");
-+is($@, "Got an undefined number of tests at $0 line 20.\n");
- 
--#line 23
-+#line 24
- ok !eval { $tb->plan(tests => 0) };
--is($@, "You said to run 0 tests at $0 line 23.\n");
-+is($@, "You said to run 0 tests at $0 line 24.\n");
- 
--#line 27
--ok !eval { $tb->ok(1) };
--is( $@, "You tried to run a test without a plan at $0 line 27.\n");
-+{
-+    my $warning = '';
-+    local $SIG{__WARN__} = sub { $warning .= join '', @_ };
-+
-+#line 31
-+    ok $tb->plan(no_plan => 1);
-+    is( $warning, "no_plan takes no arguments at $0 line 31.\n" );
-+    is $tb->has_plan, 'no_plan';
-+}
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/no_tests.t perl-5.10.0/lib/Test/Simple/t/no_tests.t
---- perl-5.10.0.orig/lib/Test/Simple/t/no_tests.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/no_tests.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,44 @@
-+#!perl -w
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = '../lib';
-+    }
-+}
-+
-+# Can't use Test.pm, that's a 5.005 thing.
-+package My::Test;
-+
-+# This has to be a require or else the END block below runs before
-+# Test::Builder's own and the ending diagnostics don't come out right.
-+require Test::Builder;
-+my $TB = Test::Builder->create;
-+$TB->plan(tests => 3);
-+
-+
-+package main;
-+
-+require Test::Simple;
-+
-+chdir 't';
-+push @INC, '../t/lib/';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+local $ENV{HARNESS_ACTIVE} = 0;
-+
-+Test::Simple->import(tests => 1);
-+
-+END {
-+    $TB->is_eq($out->read, <<OUT);
-+1..1
-+OUT
-+
-+    $TB->is_eq($err->read, <<ERR);
-+# No tests run!
-+ERR
-+
-+    $TB->is_eq($?, 255, "exit code");
-+
-+    exit grep { !$_ } $TB->summary;
-+}
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/note.t perl-5.10.0/lib/Test/Simple/t/note.t
---- perl-5.10.0.orig/lib/Test/Simple/t/note.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/note.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,30 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ('../lib', 'lib');
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+use warnings;
-+
-+use Test::Builder::NoOutput;
-+
-+use Test::More tests => 2;
-+
-+{
-+    my $tb = Test::Builder::NoOutput->create;
-+
-+    $tb->note("foo");
-+
-+    $tb->reset_outputs;
-+
-+    is $tb->read('out'), "# foo\n";
-+    is $tb->read('err'), '';
-+}
-+
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/output.t perl-5.10.0/lib/Test/Simple/t/output.t
---- perl-5.10.0.orig/lib/Test/Simple/t/output.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/output.t	2009-08-26 06:14:11.000000000 +0200
-@@ -1,5 +1,7 @@
- #!perl -w
- 
-+use strict;
-+
- BEGIN {
-     if( $ENV{PERL_CORE} ) {
-         chdir 't';
-@@ -11,76 +13,91 @@
- }
- chdir 't';
- 
-+use Test::Builder;
- 
--# Can't use Test.pm, that's a 5.005 thing.
--print "1..4\n";
-+# The real Test::Builder
-+my $Test = Test::Builder->new;
-+$Test->plan( tests => 6 );
- 
--my $test_num = 1;
--# Utility testing functions.
--sub ok ($;$) {
--    my($test, $name) = @_;
--    my $ok = '';
--    $ok .= "not " unless $test;
--    $ok .= "ok $test_num";
--    $ok .= " - $name" if defined $name;
--    $ok .= "\n";
--    print $ok;
--    $test_num++;
- 
--    return $test;
--}
--
--use TieOut;
--use Test::Builder;
--my $Test = Test::Builder->new();
-+# The one we're going to test.
-+my $tb = Test::Builder->create();
- 
--my $result;
- my $tmpfile = 'foo.tmp';
--my $out = $Test->output($tmpfile);
- END { 1 while unlink($tmpfile) }
- 
--ok( defined $out );
-+# Test output to a file
-+{
-+    my $out = $tb->output($tmpfile);
-+    $Test->ok( defined $out );
-+
-+    print $out "hi!\n";
-+    close *$out;
-+
-+    undef $out;
-+    open(IN, $tmpfile) or die $!;
-+    chomp(my $line = <IN>);
-+    close IN;
-+
-+    $Test->is_eq($line, 'hi!');
-+}
- 
--print $out "hi!\n";
--close *$out;
- 
--undef $out;
--open(IN, $tmpfile) or die $!;
--chomp(my $line = <IN>);
--close IN;
--
--ok($line eq 'hi!');
--
--open(FOO, ">>$tmpfile") or die $!;
--$out = $Test->output(\*FOO);
--$old = select *$out;
--print "Hello!\n";
--close *$out;
--undef $out;
--select $old;
--open(IN, $tmpfile) or die $!;
--my @lines = <IN>;
--close IN;
-+# Test output to a filehandle
-+{
-+    open(FOO, ">>$tmpfile") or die $!;
-+    my $out = $tb->output(\*FOO);
-+    my $old = select *$out;
-+    print "Hello!\n";
-+    close *$out;
-+    undef $out;
-+    select $old;
-+    open(IN, $tmpfile) or die $!;
-+    my @lines = <IN>;
-+    close IN;
- 
--ok($lines[1] =~ /Hello!/);
-+    $Test->like($lines[1], qr/Hello!/);
-+}
- 
- 
-+# Test output to a scalar ref
-+{
-+    my $scalar = '';
-+    my $out = $tb->output(\$scalar);
-+
-+    print $out "Hey hey hey!\n";
-+    $Test->is_eq($scalar, "Hey hey hey!\n");
-+}
-+
-+
-+# Test we can output to the same scalar ref
-+{
-+    my $scalar = '';
-+    my $out = $tb->output(\$scalar);
-+    my $err = $tb->failure_output(\$scalar);
-+
-+    print $out "To output ";
-+    print $err "and beyond!";
-+
-+    $Test->is_eq($scalar, "To output and beyond!", "One scalar, two filehandles");
-+}
-+
- 
- # Ensure stray newline in name escaping works.
--$out = tie *FAKEOUT, 'TieOut';
--$Test->output(\*FAKEOUT);
--$Test->exported_to(__PACKAGE__);
--$Test->no_ending(1);
--$Test->plan(tests => 5);
--
--$Test->ok(1, "ok");
--$Test->ok(1, "ok\n");
--$Test->ok(1, "ok, like\nok");
--$Test->skip("wibble\nmoof");
--$Test->todo_skip("todo\nskip\n");
-+{
-+    my $fakeout = '';
-+    my $out = $tb->output(\$fakeout);
-+    $tb->exported_to(__PACKAGE__);
-+    $tb->no_ending(1);
-+    $tb->plan(tests => 5);
-+
-+    $tb->ok(1, "ok");
-+    $tb->ok(1, "ok\n");
-+    $tb->ok(1, "ok, like\nok");
-+    $tb->skip("wibble\nmoof");
-+    $tb->todo_skip("todo\nskip\n");
- 
--my $output = $out->read;
--ok( $output eq <<OUTPUT ) || print STDERR $output;
-+    $Test->is_eq( $fakeout, <<OUTPUT ) || print STDERR $fakeout;
- 1..5
- ok 1 - ok
- ok 2 - ok
-@@ -93,3 +110,4 @@
- # skip
- # 
- OUTPUT
-+}
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/overload.t perl-5.10.0/lib/Test/Simple/t/overload.t
---- perl-5.10.0.orig/lib/Test/Simple/t/overload.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/overload.t	2009-08-26 06:14:11.000000000 +0200
-@@ -11,27 +11,26 @@
- }
- 
- use strict;
--use Test::More;
--
--BEGIN {
--    if( !eval "require overload" ) {
--        plan skip_all => "needs overload.pm";
--    }
--    else {
--        plan tests => 13;
--    }
--}
-+use Test::More tests => 19;
- 
- 
- package Overloaded;
- 
- use overload
--        q{""}    => sub { $_[0]->{string} },
--        q{0+}    => sub { $_[0]->{num} };
-+  q{eq}    => sub { $_[0]->{string} eq $_[1] },
-+  q{==}    => sub { $_[0]->{num} == $_[1] },
-+  q{""}    => sub { $_[0]->{stringify}++; $_[0]->{string} },
-+  q{0+}    => sub { $_[0]->{numify}++;   $_[0]->{num}    }
-+;
- 
- sub new {
-     my $class = shift;
--    bless { string => shift, num => shift }, $class;
-+    bless {
-+        string  => shift,
-+        num     => shift,
-+        stringify       => 0,
-+        numify          => 0,
-+    }, $class;
- }
- 
- 
-@@ -46,9 +45,11 @@
- my $obj = Overloaded->new('foo', 42);
- isa_ok $obj, 'Overloaded';
- 
--is $obj, 'foo',            'is() with string overloading';
--cmp_ok $obj, 'eq', 'foo',  'cmp_ok() ...';
--cmp_ok $obj, '==', 42,     'cmp_ok() with number overloading';
-+cmp_ok $obj, 'eq', 'foo',       'cmp_ok() eq';
-+is $obj->{stringify}, 0,        '  does not stringify';
-+is $obj, 'foo',                 'is() with string overloading';
-+cmp_ok $obj, '==', 42,          'cmp_ok() with number overloading';
-+is $obj->{numify}, 0,           '  does not numify';
- 
- is_deeply [$obj], ['foo'],                 'is_deeply with string overloading';
- ok eq_array([$obj], ['foo']),              'eq_array ...';
-@@ -72,3 +73,14 @@
-                 {'TestPackage' => 'TestPackage'});
-     ::is_deeply('TestPackage', 'TestPackage');
- }
-+
-+
-+# Make sure 0 isn't a special case. [rt.cpan.org 41109]
-+{
-+    my $obj = Overloaded->new('0', 42);
-+    isa_ok $obj, 'Overloaded';
-+
-+    cmp_ok $obj, 'eq', '0',  'cmp_ok() eq';
-+    is $obj->{stringify}, 0, '  does not stringify';
-+    is $obj, '0',            'is() with string overloading';
-+}
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/overload_threads.t perl-5.10.0/lib/Test/Simple/t/overload_threads.t
---- perl-5.10.0.orig/lib/Test/Simple/t/overload_threads.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/overload_threads.t	2009-08-26 06:14:11.000000000 +0200
-@@ -17,16 +17,7 @@
-     eval { require threads; 'threads'->import; 1; };
- }
- 
--use Test::More;
--
--BEGIN {
--    if( !eval "require overload" ) {
--        plan skip_all => "needs overload.pm";
--    }
--    else {
--        plan tests => 5;
--    }
--}
-+use Test::More tests => 5;
- 
- 
- package Overloaded;
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/plan_bad.t perl-5.10.0/lib/Test/Simple/t/plan_bad.t
---- perl-5.10.0.orig/lib/Test/Simple/t/plan_bad.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/plan_bad.t	2009-08-26 06:14:11.000000000 +0200
-@@ -8,7 +8,7 @@
- }
- 
- 
--use Test::More tests => 10;
-+use Test::More tests => 12;
- use Test::Builder;
- my $tb = Test::Builder->create;
- $tb->level(0);
-@@ -21,6 +21,9 @@
- ok !eval { $tb->plan( tests => @foo ) };
- is $@, sprintf "Number of tests must be a positive integer.  You gave it '$foo' at %s line %d.\n", $0, __LINE__ - 1;
- 
-+ok !eval { $tb->plan( tests => 9.99 ) };
-+is $@, sprintf "Number of tests must be a positive integer.  You gave it '9.99' at %s line %d.\n", $0, __LINE__ - 1;
-+
- #line 25
- ok !eval { $tb->plan( tests => -1 ) };
- is $@, "Number of tests must be a positive integer.  You gave it '-1' at $0 line 25.\n";
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/plan_is_noplan.t perl-5.10.0/lib/Test/Simple/t/plan_is_noplan.t
---- perl-5.10.0.orig/lib/Test/Simple/t/plan_is_noplan.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/plan_is_noplan.t	2009-08-26 06:14:11.000000000 +0200
-@@ -1,3 +1,5 @@
-+#!/usr/bin/perl -w
-+
- BEGIN {
-     if( $ENV{PERL_CORE} ) {
-         chdir 't';
-@@ -8,47 +10,23 @@
-     }
- }
- 
--# Can't use Test.pm, that's a 5.005 thing.
--package My::Test;
--
--print "1..2\n";
--
--my $test_num = 1;
--# Utility testing functions.
--sub ok ($;$) {
--    my($test, $name) = @_;
--    my $ok = '';
--    $ok .= "not " unless $test;
--    $ok .= "ok $test_num";
--    $ok .= " - $name" if defined $name;
--    $ok .= "\n";
--    print $ok;
--    $test_num++;
--}
--
-+use strict;
- 
--package main;
-+use Test::More tests => 1;
- 
--require Test::Simple;
-+use Test::Builder::NoOutput;
- 
--require Test::Simple::Catch;
--my($out, $err) = Test::Simple::Catch::caught();
-+{
-+    my $tb = Test::Builder::NoOutput->create;
- 
-+    $tb->plan('no_plan');
- 
--Test::Simple->import('no_plan');
-+    $tb->ok(1, 'foo');
-+    $tb->_ending;
- 
--ok(1, 'foo');
--
--
--END {
--    My::Test::ok($$out eq <<OUT);
-+    is($tb->read, <<OUT);
- ok 1 - foo
- 1..1
- OUT
--
--    My::Test::ok($$err eq <<ERR);
--ERR
--
--    # Prevent Test::Simple from exiting with non zero
--    exit 0;
- }
-+
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/reset_outputs.t perl-5.10.0/lib/Test/Simple/t/reset_outputs.t
---- perl-5.10.0.orig/lib/Test/Simple/t/reset_outputs.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/reset_outputs.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,35 @@
-+#!perl -w
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ('../lib', 'lib');
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use Test::Builder;
-+use Test::More 'no_plan';
-+
-+{
-+    my $tb = Test::Builder->create();
-+
-+    # Store the original output filehandles and change them all.
-+    my %original_outputs;
-+
-+    open my $fh, ">", "dummy_file.tmp";
-+    END { 1 while unlink "dummy_file.tmp"; }
-+    for my $method (qw(output failure_output todo_output)) {
-+        $original_outputs{$method} = $tb->$method();
-+        $tb->$method($fh);
-+        is $tb->$method(), $fh;
-+    }
-+
-+    $tb->reset_outputs;
-+
-+    for my $method (qw(output failure_output todo_output)) {
-+        is $tb->$method(), $original_outputs{$method}, "reset_outputs() resets $method";
-+    }
-+}
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/reset.t perl-5.10.0/lib/Test/Simple/t/reset.t
---- perl-5.10.0.orig/lib/Test/Simple/t/reset.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/reset.t	2009-08-26 06:14:11.000000000 +0200
-@@ -15,19 +15,23 @@
- 
- 
- use Test::Builder;
--my $tb = Test::Builder->new;
--$tb->plan(tests => 14);
--$tb->level(0);
-+my $Test = Test::Builder->new;
-+my $tb = Test::Builder->create;
-+
-+# We'll need this later to know the outputs were reset
-+my %Original_Output;
-+$Original_Output{$_} = $tb->$_ for qw(output failure_output todo_output);
- 
- # Alter the state of Test::Builder as much as possible.
--$tb->ok(1, "Running a test to alter TB's state");
-+my $output = '';
-+$tb->output(\$output);
-+$tb->failure_output(\$output);
-+$tb->todo_output(\$output);
- 
--my $tmpfile = 'foo.tmp';
-+$tb->plan(tests => 14);
-+$tb->level(0);
- 
--$tb->output($tmpfile);
--$tb->failure_output($tmpfile);
--$tb->todo_output($tmpfile);
--END { 1 while unlink $tmpfile }
-+$tb->ok(1, "Running a test to alter TB's state");
- 
- # This won't print since we just sent output off to oblivion.
- $tb->ok(0, "And a failure for fun");
-@@ -44,41 +48,26 @@
- # Now reset it.
- $tb->reset;
- 
--my $test_num = 2;   # since we already printed 1
--# Utility testing functions.
--sub ok ($;$) {
--    my($test, $name) = @_;
--    my $ok = '';
--    $ok .= "not " unless $test;
--    $ok .= "ok $test_num";
--    $ok .= " - $name" if defined $name;
--    $ok .= "\n";
--    print $ok;
--    $test_num++;
--
--    return $test;
--}
--
--
--ok( !defined $tb->exported_to,          'exported_to' );
--ok( $tb->expected_tests == 0,           'expected_tests' );
--ok( $tb->level          == 1,           'level' );
--ok( $tb->use_numbers    == 1,           'use_numbers' );
--ok( $tb->no_header      == 0,           'no_header' );
--ok( $tb->no_ending      == 0,           'no_ending' );
--ok( fileno $tb->output         == fileno *Test::Builder::TESTOUT,    
--                                        'output' );
--ok( fileno $tb->failure_output == fileno *Test::Builder::TESTERR,    
--                                        'failure_output' );
--ok( fileno $tb->todo_output    == fileno *Test::Builder::TESTOUT,
--                                        'todo_output' );
--ok( $tb->current_test   == 0,           'current_test' );
--ok( $tb->summary        == 0,           'summary' );
--ok( $tb->details        == 0,           'details' );
- 
--$tb->no_ending(1);
--$tb->no_header(1);
--$tb->plan(tests => 14);
--$tb->current_test(13);
-+$Test->ok( !defined $tb->exported_to, 'exported_to' );
-+$Test->is_eq( $tb->expected_tests, 0, 'expected_tests' );
-+$Test->is_eq( $tb->level,          1, 'level' );
-+$Test->is_eq( $tb->use_numbers,    1, 'use_numbers' );
-+$Test->is_eq( $tb->no_header,      0, 'no_header' );
-+$Test->is_eq( $tb->no_ending,      0, 'no_ending' );
-+$Test->is_eq( $tb->current_test,   0, 'current_test' );
-+$Test->is_eq( scalar $tb->summary, 0, 'summary' );
-+$Test->is_eq( scalar $tb->details, 0, 'details' );
-+$Test->is_eq( fileno $tb->output,
-+              fileno $Original_Output{output},         'output' );
-+$Test->is_eq( fileno $tb->failure_output,
-+              fileno $Original_Output{failure_output}, 'failure_output' );
-+$Test->is_eq( fileno $tb->todo_output,
-+              fileno $Original_Output{todo_output},    'todo_output' );
-+
-+$tb->current_test(12);
- $tb->level(0);
- $tb->ok(1, 'final test to make sure output was reset');
-+
-+$Test->current_test(13);
-+$Test->done_testing(13);
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/skipall.t perl-5.10.0/lib/Test/Simple/t/skipall.t
---- perl-5.10.0.orig/lib/Test/Simple/t/skipall.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/skipall.t	2009-08-26 06:14:11.000000000 +0200
-@@ -1,3 +1,5 @@
-+#!/usr/bin/perl -w
-+
- BEGIN {
-     if( $ENV{PERL_CORE} ) {
-         chdir 't';
-@@ -10,35 +12,22 @@
- 
- use strict;
- 
--# Can't use Test.pm, that's a 5.005 thing.
--package My::Test;
--
--print "1..2\n";
--
--my $test_num = 1;
--# Utility testing functions.
--sub ok ($;$) {
--    my($test, $name) = @_;
--    my $ok = '';
--    $ok .= "not " unless $test;
--    $ok .= "ok $test_num";
--    $ok .= " - $name" if defined $name;
--    $ok .= "\n";
--    print $ok;
--    $test_num++;
--}
-+use Test::More;
- 
-+my $Test = Test::Builder->create;
-+$Test->plan(tests => 2);
- 
--package main;
--require Test::More;
--
--require Test::Simple::Catch;
--my($out, $err) = Test::Simple::Catch::caught();
--
--Test::More->import('skip_all');
-+my $out = '';
-+my $err = '';
-+{
-+    my $tb = Test::More->builder;
-+    $tb->output(\$out);
-+    $tb->failure_output(\$err);
- 
-+    plan 'skip_all';
-+}
- 
- END {
--    My::Test::ok($$out eq "1..0\n");
--    My::Test::ok($$err eq "");
-+    $Test->is_eq($out, "1..0 # SKIP\n");
-+    $Test->is_eq($err, "");
- }
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/skip.t perl-5.10.0/lib/Test/Simple/t/skip.t
---- perl-5.10.0.orig/lib/Test/Simple/t/skip.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/skip.t	2009-08-26 06:14:11.000000000 +0200
-@@ -94,5 +94,5 @@
-         pass "This does not run";
-     }
- 
--    like $warning, '/^skip\(\) was passed a non-numeric number of tests/';
-+    like $warning, qr/^skip\(\) was passed a non-numeric number of tests/;
- }
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/tbm_doesnt_set_exported_to.t perl-5.10.0/lib/Test/Simple/t/tbm_doesnt_set_exported_to.t
---- perl-5.10.0.orig/lib/Test/Simple/t/tbm_doesnt_set_exported_to.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/tbm_doesnt_set_exported_to.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,24 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = '../lib';
-+    }
-+}
-+
-+use strict;
-+use warnings;
-+
-+# Can't use Test::More, that would set exported_to()
-+use Test::Builder;
-+use Test::Builder::Module;
-+
-+my $TB = Test::Builder->create;
-+$TB->plan( tests => 1 );
-+$TB->level(0);
-+
-+$TB->is_eq( Test::Builder::Module->builder->exported_to,
-+            undef,
-+            'using Test::Builder::Module does not set exported_to()'
-+);
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/thread_taint.t perl-5.10.0/lib/Test/Simple/t/thread_taint.t
---- perl-5.10.0.orig/lib/Test/Simple/t/thread_taint.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/thread_taint.t	2009-08-26 06:14:11.000000000 +0200
-@@ -2,4 +2,4 @@
- 
- use Test::More tests => 1;
- 
--ok( !$INC{'threads.pm'}, 'Loading Test::More does not load threads.pm' );
-\ No newline at end of file
-+ok( !$INC{'threads.pm'}, 'Loading Test::More does not load threads.pm' );
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/todo.t perl-5.10.0/lib/Test/Simple/t/todo.t
---- perl-5.10.0.orig/lib/Test/Simple/t/todo.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/todo.t	2009-08-26 06:14:11.000000000 +0200
-@@ -9,7 +9,7 @@
- 
- use Test::More;
- 
--plan tests => 18;
-+plan tests => 36;
- 
- 
- $Why = 'Just testing the todo interface.';
-@@ -42,7 +42,7 @@
- 
-     ok( 'this' eq 'that',   'ok' );
- 
--    like( 'this', '/that/', 'like' );
-+    like( 'this', qr/that/, 'like' );
-     is(   'this', 'that',   'is' );
-     isnt( 'this', 'this',   'isnt' );
- 
-@@ -69,11 +69,89 @@
-         # perl gets the line number a little wrong on the first
-         # statement inside a block.
-         1 == 1;
--#line 82
-+#line 74
-         todo_skip "Just testing todo_skip";
-         fail("So very failed");
-     }
-     is( $warning, "todo_skip() needs to know \$how_many tests are in the ".
--                  "block at $0 line 82\n",
-+                  "block at $0 line 74\n",
-         'todo_skip without $how_many warning' );
- }
-+
-+my $builder = Test::More->builder;
-+my $exported_to = $builder->exported_to;
-+TODO: {
-+    $builder->exported_to("Wibble");
-+    
-+    local $TODO = "testing \$TODO with an incorrect exported_to()";
-+    
-+    fail("Just testing todo");
-+}
-+
-+$builder->exported_to($exported_to);
-+
-+$builder->todo_start('Expected failures');
-+fail('Testing todo_start()');
-+ok 0, 'Testing todo_start() with more than one failure';
-+$is_todo = $builder->todo;
-+$builder->todo_end;
-+is $is_todo, 'Expected failures',
-+  'todo_start should have the correct TODO message';
-+ok 1, 'todo_end() should not leak TODO behavior';
-+
-+my @nested_todo;
-+my ( $level1, $level2 ) = ( 'failure level 1', 'failure_level 2' );
-+TODO: {
-+    local $TODO = 'Nesting TODO';
-+    fail('fail 1');
-+
-+    $builder->todo_start($level1);
-+    fail('fail 2');
-+
-+    push @nested_todo => $builder->todo;
-+    $builder->todo_start($level2);
-+    fail('fail 3');
-+
-+    push @nested_todo => $builder->todo;
-+    $builder->todo_end;
-+    fail('fail 4');
-+
-+    push @nested_todo => $builder->todo;
-+    $builder->todo_end;
-+    $is_todo = $builder->todo;
-+    fail('fail 4');
-+}
-+is_deeply \@nested_todo, [ $level1, $level2, $level1 ],
-+  'Nested TODO message should be correct';
-+is $is_todo, 'Nesting TODO',
-+  '... and original TODO message should be correct';
-+
-+{
-+    $builder->todo_start;
-+    fail("testing todo_start() with no message");
-+    my $reason  = $builder->todo;
-+    my $in_todo = $builder->in_todo;
-+    $builder->todo_end;
-+
-+    is $reason, '', "  todo() reports no reason";
-+    ok $in_todo,    "  but we're in_todo()";
-+}
-+
-+eval {
-+    $builder->todo_end;
-+};
-+is $@, sprintf "todo_end() called without todo_start() at %s line %d.\n", $0, __LINE__ - 2;
-+
-+
-+{
-+    my($reason, $in_todo);
-+
-+    TODO: {
-+        local $TODO = '';
-+        $reason  = $builder->todo;
-+        $in_todo = $builder->in_todo;
-+    }
-+
-+    is $reason, '';
-+    ok !$in_todo, '$TODO = "" is not considered TODO';
-+}
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/try.t perl-5.10.0/lib/Test/Simple/t/try.t
---- perl-5.10.0.orig/lib/Test/Simple/t/try.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/try.t	2009-08-26 06:14:11.000000000 +0200
-@@ -17,19 +17,26 @@
- require Test::Builder;
- my $tb = Test::Builder->new;
- 
--local $SIG{__DIE__} = sub { fail("DIE handler called: @_") };
- 
--# These should not change;
--local $@ = 42;
--local $! = 23;
--
--is $tb->_try(sub { 2 }), 2;
--is $tb->_try(sub { return '' }), '';
--
--is $tb->_try(sub { die; }), undef;
--
--is_deeply [$tb->_try(sub { die "Foo\n" }, undef)],
--          [undef, "Foo\n"];
--
--is $@, 42;
--cmp_ok $!, '==', 23;
-\ No newline at end of file
-+# Test that _try() has no effect on $@ and $! and is not effected by
-+# __DIE__
-+{
-+    local $SIG{__DIE__} = sub { fail("DIE handler called: @_") };
-+    local $@ = 42;
-+    local $! = 23;
-+
-+    is $tb->_try(sub { 2 }), 2;
-+    is $tb->_try(sub { return '' }), '';
-+
-+    is $tb->_try(sub { die; }), undef;
-+
-+    is_deeply [$tb->_try(sub { die "Foo\n" })], [undef, "Foo\n"];
-+
-+    is $@, 42;
-+    cmp_ok $!, '==', 23;
-+}
-+
-+ok !eval {
-+    $tb->_try(sub { die "Died\n" }, die_on_fail => 1);
-+};
-+is $@, "Died\n";
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/undef.t perl-5.10.0/lib/Test/Simple/t/undef.t
---- perl-5.10.0.orig/lib/Test/Simple/t/undef.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/undef.t	2009-08-26 06:14:11.000000000 +0200
-@@ -11,8 +11,7 @@
- }
- 
- use strict;
--use Test::More tests => 18;
--use TieOut;
-+use Test::More tests => 21;
- 
- BEGIN { $^W = 1; }
- 
-@@ -31,7 +30,7 @@
- }
- 
- sub warnings_like {
--    $TB->like($warnings, "/$_[0]/");
-+    $TB->like($warnings, $_[0]);
-     $warnings = '';
- }
- 
-@@ -48,9 +47,12 @@
- isnt( undef, '',            'undef isnt an empty string' );
- isnt( undef, 0,             'undef isnt zero' );
- 
-+Test::More->builder->is_num(undef, undef, 'is_num()');
-+Test::More->builder->isnt_num(23, undef,  'isnt_num()');
-+
- #line 45
--like( undef, '/.*/',        'undef is like anything' );
--warnings_like("Use of uninitialized value.* at $Filename line 45\\.\n");
-+like( undef, qr/.*/,        'undef is like anything' );
-+warnings_like(qr/Use of uninitialized value.* at $Filename line 45\.\n/);
- 
- eq_array( [undef, undef], [undef, 23] );
- no_warnings;
-@@ -70,23 +72,27 @@
- 
- #line 64
- cmp_ok( undef, '<=', 2, '  undef <= 2' );
--warnings_like("Use of uninitialized value.* at $Filename line 64\\.\n");
-+warnings_like(qr/Use of uninitialized value.* at cmp_ok \[from $Filename line 64\] line 1\.\n/);
- 
- 
- 
- my $tb = Test::More->builder;
- 
--use TieOut;
--my $caught = tie *CATCH, 'TieOut';
--my $old_fail = $tb->failure_output;
--$tb->failure_output(\*CATCH);
-+my $err;
-+$tb->failure_output(\$err);
- diag(undef);
--$tb->failure_output($old_fail);
-+$tb->reset_outputs;
- 
--is( $caught->read, "# undef\n" );
-+is( $err, "# undef\n" );
- no_warnings;
- 
- 
- $tb->maybe_regex(undef);
--is( $caught->read, '' );
- no_warnings;
-+
-+
-+# test-more.googlecode.com #42
-+{
-+    is_deeply([ undef ], [ undef ]);
-+    no_warnings;
-+}
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/use_ok.t perl-5.10.0/lib/Test/Simple/t/use_ok.t
---- perl-5.10.0.orig/lib/Test/Simple/t/use_ok.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/use_ok.t	2009-08-26 06:16:36.000000000 +0200
-@@ -3,14 +3,14 @@
- BEGIN {
-     if( $ENV{PERL_CORE} ) {
-         chdir 't';
--        @INC = ('../lib', 'lib');
-+        @INC = qw(../lib lib ../lib/Test/Simple/t/lib);
-     }
-     else {
-         unshift @INC, 't/lib';
-     }
- }
- 
--use Test::More tests => 13;
-+use Test::More tests => 15;
- 
- # Using Symbol because it's core and exports lots of stuff.
- {
-@@ -58,3 +58,10 @@
-     };
-     ::use_ok("Test::More", 0.47);
- }
-+
-+{
-+    package Foo::eight;
-+    local $SIG{__DIE__};
-+    ::use_ok("SigDie");
-+    ::ok(defined $SIG{__DIE__}, '  SIG{__DIE__} preserved');
-+}
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/utf8.t perl-5.10.0/lib/Test/Simple/t/utf8.t
---- perl-5.10.0.orig/lib/Test/Simple/t/utf8.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/utf8.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,69 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = '../lib';
-+    }
-+}
-+
-+use strict;
-+use warnings;
-+
-+use Test::More skip_all => 'Not yet implemented';
-+
-+my $have_perlio;
-+BEGIN {
-+    # All together so Test::More sees the open discipline
-+    $have_perlio = eval q[
-+        use PerlIO;
-+        use open ':std', ':locale';
-+        use Test::More;
-+        1;
-+    ];
-+}
-+
-+use Test::More;
-+
-+if( !$have_perlio ) {
-+    plan skip_all => "Don't have PerlIO";
-+}
-+else {
-+    plan tests => 5;
-+}
-+
-+SKIP: {
-+    skip( "Need PerlIO for this feature", 3 )
-+        unless $have_perlio;
-+
-+    my %handles = (
-+        output          => \*STDOUT,
-+        failure_output  => \*STDERR,
-+        todo_output     => \*STDOUT
-+    );
-+
-+    for my $method (keys %handles) {
-+        my $src = $handles{$method};
-+        
-+        my $dest = Test::More->builder->$method;
-+        
-+        is_deeply { map { $_ => 1 } PerlIO::get_layers($dest) },
-+                  { map { $_ => 1 } PerlIO::get_layers($src)  },
-+                  "layers copied to $method";
-+    }
-+}
-+
-+SKIP: {
-+    skip( "Can't test in general because their locale is unknown", 2 )
-+        unless $ENV{AUTHOR_TESTING};
-+
-+    my $uni = "\x{11e}";
-+    
-+    my @warnings;
-+    local $SIG{__WARN__} = sub {
-+        push @warnings, @_;
-+    };
-+
-+    is( $uni, $uni, "Testing $uni" );
-+    is_deeply( \@warnings, [] );
-+}
-diff -urN perl-5.10.0.orig/lib/Test/Simple/t/versions.t perl-5.10.0/lib/Test/Simple/t/versions.t
---- perl-5.10.0.orig/lib/Test/Simple/t/versions.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/versions.t	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,21 @@
-+#!/usr/bin/perl -w
-+
-+# Make sure all the modules have the same version
-+#
-+# TBT has its own version system.
-+
-+use strict;
-+use Test::More;
-+
-+require Test::Builder;
-+require Test::Builder::Module;
-+require Test::Simple;
-+
-+my $dist_version = $Test::More::VERSION;
-+
-+like( $dist_version, qr/^ \d+ \. \d+ $/x );
-+is( $dist_version, $Test::Builder::VERSION,             'Test::Builder' );
-+is( $dist_version, $Test::Builder::Module::VERSION,     'TB::Module' );
-+is( $dist_version, $Test::Simple::VERSION,              'Test::Simple' );
-+
-+done_testing(4);
-diff -urN perl-5.10.0.orig/lib/Test/Simple.pm perl-5.10.0/lib/Test/Simple.pm
---- perl-5.10.0.orig/lib/Test/Simple.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple.pm	2009-08-26 06:14:11.000000000 +0200
-@@ -2,18 +2,17 @@
- 
- use 5.004;
- 
--use strict 'vars';
--use vars qw($VERSION @ISA @EXPORT);
--$VERSION = '0.72';
--$VERSION = eval $VERSION;    # make the alpha version come out as a number
-+use strict;
-+
-+our $VERSION = '0.92';
-+$VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
- 
- use Test::Builder::Module;
--@ISA    = qw(Test::Builder::Module);
--@EXPORT = qw(ok);
-+our @ISA    = qw(Test::Builder::Module);
-+our @EXPORT = qw(ok);
- 
- my $CLASS = __PACKAGE__;
- 
--
- =head1 NAME
- 
- Test::Simple - Basic utilities for writing tests.
-@@ -77,11 +76,10 @@
- 
- =cut
- 
--sub ok ($;$) {
--    $CLASS->builder->ok(@_);
-+sub ok ($;$) {    ## no critic (Subroutines::ProhibitSubroutinePrototypes)
-+    return $CLASS->builder->ok(@_);
- }
- 
--
- =back
- 
- Test::Simple will start by printing number of tests run in the form
-@@ -191,24 +189,10 @@
- (i.e. you can just use Test::More instead of Test::Simple in your
- programs and things will still work).
- 
--=item L<Test>
--
--The original Perl testing module.
--
--=item L<Test::Unit>
--
--Elaborate unit testing.
--
--=item L<Test::Inline>, L<SelfTest>
--
--Embed tests in your code!
--
--=item L<Test::Harness>
--
--Interprets the output of your test program.
--
- =back
- 
-+Look in Test::More's SEE ALSO for more testing modules.
-+
- 
- =head1 AUTHORS
- 
-@@ -218,7 +202,7 @@
- 
- =head1 COPYRIGHT
- 
--Copyright 2001, 2002, 2004 by Michael G Schwern E<lt>schwern@pobox.comE<gt>.
-+Copyright 2001-2008 by Michael G Schwern E<lt>schwern@pobox.comE<gt>.
- 
- This program is free software; you can redistribute it and/or 
- modify it under the same terms as Perl itself.
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-08-26 06:14:11.000000000 +0200
-@@ -2626,20 +2626,34 @@
- lib/Test/Simple/Changes		Test::Simple changes
- lib/Test/Simple.pm		Basic utility for writing tests
- lib/Test/Simple/README		Test::Simple README
-+lib/Test/Simple/TODO        Test::Simple TODO
- lib/Test/Simple/t/00test_harness_check.t	Test::Simple test
- lib/Test/Simple/t/bad_plan.t	Test::Builder plan() test
- lib/Test/Simple/t/bail_out.t	Test::Builder BAIL_OUT test
-+lib/Test/Simple/t/BEGIN_require_ok.t
-+lib/Test/Simple/t/BEGIN_use_ok.t
- lib/Test/Simple/t/buffer.t	Test::Builder buffering test
- lib/Test/Simple/t/Builder.t	Test::Builder tests
-+lib/Test/Simple/t/c_flag.t
- lib/Test/Simple/t/carp.t	Test::Builder test
- lib/Test/Simple/t/circular_data.t	Test::Simple test
- lib/Test/Simple/t/cmp_ok.t	Test::More test
- lib/Test/Simple/t/create.t	Test::Simple test
--lib/Test/Simple/t/curr_test.t	Test::Builder->curr_test tests
-+lib/Test/Simple/t/current_test.t
-+lib/Test/Simple/t/current_test_without_plan.t
- lib/Test/Simple/t/details.t	Test::Builder tests
- lib/Test/Simple/t/diag.t	Test::More diag() test
-+lib/Test/Simple/t/died.t
-+lib/Test/Simple/t/done_testing_double.t
-+lib/Test/Simple/t/done_testing_plan_mismatch.t
-+lib/Test/Simple/t/done_testing.t
-+lib/Test/Simple/t/done_testing_with_no_plan.t
-+lib/Test/Simple/t/done_testing_with_number.t
-+lib/Test/Simple/t/done_testing_with_plan.t
-+lib/Test/Simple/t/dont_overwrite_die_handler.t
- lib/Test/Simple/t/eq_set.t	Test::Simple test
- lib/Test/Simple/t/exit.t	Test::Simple test, exit codes
-+lib/Test/Simple/t/explain.t
- lib/Test/Simple/t/extra_one.t	Test::Simple test
- lib/Test/Simple/t/extra.t	Test::Simple test
- lib/Test/Simple/t/fail-like.t	Test::More test, like() failures
-@@ -2648,6 +2662,7 @@
- lib/Test/Simple/t/fail.t	Test::Simple test, test failures
- lib/Test/Simple/t/filehandles.t	Test::Simple test, STDOUT can be played with
- lib/Test/Simple/t/fork.t	Test::More fork tests
-+lib/Test/Simple/t/fork_with_new_stdout.t
- lib/Test/Simple/t/harness_active.t	Test::Simple test
- lib/Test/Simple/t/has_plan2.t	Test::More->plan tests
- lib/Test/Simple/t/has_plan.t	Test::Builder->plan tests
-@@ -2661,10 +2676,15 @@
- lib/Test/Simple/t/maybe_regex.t	Test::Builder->maybe_regex() tests
- lib/Test/Simple/t/missing.t	Test::Simple test, missing tests
- lib/Test/Simple/t/More.t	Test::More test, basic stuff
-+lib/Test/Simple/t/new_ok.t
- lib/Test/Simple/t/no_diag.t	Test::Simple test
- lib/Test/Simple/t/no_ending.t	Test::Builder test, no_ending()
- lib/Test/Simple/t/no_header.t	Test::Builder test, no_header()
- lib/Test/Simple/t/no_plan.t	Test::Simple test, forgot the plan
-+lib/Test/Simple/t/no_plan_at_all.t
-+lib/Test/Simple/t/no_tests.t
-+lib/Test/Simple/t/note.t
-+lib/Test/Simple/t/reset_outputs.t
- lib/Test/Simple/TODO		Test::Simple TODO
- lib/Test/Simple/t/ok_obj.t	Test::Builder object tests
- lib/Test/Simple/t/output.t	Test::Builder test, output methods
-@@ -2681,6 +2701,7 @@
- lib/Test/Simple/t/simple.t	Test::Simple test, basic stuff
- lib/Test/Simple/t/skipall.t	Test::More test, skip all tests
- lib/Test/Simple/t/skip.t	Test::More test, SKIP tests
-+lib/Test/Simple/t/tbm_doesnt_set_exported_to.t
- lib/Test/Simple/t/tbt_01basic.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_02fhrestore.t	Test::Builder::Tester test
- lib/Test/Simple/t/tbt_03die.t	Test::Builder::Tester test
-@@ -2695,6 +2716,8 @@
- lib/Test/Simple/t/undef.t	Test::More test, undefs don't cause warnings
- lib/Test/Simple/t/useing.t	Test::More test, compile test
- lib/Test/Simple/t/use_ok.t	Test::More test, use_ok()
-+lib/Test/Simple/t/utf8.t
-+lib/Test/Simple/t/versions.t
- lib/Test/t/05_about_verbose.t	See if Test works
- lib/Test/t/fail.t		See if Test works
- lib/Test/t/mix.t		See if Test works
-diff -urN perl-5.10.0.orig/t/lib/Test/Builder/NoOutput.pm perl-5.10.0/t/lib/Test/Builder/NoOutput.pm
---- perl-5.10.0.orig/t/lib/Test/Builder/NoOutput.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Builder/NoOutput.pm	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,122 @@
-+package Test::Builder::NoOutput;
-+
-+use strict;
-+use warnings;
-+
-+use base qw(Test::Builder);
-+
-+
-+=head1 NAME
-+
-+Test::Builder::NoOutput - A subclass of Test::Builder which prints nothing
-+
-+=head1 SYNOPSIS
-+
-+    use Test::Builder::NoOutput;
-+
-+    my $tb = Test::Builder::NoOutput->new;
-+
-+    ...test as normal...
-+
-+    my $output = $tb->read;
-+
-+=head1 DESCRIPTION
-+
-+This is a subclass of Test::Builder which traps all its output.
-+It is mostly useful for testing Test::Builder.
-+
-+=head3 read
-+
-+    my $all_output = $tb->read;
-+    my $output     = $tb->read($stream);
-+
-+Returns all the output (including failure and todo output) collected
-+so far.  It is destructive, each call to read clears the output
-+buffer.
-+
-+If $stream is given it will return just the output from that stream.
-+$stream's are...
-+
-+    out         output()
-+    err         failure_output()
-+    todo        todo_output()
-+    all         all outputs
-+
-+Defaults to 'all'.
-+
-+=cut
-+
-+my $Test = __PACKAGE__->new;
-+
-+sub create {
-+    my $class = shift;
-+    my $self = $class->SUPER::create(@_);
-+
-+    my %outputs = (
-+        all  => '',
-+        out  => '',
-+        err  => '',
-+        todo => '',
-+    );
-+    $self->{_outputs} = \%outputs;
-+
-+    tie *OUT,  "Test::Builder::NoOutput::Tee", \$outputs{all}, \$outputs{out};
-+    tie *ERR,  "Test::Builder::NoOutput::Tee", \$outputs{all}, \$outputs{err};
-+    tie *TODO, "Test::Builder::NoOutput::Tee", \$outputs{all}, \$outputs{todo};
-+
-+    $self->output(*OUT);
-+    $self->failure_output(*ERR);
-+    $self->todo_output(*TODO);
-+
-+    return $self;
-+}
-+
-+sub read {
-+    my $self = shift;
-+    my $stream = @_ ? shift : 'all';
-+
-+    my $out = $self->{_outputs}{$stream};
-+
-+    $self->{_outputs}{$stream} = '';
-+
-+    # Clear all the streams if 'all' is read.
-+    if( $stream eq 'all' ) {
-+        my @keys = keys %{$self->{_outputs}};
-+        $self->{_outputs}{$_} = '' for @keys;
-+    }
-+
-+    return $out;
-+}
-+
-+
-+package Test::Builder::NoOutput::Tee;
-+
-+# A cheap implementation of IO::Tee.
-+
-+sub TIEHANDLE {
-+    my($class, @refs) = @_;
-+
-+    my @fhs;
-+    for my $ref (@refs) {
-+        my $fh = Test::Builder->_new_fh($ref);
-+        push @fhs, $fh;
-+    }
-+
-+    my $self = [@fhs];
-+    return bless $self, $class;
-+}
-+
-+sub PRINT {
-+    my $self = shift;
-+
-+    print $_ @_ for @$self;
-+}
-+
-+sub PRINTF {
-+    my $self   = shift;
-+    my $format = shift;
-+
-+    printf $_ @_ for @$self;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/Catch.pm perl-5.10.0/t/lib/Test/Simple/Catch.pm
---- perl-5.10.0.orig/t/lib/Test/Simple/Catch.pm	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/Catch.pm	2009-08-26 06:14:11.000000000 +0200
-@@ -1,9 +1,11 @@
- # For testing Test::Simple;
- package Test::Simple::Catch;
- 
-+use strict;
-+
- use Symbol;
- use TieOut;
--my($out_fh, $err_fh) = (gensym, gensym);
-+my( $out_fh, $err_fh ) = ( gensym, gensym );
- my $out = tie *$out_fh, 'TieOut';
- my $err = tie *$err_fh, 'TieOut';
- 
-@@ -13,6 +15,6 @@
- $t->failure_output($err_fh);
- $t->todo_output($err_fh);
- 
--sub caught { return($out, $err) }
-+sub caught { return( $out, $err ) }
- 
- 1;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx	2009-08-26 06:14:11.000000000 +0200
-@@ -4,10 +4,13 @@
- require Test::Simple::Catch;
- my($out, $err) = Test::Simple::Catch::caught();
- 
-+require Dev::Null;
-+
- Test::Simple->import(tests => 5);
--close STDERR;
-+tie *STDERR, 'Dev::Null';
- 
- ok(1);
- ok(1);
- ok(1);
--die "Knife?";
-+$! = 0;
-+die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_with_handler.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_with_handler.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx	2009-08-26 06:14:11.000000000 +0200
-@@ -0,0 +1,20 @@
-+require Test::Simple;
-+
-+push @INC, 't/lib';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+
-+Test::Simple->import(tests => 2);
-+
-+# Test we still get the right exit code despite having a die
-+# handler.
-+$SIG{__DIE__} = sub {};
-+
-+require Dev::Null;
-+tie *STDERR, 'Dev::Null';
-+
-+ok(1);
-+ok(1);
-+
-+$! = 0;
-+die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/last_minute_death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2009-08-26 06:14:11.000000000 +0200
-@@ -5,7 +5,9 @@
- my($out, $err) = Test::Simple::Catch::caught();
- 
- Test::Simple->import(tests => 5);
--close STDERR;
-+
-+require Dev::Null;
-+tie *STDERR, 'Dev::Null';
- 
- ok(1);
- ok(1);
-@@ -13,4 +15,5 @@
- ok(1);
- ok(1);
- 
--die "Almost there...";
-+$! = 0;
-+die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2009-08-26 06:14:11.000000000 +0200
-@@ -9,4 +9,4 @@
- 
- ok(0);
- ok(1);
--ok(0);
-\ No newline at end of file
-+ok(0);
-diff -urN perl-5.10.0.orig/t/lib/TieOut.pm perl-5.10.0/t/lib/TieOut.pm
---- perl-5.10.0.orig/t/lib/TieOut.pm	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/TieOut.pm	2009-08-26 06:14:11.000000000 +0200
-@@ -1,13 +1,15 @@
- package TieOut;
- 
-+use strict;
-+
- sub TIEHANDLE {
-     my $scalar = '';
--    bless( \$scalar, $_[0]);
-+    bless( \$scalar, $_[0] );
- }
- 
- sub PRINT {
-     my $self = shift;
--    $$self .= join('', @_);
-+    $$self .= join( '', @_ );
- }
- 
- sub PRINTF {
-@@ -16,7 +18,7 @@
-     $$self .= sprintf $fmt, @_;
- }
- 
--sub FILENO {}
-+sub FILENO { }
- 
- sub read {
-     my $self = shift;
diff --git a/perl-update-Time-HiRes.patch b/perl-update-Time-HiRes.patch
deleted file mode 100644
index a2fe610..0000000
--- a/perl-update-Time-HiRes.patch
+++ /dev/null
@@ -1,686 +0,0 @@
-Time-HiRes-1.9719
-
-diff -urN perl-5.10.0.orig/ext/Time/HiRes/Changes perl-5.10.0/ext/Time/HiRes/Changes
---- perl-5.10.0.orig/ext/Time/HiRes/Changes	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Time/HiRes/Changes	2009-03-10 17:48:02.000000000 +0100
-@@ -1,5 +1,66 @@
- Revision history for the Perl extension Time::HiRes.
- 
-+1.9719	[2009-01-04]
-+	- As with QNX, Haiku has the API of interval timers but not
-+	  the implementation (bleadperl change #34630), hence skip
-+	  the tests, via David Mitchell.
-+
-+1.9718	[2008-12-31]
-+	- .xs code cleanup from Albert Dvornik
-+	- in the #39 and #40 do not do us I did, mixing alarm() and
-+	  sleep().  Now instead spin until enough time has passed.
-+
-+1.9717	[2008-12-30]
-+	- Skip the tests added in 1.9716 (#39, #40) if there's no subsecond
-+	  alarm capability, like with the older subsecond alarm tests
-+
-+1.9716	[2008-12-26]
-+	- Change documentation to agree with reality: there are
-+	  no interval timers in Win32.
-+	- Address [rt.cpan.org #35899] (problem in subsecond sleeps),
-+          add two tests to guard against this problem
-+	- Address [rt.cpan.org #36600] 'Division by zero' failure in test suite
-+	- Address [rt.cpan.org #37340] [PATCH] Address timer process in test
-+	- Address [rt.cpan.org#40311 ] bad implementation of hrt_usleep
-+          with TIME_HIRES_NANOSLEEP
-+
-+1.9715	[2008-04-08]
-+	- Silly me: Makefile.PL does need to accept arguments other than mine.
-+	  Some testing frameworks obviously do this.
-+	- Add retrying for tests 34..37, which are the most commonly
-+	  failing tests.  If this helps, consider extending the retry
-+	  framework to all the tests.  [Inspired by Slaven Rezic,
-+	  [rt.cpan.org #34711] Occasional failures of test 35 or 36 (FreeBSD)]
-+
-+1.9714	[2008-04-07]
-+	- Under Perl 5.6.* NVgf needs to be "g", reported by Zefram,
-+	  it seems that ppport.h 3.13 gets this wrong.
-+	- remove the check in Makefile.PL for 5.7.2, shouldn't be
-+	  (a) necessary (b) relevant
-+	- add logic to Makefile.PL to skip configure/write Makefile
-+	  step if the "xdefine" file already exists, indicating that
-+	  the configure step has already been done, one can still
-+	  force (re)configure by "perl Makefile.PL configure",
-+	  or of course by "make clean && perl Makefile.PL".
-+
-+1.9713	[2008-04-04]
-+	- for alarm() and ualarm() [Perl] prefer setitimer() [C]
-+	  instead of ualarm() [C] since ualarm() [C] cannot portably
-+	  (and standards-compliantly) be used for more than 999_999
-+	  microseconds (rt.cpan.org #34655)
-+	- it seems that HP-UX has started (at least in 11.31 ia64)
-+	  #defining the CLOCK_REALTIME et alia (instead of having
-+	  them just as enums)
-+	- document all the diagnostics 
-+
-+1.9712	[2008-02-09]
-+	- move the sub tick in the test file back to where it used to be
-+	- in the "consider upgrading" message recommend at least Perl 5.8.8
-+	  and make the message to appear only for 5.8.0 since 5.8.1 and
-+	  later have the problem fixed
-+	- VOS tweak for Makefile (core perl change #33259)
-+	- since the test #17 seems to fail often, relax its limits a bit
-+
- 1.9711	[2007-11-29]
- 	- lost VMS test skippage from Craig Berry
- 	- reformat the test code a little
-diff -urN perl-5.10.0.orig/ext/Time/HiRes/HiRes.pm perl-5.10.0/ext/Time/HiRes/HiRes.pm
---- perl-5.10.0.orig/ext/Time/HiRes/HiRes.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Time/HiRes/HiRes.pm	2009-03-10 17:48:02.000000000 +0100
-@@ -22,8 +22,8 @@
- 		 d_clock d_clock_nanosleep
- 		 stat
- 		);
--	
--$VERSION = '1.9711';
-+
-+$VERSION = '1.9719';
- $XS_VERSION = $VERSION;
- $VERSION = eval $VERSION;
- 
-@@ -209,6 +209,9 @@
- Issues a C<ualarm> call; the C<$interval_useconds> is optional and
- will be zero if unspecified, resulting in C<alarm>-like behaviour.
- 
-+Returns the remaining time in the alarm in microseconds, or C<undef>
-+if an error occurred.
-+
- ualarm(0) will cancel an outstanding ualarm().
- 
- Note that the interaction between alarms and sleeps is unspecified.
-@@ -260,10 +263,14 @@
- =item alarm ( $floating_seconds [, $interval_floating_seconds ] )
- 
- The C<SIGALRM> signal is sent after the specified number of seconds.
--Implemented using C<ualarm()>.  The C<$interval_floating_seconds> argument
--is optional and will be zero if unspecified, resulting in C<alarm()>-like
--behaviour.  This function can be imported, resulting in a nice drop-in
--replacement for the C<alarm> provided with perl, see the L</EXAMPLES> below.
-+Implemented using C<setitimer()> if available, C<ualarm()> if not.
-+The C<$interval_floating_seconds> argument is optional and will be
-+zero if unspecified, resulting in C<alarm()>-like behaviour.  This
-+function can be imported, resulting in a nice drop-in replacement for
-+the C<alarm> provided with perl, see the L</EXAMPLES> below.
-+
-+Returns the remaining time in the alarm in seconds, or C<undef>
-+if an error occurred.
- 
- B<NOTE 1>: With some combinations of operating systems and Perl
- releases C<SIGALRM> restarts C<select()>, instead of interrupting it.
-@@ -292,9 +299,9 @@
- There are usually three or four interval timers (signals) available: the
- C<$which> can be C<ITIMER_REAL>, C<ITIMER_VIRTUAL>, C<ITIMER_PROF>, or
- C<ITIMER_REALPROF>.  Note that which ones are available depends: true
--UNIX platforms usually have the first three, but (for example) Win32
--and Cygwin have only C<ITIMER_REAL>, and only Solaris seems to have
--C<ITIMER_REALPROF> (which is used to profile multithreaded programs).
-+UNIX platforms usually have the first three, but only Solaris seems to
-+have C<ITIMER_REALPROF> (which is used to profile multithreaded programs).
-+Win32 unfortunately does not haveinterval timers.
- 
- C<ITIMER_REAL> results in C<alarm()>-like behaviour.  Time is counted in
- I<real time>; that is, wallclock time.  C<SIGALRM> is delivered when
-@@ -337,8 +344,8 @@
- CLOCK_REALTIME is zero, it might be one, or something else.
- Another potentially useful (but not available everywhere) value is
- C<CLOCK_MONOTONIC>, which guarantees a monotonically increasing time
--value (unlike time(), which can be adjusted).  See your system
--documentation for other possibly supported values.
-+value (unlike time() or gettimeofday(), which can be adjusted).
-+See your system documentation for other possibly supported values.
- 
- =item clock_getres ( $which )
- 
-@@ -528,6 +535,15 @@
- Something went horribly wrong-- the number of microseconds that cannot
- become negative just became negative.  Maybe your compiler is broken?
- 
-+=head2 useconds or uinterval equal to or more than 1000000
-+
-+In some platforms it is not possible to get an alarm with subsecond
-+resolution and later than one second.
-+
-+=head2 unimplemented in this platform
-+
-+Some calls simply aren't available, real or emulated, on every platform.
-+
- =head1 CAVEATS
- 
- Notice that the core C<time()> maybe rounding rather than truncating.
-@@ -544,6 +560,9 @@
- Note that since Time::HiRes 1.77 the clock_gettime(CLOCK_MONOTONIC)
- might help in this (in case your system supports CLOCK_MONOTONIC).
- 
-+Some systems have APIs but not implementations: for example QNX and Haiku
-+have the interval timer APIs but not the functionality.
-+
- =head1 SEE ALSO
- 
- Perl modules L<BSD::Resource>, L<Time::TAI64>.
-@@ -563,7 +582,8 @@
- 
- Copyright (c) 1996-2002 Douglas E. Wegscheid.  All rights reserved.
- 
--Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007 Jarkko Hietaniemi.  All rights reserved.
-+Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Jarkko Hietaniemi.
-+All rights reserved.
- 
- This program is free software; you can redistribute it and/or modify
- it under the same terms as Perl itself.
-diff -urN perl-5.10.0.orig/ext/Time/HiRes/HiRes.xs perl-5.10.0/ext/Time/HiRes/HiRes.xs
---- perl-5.10.0.orig/ext/Time/HiRes/HiRes.xs	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Time/HiRes/HiRes.xs	2009-03-10 17:48:02.000000000 +0100
-@@ -2,7 +2,8 @@
-  * 
-  * Copyright (c) 1996-2002 Douglas E. Wegscheid.  All rights reserved.
-  * 
-- * Copyright (c) 2002,2003,2004,2005,2006,2007 Jarkko Hietaniemi.  All rights reserved.
-+ * Copyright (c) 2002,2003,2004,2005,2006,2007,2008 Jarkko Hietaniemi.
-+ * All rights reserved.
-  * 
-  * This program is free software; you can redistribute it and/or modify
-  * it under the same terms as Perl itself.
-@@ -37,6 +38,13 @@
- }
- #endif
- 
-+/* At least ppport.h 3.13 gets this wrong: one really cannot
-+ * have NVgf as anything else than "g" under Perl 5.6.x. */
-+#if PERL_REVISION == 5 && PERL_VERSION == 6
-+# undef NVgf
-+# define NVgf "g"
-+#endif
-+
- #define IV_1E6 1000000
- #define IV_1E7 10000000
- #define IV_1E9 1000000000
-@@ -71,9 +79,13 @@
- /* HP-UX has CLOCK_XXX values but as enums, not as defines.
-  * The only way to detect these would be to test compile for each. */
- # ifdef __hpux
--#  define CLOCK_REALTIME CLOCK_REALTIME
--#  define CLOCK_VIRTUAL  CLOCK_VIRTUAL
--#  define CLOCK_PROFILE  CLOCK_PROFILE
-+/* However, it seems that at least in HP-UX 11.31 ia64 there *are*
-+ * defines for these, so let's try detecting them. */
-+#  ifndef CLOCK_REALTIME
-+#    define CLOCK_REALTIME CLOCK_REALTIME
-+#    define CLOCK_VIRTUAL  CLOCK_VIRTUAL
-+#    define CLOCK_PROFILE  CLOCK_PROFILE
-+#  endif
- # endif /* # ifdef __hpux */
- 
- #endif /* #if defined(TIME_HIRES_CLOCK_GETTIME) && defined(_STRUCT_ITIMERSPEC) */
-@@ -390,10 +402,10 @@
-   * The TIME_HIRES_NANOSLEEP is set by Makefile.PL. */
- #if !defined(HAS_USLEEP) && defined(TIME_HIRES_NANOSLEEP)
- #define HAS_USLEEP
--#define usleep hrt_nanosleep  /* could conflict with ncurses for static build */
-+#define usleep hrt_usleep  /* could conflict with ncurses for static build */
- 
- void
--hrt_nanosleep(unsigned long usec) /* This is used to emulate usleep. */
-+hrt_usleep(unsigned long usec) /* This is used to emulate usleep. */
- {
-     struct timespec res;
-     res.tv_sec = usec / IV_1E6;
-@@ -433,21 +445,6 @@
- }
- #endif /* #if !defined(HAS_USLEEP) && defined(WIN32) */
- 
--#if !defined(HAS_USLEEP) && defined(TIME_HIRES_NANOSLEEP)
--#define HAS_USLEEP
--#define usleep hrt_usleep  /* could conflict with ncurses for static build */
--
--void
--hrt_usleep(unsigned long usec)
--{
--	struct timespec ts1;
--	ts1.tv_sec  = usec * 1000; /* Ignoring wraparound. */
--	ts1.tv_nsec = 0;
--	nanosleep(&ts1, NULL);
--}
--
--#endif /* #if !defined(HAS_USLEEP) && defined(TIME_HIRES_NANOSLEEP) */
--
- #if !defined(HAS_USLEEP) && defined(HAS_POLL)
- #define HAS_USLEEP
- #define usleep hrt_usleep  /* could conflict with ncurses for static build */
-@@ -462,16 +459,24 @@
- #endif /* #if !defined(HAS_USLEEP) && defined(HAS_POLL) */
- 
- #if defined(HAS_SETITIMER) && defined(ITIMER_REAL)
-+
-+static int
-+hrt_ualarm_itimero(struct itimerval* itv, int usec, int uinterval)
-+{
-+   itv->it_value.tv_sec = usec / IV_1E6;
-+   itv->it_value.tv_usec = usec % IV_1E6;
-+   itv->it_interval.tv_sec = uinterval / IV_1E6;
-+   itv->it_interval.tv_usec = uinterval % IV_1E6;
-+   return setitimer(ITIMER_REAL, itv, 0);
-+}
-+
- int
--hrt_ualarm_itimer(int usec, int interval)
-+hrt_ualarm_itimer(int usec, int uinterval)
- {
--   struct itimerval itv;
--   itv.it_value.tv_sec = usec / IV_1E6;
--   itv.it_value.tv_usec = usec % IV_1E6;
--   itv.it_interval.tv_sec = interval / IV_1E6;
--   itv.it_interval.tv_usec = interval % IV_1E6;
--   return setitimer(ITIMER_REAL, &itv, 0);
-+  struct itimerval itv;
-+  return hrt_ualarm_itimero(&itv, usec, uinterval);
- }
-+
- #ifdef HAS_UALARM
- int
- hrt_ualarm(int usec, int interval) /* for binary compat before 1.91 */
-@@ -898,21 +903,27 @@
- 
- #ifdef HAS_UALARM
- 
--int
--ualarm(useconds,interval=0)
-+IV
-+ualarm(useconds,uinterval=0)
- 	int useconds
--	int interval
-+	int uinterval
- 	CODE:
--	if (useconds < 0 || interval < 0)
--	    croak("Time::HiRes::ualarm(%d, %d): negative time not invented yet", useconds, interval);
--	if (useconds >= IV_1E6 || interval >= IV_1E6)
-+	if (useconds < 0 || uinterval < 0)
-+	    croak("Time::HiRes::ualarm(%d, %d): negative time not invented yet", useconds, uinterval);
- #if defined(HAS_SETITIMER) && defined(ITIMER_REAL)
--		RETVAL = hrt_ualarm_itimer(useconds, interval);
-+	  {
-+	        struct itimerval itv;
-+	        if (hrt_ualarm_itimero(&itv, useconds, uinterval)) {
-+		  RETVAL = itv.it_value.tv_sec + IV_1E6 * itv.it_value.tv_usec;
-+		} else {
-+		  RETVAL = 0;
-+		}
-+	  }
- #else
--		croak("Time::HiRes::ualarm(%d, %d): useconds or interval equal or more than %"IVdf, useconds, interval, IV_1E6);
-+	if (useconds >= IV_1E6 || uinterval >= IV_1E6) 
-+		croak("Time::HiRes::ualarm(%d, %d): useconds or uinterval equal to or more than %"IVdf, useconds, uinterval, IV_1E6);
-+	RETVAL = ualarm(useconds, uinterval);
- #endif
--	else
--		RETVAL = ualarm(useconds, interval);
- 
- 	OUTPUT:
- 	RETVAL
-@@ -924,8 +935,24 @@
- 	CODE:
- 	if (seconds < 0.0 || interval < 0.0)
- 	    croak("Time::HiRes::alarm(%"NVgf", %"NVgf"): negative time not invented yet", seconds, interval);
--	RETVAL = (NV)ualarm((IV)(seconds  * IV_1E6),
--			    (IV)(interval * IV_1E6)) / NV_1E6;
-+	{
-+	  IV useconds     = IV_1E6 * seconds;
-+	  IV uinterval    = IV_1E6 * interval;
-+#if defined(HAS_SETITIMER) && defined(ITIMER_REAL)
-+	  {
-+	        struct itimerval itv;
-+	        if (hrt_ualarm_itimero(&itv, useconds, uinterval)) {
-+		  RETVAL = (NV)itv.it_value.tv_sec + (NV)itv.it_value.tv_usec / NV_1E6;
-+		} else {
-+		  RETVAL = 0;
-+		}
-+	  }
-+#else
-+	  if (useconds >= IV_1E6 || uinterval >= IV_1E6)
-+		croak("Time::HiRes::alarm(%d, %d): seconds or interval equal to or more than 1.0 ", useconds, uinterval, IV_1E6);
-+	    RETVAL = (NV)ualarm( useconds, uinterval ) / NV_1E6;
-+#endif
-+	}
- 
- 	OUTPUT:
- 	RETVAL
-diff -urN perl-5.10.0.orig/ext/Time/HiRes/Makefile.PL perl-5.10.0/ext/Time/HiRes/Makefile.PL
---- perl-5.10.0.orig/ext/Time/HiRes/Makefile.PL	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Time/HiRes/Makefile.PL	2009-03-10 17:48:02.000000000 +0100
-@@ -19,8 +19,11 @@
- 
- use vars qw($self); # Used in 'sourcing' the hints.
- 
-+# TBD: Can we just use $Config(exe_ext) here instead of this complex
-+#      expression?
- my $ld_exeext = ($^O eq 'cygwin' ||
--                 $^O eq 'os2' && $Config{ldflags} =~ /-Zexe\b/) ? '.exe' : '';
-+                 $^O eq 'os2' && $Config{ldflags} =~ /-Zexe\b/) ? '.exe' :
-+                (($^O eq 'vos') ? $Config{exe_ext} : '');
- 
- unless($ENV{PERL_CORE}) {
-     $ENV{PERL_CORE} = 1 if grep { $_ eq 'PERL_CORE=1' } @ARGV;
-@@ -829,38 +832,43 @@
- }
- 
- sub main {
--    print "Configuring Time::HiRes...\n";
--    if ($] == 5.007002) {
--	die "Cannot Configure Time::HiRes for Perl $], aborting.\n";
--    }
--
--    if ($^O =~ /Win32/i) {
--      DEFINE('SELECT_IS_BROKEN');
--      $LIBS = [];
--      print "System is $^O, skipping full configure...\n";
--    } else {
--      init();
-+    if (-f "xdefine" && !(@ARGV  && $ARGV[0] eq '--configure')) {
-+	print qq[$0: The "xdefine" exists, skipping the configure step.\n];
-+	print qq[("$^X $0 --configure" to force the configure step)\n];
-+    } else {
-+	print "Configuring Time::HiRes...\n";
-+	1 while unlink("define");
-+	if ($^O =~ /Win32/i) {
-+	    DEFINE('SELECT_IS_BROKEN');
-+	    $LIBS = [];
-+	    print "System is $^O, skipping full configure...\n";
-+	    open(XDEFINE, ">xdefine") or die "$0: Cannot create xdefine: $!\n";
-+	    close(XDEFINE);
-+	} else {
-+	    init();
-+	}
-+	doMakefile;
-+	doConstants;
-     }
--    doMakefile;
--    doConstants;
-     my $make = $Config{'make'} || "make";
-     unless (exists $ENV{PERL_CORE} && $ENV{PERL_CORE}) {
- 	print  <<EOM;
- Now you may issue '$make'.  Do not forget also '$make test'.
- EOM
--       if ((exists $ENV{LC_ALL}   && $ENV{LC_ALL}   =~ /utf-?8/i) ||
--           (exists $ENV{LC_CTYPE} && $ENV{LC_CTYPE} =~ /utf-?8/i) ||
--           (exists $ENV{LANG}     && $ENV{LANG}     =~ /utf-?8/i)) {
-+       if ($] == 5.008 &&
-+	   ((exists $ENV{LC_ALL}   && $ENV{LC_ALL}   =~ /utf-?8/i) ||
-+	    (exists $ENV{LC_CTYPE} && $ENV{LC_CTYPE} =~ /utf-?8/i) ||
-+	    (exists $ENV{LANG}     && $ENV{LANG}     =~ /utf-?8/i))) {
-             print <<EOM;
- 
- NOTE: if you get an error like this (the Makefile line number may vary):
- Makefile:91: *** missing separator
- then set the environment variable LC_ALL to "C" and retry
- from scratch (re-run perl "Makefile.PL").
--(And consider upgrading your Perl.)
-+(And consider upgrading your Perl to, say, at least Perl 5.8.8.)
- (You got this message because you seem to have
-  an UTF-8 locale active in your shell environment, this used
-- to cause broken Makefiles to be created from Makefile.PLs.)
-+ to cause broken Makefiles to be created from Makefile.PLs)
- EOM
-         }
-     }
-diff -urN perl-5.10.0.orig/ext/Time/HiRes/t/HiRes.t perl-5.10.0/ext/Time/HiRes/t/HiRes.t
---- perl-5.10.0.orig/ext/Time/HiRes/t/HiRes.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/ext/Time/HiRes/t/HiRes.t	2009-03-10 17:48:02.000000000 +0100
-@@ -12,7 +12,7 @@
-     }
- }
- 
--BEGIN { $| = 1; print "1..38\n"; }
-+BEGIN { $| = 1; print "1..40\n"; }
- 
- END { print "not ok 1\n" unless $loaded }
- 
-@@ -68,7 +68,7 @@
- 
- my $have_alarm = $Config{d_alarm};
- my $have_fork  = $Config{d_fork};
--my $waitfor = 180; # 30-45 seconds is normal (load affects this).
-+my $waitfor = 360; # 30-45 seconds is normal (load affects this).
- my $timer_pid;
- my $TheEnd;
- 
-@@ -79,11 +79,14 @@
- 	if ($timer_pid == 0) { # We are the kid, set up the timer.
- 	    my $ppid = getppid();
- 	    print "# I am the timer process $$, sleeping for $waitfor seconds...\n";
--	    sleep($waitfor);
--	    warn "\n$0: overall time allowed for tests (${waitfor}s) exceeded!\n";
--	    print "# Terminating main process $ppid...\n";
--	    kill('TERM', $ppid);
--	    print "# This is the timer process $$, over and out.\n";
-+	    sleep($waitfor - 2);    # Workaround for perlbug #49073
-+	    sleep(2);               # Wait for parent to exit
-+	    if (kill(0, $ppid)) {   # Check if parent still exists
-+		warn "\n$0: overall time allowed for tests (${waitfor}s) exceeded!\n";
-+		print "# Terminating main process $ppid...\n";
-+		kill('KILL', $ppid);
-+		print "# This is the timer process $$, over and out.\n";
-+	    }
- 	    exit(0);
- 	} else {
- 	    print "# The timer process $timer_pid launched, continuing testing...\n";
-@@ -238,10 +241,13 @@
- 
- $has_ualarm ||= $xdefine =~ /-DHAS_UALARM/;
- 
--unless (   defined &Time::HiRes::gettimeofday
--	&& defined &Time::HiRes::ualarm
--	&& defined &Time::HiRes::usleep
--	&& $has_ualarm) {
-+my $can_subsecond_alarm =
-+   defined &Time::HiRes::gettimeofday &&
-+   defined &Time::HiRes::ualarm &&
-+   defined &Time::HiRes::usleep &&
-+   $has_ualarm;
-+
-+unless ($can_subsecond_alarm) {
-     for (15..17) {
- 	print "ok $_ # Skip: no gettimeofday or no ualarm or no usleep\n";
-     }
-@@ -271,19 +277,6 @@
- 	# Perl's deferred signals may be too wimpy to break through
- 	# a restartable select(), so use POSIX::sigaction if available.
- 
--	sub tick {
--	    $i--;
--	    my $ival = Time::HiRes::tv_interval ($r);
--	    print "# Tick! $i $ival\n";
--	    my $exp = 0.3 * (5 - $i);
--	    # This test is more sensitive, so impose a softer limit.
--	    if (abs($ival/$exp - 1) > 4*$limit) {
--		my $ratio = abs($ival/$exp);
--		$not = "tick: $exp sleep took $ival ratio $ratio";
--		$i = 0;
--	    }
--	}
--
- 	POSIX::sigaction(&POSIX::SIGALRM,
- 			 POSIX::SigAction->new("tick"),
- 			 $oldaction)
-@@ -314,8 +307,12 @@
- 		last;
- 	    }
- 	    my $exp = 0.3 * (5 - $i);
-+	    if ($exp == 0) {
-+		$not = "while: divisor became zero";
-+		last;
-+	    }
- 	    # This test is more sensitive, so impose a softer limit.
--	    if (abs($ival/$exp - 1) > 3*$limit) {
-+	    if (abs($ival/$exp - 1) > 4*$limit) {
- 		my $ratio = abs($ival/$exp);
- 		$not = "while: $exp sleep took $ival ratio $ratio";
- 		last;
-@@ -324,6 +321,23 @@
- 	}
-     }
- 
-+    sub tick {
-+	$i--;
-+	my $ival = Time::HiRes::tv_interval ($r);
-+	print "# Tick! $i $ival\n";
-+	my $exp = 0.3 * (5 - $i);
-+	if ($exp == 0) {
-+	    $not = "tick: divisor became zero";
-+	    last;
-+	}
-+	# This test is more sensitive, so impose a softer limit.
-+	if (abs($ival/$exp - 1) > 4*$limit) {
-+	    my $ratio = abs($ival/$exp);
-+	    $not = "tick: $exp sleep took $ival ratio $ratio";
-+	    $i = 0;
-+	}
-+    }
-+
-     if ($use_sigaction) {
- 	POSIX::sigaction(&POSIX::SIGALRM, $oldaction);
-     } else {
-@@ -333,11 +347,13 @@
-     print $not ? "not ok 17 # $not\n" : "ok 17 # $ok\n";
- }
- 
--unless (   defined &Time::HiRes::setitimer
-+unless (defined &Time::HiRes::setitimer
- 	&& defined &Time::HiRes::getitimer
- 	&& has_symbol('ITIMER_VIRTUAL')
- 	&& $Config{sig_name} =~ m/\bVTALRM\b/
--        && $^O !~ /^(nto)$/) { # nto: QNX 6 has the API but no implementation
-+	&& $^O ne 'nto' # nto: QNX 6 has the API but no implementation
-+	&& $^O ne 'haiku' # haiku: has the API but no implementation
-+    ) {
-     for (18..19) {
- 	print "ok $_ # Skip: no virtual interval timers\n";
-     }
-@@ -502,13 +518,14 @@
-     };
- 
-     # Next setup a periodic timer (the two-argument alarm() of
--    # Time::HiRes, behind the curtains the libc ualarm()) which has
--    # a signal handler that takes so much time (on the first initial
--    # invocation) that the first periodic invocation (second invocation)
--    # will happen before the first invocation has finished.  In Perl 5.8.0
--    # the "safe signals" concept was implemented, with unfortunately at least
--    # one bug that caused a core dump on reentering the handler. This bug
--    # was fixed by the time of Perl 5.8.1.
-+    # Time::HiRes, behind the curtains the libc getitimer() or
-+    # ualarm()) which has a signal handler that takes so much time (on
-+    # the first initial invocation) that the first periodic invocation
-+    # (second invocation) will happen before the first invocation has
-+    # finished.  In Perl 5.8.0 the "safe signals" concept was
-+    # implemented, with unfortunately at least one bug that caused a
-+    # core dump on reentering the handler. This bug was fixed by the
-+    # time of Perl 5.8.1.
- 
-     # Do not try mixing sleep() and alarm() for testing this.
- 
-@@ -620,6 +637,16 @@
-     skip 33;
- }
- 
-+sub bellish {  # Cheap emulation of a bell curve.
-+    my ($min, $max) = @_;
-+    my $rand = ($max - $min) / 5;
-+    my $sum = 0; 
-+    for my $i (0..4) {
-+	$sum += rand($rand);
-+    }
-+    return $min + $sum;
-+}
-+
- if ($have_ualarm) {
-     # 1_100_000 sligthly over 1_000_000,
-     # 2_200_000 slightly over 2**31/1000,
-@@ -629,21 +656,29 @@
- 	       [36, 2_200_000],
- 	       [37, 4_300_000]) {
- 	my ($i, $n) = @$t;
--	my $alarmed = 0;
--	local $SIG{ ALRM } = sub { $alarmed++ };
--	my $t0 = Time::HiRes::time();
--	print "# t0 = $t0\n";
--	print "# ualarm($n)\n";
--	ualarm($n); 1 while $alarmed == 0;
--	my $t1 = Time::HiRes::time();
--	print "# t1 = $t1\n";
--	my $dt = $t1 - $t0;
--	print "# dt = $dt\n";
--	my $r = $dt / ($n/1e6);
--	print "# r = $r\n";
--	ok $i,
--	($n < 1_000_000 || # Too much noise.
--	 $r >= 0.8 && $r <= 1.6), "ualarm($n) close enough";
-+	my $ok;
-+	for my $retry (1..10) {
-+	    my $alarmed = 0;
-+	    local $SIG{ ALRM } = sub { $alarmed++ };
-+	    my $t0 = Time::HiRes::time();
-+	    print "# t0 = $t0\n";
-+	    print "# ualarm($n)\n";
-+	    ualarm($n); 1 while $alarmed == 0;
-+	    my $t1 = Time::HiRes::time();
-+	    print "# t1 = $t1\n";
-+	    my $dt = $t1 - $t0;
-+	    print "# dt = $dt\n";
-+	    my $r = $dt / ($n/1e6);
-+	    print "# r = $r\n";
-+	    $ok =
-+		($n < 1_000_000 || # Too much noise.
-+		 ($r >= 0.8 && $r <= 1.6));
-+	    last if $ok;
-+	    my $nap = bellish(3, 15);
-+	    printf "# Retrying in %.1f seconds...\n", $nap;
-+	    Time::HiRes::sleep($nap);
-+	}
-+	ok $i, $ok, "ualarm($n) close enough";
-     }
- } else {
-     print "# No ualarm\n";
-@@ -710,12 +745,37 @@
-     skip 38;
- }
- 
-+unless ($can_subsecond_alarm) {
-+    skip 39..40;
-+} else {
-+    {
-+	my $alrm;
-+	$SIG{ALRM} = sub { $alrm++ };
-+	Time::HiRes::alarm(0.1);
-+	my $t0 = time();
-+	1 while time() - $t0 <= 1;
-+	print $alrm ? "ok 39\n" : "not ok 39\n";
-+    }
-+    {
-+	my $alrm;
-+	$SIG{ALRM} = sub { $alrm++ };
-+	Time::HiRes::alarm(1.1);
-+	my $t0 = time();
-+	1 while time() - $t0 <= 2;
-+	print $alrm ? "ok 40\n" : "not ok 40\n";
-+    }
-+}
-+
- END {
-     if ($timer_pid) { # Only in the main process.
- 	my $left = $TheEnd - time();
- 	printf "# I am the main process $$, terminating the timer process $timer_pid\n# before it terminates me in %d seconds (testing took %d seconds).\n", $left, $waitfor - $left;
--	my $kill = kill('TERM', $timer_pid); # We are done, the timer can go.
--	printf "# kill TERM $timer_pid = %d\n", $kill;
-+	if (kill(0, $timer_pid)) {
-+	    local $? = 0;
-+	    my $kill = kill('KILL', $timer_pid); # We are done, the timer can go.
-+	    wait();
-+	    printf "# kill KILL $timer_pid = %d\n", $kill;
-+	}
- 	unlink("ktrace.out"); # Used in BSD system call tracing.
- 	print "# All done.\n";
-     }
diff --git a/perl-update-autodie.patch b/perl-update-autodie.patch
deleted file mode 100644
index 18e3f52..0000000
--- a/perl-update-autodie.patch
+++ /dev/null
@@ -1,4211 +0,0 @@
-autodie-1.999
-
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST	2009-02-20 18:22:32.000000000 +0100
-+++ perl-5.10.0/MANIFEST	2009-03-24 12:42:25.000000000 +0100
-@@ -1442,6 +1442,9 @@
- lib/Attribute/Handlers/t/linerep.t	See if Attribute::Handlers works
- lib/Attribute/Handlers/t/multi.t	See if Attribute::Handlers works
- lib/attributes.pm		For "sub foo : attrlist"
-+lib/autodie.pm                  Functions suceed or die with lexical scope
-+lib/autodie/exception.pm        Exception class for autodie
-+lib/autodie/exception/system.pm Exception class for autodying system()
- lib/AutoLoader.pm		Autoloader base class
- lib/AutoLoader.t		See if AutoLoader works
- lib/AutoSplit.pm		Split up autoload functions
-@@ -3439,6 +3442,45 @@
- t/io/utf8.t			See if file seeking works
- t/japh/abigail.t		Obscure tests
- t/lib/1_compile.t		See if the various libraries and extensions compile
-+t/lib/autodie/00-load.t             autodie - basic load
-+t/lib/autodie/autodie.t             autodie - Basic functionality
-+t/lib/autodie/autodie_test_module.pm    autodie - test helper
-+t/lib/autodie/backcompat.t          autodie - More Fatal backcompat
-+t/lib/autodie/basic_exceptions.t    autodie - Basic exception tests
-+t/lib/autodie/binmode.t             autodie - Binmode testing
-+t/lib/autodie/caller.t			autodie - Caller diagnostics
-+t/lib/autodie/context.t             autodie - Context clobbering tests
-+t/lib/autodie/context_lexical.t		autodie - Context clobbering lexically
-+t/lib/autodie/crickey.t             autodie - Like an Australian
-+t/lib/autodie/dbmopen.t             autodie - dbm tests
-+t/lib/autodie/exceptions.t          autodie - 5.10 exception tests.
-+t/lib/autodie/exception_class.t		autodie - Exception class subclasses
-+t/lib/autodie/exec.t                autodie - exec tests.
-+t/lib/autodie/Fatal.t               autodie - Fatal backcompatibility
-+t/lib/autodie/filehandles.t         autodie - filehandle tests
-+t/lib/autodie/fileno.t              autodie - fileno tests
-+t/lib/autodie/flock.t               autodie - File locking tests
-+t/lib/autodie/internal.t            autodie - internal interface tests
-+t/lib/autodie/lethal.t              autodie - lethal is the one true name
-+t/lib/autodie/lib/autodie/test/au.pm autodie - Austrlaian helper
-+t/lib/autodie/lib/autodie/test/au/exception.pm autodie - Australian helper
-+t/lib/autodie/lib/autodie/test/badname.pm   autodie - Bad exception class
-+t/lib/autodie/lib/autodie/test/missing.pm   autodie - Missing exception class
-+t/lib/autodie/lib/lethal.pm         autodie - with a better name
-+t/lib/autodie/lib/pujHa/ghach.pm    autodie - Like a Klingon
-+t/lib/autodie/lib/pujHa/ghach/Dotlh.pm  autodie - With Klingon honour
-+t/lib/autodie/mkdir.t               autodie - filesystem tests
-+t/lib/autodie/open.t                autodie - Testing open
-+t/lib/autodie/recv.t                autodie - send/recv tests
-+t/lib/autodie/repeat.t              autodie - repeat autodie leak tests
-+t/lib/autodie/scope_leak.t          autodie - file scope leak tests
-+t/lib/autodie/sysopen.t             autodie - sysopen tests
-+t/lib/autodie/truncate.t            autodie - File truncation tests
-+t/lib/autodie/unlink.t              autodie - Unlink system tests.
-+t/lib/autodie/user-context.t		autodie - Context changes for usersubs
-+t/lib/autodie/usersub.t             autodie - user subroutine tests
-+t/lib/autodie/version.t             autodie - versioning tests
-+t/lib/autodie/version_tag.t
- t/lib/Cname.pm			Test charnames in regexes (op/pat.t)
- t/lib/common.pl			Helper for lib/{warnings,feature}.t
- t/lib/commonsense.t		See if configuration meets basic needs
-diff -urN perl-5.10.0.orig/Porting/Maintainers.pl perl-5.10.0/Porting/Maintainers.pl
---- perl-5.10.0.orig/Porting/Maintainers.pl	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/Porting/Maintainers.pl	2009-03-24 11:53:29.000000000 +0100
-@@ -57,6 +57,7 @@
- 	'p5p'		=> 'perl5-porters <perl5-porters@perl.org>',
- 	'perlfaq'	=> 'perlfaq-workers <perlfaq-workers@perl.org>',
- 	'petdance'	=> 'Andy Lester <andy@petdance.com>',
-+	'pjf'		=> 'Paul Fenwick <pjf@cpan.org>',
- 	'pmqs'		=> 'Paul Marquess <pmqs@cpan.org>',
- 	'pvhp'		=> 'Peter Prymmer <pvhp@best.com>',
- 	'rclamp'	=> 'Richard Clamp <rclamp@cpan.org>',
-@@ -113,6 +114,14 @@
- 		'CPAN'		=> 1,
- 		},
- 
-+	'autodie' =>
-+		{
-+		'MAINTAINER'    => 'pjf',
-+		'FILES'         => q[lib/Fatal.pm lib/autodie.pm lib/autodie],
-+		'CPAN'          => 1,
-+		'UPSTREAM'      => 'cpan',
-+		},
-+
- 	'B::Concise' =>
- 		{
- 		'MAINTAINER'	=> 'smccam',
-diff -urN perl-5.10.0.orig/installperl perl-5.10.0/installperl
---- perl-5.10.0.orig/installperl	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/installperl	2009-03-24 12:42:25.000000000 +0100
-@@ -827,7 +827,7 @@
-     $name = "$dir/$name" if $dir ne '';
- 
-     my $installlib = $installprivlib;
--    if ($dir =~ /^auto/ ||
-+    if ($dir =~ /^auto\// ||
- 	  ($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) ||
- 	  ($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare)) ||
- 	  $name eq 'Config_heavy.pl'
-diff -urN perl-5.10.0.orig/lib/Fatal.pm perl-5.10.0/lib/Fatal.pm
---- perl-5.10.0.orig/lib/Fatal.pm	2009-03-24 13:14:31.000000000 +0100
-+++ perl-5.10.0/lib/Fatal.pm	2009-03-24 13:15:35.000000000 +0100
-@@ -1,137 +1,1002 @@
- package Fatal;
- 
--use 5.006_001;
-+use 5.008;  # 5.8.x needed for autodie
- use Carp;
- use strict;
--our($AUTOLOAD, $Debug, $VERSION);
-+use warnings;
- 
--$VERSION = 1.06;
-+use constant LEXICAL_TAG => q{:lexical};
-+use constant VOID_TAG    => q{:void};
- 
--$Debug = 0 unless defined $Debug;
-+use constant ERROR_NOARGS    => 'Cannot use lexical %s with no arguments';
-+use constant ERROR_VOID_LEX  => VOID_TAG.' cannot be used with lexical scope';
-+use constant ERROR_LEX_FIRST => LEXICAL_TAG.' must be used as first argument';
-+use constant ERROR_NO_LEX    => "no %s can only start with ".LEXICAL_TAG;
-+use constant ERROR_BADNAME   => "Bad subroutine name for %s: %s";
-+use constant ERROR_NOTSUB    => "%s is not a Perl subroutine";
-+use constant ERROR_NOT_BUILT => "%s is neither a builtin, nor a Perl subroutine";
-+use constant ERROR_CANT_OVERRIDE => "Cannot make the non-overridable builtin %s fatal";
-+
-+use constant ERROR_NO_IPC_SYS_SIMPLE => "IPC::System::Simple required for Fatalised/autodying system()";
-+
-+use constant ERROR_IPC_SYS_SIMPLE_OLD => "IPC::System::Simple version %f required for Fatalised/autodying system().  We only have version %f";
-+
-+use constant ERROR_AUTODIE_CONFLICT => q{"no autodie '%s'" is not allowed while "use Fatal '%s'" is in effect};
-+
-+use constant ERROR_FATAL_CONFLICT => q{"use Fatal '%s'" is not allowed while "no autodie '%s'" is in effect};
-+
-+# Older versions of IPC::System::Simple don't support all the
-+# features we need.
-+
-+use constant MIN_IPC_SYS_SIMPLE_VER => 0.12;
-+
-+# All the Fatal/autodie modules share the same version number.
-+our $VERSION = '1.999';
-+
-+our $Debug ||= 0;
-+
-+# EWOULDBLOCK values for systems that don't supply their own.
-+# Even though this is defined with our, that's to help our
-+# test code.  Please don't rely upon this variable existing in
-+# the future.
-+
-+our %_EWOULDBLOCK = (
-+    MSWin32 => 33,
-+);
-+
-+# We have some tags that can be passed in for use with import.
-+# These are all assumed to be CORE::
-+
-+my %TAGS = (
-+    ':io'      => [qw(:dbm :file :filesys :ipc :socket
-+                       read seek sysread syswrite sysseek )],
-+    ':dbm'     => [qw(dbmopen dbmclose)],
-+    ':file'    => [qw(open close flock sysopen fcntl fileno binmode
-+                     ioctl truncate)],
-+    ':filesys' => [qw(opendir closedir chdir link unlink rename mkdir
-+                      symlink rmdir readlink umask)],
-+    ':ipc'     => [qw(:msg :semaphore :shm pipe)],
-+    ':msg'     => [qw(msgctl msgget msgrcv msgsnd)],
-+    ':threads' => [qw(fork)],
-+    ':semaphore'=>[qw(semctl semget semop)],
-+    ':shm'     => [qw(shmctl shmget shmread)],
-+    ':system'  => [qw(system exec)],
-+
-+    # Can we use qw(getpeername getsockname)? What do they do on failure?
-+    # XXX - Can socket return false?
-+    ':socket'  => [qw(accept bind connect getsockopt listen recv send
-+                   setsockopt shutdown socketpair)],
-+
-+    # Our defaults don't include system(), because it depends upon
-+    # an optional module, and it breaks the exotic form.
-+    #
-+    # This *may* change in the future.  I'd love IPC::System::Simple
-+    # to be a dependency rather than a recommendation, and hence for
-+    # system() to be autodying by default.
-+
-+    ':default' => [qw(:io :threads)],
-+
-+    # Version specific tags.  These allow someone to specify
-+    # use autodie qw(:1.994) and know exactly what they'll get.
-+
-+    ':1.994' => [qw(:default)],
-+    ':1.995' => [qw(:default)],
-+    ':1.996' => [qw(:default)],
-+    ':1.997' => [qw(:default)],
-+    ':1.998' => [qw(:default)],
-+    ':1.999' => [qw(:default)],
-+
-+);
-+
-+$TAGS{':all'}  = [ keys %TAGS ];
-+
-+# This hash contains subroutines for which we should
-+# subroutine() // die() rather than subroutine() || die()
-+
-+my %Use_defined_or;
-+
-+# CORE::open returns undef on failure.  It can legitimately return
-+# 0 on success, eg: open(my $fh, '-|') || exec(...);
-+
-+@Use_defined_or{qw(
-+    CORE::fork
-+    CORE::recv
-+    CORE::send
-+    CORE::open
-+    CORE::fileno
-+    CORE::read
-+    CORE::readlink
-+    CORE::sysread
-+    CORE::syswrite
-+    CORE::sysseek
-+    CORE::umask
-+)} = ();
-+
-+# Cached_fatalised_sub caches the various versions of our
-+# fatalised subs as they're produced.  This means we don't
-+# have to build our own replacement of CORE::open and friends
-+# for every single package that wants to use them.
-+
-+my %Cached_fatalised_sub = ();
-+
-+# Every time we're called with package scope, we record the subroutine
-+# (including package or CORE::) in %Package_Fatal.  This allows us
-+# to detect illegal combinations of autodie and Fatal, and makes sure
-+# we don't accidently make a Fatal function autodying (which isn't
-+# very useful).
-+
-+my %Package_Fatal = ();
-+
-+# The first time we're called with a user-sub, we cache it here.
-+# In the case of a "no autodie ..." we put back the cached copy.
-+
-+my %Original_user_sub = ();
-+
-+# We use our package in a few hash-keys.  Having it in a scalar is
-+# convenient.  The "guard $PACKAGE" string is used as a key when
-+# setting up lexical guards.
-+
-+my $PACKAGE       = __PACKAGE__;
-+my $PACKAGE_GUARD = "guard $PACKAGE";
-+my $NO_PACKAGE    = "no $PACKAGE";      # Used to detect 'no autodie'
-+
-+# Here's where all the magic happens when someone write 'use Fatal'
-+# or 'use autodie'.
- 
- sub import {
--    my $self = shift(@_);
--    my($sym, $pkg);
--    my $void = 0;
--    $pkg = (caller)[0];
--    foreach $sym (@_) {
--	if ($sym eq ":void") {
--	    $void = 1;
--	}
--	else {
--	    &_make_fatal($sym, $pkg, $void);
--	}
--    }
--};
--
--sub AUTOLOAD {
--    my $cmd = $AUTOLOAD;
--    $cmd =~ s/.*:://;
--    &_make_fatal($cmd, (caller)[0]);
--    goto &$AUTOLOAD;
-+    my $class   = shift(@_);
-+    my $void    = 0;
-+    my $lexical = 0;
-+
-+    my ($pkg, $filename) = caller();
-+
-+    @_ or return;   # 'use Fatal' is a no-op.
-+
-+    # If we see the :lexical flag, then _all_ arguments are
-+    # changed lexically
-+
-+    if ($_[0] eq LEXICAL_TAG) {
-+        $lexical = 1;
-+        shift @_;
-+
-+        # If we see no arguments and :lexical, we assume they
-+        # wanted ':default'.
-+
-+        if (@_ == 0) {
-+            push(@_, ':default');
-+        }
-+
-+        # Don't allow :lexical with :void, it's needlessly confusing.
-+        if ( grep { $_ eq VOID_TAG } @_ ) {
-+            croak(ERROR_VOID_LEX);
-+        }
-+    }
-+
-+    if ( grep { $_ eq LEXICAL_TAG } @_ ) {
-+        # If we see the lexical tag as the non-first argument, complain.
-+        croak(ERROR_LEX_FIRST);
-+    }
-+
-+    my @fatalise_these =  @_;
-+
-+    # Thiese subs will get unloaded at the end of lexical scope.
-+    my %unload_later;
-+
-+    # This hash helps us track if we've alredy done work.
-+    my %done_this;
-+
-+    # NB: we're using while/shift rather than foreach, since
-+    # we'll be modifying the array as we walk through it.
-+
-+    while (my $func = shift @fatalise_these) {
-+
-+        if ($func eq VOID_TAG) {
-+
-+            # When we see :void, set the void flag.
-+            $void = 1;
-+
-+        } elsif (exists $TAGS{$func}) {
-+
-+            # When it's a tag, expand it.
-+            push(@fatalise_these, @{ $TAGS{$func} });
-+
-+        } else {
-+
-+            # Otherwise, fatalise it.
-+
-+            # If we've already made something fatal this call,
-+            # then don't do it twice.
-+
-+            next if $done_this{$func};
-+
-+            # We're going to make a subroutine fatalistic.
-+            # However if we're being invoked with 'use Fatal qw(x)'
-+            # and we've already been called with 'no autodie qw(x)'
-+            # in the same scope, we consider this to be an error.
-+            # Mixing Fatal and autodie effects was considered to be
-+            # needlessly confusing on p5p.
-+
-+            my $sub = $func;
-+            $sub = "${pkg}::$sub" unless $sub =~ /::/;
-+
-+            # If we're being called as Fatal, and we've previously
-+            # had a 'no X' in scope for the subroutine, then complain
-+            # bitterly.
-+
-+            if (! $lexical and $^H{$NO_PACKAGE}{$sub}) {
-+                 croak(sprintf(ERROR_FATAL_CONFLICT, $func, $func));
-+            }
-+
-+            # We're not being used in a confusing way, so make
-+            # the sub fatal.  Note that _make_fatal returns the
-+            # old (original) version of the sub, or undef for
-+            # built-ins.
-+
-+            my $sub_ref = $class->_make_fatal(
-+                $func, $pkg, $void, $lexical, $filename
-+            );
-+
-+            $done_this{$func}++;
-+
-+            $Original_user_sub{$sub} ||= $sub_ref;
-+
-+            # If we're making lexical changes, we need to arrange
-+            # for them to be cleaned at the end of our scope, so
-+            # record them here.
-+
-+            $unload_later{$func} = $sub_ref if $lexical;
-+        }
-+    }
-+
-+    if ($lexical) {
-+
-+        # Dark magic to have autodie work under 5.8
-+        # Copied from namespace::clean, that copied it from
-+        # autobox, that found it on an ancient scroll written
-+        # in blood.
-+
-+        # This magic bit causes %^H to be lexically scoped.
-+
-+        $^H |= 0x020000;
-+
-+        # Our package guard gets invoked when we leave our lexical
-+        # scope.
-+
-+        push(@ { $^H{$PACKAGE_GUARD} }, autodie::Scope::Guard->new(sub {
-+            $class->_install_subs($pkg, \%unload_later);
-+        }));
-+
-+    }
-+
-+    return;
-+
- }
- 
-+# The code here is originally lifted from namespace::clean,
-+# by Robert "phaylon" Sedlacek.
-+#
-+# It's been redesigned after feedback from ikegami on perlmonks.
-+# See http://perlmonks.org/?node_id=693338 .  Ikegami rocks.
-+#
-+# Given a package, and hash of (subname => subref) pairs,
-+# we install the given subroutines into the package.  If
-+# a subref is undef, the subroutine is removed.  Otherwise
-+# it replaces any existing subs which were already there.
-+
-+sub _install_subs {
-+    my ($class, $pkg, $subs_to_reinstate) = @_;
-+
-+    my $pkg_sym = "${pkg}::";
-+
-+    while(my ($sub_name, $sub_ref) = each %$subs_to_reinstate) {
-+
-+        my $full_path = $pkg_sym.$sub_name;
-+
-+        # Copy symbols across to temp area.
-+
-+        no strict 'refs';   ## no critic
-+
-+        local *__tmp = *{ $full_path };
-+
-+        # Nuke the old glob.
-+        { no strict; delete $pkg_sym->{$sub_name}; }    ## no critic
-+
-+        # Copy innocent bystanders back.
-+
-+        foreach my $slot (qw( SCALAR ARRAY HASH IO FORMAT ) ) {
-+            next unless defined *__tmp{ $slot };
-+            *{ $full_path } = *__tmp{ $slot };
-+        }
-+
-+        # Put back the old sub (if there was one).
-+
-+        if ($sub_ref) {
-+
-+            no strict;  ## no critic
-+            *{ $pkg_sym . $sub_name } = $sub_ref;
-+        }
-+    }
-+
-+    return;
-+}
-+
-+sub unimport {
-+    my $class = shift;
-+
-+    # Calling "no Fatal" must start with ":lexical"
-+    if ($_[0] ne LEXICAL_TAG) {
-+        croak(sprintf(ERROR_NO_LEX,$class));
-+    }
-+
-+    shift @_;   # Remove :lexical
-+
-+    my $pkg = (caller)[0];
-+
-+    # If we've been called with arguments, then the developer
-+    # has explicitly stated 'no autodie qw(blah)',
-+    # in which case, we disable Fatalistic behaviour for 'blah'.
-+
-+    my @unimport_these = @_ ? @_ : ':all';
-+
-+    while (my $symbol = shift @unimport_these) {
-+
-+        if ($symbol =~ /^:/) {
-+
-+            # Looks like a tag!  Expand it!
-+            push(@unimport_these, @{ $TAGS{$symbol} });
-+
-+            next;
-+        }
-+
-+        my $sub = $symbol;
-+        $sub = "${pkg}::$sub" unless $sub =~ /::/;
-+
-+        # If 'blah' was already enabled with Fatal (which has package
-+        # scope) then, this is considered an error.
-+
-+        if (exists $Package_Fatal{$sub}) {
-+            croak(sprintf(ERROR_AUTODIE_CONFLICT,$symbol,$symbol));
-+        }
-+
-+        # Record 'no autodie qw($sub)' as being in effect.
-+        # This is to catch conflicting semantics elsewhere
-+        # (eg, mixing Fatal with no autodie)
-+
-+        $^H{$NO_PACKAGE}{$sub} = 1;
-+
-+        if (my $original_sub = $Original_user_sub{$sub}) {
-+            # Hey, we've got an original one of these, put it back.
-+            $class->_install_subs($pkg, { $symbol => $original_sub });
-+            next;
-+        }
-+
-+        # We don't have an original copy of the sub, on the assumption
-+        # it's core (or doesn't exist), we'll just nuke it.
-+
-+        $class->_install_subs($pkg,{ $symbol => undef });
-+
-+    }
-+
-+    return;
-+
-+}
-+
-+# TODO - This is rather terribly inefficient right now.
-+
-+# NB: Perl::Critic's dump-autodie-tag-contents depends upon this
-+# continuing to work.
-+
-+{
-+    my %tag_cache;
-+
-+    sub _expand_tag {
-+        my ($class, $tag) = @_;
-+
-+        if (my $cached = $tag_cache{$tag}) {
-+            return $cached;
-+        }
-+
-+        if (not exists $TAGS{$tag}) {
-+            croak "Invalid exception class $tag";
-+        }
-+
-+        my @to_process = @{$TAGS{$tag}};
-+
-+        my @taglist = ();
-+
-+        while (my $item = shift @to_process) {
-+            if ($item =~ /^:/) {
-+                push(@to_process, @{$TAGS{$item}} );
-+            } else {
-+                push(@taglist, "CORE::$item");
-+            }
-+        }
-+
-+        $tag_cache{$tag} = \@taglist;
-+
-+        return \@taglist;
-+
-+    }
-+
-+}
-+
-+# This code is from the original Fatal.  It scares me.
-+
- sub fill_protos {
--  my $proto = shift;
--  my ($n, $isref, @out, @out1, $seen_semi) = -1;
--  while ($proto =~ /\S/) {
--    $n++;
--    push(@out1,[$n,@out]) if $seen_semi;
--    push(@out, $1 . "{\$_[$n]}"), next if $proto =~ s/^\s*\\([\@%\$\&])//;
--    push(@out, "\$_[$n]"), next if $proto =~ s/^\s*([_*\$&])//;
--    push(@out, "\@_[$n..\$#_]"), last if $proto =~ s/^\s*(;\s*)?\@//;
--    $seen_semi = 1, $n--, next if $proto =~ s/^\s*;//; # XXXX ????
--    die "Unknown prototype letters: \"$proto\"";
--  }
--  push(@out1,[$n+1,@out]);
--  @out1;
-+    my $proto = shift;
-+    my ($n, $isref, @out, @out1, $seen_semi) = -1;
-+    while ($proto =~ /\S/) {
-+        $n++;
-+        push(@out1,[$n,@out]) if $seen_semi;
-+        push(@out, $1 . "{\$_[$n]}"), next if $proto =~ s/^\s*\\([\@%\$\&])//;
-+        push(@out, "\$_[$n]"),        next if $proto =~ s/^\s*([_*\$&])//;
-+        push(@out, "\@_[$n..\$#_]"),  last if $proto =~ s/^\s*(;\s*)?\@//;
-+        $seen_semi = 1, $n--,         next if $proto =~ s/^\s*;//; # XXXX ????
-+        die "Internal error: Unknown prototype letters: \"$proto\"";
-+    }
-+    push(@out1,[$n+1,@out]);
-+    return @out1;
- }
- 
-+# This generates the code that will become our fatalised subroutine.
-+
- sub write_invocation {
--  my ($core, $call, $name, $void, @argvs) = @_;
--  if (@argvs == 1) {		# No optional arguments
--    my @argv = @{$argvs[0]};
--    shift @argv;
--    return "\t" . one_invocation($core, $call, $name, $void, @argv) . ";\n";
--  } else {
--    my $else = "\t";
--    my (@out, @argv, $n);
--    while (@argvs) {
--      @argv = @{shift @argvs};
--      $n = shift @argv;
--      push @out, "$ {else}if (\@_ == $n) {\n";
--      $else = "\t} els";
--      push @out, 
--          "\t\treturn " . one_invocation($core, $call, $name, $void, @argv) . ";\n";
--    }
--    push @out, <<EOC;
--	}
--	die "$name(\@_): Do not expect to get ", scalar \@_, " arguments";
--EOC
--    return join '', @out;
--  }
-+    my ($class, $core, $call, $name, $void, $lexical, $sub, @argvs) = @_;
-+
-+    if (@argvs == 1) {        # No optional arguments
-+
-+        my @argv = @{$argvs[0]};
-+        shift @argv;
-+
-+        return $class->one_invocation($core,$call,$name,$void,$sub,! $lexical,@argv);
-+
-+    } else {
-+        my $else = "\t";
-+        my (@out, @argv, $n);
-+        while (@argvs) {
-+            @argv = @{shift @argvs};
-+            $n = shift @argv;
-+
-+            push @out, "${else}if (\@_ == $n) {\n";
-+            $else = "\t} els";
-+
-+        push @out, $class->one_invocation($core,$call,$name,$void,$sub,! $lexical,@argv);
-+        }
-+        push @out, q[
-+            }
-+            die "Internal error: $name(\@_): Do not expect to get ", scalar \@_, " arguments";
-+    ];
-+
-+        return join '', @out;
-+    }
- }
- 
- sub one_invocation {
--  my ($core, $call, $name, $void, @argv) = @_;
--  local $" = ', ';
--  if ($void) { 
--    return qq/(defined wantarray)?$call(@argv):
--              $call(@argv) || croak "Can't $name(\@_)/ . 
--           ($core ? ': $!' : ', \$! is \"$!\"') . '"'
--  } else {
--    return qq{$call(@argv) || croak "Can't $name(\@_)} . 
--           ($core ? ': $!' : ', \$! is \"$!\"') . '"';
--  }
-+    my ($class, $core, $call, $name, $void, $sub, $back_compat, @argv) = @_;
-+
-+    # If someone is calling us directly (a child class perhaps?) then
-+    # they could try to mix void without enabling backwards
-+    # compatibility.  We just don't support this at all, so we gripe
-+    # about it rather than doing something unwise.
-+
-+    if ($void and not $back_compat) {
-+        Carp::confess("Internal error: :void mode not supported with $class");
-+    }
-+
-+    # @argv only contains the results of the in-built prototype
-+    # function, and is therefore safe to interpolate in the
-+    # code generators below.
-+
-+    # TODO - The following clobbers context, but that's what the
-+    #        old Fatal did.  Do we care?
-+
-+    if ($back_compat) {
-+
-+        # TODO - Use Fatal qw(system) is not yet supported.  It should be!
-+
-+        if ($call eq 'CORE::system') {
-+            return q{
-+                croak("UNIMPLEMENTED: use Fatal qw(system) not yet supported.");
-+            };
-+        }
-+
-+        local $" = ', ';
-+
-+        if ($void) {
-+            return qq/return (defined wantarray)?$call(@argv):
-+                   $call(@argv) || croak "Can't $name(\@_)/ .
-+                   ($core ? ': $!' : ', \$! is \"$!\"') . '"'
-+        } else {
-+            return qq{return $call(@argv) || croak "Can't $name(\@_)} .
-+                   ($core ? ': $!' : ', \$! is \"$!\"') . '"';
-+        }
-+    }
-+
-+    # The name of our original function is:
-+    #   $call if the function is CORE
-+    #   $sub if our function is non-CORE
-+
-+    # The reason for this is that $call is what we're actualling
-+    # calling.  For our core functions, this is always
-+    # CORE::something.  However for user-defined subs, we're about to
-+    # replace whatever it is that we're calling; as such, we actually
-+    # calling a subroutine ref.
-+
-+    # Unfortunately, none of this tells us the *ultimate* name.
-+    # For example, if I export 'copy' from File::Copy, I'd like my
-+    # ultimate name to be File::Copy::copy.
-+    #
-+    # TODO - Is there any way to find the ultimate name of a sub, as
-+    # described above?
-+
-+    my $true_sub_name = $core ? $call : $sub;
-+
-+    if ($call eq 'CORE::system') {
-+
-+        # Leverage IPC::System::Simple if we're making an autodying
-+        # system.
-+
-+        local $" = ", ";
-+
-+        # We need to stash $@ into $E, rather than using
-+        # local $@ for the whole sub.  If we don't then
-+        # any exceptions from internal errors in autodie/Fatal
-+        # will mysteriously disappear before propogating
-+        # upwards.
-+
-+        return qq{
-+            my \$retval;
-+            my \$E;
-+
-+
-+            {
-+                local \$@;
-+
-+                eval {
-+                    \$retval = IPC::System::Simple::system(@argv);
-+                };
-+
-+                \$E = \$@;
-+            }
-+
-+            if (\$E) {
-+
-+                # XXX - TODO - This can't be overridden in child
-+                # classes!
-+
-+                die autodie::exception::system->new(
-+                    function => q{CORE::system}, args => [ @argv ],
-+                    message => "\$E", errno => \$!,
-+                );
-+            }
-+
-+            return \$retval;
-+        };
-+
-+    }
-+
-+    # Should we be testing to see if our result is defined, or
-+    # just true?
-+    my $use_defined_or = exists ( $Use_defined_or{$call} );
-+
-+    local $" = ', ';
-+
-+    # If we're going to throw an exception, here's the code to use.
-+    my $die = qq{
-+        die $class->throw(
-+            function => q{$true_sub_name}, args => [ @argv ],
-+            pragma => q{$class}, errno => \$!,
-+        )
-+    };
-+
-+    if ($call eq 'CORE::flock') {
-+
-+        # flock needs special treatment.  When it fails with
-+        # LOCK_UN and EWOULDBLOCK, then it's not really fatal, it just
-+        # means we couldn't get the lock right now.
-+
-+        require POSIX;      # For POSIX::EWOULDBLOCK
-+
-+        local $@;   # Don't blat anyone else's $@.
-+
-+        # Ensure that our vendor supports EWOULDBLOCK.  If they
-+        # don't (eg, Windows), then we use known values for its
-+        # equivalent on other systems.
-+
-+        my $EWOULDBLOCK = eval { POSIX::EWOULDBLOCK(); }
-+                          || $_EWOULDBLOCK{$^O}
-+                          || _autocroak("Internal error - can't overload flock - EWOULDBLOCK not defined on this system.");
-+
-+        require Fcntl;      # For Fcntl::LOCK_NB
-+
-+        return qq{
-+
-+            # Try to flock.  If successful, return it immediately.
-+
-+            my \$retval = $call(@argv);
-+            return \$retval if \$retval;
-+
-+            # If we failed, but we're using LOCK_NB and
-+            # returned EWOULDBLOCK, it's not a real error.
-+
-+            if (\$_[1] & Fcntl::LOCK_NB() and \$! == $EWOULDBLOCK ) {
-+                return \$retval;
-+            }
-+
-+            # Otherwise, we failed.  Die noisily.
-+
-+            $die;
-+
-+        };
-+    }
-+
-+    # AFAIK everything that can be given an unopned filehandle
-+    # will fail if it tries to use it, so we don't really need
-+    # the 'unopened' warning class here.  Especially since they
-+    # then report the wrong line number.
-+
-+    return qq{
-+        no warnings qw(unopened);
-+
-+        if (wantarray) {
-+            my \@results = $call(@argv);
-+            # If we got back nothing, or we got back a single
-+            # undef, we die.
-+            if (! \@results or (\@results == 1 and ! defined \$results[0])) {
-+                $die;
-+            };
-+            return \@results;
-+        }
-+
-+        # Otherwise, we're in scalar context.
-+        # We're never in a void context, since we have to look
-+        # at the result.
-+
-+        my \$result = $call(@argv);
-+
-+    } . ( $use_defined_or ? qq{
-+
-+        $die if not defined \$result;
-+
-+        return \$result;
-+
-+    } : qq{
-+
-+        return \$result || $die;
-+
-+    } ) ;
-+
- }
- 
-+# This returns the old copy of the sub, so we can
-+# put it back at end of scope.
-+
-+# TODO : Check to make sure prototypes are restored correctly.
-+
-+# TODO: Taking a huge list of arguments is awful.  Rewriting to
-+#       take a hash would be lovely.
-+
- sub _make_fatal {
--    my($sub, $pkg, $void) = @_;
-+    my($class, $sub, $pkg, $void, $lexical, $filename) = @_;
-     my($name, $code, $sref, $real_proto, $proto, $core, $call);
-     my $ini = $sub;
- 
-     $sub = "${pkg}::$sub" unless $sub =~ /::/;
-+
-+    # Figure if we're using lexical or package semantics and
-+    # twiddle the appropriate bits.
-+
-+    if (not $lexical) {
-+        $Package_Fatal{$sub} = 1;
-+    }
-+
-+    # TODO - We *should* be able to do skipping, since we know when
-+    # we've lexicalised / unlexicalised a subroutine.
-+
-     $name = $sub;
-     $name =~ s/.*::// or $name =~ s/^&//;
--    print "# _make_fatal: sub=$sub pkg=$pkg name=$name void=$void\n" if $Debug;
--    croak "Bad subroutine name for Fatal: $name" unless $name =~ /^\w+$/;
--    if (defined(&$sub)) {	# user subroutine
--	$sref = \&$sub;
--	$proto = prototype $sref;
--	$call = '&$sref';
-+
-+    warn  "# _make_fatal: sub=$sub pkg=$pkg name=$name void=$void\n" if $Debug;
-+    croak(sprintf(ERROR_BADNAME, $class, $name)) unless $name =~ /^\w+$/;
-+
-+    if (defined(&$sub)) {   # user subroutine
-+
-+        # This could be something that we've fatalised that
-+        # was in core.
-+
-+        local $@; # Don't clobber anyone else's $@
-+
-+        if ( $Package_Fatal{$sub} and eval { prototype "CORE::$name" } ) {
-+
-+            # Something we previously made Fatal that was core.
-+            # This is safe to replace with an autodying to core
-+            # version.
-+
-+            $core  = 1;
-+            $call  = "CORE::$name";
-+            $proto = prototype $call;
-+
-+            # We return our $sref from this subroutine later
-+            # on, indicating this subroutine should be placed
-+            # back when we're finished.
-+
-+            $sref = \&$sub;
-+
-+        } else {
-+
-+            # A regular user sub, or a user sub wrapping a
-+            # core sub.
-+
-+            $sref = \&$sub;
-+            $proto = prototype $sref;
-+            $call = '&$sref';
-+
-+        }
-+
-     } elsif ($sub eq $ini && $sub !~ /^CORE::GLOBAL::/) {
--	# Stray user subroutine
--	die "$sub is not a Perl subroutine" 
--    } else {			# CORE subroutine
-+        # Stray user subroutine
-+        croak(sprintf(ERROR_NOTSUB,$sub));
-+
-+    } elsif ($name eq 'system') {
-+
-+        # If we're fatalising system, then we need to load
-+        # helper code.
-+
-+        eval {
-+            require IPC::System::Simple; # Only load it if we need it.
-+            require autodie::exception::system;
-+        };
-+
-+        if ($@) { croak ERROR_NO_IPC_SYS_SIMPLE; }
-+
-+            # Make sure we're using a recent version of ISS that actually
-+            # support fatalised system.
-+            if ($IPC::System::Simple::VERSION < MIN_IPC_SYS_SIMPLE_VER) {
-+                croak sprintf(
-+                ERROR_IPC_SYS_SIMPLE_OLD, MIN_IPC_SYS_SIMPLE_VER,
-+                $IPC::System::Simple::VERSION
-+                );
-+            }
-+
-+        $call = 'CORE::system';
-+        $name = 'system';
-+        $core = 1;
-+
-+    } elsif ($name eq 'exec') {
-+        # Exec doesn't have a prototype.  We don't care.  This
-+        # breaks the exotic form with lexical scope, and gives
-+        # the regular form a "do or die" beaviour as expected.
-+
-+        $call = 'CORE::exec';
-+        $name = 'exec';
-+        $core = 1;
-+
-+    } else {            # CORE subroutine
-         $proto = eval { prototype "CORE::$name" };
--	die "$name is neither a builtin, nor a Perl subroutine" 
--	  if $@;
--	die "Cannot make the non-overridable builtin $name fatal"
--	  if not defined $proto;
--	$core = 1;
--	$call = "CORE::$name";
-+        croak(sprintf(ERROR_NOT_BUILT,$name)) if $@;
-+        croak(sprintf(ERROR_CANT_OVERRIDE,$name)) if not defined $proto;
-+        $core = 1;
-+        $call = "CORE::$name";
-     }
-+
-     if (defined $proto) {
--      $real_proto = " ($proto)";
-+        $real_proto = " ($proto)";
-     } else {
--      $real_proto = '';
--      $proto = '@';
-+        $real_proto = '';
-+        $proto = '@';
-     }
--    $code = <<EOS;
--sub$real_proto {
--	local(\$", \$!) = (', ', 0);
--EOS
-+
-+    my $true_name = $core ? $call : $sub;
-+
-+    # TODO: This caching works, but I don't like using $void and
-+    # $lexical as keys.  In particular, I suspect our code may end up
-+    # wrapping already wrapped code when autodie and Fatal are used
-+    # together.
-+
-+    # NB: We must use '$sub' (the name plus package) and not
-+    # just '$name' (the short name) here.  Failing to do so
-+    # results code that's in the wrong package, and hence has
-+    # access to the wrong package filehandles.
-+
-+    if (my $subref = $Cached_fatalised_sub{$class}{$sub}{$void}{$lexical}) {
-+        $class->_install_subs($pkg, { $name => $subref });
-+        return $sref;
-+    }
-+
-+    $code = qq[
-+        sub$real_proto {
-+            local(\$", \$!) = (', ', 0);    # TODO - Why do we do this?
-+    ];
-+
-+    # Don't have perl whine if exec fails, since we'll be handling
-+    # the exception now.
-+    $code .= "no warnings qw(exec);\n" if $call eq "CORE::exec";
-+
-     my @protos = fill_protos($proto);
--    $code .= write_invocation($core, $call, $name, $void, @protos);
-+    $code .= $class->write_invocation($core, $call, $name, $void, $lexical, $sub, @protos);
-     $code .= "}\n";
--    print $code if $Debug;
-+    warn $code if $Debug;
-+
-+    # I thought that changing package was a monumental waste of
-+    # time for CORE subs, since they'll always be the same.  However
-+    # that's not the case, since they may refer to package-based
-+    # filehandles (eg, with open).
-+    #
-+    # There is potential to more aggressively cache core subs
-+    # that we know will never want to interact with package variables
-+    # and filehandles.
-+
-     {
--      no strict 'refs'; # to avoid: Can't use string (...) as a symbol ref ...
--      $code = eval("package $pkg; use Carp; $code");
--      die if $@;
--      no warnings;   # to avoid: Subroutine foo redefined ...
--      *{$sub} = $code;
-+        local $@;
-+        no strict 'refs'; ## no critic # to avoid: Can't use string (...) as a symbol ref ...
-+        $code = eval("package $pkg; use Carp; $code");  ## no critic
-+        if (not $code) {
-+
-+            # For some reason, using a die, croak, or confess in here
-+            # results in the error being completely surpressed. As such,
-+            # we need to do our own reporting.
-+            #
-+            # TODO: Fix the above.
-+
-+            _autocroak("Internal error in autodie/Fatal processing $true_name: $@");
-+
-+        }
-     }
-+
-+    # Now we need to wrap our fatalised sub inside an itty bitty
-+    # closure, which can detect if we've leaked into another file.
-+    # Luckily, we only need to do this for lexical (autodie)
-+    # subs.  Fatal subs can leak all they want, it's considered
-+    # a "feature" (or at least backwards compatible).
-+
-+    # TODO: Cache our leak guards!
-+
-+    # TODO: This is pretty hairy code.  A lot more tests would
-+    # be really nice for this.
-+
-+    my $leak_guard;
-+
-+    if ($lexical) {
-+
-+        $leak_guard = qq<
-+            package $pkg;
-+
-+            sub$real_proto {
-+
-+                # If we're inside a string eval, we can end up with a
-+                # whacky filename.  The following code allows autodie
-+                # to propagate correctly into string evals.
-+
-+                my \$caller_level = 0;
-+
-+                while ( (caller \$caller_level)[1] =~ m{^\\(eval \\d+\\)\$} ) {
-+                    \$caller_level++;
-+                }
-+
-+                # If we're called from the correct file, then use the
-+                # autodying code.
-+                goto &\$code if ((caller \$caller_level)[1] eq \$filename);
-+
-+                # Oh bother, we've leaked into another file.  Call the
-+                # original code.  Note that \$sref may actually be a
-+                # reference to a Fatalised version of a core built-in.
-+                # That's okay, because Fatal *always* leaks between files.
-+
-+                goto &\$sref if \$sref;
-+        >;
-+
-+
-+        # If we're here, it must have been a core subroutine called.
-+        # Warning: The following code may disturb some viewers.
-+
-+        # TODO: It should be possible to combine this with
-+        # write_invocation().
-+
-+        foreach my $proto (@protos) {
-+            local $" = ", ";    # So @args is formatted correctly.
-+            my ($count, @args) = @$proto;
-+            $leak_guard .= qq<
-+                if (\@_ == $count) {
-+                    return $call(@args);
-+                }
-+            >;
-+        }
-+
-+        $leak_guard .= qq< croak "Internal error in Fatal/autodie.  Leak-guard failure"; } >;
-+
-+        # warn "$leak_guard\n";
-+
-+        local $@;
-+
-+        $leak_guard = eval $leak_guard;  ## no critic
-+
-+        die "Internal error in $class: Leak-guard installation failure: $@" if $@;
-+    }
-+
-+    $class->_install_subs($pkg, { $name => $leak_guard || $code });
-+
-+    $Cached_fatalised_sub{$class}{$sub}{$void}{$lexical} = $leak_guard || $code;
-+
-+    return $sref;
-+
-+}
-+
-+# This subroutine exists primarily so that child classes can override
-+# it to point to their own exception class.  Doing this is significantly
-+# less complex than overriding throw()
-+
-+sub exception_class { return "autodie::exception" };
-+
-+{
-+    my %exception_class_for;
-+    my %class_loaded;
-+
-+    sub throw {
-+        my ($class, @args) = @_;
-+
-+        # Find our exception class if we need it.
-+        my $exception_class =
-+             $exception_class_for{$class} ||= $class->exception_class;
-+
-+        if (not $class_loaded{$exception_class}) {
-+            if ($exception_class =~ /[^\w:']/) {
-+                confess "Bad exception class '$exception_class'.\nThe '$class->exception_class' method wants to use $exception_class\nfor exceptions, but it contains characters which are not word-characters or colons.";
-+            }
-+
-+            # Alas, Perl does turn barewords into modules unless they're
-+            # actually barewords.  As such, we're left doing a string eval
-+            # to make sure we load our file correctly.
-+
-+            my $E;
-+
-+            {
-+                local $@;   # We can't clobber $@, it's wrong!
-+                eval "require $exception_class"; ## no critic
-+                $E = $@;    # Save $E despite ending our local.
-+            }
-+
-+            # We need quotes around $@ to make sure it's stringified
-+            # while still in scope.  Without them, we run the risk of
-+            # $@ having been cleared by us exiting the local() block.
-+
-+            confess "Failed to load '$exception_class'.\nThis may be a typo in the '$class->exception_class' method,\nor the '$exception_class' module may not exist.\n\n $E" if $E;
-+
-+            $class_loaded{$exception_class}++;
-+
-+        }
-+
-+        return $exception_class->new(@args);
-+    }
-+}
-+
-+# For some reason, dying while replacing our subs doesn't
-+# kill our calling program.  It simply stops the loading of
-+# autodie and keeps going with everything else.  The _autocroak
-+# sub allows us to die with a vegence.  It should *only* ever be
-+# used for serious internal errors, since the results of it can't
-+# be captured.
-+
-+sub _autocroak {
-+    warn Carp::longmess(@_);
-+    exit(255);  # Ugh!
-+}
-+
-+package autodie::Scope::Guard;
-+
-+# This code schedules the cleanup of subroutines at the end of
-+# scope.  It's directly inspired by chocolateboy's excellent
-+# Scope::Guard module.
-+
-+sub new {
-+    my ($class, $handler) = @_;
-+
-+    return bless $handler, $class;
-+}
-+
-+sub DESTROY {
-+    my ($self) = @_;
-+
-+    $self->();
- }
- 
- 1;
-@@ -140,54 +1005,129 @@
- 
- =head1 NAME
- 
--Fatal - replace functions with equivalents which succeed or die
-+Fatal - Replace functions with equivalents which succeed or die
- 
- =head1 SYNOPSIS
- 
-     use Fatal qw(open close);
- 
-+    open(my $fh, "<", $filename);  # No need to check errors!
-+
-+    use File::Copy qw(move);
-+    use Fatal qw(move);
-+
-+    move($file1, $file2); # No need to check errors!
-+
-     sub juggle { . . . }
--    import Fatal 'juggle';
-+    Fatal->import('juggle');
-+
-+=head1 BEST PRACTICE
-+
-+B<Fatal has been obsoleted by the new L<autodie> pragma.> Please use
-+L<autodie> in preference to C<Fatal>.  L<autodie> supports lexical scoping,
-+throws real exception objects, and provides much nicer error messages.
-+
-+The use of C<:void> with Fatal is discouraged.
- 
- =head1 DESCRIPTION
- 
--C<Fatal> provides a way to conveniently replace functions which normally
--return a false value when they fail with equivalents which raise exceptions
--if they are not successful.  This lets you use these functions without
--having to test their return values explicitly on each call.  Exceptions
--can be caught using C<eval{}>.  See L<perlfunc> and L<perlvar> for details.
-+C<Fatal> provides a way to conveniently replace
-+functions which normally return a false value when they fail with
-+equivalents which raise exceptions if they are not successful.  This
-+lets you use these functions without having to test their return
-+values explicitly on each call.  Exceptions can be caught using
-+C<eval{}>.  See L<perlfunc> and L<perlvar> for details.
- 
- The do-or-die equivalents are set up simply by calling Fatal's
- C<import> routine, passing it the names of the functions to be
- replaced.  You may wrap both user-defined functions and overridable
--CORE operators (except C<exec>, C<system> which cannot be expressed
--via prototypes) in this way.
-+CORE operators (except C<exec>, C<system>, C<print>, or any other
-+built-in that cannot be expressed via prototypes) in this way.
- 
- If the symbol C<:void> appears in the import list, then functions
- named later in that import list raise an exception only when
- these are called in void context--that is, when their return
- values are ignored.  For example
- 
--	use Fatal qw/:void open close/;
-+    use Fatal qw/:void open close/;
-+
-+    # properly checked, so no exception raised on error
-+    if (not open(my $fh, '<' '/bogotic') {
-+        warn "Can't open /bogotic: $!";
-+    }
-+
-+    # not checked, so error raises an exception
-+    close FH;
-+
-+The use of C<:void> is discouraged, as it can result in exceptions
-+not being thrown if you I<accidentally> call a method without
-+void context.  Use L<autodie> instead if you need to be able to
-+disable autodying/Fatal behaviour for a small block of code.
- 
--	# properly checked, so no exception raised on error
--	if(open(FH, "< /bogotic") {
--		warn "bogo file, dude: $!";
--	}
-+=head1 DIAGNOSTICS
- 
--	# not checked, so error raises an exception
--	close FH;
-+=over 4
-+
-+=item Bad subroutine name for Fatal: %s
-+
-+You've called C<Fatal> with an argument that doesn't look like
-+a subroutine name, nor a switch that this version of Fatal
-+understands.
-+
-+=item %s is not a Perl subroutine
-+
-+You've asked C<Fatal> to try and replace a subroutine which does not
-+exist, or has not yet been defined.
-+
-+=item %s is neither a builtin, nor a Perl subroutine
-+
-+You've asked C<Fatal> to replace a subroutine, but it's not a Perl
-+built-in, and C<Fatal> couldn't find it as a regular subroutine.
-+It either doesn't exist or has not yet been defined.
-+
-+=item Cannot make the non-overridable %s fatal
-+
-+You've tried to use C<Fatal> on a Perl built-in that can't be
-+overridden, such as C<print> or C<system>, which means that
-+C<Fatal> can't help you, although some other modules might.
-+See the L</"SEE ALSO"> section of this documentation.
-+
-+=item Internal error: %s
-+
-+You've found a bug in C<Fatal>.  Please report it using
-+the C<perlbug> command.
-+
-+=back
- 
- =head1 BUGS
- 
--You should not fatalize functions that are called in list context, because this
--module tests whether a function has failed by testing the boolean truth of its
--return value in scalar context.
-+C<Fatal> clobbers the context in which a function is called and always
-+makes it a scalar context, except when the C<:void> tag is used.
-+This problem does not exist in L<autodie>.
-+
-+"Used only once" warnings can be generated when C<autodie> or C<Fatal>
-+is used with package filehandles (eg, C<FILE>).  It's strongly recommended
-+you use scalar filehandles instead.
- 
- =head1 AUTHOR
- 
--Lionel Cons (CERN).
-+Original module by Lionel Cons (CERN).
- 
- Prototype updates by Ilya Zakharevich <ilya@math.ohio-state.edu>.
- 
-+L<autodie> support, bugfixes, extended diagnostics, C<system>
-+support, and major overhauling by Paul Fenwick <pjf@perltraining.com.au>
-+
-+=head1 LICENSE
-+
-+This module is free software, you may distribute it under the
-+same terms as Perl itself.
-+
-+=head1 SEE ALSO
-+
-+L<autodie> for a nicer way to use lexical Fatal.
-+
-+L<IPC::System::Simple> for a similar idea for calls to C<system()>
-+and backticks.
-+
- =cut
-diff -urN perl-5.10.0.orig/lib/autodie/exception/system.pm perl-5.10.0/lib/autodie/exception/system.pm
---- perl-5.10.0.orig/lib/autodie/exception/system.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/autodie/exception/system.pm	2009-03-24 12:42:25.000000000 +0100
-@@ -0,0 +1,81 @@
-+package autodie::exception::system;
-+use 5.008;
-+use strict;
-+use warnings;
-+use base 'autodie::exception';
-+use Carp qw(croak);
-+
-+our $VERSION = '1.999';
-+
-+my $PACKAGE = __PACKAGE__;
-+
-+=head1 NAME
-+
-+autodie::exception::system - Exceptions from autodying system().
-+
-+=head1 SYNOPSIS
-+
-+    eval {
-+        use autodie qw(system);
-+
-+        system($cmd, @args);
-+
-+    };
-+
-+    if (my $E = $@) {
-+        say "Ooops!  ",$E->caller," had problems: $@";
-+    }
-+
-+
-+=head1 DESCRIPTION
-+
-+This is a L<autodie::exception> class for failures from the
-+C<system> command.
-+
-+Presently there is no way to interrogate an C<autodie::exception::system>
-+object for the command, exit status, and other information you'd expect
-+such an object to hold.  The interface will be expanded to accommodate
-+this in the future.
-+
-+=cut
-+
-+sub _init {
-+    my ($this, %args) = @_;
-+
-+    $this->{$PACKAGE}{message} = $args{message}
-+        || croak "'message' arg not supplied to autodie::exception::system->new";
-+
-+    return $this->SUPER::_init(%args);
-+
-+}
-+
-+=head2 stringify
-+
-+When stringified, C<autodie::exception::system> objects currently
-+use the message generated by L<IPC::System::Simple>.
-+
-+=cut
-+
-+sub stringify {
-+
-+    my ($this) = @_;
-+
-+    return $this->{$PACKAGE}{message} . $this->add_file_and_line;
-+
-+}
-+
-+1;
-+
-+__END__
-+
-+=head1 LICENSE
-+
-+Copyright (C)2008 Paul Fenwick
-+
-+This is free software.  You may modify and/or redistribute this
-+code under the same terms as Perl 5.10 itself, or, at your option,
-+any later version of Perl 5.
-+
-+=head1 AUTHOR
-+
-+Paul Fenwick E<lt>pjf@perltraining.com.auE<gt>
-diff -urN perl-5.10.0.orig/lib/autodie/exception.pm perl-5.10.0/lib/autodie/exception.pm
---- perl-5.10.0.orig/lib/autodie/exception.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/autodie/exception.pm	2009-03-24 12:42:25.000000000 +0100
-@@ -0,0 +1,687 @@
-+package autodie::exception;
-+use 5.008;
-+use strict;
-+use warnings;
-+use Carp qw(croak);
-+
-+our $DEBUG = 0;
-+
-+use overload
-+    q{""} => "stringify"
-+;
-+
-+# Overload smart-match only if we're using 5.10
-+
-+use if ($] >= 5.010), overload => '~~'  => "matches";
-+
-+our $VERSION = '1.999';
-+
-+my $PACKAGE = __PACKAGE__;  # Useful to have a scalar for hash keys.
-+
-+=head1 NAME
-+
-+autodie::exception - Exceptions from autodying functions.
-+
-+=head1 SYNOPSIS
-+
-+    eval {
-+        use autodie;
-+
-+        open(my $fh, '<', 'some_file.txt');
-+
-+        ...
-+    };
-+
-+    if (my $E = $@) {
-+        say "Ooops!  ",$E->caller," had problems: $@";
-+    }
-+
-+
-+=head1 DESCRIPTION
-+
-+When an L<autodie> enabled function fails, it generates an
-+C<autodie::exception> object.  This can be interrogated to
-+determine further information about the error that occurred.
-+
-+This document is broken into two sections; those methods that
-+are most useful to the end-developer, and those methods for
-+anyone wishing to subclass or get very familiar with
-+C<autodie::exception>.
-+
-+=head2 Common Methods
-+
-+These methods are intended to be used in the everyday dealing
-+of exceptions.
-+
-+The following assume that the error has been copied into
-+a separate scalar:
-+
-+    if ($E = $@) {
-+        ...
-+    }
-+
-+This is not required, but is recommended in case any code
-+is called which may reset or alter C<$@>.
-+
-+=cut
-+
-+=head3 args
-+
-+    my $array_ref = $E->args;
-+
-+Provides a reference to the arguments passed to the subroutine
-+that died.
-+
-+=cut
-+
-+sub args        { return $_[0]->{$PACKAGE}{args}; }
-+
-+=head3 function
-+
-+    my $sub = $E->function;
-+
-+The subroutine (including package) that threw the exception.
-+
-+=cut
-+
-+sub function   { return $_[0]->{$PACKAGE}{function};  }
-+
-+=head3 file
-+
-+    my $file = $E->file;
-+
-+The file in which the error occurred (eg, C<myscript.pl> or
-+C<MyTest.pm>).
-+
-+=cut
-+
-+sub file        { return $_[0]->{$PACKAGE}{file};  }
-+
-+=head3 package
-+
-+    my $package = $E->package;
-+
-+The package from which the exceptional subroutine was called.
-+
-+=cut
-+
-+sub package     { return $_[0]->{$PACKAGE}{package}; }
-+
-+=head3 caller
-+
-+    my $caller = $E->caller;
-+
-+The subroutine that I<called> the exceptional code.
-+
-+=cut
-+
-+sub caller      { return $_[0]->{$PACKAGE}{caller};  }
-+
-+=head3 line
-+
-+    my $line = $E->line;
-+
-+The line in C<< $E->file >> where the exceptional code was called.
-+
-+=cut
-+
-+sub line        { return $_[0]->{$PACKAGE}{line};  }
-+
-+=head3 errno
-+
-+    my $errno = $E->errno;
-+
-+The value of C<$!> at the time when the exception occurred.
-+
-+B<NOTE>: This method will leave the main C<autodie::exception> class
-+and become part of a role in the future.  You should only call
-+C<errno> for exceptions where C<$!> would reasonably have been
-+set on failure.
-+
-+=cut
-+
-+# TODO: Make errno part of a role.  It doesn't make sense for
-+# everything.
-+
-+sub errno       { return $_[0]->{$PACKAGE}{errno}; }
-+
-+=head3 matches
-+
-+    if ( $e->matches('open') ) { ... }
-+
-+    if ( $e ~~ 'open' ) { ... }
-+
-+C<matches> is used to determine whether a
-+given exception matches a particular role.  On Perl 5.10,
-+using smart-match (C<~~>) with an C<autodie::exception> object
-+will use C<matches> underneath.
-+
-+An exception is considered to match a string if:
-+
-+=over 4
-+
-+=item *
-+
-+For a string not starting with a colon, the string exactly matches the
-+package and subroutine that threw the exception.  For example,
-+C<MyModule::log>.  If the string does not contain a package name,
-+C<CORE::> is assumed.
-+
-+=item *
-+
-+For a string that does start with a colon, if the subroutine
-+throwing the exception I<does> that behaviour.  For example, the
-+C<CORE::open> subroutine does C<:file>, C<:io> and C<:all>.
-+
-+See L<autodie/CATEGORIES> for futher information.
-+
-+=back
-+
-+=cut
-+
-+{
-+    my (%cache);
-+
-+    sub matches {
-+        my ($this, $that) = @_;
-+
-+        # XXX - Handle references
-+        croak "UNIMPLEMENTED" if ref $that;
-+
-+        my $sub = $this->function;
-+
-+        if ($DEBUG) {
-+            my $sub2 = $this->function;
-+            warn "Smart-matching $that against $sub / $sub2\n";
-+        }
-+
-+        # Direct subname match.
-+        return 1 if $that eq $sub;
-+        return 1 if $that !~ /:/ and "CORE::$that" eq $sub;
-+        return 0 if $that !~ /^:/;
-+
-+        # Cached match / check tags.
-+        require Fatal;
-+
-+        if (exists $cache{$sub}{$that}) {
-+            return $cache{$sub}{$that};
-+        }
-+
-+        # This rather awful looking line checks to see if our sub is in the
-+        # list of expanded tags, caches it, and returns the result.
-+
-+        return $cache{$sub}{$that} = grep { $_ eq $sub } @{ $this->_expand_tag($that) };
-+    }
-+}
-+
-+# This exists primarily so that child classes can override or
-+# augment it if they wish.
-+
-+sub _expand_tag {
-+    my ($this, @args) = @_;
-+
-+    return Fatal->_expand_tag(@args);
-+}
-+
-+=head2 Advanced methods
-+
-+The following methods, while usable from anywhere, are primarily
-+intended for developers wishing to subclass C<autodie::exception>,
-+write code that registers custom error messages, or otherwise
-+work closely with the C<autodie::exception> model.
-+
-+=cut
-+
-+# The table below records customer formatters.
-+# TODO - Should this be a package var instead?
-+# TODO - Should these be in a completely different file, or
-+#        perhaps loaded on demand?  Most formatters will never
-+#        get used in most programs.
-+
-+my %formatter_of = (
-+    'CORE::close'   => \&_format_close,
-+    'CORE::open'    => \&_format_open,
-+    'CORE::dbmopen' => \&_format_dbmopen,
-+    'CORE::flock'   => \&_format_flock,
-+);
-+
-+# TODO: Our tests only check LOCK_EX | LOCK_NB is properly
-+# formatted.  Try other combinations and ensure they work
-+# correctly.
-+
-+sub _format_flock {
-+    my ($this) = @_;
-+
-+    require Fcntl;
-+
-+    my $filehandle = $this->args->[0];
-+    my $raw_mode   = $this->args->[1];
-+
-+    my $mode_type;
-+    my $lock_unlock;
-+
-+    if ($raw_mode & Fcntl::LOCK_EX() ) {
-+        $lock_unlock = "lock";
-+        $mode_type = "for exclusive access";
-+    }
-+    elsif ($raw_mode & Fcntl::LOCK_SH() ) {
-+        $lock_unlock = "lock";
-+        $mode_type = "for shared access";
-+    }
-+    elsif ($raw_mode & Fcntl::LOCK_UN() ) {
-+        $lock_unlock = "unlock";
-+        $mode_type = "";
-+    }
-+    else {
-+        # I've got no idea what they're trying to do.
-+        $lock_unlock = "lock";
-+        $mode_type = "with mode $raw_mode";
-+    }
-+
-+    my $cooked_filehandle;
-+
-+    if ($filehandle and not ref $filehandle) {
-+
-+        # A package filehandle with a name!
-+
-+        $cooked_filehandle = " $filehandle";
-+    }
-+    else {
-+        # Otherwise we have a scalar filehandle.
-+
-+        $cooked_filehandle = '';
-+
-+    }
-+
-+    local $! = $this->errno;
-+
-+    return "Can't $lock_unlock filehandle$cooked_filehandle $mode_type: $!";
-+
-+}
-+
-+# Default formatter for CORE::dbmopen
-+sub _format_dbmopen {
-+    my ($this) = @_;
-+    my @args   = @{$this->args};
-+
-+    # TODO: Presently, $args flattens out the (usually empty) hash
-+    # which is passed as the first argument to dbmopen.  This is
-+    # a bug in our args handling code (taking a reference to it would
-+    # be better), but for the moment we'll just examine the end of
-+    # our arguments list for message formatting.
-+
-+    my $mode = $args[-1];
-+    my $file = $args[-2];
-+
-+    # If we have a mask, then display it in octal, not decimal.
-+    # We don't do this if it already looks octalish, or doesn't
-+    # look like a number.
-+
-+    if ($mode =~ /^[^\D0]\d+$/) {
-+        $mode = sprintf("0%lo", $mode);
-+    };
-+
-+    local $! = $this->errno;
-+
-+    return "Can't dbmopen(%hash, '$file', $mode): '$!'";
-+}
-+
-+# Default formatter for CORE::close
-+
-+sub _format_close {
-+    my ($this) = @_;
-+    my $close_arg = $this->args->[0];
-+
-+    local $! = $this->errno;
-+
-+    # If we've got an old-style filehandle, mention it.
-+    if ($close_arg and not ref $close_arg) {
-+        return "Can't close filehandle '$close_arg': '$!'";
-+    }
-+
-+    # TODO - This will probably produce an ugly error.  Test and fix.
-+    return "Can't close($close_arg) filehandle: '$!'";
-+
-+}
-+
-+# Default formatter for CORE::open
-+
-+use constant _FORMAT_OPEN => "Can't open '%s' for %s: '%s'";
-+
-+sub _format_open_with_mode {
-+    my ($this, $mode, $file, $error) = @_;
-+
-+    my $wordy_mode;
-+
-+    if    ($mode eq '<')  { $wordy_mode = 'reading';   }
-+    elsif ($mode eq '>')  { $wordy_mode = 'writing';   }
-+    elsif ($mode eq '>>') { $wordy_mode = 'appending'; }
-+
-+    return sprintf _FORMAT_OPEN, $file, $wordy_mode, $error if $wordy_mode;
-+
-+    Carp::confess("Internal autodie::exception error: Don't know how to format mode '$mode'.");
-+
-+}
-+
-+sub _format_open {
-+    my ($this) = @_;
-+
-+    my @open_args = @{$this->args};
-+
-+    # Use the default formatter for single-arg and many-arg open
-+    if (@open_args <= 1 or @open_args >= 4) {
-+        return $this->format_default;
-+    }
-+
-+    # For two arg open, we have to extract the mode
-+    if (@open_args == 2) {
-+        my ($fh, $file) = @open_args;
-+
-+        if (ref($fh) eq "GLOB") {
-+            $fh = '$fh';
-+        }
-+
-+        my ($mode) = $file =~ m{
-+            ^\s*                # Spaces before mode
-+            (
-+                (?>             # Non-backtracking subexp.
-+                    <           # Reading
-+                    |>>?        # Writing/appending
-+                )
-+            )
-+            [^&]                # Not an ampersand (which means a dup)
-+        }x;
-+
-+        # Have a funny mode?  Use the default format.
-+        return $this->format_default if not defined $mode;
-+
-+        # Localising $! means perl make make it a pretty error for us.
-+        local $! = $this->errno;
-+
-+        return $this->_format_open_with_mode($mode, $file, $!);
-+    }
-+
-+    # Here we must be using three arg open.
-+
-+    my $file = $open_args[2];
-+
-+    local $! = $this->errno;
-+
-+    my $mode = $open_args[1];
-+
-+    local $@;
-+
-+    my $msg = eval { $this->_format_open_with_mode($mode, $file, $!); };
-+
-+    return $msg if $msg;
-+
-+    # Default message (for pipes and odd things)
-+
-+    return "Can't open '$file' with mode '$open_args[1]': '$!'";
-+}
-+
-+=head3 register
-+
-+    autodie::exception->register( 'CORE::open' => \&mysub );
-+
-+The C<register> method allows for the registration of a message
-+handler for a given subroutine.  The full subroutine name including
-+the package should be used.
-+
-+Registered message handlers will receive the C<autodie::exception>
-+object as the first parameter.
-+
-+=cut
-+
-+sub register {
-+    my ($class, $symbol, $handler) = @_;
-+
-+    croak "Incorrect call to autodie::register" if @_ != 3;
-+
-+    $formatter_of{$symbol} = $handler;
-+
-+}
-+
-+=head3 add_file_and_line
-+
-+    say "Problem occurred",$@->add_file_and_line;
-+
-+Returns the string C< at %s line %d>, where C<%s> is replaced with
-+the filename, and C<%d> is replaced with the line number.
-+
-+Primarily intended for use by format handlers.
-+
-+=cut
-+
-+# Simply produces the file and line number; intended to be added
-+# to the end of error messages.
-+
-+sub add_file_and_line {
-+    my ($this) = @_;
-+
-+    return sprintf(" at %s line %d\n", $this->file, $this->line);
-+}
-+
-+=head3 stringify
-+
-+    say "The error was: ",$@->stringify;
-+
-+Formats the error as a human readable string.  Usually there's no
-+reason to call this directly, as it is used automatically if an
-+C<autodie::exception> object is ever used as a string.
-+
-+Child classes can override this method to change how they're
-+stringified.
-+
-+=cut
-+
-+sub stringify {
-+    my ($this) = @_;
-+
-+    my $call        =  $this->function;
-+
-+    if ($DEBUG) {
-+        my $dying_pkg   = $this->package;
-+        my $sub   = $this->function;
-+        my $caller = $this->caller;
-+        warn "Stringifing exception for $dying_pkg :: $sub / $caller / $call\n";
-+    }
-+
-+    # TODO - This isn't using inheritance.  Should it?
-+    if ( my $sub = $formatter_of{$call} ) {
-+        return $sub->($this) . $this->add_file_and_line;
-+    }
-+
-+    return $this->format_default;
-+
-+}
-+
-+=head3 format_default
-+
-+    my $error_string = $E->format_default;
-+
-+This produces the default error string for the given exception,
-+I<without using any registered message handlers>.  It is primarily
-+intended to be called from a message handler when they have
-+been passed an exception they don't want to format.
-+
-+Child classes can override this method to change how default
-+messages are formatted.
-+
-+=cut
-+
-+# TODO: This produces ugly errors.  Is there any way we can
-+# dig around to find the actual variable names?  I know perl 5.10
-+# does some dark and terrible magicks to find them for undef warnings.
-+
-+sub format_default {
-+    my ($this) = @_;
-+
-+    my $call        =  $this->function;
-+
-+    local $! = $this->errno;
-+
-+    # TODO: This is probably a good idea for CORE, is it
-+    # a good idea for other subs?
-+
-+    # Trim package name off dying sub for error messages.
-+    $call =~ s/.*:://;
-+
-+    # Walk through all our arguments, and...
-+    #
-+    #   * Replace undef with the word 'undef'
-+    #   * Replace globs with the string '$fh'
-+    #   * Quote all other args.
-+
-+    my @args = @{ $this->args() };
-+
-+    foreach my $arg (@args) {
-+       if    (not defined($arg))   { $arg = 'undef' }
-+       elsif (ref($arg) eq "GLOB") { $arg = '$fh'   }
-+       else                        { $arg = qq{'$arg'} }
-+    }
-+
-+    # Format our beautiful error.
-+
-+    return "Can't $call(".  join(q{, }, @args) . "): $!" .
-+        $this->add_file_and_line;
-+
-+    # TODO - Handle user-defined errors from hash.
-+
-+    # TODO - Handle default error messages.
-+
-+}
-+
-+=head3 new
-+
-+    my $error = autodie::exception->new(
-+        args => \@_,
-+        function => "CORE::open",
-+        errno => $!,
-+    );
-+
-+
-+Creates a new C<autodie::exception> object.  Normally called
-+directly from an autodying function.  The C<function> argument
-+is required, its the function we were trying to call that
-+generated the exception.  The C<args> parameter is optional.
-+
-+The C<errno> value is optional.  In versions of C<autodie::exception>
-+1.99 and earlier the code would try to automatically use the
-+current value of C<$!>, but this was unreliable and is no longer
-+supported.
-+
-+Atrributes such as package, file, and caller are determined
-+automatically, and cannot be specified.
-+
-+=cut
-+
-+sub new {
-+    my ($class, @args) = @_;
-+
-+    my $this = {};
-+
-+    bless($this,$class);
-+
-+    # I'd love to use EVERY here, but it causes our code to die
-+    # because it wants to stringify our objects before they're
-+    # initialised, causing everything to explode.
-+
-+    $this->_init(@args);
-+
-+    return $this;
-+}
-+
-+sub _init {
-+
-+    my ($this, %args) = @_;
-+
-+    # Capturing errno here is not necessarily reliable.
-+    my $original_errno = $!;
-+
-+    our $init_called = 1;
-+
-+    my $class = ref $this;
-+
-+    # We're going to walk up our call stack, looking for the
-+    # first thing that doesn't look like our exception
-+    # code, autodie/Fatal, or some whacky eval.
-+
-+    my ($package, $file, $line, $sub);
-+
-+    my $depth = 0;
-+
-+    while (1) {
-+        $depth++;
-+
-+        ($package, $file, $line, $sub) = CORE::caller($depth);
-+
-+        # Skip up the call stack until we find something outside
-+        # of the Fatal/autodie/eval space.
-+
-+        next if $package->isa('Fatal');
-+        next if $package->isa($class);
-+        next if $package->isa(__PACKAGE__);
-+        next if $file =~ /^\(eval\s\d+\)$/;
-+
-+        last;
-+
-+    }
-+
-+    # We now have everything correct, *except* for our subroutine
-+    # name.  If it's __ANON__ or (eval), then we need to keep on
-+    # digging deeper into our stack to find the real name.  However we
-+    # don't update our other information, since that will be correct
-+    # for our current exception.
-+
-+    my $first_guess_subroutine = $sub;
-+
-+    while (defined $sub and $sub =~ /^\(eval\)$|::__ANON__$/) {
-+        $depth++;
-+
-+        $sub = (CORE::caller($depth))[3];
-+    }
-+
-+    # If we end up falling out the bottom of our stack, then our
-+    # __ANON__ guess is the best we can get.  This includes situations
-+    # where we were called from thetop level of a program.
-+
-+    if (not defined $sub) {
-+        $sub = $first_guess_subroutine;
-+    }
-+
-+    $this->{$PACKAGE}{package} = $package;
-+    $this->{$PACKAGE}{file}    = $file;
-+    $this->{$PACKAGE}{line}    = $line;
-+    $this->{$PACKAGE}{caller}  = $sub;
-+    $this->{$PACKAGE}{package} = $package;
-+
-+    $this->{$PACKAGE}{errno}   = $args{errno} || 0;
-+
-+    $this->{$PACKAGE}{args}    = $args{args} || [];
-+    $this->{$PACKAGE}{function}= $args{function} or
-+              croak("$class->new() called without function arg");
-+
-+    return $this;
-+
-+}
-+
-+1;
-+
-+__END__
-+
-+=head1 SEE ALSO
-+
-+L<autodie>, L<autodie::exception::system>
-+
-+=head1 LICENSE
-+
-+Copyright (C)2008 Paul Fenwick
-+
-+This is free software.  You may modify and/or redistribute this
-+code under the same terms as Perl 5.10 itself, or, at your option,
-+any later version of Perl 5.
-+
-+=head1 AUTHOR
-+
-+Paul Fenwick E<lt>pjf@perltraining.com.auE<gt>
-diff -urN perl-5.10.0.orig/lib/autodie.pm perl-5.10.0/lib/autodie.pm
---- perl-5.10.0.orig/lib/autodie.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/autodie.pm	2009-03-24 12:42:25.000000000 +0100
-@@ -0,0 +1,360 @@
-+package autodie;
-+use 5.008;
-+use strict;
-+use warnings;
-+
-+use Fatal ();
-+our @ISA = qw(Fatal);
-+our $VERSION;
-+
-+BEGIN {
-+    $VERSION = "1.999";
-+}
-+
-+use constant ERROR_WRONG_FATAL => q{
-+Incorrect version of Fatal.pm loaded by autodie.
-+
-+The autodie pragma uses an updated version of Fatal to do its
-+heavy lifting.  We seem to have loaded Fatal version %s, which is
-+probably the version that came with your version of Perl.  However
-+autodie needs version %s, which would have come bundled with
-+autodie.
-+
-+You may be able to solve this problem by adding the following
-+line of code to your main program, before any use of Fatal or
-+autodie.
-+
-+    use lib "%s";
-+
-+};
-+
-+# We have to check we've got the right version of Fatal before we
-+# try to compile the rest of our code, lest we use a constant
-+# that doesn't exist.
-+
-+BEGIN {
-+
-+    # If we have the wrong Fatal, then we've probably loaded the system
-+    # one, not our own.  Complain, and give a useful hint. ;)
-+
-+    if ($Fatal::VERSION ne $VERSION) {
-+        my $autodie_path = $INC{'autodie.pm'};
-+
-+        $autodie_path =~ s/autodie\.pm//;
-+
-+        require Carp;
-+
-+        Carp::croak sprintf(
-+            ERROR_WRONG_FATAL, $Fatal::VERSION, $VERSION, $autodie_path
-+        );
-+    }
-+}
-+
-+# When passing args to Fatal we want to keep the first arg
-+# (our package) in place.  Hence the splice.
-+
-+sub import {
-+        splice(@_,1,0,Fatal::LEXICAL_TAG);
-+        goto &Fatal::import;
-+}
-+
-+sub unimport {
-+        splice(@_,1,0,Fatal::LEXICAL_TAG);
-+        goto &Fatal::unimport;
-+}
-+
-+1;
-+
-+__END__
-+
-+=head1 NAME
-+
-+autodie - Replace functions with ones that succeed or die with lexical scope
-+
-+=head1 SYNOPSIS
-+
-+    use autodie;    # Recommended, implies 'use autodie qw(:default)'
-+
-+    use autodie qw(open close);   # open/close succeed or die
-+
-+    open(my $fh, "<", $filename); # No need to check!
-+
-+    {
-+        no autodie qw(open);          # open failures won't die
-+        open(my $fh, "<", $filename); # Could fail silently!
-+        no autodie;                   # disable all autodies
-+    }
-+
-+=head1 DESCRIPTION
-+
-+        bIlujDI' yIchegh()Qo'; yIHegh()!
-+
-+        It is better to die() than to return() in failure.
-+
-+                -- Klingon programming proverb.
-+
-+The C<autodie> pragma provides a convenient way to replace functions
-+that normally return false on failure with equivalents that throw
-+an exception on failure.
-+
-+The C<autodie> pragma has I<lexical scope>, meaning that functions
-+and subroutines altered with C<autodie> will only change their behaviour
-+until the end of the enclosing block, file, or C<eval>.
-+
-+If C<system> is specified as an argument to C<autodie>, then it
-+uses L<IPC::System::Simple> to do the heavy lifting.  See the
-+description of that module for more information.
-+
-+=head1 EXCEPTIONS
-+
-+Exceptions produced by the C<autodie> pragma are members of the
-+L<autodie::exception> class.  The preferred way to work with
-+these exceptions under Perl 5.10 is as follows:
-+
-+    use feature qw(switch);
-+
-+    eval {
-+        use autodie;
-+
-+        open(my $fh, '<', $some_file);
-+
-+        my @records = <$fh>;
-+
-+        # Do things with @records...
-+
-+        close($fh);
-+
-+    };
-+
-+    given ($@) {
-+        when (undef)   { say "No error";                    }
-+        when ('open')  { say "Error from open";             }
-+        when (':io')   { say "Non-open, IO error.";         }
-+        when (':all')  { say "All other autodie errors."    }
-+        default        { say "Not an autodie error at all." }
-+    }
-+
-+Under Perl 5.8, the C<given/when> structure is not available, so the
-+following structure may be used:
-+
-+    eval {
-+        use autodie;
-+
-+        open(my $fh, '<', $some_file);
-+
-+        my @records = <$fh>;
-+
-+        # Do things with @records...
-+
-+        close($fh);
-+    };
-+
-+    if ($@ and $@->isa('autodie::exception')) {
-+        if ($@->matches('open')) { print "Error from open\n";   }
-+        if ($@->matches(':io' )) { print "Non-open, IO error."; }
-+    } elsif ($@) {
-+        # A non-autodie exception.
-+    }
-+
-+See L<autodie::exception> for further information on interrogating
-+exceptions.
-+
-+=head1 CATEGORIES
-+
-+Autodie uses a simple set of categories to group together similar
-+built-ins.  Requesting a category type (starting with a colon) will
-+enable autodie for all built-ins beneath that category.  For example,
-+requesting C<:file> will enable autodie for C<close>, C<fcntl>,
-+C<fileno>, C<open> and C<sysopen>.
-+
-+The categories are currently:
-+
-+    :all
-+        :default
-+            :io
-+                read
-+                seek
-+                sysread
-+                sysseek
-+                syswrite
-+                :dbm
-+                    dbmclose
-+                    dbmopen
-+                :file
-+                    binmode
-+                    close
-+                    fcntl
-+                    fileno
-+                    flock
-+                    ioctl
-+                    open
-+                    sysopen
-+                    truncate
-+                :filesys
-+                    chdir
-+                    closedir
-+                    opendir
-+                    link
-+                    mkdir
-+                    readlink
-+                    rename
-+                    rmdir
-+                    symlink
-+                    unlink
-+                :ipc
-+                    pipe
-+                    :msg
-+                        msgctl
-+                        msgget
-+                        msgrcv
-+                        msgsnd
-+                    :semaphore
-+                        semctl
-+                        semget
-+                        semop
-+                    :shm
-+                        shmctl
-+                        shmget
-+                        shmread
-+                :socket
-+                    accept
-+                    bind
-+                    connect
-+                    getsockopt
-+                    listen
-+                    recv
-+                    send
-+                    setsockopt
-+                    shutdown
-+                    socketpair
-+            :threads
-+                fork
-+        :system
-+            system
-+            exec
-+
-+
-+Note that while the above category system is presently a strict
-+hierarchy, this should not be assumed.
-+
-+A plain C<use autodie> implies C<use autodie qw(:default)>.  Note that
-+C<system> and C<exec> are not enabled by default.  C<system> requires
-+the optional L<IPC::System::Simple> module to be installed, and enabling
-+C<system> or C<exec> will invalidate their exotic forms.  See L</BUGS>
-+below for more details.
-+
-+The syntax:
-+
-+    use autodie qw(:1.994);
-+
-+allows the C<:default> list from a particular version to be used.  This
-+provides the convenience of using the default methods, but the surity
-+that no behavorial changes will occur if the C<autodie> module is
-+upgraded.
-+
-+=head1 FUNCTION SPECIFIC NOTES
-+
-+=head2 flock
-+
-+It is not considered an error for C<flock> to return false if it fails
-+to an C<EWOULDBLOCK> (or equivalent) condition.  This means one can
-+still use the common convention of testing the return value of
-+C<flock> when called with the C<LOCK_NB> option:
-+
-+    use autodie;
-+
-+    if ( flock($fh, LOCK_EX | LOCK_NB) ) {
-+        # We have a lock
-+    }
-+
-+Autodying C<flock> will generate an exception if C<flock> returns
-+false with any other error.
-+
-+=head2 system/exec
-+
-+Applying C<autodie> to C<system> or C<exec> causes the exotic
-+forms C<system { $cmd } @args > or C<exec { $cmd } @args>
-+to be considered a syntax error until the end of the lexical scope.
-+If you really need to use the exotic form, you can call C<CORE::system>
-+or C<CORE::exec> instead, or use C<no autodie qw(system exec)> before
-+calling the exotic form.
-+
-+=head1 GOTCHAS
-+
-+Functions called in list context are assumed to have failed if they
-+return an empty list, or a list consisting only of a single undef
-+element.
-+
-+=head1 DIAGNOSTICS
-+
-+=over 4
-+
-+=item :void cannot be used with lexical scope
-+
-+The C<:void> option is supported in L<Fatal>, but not
-+C<autodie>.  However you can explicitly disable autodie
-+end the end of the current block with C<no autodie>.
-+To disable autodie for only a single function (eg, open)
-+use or C<no autodie qw(open)>.
-+
-+=back
-+
-+See also L<Fatal/DIAGNOSTICS>.
-+
-+=head1 BUGS
-+
-+"Used only once" warnings can be generated when C<autodie> or C<Fatal>
-+is used with package filehandles (eg, C<FILE>).  It's strongly recommended
-+you use scalar filehandles instead.
-+
-+Under Perl 5.8 only, C<autodie> I<does not> propagate into string C<eval>
-+statements, although it can be explicitly enabled inside a string
-+C<eval>.  This bug does not affect block C<eval> statements in
-+any version of Perl.
-+
-+When using C<autodie> or C<Fatal> with user subroutines, the
-+declaration of those subroutines must appear before the first use of
-+C<Fatal> or C<autodie>, or have been exported from a module.
-+Attempting to ue C<Fatal> or C<autodie> on other user subroutines will
-+result in a compile-time error.
-+
-+=head2 REPORTING BUGS
-+
-+Please report bugs via the CPAN Request Tracker at
-+L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=autodie>.
-+
-+=head1 FEEDBACK
-+
-+If you find this module useful, please consider rating it on the
-+CPAN Ratings service at
-+L<http://cpanratings.perl.org/rate?distribution=autodie> .
-+
-+The module author loves to hear how C<autodie> has made your life
-+better (or worse).  Feedback can be sent to
-+E<lt>pjf@perltraining.com.auE<gt>.
-+
-+=head1 AUTHOR
-+
-+Copyright 2008, Paul Fenwick E<lt>pjf@perltraining.com.auE<gt>
-+
-+=head1 LICENSE
-+
-+This module is free software.  You may distribute it under the
-+same terms as Perl itself.
-+
-+=head1 SEE ALSO
-+
-+L<Fatal>, L<autodie::exception>, L<IPC::System::Simple>
-+
-+I<Perl tips, autodie> at
-+L<http://perltraining.com.au/tips/2008-08-20.html>
-+
-+=head1 ACKNOWLEDGEMENTS
-+
-+Mark Reed and Roland Giersig -- Klingon translators.
-+
-+See the F<AUTHORS> file for full credits.  The latest version of this
-+file can be found at
-+L<http://github.com/pfenwick/autodie/tree/AUTHORS> .
-+
-+=cut
-diff -urN perl-5.10.0.orig/pod/perlmodlib.pod perl-5.10.0/pod/perlmodlib.pod
---- perl-5.10.0.orig/pod/perlmodlib.pod	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/pod/perlmodlib.pod	2009-03-24 11:53:29.000000000 +0100
-@@ -55,6 +55,10 @@
- 
- Set/get attributes of a subroutine (deprecated)
- 
-+=item autodie
-+
-+Replace functions with ones that succeed or die with lexical scope
-+
- =item autouse
- 
- Postpone load of modules until a function is used
-diff -urN perl-5.10.0.orig/t/lib/autodie/00-load.t perl-5.10.0/t/lib/autodie/00-load.t
---- perl-5.10.0.orig/t/lib/autodie/00-load.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/00-load.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,9 @@
-+#!perl -T
-+
-+use Test::More tests => 1;
-+
-+BEGIN {
-+	use_ok( 'Fatal' );
-+}
-+
-+# diag( "Testing Fatal $Fatal::VERSION, Perl $], $^X" );
-diff -urN perl-5.10.0.orig/t/lib/autodie/Fatal.t perl-5.10.0/t/lib/autodie/Fatal.t
---- perl-5.10.0.orig/t/lib/autodie/Fatal.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/Fatal.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,36 @@
-+#!/usr/bin/perl -w
-+use strict;
-+
-+use constant NO_SUCH_FILE => "this_file_or_dir_had_better_not_exist_XYZZY";
-+
-+use Test::More tests => 17;
-+
-+use Fatal qw(open close :void opendir);
-+
-+eval { open FOO, "<".NO_SUCH_FILE };	# Two arg open
-+like($@, qr/^Can't open/, q{Package Fatal::open});
-+is(ref $@, "", "Regular fatal throws a string");
-+
-+my $foo = 'FOO';
-+for ('$foo', "'$foo'", "*$foo", "\\*$foo") {
-+    eval qq{ open $_, '<$0' };
-+
-+    is($@,"", "Open using filehandle named - $_");
-+
-+    like(scalar(<$foo>), qr{^#!.*/perl}, "File contents using - $_");
-+    eval qq{ close FOO };
-+
-+    is($@,"", "Close filehandle using - $_");
-+}
-+
-+eval { opendir FOO, NO_SUCH_FILE };
-+like($@, qr{^Can't open}, "Package :void Fatal::opendir");
-+
-+eval { my $a = opendir FOO, NO_SUCH_FILE };
-+is($@, "", "Package :void Fatal::opendir in scalar context");
-+
-+eval { Fatal->import(qw(print)) };
-+like(
-+	$@, qr{Cannot make the non-overridable builtin print fatal},
-+	"Can't override print"
-+);
-diff -urN perl-5.10.0.orig/t/lib/autodie/autodie.t perl-5.10.0/t/lib/autodie/autodie.t
---- perl-5.10.0.orig/t/lib/autodie/autodie.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/autodie.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,103 @@
-+#!/usr/bin/perl -w
-+use strict;
-+
-+use constant NO_SUCH_FILE => 'this_file_had_so_better_not_be_here';
-+
-+use Test::More tests => 19;
-+
-+{
-+
-+    use autodie qw(open);
-+
-+    eval { open(my $fh, '<', NO_SUCH_FILE); };
-+    like($@,qr{Can't open},"autodie qw(open) in lexical scope");
-+
-+    no autodie qw(open);
-+
-+    eval { open(my $fh, '<', NO_SUCH_FILE); };
-+    is($@,"","no autodie qw(open) in lexical scope");
-+
-+    use autodie qw(open);
-+    eval { open(my $fh, '<', NO_SUCH_FILE); };
-+    like($@,qr{Can't open},"autodie qw(open) in lexical scope 2");
-+
-+    no autodie; # Should turn off all autodying subs
-+    eval { open(my $fh, '<', NO_SUCH_FILE); };
-+    is($@,"","no autodie in lexical scope 2");
-+
-+    # Turn our pragma on one last time, so we can verify that
-+    # falling out of this block reverts it back to previous
-+    # behaviour.
-+    use autodie qw(open);
-+    eval { open(my $fh, '<', NO_SUCH_FILE); };
-+    like($@,qr{Can't open},"autodie qw(open) in lexical scope 3");
-+
-+}
-+
-+eval { open(my $fh, '<', NO_SUCH_FILE); };
-+is($@,"","autodie open outside of lexical scope");
-+
-+eval {
-+    use autodie;	# Should turn on everything
-+    open(my $fh, '<', NO_SUCH_FILE);
-+};
-+
-+like($@, qr{Can't open}, "vanilla use autodie turns on everything.");
-+
-+eval { open(my $fh, '<', NO_SUCH_FILE); };
-+is($@,"","vanilla autodie cleans up");
-+
-+{
-+    use autodie qw(:io);
-+
-+    eval { open(my $fh, '<', NO_SUCH_FILE); };
-+    like($@,qr{Can't open},"autodie q(:io) makes autodying open");
-+
-+    no autodie qw(:io);
-+
-+    eval { open(my $fh, '<', NO_SUCH_FILE); };
-+    is($@,"", "no autodie qw(:io) disabled autodying open");
-+}
-+
-+{
-+    package Testing_autodie;
-+
-+    use Test::More;
-+
-+    use constant NO_SUCH_FILE => ::NO_SUCH_FILE();
-+
-+    use Fatal qw(open);
-+
-+    eval { open(my $fh, '<', NO_SUCH_FILE); };
-+
-+    like($@, qr{Can't open}, "Package fatal working");
-+    is(ref $@,"","Old Fatal throws strings");
-+
-+    {
-+        use autodie qw(open);
-+
-+        ok(1,"use autodie allowed with Fatal");
-+
-+        eval { open(my $fh, '<', NO_SUCH_FILE); };
-+        like($@, qr{Can't open}, "autodie and Fatal works");
-+        isa_ok($@, "autodie::exception"); # autodie throws real exceptions
-+
-+    }
-+
-+    eval { open(my $fh, '<', NO_SUCH_FILE); };
-+
-+    like($@, qr{Can't open}, "Package fatal working after autodie");
-+    is(ref $@,"","Old Fatal throws strings after autodie");
-+
-+    eval " no autodie qw(open); ";
-+
-+    ok($@,"no autodie on Fataled sub an error.");
-+
-+    eval "
-+        no autodie qw(close);
-+        use Fatal 'close';
-+    ";
-+
-+    like($@, qr{not allowed}, "Using fatal after autodie is an error.");
-+}
-+
-diff -urN perl-5.10.0.orig/t/lib/autodie/autodie_test_module.pm perl-5.10.0/t/lib/autodie/autodie_test_module.pm
---- perl-5.10.0.orig/t/lib/autodie/autodie_test_module.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/autodie_test_module.pm	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,18 @@
-+package main;
-+use strict;
-+use warnings;
-+
-+# Calls open, while still in the main package.  This shouldn't
-+# be autodying.
-+sub leak_test {
-+    return open(my $fh, '<', $_[0]);
-+}
-+
-+package autodie_test_module;
-+
-+# This should be calling CORE::open
-+sub your_open {
-+    return open(my $fh, '<', $_[0]);
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/t/lib/autodie/backcompat.t perl-5.10.0/t/lib/autodie/backcompat.t
---- perl-5.10.0.orig/t/lib/autodie/backcompat.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/backcompat.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,14 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use Fatal qw(open);
-+use Test::More tests => 2;
-+use constant NO_SUCH_FILE => "xyzzy_this_file_is_not_here";
-+
-+eval {
-+    open(my $fh, '<', NO_SUCH_FILE);
-+};
-+
-+my $old_msg = qr{Can't open\(GLOB\(0x[0-9a-f]+\), <, xyzzy_this_file_is_not_here\): .* at \(eval \d+\)(?:\[.*?\])? line \d+\s+main::__ANON__\('GLOB\(0x[0-9a-f]+\)',\s*'<',\s*'xyzzy_this_file_is_not_here'\) called at \S+ line \d+\s+eval \Q{...}\E called at \S+ line \d+};
-+
-+like($@,$old_msg,"Backwards compat ugly messages");
-+is(ref($@),"", "Exception is a string, not an object");
-diff -urN perl-5.10.0.orig/t/lib/autodie/basic_exceptions.t perl-5.10.0/t/lib/autodie/basic_exceptions.t
---- perl-5.10.0.orig/t/lib/autodie/basic_exceptions.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/basic_exceptions.t	2009-03-24 12:42:25.000000000 +0100
-@@ -0,0 +1,46 @@
-+#!/usr/bin/perl -w
-+use strict;
-+
-+use Test::More tests => 17;
-+
-+use constant NO_SUCH_FILE => "this_file_had_better_not_exist";
-+
-+my $line;
-+
-+eval {
-+	use autodie ':io';
-+	$line = __LINE__; open(my $fh, '<', NO_SUCH_FILE);
-+};
-+
-+like($@, qr/Can't open '\w+' for reading: /, "Prety printed open msg");
-+like($@, qr{\Q$0\E}, "Our file mention in error message");
-+
-+like($@, qr{for reading: '.+'}, "Error should be in single-quotes");
-+like($@->errno,qr/./, "Errno should not be empty");
-+
-+like($@, qr{\n$}, "Errors should end with a newline");
-+is($@->file, $0, "Correct file");
-+is($@->function, 'CORE::open', "Correct dying sub");
-+is($@->package, __PACKAGE__, "Correct package");
-+is($@->caller,__PACKAGE__."::__ANON__", "Correct caller");
-+is($@->line, $line, "Correct line");
-+is($@->args->[1], '<', 'Correct mode arg');
-+is($@->args->[2], NO_SUCH_FILE, 'Correct filename arg');
-+ok($@->matches('open'), 'Looks like an error from open');
-+ok($@->matches(':io'),  'Looks like an error from :io');
-+
-+# Testing of caller info with a real subroutine.
-+
-+my $line2;
-+
-+sub xyzzy {
-+    use autodie ':io';
-+    $line2 = __LINE__; open(my $fh, '<', NO_SUCH_FILE);
-+    return;
-+};
-+
-+eval { xyzzy(); };
-+
-+isa_ok($@, 'autodie::exception');
-+is($@->caller, __PACKAGE__."::xyzzy", "Subroutine caller test");
-+is($@->line, $line2, "Subroutine line test");
-diff -urN perl-5.10.0.orig/t/lib/autodie/binmode.t perl-5.10.0/t/lib/autodie/binmode.t
---- perl-5.10.0.orig/t/lib/autodie/binmode.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/binmode.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,33 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use Test::More 'no_plan';
-+
-+# These are a bunch of general tests for working with files and
-+# filehandles.
-+
-+my $r = "default";
-+
-+eval {
-+    no warnings;
-+    $r = binmode(FOO);
-+};
-+
-+is($@,"","Sanity: binmode(FOO) doesn't usually throw exceptions");
-+is($r,undef,"Sanity: binmode(FOO) returns undef");
-+
-+eval {
-+    use autodie qw(binmode);
-+    no warnings;
-+    binmode(FOO);
-+};
-+
-+ok($@, "autodie qw(binmode) should cause failing binmode to die.");
-+isa_ok($@,"autodie::exception", "binmode exceptions are in autodie::exception");
-+
-+eval {
-+    use autodie;
-+    no warnings;
-+    binmode(FOO);
-+};
-+
-+ok($@, "autodie (default) should cause failing binmode to die.");
-diff -urN perl-5.10.0.orig/t/lib/autodie/caller.t perl-5.10.0/t/lib/autodie/caller.t
---- perl-5.10.0.orig/t/lib/autodie/caller.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/caller.t	2009-03-24 12:42:25.000000000 +0100
-@@ -0,0 +1,34 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use warnings;
-+use autodie;
-+use Test::More 'no_plan';
-+use FindBin qw($Bin);
-+use lib "$Bin/lib";
-+use Caller_helper;
-+
-+use constant NO_SUCH_FILE => "kiwifoo_is_so_much_fun";
-+
-+eval {
-+    foo();
-+};
-+
-+isa_ok($@, 'autodie::exception');
-+
-+is($@->caller, 'main::foo', "Caller should be main::foo");
-+
-+sub foo {
-+    use autodie;
-+    open(my $fh, '<', NO_SUCH_FILE);
-+}
-+
-+eval {
-+    Caller_helper::foo();
-+};
-+
-+isa_ok($@, 'autodie::exception');
-+
-+is($@->line,     $Caller_helper::line,     "External line number check");
-+is($@->file,     $INC{"Caller_helper.pm"}, "External filename check");
-+is($@->package, "Caller_helper",           "External package check");
-+is($@->caller,  "Caller_helper::foo",      "External subname check");
-diff -urN perl-5.10.0.orig/t/lib/autodie/context.t perl-5.10.0/t/lib/autodie/context.t
---- perl-5.10.0.orig/t/lib/autodie/context.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/context.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,66 @@
-+#!/usr/bin/perl -w
-+use strict;
-+
-+use Test::More;
-+
-+plan 'no_plan';
-+
-+sub list_return {
-+    return if @_;
-+    return qw(foo bar baz);
-+}
-+
-+sub list_return2 {
-+    return if @_;
-+    return qw(foo bar baz);
-+}
-+
-+# Returns a list presented to it, but also returns a single
-+# undef if given a list of a single undef.  This mimics the
-+# behaviour of many user-defined subs and built-ins (eg: open) that
-+# always return undef regardless of context.
-+
-+sub list_mirror {
-+    return undef if (@_ == 1 and not defined $_[0]);
-+    return @_;
-+
-+}
-+
-+use Fatal qw(list_return);
-+use Fatal qw(:void list_return2);
-+
-+TODO: {
-+
-+    # Clobbering context was documented as a bug in the original
-+    # Fatal, so we'll still consider it a bug here.
-+
-+    local $TODO = "Fatal clobbers context, just like it always has.";
-+
-+    my @list = list_return();
-+
-+    is_deeply(\@list,[qw(foo bar baz)],'fatal sub works in list context');
-+}
-+
-+eval {
-+    my @line = list_return(1);  # Should die
-+};
-+
-+ok($@,"List return fatalised");
-+
-+### Tests where we've fatalised our function with :void ###
-+
-+my @list2 = list_return2();
-+
-+is_deeply(\@list2,[qw(foo bar baz)],'fatal sub works in list context');
-+
-+eval {
-+    my @line = list_return2(1);  # Shouldn't die
-+};
-+
-+ok(! $@,"void List return fatalised survives when non-void");
-+
-+eval {
-+    list_return2(1);
-+};
-+
-+ok($@,"void List return fatalised");
-diff -urN perl-5.10.0.orig/t/lib/autodie/context_lexical.t perl-5.10.0/t/lib/autodie/context_lexical.t
---- perl-5.10.0.orig/t/lib/autodie/context_lexical.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/context_lexical.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,80 @@
-+#!/usr/bin/perl -w
-+use strict;
-+
-+use Test::More;
-+
-+plan 'no_plan';
-+
-+# Returns a list presented to it, but also returns a single
-+# undef if given a list of a single undef.  This mimics the
-+# behaviour of many user-defined subs and built-ins (eg: open) that
-+# always return undef regardless of context.
-+
-+sub list_mirror {
-+    return undef if (@_ == 1 and not defined $_[0]);
-+    return @_;
-+
-+}
-+
-+### autodie clobbering tests ###
-+
-+eval {
-+    list_mirror();
-+};
-+
-+is($@, "", "No autodie, no fatality");
-+
-+eval {
-+    use autodie qw(list_mirror);
-+    list_mirror();
-+};
-+
-+ok($@, "Autodie fatality for empty return in void context");
-+
-+eval {
-+    list_mirror();
-+};
-+
-+is($@, "", "No autodie, no fatality (after autodie used)");
-+
-+eval {
-+    use autodie qw(list_mirror);
-+    list_mirror(undef);
-+};
-+
-+ok($@, "Autodie fatality for undef return in void context");
-+
-+eval {
-+    use autodie qw(list_mirror);
-+    my @list = list_mirror();
-+};
-+
-+ok($@,"Autodie fatality for empty list return");
-+
-+eval {
-+    use autodie qw(list_mirror);
-+    my @list = list_mirror(undef);
-+};
-+
-+ok($@,"Autodie fatality for undef list return");
-+
-+eval {
-+    use autodie qw(list_mirror);
-+    my @list = list_mirror("tada");
-+};
-+
-+ok(! $@,"No Autodie fatality for defined list return");
-+
-+eval {
-+    use autodie qw(list_mirror);
-+    my $single = list_mirror("tada");
-+};
-+
-+ok(! $@,"No Autodie fatality for defined scalar return");
-+
-+eval {
-+    use autodie qw(list_mirror);
-+    my $single = list_mirror(undef);
-+};
-+
-+ok($@,"Autodie fatality for undefined scalar return");
-diff -urN perl-5.10.0.orig/t/lib/autodie/crickey.t perl-5.10.0/t/lib/autodie/crickey.t
---- perl-5.10.0.orig/t/lib/autodie/crickey.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/crickey.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,27 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use FindBin;
-+use Test::More 'no_plan';
-+
-+use lib "$FindBin::Bin/lib";
-+
-+use constant NO_SUCH_FILE => "crickey_mate_this_file_isnt_here_either";
-+
-+use autodie::test::au qw(open);
-+
-+eval {
-+    open(my $fh, '<', NO_SUCH_FILE);
-+};
-+
-+ok(my $e = $@, 'Strewth!  autodie::test::au should throw an exception on failure');
-+
-+isa_ok($e, 'autodie::test::au::exception',
-+    'Yeah mate, that should be our test exception.');
-+
-+like($e, qr/time for a beer/, "Time for a beer mate?");
-+
-+like( eval { $e->time_for_a_beer; },
-+    qr/time for a beer/, "It's always a good time for a beer."
-+);
-+
-+ok($e->matches('open'), "Should be a fair dinkum error from open");
-diff -urN perl-5.10.0.orig/t/lib/autodie/dbmopen.t perl-5.10.0/t/lib/autodie/dbmopen.t
---- perl-5.10.0.orig/t/lib/autodie/dbmopen.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/dbmopen.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,36 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use Test::More qw(no_plan);
-+
-+use constant ERROR_REGEXP => qr{Can't dbmopen\(%hash, 'foo/bar/baz', 0666\):};
-+
-+my $return = "default";
-+
-+eval {
-+    $return = dbmopen(my %foo, "foo/bar/baz", 0666);
-+};
-+
-+ok(!$return, "Sanity: dbmopen usually returns false on failure");
-+ok(!$@,      "Sanity: dbmopen doesn't usually throw exceptions");
-+
-+eval {
-+    use autodie;
-+
-+    dbmopen(my %foo, "foo/bar/baz", 0666);
-+};
-+
-+ok($@, "autodie allows dbmopen to throw errors.");
-+isa_ok($@, "autodie::exception", "... errors are of the correct type");
-+
-+like($@, ERROR_REGEXP, "Message should include number in octal, not decimal");
-+
-+eval {
-+    use autodie;
-+
-+    my %bar = ( foo => 1, bar => 2 );
-+
-+    dbmopen(%bar, "foo/bar/baz", 0666);
-+};
-+
-+like($@, ERROR_REGEXP, "Correct formatting even with non-empty dbmopen hash");
-+
-diff -urN perl-5.10.0.orig/t/lib/autodie/exception_class.t perl-5.10.0/t/lib/autodie/exception_class.t
---- perl-5.10.0.orig/t/lib/autodie/exception_class.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/exception_class.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,57 @@
-+#!/usr/bin/perl -w
-+use strict;
-+
-+use FindBin;
-+use Test::More 'no_plan';
-+
-+use lib "$FindBin::Bin/lib";
-+
-+use constant NO_SUCH_FILE => "this_file_had_better_not_exist_xyzzy";
-+
-+### Tests with non-existent exception class.
-+
-+my $open_success = eval {
-+    use autodie::test::missing qw(open);    # Uses non-existent exceptions
-+    open(my $fh, '<', NO_SUCH_FILE);
-+    1;
-+};
-+
-+is($open_success,undef,"Open should fail");
-+
-+isnt($@,"",'$@ should not be empty');
-+
-+is(ref($@),"",'$@ should not be a reference or object');
-+
-+like($@, qr/Failed to load/, '$@ should contain bad exception class msg');
-+
-+#### Tests with malformed exception class.
-+
-+my $open_success2 = eval {
-+    use autodie::test::badname qw(open);
-+    open(my $fh, '<', NO_SUCH_FILE);
-+    1;
-+};
-+
-+is($open_success2,undef,"Open should fail");
-+
-+isnt($@,"",'$@ should not be empty');
-+
-+is(ref($@),"",'$@ should not be a reference or object');
-+
-+like($@, qr/Bad exception class/, '$@ should contain bad exception class msg');
-+
-+### Tests with well-formed exception class (in Klingon)
-+
-+my $open_success3 = eval {
-+    use pujHa'ghach qw(open);         #' <-- this makes my editor happy
-+    open(my $fh, '<', NO_SUCH_FILE);
-+    1;
-+};
-+
-+is($open_success3,undef,"Open should fail");
-+
-+isnt("$@","",'$@ should not be empty');
-+
-+isa_ok($@, "pujHa'ghach::Dotlh", '$@ should be a Klingon exception');
-+
-+like($@, qr/lujqu'/, '$@ should contain Klingon text');
-diff -urN perl-5.10.0.orig/t/lib/autodie/exceptions.t perl-5.10.0/t/lib/autodie/exceptions.t
---- perl-5.10.0.orig/t/lib/autodie/exceptions.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/exceptions.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,45 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use Test::More;
-+
-+BEGIN { plan skip_all => "Perl 5.10 only tests" if $] < 5.010; }
-+
-+# These are tests that depend upon 5.10 (eg, smart-match).
-+# Basic tests should go in basic_exceptions.t
-+
-+use 5.010;
-+use constant NO_SUCH_FILE => 'this_file_had_better_not_exist_xyzzy';
-+
-+plan 'no_plan';
-+
-+eval {
-+	use autodie ':io';
-+	open(my $fh, '<', NO_SUCH_FILE);
-+};
-+
-+ok($@,			"Exception thrown"		        );
-+ok($@ ~~ 'open',	"Exception from open"		        );
-+ok($@ ~~ ':file',	"Exception from open / class :file"	);
-+ok($@ ~~ ':io',		"Exception from open / class :io"	);
-+ok($@ ~~ ':all',	"Exception from open / class :all"	);
-+
-+eval {
-+    no warnings 'once';    # To prevent the following close from complaining.
-+	close(THIS_FILEHANDLE_AINT_OPEN);
-+};
-+
-+ok(! $@, "Close without autodie should fail silent");
-+
-+eval {
-+	use autodie ':io';
-+	close(THIS_FILEHANDLE_AINT_OPEN);
-+};
-+
-+like($@, qr{Can't close filehandle 'THIS_FILEHANDLE_AINT_OPEN'},"Nice msg from close");
-+
-+ok($@,			"Exception thrown"		        );
-+ok($@ ~~ 'close',	"Exception from close"		        );
-+ok($@ ~~ ':file',	"Exception from close / class :file"	);
-+ok($@ ~~ ':io',		"Exception from close / class :io"	);
-+ok($@ ~~ ':all',	"Exception from close / class :all"	);
-+
-diff -urN perl-5.10.0.orig/t/lib/autodie/exec.t perl-5.10.0/t/lib/autodie/exec.t
---- perl-5.10.0.orig/t/lib/autodie/exec.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/exec.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,12 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use Test::More tests => 3;
-+
-+eval {
-+    use autodie qw(exec);
-+    exec("this_command_had_better_not_exist", 1);
-+};
-+
-+isa_ok($@,"autodie::exception", "failed execs should die");
-+ok($@->matches('exec'), "exception should match exec");
-+ok($@->matches(':system'), "exception should match :system");
-diff -urN perl-5.10.0.orig/t/lib/autodie/filehandles.t perl-5.10.0/t/lib/autodie/filehandles.t
---- perl-5.10.0.orig/t/lib/autodie/filehandles.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/filehandles.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,60 @@
-+#!/usr/bin/perl -w
-+
-+package main;
-+
-+use strict;
-+use Test::More;
-+
-+# We may see failures with package filehandles if Fatal/autodie
-+# incorrectly pulls out a cached subroutine from a different package.
-+
-+# We're using Fatal because package filehandles are likely to
-+# see more use with Fatal than autodie.
-+
-+use Fatal qw(open);
-+
-+eval {
-+    open(FILE, '<', $0);
-+};
-+
-+
-+if ($@) {
-+    # Holy smokes!  We couldn't even open our own file, bail out...
-+
-+    plan skip_all => q{Can't open $0 for filehandle tests}
-+}
-+
-+plan tests => 4;
-+
-+my $line = <FILE>;
-+
-+like($line, qr{perl}, 'Looks like we opened $0 correctly');
-+
-+close(FILE);
-+
-+package autodie::test;
-+use Test::More;
-+
-+use Fatal qw(open);
-+
-+eval {
-+    open(FILE2, '<', $0);
-+};
-+
-+is($@,"",'Opened $0 in autodie::test');
-+
-+my $line2 = <FILE2>;
-+
-+like($line2, qr{perl}, '...and we can read from $0 fine');
-+
-+close(FILE2);
-+
-+package main;
-+
-+# This shouldn't read anything, because FILE2 should be inside
-+# autodie::test
-+
-+no warnings;    # Otherwise we see problems with FILE2
-+my $wrong_line = <FILE2>;
-+
-+ok(! defined($wrong_line),q{Filehandles shouldn't leak between packages});
-diff -urN perl-5.10.0.orig/t/lib/autodie/fileno.t perl-5.10.0/t/lib/autodie/fileno.t
---- perl-5.10.0.orig/t/lib/autodie/fileno.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/fileno.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,35 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use Test::More tests => 8;
-+
-+# Basic sanity tests.
-+is(fileno(STDIN), 0, "STDIN fileno looks sane");
-+is(fileno(STDOUT),1, "STDOUT looks sane");
-+
-+my $dummy = "foo";
-+
-+ok(!defined(fileno($dummy)), "Non-filehandles shouldn't be defined.");
-+
-+
-+my $fileno = eval {
-+    use autodie qw(fileno);
-+    fileno(STDIN);
-+};
-+
-+is($@,"","fileno(STDIN) shouldn't die");
-+is($fileno,0,"autodying fileno(STDIN) should be 0");
-+
-+$fileno = eval {
-+    use autodie qw(fileno);
-+    fileno(STDOUT);
-+};
-+
-+is($@,"","fileno(STDOUT) shouldn't die");
-+is($fileno,1,"autodying fileno(STDOUT) should be 1");
-+
-+$fileno = eval {
-+    use autodie qw(fileno);
-+    fileno($dummy);
-+};
-+
-+isa_ok($@,"autodie::exception", 'autodying fileno($dummy) should die');
-diff -urN perl-5.10.0.orig/t/lib/autodie/flock.t perl-5.10.0/t/lib/autodie/flock.t
---- perl-5.10.0.orig/t/lib/autodie/flock.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/flock.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,90 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use Test::More;
-+use Fcntl qw(:flock);
-+use POSIX qw(EWOULDBLOCK);
-+
-+require Fatal;
-+
-+my $EWOULDBLOCK = eval { EWOULDBLOCK() }
-+                  || $Fatal::_EWOULDBLOCK{$^O}
-+                  || plan skip_all => "EWOULDBLOCK not defined on this system";
-+
-+my ($self_fh, $self_fh2);
-+
-+eval {
-+    use autodie;
-+    open($self_fh,  '<', $0);
-+    open($self_fh2, '<', $0);
-+    open(SELF,      '<', $0);
-+};
-+
-+if ($@) {
-+    plan skip_all => "Cannot lock this test on this system.";
-+}
-+
-+my $flock_return = flock($self_fh, LOCK_EX | LOCK_NB);
-+
-+if (not $flock_return) {
-+    plan skip_all => "flock on my own test not supported on this system.";
-+}
-+
-+my $flock_return2 = flock($self_fh2, LOCK_EX | LOCK_NB);
-+
-+if ($flock_return2) {
-+    plan skip_all => "this test requires locking a file twice with ".
-+                     "different filehandles to fail";
-+}
-+
-+$flock_return = flock($self_fh, LOCK_UN);
-+
-+if (not $flock_return) {
-+    plan skip_all => "Odd, I can't unlock a file with flock on this system.";
-+}
-+
-+# If we're here, then we can lock and unlock our own file.
-+
-+plan 'no_plan';
-+
-+ok( flock($self_fh, LOCK_EX | LOCK_NB), "Test file locked");
-+
-+my $return;
-+
-+eval {
-+    use autodie qw(flock);
-+    $return = flock($self_fh2, LOCK_EX | LOCK_NB);
-+};
-+
-+is($!+0, $EWOULDBLOCK, "Double-flocking should be EWOULDBLOCK");
-+ok(!$return, "flocking a file twice should fail");
-+is($@, "", "Non-blocking flock should not fail on EWOULDBLOCK");
-+
-+__END__
-+
-+# These are old tests which I'd love to resurrect, but they need
-+# a reliable way of getting flock to throw exceptions but with
-+# minimal blocking.  They may turn into author tests.
-+
-+eval {
-+    use autodie;
-+    flock($self_fh2, LOCK_EX | LOCK_NB);
-+};
-+
-+ok($@, "Locking a file twice throws an exception with vanilla autodie");
-+isa_ok($@, "autodie::exception", "Exception is from autodie::exception");
-+
-+like($@,   qr/LOCK_EX/, "error message contains LOCK_EX switch");
-+like($@,   qr/LOCK_NB/, "error message contains LOCK_NB switch");
-+unlike($@, qr/GLOB/   , "error doesn't include ugly GLOB mention");
-+
-+eval {
-+    use autodie;
-+    flock(SELF, LOCK_EX | LOCK_NB);
-+};
-+
-+ok($@, "Locking a package filehanlde twice throws exception with vanilla autodie");
-+isa_ok($@, "autodie::exception", "Exception is from autodie::exception");
-+
-+like($@,   qr/LOCK_EX/, "error message contains LOCK_EX switch");
-+like($@,   qr/LOCK_NB/, "error message contains LOCK_NB switch");
-+like($@,   qr/SELF/   , "error mentions actual filehandle name.");
-diff -urN perl-5.10.0.orig/t/lib/autodie/internal.t perl-5.10.0/t/lib/autodie/internal.t
---- perl-5.10.0.orig/t/lib/autodie/internal.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/internal.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,33 @@
-+#!/usr/bin/perl -w
-+use strict;
-+
-+use constant NO_SUCH_FILE => "this_file_or_dir_had_better_not_exist_XYZZY";
-+
-+use Test::More tests => 6;
-+
-+# Lexical tests using the internal interface.
-+
-+eval { Fatal->import(qw(:lexical :void)) };
-+like($@, qr{:void cannot be used with lexical}, ":void can't be used with :lexical");
-+
-+eval { Fatal->import(qw(open close :lexical)) };
-+like($@, qr{:lexical must be used as first}, ":lexical must come first");
-+
-+{
-+	use Fatal qw(:lexical chdir);
-+
-+	eval { chdir(NO_SUCH_FILE); };
-+	like ($@, qr/^Can't chdir/, "Lexical fatal chdir");
-+
-+	no Fatal qw(:lexical chdir);
-+
-+	eval { chdir(NO_SUCH_FILE); };
-+	is ($@, "", "No lexical fatal chdir");
-+
-+}
-+
-+eval { chdir(NO_SUCH_FILE); };
-+is($@, "", "Lexical chdir becomes non-fatal out of scope.");
-+
-+eval { Fatal->import('2+2'); };
-+like($@,qr{Bad subroutine name},"Can't use fatal with invalid sub names");
-diff -urN perl-5.10.0.orig/t/lib/autodie/lethal.t perl-5.10.0/t/lib/autodie/lethal.t
---- perl-5.10.0.orig/t/lib/autodie/lethal.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/lethal.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,17 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use FindBin;
-+use Test::More tests => 4;
-+use lib "$FindBin::Bin/lib";
-+use lethal qw(open);
-+
-+use constant NO_SUCH_FILE => "this_file_had_better_not_exist";
-+
-+eval {
-+    open(my $fh, '<', NO_SUCH_FILE);
-+};
-+
-+ok($@, "lethal throws an exception");
-+isa_ok($@, 'autodie::exception','...which is the correct class');
-+ok($@->matches('open'),         "...which matches open");
-+is($@->file,__FILE__,           "...which reports the correct file");
-diff -urN perl-5.10.0.orig/t/lib/autodie/lib/Caller_helper.pm perl-5.10.0/t/lib/autodie/lib/Caller_helper.pm
---- perl-5.10.0.orig/t/lib/autodie/lib/Caller_helper.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/lib/Caller_helper.pm	2009-03-24 12:42:25.000000000 +0100
-@@ -0,0 +1,13 @@
-+package Caller_helper;
-+
-+our $line;
-+
-+sub foo {
-+    use autodie;
-+
-+    $line = __LINE__; open(my $fh, '<', "no_such_file_here");
-+
-+    return;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/t/lib/autodie/lib/autodie/test/au/exception.pm perl-5.10.0/t/lib/autodie/lib/autodie/test/au/exception.pm
---- perl-5.10.0.orig/t/lib/autodie/lib/autodie/test/au/exception.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/lib/autodie/test/au/exception.pm	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,19 @@
-+package autodie::test::au::exception;
-+use strict;
-+use warnings;
-+
-+use base qw(autodie::exception);
-+
-+sub time_for_a_beer {
-+    return "Now's a good time for a beer.";
-+}
-+
-+sub stringify {
-+    my ($this) = @_;
-+
-+    my $base_str = $this->SUPER::stringify;
-+
-+    return "$base_str\n" . $this->time_for_a_beer;
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/t/lib/autodie/lib/autodie/test/au.pm perl-5.10.0/t/lib/autodie/lib/autodie/test/au.pm
---- perl-5.10.0.orig/t/lib/autodie/lib/autodie/test/au.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/lib/autodie/test/au.pm	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,14 @@
-+package autodie::test::au;
-+use strict;
-+use warnings;
-+
-+use base qw(autodie);
-+
-+use autodie::test::au::exception;
-+
-+sub throw {
-+    my ($this, @args) = @_;
-+    return autodie::test::au::exception->new(@args);
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/t/lib/autodie/lib/autodie/test/badname.pm perl-5.10.0/t/lib/autodie/lib/autodie/test/badname.pm
---- perl-5.10.0.orig/t/lib/autodie/lib/autodie/test/badname.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/lib/autodie/test/badname.pm	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,8 @@
-+package autodie::test::badname;
-+use base qw(autodie);
-+
-+sub exception_class {
-+    return 'autodie::test::badname::$@#%';  # Doesn't exist!
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/t/lib/autodie/lib/autodie/test/missing.pm perl-5.10.0/t/lib/autodie/lib/autodie/test/missing.pm
---- perl-5.10.0.orig/t/lib/autodie/lib/autodie/test/missing.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/lib/autodie/test/missing.pm	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,8 @@
-+package autodie::test::missing;
-+use base qw(autodie);
-+
-+sub exception_class {
-+    return "autodie::test::missing::exception";  # Doesn't exist!
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/t/lib/autodie/lib/lethal.pm perl-5.10.0/t/lib/autodie/lib/lethal.pm
---- perl-5.10.0.orig/t/lib/autodie/lib/lethal.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/lib/lethal.pm	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,8 @@
-+package lethal;
-+
-+# A dummy package showing how we can trivially subclass autodie
-+# to our tastes.
-+
-+use base qw(autodie);
-+
-+1;
-diff -urN perl-5.10.0.orig/t/lib/autodie/lib/pujHa/ghach/Dotlh.pm perl-5.10.0/t/lib/autodie/lib/pujHa/ghach/Dotlh.pm
---- perl-5.10.0.orig/t/lib/autodie/lib/pujHa/ghach/Dotlh.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/lib/pujHa/ghach/Dotlh.pm	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,59 @@
-+package pujHa'ghach::Dotlh;
-+
-+# Translator notes: Dotlh = status
-+
-+# Ideally this should be le'wI' - Thing that is exceptional. ;)
-+# Unfortunately that results in a file called .pm, which may cause
-+# problems on some filesystems.
-+
-+use strict;
-+use warnings;
-+
-+use base qw(autodie::exception);
-+
-+sub stringify {
-+    my ($this) = @_;
-+
-+    my $error = $this->SUPER::stringify;
-+
-+    return "QaghHommeyHeylIjmo':\n" .   # Due to your apparent minor errors
-+           "$error\n" .
-+           "lujqu'";                    # Epic fail
-+
-+
-+}
-+
-+1;
-+
-+__END__
-+
-+# The following was a really neat idea, but currently autodie
-+# always pushes values in $! to format them, which loses the
-+# Klingon translation.
-+
-+use Errno qw(:POSIX);
-+use Scalar::Util qw(dualvar);
-+
-+my %translation_for = (
-+    EPERM()  => q{Dachaw'be'},        # You do not have permission
-+    ENOENT() => q{De' vItu'laHbe'},   # I cannot find this information.
-+);
-+
-+sub errno {
-+    my ($this) = @_;
-+
-+    my $errno = int $this->SUPER::errno;
-+
-+    warn "In tlhIngan errno - $errno\n";
-+
-+    if ( my $tlhIngan = $translation_for{ $errno } ) {
-+        return dualvar( $errno, $tlhIngan );
-+    }
-+
-+    return $!;
-+
-+}
-+
-+1;
-+
-+
-diff -urN perl-5.10.0.orig/t/lib/autodie/lib/pujHa/ghach.pm perl-5.10.0/t/lib/autodie/lib/pujHa/ghach.pm
---- perl-5.10.0.orig/t/lib/autodie/lib/pujHa/ghach.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/lib/pujHa/ghach.pm	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,26 @@
-+package pujHa'ghach;
-+
-+# Translator notes: reH Hegh is Kligon for "always dying".
-+# It was the original name for this testing pragma, but
-+# it lacked an apostrophe, which better shows how Perl is
-+# useful in Klingon naming schemes.
-+
-+# The new name is pujHa'ghach is "thing which is not weak".
-+#   puj   -> be weak (verb)
-+#   -Ha'  -> not
-+#   ghach -> normalise -Ha' verb into noun.
-+#
-+# I'm not use if -wI' should be used here.  pujwI' is "thing which
-+# is weak".  One could conceivably use "pujHa'wI'" for "thing which
-+# is not weak".
-+
-+use strict;
-+use warnings;
-+
-+use base qw(autodie);
-+
-+sub exception_class {
-+    return "pujHa'ghach::Dotlh";      # Dotlh - status
-+}
-+
-+1;
-diff -urN perl-5.10.0.orig/t/lib/autodie/mkdir.t perl-5.10.0/t/lib/autodie/mkdir.t
---- perl-5.10.0.orig/t/lib/autodie/mkdir.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/mkdir.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,69 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use Test::More;
-+use FindBin qw($Bin);
-+use constant TMPDIR => "$Bin/mkdir_test_delete_me";
-+
-+# Delete our directory if it's there
-+rmdir TMPDIR;
-+
-+# See if we can create directories and remove them
-+mkdir TMPDIR or plan skip_all => "Failed to make test directory";
-+
-+# Test the directory was created
-+-d TMPDIR or plan skip_all => "Failed to make test directory";
-+
-+# Try making it a second time (this should fail)
-+if(mkdir TMPDIR) { plan skip_all => "Attempt to remake a directory succeeded";}
-+
-+# See if we can remove the directory
-+rmdir TMPDIR or plan skip_all => "Failed to remove directory";
-+
-+# Check that the directory was removed
-+if(-d TMPDIR) { plan skip_all => "Failed to delete test directory"; }
-+
-+# Try to delete second time
-+if(rmdir TMPDIR) { plan skip_all => "Able to rmdir directory twice"; }
-+
-+plan tests => 12;
-+
-+# Create a directory (this should succeed)
-+eval {
-+	use autodie;
-+
-+	mkdir TMPDIR;
-+};
-+is($@, "", "mkdir returned success");
-+ok(-d TMPDIR, "Successfully created test directory");
-+
-+# Try to create it again (this should fail)
-+eval {
-+	use autodie;
-+
-+	mkdir TMPDIR;
-+};
-+ok($@, "Re-creating directory causes failure.");
-+isa_ok($@, "autodie::exception", "... errors are of the correct type");
-+ok($@->matches("mkdir"), "... it's also a mkdir object");
-+ok($@->matches(":filesys"), "... and a filesys object");
-+
-+# Try to delete directory (this should succeed)
-+eval {
-+	use autodie;
-+
-+	rmdir TMPDIR;
-+};
-+is($@, "", "rmdir returned success");
-+ok(! -d TMPDIR, "Successfully removed test directory");
-+
-+# Try to delete directory again (this should fail)
-+eval {
-+	use autodie;
-+
-+	rmdir TMPDIR;
-+};
-+ok($@, "Re-deleting directory causes failure.");
-+isa_ok($@, "autodie::exception", "... errors are of the correct type");
-+ok($@->matches("rmdir"), "... it's also a rmdir object");
-+ok($@->matches(":filesys"), "... and a filesys object");
-+
-diff -urN perl-5.10.0.orig/t/lib/autodie/open.t perl-5.10.0/t/lib/autodie/open.t
---- perl-5.10.0.orig/t/lib/autodie/open.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/open.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,18 @@
-+#!/usr/bin/perl -w
-+use strict;
-+
-+use Test::More 'no_plan';
-+
-+use constant NO_SUCH_FILE => "this_file_had_better_not_exist";
-+
-+use autodie;
-+
-+eval { open(my $fh, '<', NO_SUCH_FILE); };
-+ok($@, "3-arg opening non-existent file fails");
-+like($@, qr/for reading/, "Well-formatted 3-arg open failure");
-+
-+eval { open(my $fh, "< ".NO_SUCH_FILE) };
-+ok($@, "2-arg opening non-existent file fails");
-+
-+like($@, qr/for reading/, "Well-formatted 2-arg open failure");
-+unlike($@, qr/GLOB\(0x/, "No ugly globs in 2-arg open messsage");
-diff -urN perl-5.10.0.orig/t/lib/autodie/recv.t perl-5.10.0/t/lib/autodie/recv.t
---- perl-5.10.0.orig/t/lib/autodie/recv.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/recv.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,60 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use Test::More tests => 8;
-+use Socket;
-+use autodie qw(socketpair);
-+
-+# All of this code is based around recv returning an empty
-+# string when it gets data from a local machine (using AF_UNIX),
-+# but returning an undefined value on error.  Fatal/autodie
-+# should be able to tell the difference.
-+
-+$SIG{PIPE} = 'IGNORE';
-+
-+my ($sock1, $sock2);
-+socketpair($sock1, $sock2, AF_UNIX, SOCK_STREAM, PF_UNSPEC);
-+
-+my $buffer;
-+send($sock1, "xyz", 0);
-+my $ret = recv($sock2, $buffer, 2, 0);
-+
-+use autodie qw(recv);
-+
-+SKIP: {
-+
-+    skip('recv() never returns empty string with socketpair emulation',4)
-+        if ($ret);
-+
-+    is($buffer,'xy',"recv() operational without autodie");
-+
-+    # Read the last byte from the socket.
-+    eval { $ret = recv($sock2, $buffer, 1, 0); };
-+
-+    is($@, "", "recv should not die on returning an emtpy string.");
-+
-+    is($buffer,"z","recv() operational with autodie");
-+    is($ret,"","recv returns undying empty string for local sockets");
-+
-+}
-+
-+eval {
-+    # STDIN isn't a socket, so this should fail.
-+    recv(STDIN,$buffer,1,0);
-+};
-+
-+ok($@,'recv dies on returning undef');
-+isa_ok($@,'autodie::exception');
-+
-+$buffer = "# Not an empty string\n";
-+
-+# Terminate writing for $sock1
-+shutdown($sock1, 1);
-+
-+eval {
-+    use autodie qw(send);
-+    # Writing to a socket terminated for writing should fail.
-+    send($sock1,$buffer,0);
-+};
-+
-+ok($@,'send dies on returning undef');
-+isa_ok($@,'autodie::exception');
-diff -urN perl-5.10.0.orig/t/lib/autodie/repeat.t perl-5.10.0/t/lib/autodie/repeat.t
---- perl-5.10.0.orig/t/lib/autodie/repeat.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/repeat.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,19 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use Test::More 'no_plan';
-+use constant NO_SUCH_FILE => "this_file_had_better_not_exist";
-+
-+eval {
-+    use autodie qw(open open open);
-+    open(my $fh, '<', NO_SUCH_FILE);
-+};
-+
-+isa_ok($@,q{autodie::exception});
-+ok($@->matches('open'),"Exception from open");
-+
-+eval {
-+    open(my $fh, '<', NO_SUCH_FILE);
-+};
-+
-+is($@,"","Repeated autodie should not leak");
-+
-diff -urN perl-5.10.0.orig/t/lib/autodie/scope_leak.t perl-5.10.0/t/lib/autodie/scope_leak.t
---- perl-5.10.0.orig/t/lib/autodie/scope_leak.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/scope_leak.t	2009-03-24 12:42:25.000000000 +0100
-@@ -0,0 +1,78 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use FindBin;
-+
-+# Check for %^H leaking across file boundries.  Many thanks
-+# to chocolateboy for pointing out this can be a problem.
-+
-+use lib $FindBin::Bin;
-+
-+use Test::More 'no_plan';
-+
-+use constant NO_SUCH_FILE => 'this_file_had_better_not_exist';
-+use autodie qw(open);
-+
-+eval {
-+    open(my $fh, '<', NO_SUCH_FILE);
-+};
-+
-+ok($@, "basic autodie test");
-+
-+use autodie_test_module;
-+
-+# If things don't work as they should, then the file we've
-+# just loaded will still have an autodying main::open (although
-+# its own open should be unaffected).
-+
-+eval {
-+    leak_test(NO_SUCH_FILE);
-+};
-+
-+is($@,"","autodying main::open should not leak to other files");
-+
-+eval {
-+    autodie_test_module::your_open(NO_SUCH_FILE);
-+};
-+
-+is($@,"","Other package open should be unaffected");
-+
-+# Due to odd filenames reported when doing string evals,
-+# older versions of autodie would not propogate into string evals.
-+
-+eval q{
-+    open(my $fh, '<', NO_SUCH_FILE);
-+};
-+
-+TODO: {
-+    local $TODO = "No known way of propagating into string eval in 5.8"
-+        if $] < 5.010;
-+
-+    ok($@, "Failing-open string eval should throw an exception");
-+    isa_ok($@, 'autodie::exception');
-+}
-+
-+eval q{
-+    no autodie;
-+
-+    open(my $fh, '<', NO_SUCH_FILE);
-+};
-+
-+is("$@","","disabling autodie in string context should work");
-+
-+eval {
-+    open(my $fh, '<', NO_SUCH_FILE);
-+};
-+
-+ok($@,"...but shouldn't disable it for the calling code.");
-+isa_ok($@, 'autodie::exception');
-+
-+eval q{
-+    no autodie;
-+
-+    use autodie qw(open);
-+
-+    open(my $fh, '<', NO_SUCH_FILE);
-+};
-+
-+ok($@,"Wacky flipping of autodie in string eval should work too!");
-+isa_ok($@, 'autodie::exception');
-diff -urN perl-5.10.0.orig/t/lib/autodie/sysopen.t perl-5.10.0/t/lib/autodie/sysopen.t
---- perl-5.10.0.orig/t/lib/autodie/sysopen.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/sysopen.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,23 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use Test::More 'no_plan';
-+use Fcntl;
-+
-+use autodie qw(sysopen);
-+
-+use constant NO_SUCH_FILE => "this_file_had_better_not_be_here_at_all";
-+
-+my $fh;
-+eval {
-+	sysopen($fh, $0, O_RDONLY);
-+};
-+
-+is($@, "", "sysopen can open files that exist");
-+
-+like(scalar( <$fh> ), qr/perl/, "Data in file read");
-+
-+eval {
-+	sysopen(my $fh2, NO_SUCH_FILE, O_RDONLY);
-+};
-+
-+isa_ok($@, 'autodie::exception', 'Opening a bad file fails with sysopen');
-diff -urN perl-5.10.0.orig/t/lib/autodie/truncate.t perl-5.10.0/t/lib/autodie/truncate.t
---- perl-5.10.0.orig/t/lib/autodie/truncate.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/truncate.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,53 @@
-+#!/usr/bin/perl -w
-+use strict;
-+
-+use Test::More;
-+use File::Temp qw(tempfile);
-+use IO::Handle;
-+
-+my $tmpfh = tempfile();
-+my $truncate_status;
-+
-+eval {
-+    $truncate_status = truncate($tmpfh, 0);
-+};
-+
-+if ($@ || !defined($truncate_status)) {
-+    plan skip_all => 'Truncate not implemented or not working on this system';
-+}
-+
-+plan tests => 3;
-+
-+SKIP: {
-+    my $can_truncate_stdout = truncate(\*STDOUT,0);
-+
-+    if ($can_truncate_stdout) {
-+        skip("This system thinks we can truncate STDOUT. Suuure!", 1);
-+    }
-+
-+    eval {
-+        use autodie;
-+        truncate(\*STDOUT,0);
-+    };
-+
-+    isa_ok($@, 'autodie::exception', "Truncating STDOUT should throw an exception");
-+
-+}
-+
-+eval {
-+    use autodie;
-+    no warnings 'once';
-+    truncate(\*FOO, 0);
-+};
-+
-+isa_ok($@, 'autodie::exception', "Truncating an unopened file is wrong.");
-+
-+$tmpfh->print("Hello World");
-+$tmpfh->flush;
-+
-+eval {
-+    use autodie;
-+    truncate($tmpfh, 0);
-+};
-+
-+is($@, "", "Truncating a normal file should be fine");
-diff -urN perl-5.10.0.orig/t/lib/autodie/unlink.t perl-5.10.0/t/lib/autodie/unlink.t
---- perl-5.10.0.orig/t/lib/autodie/unlink.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/unlink.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,52 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use Test::More;
-+use FindBin qw($Bin);
-+use constant TMPFILE => "$Bin/unlink_test_delete_me";
-+
-+# Create a file to practice unlinking
-+open(my $fh, ">", TMPFILE)
-+	or plan skip_all => "Unable to create test file: $!";
-+print {$fh} "Test\n";
-+close $fh;
-+
-+# Check that file now exists
-+-e TMPFILE or plan skip_all => "Failed to create test file";
-+
-+# Check we can unlink
-+unlink TMPFILE;
-+
-+# Check it's gone
-+if(-e TMPFILE) {plan skip_all => "Failed to delete test file: $!";}
-+
-+# Re-create file
-+open(my $fh2, ">", TMPFILE)
-+	or plan skip_all => "Unable to create test file: $!";
-+print {$fh2} "Test\n";
-+close $fh2;
-+
-+# Check that file now exists
-+-e TMPFILE or plan skip_all => "Failed to create test file";
-+
-+plan tests => 6;
-+
-+# Try to delete directory (this should succeed)
-+eval {
-+	use autodie;
-+
-+	unlink TMPFILE;
-+};
-+is($@, "", "Unlink appears to have been successful");
-+ok(! -e TMPFILE, "File does not exist");
-+
-+# Try to delete file again (this should fail)
-+eval {
-+	use autodie;
-+
-+	unlink TMPFILE;
-+};
-+ok($@, "Re-unlinking file causes failure.");
-+isa_ok($@, "autodie::exception", "... errors are of the correct type");
-+ok($@->matches("unlink"), "... it's also a unlink object");
-+ok($@->matches(":filesys"), "... and a filesys object");
-+
-diff -urN perl-5.10.0.orig/t/lib/autodie/user-context.t perl-5.10.0/t/lib/autodie/user-context.t
---- perl-5.10.0.orig/t/lib/autodie/user-context.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/user-context.t	2009-03-24 12:42:25.000000000 +0100
-@@ -0,0 +1,59 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use warnings;
-+use Test::More 'no_plan';
-+use File::Copy;
-+use constant NO_SUCH_FILE => 'this_file_had_better_not_exist';
-+use constant EXCEPTION => 'autodie::exception';
-+
-+# http://perlmonks.org/?node_id=744246 describes a situation where
-+# using autodie on user-defined functions can fail, depending upon
-+# their context.  These tests attempt to detect this bug.
-+
-+eval {
-+    use autodie qw(copy);
-+    copy(NO_SUCH_FILE, 'xyzzy');
-+};
-+
-+isa_ok($@,EXCEPTION,"Copying a non-existent file should throw an error");
-+
-+eval {
-+    use autodie qw(copy);
-+    my $x = copy(NO_SUCH_FILE, 'xyzzy');
-+};
-+
-+isa_ok($@,EXCEPTION,"This shouldn't change with scalar context");
-+
-+eval {
-+    use autodie qw(copy);
-+    my @x = copy(NO_SUCH_FILE, 'xyzzy');
-+};
-+
-+TODO: {
-+    local $TODO = "Fixed in 'hints' branch";
-+
-+    isa_ok($@,EXCEPTION,"This shouldn't change with array context");
-+}
-+
-+# For good measure, test with built-ins.
-+
-+eval {
-+    use autodie qw(open);
-+    open(my $fh, '<', 'xyzzy');
-+};
-+
-+isa_ok($@,EXCEPTION,"Opening a non-existent file should throw an error");
-+
-+eval {
-+    use autodie qw(open);
-+    my $x = open(my $fh, '<', 'xyzzy');
-+};
-+
-+isa_ok($@,EXCEPTION,"This shouldn't change with scalar context");
-+
-+eval {
-+    use autodie qw(open);
-+    my @x = open(my $fh, '<', 'xyzzy');
-+};
-+
-+isa_ok($@,EXCEPTION,"This shouldn't change with array context");
-diff -urN perl-5.10.0.orig/t/lib/autodie/usersub.t perl-5.10.0/t/lib/autodie/usersub.t
---- perl-5.10.0.orig/t/lib/autodie/usersub.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/usersub.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,64 @@
-+#!/usr/bin/perl -w
-+use strict;
-+
-+use Test::More 'no_plan';
-+
-+sub mytest {
-+    return $_[0];
-+}
-+
-+is(mytest(q{foo}),q{foo},"Mytest returns input");
-+
-+my $return = eval { mytest(undef); };
-+
-+ok(!defined($return), "mytest returns undef without autodie");
-+is($@,"","Mytest doesn't throw an exception without autodie");
-+
-+$return = eval {
-+    use autodie qw(mytest);
-+
-+    mytest('foo');
-+};
-+
-+is($return,'foo',"Mytest returns input with autodie");
-+
-+$return = eval {
-+    use autodie qw(mytest);
-+
-+    mytest(undef);
-+};
-+
-+isa_ok($@,'autodie::exception',"autodie mytest/undef throws exception");
-+
-+# We set initial values here because we're expecting $data to be
-+# changed to undef later on.   Having it as undef to begin with means
-+# we can't see mytest(undef) working correctly.
-+
-+my ($data, $data2) = (1,1);
-+
-+eval {
-+    use autodie qw(mytest);
-+
-+    {
-+        no autodie qw(mytest);
-+
-+        $data  = mytest(undef);
-+        $data2 = mytest('foo');
-+    }
-+};
-+
-+is($@,"","no autodie can counter use autodie for user subs");
-+ok(!defined($data), "mytest(undef) should return undef");
-+is($data2, "foo", "mytest(foo) should return foo");
-+
-+eval {
-+    mytest(undef);
-+};
-+
-+is($@,"","No lingering failure effects");
-+
-+$return = eval {
-+    mytest("bar");
-+};
-+
-+is($return,"bar","No lingering return effects");
-diff -urN perl-5.10.0.orig/t/lib/autodie/version.t perl-5.10.0/t/lib/autodie/version.t
---- perl-5.10.0.orig/t/lib/autodie/version.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/version.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,17 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use Test::More tests => 3;
-+
-+# For the moment, we'd like all our versions to be the same.
-+# In order to play nicely with some code scanners, they need to be
-+# hard-coded into the files, rather than just nicking the version
-+# from autodie::exception at run-time.
-+
-+require Fatal;
-+require autodie;
-+require autodie::exception;
-+require autodie::exception::system;
-+
-+is($Fatal::VERSION, $autodie::VERSION);
-+is($autodie::VERSION, $autodie::exception::VERSION);
-+is($autodie::exception::VERSION, $autodie::exception::system::VERSION);
-diff -urN perl-5.10.0.orig/t/lib/autodie/version_tag.t perl-5.10.0/t/lib/autodie/version_tag.t
---- perl-5.10.0.orig/t/lib/autodie/version_tag.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/autodie/version_tag.t	2009-03-24 11:53:29.000000000 +0100
-@@ -0,0 +1,26 @@
-+#!/usr/bin/perl -w
-+use strict;
-+use warnings;
-+use Test::More tests => 3;
-+
-+eval {
-+    use autodie qw(:1.994);
-+
-+    open(my $fh, '<', 'this_file_had_better_not_exist.txt');
-+};
-+
-+isa_ok($@, 'autodie::exception', "Basic version tags work");
-+
-+
-+# Expanding :1.00 should fail, there was no autodie :1.00
-+eval { my $foo = autodie->_expand_tag(":1.00"); };
-+
-+isnt($@,"","Expanding :1.00 should fail");
-+
-+my $version = $autodie::VERSION;
-+
-+# Expanding our current version should work!
-+eval { my $foo = autodie->_expand_tag(":$version"); };
-+
-+is($@,"","Expanding :$version should succeed");
-+
diff --git a/perl-update-constant.patch b/perl-update-constant.patch
deleted file mode 100644
index c258faf..0000000
--- a/perl-update-constant.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-constant-1.17
-
-diff -urN perl-5.10.0.orig/lib/constant.pm perl-5.10.0/lib/constant.pm
---- perl-5.10.0.orig/lib/constant.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/constant.pm	2008-10-29 22:38:47.000000000 +0100
-@@ -4,7 +4,7 @@
- use warnings::register;
- 
- use vars qw($VERSION %declared);
--$VERSION = '1.13';
-+$VERSION = '1.17';
- 
- #=======================================================================
- 
-@@ -168,7 +168,7 @@
- far less likely to send a space probe to the wrong planet because
- nobody noticed the one equation in which you wrote C<3.14195>.
- 
--When a constant is used in an expression, perl replaces it with its
-+When a constant is used in an expression, Perl replaces it with its
- value at compile time, and may then optimize the expression further.
- In particular, any code in an C<if (CONSTANT)> block will be optimized
- away if the constant is false.
-@@ -331,6 +331,20 @@
- (or simply use a comma in place of the big arrow) instead of
- C<< CONSTANT => 'value' >>.
- 
-+=head1 SEE ALSO
-+
-+L<Readonly> - Facility for creating read-only scalars, arrays, hashes.
-+
-+L<Const> - Facility for creating read-only variables. Similar to C<Readonly>,
-+but uses C<SvREADONLY> instead of C<tie>.
-+
-+L<Attribute::Constant> - Make read-only variables via attribute
-+
-+L<Scalar::Readonly> - Perl extension to the C<SvREADONLY> scalar flag
-+
-+L<Hash::Util> - A selection of general-utility hash subroutines (mostly
-+to lock/unlock keys and values)
-+
- =head1 BUGS
- 
- Please report any bugs or feature requests via the perlbug(1) utility.
-@@ -350,7 +364,7 @@
- The CPAN distribution is maintained by SE<eacute>bastien Aperghis-Tramoni
- E<lt>F<sebastien@aperghis.net>E<gt>.
- 
--=head1 COPYRIGHT
-+=head1 COPYRIGHT & LICENSE
- 
- Copyright (C) 1997, 1999 Tom Phoenix
- 
-diff -urN perl-5.10.0.orig/lib/constant.t perl-5.10.0/lib/constant.t
---- perl-5.10.0.orig/lib/constant.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/constant.t	2008-10-29 22:38:47.000000000 +0100
-@@ -12,11 +12,11 @@
- BEGIN {				# ...and save 'em for later
-     $SIG{'__WARN__'} = sub { push @warnings, @_ }
- }
--END { print STDERR @warnings }
-+END { @warnings && print STDERR join "\n- ", "accumulated warnings:", @warnings }
- 
- 
- use strict;
--use Test::More tests => 97;
-+use Test::More tests => 95;
- my $TB = Test::More->builder;
- 
- BEGIN { use_ok('constant'); }
-@@ -80,13 +80,6 @@
- is MESS, q('"'\\"'"\\);
- is length(MESS), 8;
- 
--use constant TRAILING	=> '12 cats';
--{
--    local $^W;
--    cmp_ok TRAILING, '==', 12;
--}
--is TRAILING, '12 cats';
--
- use constant LEADING	=> " \t1234";
- cmp_ok LEADING, '==', 1234;
- is LEADING, " \t1234";
-@@ -112,7 +105,7 @@
- # text may vary, so we can't test much better than this.
- cmp_ok length(E2BIG), '>', 6;
- 
--is @warnings, 0 or diag join "\n", "unexpected warning", @warnings;
-+is @warnings, 0 or diag join "\n- ", "unexpected warning:", @warnings;
- @warnings = ();		# just in case
- undef &PI;
- ok @warnings && ($warnings[0] =~ /Constant sub.* undefined/) or
-@@ -122,9 +115,9 @@
- is @warnings, 0, "unexpected warning";
- 
- my $curr_test = $TB->current_test;
--use constant CSCALAR	=> \"ok 37\n";
--use constant CHASH	=> { foo => "ok 38\n" };
--use constant CARRAY	=> [ undef, "ok 39\n" ];
-+use constant CSCALAR	=> \"ok 35\n";
-+use constant CHASH	=> { foo => "ok 36\n" };
-+use constant CARRAY	=> [ undef, "ok 37\n" ];
- use constant CCODE	=> sub { "ok $_[0]\n" };
- 
- my $output = $TB->output ;
-@@ -305,7 +298,7 @@
-     eval 'use constant zit => 4; 1' or die $@;
- 
-     # empty prototypes are reported differently in different versions
--    my $no_proto = $] < 5.008 ? "" : ": none";
-+    my $no_proto = $] < 5.008004 ? "" : ": none";
- 
-     is(scalar @warnings, 1, "1 warning");
-     like ($warnings[0], qr/^Prototype mismatch: sub main::zit$no_proto vs \(\)/,
diff --git a/perl.spec b/perl.spec
index 507e768..5d5dc35 100644
--- a/perl.spec
+++ b/perl.spec
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        112%{?dist}
+Release:        113%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -20,9 +20,9 @@ Group:          Development/Languages
 License:        (GPL+ or Artistic) and (GPLv2+ or Artistic) and Copyright Only and MIT and Public Domain and UCD
 Url:            http://www.perl.org/
 Source0:        http://www.cpan.org/src/5.0/perl-%{perl_version}.tar.bz2
-Source11:       filter-requires.sh
-Source12:       perl-5.8.0-libnet.cfg
-Source13:       macros.perl
+Source1:        filter-requires.sh
+Source2:        perl-5.8.0-libnet.cfg
+Source3:        macros.perl
 
 # Specific to Fedora/RHEL
 Patch1:         perl-suid-noroot.patch
@@ -101,64 +101,11 @@ Patch203:	perl-update-Module-Build.patch
 Patch204:       perl-update-Parse-CPAN-Meta.patch
 %define                     Parse_CPAN_Meta_version 1.40
 
-#---
-# FIXME; is 2.18->2.21, should be 2.20->2.21
+#--- MODULES ---
+# Storable_version FIXME; is 2.18->2.21, should be 2.20->2.21
 # - was 2.21 previously; but it is not a subpackage, can wait
-Patch99:	perl-update-Storable.patch
-%define             Storable_version 2.20
-
-# This patches are now unused:
-#could be 1.19
-Patch100:	perl-update-constant.patch
-%define			    constant_version 1.17
-# could be 0.36
-Patch101:	perl-update-Archive-Extract.patch
-# could be 1.54
-Patch102:	perl-update-Archive-Tar.patch
-# could be 3.43->3.48
-Patch103:	perl-update-CGI.patch
-# could be 0.22
-Patch105:	perl-update-File-Fetch.patch
-Patch107:	perl-update-File-Temp.patch
-# could be 0.54
-Patch108:	perl-update-IPC-Cmd.patch
-# could be 2.23
-Patch110:	perl-update-Module-CoreList.patch
-# could be 0.34
-Patch111:	perl-update-Module-Load-Conditional.patch
-# could be 3.10
-Patch112:	perl-update-Pod-Simple.patch
-Patch113:	perl-update-Sys-Syslog.patch
-%define			    Sys_Syslog_version 0.27
-Patch114:	perl-update-Test-Harness.patch
-# could be 0.94
-Patch115:	perl-update-Test-Simple.patch
-Patch116:	perl-update-Time-HiRes.patch
-%define			    Time_HiRes_version 1.9719
-Patch117:	perl-update-Digest-SHA.patch
-# includes Fatal.pm
-Patch118:	perl-update-autodie.patch
-%define			    autodie_version 1.999
-# cpan has it under PathTools-3.30
-# could be 3.31
-Patch119:	perl-update-FileSpec.patch
-%define			    File_Spec_version 3.30
-# FIXME should be 2.023, to preserve upgrade path
+# Compress_Raw_Zlib_version FIXME should be 2.023, to preserve upgrade path
 # -- for now, we just cheat with the version number
-Patch120:	perl-update-Compress-Raw-Zlib.patch
-%define			    Compress_Raw_Zlib_version 2.023
-# could be 1.22
-Patch121:	perl-update-Scalar-List-Utils.patch
-%define			    Scalar_List_Utils 1.21
-Patch122:	perl-update-Module-Pluggable.patch
-
-# could be 2.023
-Patch124:	perl-update-IO-Compress-Base.patch
-%define			    IO_Compress_Base_version 2.020
-# could be 2.023
-Patch125:	perl-update-IO-Compress-Zlib.patch
-%define			    IO_Compress_Zlib_version 2.020
-#... also update version number of Compress::Zlib
 
 # FIXME: Compress-Raw-Zlib also contains Compress-Raw-Bzip2
 # and IO-Compress-Zlib contains IO-Compress-Bzip2
@@ -168,7 +115,6 @@ Patch125:	perl-update-IO-Compress-Zlib.patch
 # and also ExtUtils-ParseXS 2.2002 -> 2.21
 
 
-
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel, zlib-devel
@@ -255,13 +201,13 @@ Requires(post): perl-libs
 # The original script might be /usr/lib/rpm/perl.req or
 # /usr/lib/rpm/redhat/perl.req, better use the original value of the macro:
 %{expand:%%define prev__perl_requires %{__perl_requires}}
-%define __perl_requires %{SOURCE11} %{prev__perl_requires}
+%define __perl_requires %{SOURCE1} %{prev__perl_requires}
 
 # When _use_internal_dependency_generator is 0, the perl.req script is
 # called from /usr/lib/rpm{,/redhat}/find-requires.sh
 # Likewise:
 %{expand:%%define prev__find_requires %{__find_requires}}
-%define __find_requires %{SOURCE11} %{prev__find_requires}
+%define __find_requires %{SOURCE1} %{prev__find_requires}
 
 
 %description
@@ -1101,13 +1047,13 @@ done
 #
 # libnet configuration file
 #
-install -p -m 644 %{SOURCE12} %{build_privlib}/Net/libnet.cfg
+install -p -m 644 %{SOURCE2} %{build_privlib}/Net/libnet.cfg
 
 #
 # perl RPM macros
 #
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
-install -p -m 644 %{SOURCE13} ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/
+install -p -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/
 
 #
 # Core modules removal
@@ -1825,6 +1771,10 @@ make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Thu Mar 11 2010 Marcela Mašláňová <mmaslano@redhat.com> - 4:5.10.1-113
+- rebuild with new gdbm
+- clean spec a little more
+
 * Fri Mar  5 2010 Marcela Mašláňová <mmaslano@redhat.com> - 4:5.10.1-112
 - fix license according to advice from legal
 - clean unused patches