diff --git a/.cvsignore b/.cvsignore
index 28c65b7..4f04ee6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
 perl-5.10.0.tar.gz
-Tar-Archive.tar.gz
-x.tgz
diff --git a/perl-5.10.0-ArchiveTar1.38.patch b/perl-5.10.0-ArchiveTar1.38.patch
deleted file mode 100644
index e630ad9..0000000
--- a/perl-5.10.0-ArchiveTar1.38.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -urN perl-5.10.0/lib/Archive/Tar.old/t/04_resolved_issues.t perl-5.10.0/lib/Archive/Tar/t/04_resolved_issues.t
---- perl-5.10.0/lib/Archive/Tar.old/t/04_resolved_issues.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/04_resolved_issues.t	2007-11-15 12:47:43.000000000 +0100
-@@ -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" );
-diff -urN perl-5.10.0/lib/Archive/Tar.old/t/99_pod.t perl-5.10.0/lib/Archive/Tar/t/99_pod.t
---- perl-5.10.0/lib/Archive/Tar.old/t/99_pod.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/99_pod.t	2007-03-06 15:30:04.000000000 +0100
-@@ -0,0 +1,22 @@
-+use Test::More;
-+use File::Spec;
-+use File::Find;
-+use strict;
-+
-+BEGIN { chdir 't' if -d 't' };
-+
-+eval 'use Test::Pod';
-+plan skip_all => "Test::Pod v0.95 required for testing POD"
-+    if $@ || $Test::Pod::VERSION < 0.95;
-+
-+my @files;
-+find( sub { push @files, File::Spec->catfile(
-+                    File::Spec->splitdir( $File::Find::dir ), $_
-+                ) if /\.p(?:l|m|od)$/ }, File::Spec->catdir(qw(.. blib lib) ));
-+
-+plan tests => scalar @files;
-+for my $file ( @files ) {
-+    pod_file_ok( $file );
-+}
-+
-+
diff --git a/perl-5.10.0-ArchiveTar1.40.patch b/perl-5.10.0-ArchiveTar1.40.patch
deleted file mode 100644
index 453e663..0000000
--- a/perl-5.10.0-ArchiveTar1.40.patch
+++ /dev/null
@@ -1,1756 +0,0 @@
-diff -up perl-5.10.0/lib/Archive/Tar/bin/ptar.old perl-5.10.0/lib/Archive/Tar/bin/ptar
---- perl-5.10.0/lib/Archive/Tar/bin/ptar.old	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/bin/ptar	2008-08-25 05:43:01.000000000 +0200
-@@ -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 @@ if( $opts->{c} ) {
-     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 @@ Archive::Tar to extract, create and list
- 
- =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 -up perl-5.10.0/lib/Archive/Tar/Constant.pm.old perl-5.10.0/lib/Archive/Tar/Constant.pm
---- perl-5.10.0/lib/Archive/Tar/Constant.pm.old	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/Constant.pm	2008-09-10 10:42:08.000000000 +0200
-@@ -2,20 +2,16 @@ package Archive::Tar::Constant;
- 
- 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 BUFFER         => 4096;
- 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,14 +60,23 @@ use constant TIME_OFFSET    => ($^O eq "
- 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_READLINK   => ($^O ne 'MSWin32' and $^O !~ /RISC(?:[ _])?OS/i and $^O ne 'VMS');
-diff -up perl-5.10.0/lib/Archive/Tar/File.pm.old perl-5.10.0/lib/Archive/Tar/File.pm
---- perl-5.10.0/lib/Archive/Tar/File.pm.old	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/File.pm	2008-10-13 13:51:50.000000000 +0200
-@@ -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 @@ Raw tar header -- not useful for most us
- 
- =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 @@ tar header), which are described above i
- 
- 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 @@ sub _new_from_file {
-     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 @@ sub _prefix_and_file {
-     ### 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 @@ sub _downgrade_to_plainfile {
-     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 @@ sub full_path {
- }
- 
- 
--=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.
-@@ -448,7 +495,7 @@ sub validate {
- 	return 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 +509,7 @@ sub has_content {
-     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 +520,7 @@ sub get_content {
-     $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 +536,7 @@ sub get_content_by_ref {
-     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 +555,7 @@ sub replace_content {
-     return 1;
- }
- 
--=head2 rename( $new_name )
-+=head2 $bool = $file->rename( $new_name )
- 
- Rename the current file to $new_name.
- 
-@@ -540,49 +587,49 @@ use the following methods:
- 
- =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 -up perl-5.10.0/lib/Archive/Tar.pm.old perl-5.10.0/lib/Archive/Tar.pm
---- perl-5.10.0/lib/Archive/Tar.pm.old	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar.pm	2008-10-13 15:16:06.000000000 +0200
-@@ -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                 = ( COMPRESS_GZIP, COMPRESS_BZIP );
- $DEBUG                  = 0;
- $WARN                   = 1;
- $FOLLOW_SYMLINK         = 0;
--$VERSION                = "1.38";
-+$VERSION                = "1.40";
- $CHOWN                  = 1;
- $CHMOD                  = 1;
- $DO_NOT_USE_PREFIX      = 0;
-@@ -28,24 +43,13 @@ BEGIN {
- 
-     ### 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 @@ Archive::Tar - module for manipulations 
-     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 @@ Archive::Tar - module for manipulations 
- 
-     $tar->rename('oldname', 'new/file/name');
- 
--    $tar->write('files.tar');
-+    $tar->write('files.tar');                   # plain tar
-+    $tar->write('files.tgz', COMPRESSED_GZIP);  # gzip compressed
-+    $tar->write('files.tbz', COMPRESSED_BZIP);  # bzip2 compressed
- 
- =head1 DESCRIPTION
- 
-@@ -122,23 +128,25 @@ sub new {
-     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 @@ all options are case-sensitive.
- 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 read {
- }
- 
- sub _get_handle {
--    my $self = shift;
--    my $file = shift;   return unless defined $file;
--                        return $file if ref $file;
--
--    my $gzip = shift || 0;
--    my $mode = shift || READ_ONLY->( ZLIB ); # default to read only
--
--    my $fh; my $bin;
-+    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
- 
--    ### only default to ZLIB if we're not trying to /write/ to a handle ###
--    if( ZLIB and $gzip || MODE_READ->( $mode ) ) {
- 
--        ### IO::Zlib will Do The Right Thing, even when passed
--        ### a plain file ###
--        $fh = new IO::Zlib;
-+    ### 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;
-+            };
-+        
-+            ### 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;
-+        }
- 
--    } else {
--        if( $gzip ) {
--            $self->_error(qq[Compression not available - Install IO::Zlib!]);
--            return;
-+        ### 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 )
-+            )
-+        ) {
-+        
-+            ### 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 ###
-@@ -372,6 +434,17 @@ sub _read_tar {
-             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
-@@ -544,7 +617,7 @@ sub _extract_file {
- 
-     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
-@@ -557,30 +630,65 @@ sub _extract_file {
-         }
-         
-         ### 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
--        ) {
--            $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;
--        }            
-+            not $INSECURE_EXTRACT_MODE 
-+        ) {            
-+
-+            ### 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, of which the first one has to
-         ### be escaped/changed.
-@@ -622,7 +730,8 @@ sub _extract_file {
-     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;
-         }
-         
-@@ -672,8 +781,13 @@ sub _extract_file {
-         $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 ) {
-         chown $entry->uid, $entry->gid, $full or
-@@ -707,8 +821,8 @@ sub _make_special_file {
-                 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 +1063,23 @@ sub clear {
- 
- 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', COMPRESSION_GZIP );
-+
-+  # write a bzip compressed file  
-+  $tar->write( 'out.tbz', COMPRESSION_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 +1090,7 @@ If no arguments are given, C<write> retu
- 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 {
-@@ -1350,56 +1471,29 @@ sub setcwd {
-     $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', COMPRESSION_GZIP, @filelist );
-+
-+  # write a bzip compressed file  
-+  Archive::Tar->create_archive( 'out.tbz', COMPRESSION_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 +1525,63 @@ sub create_archive {
-     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
-@@ -1462,7 +1612,7 @@ sub list_archive {
-     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 +1636,57 @@ sub extract_archive {
-     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 +1694,7 @@ C<read> method.
- 
- =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");
-@@ -1645,18 +1841,24 @@ Yes it is, see previous answer. Since C<
- 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 +1868,9 @@ try to make a copy of the original file,
- 
- 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.
-@@ -1852,12 +2055,12 @@ Please reports bugs to E<lt>bug-archive-
- 
- =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 
-diff -up perl-5.10.0/lib/Archive/Tar/t/01_use.t.old perl-5.10.0/lib/Archive/Tar/t/01_use.t
-diff -up perl-5.10.0/lib/Archive/Tar/t/02_methods.t.old perl-5.10.0/lib/Archive/Tar/t/02_methods.t
---- perl-5.10.0/lib/Archive/Tar/t/02_methods.t.old	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/02_methods.t	2008-10-13 15:00:07.000000000 +0200
-@@ -21,9 +21,14 @@ use File::Spec::Unix    ();
- use File::Basename      ();
- use Data::Dumper;
- 
--use Archive::Tar;
-+### need the constants at compile time;
- use Archive::Tar::Constant;
- 
-+my $Class   = 'Archive::Tar';
-+use_ok( $Class );
-+
-+
-+
- ### XXX TODO:
- ### * change to fullname
- ### * add tests for global variables
-@@ -72,22 +77,23 @@ if ($TOO_LONG) {
- }
- 
- 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];
-+### enable debugging? 
-+### 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,15 +102,16 @@ chmod 0644, $COMPRESS_FILE;
- 
- ### done setting up environment ###
- 
-+### check for zlib/bzip2 support
-+{   for my $meth ( qw[has_zlib_support has_bzip2_support] ) {
-+        can_ok( $Class, $meth );
-+    }
-+}    
- 
--### did we probe IO::Zlib support ok? ###
--{   is( Archive::Tar->can_handle_compressed_files, $ZLIB,
--                                    "Proper IO::Zlib support detected" );
--}
- 
- 
- ### tar error tests
--{   my $tar     = Archive::Tar->new;
-+{   my $tar     = $Class->new;
- 
-     ok( $tar,                       "Object created" );
-     isa_ok( $tar,                   'Archive::Tar');
-@@ -133,7 +140,7 @@ chmod 0644, $COMPRESS_FILE;
- 
-     ### check if ->error eq $error
-     is( $tar->error, $Archive::Tar::error,
--                                    '$error matches error() method' );
-+                                    "Error '$Archive::Tar::error' matches $Class->error method" );
-                      
-     ### check that 'contains_file' doesn't warn about missing files.                     
-     {   ### turn on warnings in general!
-@@ -149,89 +156,77 @@ chmod 0644, $COMPRESS_FILE;
- }
- 
- ### 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,                   'Archive::Tar');
- 
--            ### 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,  "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;
- 
--                    ### ->fullname!
--                    ok($expect_name,"   Found expected file '$name'" );
-+            my $name = $file->full_path;
-+            my($expect_name, $expect_content) =
-+                get_expect_name_and_contents( $name, \@EXPECT_NORMAL );
- 
--                    like($tar->get_content($name), $expect_content,
--                                    "   Content OK" );
--                }
--            }
-+            ### ->fullname!
-+            ok($expect_name,"   Found expected file '$name'" );
- 
-+            like($tar->get_content($name), $expect_content,
-+                            "   Content OK" );
-+        }
- 
--            ### 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" );
- 
--                for my $file ( @list ) {
--                    next if __PACKAGE__->is_dir( $file ); # directories
-+        ### 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" );
- 
--                    my($expect_name, $expect_content) =
--                        get_expect_name_and_contents( $file, \@EXPECT_NORMAL );
-+            for my $file ( @list ) {
-+                next if __PACKAGE__->is_dir( $file ); # directories
- 
--                    ok( $expect_name,
--                                    "   Found expected file '$file'" );
--                }
-+                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" );
-@@ -264,7 +259,7 @@ chmod 0644, $COMPRESS_FILE;
- 
-     ### 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;
- 
-@@ -285,7 +280,7 @@ chmod 0644, $COMPRESS_FILE;
- {
-     {   ### 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" );
-@@ -330,7 +325,7 @@ chmod 0644, $COMPRESS_FILE;
- }
- 
- ### rename/replace_content tests ###
--{   my $tar     = Archive::Tar->new;
-+{   my $tar     = $Class->new;
-     my $from    = 'c';
-     my $to      = 'e';
- 
-@@ -362,7 +357,7 @@ chmod 0644, $COMPRESS_FILE;
- 
- ### remove tests ###
- {   my $remove  = 'c';
--    my $tar     = Archive::Tar->new;
-+    my $tar     = $Class->new;
- 
-     ok( $tar->read( $TAR_FILE ),    "Read in '$TAR_FILE'" );
- 
-@@ -376,12 +371,14 @@ chmod 0644, $COMPRESS_FILE;
- }
- 
- ### write + read + extract tests ###
--SKIP: {
-+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],
-@@ -421,40 +418,31 @@ SKIP: {
- 
- 
-             {   ### create_archive()
--                ok( Archive::Tar->create_archive( $out, 0, $COMPRESS_FILE ),
-+                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 ),
-+                ok( $Class->extract_archive( $out ),
-                                     "Extracted file using 'extract_archive'");
-                 rm( $out ) unless $NO_UNLINK;
-             }
-         }
- 
-         ## write tgz tests
--        {   my $out = $OUT_TGZ_FILE;
--
--            SKIP: {
--
--                ### 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
-+        {   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;
-+        
-+            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
-@@ -471,12 +459,12 @@ SKIP: {
-                 }
- 
-                 {   ### 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 ),
-+                    ok( $Class->extract_archive( $out, $compression ),
-                                     "Extracted file using 'extract_archive'");
-                     rm( $out ) unless $NO_UNLINK;
-                 }
-@@ -487,7 +475,7 @@ SKIP: {
- 
- 
- ### 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];
- 
-@@ -528,7 +516,7 @@ SKIP: {
- 
- 
- ### clear tests ###
--{   my $tar     = Archive::Tar->new;
-+{   my $tar     = $Class->new;
-     my @files   = $tar->read( $TAR_FILE );
- 
-     my $cnt = $tar->list_files();
-@@ -540,7 +528,7 @@ SKIP: {
- }
- 
- ### $DO_NOT_USE_PREFIX tests
--{   my $tar     = Archive::Tar->new;
-+{   my $tar     = $Class->new;
- 
- 
-     ### first write a tar file without prefix
-@@ -556,7 +544,10 @@ SKIP: {
-         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" );
- 
-@@ -645,10 +636,10 @@ sub check_tar_file {
-     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" );
-@@ -762,18 +753,29 @@ sub slurp_binfile {
-     return <$fh>;
- }
- 
--sub slurp_gzfile {
-+sub slurp_compressed_file {
-     my $file = shift;
--    my $str;
--    my $buff;
-+    my $fh;
-+    
-+    ### bzip2
-+    if( $file =~ /.tbz$/ ) {
-+        require IO::Uncompress::Bunzip2;
-+        $fh = IO::Uncompress::Bunzip2->new( $file )    
-+            or warn( "Error opening '$file' with IO::Uncompress::Bunzip2" ), return
- 
--    require IO::Zlib;
--    my $fh = new IO::Zlib;
--    $fh->open( $file, READ_ONLY->(1) )
--        or warn( "Error opening '$file' with IO::Zlib" ), return undef;
-+    ### 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/lib/Archive/Tar/t.old/04_resolved_issues.t perl-5.10.0/lib/Archive/Tar/t/04_resolved_issues.t
---- perl-5.10.0/lib/Archive/Tar/t.old/04_resolved_issues.t	2008-12-11 12:43:35.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/04_resolved_issues.t	2008-10-13 13:51:50.000000000 +0200
-@@ -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'" );
-diff -urN perl-5.10.0/lib/Archive/Tar/t.old/05_iter.t perl-5.10.0/lib/Archive/Tar/t/05_iter.t
---- perl-5.10.0/lib/Archive/Tar/t.old/05_iter.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/05_iter.t	2008-08-25 05:53:18.000000000 +0200
-@@ -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/lib/Archive/Tar/t.old/90_symlink.t perl-5.10.0/lib/Archive/Tar/t/90_symlink.t
---- perl-5.10.0/lib/Archive/Tar/t.old/90_symlink.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/90_symlink.t	2008-08-25 05:43:01.000000000 +0200
-@@ -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/lib/Archive/Tar/t.old/99_pod.t perl-5.10.0/lib/Archive/Tar/t/99_pod.t
---- perl-5.10.0/lib/Archive/Tar/t.old/99_pod.t	2008-12-11 12:43:35.000000000 +0100
-+++ perl-5.10.0/lib/Archive/Tar/t/99_pod.t	2008-10-13 14:24:42.000000000 +0200
-@@ -8,6 +8,8 @@
- eval 'use Test::Pod';
- plan skip_all => "Test::Pod v0.95 required for testing POD"
-     if $@ || $Test::Pod::VERSION < 0.95;
-+    
-+plan skip_all => "Pod tests disabled under perl core" if $ENV{PERL_CORE};    
- 
- my @files;
- find( sub { push @files, File::Spec->catfile(
diff --git a/perl-5.10.0-CGI.patch b/perl-5.10.0-CGI.patch
deleted file mode 100644
index d119bea..0000000
--- a/perl-5.10.0-CGI.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up perl-5.10.0/lib/CGI.pm.tied perl-5.10.0/lib/CGI.pm
---- perl-5.10.0/lib/CGI.pm.tied	2008-07-30 08:37:48.000000000 +0200
-+++ perl-5.10.0/lib/CGI.pm	2008-07-30 08:41:38.000000000 +0200
-@@ -1176,7 +1176,7 @@ END_OF_FUNC
- 
- 'EXISTS' => <<'END_OF_FUNC',
- sub EXISTS {
--    exists $_[0]->{$_[1]};
-+    exists $_[0]->{param}{$_[1]};
- }
- END_OF_FUNC
- 
diff --git a/perl-5.10.0-CVE-2008-2827.patch b/perl-5.10.0-CVE-2008-2827.patch
deleted file mode 100644
index 7e2539f..0000000
--- a/perl-5.10.0-CVE-2008-2827.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up perl-5.10.0/lib/File/Path.pm.cve perl-5.10.0/lib/File/Path.pm
---- perl-5.10.0/lib/File/Path.pm.cve	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/File/Path.pm	2008-06-24 13:25:53.000000000 +0200
-@@ -351,10 +351,8 @@ sub _rmtree {
-             }
- 
-             my $nperm = $perm & 07777 | 0600;
--            if ($nperm != $perm and not chmod $nperm, $root) {
--                if ($Force_Writeable) {
--                    _error($arg, "cannot make file writeable", $canon);
--                }
-+            if ($Force_Writeable && $nperm != $perm and not chmod $nperm, $root) {
-+                _error($arg, "cannot make file writeable", $canon);
-             }
-             print "unlink $canon\n" if $arg->{verbose};
-             # delete all versions under VMS
diff --git a/perl-5.10.0-Change33640.patch b/perl-5.10.0-Change33640.patch
index f51f8ee..729b642 100644
--- a/perl-5.10.0-Change33640.patch
+++ b/perl-5.10.0-Change33640.patch
@@ -1,3 +1,6 @@
+http://www.nntp.perl.org/group/perl.perl5.changes/2008/04/msg21478.html
+- minus the change in Module::CoreList that we are upgrading
+
 --- perl/Porting/Maintainers.pm#2~33194~	2008-02-02 09:05:25.000000000 -0800
 +++ perl/Porting/Maintainers.pm	2008-04-03 09:03:24.000000000 -0700
 @@ -14,11 +14,12 @@
@@ -201,131 +204,6 @@
  require Cwd;
  
 
---- perl/lib/Module/CoreList.pm#3~33615~	2008-03-31 11:01:17.000000000 -0700
-+++ perl/lib/Module/CoreList.pm	2008-04-03 09:03:24.000000000 -0700
-@@ -1,7 +1,7 @@
- package Module::CoreList;
- use strict;
- use vars qw/$VERSION %released %patchlevel %version %families/;
--$VERSION = '2.14';
-+$VERSION = '2.15';
- 
- =head1 NAME
- 
-@@ -2007,7 +2007,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',
-@@ -4462,6 +4462,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
-@@ -5555,6 +5556,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',
-@@ -5595,6 +5597,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',
-@@ -5919,6 +5922,7 @@
- 	'warnings'              => '1.04',
- 	'warnings::register'    => '1.00',
-     },
-+
-     5.008007 => {
- 	'AnyDBM_File'           => '1.00',
- 	'Attribute::Handlers'   => '0.78_01',
-@@ -5959,6 +5963,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',
-@@ -6278,6 +6283,7 @@
- 	'warnings'              => '1.03',
- 	'warnings::register'    => '1.00',
-     },
-+
-     5.009003 => {
- 	'AnyDBM_File'           => '1.00',
- 	'Archive::Tar'          => '1.26_01',
-@@ -6348,6 +6354,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',
-@@ -6727,6 +6734,7 @@
- 	'warnings'              => '1.05',
- 	'warnings::register'    => '1.01',
-     },
-+
-     5.008008 => {
- 	'AnyDBM_File'           => '1.00',
- 	'Attribute::Handlers'   => '0.78_02',
-@@ -6767,6 +6775,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',
-@@ -7094,6 +7103,7 @@
- 	'warnings'              => '1.05',
- 	'warnings::register'    => '1.01',
-     },
-+
-     5.009004 => {
- 	'AnyDBM_File'           => '1.00',
- 	'Archive::Tar'          => '1.30_01',
-@@ -7143,6 +7153,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',
-@@ -7576,6 +7587,7 @@
- 	'warnings'              => '1.05',
- 	'warnings::register'    => '1.01',
-     },
-+
-     5.009005 => {
- 	'AnyDBM_File'           => '1.00',
- 	'Archive::Extract'      => '0.22_01',
-@@ -8110,6 +8122,7 @@
- 	'warnings'              => '1.06',
- 	'warnings::register'    => '1.01',
-     },
-+
-     5.010000 => {
- 	'AnyDBM_File'           => '1.00',
- 	'Archive::Extract'      => '0.24',
-
 --- perl/os2/OS2/REXX/REXX.pm#1~32694~	2007-12-22 01:23:09.000000000 -0800
 +++ perl/os2/OS2/REXX/REXX.pm	2008-04-03 09:03:24.000000000 -0700
 @@ -11,7 +11,7 @@
diff --git a/perl-5.10.0-File-Temp-0.20.patch b/perl-5.10.0-File-Temp-0.20.patch
deleted file mode 100644
index 4e5b248..0000000
--- a/perl-5.10.0-File-Temp-0.20.patch
+++ /dev/null
@@ -1,748 +0,0 @@
-diff -up perl-5.10.0/lib/File/Temp.pm.OLD perl-5.10.0/lib/File/Temp.pm
---- perl-5.10.0/lib/File/Temp.pm.OLD	2007-12-18 05:47:07.000000000 -0500
-+++ perl-5.10.0/lib/File/Temp.pm	2008-10-23 10:13:10.000000000 -0400
-@@ -52,7 +52,9 @@ The C<_can_do_level> method should be mo
- 
-   ($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 @@ Object interface:
-   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 @@ but should be used with caution since th
- 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
-@@ -149,7 +153,7 @@ require VMS::Stdio if $^O eq 'VMS';
- # 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;
-@@ -199,7 +203,7 @@ Exporter::export_tags('POSIX','mktemp','
- 
- # Version number
- 
--$VERSION = '0.18';
-+$VERSION = '0.20';
- 
- # This is a list of characters that can be used in random filenames
- 
-@@ -229,9 +233,10 @@ use constant HIGH     => 2;
- # 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 @@ unless ($^O eq 'MacOS') {
-       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 @@ my $OPENTEMPFLAGS = $OPENFLAGS;
- 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 @@ unless ($^O eq 'MacOS') {
-   }
- }
- 
-+# 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 @@ unless ($^O eq 'MacOS') {
- #                        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
-@@ -328,6 +344,7 @@ sub _gettemp {
- 		 "mkdir" => 0,
- 		 "suffixlen" => 0,
- 		 "unlink_on_close" => 0,
-+		 "use_exlock" => 1,
- 		 "ErrStr" => \$tempErrStr,
- 		);
- 
-@@ -437,6 +454,10 @@ sub _gettemp {
-   # 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 ();
-@@ -493,6 +514,7 @@ sub _gettemp {
- 	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 ) {
-@@ -587,22 +609,6 @@ sub _gettemp {
- 
- }
- 
--# 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 +629,12 @@ sub _replace_XX {
-   # 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;
- }
-@@ -678,7 +685,7 @@ sub _is_safe {
-   # 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'",
-+    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"
-@@ -733,6 +740,7 @@ sub _is_verysafe {
- 
-   # 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};
-@@ -974,7 +982,7 @@ available.
- 
- 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 +990,11 @@ that the temporary file is removed by th
- 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');
- 
-@@ -1024,6 +1032,9 @@ sub new {
-   # 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 +1047,48 @@ sub new {
-   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 +1107,15 @@ sub STRINGIFY {
-   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,7 +1144,15 @@ if UNLINK is not specified).
- 
- 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
- 
-@@ -1094,6 +1161,9 @@ sub DESTROY {
-   if (${*$self}{UNLINK} && !$KEEP_ALL) {
-     print "# --------->   Unlinking $self\n" if $DEBUG;
- 
-+    # only delete if this process created it
-+    return unless exists $FILES_CREATED_BY_OBJECT{$$}{$self->filename};
-+
-     # 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
-@@ -1145,6 +1215,12 @@ But see the WARNING at the end.
- 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 +1239,7 @@ automatically generated. This temporary 
- (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 +1262,16 @@ if warnings are turned on. Consider usin
- 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 +1285,13 @@ sub tempfile {
- 
-   # Default options
-   my %options = (
--		 "DIR"    => undef,  # Directory prefix
-+		"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);
-@@ -1234,10 +1322,15 @@ sub tempfile {
-   # 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 {
-@@ -1278,6 +1371,7 @@ sub tempfile {
-                                     "unlink_on_close" => $unlink_on_close,
- 				    "suffixlen" => length($options{'SUFFIX'}),
- 				    "ErrStr" => \$errstr,
-+				    "use_exlock" => $options{EXLOCK},
- 				   ) );
- 
-   # Set up an exit handler that can do whatever is right for the
-@@ -1312,7 +1406,15 @@ sub tempfile {
- 
- =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();
-@@ -2045,11 +2147,10 @@ Options are:
- 
- =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
- 
-@@ -2237,9 +2338,12 @@ themselves to give up if they exceed the
- =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 +2360,14 @@ L<POSIX/tmpnam>, L<POSIX/tmpfile>, L<Fil
- 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 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 +2380,46 @@ security enhancements.
- 
- =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;
-+  if ($self->unlink_on_destroy && 
-+      $$ == $self->{LAUNCHPID} && !$File::Temp::KEEP_ALL) {
-+    rmtree($self->{DIRNAME}, $File::Temp::DEBUG, 0)
-+      if -d $self->{DIRNAME};
-+  }
-+}
-+
-+
- 1;
-diff -up perl-5.10.0/lib/File/Temp/t/cmp.t.OLD perl-5.10.0/lib/File/Temp/t/cmp.t
-diff -up perl-5.10.0/lib/File/Temp/t/fork.t.OLD perl-5.10.0/lib/File/Temp/t/fork.t
---- perl-5.10.0/lib/File/Temp/t/fork.t.OLD	2008-10-23 10:14:08.000000000 -0400
-+++ perl-5.10.0/lib/File/Temp/t/fork.t	2008-10-23 10:14:04.000000000 -0400
-@@ -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 -up perl-5.10.0/lib/File/Temp/t/lock.t.OLD perl-5.10.0/lib/File/Temp/t/lock.t
---- perl-5.10.0/lib/File/Temp/t/lock.t.OLD	2008-10-23 10:14:27.000000000 -0400
-+++ perl-5.10.0/lib/File/Temp/t/lock.t	2008-10-23 10:14:24.000000000 -0400
-@@ -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 -up perl-5.10.0/lib/File/Temp/t/mktemp.t.OLD perl-5.10.0/lib/File/Temp/t/mktemp.t
-diff -up perl-5.10.0/lib/File/Temp/t/object.t.OLD perl-5.10.0/lib/File/Temp/t/object.t
---- perl-5.10.0/lib/File/Temp/t/object.t.OLD	2007-12-18 05:47:07.000000000 -0500
-+++ perl-5.10.0/lib/File/Temp/t/object.t	2007-11-19 15:49:20.000000000 -0500
-@@ -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 @@ ok( (-f "$fh"), "File $fh still exists a
- # 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 -up perl-5.10.0/lib/File/Temp/t/posix.t.OLD perl-5.10.0/lib/File/Temp/t/posix.t
-diff -up perl-5.10.0/lib/File/Temp/t/security.t.OLD perl-5.10.0/lib/File/Temp/t/security.t
-diff -up perl-5.10.0/lib/File/Temp/t/seekable.t.OLD perl-5.10.0/lib/File/Temp/t/seekable.t
---- perl-5.10.0/lib/File/Temp/t/seekable.t.OLD	2007-12-18 05:47:07.000000000 -0500
-+++ perl-5.10.0/lib/File/Temp/t/seekable.t	2007-11-14 19:19:19.000000000 -0500
-@@ -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') };
- 
- #########################
-@@ -21,7 +21,11 @@ isa_ok( $tmp, 'IO::Handle' );
- 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 +34,7 @@ ok( File::Temp->can('print'), 'tmp can p
- $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 -up perl-5.10.0/lib/File/Temp/t/tempfile.t.OLD perl-5.10.0/lib/File/Temp/t/tempfile.t
-diff -up perl-5.10.0/MANIFEST.OLD perl-5.10.0/MANIFEST
---- perl-5.10.0/MANIFEST.OLD	2008-10-23 10:35:38.000000000 -0400
-+++ perl-5.10.0/MANIFEST	2008-10-23 10:36:35.000000000 -0400
-@@ -1890,6 +1890,8 @@ lib/File/stat.pm		By-name interface to P
- 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 --git a/perl-5.10.0-Module-CoreList2.14.patch b/perl-5.10.0-Module-CoreList2.14.patch
deleted file mode 100644
index a466dd4..0000000
--- a/perl-5.10.0-Module-CoreList2.14.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -up perl-5.10.0/lib/Module/CoreList.pm.crr perl-5.10.0/lib/Module/CoreList.pm
---- perl-5.10.0/lib/Module/CoreList.pm.crr	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Module/CoreList.pm	2008-03-17 16:15:07.000000000 +0100
-@@ -1,7 +1,7 @@
- package Module::CoreList;
- use strict;
- use vars qw/$VERSION %released %patchlevel %version %families/;
--$VERSION = '2.13';
-+$VERSION = '2.14';
- 
- =head1 NAME
- 
-@@ -138,6 +138,11 @@ sub find_modules {
-     return sort keys %mods
- }
- 
-+sub find_version {
-+    my ($class, $v) = @_;
-+    return $version{$v} if defined $version{$v};
-+    return undef;
-+}
- 
- # when things escaped
- %released = (
-@@ -176,7 +181,7 @@ sub find_modules {
- %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],
-diff -up perl-5.10.0/lib/Module/CoreList/t/corelist.t.crr perl-5.10.0/lib/Module/CoreList/t/corelist.t
-diff -up perl-5.10.0/lib/Module/CoreList/t/pod.t.crr perl-5.10.0/lib/Module/CoreList/t/pod.t
---- perl-5.10.0/lib/Module/CoreList/t/pod.t.crr	2008-03-18 09:43:20.000000000 +0100
-+++ perl-5.10.0/lib/Module/CoreList/t/pod.t	2006-02-01 14:38:29.000000000 +0100
-@@ -0,0 +1,10 @@
-+#!perl
-+
-+use Test::More;
-+eval "use Test::Pod 1.00";
-+plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
-+
-+plan tests => 2;
-+
-+pod_file_ok( 'lib/Module/CoreList.pm', 'module pod ok' );
-+pod_file_ok( 'corelist', 'script pod ok' );
-diff -up perl-5.10.0/lib/Module/CoreList/t/find_modules.t.crr perl-5.10.0/lib/Module/CoreList/t/find_modules.t
-diff -up perl-5.10.0/lib/Module/CoreList/bin/corelist.crr perl-5.10.0/lib/Module/CoreList/bin/corelist
---- perl-5.10.0/lib/Module/CoreList/bin/corelist.crr	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Module/CoreList/bin/corelist	2008-03-17 16:14:59.000000000 +0100
-@@ -11,14 +11,14 @@ See L<Module::CoreList> for one.
- =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 @@ used a module regexp) in the perls Modul
-       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 @@ use warnings;
- 
- 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 @@ if(exists $Opts{v} ){
-     }
- 
-     $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 @@ sub module_version {
-     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 module_version {
- 
- 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 --git a/perl-5.10.0-Module-Load-Conditional-0.24.patch b/perl-5.10.0-Module-Load-Conditional-0.24.patch
deleted file mode 100644
index a684c10..0000000
--- a/perl-5.10.0-Module-Load-Conditional-0.24.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -up perl-5.10.0/lib/Module/Load/Conditional.pm.BAD perl-5.10.0/lib/Module/Load/Conditional.pm
---- perl-5.10.0/lib/Module/Load/Conditional.pm.BAD	2007-12-18 05:47:07.000000000 -0500
-+++ perl-5.10.0/lib/Module/Load/Conditional.pm	2008-03-08 15:26:18.000000000 -0500
-@@ -9,7 +9,7 @@ use Locale::Maketext::Simple Style  => '
- use Carp        ();
- use File::Spec  ();
- use FileHandle  ();
--use version     qw[qv];
-+use version;
- 
- use constant ON_VMS  => $^O eq 'VMS';
- 
-@@ -18,7 +18,7 @@ BEGIN {
-                         $FIND_VERSION $ERROR $CHECK_INC_HASH];
-     use Exporter;
-     @ISA            = qw[Exporter];
--    $VERSION        = '0.22';
-+    $VERSION        = '0.24';
-     $VERBOSE        = 0;
-     $FIND_VERSION   = 1;
-     $CHECK_INC_HASH = 0;
-@@ -280,8 +280,14 @@ sub check_install {
-         ### 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 +307,8 @@ sub _parse_version {
-     ### 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 +328,7 @@ sub _parse_version {
- 
-             local $1$2;
-             \$$2=undef; do {
--                $str
-+                $taint_safe_str
-             }; \$$2
-         };
-         
-@@ -426,9 +433,14 @@ sub can_load {
-             ### 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-5.10.0-SysSyslog-0.24.patch b/perl-5.10.0-SysSyslog-0.24.patch
deleted file mode 100644
index 607ccc7..0000000
--- a/perl-5.10.0-SysSyslog-0.24.patch
+++ /dev/null
@@ -1,5550 +0,0 @@
-diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/Changes perl-5.10.0/ext/Sys/Syslog/Changes
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/Changes	2007-12-18 05:47:07.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/Changes	2007-12-31 11:15:57.000000000 -0500
-@@ -1,5 +1,16 @@
- Revision history for Sys-Syslog
- 
-+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.
-diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/eg/syslog.pl perl-5.10.0/ext/Sys/Syslog/eg/syslog.pl
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/eg/syslog.pl	1969-12-31 19:00:00.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/eg/syslog.pl	2006-10-26 18:10:46.000000000 -0400
-@@ -0,0 +1,12 @@
-+#!/usr/bin/perl
-+use strict;
-+use Sys::Syslog;
-+
-+die "usage: $0 facility/priority message\n" unless @ARGV;
-+
-+my ($facility, $priority) = split '/', shift;
-+my $message = join ' ', @ARGV;
-+
-+openlog($0, "ndelay,pid", $facility) or die "fatal: can't open syslog: $!\n";
-+syslog($priority, "%s", $message);
-+closelog();
-diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/fallback/syslog.h perl-5.10.0/ext/Sys/Syslog/fallback/syslog.h
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/fallback/syslog.h	1969-12-31 19:00:00.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/fallback/syslog.h	2007-11-12 17:24:23.000000000 -0500
-@@ -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 -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/Makefile.PL perl-5.10.0/ext/Sys/Syslog/Makefile.PL
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/Makefile.PL	2007-12-18 05:47:07.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/Makefile.PL	2007-11-09 08:51:59.000000000 -0500
-@@ -70,6 +70,9 @@
-         DEFINE      => '-DUSE_PPPORT_H';
- }
- 
-+# on pre-5.6 Perls, add warnings::compat to the prereq modules
-+push @extra_prereqs, "warnings::compat"  if $] < 5.006;
-+
- WriteMakefile(
-     NAME            => 'Sys::Syslog',
-     LICENSE         => 'perl',
-diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/MANIFEST perl-5.10.0/ext/Sys/Syslog/MANIFEST
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/MANIFEST	1969-12-31 19:00:00.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/MANIFEST	2007-12-31 12:00:44.000000000 -0500
-@@ -0,0 +1,27 @@
-+Makefile.PL
-+META.yml
-+Changes
-+MANIFEST
-+README
-+README.win32
-+Syslog.pm
-+Syslog.xs
-+fallback/const-c.inc
-+fallback/const-xs.inc
-+fallback/syslog.h
-+ppport.h
-+eg/syslog.pl
-+t/00-load.t
-+t/constants.t
-+t/distchk.t
-+t/syslog.t
-+t/pod.t
-+t/podcover.t
-+t/podspell.t
-+t/portfs.t
-+win32/compile.pl
-+win32/PerlLog.mc
-+win32/PerlLog.RES
-+win32/PerlLog_RES.uu
-+win32/PerlLog_dll.uu
-+win32/Win32.pm
-diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/META.yml perl-5.10.0/ext/Sys/Syslog/META.yml
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/META.yml	1969-12-31 19:00:00.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/META.yml	2007-12-31 12:01:18.000000000 -0500
-@@ -0,0 +1,14 @@
-+--- #YAML:1.0
-+name:                Sys-Syslog
-+version:             0.24
-+abstract:            Perl interface to the UNIX syslog(3) calls
-+license:             perl
-+author:              ~
-+generated_by:        ExtUtils::MakeMaker version 6.42
-+distribution_type:   module
-+requires:     
-+    Test::More:                    0
-+    XSLoader:                      0
-+meta-spec:
-+    url:     http://module-build.sourceforge.net/META-spec-v1.3.html
-+    version: 1.3
-diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/ppport.h perl-5.10.0/ext/Sys/Syslog/ppport.h
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/ppport.h	1969-12-31 19:00:00.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/ppport.h	2006-10-26 18:10:46.000000000 -0400
-@@ -0,0 +1,5155 @@
-+#if 0
-+<<'SKIP';
-+#endif
-+/*
-+----------------------------------------------------------------------
-+
-+    ppport.h -- Perl/Pollution/Portability Version 3.08
-+
-+    Automatically created by Devel::PPPort running under
-+    perl 5.008005 on Thu Jun  8 00:58:19 2006.
-+
-+    Do NOT edit this file directly! -- Edit PPPort_pm.PL and the
-+    includes in parts/inc/ instead.
-+
-+    Use 'perldoc ppport.h' to view the documentation below.
-+
-+----------------------------------------------------------------------
-+
-+SKIP
-+
-+=pod
-+
-+=head1 NAME
-+
-+ppport.h - Perl/Pollution/Portability version 3.08
-+
-+=head1 SYNOPSIS
-+
-+  perl ppport.h [options] [source files]
-+
-+  Searches current directory for files if no [source files] are given
-+
-+  --help                      show short help
-+
-+  --patch=file                write one patch file with changes
-+  --copy=suffix               write changed copies with suffix
-+  --diff=program              use diff program and options
-+
-+  --compat-version=version    provide compatibility with Perl version
-+  --cplusplus                 accept C++ comments
-+
-+  --quiet                     don't output anything except fatal errors
-+  --nodiag                    don't show diagnostics
-+  --nohints                   don't show hints
-+  --nochanges                 don't suggest changes
-+  --nofilter                  don't filter input files
-+
-+  --strip                     strip all script and doc functionality from
-+                              ppport.h (this, obviously, cannot be undone)
-+
-+  --list-provided             list provided API
-+  --list-unsupported          list unsupported API
-+  --api-info=name             show Perl API portability information
-+
-+=head1 COMPATIBILITY
-+
-+This version of F<ppport.h> is designed to support operation with Perl
-+installations back to 5.003, and has been tested up to 5.9.3.
-+
-+=head1 OPTIONS
-+
-+=head2 --help
-+
-+Display a brief usage summary.
-+
-+=head2 --patch=I<file>
-+
-+If this option is given, a single patch file will be created if
-+any changes are suggested. This requires a working diff program
-+to be installed on your system.
-+
-+=head2 --copy=I<suffix>
-+
-+If this option is given, a copy of each file will be saved with
-+the given suffix that contains the suggested changes. This does
-+not require any external programs.
-+
-+If neither C<--patch> or C<--copy> are given, the default is to
-+simply print the diffs for each file. This requires either
-+C<Text::Diff> or a C<diff> program to be installed.
-+
-+=head2 --diff=I<program>
-+
-+Manually set the diff program and options to use. The default
-+is to use C<Text::Diff>, when installed, and output unified
-+context diffs.
-+
-+=head2 --compat-version=I<version>
-+
-+Tell F<ppport.h> to check for compatibility with the given
-+Perl version. The default is to check for compatibility with Perl
-+version 5.003. You can use this option to reduce the output
-+of F<ppport.h> if you intend to be backward compatible only
-+down to a certain Perl version.
-+
-+=head2 --cplusplus
-+
-+Usually, F<ppport.h> will detect C++ style comments and
-+replace them with C style comments for portability reasons.
-+Using this option instructs F<ppport.h> to leave C++
-+comments untouched.
-+
-+=head2 --quiet
-+
-+Be quiet. Don't print anything except fatal errors.
-+
-+=head2 --nodiag
-+
-+Don't output any diagnostic messages. Only portability
-+alerts will be printed.
-+
-+=head2 --nohints
-+
-+Don't output any hints. Hints often contain useful portability
-+notes.
-+
-+=head2 --nochanges
-+
-+Don't suggest any changes. Only give diagnostic output and hints
-+unless these are also deactivated.
-+
-+=head2 --nofilter
-+
-+Don't filter the list of input files. By default, files not looking
-+like source code (i.e. not *.xs, *.c, *.cc, *.cpp or *.h) are skipped.
-+
-+=head2 --strip
-+
-+Strip all script and documentation functionality from F<ppport.h>.
-+This reduces the size of F<ppport.h> dramatically and may be useful
-+if you want to include F<ppport.h> in smaller modules without
-+increasing their distribution size too much.
-+
-+=head2 --list-provided
-+
-+Lists the API elements for which compatibility is provided by
-+F<ppport.h>. Also lists if it must be explicitly requested,
-+if it has dependencies, and if there are hints for it.
-+
-+=head2 --list-unsupported
-+
-+Lists the API elements that are known not to be supported by
-+F<ppport.h> and below which version of Perl they probably
-+won't be available or work.
-+
-+=head2 --api-info=I<name>
-+
-+Show portability information for API elements matching I<name>.
-+If I<name> is surrounded by slashes, it is interpreted as a regular
-+expression.
-+
-+=head1 DESCRIPTION
-+
-+In order for a Perl extension (XS) module to be as portable as possible
-+across differing versions of Perl itself, certain steps need to be taken.
-+
-+=over 4
-+
-+=item *
-+
-+Including this header is the first major one. This alone will give you
-+access to a large part of the Perl API that hasn't been available in
-+earlier Perl releases. Use
-+
-+    perl ppport.h --list-provided
-+
-+to see which API elements are provided by ppport.h.
-+
-+=item *
-+
-+You should avoid using deprecated parts of the API. For example, using
-+global Perl variables without the C<PL_> prefix is deprecated. Also,
-+some API functions used to have a C<perl_> prefix. Using this form is
-+also deprecated. You can safely use the supported API, as F<ppport.h>
-+will provide wrappers for older Perl versions.
-+
-+=item *
-+
-+If you use one of a few functions or variables that were not present in
-+earlier versions of Perl, and that can't be provided using a macro, you
-+have to explicitly request support for these functions by adding one or
-+more C<#define>s in your source code before the inclusion of F<ppport.h>.
-+
-+These functions or variables will be marked C<explicit> in the list shown
-+by C<--list-provided>.
-+
-+Depending on whether you module has a single or multiple files that
-+use such functions or variables, you want either C<static> or global
-+variants.
-+
-+For a C<static> function or variable (used only in a single source
-+file), use:
-+
-+    #define NEED_function
-+    #define NEED_variable
-+
-+For a global function or variable (used in multiple source files),
-+use:
-+
-+    #define NEED_function_GLOBAL
-+    #define NEED_variable_GLOBAL
-+
-+Note that you mustn't have more than one global request for the
-+same function or variable in your project.
-+
-+    Function / Variable       Static Request               Global Request
-+    -----------------------------------------------------------------------------------------
-+    PL_signals                NEED_PL_signals              NEED_PL_signals_GLOBAL
-+    eval_pv()                 NEED_eval_pv                 NEED_eval_pv_GLOBAL
-+    grok_bin()                NEED_grok_bin                NEED_grok_bin_GLOBAL
-+    grok_hex()                NEED_grok_hex                NEED_grok_hex_GLOBAL
-+    grok_number()             NEED_grok_number             NEED_grok_number_GLOBAL
-+    grok_numeric_radix()      NEED_grok_numeric_radix      NEED_grok_numeric_radix_GLOBAL
-+    grok_oct()                NEED_grok_oct                NEED_grok_oct_GLOBAL
-+    newCONSTSUB()             NEED_newCONSTSUB             NEED_newCONSTSUB_GLOBAL
-+    newRV_noinc()             NEED_newRV_noinc             NEED_newRV_noinc_GLOBAL
-+    sv_2pv_nolen()            NEED_sv_2pv_nolen            NEED_sv_2pv_nolen_GLOBAL
-+    sv_2pvbyte()              NEED_sv_2pvbyte              NEED_sv_2pvbyte_GLOBAL
-+    sv_catpvf_mg()            NEED_sv_catpvf_mg            NEED_sv_catpvf_mg_GLOBAL
-+    sv_catpvf_mg_nocontext()  NEED_sv_catpvf_mg_nocontext  NEED_sv_catpvf_mg_nocontext_GLOBAL
-+    sv_setpvf_mg()            NEED_sv_setpvf_mg            NEED_sv_setpvf_mg_GLOBAL
-+    sv_setpvf_mg_nocontext()  NEED_sv_setpvf_mg_nocontext  NEED_sv_setpvf_mg_nocontext_GLOBAL
-+    vnewSVpvf()               NEED_vnewSVpvf               NEED_vnewSVpvf_GLOBAL
-+
-+To avoid namespace conflicts, you can change the namespace of the
-+explicitly exported functions / variables using the C<DPPP_NAMESPACE>
-+macro. Just C<#define> the macro before including C<ppport.h>:
-+
-+    #define DPPP_NAMESPACE MyOwnNamespace_
-+    #include "ppport.h"
-+
-+The default namespace is C<DPPP_>.
-+
-+=back
-+
-+The good thing is that most of the above can be checked by running
-+F<ppport.h> on your source code. See the next section for
-+details.
-+
-+=head1 EXAMPLES
-+
-+To verify whether F<ppport.h> is needed for your module, whether you
-+should make any changes to your code, and whether any special defines
-+should be used, F<ppport.h> can be run as a Perl script to check your
-+source code. Simply say:
-+
-+    perl ppport.h
-+
-+The result will usually be a list of patches suggesting changes
-+that should at least be acceptable, if not necessarily the most
-+efficient solution, or a fix for all possible problems.
-+
-+If you know that your XS module uses features only available in
-+newer Perl releases, if you're aware that it uses C++ comments,
-+and if you want all suggestions as a single patch file, you could
-+use something like this:
-+
-+    perl ppport.h --compat-version=5.6.0 --cplusplus --patch=test.diff
-+
-+If you only want your code to be scanned without any suggestions
-+for changes, use:
-+
-+    perl ppport.h --nochanges
-+
-+You can specify a different C<diff> program or options, using
-+the C<--diff> option:
-+
-+    perl ppport.h --diff='diff -C 10'
-+
-+This would output context diffs with 10 lines of context.
-+
-+To display portability information for the C<newSVpvn> function,
-+use:
-+
-+    perl ppport.h --api-info=newSVpvn
-+
-+Since the argument to C<--api-info> can be a regular expression,
-+you can use
-+
-+    perl ppport.h --api-info=/_nomg$/
-+
-+to display portability information for all C<_nomg> functions or
-+
-+    perl ppport.h --api-info=/./
-+
-+to display information for all known API elements.
-+
-+=head1 BUGS
-+
-+If this version of F<ppport.h> is causing failure during
-+the compilation of this module, please check if newer versions
-+of either this module or C<Devel::PPPort> are available on CPAN
-+before sending a bug report.
-+
-+If F<ppport.h> was generated using the latest version of
-+C<Devel::PPPort> and is causing failure of this module, please
-+file a bug report using the CPAN Request Tracker at L<http://rt.cpan.org/>.
-+
-+Please include the following information:
-+
-+=over 4
-+
-+=item 1.
-+
-+The complete output from running "perl -V"
-+
-+=item 2.
-+
-+This file.
-+
-+=item 3.
-+
-+The name and version of the module you were trying to build.
-+
-+=item 4.
-+
-+A full log of the build that failed.
-+
-+=item 5.
-+
-+Any other information that you think could be relevant.
-+
-+=back
-+
-+For the latest version of this code, please get the C<Devel::PPPort>
-+module from CPAN.
-+
-+=head1 COPYRIGHT
-+
-+Version 3.x, Copyright (c) 2004-2006, Marcus Holland-Moritz.
-+
-+Version 2.x, Copyright (C) 2001, Paul Marquess.
-+
-+Version 1.x, Copyright (C) 1999, Kenneth Albanowski.
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the same terms as Perl itself.
-+
-+=head1 SEE ALSO
-+
-+See L<Devel::PPPort>.
-+
-+=cut
-+
-+use strict;
-+
-+my %opt = (
-+  quiet     => 0,
-+  diag      => 1,
-+  hints     => 1,
-+  changes   => 1,
-+  cplusplus => 0,
-+  filter    => 1,
-+  strip     => 0,
-+);
-+
-+my($ppport) = $0 =~ /([\w.]+)$/;
-+my $LF = '(?:\r\n|[\r\n])';   # line feed
-+my $HS = "[ \t]";             # horizontal whitespace
-+
-+eval {
-+  require Getopt::Long;
-+  Getopt::Long::GetOptions(\%opt, qw(
-+    help quiet diag! filter! hints! changes! cplusplus strip
-+    patch=s copy=s diff=s compat-version=s
-+    list-provided list-unsupported api-info=s
-+  )) or usage();
-+};
-+
-+if ($@ and grep /^-/, @ARGV) {
-+  usage() if "@ARGV" =~ /^--?h(?:elp)?$/;
-+  die "Getopt::Long not found. Please don't use any options.\n";
-+}
-+
-+usage() if $opt{help};
-+strip() if $opt{strip};
-+
-+if (exists $opt{'compat-version'}) {
-+  my($r,$v,$s) = eval { parse_version($opt{'compat-version'}) };
-+  if ($@) {
-+    die "Invalid version number format: '$opt{'compat-version'}'\n";
-+  }
-+  die "Only Perl 5 is supported\n" if $r != 5;
-+  die "Invalid version number: $opt{'compat-version'}\n" if $v >= 1000 || $s >= 1000;
-+  $opt{'compat-version'} = sprintf "%d.%03d%03d", $r, $v, $s;
-+}
-+else {
-+  $opt{'compat-version'} = 5;
-+}
-+
-+# Never use C comments in this file!!!!!
-+my $ccs  = '/'.'*';
-+my $cce  = '*'.'/';
-+my $rccs = quotemeta $ccs;
-+my $rcce = quotemeta $cce;
-+
-+my %API = map { /^(\w+)\|([^|]*)\|([^|]*)\|(\w*)$/
-+                ? ( $1 => {
-+                      ($2                  ? ( base     => $2 ) : ()),
-+                      ($3                  ? ( todo     => $3 ) : ()),
-+                      (index($4, 'v') >= 0 ? ( varargs  => 1  ) : ()),
-+                      (index($4, 'p') >= 0 ? ( provided => 1  ) : ()),
-+                      (index($4, 'n') >= 0 ? ( nothxarg => 1  ) : ()),
-+                    } )
-+                : die "invalid spec: $_" } qw(
-+AvFILLp|5.004050||p
-+AvFILL|||
-+CLASS|||n
-+CX_CURPAD_SAVE|||
-+CX_CURPAD_SV|||
-+CopFILEAV|5.006000||p
-+CopFILEGV_set|5.006000||p
-+CopFILEGV|5.006000||p
-+CopFILESV|5.006000||p
-+CopFILE_set|5.006000||p
-+CopFILE|5.006000||p
-+CopSTASHPV_set|5.006000||p
-+CopSTASHPV|5.006000||p
-+CopSTASH_eq|5.006000||p
-+CopSTASH_set|5.006000||p
-+CopSTASH|5.006000||p
-+CopyD|5.009002||p
-+Copy|||
-+CvPADLIST|||
-+CvSTASH|||
-+CvWEAKOUTSIDE|||
-+DEFSV|5.004050||p
-+END_EXTERN_C|5.005000||p
-+ENTER|||
-+ERRSV|5.004050||p
-+EXTEND|||
-+EXTERN_C|5.005000||p
-+F0convert|||n
-+FREETMPS|||
-+GIMME_V||5.004000|n
-+GIMME|||n
-+GROK_NUMERIC_RADIX|5.007002||p
-+G_ARRAY|||
-+G_DISCARD|||
-+G_EVAL|||
-+G_NOARGS|||
-+G_SCALAR|||
-+G_VOID||5.004000|
-+GetVars|||
-+GvSV|||
-+Gv_AMupdate|||
-+HEf_SVKEY||5.004000|
-+HeHASH||5.004000|
-+HeKEY||5.004000|
-+HeKLEN||5.004000|
-+HePV||5.004000|
-+HeSVKEY_force||5.004000|
-+HeSVKEY_set||5.004000|
-+HeSVKEY||5.004000|
-+HeVAL||5.004000|
-+HvNAME|||
-+INT2PTR|5.006000||p
-+IN_LOCALE_COMPILETIME|5.007002||p
-+IN_LOCALE_RUNTIME|5.007002||p
-+IN_LOCALE|5.007002||p
-+IN_PERL_COMPILETIME|5.008001||p
-+IS_NUMBER_GREATER_THAN_UV_MAX|5.007002||p
-+IS_NUMBER_INFINITY|5.007002||p
-+IS_NUMBER_IN_UV|5.007002||p
-+IS_NUMBER_NAN|5.007003||p
-+IS_NUMBER_NEG|5.007002||p
-+IS_NUMBER_NOT_INT|5.007002||p
-+IVSIZE|5.006000||p
-+IVTYPE|5.006000||p
-+IVdf|5.006000||p
-+LEAVE|||
-+LVRET|||
-+MARK|||
-+MULTICALL||5.009003|
-+MY_CXT_CLONE|5.009002||p
-+MY_CXT_INIT|5.007003||p
-+MY_CXT|5.007003||p
-+MoveD|5.009002||p
-+Move|||
-+NEWSV|||
-+NOOP|5.005000||p
-+NUM2PTR|5.006000||p
-+NVTYPE|5.006000||p
-+NVef|5.006001||p
-+NVff|5.006001||p
-+NVgf|5.006001||p
-+Newxc|5.009003||p
-+Newxz|5.009003||p
-+Newx|5.009003||p
-+Nullav|||
-+Nullch|||
-+Nullcv|||
-+Nullhv|||
-+Nullsv|||
-+ORIGMARK|||
-+PAD_BASE_SV|||
-+PAD_CLONE_VARS|||
-+PAD_COMPNAME_FLAGS|||
-+PAD_COMPNAME_GEN_set|||
-+PAD_COMPNAME_GEN|||
-+PAD_COMPNAME_OURSTASH|||
-+PAD_COMPNAME_PV|||
-+PAD_COMPNAME_TYPE|||
-+PAD_RESTORE_LOCAL|||
-+PAD_SAVE_LOCAL|||
-+PAD_SAVE_SETNULLPAD|||
-+PAD_SETSV|||
-+PAD_SET_CUR_NOSAVE|||
-+PAD_SET_CUR|||
-+PAD_SVl|||
-+PAD_SV|||
-+PERL_BCDVERSION|5.009003||p
-+PERL_GCC_BRACE_GROUPS_FORBIDDEN|5.008001||p
-+PERL_INT_MAX|5.004000||p
-+PERL_INT_MIN|5.004000||p
-+PERL_LONG_MAX|5.004000||p
-+PERL_LONG_MIN|5.004000||p
-+PERL_MAGIC_arylen|5.007002||p
-+PERL_MAGIC_backref|5.007002||p
-+PERL_MAGIC_bm|5.007002||p
-+PERL_MAGIC_collxfrm|5.007002||p
-+PERL_MAGIC_dbfile|5.007002||p
-+PERL_MAGIC_dbline|5.007002||p
-+PERL_MAGIC_defelem|5.007002||p
-+PERL_MAGIC_envelem|5.007002||p
-+PERL_MAGIC_env|5.007002||p
-+PERL_MAGIC_ext|5.007002||p
-+PERL_MAGIC_fm|5.007002||p
-+PERL_MAGIC_glob|5.007002||p
-+PERL_MAGIC_isaelem|5.007002||p
-+PERL_MAGIC_isa|5.007002||p
-+PERL_MAGIC_mutex|5.007002||p
-+PERL_MAGIC_nkeys|5.007002||p
-+PERL_MAGIC_overload_elem|5.007002||p
-+PERL_MAGIC_overload_table|5.007002||p
-+PERL_MAGIC_overload|5.007002||p
-+PERL_MAGIC_pos|5.007002||p
-+PERL_MAGIC_qr|5.007002||p
-+PERL_MAGIC_regdata|5.007002||p
-+PERL_MAGIC_regdatum|5.007002||p
-+PERL_MAGIC_regex_global|5.007002||p
-+PERL_MAGIC_shared_scalar|5.007003||p
-+PERL_MAGIC_shared|5.007003||p
-+PERL_MAGIC_sigelem|5.007002||p
-+PERL_MAGIC_sig|5.007002||p
-+PERL_MAGIC_substr|5.007002||p
-+PERL_MAGIC_sv|5.007002||p
-+PERL_MAGIC_taint|5.007002||p
-+PERL_MAGIC_tiedelem|5.007002||p
-+PERL_MAGIC_tiedscalar|5.007002||p
-+PERL_MAGIC_tied|5.007002||p
-+PERL_MAGIC_utf8|5.008001||p
-+PERL_MAGIC_uvar_elem|5.007003||p
-+PERL_MAGIC_uvar|5.007002||p
-+PERL_MAGIC_vec|5.007002||p
-+PERL_MAGIC_vstring|5.008001||p
-+PERL_QUAD_MAX|5.004000||p
-+PERL_QUAD_MIN|5.004000||p
-+PERL_REVISION|5.006000||p
-+PERL_SCAN_ALLOW_UNDERSCORES|5.007003||p
-+PERL_SCAN_DISALLOW_PREFIX|5.007003||p
-+PERL_SCAN_GREATER_THAN_UV_MAX|5.007003||p
-+PERL_SCAN_SILENT_ILLDIGIT|5.008001||p
-+PERL_SHORT_MAX|5.004000||p
-+PERL_SHORT_MIN|5.004000||p
-+PERL_SIGNALS_UNSAFE_FLAG|5.008001||p
-+PERL_SUBVERSION|5.006000||p
-+PERL_UCHAR_MAX|5.004000||p
-+PERL_UCHAR_MIN|5.004000||p
-+PERL_UINT_MAX|5.004000||p
-+PERL_UINT_MIN|5.004000||p
-+PERL_ULONG_MAX|5.004000||p
-+PERL_ULONG_MIN|5.004000||p
-+PERL_UNUSED_DECL|5.007002||p
-+PERL_UQUAD_MAX|5.004000||p
-+PERL_UQUAD_MIN|5.004000||p
-+PERL_USHORT_MAX|5.004000||p
-+PERL_USHORT_MIN|5.004000||p
-+PERL_VERSION|5.006000||p
-+PL_DBsingle|||pn
-+PL_DBsub|||pn
-+PL_DBtrace|||n
-+PL_Sv|5.005000||p
-+PL_compiling|5.004050||p
-+PL_copline|5.005000||p
-+PL_curcop|5.004050||p
-+PL_curstash|5.004050||p
-+PL_debstash|5.004050||p
-+PL_defgv|5.004050||p
-+PL_diehook|5.004050||p
-+PL_dirty|5.004050||p
-+PL_dowarn|||pn
-+PL_errgv|5.004050||p
-+PL_hexdigit|5.005000||p
-+PL_hints|5.005000||p
-+PL_last_in_gv|||n
-+PL_modglobal||5.005000|n
-+PL_na|5.004050||pn
-+PL_no_modify|5.006000||p
-+PL_ofs_sv|||n
-+PL_perl_destruct_level|5.004050||p
-+PL_perldb|5.004050||p
-+PL_ppaddr|5.006000||p
-+PL_rsfp_filters|5.004050||p
-+PL_rsfp|5.004050||p
-+PL_rs|||n
-+PL_signals|5.008001||p
-+PL_stack_base|5.004050||p
-+PL_stack_sp|5.004050||p
-+PL_stdingv|5.004050||p
-+PL_sv_arenaroot|5.004050||p
-+PL_sv_no|5.004050||pn
-+PL_sv_undef|5.004050||pn
-+PL_sv_yes|5.004050||pn
-+PL_tainted|5.004050||p
-+PL_tainting|5.004050||p
-+POP_MULTICALL||5.009003|
-+POPi|||n
-+POPl|||n
-+POPn|||n
-+POPpbytex||5.007001|n
-+POPpx||5.005030|n
-+POPp|||n
-+POPs|||n
-+PTR2IV|5.006000||p
-+PTR2NV|5.006000||p
-+PTR2UV|5.006000||p
-+PTR2ul|5.007001||p
-+PTRV|5.006000||p
-+PUSHMARK|||
-+PUSH_MULTICALL||5.009003|
-+PUSHi|||
-+PUSHmortal|5.009002||p
-+PUSHn|||
-+PUSHp|||
-+PUSHs|||
-+PUSHu|5.004000||p
-+PUTBACK|||
-+PerlIO_clearerr||5.007003|
-+PerlIO_close||5.007003|
-+PerlIO_eof||5.007003|
-+PerlIO_error||5.007003|
-+PerlIO_fileno||5.007003|
-+PerlIO_fill||5.007003|
-+PerlIO_flush||5.007003|
-+PerlIO_get_base||5.007003|
-+PerlIO_get_bufsiz||5.007003|
-+PerlIO_get_cnt||5.007003|
-+PerlIO_get_ptr||5.007003|
-+PerlIO_read||5.007003|
-+PerlIO_seek||5.007003|
-+PerlIO_set_cnt||5.007003|
-+PerlIO_set_ptrcnt||5.007003|
-+PerlIO_setlinebuf||5.007003|
-+PerlIO_stderr||5.007003|
-+PerlIO_stdin||5.007003|
-+PerlIO_stdout||5.007003|
-+PerlIO_tell||5.007003|
-+PerlIO_unread||5.007003|
-+PerlIO_write||5.007003|
-+Poison|5.008000||p
-+RETVAL|||n
-+Renewc|||
-+Renew|||
-+SAVECLEARSV|||
-+SAVECOMPPAD|||
-+SAVEPADSV|||
-+SAVETMPS|||
-+SAVE_DEFSV|5.004050||p
-+SPAGAIN|||
-+SP|||
-+START_EXTERN_C|5.005000||p
-+START_MY_CXT|5.007003||p
-+STMT_END|||p
-+STMT_START|||p
-+ST|||
-+SVt_IV|||
-+SVt_NV|||
-+SVt_PVAV|||
-+SVt_PVCV|||
-+SVt_PVHV|||
-+SVt_PVMG|||
-+SVt_PV|||
-+Safefree|||
-+Slab_Alloc|||
-+Slab_Free|||
-+StructCopy|||
-+SvCUR_set|||
-+SvCUR|||
-+SvEND|||
-+SvGETMAGIC|5.004050||p
-+SvGROW|||
-+SvIOK_UV||5.006000|
-+SvIOK_notUV||5.006000|
-+SvIOK_off|||
-+SvIOK_only_UV||5.006000|
-+SvIOK_only|||
-+SvIOK_on|||
-+SvIOKp|||
-+SvIOK|||
-+SvIVX|||
-+SvIV_nomg|5.009001||p
-+SvIV_set|||
-+SvIVx|||
-+SvIV|||
-+SvIsCOW_shared_hash||5.008003|
-+SvIsCOW||5.008003|
-+SvLEN_set|||
-+SvLEN|||
-+SvLOCK||5.007003|
-+SvMAGIC_set|5.009003||p
-+SvNIOK_off|||
-+SvNIOKp|||
-+SvNIOK|||
-+SvNOK_off|||
-+SvNOK_only|||
-+SvNOK_on|||
-+SvNOKp|||
-+SvNOK|||
-+SvNVX|||
-+SvNV_set|||
-+SvNVx|||
-+SvNV|||
-+SvOK|||
-+SvOOK|||
-+SvPOK_off|||
-+SvPOK_only_UTF8||5.006000|
-+SvPOK_only|||
-+SvPOK_on|||
-+SvPOKp|||
-+SvPOK|||
-+SvPVX_const|5.009003||p
-+SvPVX_mutable|5.009003||p
-+SvPVX|||
-+SvPV_force_nomg|5.007002||p
-+SvPV_force|||
-+SvPV_nolen|5.006000||p
-+SvPV_nomg|5.007002||p
-+SvPV_set|||
-+SvPVbyte_force||5.009002|
-+SvPVbyte_nolen||5.006000|
-+SvPVbytex_force||5.006000|
-+SvPVbytex||5.006000|
-+SvPVbyte|5.006000||p
-+SvPVutf8_force||5.006000|
-+SvPVutf8_nolen||5.006000|
-+SvPVutf8x_force||5.006000|
-+SvPVutf8x||5.006000|
-+SvPVutf8||5.006000|
-+SvPVx|||
-+SvPV|||
-+SvREFCNT_dec|||
-+SvREFCNT_inc|||
-+SvREFCNT|||
-+SvROK_off|||
-+SvROK_on|||
-+SvROK|||
-+SvRV_set|5.009003||p
-+SvRV|||
-+SvSETMAGIC|||
-+SvSHARE||5.007003|
-+SvSTASH_set|5.009003|5.009003|p
-+SvSTASH|||
-+SvSetMagicSV_nosteal||5.004000|
-+SvSetMagicSV||5.004000|
-+SvSetSV_nosteal||5.004000|
-+SvSetSV|||
-+SvTAINTED_off||5.004000|
-+SvTAINTED_on||5.004000|
-+SvTAINTED||5.004000|
-+SvTAINT|||
-+SvTRUE|||
-+SvTYPE|||
-+SvUNLOCK||5.007003|
-+SvUOK||5.007001|
-+SvUPGRADE|||
-+SvUTF8_off||5.006000|
-+SvUTF8_on||5.006000|
-+SvUTF8||5.006000|
-+SvUVXx|5.004000||p
-+SvUVX|5.004000||p
-+SvUV_nomg|5.009001||p
-+SvUV_set|5.009003||p
-+SvUVx|5.004000||p
-+SvUV|5.004000||p
-+SvVOK||5.008001|
-+THIS|||n
-+UNDERBAR|5.009002||p
-+UVSIZE|5.006000||p
-+UVTYPE|5.006000||p
-+UVXf|5.007001||p
-+UVof|5.006000||p
-+UVuf|5.006000||p
-+UVxf|5.006000||p
-+XCPT_CATCH|5.009002||p
-+XCPT_RETHROW|5.009002||p
-+XCPT_TRY_END|5.009002||p
-+XCPT_TRY_START|5.009002||p
-+XPUSHi|||
-+XPUSHmortal|5.009002||p
-+XPUSHn|||
-+XPUSHp|||
-+XPUSHs|||
-+XPUSHu|5.004000||p
-+XSRETURN_EMPTY|||
-+XSRETURN_IV|||
-+XSRETURN_NO|||
-+XSRETURN_NV|||
-+XSRETURN_PV|||
-+XSRETURN_UNDEF|||
-+XSRETURN_UV|5.008001||p
-+XSRETURN_YES|||
-+XSRETURN|||p
-+XST_mIV|||
-+XST_mNO|||
-+XST_mNV|||
-+XST_mPV|||
-+XST_mUNDEF|||
-+XST_mUV|5.008001||p
-+XST_mYES|||
-+XS_VERSION_BOOTCHECK|||
-+XS_VERSION|||
-+XSprePUSH|5.006000||p
-+XS|||
-+ZeroD|5.009002||p
-+Zero|||
-+_aMY_CXT|5.007003||p
-+_pMY_CXT|5.007003||p
-+aMY_CXT_|5.007003||p
-+aMY_CXT|5.007003||p
-+aTHX_|5.006000||p
-+aTHX|5.006000||p
-+add_data|||
-+allocmy|||
-+amagic_call|||
-+amagic_cmp_locale|||
-+amagic_cmp|||
-+amagic_i_ncmp|||
-+amagic_ncmp|||
-+any_dup|||
-+ao|||
-+append_elem|||
-+append_list|||
-+apply_attrs_my|||
-+apply_attrs_string||5.006001|
-+apply_attrs|||
-+apply|||
-+atfork_lock||5.007003|n
-+atfork_unlock||5.007003|n
-+av_arylen_p||5.009003|
-+av_clear|||
-+av_delete||5.006000|
-+av_exists||5.006000|
-+av_extend|||
-+av_fake|||
-+av_fetch|||
-+av_fill|||
-+av_len|||
-+av_make|||
-+av_pop|||
-+av_push|||
-+av_reify|||
-+av_shift|||
-+av_store|||
-+av_undef|||
-+av_unshift|||
-+ax|||n
-+bad_type|||
-+bind_match|||
-+block_end|||
-+block_gimme||5.004000|
-+block_start|||
-+boolSV|5.004000||p
-+boot_core_PerlIO|||
-+boot_core_UNIVERSAL|||
-+boot_core_xsutils|||
-+bytes_from_utf8||5.007001|
-+bytes_to_utf8||5.006001|
-+cache_re|||
-+call_argv|5.006000||p
-+call_atexit||5.006000|
-+call_body|||
-+call_list_body|||
-+call_list||5.004000|
-+call_method|5.006000||p
-+call_pv|5.006000||p
-+call_sv|5.006000||p
-+calloc||5.007002|n
-+cando|||
-+cast_i32||5.006000|
-+cast_iv||5.006000|
-+cast_ulong||5.006000|
-+cast_uv||5.006000|
-+check_type_and_open|||
-+check_uni|||
-+checkcomma|||
-+checkposixcc|||
-+ck_anoncode|||
-+ck_bitop|||
-+ck_concat|||
-+ck_defined|||
-+ck_delete|||
-+ck_die|||
-+ck_eof|||
-+ck_eval|||
-+ck_exec|||
-+ck_exists|||
-+ck_exit|||
-+ck_ftst|||
-+ck_fun|||
-+ck_glob|||
-+ck_grep|||
-+ck_index|||
-+ck_join|||
-+ck_lengthconst|||
-+ck_lfun|||
-+ck_listiob|||
-+ck_match|||
-+ck_method|||
-+ck_null|||
-+ck_open|||
-+ck_repeat|||
-+ck_require|||
-+ck_retarget|||
-+ck_return|||
-+ck_rfun|||
-+ck_rvconst|||
-+ck_sassign|||
-+ck_say|||
-+ck_select|||
-+ck_shift|||
-+ck_sort|||
-+ck_spair|||
-+ck_split|||
-+ck_subr|||
-+ck_substr|||
-+ck_svconst|||
-+ck_trunc|||
-+ck_unpack|||
-+ckwarn_d||5.009003|
-+ckwarn||5.009003|
-+cl_and|||
-+cl_anything|||
-+cl_init_zero|||
-+cl_init|||
-+cl_is_anything|||
-+cl_or|||
-+closest_cop|||
-+convert|||
-+cop_free|||
-+cr_textfilter|||
-+croak_nocontext|||vn
-+croak|||v
-+csighandler||5.009003|n
-+custom_op_desc||5.007003|
-+custom_op_name||5.007003|
-+cv_ckproto|||
-+cv_clone|||
-+cv_const_sv||5.004000|
-+cv_dump|||
-+cv_undef|||
-+cx_dump||5.005000|
-+cx_dup|||
-+cxinc|||
-+dAXMARK|5.009003||p
-+dAX|5.007002||p
-+dITEMS|5.007002||p
-+dMARK|||
-+dMULTICALL||5.009003|
-+dMY_CXT_SV|5.007003||p
-+dMY_CXT|5.007003||p
-+dNOOP|5.006000||p
-+dORIGMARK|||
-+dSP|||
-+dTHR|5.004050||p
-+dTHXa|5.006000||p
-+dTHXoa|5.006000||p
-+dTHX|5.006000||p
-+dUNDERBAR|5.009002||p
-+dXCPT|5.009002||p
-+dXSARGS|||
-+dXSI32|||
-+dXSTARG|5.006000||p
-+deb_curcv|||
-+deb_nocontext|||vn
-+deb_stack_all|||
-+deb_stack_n|||
-+debop||5.005000|
-+debprofdump||5.005000|
-+debprof|||
-+debstackptrs||5.007003|
-+debstack||5.007003|
-+deb||5.007003|v
-+del_sv|||
-+delimcpy||5.004000|
-+deprecate_old|||
-+deprecate|||
-+despatch_signals||5.007001|
-+destroy_matcher|||
-+die_nocontext|||vn
-+die_where|||
-+die|||v
-+dirp_dup|||
-+div128|||
-+djSP|||
-+do_aexec5|||
-+do_aexec|||
-+do_aspawn|||
-+do_binmode||5.004050|
-+do_chomp|||
-+do_chop|||
-+do_close|||
-+do_dump_pad|||
-+do_eof|||
-+do_exec3|||
-+do_execfree|||
-+do_exec|||
-+do_gv_dump||5.006000|
-+do_gvgv_dump||5.006000|
-+do_hv_dump||5.006000|
-+do_ipcctl|||
-+do_ipcget|||
-+do_join|||
-+do_kv|||
-+do_magic_dump||5.006000|
-+do_msgrcv|||
-+do_msgsnd|||
-+do_oddball|||
-+do_op_dump||5.006000|
-+do_open9||5.006000|
-+do_openn||5.007001|
-+do_open||5.004000|
-+do_pipe|||
-+do_pmop_dump||5.006000|
-+do_print|||
-+do_readline|||
-+do_seek|||
-+do_semop|||
-+do_shmio|||
-+do_smartmatch|||
-+do_spawn_nowait|||
-+do_spawn|||
-+do_sprintf|||
-+do_sv_dump||5.006000|
-+do_sysseek|||
-+do_tell|||
-+do_trans_complex_utf8|||
-+do_trans_complex|||
-+do_trans_count_utf8|||
-+do_trans_count|||
-+do_trans_simple_utf8|||
-+do_trans_simple|||
-+do_trans|||
-+do_vecget|||
-+do_vecset|||
-+do_vop|||
-+docatch_body|||
-+docatch|||
-+doeval|||
-+dofile|||
-+dofindlabel|||
-+doform|||
-+doing_taint||5.008001|n
-+dooneliner|||
-+doopen_pm|||
-+doparseform|||
-+dopoptoeval|||
-+dopoptogiven|||
-+dopoptolabel|||
-+dopoptoloop|||
-+dopoptosub_at|||
-+dopoptosub|||
-+dopoptowhen|||
-+doref||5.009003|
-+dounwind|||
-+dowantarray|||
-+dump_all||5.006000|
-+dump_eval||5.006000|
-+dump_fds|||
-+dump_form||5.006000|
-+dump_indent||5.006000|v
-+dump_mstats|||
-+dump_packsubs||5.006000|
-+dump_sub||5.006000|
-+dump_sv_child|||
-+dump_vindent||5.006000|
-+dumpuntil|||
-+dup_attrlist|||
-+emulate_eaccess|||
-+eval_pv|5.006000||p
-+eval_sv|5.006000||p
-+expect_number|||
-+fbm_compile||5.005000|
-+fbm_instr||5.005000|
-+fd_on_nosuid_fs|||
-+feature_is_enabled|||
-+filter_add|||
-+filter_del|||
-+filter_gets|||
-+filter_read|||
-+find_beginning|||
-+find_byclass|||
-+find_in_my_stash|||
-+find_runcv|||
-+find_rundefsvoffset||5.009002|
-+find_script|||
-+find_uninit_var|||
-+first_symbol|||n
-+fold_constants|||
-+forbid_setid|||
-+force_ident|||
-+force_list|||
-+force_next|||
-+force_version|||
-+force_word|||
-+form_nocontext|||vn
-+form||5.004000|v
-+fp_dup|||
-+fprintf_nocontext|||vn
-+free_global_struct|||
-+free_tied_hv_pool|||
-+free_tmps|||
-+gen_constant_list|||
-+get_av|5.006000||p
-+get_context||5.006000|n
-+get_cv|5.006000||p
-+get_db_sub|||
-+get_debug_opts|||
-+get_hash_seed|||
-+get_hv|5.006000||p
-+get_mstats|||
-+get_no_modify|||
-+get_num|||
-+get_op_descs||5.005000|
-+get_op_names||5.005000|
-+get_opargs|||
-+get_ppaddr||5.006000|
-+get_sv|5.006000||p
-+get_vtbl||5.005030|
-+getcwd_sv||5.007002|
-+getenv_len|||
-+gp_dup|||
-+gp_free|||
-+gp_ref|||
-+grok_bin|5.007003||p
-+grok_hex|5.007003||p
-+grok_number|5.007002||p
-+grok_numeric_radix|5.007002||p
-+grok_oct|5.007003||p
-+group_end|||
-+gv_AVadd|||
-+gv_HVadd|||
-+gv_IOadd|||
-+gv_SVadd|||
-+gv_autoload4||5.004000|
-+gv_check|||
-+gv_const_sv||5.009003|
-+gv_dump||5.006000|
-+gv_efullname3||5.004000|
-+gv_efullname4||5.006001|
-+gv_efullname|||
-+gv_ename|||
-+gv_fetchfile|||
-+gv_fetchmeth_autoload||5.007003|
-+gv_fetchmethod_autoload||5.004000|
-+gv_fetchmethod|||
-+gv_fetchmeth|||
-+gv_fetchpvn_flags||5.009002|
-+gv_fetchpv|||
-+gv_fetchsv||5.009002|
-+gv_fullname3||5.004000|
-+gv_fullname4||5.006001|
-+gv_fullname|||
-+gv_handler||5.007001|
-+gv_init_sv|||
-+gv_init|||
-+gv_stashpvn|5.006000||p
-+gv_stashpv|||
-+gv_stashsv|||
-+he_dup|||
-+hek_dup|||
-+hfreeentries|||
-+hsplit|||
-+hv_assert||5.009001|
-+hv_auxinit|||
-+hv_backreferences_p|||
-+hv_clear_placeholders||5.009001|
-+hv_clear|||
-+hv_delayfree_ent||5.004000|
-+hv_delete_common|||
-+hv_delete_ent||5.004000|
-+hv_delete|||
-+hv_eiter_p||5.009003|
-+hv_eiter_set||5.009003|
-+hv_exists_ent||5.004000|
-+hv_exists|||
-+hv_fetch_common|||
-+hv_fetch_ent||5.004000|
-+hv_fetch|||
-+hv_free_ent||5.004000|
-+hv_iterinit|||
-+hv_iterkeysv||5.004000|
-+hv_iterkey|||
-+hv_iternext_flags||5.008000|
-+hv_iternextsv|||
-+hv_iternext|||
-+hv_iterval|||
-+hv_kill_backrefs|||
-+hv_ksplit||5.004000|
-+hv_magic_check|||
-+hv_magic|||
-+hv_name_set||5.009003|
-+hv_notallowed|||
-+hv_placeholders_get||5.009003|
-+hv_placeholders_p||5.009003|
-+hv_placeholders_set||5.009003|
-+hv_riter_p||5.009003|
-+hv_riter_set||5.009003|
-+hv_scalar||5.009001|
-+hv_store_ent||5.004000|
-+hv_store_flags||5.008000|
-+hv_store|||
-+hv_undef|||
-+ibcmp_locale||5.004000|
-+ibcmp_utf8||5.007003|
-+ibcmp|||
-+incl_perldb|||
-+incline|||
-+incpush_if_exists|||
-+incpush|||
-+ingroup|||
-+init_argv_symbols|||
-+init_debugger|||
-+init_global_struct|||
-+init_i18nl10n||5.006000|
-+init_i18nl14n||5.006000|
-+init_ids|||
-+init_interp|||
-+init_lexer|||
-+init_main_stash|||
-+init_perllib|||
-+init_postdump_symbols|||
-+init_predump_symbols|||
-+init_stacks||5.005000|
-+init_tm||5.007002|
-+instr|||
-+intro_my|||
-+intuit_method|||
-+intuit_more|||
-+invert|||
-+io_close|||
-+isALNUM|||
-+isALPHA|||
-+isDIGIT|||
-+isLOWER|||
-+isSPACE|||
-+isUPPER|||
-+is_an_int|||
-+is_gv_magical_sv|||
-+is_gv_magical|||
-+is_handle_constructor|||
-+is_list_assignment|||
-+is_lvalue_sub||5.007001|
-+is_uni_alnum_lc||5.006000|
-+is_uni_alnumc_lc||5.006000|
-+is_uni_alnumc||5.006000|
-+is_uni_alnum||5.006000|
-+is_uni_alpha_lc||5.006000|
-+is_uni_alpha||5.006000|
-+is_uni_ascii_lc||5.006000|
-+is_uni_ascii||5.006000|
-+is_uni_cntrl_lc||5.006000|
-+is_uni_cntrl||5.006000|
-+is_uni_digit_lc||5.006000|
-+is_uni_digit||5.006000|
-+is_uni_graph_lc||5.006000|
-+is_uni_graph||5.006000|
-+is_uni_idfirst_lc||5.006000|
-+is_uni_idfirst||5.006000|
-+is_uni_lower_lc||5.006000|
-+is_uni_lower||5.006000|
-+is_uni_print_lc||5.006000|
-+is_uni_print||5.006000|
-+is_uni_punct_lc||5.006000|
-+is_uni_punct||5.006000|
-+is_uni_space_lc||5.006000|
-+is_uni_space||5.006000|
-+is_uni_upper_lc||5.006000|
-+is_uni_upper||5.006000|
-+is_uni_xdigit_lc||5.006000|
-+is_uni_xdigit||5.006000|
-+is_utf8_alnumc||5.006000|
-+is_utf8_alnum||5.006000|
-+is_utf8_alpha||5.006000|
-+is_utf8_ascii||5.006000|
-+is_utf8_char_slow|||
-+is_utf8_char||5.006000|
-+is_utf8_cntrl||5.006000|
-+is_utf8_common|||
-+is_utf8_digit||5.006000|
-+is_utf8_graph||5.006000|
-+is_utf8_idcont||5.008000|
-+is_utf8_idfirst||5.006000|
-+is_utf8_lower||5.006000|
-+is_utf8_mark||5.006000|
-+is_utf8_print||5.006000|
-+is_utf8_punct||5.006000|
-+is_utf8_space||5.006000|
-+is_utf8_string_loclen||5.009003|
-+is_utf8_string_loc||5.008001|
-+is_utf8_string||5.006001|
-+is_utf8_upper||5.006000|
-+is_utf8_xdigit||5.006000|
-+isa_lookup|||
-+items|||n
-+ix|||n
-+jmaybe|||
-+keyword|||
-+leave_scope|||
-+lex_end|||
-+lex_start|||
-+linklist|||
-+listkids|||
-+list|||
-+load_module_nocontext|||vn
-+load_module||5.006000|v
-+localize|||
-+looks_like_bool|||
-+looks_like_number|||
-+lop|||
-+mPUSHi|5.009002||p
-+mPUSHn|5.009002||p
-+mPUSHp|5.009002||p
-+mPUSHu|5.009002||p
-+mXPUSHi|5.009002||p
-+mXPUSHn|5.009002||p
-+mXPUSHp|5.009002||p
-+mXPUSHu|5.009002||p
-+magic_clear_all_env|||
-+magic_clearenv|||
-+magic_clearpack|||
-+magic_clearsig|||
-+magic_dump||5.006000|
-+magic_existspack|||
-+magic_freearylen_p|||
-+magic_freeovrld|||
-+magic_freeregexp|||
-+magic_getarylen|||
-+magic_getdefelem|||
-+magic_getglob|||
-+magic_getnkeys|||
-+magic_getpack|||
-+magic_getpos|||
-+magic_getsig|||
-+magic_getsubstr|||
-+magic_gettaint|||
-+magic_getuvar|||
-+magic_getvec|||
-+magic_get|||
-+magic_killbackrefs|||
-+magic_len|||
-+magic_methcall|||
-+magic_methpack|||
-+magic_nextpack|||
-+magic_regdata_cnt|||
-+magic_regdatum_get|||
-+magic_regdatum_set|||
-+magic_scalarpack|||
-+magic_set_all_env|||
-+magic_setamagic|||
-+magic_setarylen|||
-+magic_setbm|||
-+magic_setcollxfrm|||
-+magic_setdbline|||
-+magic_setdefelem|||
-+magic_setenv|||
-+magic_setfm|||
-+magic_setglob|||
-+magic_setisa|||
-+magic_setmglob|||
-+magic_setnkeys|||
-+magic_setpack|||
-+magic_setpos|||
-+magic_setregexp|||
-+magic_setsig|||
-+magic_setsubstr|||
-+magic_settaint|||
-+magic_setutf8|||
-+magic_setuvar|||
-+magic_setvec|||
-+magic_set|||
-+magic_sizepack|||
-+magic_wipepack|||
-+magicname|||
-+make_matcher|||
-+make_trie|||
-+malloced_size|||n
-+malloc||5.007002|n
-+markstack_grow|||
-+matcher_matches_sv|||
-+measure_struct|||
-+memEQ|5.004000||p
-+memNE|5.004000||p
-+mem_collxfrm|||
-+mess_alloc|||
-+mess_nocontext|||vn
-+mess||5.006000|v
-+method_common|||
-+mfree||5.007002|n
-+mg_clear|||
-+mg_copy|||
-+mg_dup|||
-+mg_find|||
-+mg_free|||
-+mg_get|||
-+mg_length||5.005000|
-+mg_localize|||
-+mg_magical|||
-+mg_set|||
-+mg_size||5.005000|
-+mini_mktime||5.007002|
-+missingterm|||
-+mode_from_discipline|||
-+modkids|||
-+mod|||
-+moreswitches|||
-+mul128|||
-+mulexp10|||n
-+my_atof2||5.007002|
-+my_atof||5.006000|
-+my_attrs|||
-+my_bcopy|||n
-+my_betoh16|||n
-+my_betoh32|||n
-+my_betoh64|||n
-+my_betohi|||n
-+my_betohl|||n
-+my_betohs|||n
-+my_bzero|||n
-+my_chsize|||
-+my_clearenv|||
-+my_cxt_init|||
-+my_exit_jump|||
-+my_exit|||
-+my_failure_exit||5.004000|
-+my_fflush_all||5.006000|
-+my_fork||5.007003|n
-+my_htobe16|||n
-+my_htobe32|||n
-+my_htobe64|||n
-+my_htobei|||n
-+my_htobel|||n
-+my_htobes|||n
-+my_htole16|||n
-+my_htole32|||n
-+my_htole64|||n
-+my_htolei|||n
-+my_htolel|||n
-+my_htoles|||n
-+my_htonl|||
-+my_kid|||
-+my_letoh16|||n
-+my_letoh32|||n
-+my_letoh64|||n
-+my_letohi|||n
-+my_letohl|||n
-+my_letohs|||n
-+my_lstat|||
-+my_memcmp||5.004000|n
-+my_memset|||n
-+my_ntohl|||
-+my_pclose||5.004000|
-+my_popen_list||5.007001|
-+my_popen||5.004000|
-+my_setenv|||
-+my_socketpair||5.007003|n
-+my_sprintf||5.009003|vn
-+my_stat|||
-+my_strftime||5.007002|
-+my_swabn|||n
-+my_swap|||
-+my_unexec|||
-+my|||
-+need_utf8|||n
-+newANONATTRSUB||5.006000|
-+newANONHASH|||
-+newANONLIST|||
-+newANONSUB|||
-+newASSIGNOP|||
-+newATTRSUB||5.006000|
-+newAVREF|||
-+newAV|||
-+newBINOP|||
-+newCONDOP|||
-+newCONSTSUB|5.006000||p
-+newCVREF|||
-+newDEFSVOP|||
-+newFORM|||
-+newFOROP|||
-+newGIVENOP||5.009003|
-+newGIVWHENOP|||
-+newGVOP|||
-+newGVREF|||
-+newGVgen|||
-+newHVREF|||
-+newHVhv||5.005000|
-+newHV|||
-+newIO|||
-+newLISTOP|||
-+newLOGOP|||
-+newLOOPEX|||
-+newLOOPOP|||
-+newMYSUB||5.006000|
-+newNULLLIST|||
-+newOP|||
-+newPADOP||5.006000|
-+newPMOP|||
-+newPROG|||
-+newPVOP|||
-+newRANGE|||
-+newRV_inc|5.004000||p
-+newRV_noinc|5.006000||p
-+newRV|||
-+newSLICEOP|||
-+newSTATEOP|||
-+newSUB|||
-+newSVOP|||
-+newSVREF|||
-+newSVhek||5.009003|
-+newSViv|||
-+newSVnv|||
-+newSVpvf_nocontext|||vn
-+newSVpvf||5.004000|v
-+newSVpvn_share||5.007001|
-+newSVpvn|5.006000||p
-+newSVpv|||
-+newSVrv|||
-+newSVsv|||
-+newSVuv|5.006000||p
-+newSV|||
-+newUNOP|||
-+newWHENOP||5.009003|
-+newWHILEOP||5.009003|
-+newXSproto||5.006000|
-+newXS||5.006000|
-+new_collate||5.006000|
-+new_constant|||
-+new_ctype||5.006000|
-+new_he|||
-+new_logop|||
-+new_numeric||5.006000|
-+new_stackinfo||5.005000|
-+new_version||5.009000|
-+next_symbol|||
-+nextargv|||
-+nextchar|||
-+ninstr|||
-+no_bareword_allowed|||
-+no_fh_allowed|||
-+no_op|||
-+not_a_number|||
-+nothreadhook||5.008000|
-+nuke_stacks|||
-+num_overflow|||n
-+offer_nice_chunk|||
-+oopsAV|||
-+oopsCV|||
-+oopsHV|||
-+op_clear|||
-+op_const_sv|||
-+op_dump||5.006000|
-+op_free|||
-+op_null||5.007002|
-+op_refcnt_lock||5.009002|
-+op_refcnt_unlock||5.009002|
-+open_script|||
-+pMY_CXT_|5.007003||p
-+pMY_CXT|5.007003||p
-+pTHX_|5.006000||p
-+pTHX|5.006000||p
-+pack_cat||5.007003|
-+pack_rec|||
-+package|||
-+packlist||5.008001|
-+pad_add_anon|||
-+pad_add_name|||
-+pad_alloc|||
-+pad_block_start|||
-+pad_check_dup|||
-+pad_compname_type|||
-+pad_findlex|||
-+pad_findmy|||
-+pad_fixup_inner_anons|||
-+pad_free|||
-+pad_leavemy|||
-+pad_new|||
-+pad_push|||
-+pad_reset|||
-+pad_setsv|||
-+pad_sv|||
-+pad_swipe|||
-+pad_tidy|||
-+pad_undef|||
-+parse_body|||
-+parse_unicode_opts|||
-+path_is_absolute|||
-+peep|||
-+pending_ident|||
-+perl_alloc_using|||n
-+perl_alloc|||n
-+perl_clone_using|||n
-+perl_clone|||n
-+perl_construct|||n
-+perl_destruct||5.007003|n
-+perl_free|||n
-+perl_parse||5.006000|n
-+perl_run|||n
-+pidgone|||
-+pmflag|||
-+pmop_dump||5.006000|
-+pmruntime|||
-+pmtrans|||
-+pop_scope|||
-+pregcomp|||
-+pregexec|||
-+pregfree|||
-+prepend_elem|||
-+printf_nocontext|||vn
-+ptr_table_clear|||
-+ptr_table_fetch|||
-+ptr_table_free|||
-+ptr_table_new|||
-+ptr_table_split|||
-+ptr_table_store|||
-+push_scope|||
-+put_byte|||
-+pv_display||5.006000|
-+pv_uni_display||5.007003|
-+qerror|||
-+re_croak2|||
-+re_dup|||
-+re_intuit_start||5.006000|
-+re_intuit_string||5.006000|
-+realloc||5.007002|n
-+reentrant_free|||
-+reentrant_init|||
-+reentrant_retry|||vn
-+reentrant_size|||
-+ref_array_or_hash|||
-+refkids|||
-+refto|||
-+ref||5.009003|
-+reg_node|||
-+reganode|||
-+regatom|||
-+regbranch|||
-+regclass_swash||5.007003|
-+regclass|||
-+regcppop|||
-+regcppush|||
-+regcurly|||
-+regdump||5.005000|
-+regexec_flags||5.005000|
-+reghop3|||
-+reghopmaybe3|||
-+reghopmaybe|||
-+reghop|||
-+reginclass|||
-+reginitcolors||5.006000|
-+reginsert|||
-+regmatch|||
-+regnext||5.005000|
-+regoptail|||
-+regpiece|||
-+regpposixcc|||
-+regprop|||
-+regrepeat_hard|||
-+regrepeat|||
-+regtail|||
-+regtry|||
-+reguni|||
-+regwhite|||
-+reg|||
-+repeatcpy|||
-+report_evil_fh|||
-+report_uninit|||
-+require_errno|||
-+require_pv||5.006000|
-+restore_magic|||
-+rninstr|||
-+rsignal_restore|||
-+rsignal_save|||
-+rsignal_state||5.004000|
-+rsignal||5.004000|
-+run_body|||
-+run_user_filter|||
-+runops_debug||5.005000|
-+runops_standard||5.005000|
-+rvpv_dup|||
-+rxres_free|||
-+rxres_restore|||
-+rxres_save|||
-+safesyscalloc||5.006000|n
-+safesysfree||5.006000|n
-+safesysmalloc||5.006000|n
-+safesysrealloc||5.006000|n
-+same_dirent|||
-+save_I16||5.004000|
-+save_I32|||
-+save_I8||5.006000|
-+save_aelem||5.004050|
-+save_alloc||5.006000|
-+save_aptr|||
-+save_ary|||
-+save_bool||5.008001|
-+save_clearsv|||
-+save_delete|||
-+save_destructor_x||5.006000|
-+save_destructor||5.006000|
-+save_freeop|||
-+save_freepv|||
-+save_freesv|||
-+save_generic_pvref||5.006001|
-+save_generic_svref||5.005030|
-+save_gp||5.004000|
-+save_hash|||
-+save_hek_flags|||
-+save_helem||5.004050|
-+save_hints||5.005000|
-+save_hptr|||
-+save_int|||
-+save_item|||
-+save_iv||5.005000|
-+save_lines|||
-+save_list|||
-+save_long|||
-+save_magic|||
-+save_mortalizesv||5.007001|
-+save_nogv|||
-+save_op|||
-+save_padsv||5.007001|
-+save_pptr|||
-+save_re_context||5.006000|
-+save_scalar_at|||
-+save_scalar|||
-+save_set_svflags||5.009000|
-+save_shared_pvref||5.007003|
-+save_sptr|||
-+save_svref|||
-+save_threadsv||5.005000|
-+save_vptr||5.006000|
-+savepvn|||
-+savepv|||
-+savesharedpv||5.007003|
-+savestack_grow_cnt||5.008001|
-+savestack_grow|||
-+savesvpv||5.009002|
-+sawparens|||
-+scalar_mod_type|||
-+scalarboolean|||
-+scalarkids|||
-+scalarseq|||
-+scalarvoid|||
-+scalar|||
-+scan_bin||5.006000|
-+scan_commit|||
-+scan_const|||
-+scan_formline|||
-+scan_heredoc|||
-+scan_hex|||
-+scan_ident|||
-+scan_inputsymbol|||
-+scan_num||5.007001|
-+scan_oct|||
-+scan_pat|||
-+scan_str|||
-+scan_subst|||
-+scan_trans|||
-+scan_version||5.009001|
-+scan_vstring||5.008001|
-+scan_word|||
-+scope|||
-+screaminstr||5.005000|
-+seed||5.008001|
-+sequence_num|||
-+sequence|||
-+set_context||5.006000|n
-+set_csh|||
-+set_numeric_local||5.006000|
-+set_numeric_radix||5.006000|
-+set_numeric_standard||5.006000|
-+setdefout|||
-+setenv_getix|||
-+share_hek_flags|||
-+share_hek||5.004000|
-+si_dup|||
-+sighandler|||n
-+simplify_sort|||
-+skipspace|||
-+sortcv_stacked|||
-+sortcv_xsub|||
-+sortcv|||
-+sortsv_flags||5.009003|
-+sortsv||5.007003|
-+ss_dup|||
-+stack_grow|||
-+start_glob|||
-+start_subparse||5.004000|
-+stashpv_hvname_match||5.009003|
-+stdize_locale|||
-+strEQ|||
-+strGE|||
-+strGT|||
-+strLE|||
-+strLT|||
-+strNE|||
-+str_to_version||5.006000|
-+stringify_regexp|||
-+strip_return|||
-+strnEQ|||
-+strnNE|||
-+study_chunk|||
-+sub_crush_depth|||
-+sublex_done|||
-+sublex_push|||
-+sublex_start|||
-+sv_2bool|||
-+sv_2cv|||
-+sv_2io|||
-+sv_2iuv_non_preserve|||
-+sv_2iv_flags||5.009001|
-+sv_2iv|||
-+sv_2mortal|||
-+sv_2nv|||
-+sv_2pv_flags||5.007002|
-+sv_2pv_nolen|5.006000||p
-+sv_2pvbyte_nolen|||
-+sv_2pvbyte|5.006000||p
-+sv_2pvutf8_nolen||5.006000|
-+sv_2pvutf8||5.006000|
-+sv_2pv|||
-+sv_2uv_flags||5.009001|
-+sv_2uv|5.004000||p
-+sv_add_arena|||
-+sv_add_backref|||
-+sv_backoff|||
-+sv_bless|||
-+sv_cat_decode||5.008001|
-+sv_catpv_mg|5.006000||p
-+sv_catpvf_mg_nocontext|||pvn
-+sv_catpvf_mg|5.006000|5.004000|pv
-+sv_catpvf_nocontext|||vn
-+sv_catpvf||5.004000|v
-+sv_catpvn_flags||5.007002|
-+sv_catpvn_mg|5.004050||p
-+sv_catpvn_nomg|5.007002||p
-+sv_catpvn|||
-+sv_catpv|||
-+sv_catsv_flags||5.007002|
-+sv_catsv_mg|5.004050||p
-+sv_catsv_nomg|5.007002||p
-+sv_catsv|||
-+sv_chop|||
-+sv_clean_all|||
-+sv_clean_objs|||
-+sv_clear|||
-+sv_cmp_locale||5.004000|
-+sv_cmp|||
-+sv_collxfrm|||
-+sv_compile_2op||5.008001|
-+sv_copypv||5.007003|
-+sv_dec|||
-+sv_del_backref|||
-+sv_derived_from||5.004000|
-+sv_dump|||
-+sv_dup|||
-+sv_eq|||
-+sv_exp_grow|||
-+sv_force_normal_flags||5.007001|
-+sv_force_normal||5.006000|
-+sv_free2|||
-+sv_free_arenas|||
-+sv_free|||
-+sv_gets||5.004000|
-+sv_grow|||
-+sv_i_ncmp|||
-+sv_inc|||
-+sv_insert|||
-+sv_isa|||
-+sv_isobject|||
-+sv_iv||5.005000|
-+sv_kill_backrefs|||
-+sv_len_utf8||5.006000|
-+sv_len|||
-+sv_magicext||5.007003|
-+sv_magic|||
-+sv_mortalcopy|||
-+sv_ncmp|||
-+sv_newmortal|||
-+sv_newref|||
-+sv_nolocking||5.007003|
-+sv_nosharing||5.007003|
-+sv_nounlocking||5.007003|
-+sv_nv||5.005000|
-+sv_peek||5.005000|
-+sv_pos_b2u||5.006000|
-+sv_pos_u2b||5.006000|
-+sv_pvbyten_force||5.006000|
-+sv_pvbyten||5.006000|
-+sv_pvbyte||5.006000|
-+sv_pvn_force_flags||5.007002|
-+sv_pvn_force|||p
-+sv_pvn_nomg|5.007003||p
-+sv_pvn|5.006000||p
-+sv_pvutf8n_force||5.006000|
-+sv_pvutf8n||5.006000|
-+sv_pvutf8||5.006000|
-+sv_pv||5.006000|
-+sv_recode_to_utf8||5.007003|
-+sv_reftype|||
-+sv_release_COW|||
-+sv_release_IVX|||
-+sv_replace|||
-+sv_report_used|||
-+sv_reset|||
-+sv_rvweaken||5.006000|
-+sv_setiv_mg|5.006000||p
-+sv_setiv|||
-+sv_setnv_mg|5.006000||p
-+sv_setnv|||
-+sv_setpv_mg|5.006000||p
-+sv_setpvf_mg_nocontext|||pvn
-+sv_setpvf_mg|5.006000|5.004000|pv
-+sv_setpvf_nocontext|||vn
-+sv_setpvf||5.004000|v
-+sv_setpviv_mg||5.008001|
-+sv_setpviv||5.008001|
-+sv_setpvn_mg|5.006000||p
-+sv_setpvn|||
-+sv_setpv|||
-+sv_setref_iv|||
-+sv_setref_nv|||
-+sv_setref_pvn|||
-+sv_setref_pv|||
-+sv_setref_uv||5.007001|
-+sv_setsv_cow|||
-+sv_setsv_flags||5.007002|
-+sv_setsv_mg|5.006000||p
-+sv_setsv_nomg|5.007002||p
-+sv_setsv|||
-+sv_setuv_mg|5.006000||p
-+sv_setuv|5.006000||p
-+sv_tainted||5.004000|
-+sv_taint||5.004000|
-+sv_true||5.005000|
-+sv_unglob|||
-+sv_uni_display||5.007003|
-+sv_unmagic|||
-+sv_unref_flags||5.007001|
-+sv_unref|||
-+sv_untaint||5.004000|
-+sv_upgrade|||
-+sv_usepvn_mg|5.006000||p
-+sv_usepvn|||
-+sv_utf8_decode||5.006000|
-+sv_utf8_downgrade||5.006000|
-+sv_utf8_encode||5.006000|
-+sv_utf8_upgrade_flags||5.007002|
-+sv_utf8_upgrade||5.007001|
-+sv_uv|5.006000||p
-+sv_vcatpvf_mg|5.006000|5.004000|p
-+sv_vcatpvfn||5.004000|
-+sv_vcatpvf|5.006000|5.004000|p
-+sv_vsetpvf_mg|5.006000|5.004000|p
-+sv_vsetpvfn||5.004000|
-+sv_vsetpvf|5.006000|5.004000|p
-+svtype|||
-+swallow_bom|||
-+swash_fetch||5.007002|
-+swash_get|||
-+swash_init||5.006000|
-+sys_intern_clear|||
-+sys_intern_dup|||
-+sys_intern_init|||
-+taint_env|||
-+taint_proper|||
-+tmps_grow||5.006000|
-+toLOWER|||
-+toUPPER|||
-+to_byte_substr|||
-+to_uni_fold||5.007003|
-+to_uni_lower_lc||5.006000|
-+to_uni_lower||5.007003|
-+to_uni_title_lc||5.006000|
-+to_uni_title||5.007003|
-+to_uni_upper_lc||5.006000|
-+to_uni_upper||5.007003|
-+to_utf8_case||5.007003|
-+to_utf8_fold||5.007003|
-+to_utf8_lower||5.007003|
-+to_utf8_substr|||
-+to_utf8_title||5.007003|
-+to_utf8_upper||5.007003|
-+tokenize_use|||
-+tokeq|||
-+tokereport|||
-+too_few_arguments|||
-+too_many_arguments|||
-+uiv_2buf|||n
-+unlnk|||
-+unpack_rec|||
-+unpack_str||5.007003|
-+unpackstring||5.008001|
-+unshare_hek_or_pvn|||
-+unshare_hek|||
-+unsharepvn||5.004000|
-+unwind_handler_stack|||
-+upg_version||5.009000|
-+usage|||
-+utf16_to_utf8_reversed||5.006001|
-+utf16_to_utf8||5.006001|
-+utf8_distance||5.006000|
-+utf8_hop||5.006000|
-+utf8_length||5.007001|
-+utf8_mg_pos_init|||
-+utf8_mg_pos|||
-+utf8_to_bytes||5.006001|
-+utf8_to_uvchr||5.007001|
-+utf8_to_uvuni||5.007001|
-+utf8n_to_uvchr|||
-+utf8n_to_uvuni||5.007001|
-+utilize|||
-+uvchr_to_utf8_flags||5.007003|
-+uvchr_to_utf8|||
-+uvuni_to_utf8_flags||5.007003|
-+uvuni_to_utf8||5.007001|
-+validate_suid|||
-+varname|||
-+vcmp||5.009000|
-+vcroak||5.006000|
-+vdeb||5.007003|
-+vdie_common|||
-+vdie_croak_common|||
-+vdie|||
-+vform||5.006000|
-+visit|||
-+vivify_defelem|||
-+vivify_ref|||
-+vload_module||5.006000|
-+vmess||5.006000|
-+vnewSVpvf|5.006000|5.004000|p
-+vnormal||5.009002|
-+vnumify||5.009000|
-+vstringify||5.009000|
-+vverify||5.009003|
-+vwarner||5.006000|
-+vwarn||5.006000|
-+wait4pid|||
-+warn_nocontext|||vn
-+warner_nocontext|||vn
-+warner||5.006000|v
-+warn|||v
-+watch|||
-+whichsig|||
-+write_no_mem|||
-+write_to_stderr|||
-+yyerror|||
-+yylex|||
-+yyparse|||
-+yywarn|||
-+);
-+
-+if (exists $opt{'list-unsupported'}) {
-+  my $f;
-+  for $f (sort { lc $a cmp lc $b } keys %API) {
-+    next unless $API{$f}{todo};
-+    print "$f ", '.'x(40-length($f)), " ", format_version($API{$f}{todo}), "\n";
-+  }
-+  exit 0;
-+}
-+
-+# Scan for possible replacement candidates
-+
-+my(%replace, %need, %hints, %depends);
-+my $replace = 0;
-+my $hint = '';
-+
-+while (<DATA>) {
-+  if ($hint) {
-+    if (m{^\s*\*\s(.*?)\s*$}) {
-+      $hints{$hint} ||= '';  # suppress warning with older perls
-+      $hints{$hint} .= "$1\n";
-+    }
-+    else {
-+      $hint = '';
-+    }
-+  }
-+  $hint = $1 if m{^\s*$rccs\sHint:\s+(\w+)\s*$};
-+
-+  $replace     = $1 if m{^\s*$rccs\s+Replace:\s+(\d+)\s+$rcce\s*$};
-+  $replace{$2} = $1 if $replace and m{^\s*#\s*define\s+(\w+)(?:\([^)]*\))?\s+(\w+)};
-+  $replace{$2} = $1 if m{^\s*#\s*define\s+(\w+)(?:\([^)]*\))?\s+(\w+).*$rccs\s+Replace\s+$rcce};
-+  $replace{$1} = $2 if m{^\s*$rccs\s+Replace (\w+) with (\w+)\s+$rcce\s*$};
-+
-+  if (m{^\s*$rccs\s+(\w+)\s+depends\s+on\s+(\w+(\s*,\s*\w+)*)\s+$rcce\s*$}) {
-+    push @{$depends{$1}}, map { s/\s+//g; $_ } split /,/, $2;
-+  }
-+
-+  $need{$1} = 1 if m{^#if\s+defined\(NEED_(\w+)(?:_GLOBAL)?\)};
-+}
-+
-+if (exists $opt{'api-info'}) {
-+  my $f;
-+  my $count = 0;
-+  my $match = $opt{'api-info'} =~ m!^/(.*)/$! ? $1 : "^\Q$opt{'api-info'}\E\$";
-+  for $f (sort { lc $a cmp lc $b } keys %API) {
-+    next unless $f =~ /$match/;
-+    print "\n=== $f ===\n\n";
-+    my $info = 0;
-+    if ($API{$f}{base} || $API{$f}{todo}) {
-+      my $base = format_version($API{$f}{base} || $API{$f}{todo});
-+      print "Supported at least starting from perl-$base.\n";
-+      $info++;
-+    }
-+    if ($API{$f}{provided}) {
-+      my $todo = $API{$f}{todo} ? format_version($API{$f}{todo}) : "5.003";
-+      print "Support by $ppport provided back to perl-$todo.\n";
-+      print "Support needs to be explicitly requested by NEED_$f.\n" if exists $need{$f};
-+      print "Depends on: ", join(', ', @{$depends{$f}}), ".\n" if exists $depends{$f};
-+      print "$hints{$f}" if exists $hints{$f};
-+      $info++;
-+    }
-+    unless ($info) {
-+      print "No portability information available.\n";
-+    }
-+    $count++;
-+  }
-+  if ($count > 0) {
-+    print "\n";
-+  }
-+  else {
-+    print "Found no API matching '$opt{'api-info'}'.\n";
-+  }
-+  exit 0;
-+}
-+
-+if (exists $opt{'list-provided'}) {
-+  my $f;
-+  for $f (sort { lc $a cmp lc $b } keys %API) {
-+    next unless $API{$f}{provided};
-+    my @flags;
-+    push @flags, 'explicit' if exists $need{$f};
-+    push @flags, 'depend'   if exists $depends{$f};
-+    push @flags, 'hint'     if exists $hints{$f};
-+    my $flags = @flags ? '  ['.join(', ', @flags).']' : '';
-+    print "$f$flags\n";
-+  }
-+  exit 0;
-+}
-+
-+my @files;
-+my @srcext = qw( xs c h cc cpp );
-+my $srcext = join '|', @srcext;
-+
-+if (@ARGV) {
-+  my %seen;
-+  @files = grep { -f && !exists $seen{$_} } map { glob $_ } @ARGV;
-+}
-+else {
-+  eval {
-+    require File::Find;
-+    File::Find::find(sub {
-+      $File::Find::name =~ /\.($srcext)$/i
-+          and push @files, $File::Find::name;
-+    }, '.');
-+  };
-+  if ($@) {
-+    @files = map { glob "*.$_" } @srcext;
-+  }
-+}
-+
-+if (!@ARGV || $opt{filter}) {
-+  my(@in, @out);
-+  my %xsc = map { /(.*)\.xs$/ ? ("$1.c" => 1, "$1.cc" => 1) : () } @files;
-+  for (@files) {
-+    my $out = exists $xsc{$_} || /\b\Q$ppport\E$/i || !/\.($srcext)$/i;
-+    push @{ $out ? \@out : \@in }, $_;
-+  }
-+  if (@ARGV && @out) {
-+    warning("Skipping the following files (use --nofilter to avoid this):\n| ", join "\n| ", @out);
-+  }
-+  @files = @in;
-+}
-+
-+unless (@files) {
-+  die "No input files given!\n";
-+}
-+
-+my(%files, %global, %revreplace);
-+%revreplace = reverse %replace;
-+my $filename;
-+my $patch_opened = 0;
-+
-+for $filename (@files) {
-+  unless (open IN, "<$filename") {
-+    warn "Unable to read from $filename: $!\n";
-+    next;
-+  }
-+
-+  info("Scanning $filename ...");
-+
-+  my $c = do { local $/; <IN> };
-+  close IN;
-+
-+  my %file = (orig => $c, changes => 0);
-+
-+  # temporarily remove C comments from the code
-+  my @ccom;
-+  $c =~ s{
-+    (
-+        [^"'/]+
-+      |
-+        (?:"[^"\\]*(?:\\.[^"\\]*)*" [^"'/]*)+
-+      |
-+        (?:'[^'\\]*(?:\\.[^'\\]*)*' [^"'/]*)+
-+    )
-+  |
-+    (/ (?:
-+        \*[^*]*\*+(?:[^$ccs][^*]*\*+)* /
-+        |
-+        /[^\r\n]*
-+      ))
-+  }{
-+    defined $2 and push @ccom, $2;
-+    defined $1 ? $1 : "$ccs$#ccom$cce";
-+  }egsx;
-+
-+  $file{ccom} = \@ccom;
-+  $file{code} = $c;
-+  $file{has_inc_ppport} = ($c =~ /#.*include.*\Q$ppport\E/);
-+
-+  my $func;
-+
-+  for $func (keys %API) {
-+    my $match = $func;
-+    $match .= "|$revreplace{$func}" if exists $revreplace{$func};
-+    if ($c =~ /\b(?:Perl_)?($match)\b/) {
-+      $file{uses_replace}{$1}++ if exists $revreplace{$func} && $1 eq $revreplace{$func};
-+      $file{uses_Perl}{$func}++ if $c =~ /\bPerl_$func\b/;
-+      if (exists $API{$func}{provided}) {
-+        if (!exists $API{$func}{base} || $API{$func}{base} > $opt{'compat-version'}) {
-+          $file{uses}{$func}++;
-+          my @deps = rec_depend($func);
-+          if (@deps) {
-+            $file{uses_deps}{$func} = \@deps;
-+            for (@deps) {
-+              $file{uses}{$_} = 0 unless exists $file{uses}{$_};
-+            }
-+          }
-+          for ($func, @deps) {
-+            if (exists $need{$_}) {
-+              $file{needs}{$_} = 'static';
-+            }
-+          }
-+        }
-+      }
-+      if (exists $API{$func}{todo} && $API{$func}{todo} > $opt{'compat-version'}) {
-+        if ($c =~ /\b$func\b/) {
-+          $file{uses_todo}{$func}++;
-+        }
-+      }
-+    }
-+  }
-+
-+  while ($c =~ /^$HS*#$HS*define$HS+(NEED_(\w+?)(_GLOBAL)?)\b/mg) {
-+    if (exists $need{$2}) {
-+      $file{defined $3 ? 'needed_global' : 'needed_static'}{$2}++;
-+    }
-+    else {
-+      warning("Possibly wrong #define $1 in $filename");
-+    }
-+  }
-+
-+  for (qw(uses needs uses_todo needed_global needed_static)) {
-+    for $func (keys %{$file{$_}}) {
-+      push @{$global{$_}{$func}}, $filename;
-+    }
-+  }
-+
-+  $files{$filename} = \%file;
-+}
-+
-+# Globally resolve NEED_'s
-+my $need;
-+for $need (keys %{$global{needs}}) {
-+  if (@{$global{needs}{$need}} > 1) {
-+    my @targets = @{$global{needs}{$need}};
-+    my @t = grep $files{$_}{needed_global}{$need}, @targets;
-+    @targets = @t if @t;
-+    @t = grep /\.xs$/i, @targets;
-+    @targets = @t if @t;
-+    my $target = shift @targets;
-+    $files{$target}{needs}{$need} = 'global';
-+    for (@{$global{needs}{$need}}) {
-+      $files{$_}{needs}{$need} = 'extern' if $_ ne $target;
-+    }
-+  }
-+}
-+
-+for $filename (@files) {
-+  exists $files{$filename} or next;
-+
-+  info("=== Analyzing $filename ===");
-+
-+  my %file = %{$files{$filename}};
-+  my $func;
-+  my $c = $file{code};
-+
-+  for $func (sort keys %{$file{uses_Perl}}) {
-+    if ($API{$func}{varargs}) {
-+      my $changes = ($c =~ s{\b(Perl_$func\s*\(\s*)(?!aTHX_?)(\)|[^\s)]*\))}
-+                            { $1 . ($2 eq ')' ? 'aTHX' : 'aTHX_ ') . $2 }ge);
-+      if ($changes) {
-+        warning("Doesn't pass interpreter argument aTHX to Perl_$func");
-+        $file{changes} += $changes;
-+      }
-+    }
-+    else {
-+      warning("Uses Perl_$func instead of $func");
-+      $file{changes} += ($c =~ s{\bPerl_$func(\s*)\((\s*aTHX_?)?\s*}
-+                                {$func$1(}g);
-+    }
-+  }
-+
-+  for $func (sort keys %{$file{uses_replace}}) {
-+    warning("Uses $func instead of $replace{$func}");
-+    $file{changes} += ($c =~ s/\b$func\b/$replace{$func}/g);
-+  }
-+
-+  for $func (sort keys %{$file{uses}}) {
-+    next unless $file{uses}{$func};   # if it's only a dependency
-+    if (exists $file{uses_deps}{$func}) {
-+      diag("Uses $func, which depends on ", join(', ', @{$file{uses_deps}{$func}}));
-+    }
-+    elsif (exists $replace{$func}) {
-+      warning("Uses $func instead of $replace{$func}");
-+      $file{changes} += ($c =~ s/\b$func\b/$replace{$func}/g);
-+    }
-+    else {
-+      diag("Uses $func");
-+    }
-+    hint($func);
-+  }
-+
-+  for $func (sort keys %{$file{uses_todo}}) {
-+    warning("Uses $func, which may not be portable below perl ",
-+            format_version($API{$func}{todo}));
-+  }
-+
-+  for $func (sort keys %{$file{needed_static}}) {
-+    my $message = '';
-+    if (not exists $file{uses}{$func}) {
-+      $message = "No need to define NEED_$func if $func is never used";
-+    }
-+    elsif (exists $file{needs}{$func} && $file{needs}{$func} ne 'static') {
-+      $message = "No need to define NEED_$func when already needed globally";
-+    }
-+    if ($message) {
-+      diag($message);
-+      $file{changes} += ($c =~ s/^$HS*#$HS*define$HS+NEED_$func\b.*$LF//mg);
-+    }
-+  }
-+
-+  for $func (sort keys %{$file{needed_global}}) {
-+    my $message = '';
-+    if (not exists $global{uses}{$func}) {
-+      $message = "No need to define NEED_${func}_GLOBAL if $func is never used";
-+    }
-+    elsif (exists $file{needs}{$func}) {
-+      if ($file{needs}{$func} eq 'extern') {
-+        $message = "No need to define NEED_${func}_GLOBAL when already needed globally";
-+      }
-+      elsif ($file{needs}{$func} eq 'static') {
-+        $message = "No need to define NEED_${func}_GLOBAL when only used in this file";
-+      }
-+    }
-+    if ($message) {
-+      diag($message);
-+      $file{changes} += ($c =~ s/^$HS*#$HS*define$HS+NEED_${func}_GLOBAL\b.*$LF//mg);
-+    }
-+  }
-+
-+  $file{needs_inc_ppport} = keys %{$file{uses}};
-+
-+  if ($file{needs_inc_ppport}) {
-+    my $pp = '';
-+
-+    for $func (sort keys %{$file{needs}}) {
-+      my $type = $file{needs}{$func};
-+      next if $type eq 'extern';
-+      my $suffix = $type eq 'global' ? '_GLOBAL' : '';
-+      unless (exists $file{"needed_$type"}{$func}) {
-+        if ($type eq 'global') {
-+          diag("Files [@{$global{needs}{$func}}] need $func, adding global request");
-+        }
-+        else {
-+          diag("File needs $func, adding static request");
-+        }
-+        $pp .= "#define NEED_$func$suffix\n";
-+      }
-+    }
-+
-+    if ($pp && ($c =~ s/^(?=$HS*#$HS*define$HS+NEED_\w+)/$pp/m)) {
-+      $pp = '';
-+      $file{changes}++;
-+    }
-+
-+    unless ($file{has_inc_ppport}) {
-+      diag("Needs to include '$ppport'");
-+      $pp .= qq(#include "$ppport"\n)
-+    }
-+
-+    if ($pp) {
-+      $file{changes} += ($c =~ s/^($HS*#$HS*define$HS+NEED_\w+.*?)^/$1$pp/ms)
-+                     || ($c =~ s/^(?=$HS*#$HS*include.*\Q$ppport\E)/$pp/m)
-+                     || ($c =~ s/^($HS*#$HS*include.*XSUB.*\s*?)^/$1$pp/m)
-+                     || ($c =~ s/^/$pp/);
-+    }
-+  }
-+  else {
-+    if ($file{has_inc_ppport}) {
-+      diag("No need to include '$ppport'");
-+      $file{changes} += ($c =~ s/^$HS*?#$HS*include.*\Q$ppport\E.*?$LF//m);
-+    }
-+  }
-+
-+  # put back in our C comments
-+  my $ix;
-+  my $cppc = 0;
-+  my @ccom = @{$file{ccom}};
-+  for $ix (0 .. $#ccom) {
-+    if (!$opt{cplusplus} && $ccom[$ix] =~ s!^//!!) {
-+      $cppc++;
-+      $file{changes} += $c =~ s/$rccs$ix$rcce/$ccs$ccom[$ix] $cce/;
-+    }
-+    else {
-+      $c =~ s/$rccs$ix$rcce/$ccom[$ix]/;
-+    }
-+  }
-+
-+  if ($cppc) {
-+    my $s = $cppc != 1 ? 's' : '';
-+    warning("Uses $cppc C++ style comment$s, which is not portable");
-+  }
-+
-+  if ($file{changes}) {
-+    if (exists $opt{copy}) {
-+      my $newfile = "$filename$opt{copy}";
-+      if (-e $newfile) {
-+        error("'$newfile' already exists, refusing to write copy of '$filename'");
-+      }
-+      else {
-+        local *F;
-+        if (open F, ">$newfile") {
-+          info("Writing copy of '$filename' with changes to '$newfile'");
-+          print F $c;
-+          close F;
-+        }
-+        else {
-+          error("Cannot open '$newfile' for writing: $!");
-+        }
-+      }
-+    }
-+    elsif (exists $opt{patch} || $opt{changes}) {
-+      if (exists $opt{patch}) {
-+        unless ($patch_opened) {
-+          if (open PATCH, ">$opt{patch}") {
-+            $patch_opened = 1;
-+          }
-+          else {
-+            error("Cannot open '$opt{patch}' for writing: $!");
-+            delete $opt{patch};
-+            $opt{changes} = 1;
-+            goto fallback;
-+          }
-+        }
-+        mydiff(\*PATCH, $filename, $c);
-+      }
-+      else {
-+fallback:
-+        info("Suggested changes:");
-+        mydiff(\*STDOUT, $filename, $c);
-+      }
-+    }
-+    else {
-+      my $s = $file{changes} == 1 ? '' : 's';
-+      info("$file{changes} potentially required change$s detected");
-+    }
-+  }
-+  else {
-+    info("Looks good");
-+  }
-+}
-+
-+close PATCH if $patch_opened;
-+
-+exit 0;
-+
-+
-+sub mydiff
-+{
-+  local *F = shift;
-+  my($file, $str) = @_;
-+  my $diff;
-+
-+  if (exists $opt{diff}) {
-+    $diff = run_diff($opt{diff}, $file, $str);
-+  }
-+
-+  if (!defined $diff and can_use('Text::Diff')) {
-+    $diff = Text::Diff::diff($file, \$str, { STYLE => 'Unified' });
-+    $diff = <<HEADER . $diff;
-+--- $file
-++++ $file.patched
-+HEADER
-+  }
-+
-+  if (!defined $diff) {
-+    $diff = run_diff('diff -u', $file, $str);
-+  }
-+
-+  if (!defined $diff) {
-+    $diff = run_diff('diff', $file, $str);
-+  }
-+
-+  if (!defined $diff) {
-+    error("Cannot generate a diff. Please install Text::Diff or use --copy.");
-+    return;
-+  }
-+
-+  print F $diff;
-+
-+}
-+
-+sub run_diff
-+{
-+  my($prog, $file, $str) = @_;
-+  my $tmp = 'dppptemp';
-+  my $suf = 'aaa';
-+  my $diff = '';
-+  local *F;
-+
-+  while (-e "$tmp.$suf") { $suf++ }
-+  $tmp = "$tmp.$suf";
-+
-+  if (open F, ">$tmp") {
-+    print F $str;
-+    close F;
-+
-+    if (open F, "$prog $file $tmp |") {
-+      while (<F>) {
-+        s/\Q$tmp\E/$file.patched/;
-+        $diff .= $_;
-+      }
-+      close F;
-+      unlink $tmp;
-+      return $diff;
-+    }
-+
-+    unlink $tmp;
-+  }
-+  else {
-+    error("Cannot open '$tmp' for writing: $!");
-+  }
-+
-+  return undef;
-+}
-+
-+sub can_use
-+{
-+  eval "use @_;";
-+  return $@ eq '';
-+}
-+
-+sub rec_depend
-+{
-+  my $func = shift;
-+  my %seen;
-+  return () unless exists $depends{$func};
-+  grep !$seen{$_}++, map { ($_, rec_depend($_)) } @{$depends{$func}};
-+}
-+
-+sub parse_version
-+{
-+  my $ver = shift;
-+
-+  if ($ver =~ /^(\d+)\.(\d+)\.(\d+)$/) {
-+    return ($1, $2, $3);
-+  }
-+  elsif ($ver !~ /^\d+\.[\d_]+$/) {
-+    die "cannot parse version '$ver'\n";
-+  }
-+
-+  $ver =~ s/_//g;
-+  $ver =~ s/$/000000/;
-+
-+  my($r,$v,$s) = $ver =~ /(\d+)\.(\d{3})(\d{3})/;
-+
-+  $v = int $v;
-+  $s = int $s;
-+
-+  if ($r < 5 || ($r == 5 && $v < 6)) {
-+    if ($s % 10) {
-+      die "cannot parse version '$ver'\n";
-+    }
-+  }
-+
-+  return ($r, $v, $s);
-+}
-+
-+sub format_version
-+{
-+  my $ver = shift;
-+
-+  $ver =~ s/$/000000/;
-+  my($r,$v,$s) = $ver =~ /(\d+)\.(\d{3})(\d{3})/;
-+
-+  $v = int $v;
-+  $s = int $s;
-+
-+  if ($r < 5 || ($r == 5 && $v < 6)) {
-+    if ($s % 10) {
-+      die "invalid version '$ver'\n";
-+    }
-+    $s /= 10;
-+
-+    $ver = sprintf "%d.%03d", $r, $v;
-+    $s > 0 and $ver .= sprintf "_%02d", $s;
-+
-+    return $ver;
-+  }
-+
-+  return sprintf "%d.%d.%d", $r, $v, $s;
-+}
-+
-+sub info
-+{
-+  $opt{quiet} and return;
-+  print @_, "\n";
-+}
-+
-+sub diag
-+{
-+  $opt{quiet} and return;
-+  $opt{diag} and print @_, "\n";
-+}
-+
-+sub warning
-+{
-+  $opt{quiet} and return;
-+  print "*** ", @_, "\n";
-+}
-+
-+sub error
-+{
-+  print "*** ERROR: ", @_, "\n";
-+}
-+
-+my %given_hints;
-+sub hint
-+{
-+  $opt{quiet} and return;
-+  $opt{hints} or return;
-+  my $func = shift;
-+  exists $hints{$func} or return;
-+  $given_hints{$func}++ and return;
-+  my $hint = $hints{$func};
-+  $hint =~ s/^/   /mg;
-+  print "   --- hint for $func ---\n", $hint;
-+}
-+
-+sub usage
-+{
-+  my($usage) = do { local(@ARGV,$/)=($0); <> } =~ /^=head\d$HS+SYNOPSIS\s*^(.*?)\s*^=/ms;
-+  my %M = ( 'I' => '*' );
-+  $usage =~ s/^\s*perl\s+\S+/$^X $0/;
-+  $usage =~ s/([A-Z])<([^>]+)>/$M{$1}$2$M{$1}/g;
-+
-+  print <<ENDUSAGE;
-+
-+Usage: $usage
-+
-+See perldoc $0 for details.
-+
-+ENDUSAGE
-+
-+  exit 2;
-+}
-+
-+sub strip
-+{
-+  my $self = do { local(@ARGV,$/)=($0); <> };
-+  $self =~ s/^$HS+Do NOT edit.*?(?=^-)//ms;
-+  $self =~ s/^SKIP.*(?=^__DATA__)/SKIP
-+if (\@ARGV && \$ARGV[0] eq '--unstrip') {
-+  eval { require Devel::PPPort };
-+  \$@ and die "Cannot require Devel::PPPort, please install.\\n";
-+  Devel::PPPort::WriteFile(\$0);
-+  exit 0;
-+}
-+print <<END;
-+
-+Sorry, but this is a stripped version of \$0.
-+
-+To be able to use its original script and doc functionality,
-+please try to regenerate this file using:
-+
-+  \$^X \$0 --unstrip
-+
-+END
-+/ms;
-+
-+  open OUT, ">$0" or die "cannot strip $0: $!\n";
-+  print OUT $self;
-+
-+  exit 0;
-+}
-+
-+__DATA__
-+*/
-+
-+#ifndef _P_P_PORTABILITY_H_
-+#define _P_P_PORTABILITY_H_
-+
-+#ifndef DPPP_NAMESPACE
-+#  define DPPP_NAMESPACE DPPP_
-+#endif
-+
-+#define DPPP_CAT2(x,y) CAT2(x,y)
-+#define DPPP_(name) DPPP_CAT2(DPPP_NAMESPACE, name)
-+
-+#ifndef PERL_REVISION
-+#  if !defined(__PATCHLEVEL_H_INCLUDED__) && !(defined(PATCHLEVEL) && defined(SUBVERSION))
-+#    define PERL_PATCHLEVEL_H_IMPLICIT
-+#    include <patchlevel.h>
-+#  endif
-+#  if !(defined(PERL_VERSION) || (defined(SUBVERSION) && defined(PATCHLEVEL)))
-+#    include <could_not_find_Perl_patchlevel.h>
-+#  endif
-+#  ifndef PERL_REVISION
-+#    define PERL_REVISION       (5)
-+     /* Replace: 1 */
-+#    define PERL_VERSION        PATCHLEVEL
-+#    define PERL_SUBVERSION     SUBVERSION
-+     /* Replace PERL_PATCHLEVEL with PERL_VERSION */
-+     /* Replace: 0 */
-+#  endif
-+#endif
-+
-+#define PERL_BCDVERSION ((PERL_REVISION * 0x1000000L) + (PERL_VERSION * 0x1000L) + PERL_SUBVERSION)
-+
-+/* It is very unlikely that anyone will try to use this with Perl 6
-+   (or greater), but who knows.
-+ */
-+#if PERL_REVISION != 5
-+#  error ppport.h only works with Perl version 5
-+#endif /* PERL_REVISION != 5 */
-+
-+#ifdef I_LIMITS
-+#  include <limits.h>
-+#endif
-+
-+#ifndef PERL_UCHAR_MIN
-+#  define PERL_UCHAR_MIN ((unsigned char)0)
-+#endif
-+
-+#ifndef PERL_UCHAR_MAX
-+#  ifdef UCHAR_MAX
-+#    define PERL_UCHAR_MAX ((unsigned char)UCHAR_MAX)
-+#  else
-+#    ifdef MAXUCHAR
-+#      define PERL_UCHAR_MAX ((unsigned char)MAXUCHAR)
-+#    else
-+#      define PERL_UCHAR_MAX ((unsigned char)~(unsigned)0)
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef PERL_USHORT_MIN
-+#  define PERL_USHORT_MIN ((unsigned short)0)
-+#endif
-+
-+#ifndef PERL_USHORT_MAX
-+#  ifdef USHORT_MAX
-+#    define PERL_USHORT_MAX ((unsigned short)USHORT_MAX)
-+#  else
-+#    ifdef MAXUSHORT
-+#      define PERL_USHORT_MAX ((unsigned short)MAXUSHORT)
-+#    else
-+#      ifdef USHRT_MAX
-+#        define PERL_USHORT_MAX ((unsigned short)USHRT_MAX)
-+#      else
-+#        define PERL_USHORT_MAX ((unsigned short)~(unsigned)0)
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef PERL_SHORT_MAX
-+#  ifdef SHORT_MAX
-+#    define PERL_SHORT_MAX ((short)SHORT_MAX)
-+#  else
-+#    ifdef MAXSHORT    /* Often used in <values.h> */
-+#      define PERL_SHORT_MAX ((short)MAXSHORT)
-+#    else
-+#      ifdef SHRT_MAX
-+#        define PERL_SHORT_MAX ((short)SHRT_MAX)
-+#      else
-+#        define PERL_SHORT_MAX ((short) (PERL_USHORT_MAX >> 1))
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef PERL_SHORT_MIN
-+#  ifdef SHORT_MIN
-+#    define PERL_SHORT_MIN ((short)SHORT_MIN)
-+#  else
-+#    ifdef MINSHORT
-+#      define PERL_SHORT_MIN ((short)MINSHORT)
-+#    else
-+#      ifdef SHRT_MIN
-+#        define PERL_SHORT_MIN ((short)SHRT_MIN)
-+#      else
-+#        define PERL_SHORT_MIN (-PERL_SHORT_MAX - ((3 & -1) == 3))
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef PERL_UINT_MAX
-+#  ifdef UINT_MAX
-+#    define PERL_UINT_MAX ((unsigned int)UINT_MAX)
-+#  else
-+#    ifdef MAXUINT
-+#      define PERL_UINT_MAX ((unsigned int)MAXUINT)
-+#    else
-+#      define PERL_UINT_MAX (~(unsigned int)0)
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef PERL_UINT_MIN
-+#  define PERL_UINT_MIN ((unsigned int)0)
-+#endif
-+
-+#ifndef PERL_INT_MAX
-+#  ifdef INT_MAX
-+#    define PERL_INT_MAX ((int)INT_MAX)
-+#  else
-+#    ifdef MAXINT    /* Often used in <values.h> */
-+#      define PERL_INT_MAX ((int)MAXINT)
-+#    else
-+#      define PERL_INT_MAX ((int)(PERL_UINT_MAX >> 1))
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef PERL_INT_MIN
-+#  ifdef INT_MIN
-+#    define PERL_INT_MIN ((int)INT_MIN)
-+#  else
-+#    ifdef MININT
-+#      define PERL_INT_MIN ((int)MININT)
-+#    else
-+#      define PERL_INT_MIN (-PERL_INT_MAX - ((3 & -1) == 3))
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef PERL_ULONG_MAX
-+#  ifdef ULONG_MAX
-+#    define PERL_ULONG_MAX ((unsigned long)ULONG_MAX)
-+#  else
-+#    ifdef MAXULONG
-+#      define PERL_ULONG_MAX ((unsigned long)MAXULONG)
-+#    else
-+#      define PERL_ULONG_MAX (~(unsigned long)0)
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef PERL_ULONG_MIN
-+#  define PERL_ULONG_MIN ((unsigned long)0L)
-+#endif
-+
-+#ifndef PERL_LONG_MAX
-+#  ifdef LONG_MAX
-+#    define PERL_LONG_MAX ((long)LONG_MAX)
-+#  else
-+#    ifdef MAXLONG
-+#      define PERL_LONG_MAX ((long)MAXLONG)
-+#    else
-+#      define PERL_LONG_MAX ((long) (PERL_ULONG_MAX >> 1))
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef PERL_LONG_MIN
-+#  ifdef LONG_MIN
-+#    define PERL_LONG_MIN ((long)LONG_MIN)
-+#  else
-+#    ifdef MINLONG
-+#      define PERL_LONG_MIN ((long)MINLONG)
-+#    else
-+#      define PERL_LONG_MIN (-PERL_LONG_MAX - ((3 & -1) == 3))
-+#    endif
-+#  endif
-+#endif
-+
-+#if defined(HAS_QUAD) && (defined(convex) || defined(uts))
-+#  ifndef PERL_UQUAD_MAX
-+#    ifdef ULONGLONG_MAX
-+#      define PERL_UQUAD_MAX ((unsigned long long)ULONGLONG_MAX)
-+#    else
-+#      ifdef MAXULONGLONG
-+#        define PERL_UQUAD_MAX ((unsigned long long)MAXULONGLONG)
-+#      else
-+#        define PERL_UQUAD_MAX (~(unsigned long long)0)
-+#      endif
-+#    endif
-+#  endif
-+
-+#  ifndef PERL_UQUAD_MIN
-+#    define PERL_UQUAD_MIN ((unsigned long long)0L)
-+#  endif
-+
-+#  ifndef PERL_QUAD_MAX
-+#    ifdef LONGLONG_MAX
-+#      define PERL_QUAD_MAX ((long long)LONGLONG_MAX)
-+#    else
-+#      ifdef MAXLONGLONG
-+#        define PERL_QUAD_MAX ((long long)MAXLONGLONG)
-+#      else
-+#        define PERL_QUAD_MAX ((long long) (PERL_UQUAD_MAX >> 1))
-+#      endif
-+#    endif
-+#  endif
-+
-+#  ifndef PERL_QUAD_MIN
-+#    ifdef LONGLONG_MIN
-+#      define PERL_QUAD_MIN ((long long)LONGLONG_MIN)
-+#    else
-+#      ifdef MINLONGLONG
-+#        define PERL_QUAD_MIN ((long long)MINLONGLONG)
-+#      else
-+#        define PERL_QUAD_MIN (-PERL_QUAD_MAX - ((3 & -1) == 3))
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+/* This is based on code from 5.003 perl.h */
-+#ifdef HAS_QUAD
-+#  ifdef cray
-+#ifndef IVTYPE
-+#  define IVTYPE                         int
-+#endif
-+
-+#ifndef IV_MIN
-+#  define IV_MIN                         PERL_INT_MIN
-+#endif
-+
-+#ifndef IV_MAX
-+#  define IV_MAX                         PERL_INT_MAX
-+#endif
-+
-+#ifndef UV_MIN
-+#  define UV_MIN                         PERL_UINT_MIN
-+#endif
-+
-+#ifndef UV_MAX
-+#  define UV_MAX                         PERL_UINT_MAX
-+#endif
-+
-+#    ifdef INTSIZE
-+#ifndef IVSIZE
-+#  define IVSIZE                         INTSIZE
-+#endif
-+
-+#    endif
-+#  else
-+#    if defined(convex) || defined(uts)
-+#ifndef IVTYPE
-+#  define IVTYPE                         long long
-+#endif
-+
-+#ifndef IV_MIN
-+#  define IV_MIN                         PERL_QUAD_MIN
-+#endif
-+
-+#ifndef IV_MAX
-+#  define IV_MAX                         PERL_QUAD_MAX
-+#endif
-+
-+#ifndef UV_MIN
-+#  define UV_MIN                         PERL_UQUAD_MIN
-+#endif
-+
-+#ifndef UV_MAX
-+#  define UV_MAX                         PERL_UQUAD_MAX
-+#endif
-+
-+#      ifdef LONGLONGSIZE
-+#ifndef IVSIZE
-+#  define IVSIZE                         LONGLONGSIZE
-+#endif
-+
-+#      endif
-+#    else
-+#ifndef IVTYPE
-+#  define IVTYPE                         long
-+#endif
-+
-+#ifndef IV_MIN
-+#  define IV_MIN                         PERL_LONG_MIN
-+#endif
-+
-+#ifndef IV_MAX
-+#  define IV_MAX                         PERL_LONG_MAX
-+#endif
-+
-+#ifndef UV_MIN
-+#  define UV_MIN                         PERL_ULONG_MIN
-+#endif
-+
-+#ifndef UV_MAX
-+#  define UV_MAX                         PERL_ULONG_MAX
-+#endif
-+
-+#      ifdef LONGSIZE
-+#ifndef IVSIZE
-+#  define IVSIZE                         LONGSIZE
-+#endif
-+
-+#      endif
-+#    endif
-+#  endif
-+#ifndef IVSIZE
-+#  define IVSIZE                         8
-+#endif
-+
-+#ifndef PERL_QUAD_MIN
-+#  define PERL_QUAD_MIN                  IV_MIN
-+#endif
-+
-+#ifndef PERL_QUAD_MAX
-+#  define PERL_QUAD_MAX                  IV_MAX
-+#endif
-+
-+#ifndef PERL_UQUAD_MIN
-+#  define PERL_UQUAD_MIN                 UV_MIN
-+#endif
-+
-+#ifndef PERL_UQUAD_MAX
-+#  define PERL_UQUAD_MAX                 UV_MAX
-+#endif
-+
-+#else
-+#ifndef IVTYPE
-+#  define IVTYPE                         long
-+#endif
-+
-+#ifndef IV_MIN
-+#  define IV_MIN                         PERL_LONG_MIN
-+#endif
-+
-+#ifndef IV_MAX
-+#  define IV_MAX                         PERL_LONG_MAX
-+#endif
-+
-+#ifndef UV_MIN
-+#  define UV_MIN                         PERL_ULONG_MIN
-+#endif
-+
-+#ifndef UV_MAX
-+#  define UV_MAX                         PERL_ULONG_MAX
-+#endif
-+
-+#endif
-+
-+#ifndef IVSIZE
-+#  ifdef LONGSIZE
-+#    define IVSIZE LONGSIZE
-+#  else
-+#    define IVSIZE 4 /* A bold guess, but the best we can make. */
-+#  endif
-+#endif
-+#ifndef UVTYPE
-+#  define UVTYPE                         unsigned IVTYPE
-+#endif
-+
-+#ifndef UVSIZE
-+#  define UVSIZE                         IVSIZE
-+#endif
-+#ifndef sv_setuv
-+#  define sv_setuv(sv, uv)               \
-+               STMT_START {                         \
-+                 UV TeMpUv = uv;                    \
-+                 if (TeMpUv <= IV_MAX)              \
-+                   sv_setiv(sv, TeMpUv);            \
-+                 else                               \
-+                   sv_setnv(sv, (double)TeMpUv);    \
-+               } STMT_END
-+#endif
-+#ifndef newSVuv
-+#  define newSVuv(uv)                    ((uv) <= IV_MAX ? newSViv((IV)uv) : newSVnv((NV)uv))
-+#endif
-+#ifndef sv_2uv
-+#  define sv_2uv(sv)                     ((PL_Sv = (sv)), (UV) (SvNOK(PL_Sv) ? SvNV(PL_Sv) : sv_2nv(PL_Sv)))
-+#endif
-+
-+#ifndef SvUVX
-+#  define SvUVX(sv)                      ((UV)SvIVX(sv))
-+#endif
-+
-+#ifndef SvUVXx
-+#  define SvUVXx(sv)                     SvUVX(sv)
-+#endif
-+
-+#ifndef SvUV
-+#  define SvUV(sv)                       (SvIOK(sv) ? SvUVX(sv) : sv_2uv(sv))
-+#endif
-+
-+#ifndef SvUVx
-+#  define SvUVx(sv)                      ((PL_Sv = (sv)), SvUV(PL_Sv))
-+#endif
-+
-+/* Hint: sv_uv
-+ * Always use the SvUVx() macro instead of sv_uv().
-+ */
-+#ifndef sv_uv
-+#  define sv_uv(sv)                      SvUVx(sv)
-+#endif
-+#ifndef XST_mUV
-+#  define XST_mUV(i,v)                   (ST(i) = sv_2mortal(newSVuv(v))  )
-+#endif
-+
-+#ifndef XSRETURN_UV
-+#  define XSRETURN_UV(v)                 STMT_START { XST_mUV(0,v);  XSRETURN(1); } STMT_END
-+#endif
-+#ifndef PUSHu
-+#  define PUSHu(u)                       STMT_START { sv_setuv(TARG, (UV)(u)); PUSHTARG;  } STMT_END
-+#endif
-+
-+#ifndef XPUSHu
-+#  define XPUSHu(u)                      STMT_START { sv_setuv(TARG, (UV)(u)); XPUSHTARG; } STMT_END
-+#endif
-+
-+#ifdef HAS_MEMCMP
-+#ifndef memNE
-+#  define memNE(s1,s2,l)                 (memcmp(s1,s2,l))
-+#endif
-+
-+#ifndef memEQ
-+#  define memEQ(s1,s2,l)                 (!memcmp(s1,s2,l))
-+#endif
-+
-+#else
-+#ifndef memNE
-+#  define memNE(s1,s2,l)                 (bcmp(s1,s2,l))
-+#endif
-+
-+#ifndef memEQ
-+#  define memEQ(s1,s2,l)                 (!bcmp(s1,s2,l))
-+#endif
-+
-+#endif
-+#ifndef MoveD
-+#  define MoveD(s,d,n,t)                 memmove((char*)(d),(char*)(s), (n) * sizeof(t))
-+#endif
-+
-+#ifndef CopyD
-+#  define CopyD(s,d,n,t)                 memcpy((char*)(d),(char*)(s), (n) * sizeof(t))
-+#endif
-+
-+#ifdef HAS_MEMSET
-+#ifndef ZeroD
-+#  define ZeroD(d,n,t)                   memzero((char*)(d), (n) * sizeof(t))
-+#endif
-+
-+#else
-+#ifndef ZeroD
-+#  define ZeroD(d,n,t)                   ((void)memzero((char*)(d), (n) * sizeof(t)), d)
-+#endif
-+
-+#endif
-+#ifndef Poison
-+#  define Poison(d,n,t)                  (void)memset((char*)(d), 0xAB, (n) * sizeof(t))
-+#endif
-+#ifndef Newx
-+#  define Newx(v,n,t)                    New(0,v,n,t)
-+#endif
-+
-+#ifndef Newxc
-+#  define Newxc(v,n,t,c)                 Newc(0,v,n,t,c)
-+#endif
-+
-+#ifndef Newxz
-+#  define Newxz(v,n,t)                   Newz(0,v,n,t)
-+#endif
-+
-+#if ((PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION <= 5)))
-+/* Replace: 1 */
-+#  define PL_DBsingle               DBsingle
-+#  define PL_DBsub                  DBsub
-+#  define PL_Sv                     Sv
-+#  define PL_compiling              compiling
-+#  define PL_copline                copline
-+#  define PL_curcop                 curcop
-+#  define PL_curstash               curstash
-+#  define PL_debstash               debstash
-+#  define PL_defgv                  defgv
-+#  define PL_diehook                diehook
-+#  define PL_dirty                  dirty
-+#  define PL_dowarn                 dowarn
-+#  define PL_errgv                  errgv
-+#  define PL_hexdigit               hexdigit
-+#  define PL_hints                  hints
-+#  define PL_na	                    na
-+#  define PL_no_modify              no_modify
-+#  define PL_perl_destruct_level    perl_destruct_level
-+#  define PL_perldb                 perldb
-+#  define PL_ppaddr                 ppaddr
-+#  define PL_rsfp_filters           rsfp_filters
-+#  define PL_rsfp                   rsfp
-+#  define PL_stack_base             stack_base
-+#  define PL_stack_sp               stack_sp
-+#  define PL_stdingv                stdingv
-+#  define PL_sv_arenaroot           sv_arenaroot
-+#  define PL_sv_no                  sv_no
-+#  define PL_sv_undef               sv_undef
-+#  define PL_sv_yes                 sv_yes
-+#  define PL_tainted                tainted
-+#  define PL_tainting               tainting
-+/* Replace: 0 */
-+#endif
-+
-+#ifndef PERL_UNUSED_DECL
-+#  ifdef HASATTRIBUTE
-+#    if (defined(__GNUC__) && defined(__cplusplus)) || defined(__INTEL_COMPILER)
-+#      define PERL_UNUSED_DECL
-+#    else
-+#      define PERL_UNUSED_DECL __attribute__((unused))
-+#    endif
-+#  else
-+#    define PERL_UNUSED_DECL
-+#  endif
-+#endif
-+#ifndef NOOP
-+#  define NOOP                           (void)0
-+#endif
-+
-+#ifndef dNOOP
-+#  define dNOOP                          extern int Perl___notused PERL_UNUSED_DECL
-+#endif
-+
-+#ifndef NVTYPE
-+#  if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE)
-+#    define NVTYPE long double
-+#  else
-+#    define NVTYPE double
-+#  endif
-+typedef NVTYPE NV;
-+#endif
-+
-+#ifndef INT2PTR
-+
-+#  if (IVSIZE == PTRSIZE) && (UVSIZE == PTRSIZE)
-+#    define PTRV                  UV
-+#    define INT2PTR(any,d)        (any)(d)
-+#  else
-+#    if PTRSIZE == LONGSIZE
-+#      define PTRV                unsigned long
-+#    else
-+#      define PTRV                unsigned
-+#    endif
-+#    define INT2PTR(any,d)        (any)(PTRV)(d)
-+#  endif
-+
-+#  define NUM2PTR(any,d)  (any)(PTRV)(d)
-+#  define PTR2IV(p)       INT2PTR(IV,p)
-+#  define PTR2UV(p)       INT2PTR(UV,p)
-+#  define PTR2NV(p)       NUM2PTR(NV,p)
-+
-+#  if PTRSIZE == LONGSIZE
-+#    define PTR2ul(p)     (unsigned long)(p)
-+#  else
-+#    define PTR2ul(p)     INT2PTR(unsigned long,p)
-+#  endif
-+
-+#endif /* !INT2PTR */
-+
-+#undef START_EXTERN_C
-+#undef END_EXTERN_C
-+#undef EXTERN_C
-+#ifdef __cplusplus
-+#  define START_EXTERN_C extern "C" {
-+#  define END_EXTERN_C }
-+#  define EXTERN_C extern "C"
-+#else
-+#  define START_EXTERN_C
-+#  define END_EXTERN_C
-+#  define EXTERN_C extern
-+#endif
-+
-+#ifndef PERL_GCC_BRACE_GROUPS_FORBIDDEN
-+#  if defined(__STRICT_ANSI__) && defined(PERL_GCC_PEDANTIC)
-+#    define PERL_GCC_BRACE_GROUPS_FORBIDDEN
-+#  endif
-+#endif
-+
-+#undef STMT_START
-+#undef STMT_END
-+#if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN) && !defined(__cplusplus)
-+#  define STMT_START	(void)(	/* gcc supports ``({ STATEMENTS; })'' */
-+#  define STMT_END	)
-+#else
-+#  if defined(VOIDFLAGS) && (VOIDFLAGS) && (defined(sun) || defined(__sun__)) && !defined(__GNUC__)
-+#    define STMT_START	if (1)
-+#    define STMT_END	else (void)0
-+#  else
-+#    define STMT_START	do
-+#    define STMT_END	while (0)
-+#  endif
-+#endif
-+#ifndef boolSV
-+#  define boolSV(b)                      ((b) ? &PL_sv_yes : &PL_sv_no)
-+#endif
-+
-+/* DEFSV appears first in 5.004_56 */
-+#ifndef DEFSV
-+#  define DEFSV                          GvSV(PL_defgv)
-+#endif
-+
-+#ifndef SAVE_DEFSV
-+#  define SAVE_DEFSV                     SAVESPTR(GvSV(PL_defgv))
-+#endif
-+
-+/* Older perls (<=5.003) lack AvFILLp */
-+#ifndef AvFILLp
-+#  define AvFILLp                        AvFILL
-+#endif
-+#ifndef ERRSV
-+#  define ERRSV                          get_sv("@",FALSE)
-+#endif
-+#ifndef newSVpvn
-+#  define newSVpvn(data,len)             ((data)                                              \
-+                                    ? ((len) ? newSVpv((data), (len)) : newSVpv("", 0)) \
-+                                    : newSV(0))
-+#endif
-+
-+/* Hint: gv_stashpvn
-+ * This function's backport doesn't support the length parameter, but
-+ * rather ignores it. Portability can only be ensured if the length
-+ * parameter is used for speed reasons, but the length can always be
-+ * correctly computed from the string argument.
-+ */
-+#ifndef gv_stashpvn
-+#  define gv_stashpvn(str,len,create)    gv_stashpv(str,create)
-+#endif
-+
-+/* Replace: 1 */
-+#ifndef get_cv
-+#  define get_cv                         perl_get_cv
-+#endif
-+
-+#ifndef get_sv
-+#  define get_sv                         perl_get_sv
-+#endif
-+
-+#ifndef get_av
-+#  define get_av                         perl_get_av
-+#endif
-+
-+#ifndef get_hv
-+#  define get_hv                         perl_get_hv
-+#endif
-+
-+/* Replace: 0 */
-+#ifndef dUNDERBAR
-+#  define dUNDERBAR                      dNOOP
-+#endif
-+
-+#ifndef UNDERBAR
-+#  define UNDERBAR                       DEFSV
-+#endif
-+#ifndef dAX
-+#  define dAX                            I32 ax = MARK - PL_stack_base + 1
-+#endif
-+
-+#ifndef dITEMS
-+#  define dITEMS                         I32 items = SP - MARK
-+#endif
-+#ifndef dXSTARG
-+#  define dXSTARG                        SV * targ = sv_newmortal()
-+#endif
-+#ifndef dAXMARK
-+#  define dAXMARK                        I32 ax = POPMARK; \
-+                               register SV ** const mark = PL_stack_base + ax++
-+#endif
-+#ifndef XSprePUSH
-+#  define XSprePUSH                      (sp = PL_stack_base + ax - 1)
-+#endif
-+
-+#if ((PERL_VERSION < 5) || ((PERL_VERSION == 5) && (PERL_SUBVERSION < 0)))
-+#  undef XSRETURN
-+#  define XSRETURN(off)                                   \
-+      STMT_START {                                        \
-+          PL_stack_sp = PL_stack_base + ax + ((off) - 1); \
-+          return;                                         \
-+      } STMT_END
-+#endif
-+
-+#ifndef PERL_SIGNALS_UNSAFE_FLAG
-+
-+#define PERL_SIGNALS_UNSAFE_FLAG 0x0001
-+
-+#if defined(NEED_PL_signals)
-+static U32 DPPP_(my_PL_signals) = PERL_SIGNALS_UNSAFE_FLAG;
-+#elif defined(NEED_PL_signals_GLOBAL)
-+U32 DPPP_(my_PL_signals) = PERL_SIGNALS_UNSAFE_FLAG;
-+#else
-+extern U32 DPPP_(my_PL_signals);
-+#endif
-+#define PL_signals DPPP_(my_PL_signals)
-+
-+#endif
-+#ifndef dTHR
-+#  define dTHR                           dNOOP
-+#endif
-+#ifndef dTHX
-+#  define dTHX                           dNOOP
-+#endif
-+
-+#ifndef dTHXa
-+#  define dTHXa(x)                       dNOOP
-+#endif
-+#ifndef pTHX
-+#  define pTHX                           void
-+#endif
-+
-+#ifndef pTHX_
-+#  define pTHX_
-+#endif
-+
-+#ifndef aTHX
-+#  define aTHX
-+#endif
-+
-+#ifndef aTHX_
-+#  define aTHX_
-+#endif
-+#ifndef dTHXoa
-+#  define dTHXoa(x)                      dTHXa(x)
-+#endif
-+#ifndef PUSHmortal
-+#  define PUSHmortal                     PUSHs(sv_newmortal())
-+#endif
-+
-+#ifndef mPUSHp
-+#  define mPUSHp(p,l)                    sv_setpvn_mg(PUSHmortal, (p), (l))
-+#endif
-+
-+#ifndef mPUSHn
-+#  define mPUSHn(n)                      sv_setnv_mg(PUSHmortal, (NV)(n))
-+#endif
-+
-+#ifndef mPUSHi
-+#  define mPUSHi(i)                      sv_setiv_mg(PUSHmortal, (IV)(i))
-+#endif
-+
-+#ifndef mPUSHu
-+#  define mPUSHu(u)                      sv_setuv_mg(PUSHmortal, (UV)(u))
-+#endif
-+#ifndef XPUSHmortal
-+#  define XPUSHmortal                    XPUSHs(sv_newmortal())
-+#endif
-+
-+#ifndef mXPUSHp
-+#  define mXPUSHp(p,l)                   STMT_START { EXTEND(sp,1); sv_setpvn_mg(PUSHmortal, (p), (l)); } STMT_END
-+#endif
-+
-+#ifndef mXPUSHn
-+#  define mXPUSHn(n)                     STMT_START { EXTEND(sp,1); sv_setnv_mg(PUSHmortal, (NV)(n)); } STMT_END
-+#endif
-+
-+#ifndef mXPUSHi
-+#  define mXPUSHi(i)                     STMT_START { EXTEND(sp,1); sv_setiv_mg(PUSHmortal, (IV)(i)); } STMT_END
-+#endif
-+
-+#ifndef mXPUSHu
-+#  define mXPUSHu(u)                     STMT_START { EXTEND(sp,1); sv_setuv_mg(PUSHmortal, (UV)(u)); } STMT_END
-+#endif
-+
-+/* Replace: 1 */
-+#ifndef call_sv
-+#  define call_sv                        perl_call_sv
-+#endif
-+
-+#ifndef call_pv
-+#  define call_pv                        perl_call_pv
-+#endif
-+
-+#ifndef call_argv
-+#  define call_argv                      perl_call_argv
-+#endif
-+
-+#ifndef call_method
-+#  define call_method                    perl_call_method
-+#endif
-+#ifndef eval_sv
-+#  define eval_sv                        perl_eval_sv
-+#endif
-+
-+/* Replace: 0 */
-+
-+/* Replace perl_eval_pv with eval_pv */
-+/* eval_pv depends on eval_sv */
-+
-+#ifndef eval_pv
-+#if defined(NEED_eval_pv)
-+static SV* DPPP_(my_eval_pv)(char *p, I32 croak_on_error);
-+static
-+#else
-+extern SV* DPPP_(my_eval_pv)(char *p, I32 croak_on_error);
-+#endif
-+
-+#ifdef eval_pv
-+#  undef eval_pv
-+#endif
-+#define eval_pv(a,b) DPPP_(my_eval_pv)(aTHX_ a,b)
-+#define Perl_eval_pv DPPP_(my_eval_pv)
-+
-+#if defined(NEED_eval_pv) || defined(NEED_eval_pv_GLOBAL)
-+
-+SV*
-+DPPP_(my_eval_pv)(char *p, I32 croak_on_error)
-+{
-+    dSP;
-+    SV* sv = newSVpv(p, 0);
-+
-+    PUSHMARK(sp);
-+    eval_sv(sv, G_SCALAR);
-+    SvREFCNT_dec(sv);
-+
-+    SPAGAIN;
-+    sv = POPs;
-+    PUTBACK;
-+
-+    if (croak_on_error && SvTRUE(GvSV(errgv)))
-+	croak(SvPVx(GvSV(errgv), na));
-+
-+    return sv;
-+}
-+
-+#endif
-+#endif
-+#ifndef newRV_inc
-+#  define newRV_inc(sv)                  newRV(sv)   /* Replace */
-+#endif
-+
-+#ifndef newRV_noinc
-+#if defined(NEED_newRV_noinc)
-+static SV * DPPP_(my_newRV_noinc)(SV *sv);
-+static
-+#else
-+extern SV * DPPP_(my_newRV_noinc)(SV *sv);
-+#endif
-+
-+#ifdef newRV_noinc
-+#  undef newRV_noinc
-+#endif
-+#define newRV_noinc(a) DPPP_(my_newRV_noinc)(aTHX_ a)
-+#define Perl_newRV_noinc DPPP_(my_newRV_noinc)
-+
-+#if defined(NEED_newRV_noinc) || defined(NEED_newRV_noinc_GLOBAL)
-+SV *
-+DPPP_(my_newRV_noinc)(SV *sv)
-+{
-+  SV *rv = (SV *)newRV(sv);
-+  SvREFCNT_dec(sv);
-+  return rv;
-+}
-+#endif
-+#endif
-+
-+/* Hint: newCONSTSUB
-+ * Returns a CV* as of perl-5.7.1. This return value is not supported
-+ * by Devel::PPPort.
-+ */
-+
-+/* newCONSTSUB from IO.xs is in the core starting with 5.004_63 */
-+#if ((PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION < 63))) && ((PERL_VERSION != 4) || (PERL_SUBVERSION != 5))
-+#if defined(NEED_newCONSTSUB)
-+static void DPPP_(my_newCONSTSUB)(HV *stash, char *name, SV *sv);
-+static
-+#else
-+extern void DPPP_(my_newCONSTSUB)(HV *stash, char *name, SV *sv);
-+#endif
-+
-+#ifdef newCONSTSUB
-+#  undef newCONSTSUB
-+#endif
-+#define newCONSTSUB(a,b,c) DPPP_(my_newCONSTSUB)(aTHX_ a,b,c)
-+#define Perl_newCONSTSUB DPPP_(my_newCONSTSUB)
-+
-+#if defined(NEED_newCONSTSUB) || defined(NEED_newCONSTSUB_GLOBAL)
-+
-+void
-+DPPP_(my_newCONSTSUB)(HV *stash, char *name, SV *sv)
-+{
-+	U32 oldhints = PL_hints;
-+	HV *old_cop_stash = PL_curcop->cop_stash;
-+	HV *old_curstash = PL_curstash;
-+	line_t oldline = PL_curcop->cop_line;
-+	PL_curcop->cop_line = PL_copline;
-+
-+	PL_hints &= ~HINT_BLOCK_SCOPE;
-+	if (stash)
-+		PL_curstash = PL_curcop->cop_stash = stash;
-+
-+	newSUB(
-+
-+#if   ((PERL_VERSION < 3) || ((PERL_VERSION == 3) && (PERL_SUBVERSION < 22)))
-+		start_subparse(),
-+#elif ((PERL_VERSION == 3) && (PERL_SUBVERSION == 22))
-+     		start_subparse(0),
-+#else  /* 5.003_23  onwards */
-+     		start_subparse(FALSE, 0),
-+#endif
-+
-+		newSVOP(OP_CONST, 0, newSVpv(name,0)),
-+		newSVOP(OP_CONST, 0, &PL_sv_no),   /* SvPV(&PL_sv_no) == "" -- GMB */
-+		newSTATEOP(0, Nullch, newSVOP(OP_CONST, 0, sv))
-+	);
-+
-+	PL_hints = oldhints;
-+	PL_curcop->cop_stash = old_cop_stash;
-+	PL_curstash = old_curstash;
-+	PL_curcop->cop_line = oldline;
-+}
-+#endif
-+#endif
-+
-+/*
-+ * Boilerplate macros for initializing and accessing interpreter-local
-+ * data from C.  All statics in extensions should be reworked to use
-+ * this, if you want to make the extension thread-safe.  See ext/re/re.xs
-+ * for an example of the use of these macros.
-+ *
-+ * Code that uses these macros is responsible for the following:
-+ * 1. #define MY_CXT_KEY to a unique string, e.g. "DynaLoader_guts"
-+ * 2. Declare a typedef named my_cxt_t that is a structure that contains
-+ *    all the data that needs to be interpreter-local.
-+ * 3. Use the START_MY_CXT macro after the declaration of my_cxt_t.
-+ * 4. Use the MY_CXT_INIT macro such that it is called exactly once
-+ *    (typically put in the BOOT: section).
-+ * 5. Use the members of the my_cxt_t structure everywhere as
-+ *    MY_CXT.member.
-+ * 6. Use the dMY_CXT macro (a declaration) in all the functions that
-+ *    access MY_CXT.
-+ */
-+
-+#if defined(MULTIPLICITY) || defined(PERL_OBJECT) || \
-+    defined(PERL_CAPI)    || defined(PERL_IMPLICIT_CONTEXT)
-+
-+#ifndef START_MY_CXT
-+
-+/* This must appear in all extensions that define a my_cxt_t structure,
-+ * right after the definition (i.e. at file scope).  The non-threads
-+ * case below uses it to declare the data as static. */
-+#define START_MY_CXT
-+
-+#if ((PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION < 68)))
-+/* Fetches the SV that keeps the per-interpreter data. */
-+#define dMY_CXT_SV \
-+	SV *my_cxt_sv = get_sv(MY_CXT_KEY, FALSE)
-+#else /* >= perl5.004_68 */
-+#define dMY_CXT_SV \
-+	SV *my_cxt_sv = *hv_fetch(PL_modglobal, MY_CXT_KEY,		\
-+				  sizeof(MY_CXT_KEY)-1, TRUE)
-+#endif /* < perl5.004_68 */
-+
-+/* This declaration should be used within all functions that use the
-+ * interpreter-local data. */
-+#define dMY_CXT	\
-+	dMY_CXT_SV;							\
-+	my_cxt_t *my_cxtp = INT2PTR(my_cxt_t*,SvUV(my_cxt_sv))
-+
-+/* Creates and zeroes the per-interpreter data.
-+ * (We allocate my_cxtp in a Perl SV so that it will be released when
-+ * the interpreter goes away.) */
-+#define MY_CXT_INIT \
-+	dMY_CXT_SV;							\
-+	/* newSV() allocates one more than needed */			\
-+	my_cxt_t *my_cxtp = (my_cxt_t*)SvPVX(newSV(sizeof(my_cxt_t)-1));\
-+	Zero(my_cxtp, 1, my_cxt_t);					\
-+	sv_setuv(my_cxt_sv, PTR2UV(my_cxtp))
-+
-+/* This macro must be used to access members of the my_cxt_t structure.
-+ * e.g. MYCXT.some_data */
-+#define MY_CXT		(*my_cxtp)
-+
-+/* Judicious use of these macros can reduce the number of times dMY_CXT
-+ * is used.  Use is similar to pTHX, aTHX etc. */
-+#define pMY_CXT		my_cxt_t *my_cxtp
-+#define pMY_CXT_	pMY_CXT,
-+#define _pMY_CXT	,pMY_CXT
-+#define aMY_CXT		my_cxtp
-+#define aMY_CXT_	aMY_CXT,
-+#define _aMY_CXT	,aMY_CXT
-+
-+#endif /* START_MY_CXT */
-+
-+#ifndef MY_CXT_CLONE
-+/* Clones the per-interpreter data. */
-+#define MY_CXT_CLONE \
-+	dMY_CXT_SV;							\
-+	my_cxt_t *my_cxtp = (my_cxt_t*)SvPVX(newSV(sizeof(my_cxt_t)-1));\
-+	Copy(INT2PTR(my_cxt_t*, SvUV(my_cxt_sv)), my_cxtp, 1, my_cxt_t);\
-+	sv_setuv(my_cxt_sv, PTR2UV(my_cxtp))
-+#endif
-+
-+#else /* single interpreter */
-+
-+#ifndef START_MY_CXT
-+
-+#define START_MY_CXT	static my_cxt_t my_cxt;
-+#define dMY_CXT_SV	dNOOP
-+#define dMY_CXT		dNOOP
-+#define MY_CXT_INIT	NOOP
-+#define MY_CXT		my_cxt
-+
-+#define pMY_CXT		void
-+#define pMY_CXT_
-+#define _pMY_CXT
-+#define aMY_CXT
-+#define aMY_CXT_
-+#define _aMY_CXT
-+
-+#endif /* START_MY_CXT */
-+
-+#ifndef MY_CXT_CLONE
-+#define MY_CXT_CLONE	NOOP
-+#endif
-+
-+#endif
-+
-+#ifndef IVdf
-+#  if IVSIZE == LONGSIZE
-+#    define	IVdf      "ld"
-+#    define	UVuf      "lu"
-+#    define	UVof      "lo"
-+#    define	UVxf      "lx"
-+#    define	UVXf      "lX"
-+#  else
-+#    if IVSIZE == INTSIZE
-+#      define	IVdf      "d"
-+#      define	UVuf      "u"
-+#      define	UVof      "o"
-+#      define	UVxf      "x"
-+#      define	UVXf      "X"
-+#    endif
-+#  endif
-+#endif
-+
-+#ifndef NVef
-+#  if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE) && \
-+      defined(PERL_PRIfldbl) /* Not very likely, but let's try anyway. */
-+#    define NVef          PERL_PRIeldbl
-+#    define NVff          PERL_PRIfldbl
-+#    define NVgf          PERL_PRIgldbl
-+#  else
-+#    define NVef          "e"
-+#    define NVff          "f"
-+#    define NVgf          "g"
-+#  endif
-+#endif
-+
-+#ifndef SvPV_nolen
-+
-+#if defined(NEED_sv_2pv_nolen)
-+static char * DPPP_(my_sv_2pv_nolen)(pTHX_ register SV *sv);
-+static
-+#else
-+extern char * DPPP_(my_sv_2pv_nolen)(pTHX_ register SV *sv);
-+#endif
-+
-+#ifdef sv_2pv_nolen
-+#  undef sv_2pv_nolen
-+#endif
-+#define sv_2pv_nolen(a) DPPP_(my_sv_2pv_nolen)(aTHX_ a)
-+#define Perl_sv_2pv_nolen DPPP_(my_sv_2pv_nolen)
-+
-+#if defined(NEED_sv_2pv_nolen) || defined(NEED_sv_2pv_nolen_GLOBAL)
-+
-+char *
-+DPPP_(my_sv_2pv_nolen)(pTHX_ register SV *sv)
-+{
-+  STRLEN n_a;
-+  return sv_2pv(sv, &n_a);
-+}
-+
-+#endif
-+
-+/* Hint: sv_2pv_nolen
-+ * Use the SvPV_nolen() macro instead of sv_2pv_nolen().
-+ */
-+
-+/* SvPV_nolen depends on sv_2pv_nolen */
-+#define SvPV_nolen(sv) \
-+          ((SvFLAGS(sv) & (SVf_POK)) == SVf_POK \
-+           ? SvPVX(sv) : sv_2pv_nolen(sv))
-+
-+#endif
-+
-+#ifdef SvPVbyte
-+
-+/* Hint: SvPVbyte
-+ * Does not work in perl-5.6.1, ppport.h implements a version
-+ * borrowed from perl-5.7.3.
-+ */
-+
-+#if ((PERL_VERSION < 7) || ((PERL_VERSION == 7) && (PERL_SUBVERSION < 0)))
-+
-+#if defined(NEED_sv_2pvbyte)
-+static char * DPPP_(my_sv_2pvbyte)(pTHX_ register SV *sv, STRLEN *lp);
-+static
-+#else
-+extern char * DPPP_(my_sv_2pvbyte)(pTHX_ register SV *sv, STRLEN *lp);
-+#endif
-+
-+#ifdef sv_2pvbyte
-+#  undef sv_2pvbyte
-+#endif
-+#define sv_2pvbyte(a,b) DPPP_(my_sv_2pvbyte)(aTHX_ a,b)
-+#define Perl_sv_2pvbyte DPPP_(my_sv_2pvbyte)
-+
-+#if defined(NEED_sv_2pvbyte) || defined(NEED_sv_2pvbyte_GLOBAL)
-+
-+char *
-+DPPP_(my_sv_2pvbyte)(pTHX_ register SV *sv, STRLEN *lp)
-+{
-+  sv_utf8_downgrade(sv,0);
-+  return SvPV(sv,*lp);
-+}
-+
-+#endif
-+
-+/* Hint: sv_2pvbyte
-+ * Use the SvPVbyte() macro instead of sv_2pvbyte().
-+ */
-+
-+#undef SvPVbyte
-+
-+/* SvPVbyte depends on sv_2pvbyte */
-+#define SvPVbyte(sv, lp)                                                \
-+        ((SvFLAGS(sv) & (SVf_POK|SVf_UTF8)) == (SVf_POK)                \
-+         ? ((lp = SvCUR(sv)), SvPVX(sv)) : sv_2pvbyte(sv, &lp))
-+
-+#endif
-+
-+#else
-+
-+#  define SvPVbyte          SvPV
-+#  define sv_2pvbyte        sv_2pv
-+
-+#endif
-+
-+/* sv_2pvbyte_nolen depends on sv_2pv_nolen */
-+#ifndef sv_2pvbyte_nolen
-+#  define sv_2pvbyte_nolen               sv_2pv_nolen
-+#endif
-+
-+/* Hint: sv_pvn
-+ * Always use the SvPV() macro instead of sv_pvn().
-+ */
-+#ifndef sv_pvn
-+#  define sv_pvn(sv, len)                SvPV(sv, len)
-+#endif
-+
-+/* Hint: sv_pvn_force
-+ * Always use the SvPV_force() macro instead of sv_pvn_force().
-+ */
-+#ifndef sv_pvn_force
-+#  define sv_pvn_force(sv, len)          SvPV_force(sv, len)
-+#endif
-+#ifndef SvMAGIC_set
-+#  define SvMAGIC_set(sv, val)           \
-+                STMT_START { assert(SvTYPE(sv) >= SVt_PVMG); \
-+                (((XPVMG*) SvANY(sv))->xmg_magic = (val)); } STMT_END
-+#endif
-+
-+#if ((PERL_VERSION < 9) || ((PERL_VERSION == 9) && (PERL_SUBVERSION < 3)))
-+#ifndef SvPVX_const
-+#  define SvPVX_const(sv)                ((const char*) (0 + SvPVX(sv)))
-+#endif
-+
-+#ifndef SvPVX_mutable
-+#  define SvPVX_mutable(sv)              (0 + SvPVX(sv))
-+#endif
-+#ifndef SvRV_set
-+#  define SvRV_set(sv, val)              \
-+                STMT_START { assert(SvTYPE(sv) >=  SVt_RV); \
-+                (((XRV*) SvANY(sv))->xrv_rv = (val)); } STMT_END
-+#endif
-+
-+#else
-+#ifndef SvPVX_const
-+#  define SvPVX_const(sv)                ((const char*)((sv)->sv_u.svu_pv))
-+#endif
-+
-+#ifndef SvPVX_mutable
-+#  define SvPVX_mutable(sv)              ((sv)->sv_u.svu_pv)
-+#endif
-+#ifndef SvRV_set
-+#  define SvRV_set(sv, val)              \
-+                STMT_START { assert(SvTYPE(sv) >=  SVt_RV); \
-+                ((sv)->sv_u.svu_rv = (val)); } STMT_END
-+#endif
-+
-+#endif
-+#ifndef SvSTASH_set
-+#  define SvSTASH_set(sv, val)           \
-+                STMT_START { assert(SvTYPE(sv) >= SVt_PVMG); \
-+                (((XPVMG*) SvANY(sv))->xmg_stash = (val)); } STMT_END
-+#endif
-+
-+#if ((PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION < 0)))
-+#ifndef SvUV_set
-+#  define SvUV_set(sv, val)              \
-+                STMT_START { assert(SvTYPE(sv) == SVt_IV || SvTYPE(sv) >= SVt_PVIV); \
-+                (((XPVIV*) SvANY(sv))->xiv_iv = (IV) (val)); } STMT_END
-+#endif
-+
-+#else
-+#ifndef SvUV_set
-+#  define SvUV_set(sv, val)              \
-+                STMT_START { assert(SvTYPE(sv) == SVt_IV || SvTYPE(sv) >= SVt_PVIV); \
-+                (((XPVUV*) SvANY(sv))->xuv_uv = (val)); } STMT_END
-+#endif
-+
-+#endif
-+
-+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(vnewSVpvf)
-+#if defined(NEED_vnewSVpvf)
-+static SV * DPPP_(my_vnewSVpvf)(pTHX_ const char * pat, va_list * args);
-+static
-+#else
-+extern SV * DPPP_(my_vnewSVpvf)(pTHX_ const char * pat, va_list * args);
-+#endif
-+
-+#ifdef vnewSVpvf
-+#  undef vnewSVpvf
-+#endif
-+#define vnewSVpvf(a,b) DPPP_(my_vnewSVpvf)(aTHX_ a,b)
-+#define Perl_vnewSVpvf DPPP_(my_vnewSVpvf)
-+
-+#if defined(NEED_vnewSVpvf) || defined(NEED_vnewSVpvf_GLOBAL)
-+
-+SV *
-+DPPP_(my_vnewSVpvf)(pTHX_ const char *pat, va_list *args)
-+{
-+  register SV *sv = newSV(0);
-+  sv_vsetpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*));
-+  return sv;
-+}
-+
-+#endif
-+#endif
-+
-+/* sv_vcatpvf depends on sv_vcatpvfn */
-+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_vcatpvf)
-+#  define sv_vcatpvf(sv, pat, args)  sv_vcatpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*))
-+#endif
-+
-+/* sv_vsetpvf depends on sv_vsetpvfn */
-+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_vsetpvf)
-+#  define sv_vsetpvf(sv, pat, args)  sv_vsetpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*))
-+#endif
-+
-+/* sv_catpvf_mg depends on sv_vcatpvfn, sv_catpvf_mg_nocontext */
-+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_catpvf_mg)
-+#if defined(NEED_sv_catpvf_mg)
-+static void DPPP_(my_sv_catpvf_mg)(pTHX_ SV * sv, const char * pat, ...);
-+static
-+#else
-+extern void DPPP_(my_sv_catpvf_mg)(pTHX_ SV * sv, const char * pat, ...);
-+#endif
-+
-+#define Perl_sv_catpvf_mg DPPP_(my_sv_catpvf_mg)
-+
-+#if defined(NEED_sv_catpvf_mg) || defined(NEED_sv_catpvf_mg_GLOBAL)
-+
-+void
-+DPPP_(my_sv_catpvf_mg)(pTHX_ SV *sv, const char *pat, ...)
-+{
-+  va_list args;
-+  va_start(args, pat);
-+  sv_vcatpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*));
-+  SvSETMAGIC(sv);
-+  va_end(args);
-+}
-+
-+#endif
-+#endif
-+
-+/* sv_catpvf_mg_nocontext depends on sv_vcatpvfn */
-+#ifdef PERL_IMPLICIT_CONTEXT
-+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_catpvf_mg_nocontext)
-+#if defined(NEED_sv_catpvf_mg_nocontext)
-+static void DPPP_(my_sv_catpvf_mg_nocontext)(SV * sv, const char * pat, ...);
-+static
-+#else
-+extern void DPPP_(my_sv_catpvf_mg_nocontext)(SV * sv, const char * pat, ...);
-+#endif
-+
-+#define sv_catpvf_mg_nocontext DPPP_(my_sv_catpvf_mg_nocontext)
-+#define Perl_sv_catpvf_mg_nocontext DPPP_(my_sv_catpvf_mg_nocontext)
-+
-+#if defined(NEED_sv_catpvf_mg_nocontext) || defined(NEED_sv_catpvf_mg_nocontext_GLOBAL)
-+
-+void
-+DPPP_(my_sv_catpvf_mg_nocontext)(SV *sv, const char *pat, ...)
-+{
-+  dTHX;
-+  va_list args;
-+  va_start(args, pat);
-+  sv_vcatpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*));
-+  SvSETMAGIC(sv);
-+  va_end(args);
-+}
-+
-+#endif
-+#endif
-+#endif
-+
-+#ifndef sv_catpvf_mg
-+#  ifdef PERL_IMPLICIT_CONTEXT
-+#    define sv_catpvf_mg   Perl_sv_catpvf_mg_nocontext
-+#  else
-+#    define sv_catpvf_mg   Perl_sv_catpvf_mg
-+#  endif
-+#endif
-+
-+/* sv_vcatpvf_mg depends on sv_vcatpvfn */
-+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_vcatpvf_mg)
-+#  define sv_vcatpvf_mg(sv, pat, args)                                     \
-+   STMT_START {                                                            \
-+     sv_vcatpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*));  \
-+     SvSETMAGIC(sv);                                                       \
-+   } STMT_END
-+#endif
-+
-+/* sv_setpvf_mg depends on sv_vsetpvfn, sv_setpvf_mg_nocontext */
-+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_setpvf_mg)
-+#if defined(NEED_sv_setpvf_mg)
-+static void DPPP_(my_sv_setpvf_mg)(pTHX_ SV * sv, const char * pat, ...);
-+static
-+#else
-+extern void DPPP_(my_sv_setpvf_mg)(pTHX_ SV * sv, const char * pat, ...);
-+#endif
-+
-+#define Perl_sv_setpvf_mg DPPP_(my_sv_setpvf_mg)
-+
-+#if defined(NEED_sv_setpvf_mg) || defined(NEED_sv_setpvf_mg_GLOBAL)
-+
-+void
-+DPPP_(my_sv_setpvf_mg)(pTHX_ SV *sv, const char *pat, ...)
-+{
-+  va_list args;
-+  va_start(args, pat);
-+  sv_vsetpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*));
-+  SvSETMAGIC(sv);
-+  va_end(args);
-+}
-+
-+#endif
-+#endif
-+
-+/* sv_setpvf_mg_nocontext depends on sv_vsetpvfn */
-+#ifdef PERL_IMPLICIT_CONTEXT
-+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_setpvf_mg_nocontext)
-+#if defined(NEED_sv_setpvf_mg_nocontext)
-+static void DPPP_(my_sv_setpvf_mg_nocontext)(SV * sv, const char * pat, ...);
-+static
-+#else
-+extern void DPPP_(my_sv_setpvf_mg_nocontext)(SV * sv, const char * pat, ...);
-+#endif
-+
-+#define sv_setpvf_mg_nocontext DPPP_(my_sv_setpvf_mg_nocontext)
-+#define Perl_sv_setpvf_mg_nocontext DPPP_(my_sv_setpvf_mg_nocontext)
-+
-+#if defined(NEED_sv_setpvf_mg_nocontext) || defined(NEED_sv_setpvf_mg_nocontext_GLOBAL)
-+
-+void
-+DPPP_(my_sv_setpvf_mg_nocontext)(SV *sv, const char *pat, ...)
-+{
-+  dTHX;
-+  va_list args;
-+  va_start(args, pat);
-+  sv_vsetpvfn(sv, pat, strlen(pat), &args, Null(SV**), 0, Null(bool*));
-+  SvSETMAGIC(sv);
-+  va_end(args);
-+}
-+
-+#endif
-+#endif
-+#endif
-+
-+#ifndef sv_setpvf_mg
-+#  ifdef PERL_IMPLICIT_CONTEXT
-+#    define sv_setpvf_mg   Perl_sv_setpvf_mg_nocontext
-+#  else
-+#    define sv_setpvf_mg   Perl_sv_setpvf_mg
-+#  endif
-+#endif
-+
-+/* sv_vsetpvf_mg depends on sv_vsetpvfn */
-+#if ((PERL_VERSION > 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION >= 0))) && !defined(sv_vsetpvf_mg)
-+#  define sv_vsetpvf_mg(sv, pat, args)                                     \
-+   STMT_START {                                                            \
-+     sv_vsetpvfn(sv, pat, strlen(pat), args, Null(SV**), 0, Null(bool*));  \
-+     SvSETMAGIC(sv);                                                       \
-+   } STMT_END
-+#endif
-+#ifndef SvGETMAGIC
-+#  define SvGETMAGIC(x)                  STMT_START { if (SvGMAGICAL(x)) mg_get(x); } STMT_END
-+#endif
-+#ifndef PERL_MAGIC_sv
-+#  define PERL_MAGIC_sv                  '\0'
-+#endif
-+
-+#ifndef PERL_MAGIC_overload
-+#  define PERL_MAGIC_overload            'A'
-+#endif
-+
-+#ifndef PERL_MAGIC_overload_elem
-+#  define PERL_MAGIC_overload_elem       'a'
-+#endif
-+
-+#ifndef PERL_MAGIC_overload_table
-+#  define PERL_MAGIC_overload_table      'c'
-+#endif
-+
-+#ifndef PERL_MAGIC_bm
-+#  define PERL_MAGIC_bm                  'B'
-+#endif
-+
-+#ifndef PERL_MAGIC_regdata
-+#  define PERL_MAGIC_regdata             'D'
-+#endif
-+
-+#ifndef PERL_MAGIC_regdatum
-+#  define PERL_MAGIC_regdatum            'd'
-+#endif
-+
-+#ifndef PERL_MAGIC_env
-+#  define PERL_MAGIC_env                 'E'
-+#endif
-+
-+#ifndef PERL_MAGIC_envelem
-+#  define PERL_MAGIC_envelem             'e'
-+#endif
-+
-+#ifndef PERL_MAGIC_fm
-+#  define PERL_MAGIC_fm                  'f'
-+#endif
-+
-+#ifndef PERL_MAGIC_regex_global
-+#  define PERL_MAGIC_regex_global        'g'
-+#endif
-+
-+#ifndef PERL_MAGIC_isa
-+#  define PERL_MAGIC_isa                 'I'
-+#endif
-+
-+#ifndef PERL_MAGIC_isaelem
-+#  define PERL_MAGIC_isaelem             'i'
-+#endif
-+
-+#ifndef PERL_MAGIC_nkeys
-+#  define PERL_MAGIC_nkeys               'k'
-+#endif
-+
-+#ifndef PERL_MAGIC_dbfile
-+#  define PERL_MAGIC_dbfile              'L'
-+#endif
-+
-+#ifndef PERL_MAGIC_dbline
-+#  define PERL_MAGIC_dbline              'l'
-+#endif
-+
-+#ifndef PERL_MAGIC_mutex
-+#  define PERL_MAGIC_mutex               'm'
-+#endif
-+
-+#ifndef PERL_MAGIC_shared
-+#  define PERL_MAGIC_shared              'N'
-+#endif
-+
-+#ifndef PERL_MAGIC_shared_scalar
-+#  define PERL_MAGIC_shared_scalar       'n'
-+#endif
-+
-+#ifndef PERL_MAGIC_collxfrm
-+#  define PERL_MAGIC_collxfrm            'o'
-+#endif
-+
-+#ifndef PERL_MAGIC_tied
-+#  define PERL_MAGIC_tied                'P'
-+#endif
-+
-+#ifndef PERL_MAGIC_tiedelem
-+#  define PERL_MAGIC_tiedelem            'p'
-+#endif
-+
-+#ifndef PERL_MAGIC_tiedscalar
-+#  define PERL_MAGIC_tiedscalar          'q'
-+#endif
-+
-+#ifndef PERL_MAGIC_qr
-+#  define PERL_MAGIC_qr                  'r'
-+#endif
-+
-+#ifndef PERL_MAGIC_sig
-+#  define PERL_MAGIC_sig                 'S'
-+#endif
-+
-+#ifndef PERL_MAGIC_sigelem
-+#  define PERL_MAGIC_sigelem             's'
-+#endif
-+
-+#ifndef PERL_MAGIC_taint
-+#  define PERL_MAGIC_taint               't'
-+#endif
-+
-+#ifndef PERL_MAGIC_uvar
-+#  define PERL_MAGIC_uvar                'U'
-+#endif
-+
-+#ifndef PERL_MAGIC_uvar_elem
-+#  define PERL_MAGIC_uvar_elem           'u'
-+#endif
-+
-+#ifndef PERL_MAGIC_vstring
-+#  define PERL_MAGIC_vstring             'V'
-+#endif
-+
-+#ifndef PERL_MAGIC_vec
-+#  define PERL_MAGIC_vec                 'v'
-+#endif
-+
-+#ifndef PERL_MAGIC_utf8
-+#  define PERL_MAGIC_utf8                'w'
-+#endif
-+
-+#ifndef PERL_MAGIC_substr
-+#  define PERL_MAGIC_substr              'x'
-+#endif
-+
-+#ifndef PERL_MAGIC_defelem
-+#  define PERL_MAGIC_defelem             'y'
-+#endif
-+
-+#ifndef PERL_MAGIC_glob
-+#  define PERL_MAGIC_glob                '*'
-+#endif
-+
-+#ifndef PERL_MAGIC_arylen
-+#  define PERL_MAGIC_arylen              '#'
-+#endif
-+
-+#ifndef PERL_MAGIC_pos
-+#  define PERL_MAGIC_pos                 '.'
-+#endif
-+
-+#ifndef PERL_MAGIC_backref
-+#  define PERL_MAGIC_backref             '<'
-+#endif
-+
-+#ifndef PERL_MAGIC_ext
-+#  define PERL_MAGIC_ext                 '~'
-+#endif
-+
-+/* That's the best we can do... */
-+#ifndef SvPV_force_nomg
-+#  define SvPV_force_nomg                SvPV_force
-+#endif
-+
-+#ifndef SvPV_nomg
-+#  define SvPV_nomg                      SvPV
-+#endif
-+
-+#ifndef sv_catpvn_nomg
-+#  define sv_catpvn_nomg                 sv_catpvn
-+#endif
-+
-+#ifndef sv_catsv_nomg
-+#  define sv_catsv_nomg                  sv_catsv
-+#endif
-+
-+#ifndef sv_setsv_nomg
-+#  define sv_setsv_nomg                  sv_setsv
-+#endif
-+
-+#ifndef sv_pvn_nomg
-+#  define sv_pvn_nomg                    sv_pvn
-+#endif
-+
-+#ifndef SvIV_nomg
-+#  define SvIV_nomg                      SvIV
-+#endif
-+
-+#ifndef SvUV_nomg
-+#  define SvUV_nomg                      SvUV
-+#endif
-+
-+#ifndef sv_catpv_mg
-+#  define sv_catpv_mg(sv, ptr)          \
-+   STMT_START {                         \
-+     SV *TeMpSv = sv;                   \
-+     sv_catpv(TeMpSv,ptr);              \
-+     SvSETMAGIC(TeMpSv);                \
-+   } STMT_END
-+#endif
-+
-+#ifndef sv_catpvn_mg
-+#  define sv_catpvn_mg(sv, ptr, len)    \
-+   STMT_START {                         \
-+     SV *TeMpSv = sv;                   \
-+     sv_catpvn(TeMpSv,ptr,len);         \
-+     SvSETMAGIC(TeMpSv);                \
-+   } STMT_END
-+#endif
-+
-+#ifndef sv_catsv_mg
-+#  define sv_catsv_mg(dsv, ssv)         \
-+   STMT_START {                         \
-+     SV *TeMpSv = dsv;                  \
-+     sv_catsv(TeMpSv,ssv);              \
-+     SvSETMAGIC(TeMpSv);                \
-+   } STMT_END
-+#endif
-+
-+#ifndef sv_setiv_mg
-+#  define sv_setiv_mg(sv, i)            \
-+   STMT_START {                         \
-+     SV *TeMpSv = sv;                   \
-+     sv_setiv(TeMpSv,i);                \
-+     SvSETMAGIC(TeMpSv);                \
-+   } STMT_END
-+#endif
-+
-+#ifndef sv_setnv_mg
-+#  define sv_setnv_mg(sv, num)          \
-+   STMT_START {                         \
-+     SV *TeMpSv = sv;                   \
-+     sv_setnv(TeMpSv,num);              \
-+     SvSETMAGIC(TeMpSv);                \
-+   } STMT_END
-+#endif
-+
-+#ifndef sv_setpv_mg
-+#  define sv_setpv_mg(sv, ptr)          \
-+   STMT_START {                         \
-+     SV *TeMpSv = sv;                   \
-+     sv_setpv(TeMpSv,ptr);              \
-+     SvSETMAGIC(TeMpSv);                \
-+   } STMT_END
-+#endif
-+
-+#ifndef sv_setpvn_mg
-+#  define sv_setpvn_mg(sv, ptr, len)    \
-+   STMT_START {                         \
-+     SV *TeMpSv = sv;                   \
-+     sv_setpvn(TeMpSv,ptr,len);         \
-+     SvSETMAGIC(TeMpSv);                \
-+   } STMT_END
-+#endif
-+
-+#ifndef sv_setsv_mg
-+#  define sv_setsv_mg(dsv, ssv)         \
-+   STMT_START {                         \
-+     SV *TeMpSv = dsv;                  \
-+     sv_setsv(TeMpSv,ssv);              \
-+     SvSETMAGIC(TeMpSv);                \
-+   } STMT_END
-+#endif
-+
-+#ifndef sv_setuv_mg
-+#  define sv_setuv_mg(sv, i)            \
-+   STMT_START {                         \
-+     SV *TeMpSv = sv;                   \
-+     sv_setuv(TeMpSv,i);                \
-+     SvSETMAGIC(TeMpSv);                \
-+   } STMT_END
-+#endif
-+
-+#ifndef sv_usepvn_mg
-+#  define sv_usepvn_mg(sv, ptr, len)    \
-+   STMT_START {                         \
-+     SV *TeMpSv = sv;                   \
-+     sv_usepvn(TeMpSv,ptr,len);         \
-+     SvSETMAGIC(TeMpSv);                \
-+   } STMT_END
-+#endif
-+
-+#ifdef USE_ITHREADS
-+#ifndef CopFILE
-+#  define CopFILE(c)                     ((c)->cop_file)
-+#endif
-+
-+#ifndef CopFILEGV
-+#  define CopFILEGV(c)                   (CopFILE(c) ? gv_fetchfile(CopFILE(c)) : Nullgv)
-+#endif
-+
-+#ifndef CopFILE_set
-+#  define CopFILE_set(c,pv)              ((c)->cop_file = savepv(pv))
-+#endif
-+
-+#ifndef CopFILESV
-+#  define CopFILESV(c)                   (CopFILE(c) ? GvSV(gv_fetchfile(CopFILE(c))) : Nullsv)
-+#endif
-+
-+#ifndef CopFILEAV
-+#  define CopFILEAV(c)                   (CopFILE(c) ? GvAV(gv_fetchfile(CopFILE(c))) : Nullav)
-+#endif
-+
-+#ifndef CopSTASHPV
-+#  define CopSTASHPV(c)                  ((c)->cop_stashpv)
-+#endif
-+
-+#ifndef CopSTASHPV_set
-+#  define CopSTASHPV_set(c,pv)           ((c)->cop_stashpv = ((pv) ? savepv(pv) : Nullch))
-+#endif
-+
-+#ifndef CopSTASH
-+#  define CopSTASH(c)                    (CopSTASHPV(c) ? gv_stashpv(CopSTASHPV(c),GV_ADD) : Nullhv)
-+#endif
-+
-+#ifndef CopSTASH_set
-+#  define CopSTASH_set(c,hv)             CopSTASHPV_set(c, (hv) ? HvNAME(hv) : Nullch)
-+#endif
-+
-+#ifndef CopSTASH_eq
-+#  define CopSTASH_eq(c,hv)              ((hv) && (CopSTASHPV(c) == HvNAME(hv) \
-+					|| (CopSTASHPV(c) && HvNAME(hv) \
-+					&& strEQ(CopSTASHPV(c), HvNAME(hv)))))
-+#endif
-+
-+#else
-+#ifndef CopFILEGV
-+#  define CopFILEGV(c)                   ((c)->cop_filegv)
-+#endif
-+
-+#ifndef CopFILEGV_set
-+#  define CopFILEGV_set(c,gv)            ((c)->cop_filegv = (GV*)SvREFCNT_inc(gv))
-+#endif
-+
-+#ifndef CopFILE_set
-+#  define CopFILE_set(c,pv)              CopFILEGV_set((c), gv_fetchfile(pv))
-+#endif
-+
-+#ifndef CopFILESV
-+#  define CopFILESV(c)                   (CopFILEGV(c) ? GvSV(CopFILEGV(c)) : Nullsv)
-+#endif
-+
-+#ifndef CopFILEAV
-+#  define CopFILEAV(c)                   (CopFILEGV(c) ? GvAV(CopFILEGV(c)) : Nullav)
-+#endif
-+
-+#ifndef CopFILE
-+#  define CopFILE(c)                     (CopFILESV(c) ? SvPVX(CopFILESV(c)) : Nullch)
-+#endif
-+
-+#ifndef CopSTASH
-+#  define CopSTASH(c)                    ((c)->cop_stash)
-+#endif
-+
-+#ifndef CopSTASH_set
-+#  define CopSTASH_set(c,hv)             ((c)->cop_stash = (hv))
-+#endif
-+
-+#ifndef CopSTASHPV
-+#  define CopSTASHPV(c)                  (CopSTASH(c) ? HvNAME(CopSTASH(c)) : Nullch)
-+#endif
-+
-+#ifndef CopSTASHPV_set
-+#  define CopSTASHPV_set(c,pv)           CopSTASH_set((c), gv_stashpv(pv,GV_ADD))
-+#endif
-+
-+#ifndef CopSTASH_eq
-+#  define CopSTASH_eq(c,hv)              (CopSTASH(c) == (hv))
-+#endif
-+
-+#endif /* USE_ITHREADS */
-+#ifndef IN_PERL_COMPILETIME
-+#  define IN_PERL_COMPILETIME            (PL_curcop == &PL_compiling)
-+#endif
-+
-+#ifndef IN_LOCALE_RUNTIME
-+#  define IN_LOCALE_RUNTIME              (PL_curcop->op_private & HINT_LOCALE)
-+#endif
-+
-+#ifndef IN_LOCALE_COMPILETIME
-+#  define IN_LOCALE_COMPILETIME          (PL_hints & HINT_LOCALE)
-+#endif
-+
-+#ifndef IN_LOCALE
-+#  define IN_LOCALE                      (IN_PERL_COMPILETIME ? IN_LOCALE_COMPILETIME : IN_LOCALE_RUNTIME)
-+#endif
-+#ifndef IS_NUMBER_IN_UV
-+#  define IS_NUMBER_IN_UV                0x01
-+#endif
-+
-+#ifndef IS_NUMBER_GREATER_THAN_UV_MAX
-+#  define IS_NUMBER_GREATER_THAN_UV_MAX  0x02
-+#endif
-+
-+#ifndef IS_NUMBER_NOT_INT
-+#  define IS_NUMBER_NOT_INT              0x04
-+#endif
-+
-+#ifndef IS_NUMBER_NEG
-+#  define IS_NUMBER_NEG                  0x08
-+#endif
-+
-+#ifndef IS_NUMBER_INFINITY
-+#  define IS_NUMBER_INFINITY             0x10
-+#endif
-+
-+#ifndef IS_NUMBER_NAN
-+#  define IS_NUMBER_NAN                  0x20
-+#endif
-+
-+/* GROK_NUMERIC_RADIX depends on grok_numeric_radix */
-+#ifndef GROK_NUMERIC_RADIX
-+#  define GROK_NUMERIC_RADIX(sp, send)   grok_numeric_radix(sp, send)
-+#endif
-+#ifndef PERL_SCAN_GREATER_THAN_UV_MAX
-+#  define PERL_SCAN_GREATER_THAN_UV_MAX  0x02
-+#endif
-+
-+#ifndef PERL_SCAN_SILENT_ILLDIGIT
-+#  define PERL_SCAN_SILENT_ILLDIGIT      0x04
-+#endif
-+
-+#ifndef PERL_SCAN_ALLOW_UNDERSCORES
-+#  define PERL_SCAN_ALLOW_UNDERSCORES    0x01
-+#endif
-+
-+#ifndef PERL_SCAN_DISALLOW_PREFIX
-+#  define PERL_SCAN_DISALLOW_PREFIX      0x02
-+#endif
-+
-+#ifndef grok_numeric_radix
-+#if defined(NEED_grok_numeric_radix)
-+static bool DPPP_(my_grok_numeric_radix)(pTHX_ const char ** sp, const char * send);
-+static
-+#else
-+extern bool DPPP_(my_grok_numeric_radix)(pTHX_ const char ** sp, const char * send);
-+#endif
-+
-+#ifdef grok_numeric_radix
-+#  undef grok_numeric_radix
-+#endif
-+#define grok_numeric_radix(a,b) DPPP_(my_grok_numeric_radix)(aTHX_ a,b)
-+#define Perl_grok_numeric_radix DPPP_(my_grok_numeric_radix)
-+
-+#if defined(NEED_grok_numeric_radix) || defined(NEED_grok_numeric_radix_GLOBAL)
-+bool
-+DPPP_(my_grok_numeric_radix)(pTHX_ const char **sp, const char *send)
-+{
-+#ifdef USE_LOCALE_NUMERIC
-+#ifdef PL_numeric_radix_sv
-+    if (PL_numeric_radix_sv && IN_LOCALE) {
-+        STRLEN len;
-+        char* radix = SvPV(PL_numeric_radix_sv, len);
-+        if (*sp + len <= send && memEQ(*sp, radix, len)) {
-+            *sp += len;
-+            return TRUE;
-+        }
-+    }
-+#else
-+    /* older perls don't have PL_numeric_radix_sv so the radix
-+     * must manually be requested from locale.h
-+     */
-+#include <locale.h>
-+    dTHR;  /* needed for older threaded perls */
-+    struct lconv *lc = localeconv();
-+    char *radix = lc->decimal_point;
-+    if (radix && IN_LOCALE) {
-+        STRLEN len = strlen(radix);
-+        if (*sp + len <= send && memEQ(*sp, radix, len)) {
-+            *sp += len;
-+            return TRUE;
-+        }
-+    }
-+#endif
-+#endif /* USE_LOCALE_NUMERIC */
-+    /* always try "." if numeric radix didn't match because
-+     * we may have data from different locales mixed */
-+    if (*sp < send && **sp == '.') {
-+        ++*sp;
-+        return TRUE;
-+    }
-+    return FALSE;
-+}
-+#endif
-+#endif
-+
-+/* grok_number depends on grok_numeric_radix */
-+
-+#ifndef grok_number
-+#if defined(NEED_grok_number)
-+static int DPPP_(my_grok_number)(pTHX_ const char * pv, STRLEN len, UV * valuep);
-+static
-+#else
-+extern int DPPP_(my_grok_number)(pTHX_ const char * pv, STRLEN len, UV * valuep);
-+#endif
-+
-+#ifdef grok_number
-+#  undef grok_number
-+#endif
-+#define grok_number(a,b,c) DPPP_(my_grok_number)(aTHX_ a,b,c)
-+#define Perl_grok_number DPPP_(my_grok_number)
-+
-+#if defined(NEED_grok_number) || defined(NEED_grok_number_GLOBAL)
-+int
-+DPPP_(my_grok_number)(pTHX_ const char *pv, STRLEN len, UV *valuep)
-+{
-+  const char *s = pv;
-+  const char *send = pv + len;
-+  const UV max_div_10 = UV_MAX / 10;
-+  const char max_mod_10 = UV_MAX % 10;
-+  int numtype = 0;
-+  int sawinf = 0;
-+  int sawnan = 0;
-+
-+  while (s < send && isSPACE(*s))
-+    s++;
-+  if (s == send) {
-+    return 0;
-+  } else if (*s == '-') {
-+    s++;
-+    numtype = IS_NUMBER_NEG;
-+  }
-+  else if (*s == '+')
-+  s++;
-+
-+  if (s == send)
-+    return 0;
-+
-+  /* next must be digit or the radix separator or beginning of infinity */
-+  if (isDIGIT(*s)) {
-+    /* UVs are at least 32 bits, so the first 9 decimal digits cannot
-+       overflow.  */
-+    UV value = *s - '0';
-+    /* This construction seems to be more optimiser friendly.
-+       (without it gcc does the isDIGIT test and the *s - '0' separately)
-+       With it gcc on arm is managing 6 instructions (6 cycles) per digit.
-+       In theory the optimiser could deduce how far to unroll the loop
-+       before checking for overflow.  */
-+    if (++s < send) {
-+      int digit = *s - '0';
-+      if (digit >= 0 && digit <= 9) {
-+        value = value * 10 + digit;
-+        if (++s < send) {
-+          digit = *s - '0';
-+          if (digit >= 0 && digit <= 9) {
-+            value = value * 10 + digit;
-+            if (++s < send) {
-+              digit = *s - '0';
-+              if (digit >= 0 && digit <= 9) {
-+                value = value * 10 + digit;
-+		if (++s < send) {
-+                  digit = *s - '0';
-+                  if (digit >= 0 && digit <= 9) {
-+                    value = value * 10 + digit;
-+                    if (++s < send) {
-+                      digit = *s - '0';
-+                      if (digit >= 0 && digit <= 9) {
-+                        value = value * 10 + digit;
-+                        if (++s < send) {
-+                          digit = *s - '0';
-+                          if (digit >= 0 && digit <= 9) {
-+                            value = value * 10 + digit;
-+                            if (++s < send) {
-+                              digit = *s - '0';
-+                              if (digit >= 0 && digit <= 9) {
-+                                value = value * 10 + digit;
-+                                if (++s < send) {
-+                                  digit = *s - '0';
-+                                  if (digit >= 0 && digit <= 9) {
-+                                    value = value * 10 + digit;
-+                                    if (++s < send) {
-+                                      /* Now got 9 digits, so need to check
-+                                         each time for overflow.  */
-+                                      digit = *s - '0';
-+                                      while (digit >= 0 && digit <= 9
-+                                             && (value < max_div_10
-+                                                 || (value == max_div_10
-+                                                     && digit <= max_mod_10))) {
-+                                        value = value * 10 + digit;
-+                                        if (++s < send)
-+                                          digit = *s - '0';
-+                                        else
-+                                          break;
-+                                      }
-+                                      if (digit >= 0 && digit <= 9
-+                                          && (s < send)) {
-+                                        /* value overflowed.
-+                                           skip the remaining digits, don't
-+                                           worry about setting *valuep.  */
-+                                        do {
-+                                          s++;
-+                                        } while (s < send && isDIGIT(*s));
-+                                        numtype |=
-+                                          IS_NUMBER_GREATER_THAN_UV_MAX;
-+                                        goto skip_value;
-+                                      }
-+                                    }
-+                                  }
-+				}
-+                              }
-+                            }
-+                          }
-+                        }
-+                      }
-+                    }
-+                  }
-+                }
-+              }
-+            }
-+          }
-+	}
-+      }
-+    }
-+    numtype |= IS_NUMBER_IN_UV;
-+    if (valuep)
-+      *valuep = value;
-+
-+  skip_value:
-+    if (GROK_NUMERIC_RADIX(&s, send)) {
-+      numtype |= IS_NUMBER_NOT_INT;
-+      while (s < send && isDIGIT(*s))  /* optional digits after the radix */
-+        s++;
-+    }
-+  }
-+  else if (GROK_NUMERIC_RADIX(&s, send)) {
-+    numtype |= IS_NUMBER_NOT_INT | IS_NUMBER_IN_UV; /* valuep assigned below */
-+    /* no digits before the radix means we need digits after it */
-+    if (s < send && isDIGIT(*s)) {
-+      do {
-+        s++;
-+      } while (s < send && isDIGIT(*s));
-+      if (valuep) {
-+        /* integer approximation is valid - it's 0.  */
-+        *valuep = 0;
-+      }
-+    }
-+    else
-+      return 0;
-+  } else if (*s == 'I' || *s == 'i') {
-+    s++; if (s == send || (*s != 'N' && *s != 'n')) return 0;
-+    s++; if (s == send || (*s != 'F' && *s != 'f')) return 0;
-+    s++; if (s < send && (*s == 'I' || *s == 'i')) {
-+      s++; if (s == send || (*s != 'N' && *s != 'n')) return 0;
-+      s++; if (s == send || (*s != 'I' && *s != 'i')) return 0;
-+      s++; if (s == send || (*s != 'T' && *s != 't')) return 0;
-+      s++; if (s == send || (*s != 'Y' && *s != 'y')) return 0;
-+      s++;
-+    }
-+    sawinf = 1;
-+  } else if (*s == 'N' || *s == 'n') {
-+    /* XXX TODO: There are signaling NaNs and quiet NaNs. */
-+    s++; if (s == send || (*s != 'A' && *s != 'a')) return 0;
-+    s++; if (s == send || (*s != 'N' && *s != 'n')) return 0;
-+    s++;
-+    sawnan = 1;
-+  } else
-+    return 0;
-+
-+  if (sawinf) {
-+    numtype &= IS_NUMBER_NEG; /* Keep track of sign  */
-+    numtype |= IS_NUMBER_INFINITY | IS_NUMBER_NOT_INT;
-+  } else if (sawnan) {
-+    numtype &= IS_NUMBER_NEG; /* Keep track of sign  */
-+    numtype |= IS_NUMBER_NAN | IS_NUMBER_NOT_INT;
-+  } else if (s < send) {
-+    /* we can have an optional exponent part */
-+    if (*s == 'e' || *s == 'E') {
-+      /* The only flag we keep is sign.  Blow away any "it's UV"  */
-+      numtype &= IS_NUMBER_NEG;
-+      numtype |= IS_NUMBER_NOT_INT;
-+      s++;
-+      if (s < send && (*s == '-' || *s == '+'))
-+        s++;
-+      if (s < send && isDIGIT(*s)) {
-+        do {
-+          s++;
-+        } while (s < send && isDIGIT(*s));
-+      }
-+      else
-+      return 0;
-+    }
-+  }
-+  while (s < send && isSPACE(*s))
-+    s++;
-+  if (s >= send)
-+    return numtype;
-+  if (len == 10 && memEQ(pv, "0 but true", 10)) {
-+    if (valuep)
-+      *valuep = 0;
-+    return IS_NUMBER_IN_UV;
-+  }
-+  return 0;
-+}
-+#endif
-+#endif
-+
-+/*
-+ * The grok_* routines have been modified to use warn() instead of
-+ * Perl_warner(). Also, 'hexdigit' was the former name of PL_hexdigit,
-+ * which is why the stack variable has been renamed to 'xdigit'.
-+ */
-+
-+#ifndef grok_bin
-+#if defined(NEED_grok_bin)
-+static UV DPPP_(my_grok_bin)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
-+static
-+#else
-+extern UV DPPP_(my_grok_bin)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
-+#endif
-+
-+#ifdef grok_bin
-+#  undef grok_bin
-+#endif
-+#define grok_bin(a,b,c,d) DPPP_(my_grok_bin)(aTHX_ a,b,c,d)
-+#define Perl_grok_bin DPPP_(my_grok_bin)
-+
-+#if defined(NEED_grok_bin) || defined(NEED_grok_bin_GLOBAL)
-+UV
-+DPPP_(my_grok_bin)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result)
-+{
-+    const char *s = start;
-+    STRLEN len = *len_p;
-+    UV value = 0;
-+    NV value_nv = 0;
-+
-+    const UV max_div_2 = UV_MAX / 2;
-+    bool allow_underscores = *flags & PERL_SCAN_ALLOW_UNDERSCORES;
-+    bool overflowed = FALSE;
-+
-+    if (!(*flags & PERL_SCAN_DISALLOW_PREFIX)) {
-+        /* strip off leading b or 0b.
-+           for compatibility silently suffer "b" and "0b" as valid binary
-+           numbers. */
-+        if (len >= 1) {
-+            if (s[0] == 'b') {
-+                s++;
-+                len--;
-+            }
-+            else if (len >= 2 && s[0] == '0' && s[1] == 'b') {
-+                s+=2;
-+                len-=2;
-+            }
-+        }
-+    }
-+
-+    for (; len-- && *s; s++) {
-+        char bit = *s;
-+        if (bit == '0' || bit == '1') {
-+            /* Write it in this wonky order with a goto to attempt to get the
-+               compiler to make the common case integer-only loop pretty tight.
-+               With gcc seems to be much straighter code than old scan_bin.  */
-+          redo:
-+            if (!overflowed) {
-+                if (value <= max_div_2) {
-+                    value = (value << 1) | (bit - '0');
-+                    continue;
-+                }
-+                /* Bah. We're just overflowed.  */
-+                warn("Integer overflow in binary number");
-+                overflowed = TRUE;
-+                value_nv = (NV) value;
-+            }
-+            value_nv *= 2.0;
-+	    /* If an NV has not enough bits in its mantissa to
-+	     * represent a UV this summing of small low-order numbers
-+	     * is a waste of time (because the NV cannot preserve
-+	     * the low-order bits anyway): we could just remember when
-+	     * did we overflow and in the end just multiply value_nv by the
-+	     * right amount. */
-+            value_nv += (NV)(bit - '0');
-+            continue;
-+        }
-+        if (bit == '_' && len && allow_underscores && (bit = s[1])
-+            && (bit == '0' || bit == '1'))
-+	    {
-+		--len;
-+		++s;
-+                goto redo;
-+	    }
-+        if (!(*flags & PERL_SCAN_SILENT_ILLDIGIT))
-+            warn("Illegal binary digit '%c' ignored", *s);
-+        break;
-+    }
-+
-+    if (   ( overflowed && value_nv > 4294967295.0)
-+#if UVSIZE > 4
-+	|| (!overflowed && value > 0xffffffff  )
-+#endif
-+	) {
-+	warn("Binary number > 0b11111111111111111111111111111111 non-portable");
-+    }
-+    *len_p = s - start;
-+    if (!overflowed) {
-+        *flags = 0;
-+        return value;
-+    }
-+    *flags = PERL_SCAN_GREATER_THAN_UV_MAX;
-+    if (result)
-+        *result = value_nv;
-+    return UV_MAX;
-+}
-+#endif
-+#endif
-+
-+#ifndef grok_hex
-+#if defined(NEED_grok_hex)
-+static UV DPPP_(my_grok_hex)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
-+static
-+#else
-+extern UV DPPP_(my_grok_hex)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
-+#endif
-+
-+#ifdef grok_hex
-+#  undef grok_hex
-+#endif
-+#define grok_hex(a,b,c,d) DPPP_(my_grok_hex)(aTHX_ a,b,c,d)
-+#define Perl_grok_hex DPPP_(my_grok_hex)
-+
-+#if defined(NEED_grok_hex) || defined(NEED_grok_hex_GLOBAL)
-+UV
-+DPPP_(my_grok_hex)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result)
-+{
-+    const char *s = start;
-+    STRLEN len = *len_p;
-+    UV value = 0;
-+    NV value_nv = 0;
-+
-+    const UV max_div_16 = UV_MAX / 16;
-+    bool allow_underscores = *flags & PERL_SCAN_ALLOW_UNDERSCORES;
-+    bool overflowed = FALSE;
-+    const char *xdigit;
-+
-+    if (!(*flags & PERL_SCAN_DISALLOW_PREFIX)) {
-+        /* strip off leading x or 0x.
-+           for compatibility silently suffer "x" and "0x" as valid hex numbers.
-+        */
-+        if (len >= 1) {
-+            if (s[0] == 'x') {
-+                s++;
-+                len--;
-+            }
-+            else if (len >= 2 && s[0] == '0' && s[1] == 'x') {
-+                s+=2;
-+                len-=2;
-+            }
-+        }
-+    }
-+
-+    for (; len-- && *s; s++) {
-+	xdigit = strchr((char *) PL_hexdigit, *s);
-+        if (xdigit) {
-+            /* Write it in this wonky order with a goto to attempt to get the
-+               compiler to make the common case integer-only loop pretty tight.
-+               With gcc seems to be much straighter code than old scan_hex.  */
-+          redo:
-+            if (!overflowed) {
-+                if (value <= max_div_16) {
-+                    value = (value << 4) | ((xdigit - PL_hexdigit) & 15);
-+                    continue;
-+                }
-+                warn("Integer overflow in hexadecimal number");
-+                overflowed = TRUE;
-+                value_nv = (NV) value;
-+            }
-+            value_nv *= 16.0;
-+	    /* If an NV has not enough bits in its mantissa to
-+	     * represent a UV this summing of small low-order numbers
-+	     * is a waste of time (because the NV cannot preserve
-+	     * the low-order bits anyway): we could just remember when
-+	     * did we overflow and in the end just multiply value_nv by the
-+	     * right amount of 16-tuples. */
-+            value_nv += (NV)((xdigit - PL_hexdigit) & 15);
-+            continue;
-+        }
-+        if (*s == '_' && len && allow_underscores && s[1]
-+		&& (xdigit = strchr((char *) PL_hexdigit, s[1])))
-+	    {
-+		--len;
-+		++s;
-+                goto redo;
-+	    }
-+        if (!(*flags & PERL_SCAN_SILENT_ILLDIGIT))
-+            warn("Illegal hexadecimal digit '%c' ignored", *s);
-+        break;
-+    }
-+
-+    if (   ( overflowed && value_nv > 4294967295.0)
-+#if UVSIZE > 4
-+	|| (!overflowed && value > 0xffffffff  )
-+#endif
-+	) {
-+	warn("Hexadecimal number > 0xffffffff non-portable");
-+    }
-+    *len_p = s - start;
-+    if (!overflowed) {
-+        *flags = 0;
-+        return value;
-+    }
-+    *flags = PERL_SCAN_GREATER_THAN_UV_MAX;
-+    if (result)
-+        *result = value_nv;
-+    return UV_MAX;
-+}
-+#endif
-+#endif
-+
-+#ifndef grok_oct
-+#if defined(NEED_grok_oct)
-+static UV DPPP_(my_grok_oct)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
-+static
-+#else
-+extern UV DPPP_(my_grok_oct)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result);
-+#endif
-+
-+#ifdef grok_oct
-+#  undef grok_oct
-+#endif
-+#define grok_oct(a,b,c,d) DPPP_(my_grok_oct)(aTHX_ a,b,c,d)
-+#define Perl_grok_oct DPPP_(my_grok_oct)
-+
-+#if defined(NEED_grok_oct) || defined(NEED_grok_oct_GLOBAL)
-+UV
-+DPPP_(my_grok_oct)(pTHX_ char *start, STRLEN *len_p, I32 *flags, NV *result)
-+{
-+    const char *s = start;
-+    STRLEN len = *len_p;
-+    UV value = 0;
-+    NV value_nv = 0;
-+
-+    const UV max_div_8 = UV_MAX / 8;
-+    bool allow_underscores = *flags & PERL_SCAN_ALLOW_UNDERSCORES;
-+    bool overflowed = FALSE;
-+
-+    for (; len-- && *s; s++) {
-+         /* gcc 2.95 optimiser not smart enough to figure that this subtraction
-+            out front allows slicker code.  */
-+        int digit = *s - '0';
-+        if (digit >= 0 && digit <= 7) {
-+            /* Write it in this wonky order with a goto to attempt to get the
-+               compiler to make the common case integer-only loop pretty tight.
-+            */
-+          redo:
-+            if (!overflowed) {
-+                if (value <= max_div_8) {
-+                    value = (value << 3) | digit;
-+                    continue;
-+                }
-+                /* Bah. We're just overflowed.  */
-+                warn("Integer overflow in octal number");
-+                overflowed = TRUE;
-+                value_nv = (NV) value;
-+            }
-+            value_nv *= 8.0;
-+	    /* If an NV has not enough bits in its mantissa to
-+	     * represent a UV this summing of small low-order numbers
-+	     * is a waste of time (because the NV cannot preserve
-+	     * the low-order bits anyway): we could just remember when
-+	     * did we overflow and in the end just multiply value_nv by the
-+	     * right amount of 8-tuples. */
-+            value_nv += (NV)digit;
-+            continue;
-+        }
-+        if (digit == ('_' - '0') && len && allow_underscores
-+            && (digit = s[1] - '0') && (digit >= 0 && digit <= 7))
-+	    {
-+		--len;
-+		++s;
-+                goto redo;
-+	    }
-+        /* Allow \octal to work the DWIM way (that is, stop scanning
-+         * as soon as non-octal characters are seen, complain only iff
-+         * someone seems to want to use the digits eight and nine). */
-+        if (digit == 8 || digit == 9) {
-+            if (!(*flags & PERL_SCAN_SILENT_ILLDIGIT))
-+                warn("Illegal octal digit '%c' ignored", *s);
-+        }
-+        break;
-+    }
-+
-+    if (   ( overflowed && value_nv > 4294967295.0)
-+#if UVSIZE > 4
-+	|| (!overflowed && value > 0xffffffff  )
-+#endif
-+	) {
-+	warn("Octal number > 037777777777 non-portable");
-+    }
-+    *len_p = s - start;
-+    if (!overflowed) {
-+        *flags = 0;
-+        return value;
-+    }
-+    *flags = PERL_SCAN_GREATER_THAN_UV_MAX;
-+    if (result)
-+        *result = value_nv;
-+    return UV_MAX;
-+}
-+#endif
-+#endif
-+
-+#ifdef NO_XSLOCKS
-+#  ifdef dJMPENV
-+#    define dXCPT             dJMPENV; int rEtV = 0
-+#    define XCPT_TRY_START    JMPENV_PUSH(rEtV); if (rEtV == 0)
-+#    define XCPT_TRY_END      JMPENV_POP;
-+#    define XCPT_CATCH        if (rEtV != 0)
-+#    define XCPT_RETHROW      JMPENV_JUMP(rEtV)
-+#  else
-+#    define dXCPT             Sigjmp_buf oldTOP; int rEtV = 0
-+#    define XCPT_TRY_START    Copy(top_env, oldTOP, 1, Sigjmp_buf); rEtV = Sigsetjmp(top_env, 1); if (rEtV == 0)
-+#    define XCPT_TRY_END      Copy(oldTOP, top_env, 1, Sigjmp_buf);
-+#    define XCPT_CATCH        if (rEtV != 0)
-+#    define XCPT_RETHROW      Siglongjmp(top_env, rEtV)
-+#  endif
-+#endif
-+
-+#endif /* _P_P_PORTABILITY_H_ */
-+
-+/* End of File ppport.h */
-diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/Syslog.pm perl-5.10.0/ext/Sys/Syslog/Syslog.pm
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/Syslog.pm	2007-12-18 05:47:07.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/Syslog.pm	2007-12-31 11:15:28.000000000 -0500
-@@ -10,7 +10,7 @@
- require Exporter;
- 
- {   no strict 'vars';
--    $VERSION = '0.22';
-+    $VERSION = '0.24';
-     @ISA = qw(Exporter);
- 
-     %EXPORT_TAGS = (
-@@ -221,7 +221,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
-         }
-@@ -771,7 +771,7 @@
- 
- =head1 VERSION
- 
--Version 0.22
-+Version 0.24
- 
- =head1 SYNOPSIS
- 
-diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/distchk.t perl-5.10.0/ext/Sys/Syslog/t/distchk.t
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/distchk.t	1969-12-31 19:00:00.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/t/distchk.t	2007-08-21 14:59:13.000000000 -0400
-@@ -0,0 +1,5 @@
-+#!perl -w
-+use strict;
-+use Test::More;
-+eval "use Test::Distribution not => [qw(versions podcover use)]";
-+plan skip_all => "Test::Distribution required for checking distribution" if $@;
-diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/podcover.t perl-5.10.0/ext/Sys/Syslog/t/podcover.t
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/podcover.t	1969-12-31 19:00:00.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/t/podcover.t	2007-08-19 19:53:41.000000000 -0400
-@@ -0,0 +1,6 @@
-+#!perl -wT
-+use strict;
-+use Test::More;
-+eval "use Test::Pod::Coverage 1.06";
-+plan skip_all => "Test::Pod::Coverage 1.06 required for testing POD coverage" if $@;
-+all_pod_coverage_ok({also_private => [qw(^constant$ ^connect ^disconnect ^xlate$ ^LOG_ _xs$)]});
-diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/podspell.t perl-5.10.0/ext/Sys/Syslog/t/podspell.t
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/podspell.t	1969-12-31 19:00:00.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/t/podspell.t	2007-09-07 09:13:19.000000000 -0400
-@@ -0,0 +1,78 @@
-+#!perl -w
-+use strict;
-+use Test::More;
-+plan skip_all => "Pod spelling: for developer interest only :)" unless -d 'releases';
-+eval "use Test::Spelling";
-+plan skip_all => "Test::Spelling required for testing POD spell" if $@;
-+set_spell_cmd('aspell -l --lang=en');
-+add_stopwords(<DATA>);
-+all_pod_files_spelling_ok();
-+
-+__END__
-+
-+SAPER
-+Sébastien
-+Aperghis
-+Tramoni
-+Aperghis-Tramoni
-+Christiansen
-+Kobes
-+Hedden
-+Reini
-+Harnisch
-+AnnoCPAN
-+CPAN
-+README
-+TODO
-+AUTOLOADER
-+API
-+arrayref
-+arrayrefs
-+hashref
-+hashrefs
-+lookup
-+hostname
-+loopback
-+netmask
-+timestamp
-+INET
-+BPF
-+IP
-+TCP
-+tcp
-+UDP
-+udp
-+UUCP
-+NTP
-+FDDI
-+Firewire
-+HDLC
-+IEEE
-+IrDA
-+LocalTalk
-+PPP
-+unix
-+FreeBSD
-+NetBSD
-+Solaris
-+IRIX
-+endianness
-+failover
-+Failover
-+logopts
-+pathname
-+syslogd
-+Syslogging
-+logmask
-+AIX
-+SUSv
-+SUSv3
-+Tru
-+Tru64
-+UX
-+HP-UX
-+VOS
-+NetInfo
-+VPN
-+launchd
-+logalert
-diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/pod.t perl-5.10.0/ext/Sys/Syslog/t/pod.t
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/pod.t	1969-12-31 19:00:00.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/t/pod.t	2007-08-19 19:53:41.000000000 -0400
-@@ -0,0 +1,6 @@
-+#!perl -wT
-+use strict;
-+use Test::More;
-+eval "use Test::Pod 1.14";
-+plan skip_all => "Test::Pod 1.14 required for testing POD" if $@;
-+all_pod_files_ok();
-diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/portfs.t perl-5.10.0/ext/Sys/Syslog/t/portfs.t
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/portfs.t	1969-12-31 19:00:00.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/t/portfs.t	2007-08-19 19:53:40.000000000 -0400
-@@ -0,0 +1,8 @@
-+#!perl -wT
-+use strict;
-+use Test::More;
-+eval "use Test::Portability::Files";
-+plan skip_all => "Test::Portability::Files required for testing filenames portability" if $@;
-+
-+# run the selected tests
-+run_tests();
-diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/syslog.t perl-5.10.0/ext/Sys/Syslog/t/syslog.t
---- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/syslog.t	2007-12-18 05:47:07.000000000 -0500
-+++ perl-5.10.0/ext/Sys/Syslog/t/syslog.t	2007-12-30 12:23:58.000000000 -0500
-@@ -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;
- 
-@@ -189,6 +193,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" );
-Binary files /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/win32/PerlLog.RES and perl-5.10.0/ext/Sys/Syslog/win32/PerlLog.RES differ
diff --git a/perl-5.10.0-TestSimple0.80.patch b/perl-5.10.0-TestSimple0.80.patch
deleted file mode 100644
index b61300c..0000000
--- a/perl-5.10.0-TestSimple0.80.patch
+++ /dev/null
@@ -1,1542 +0,0 @@
---- perl-5.10.0/lib/Test/Builder.bla/Module.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Module.pm	2008-04-06 17:26:10.000000000 +0200
-@@ -1,13 +1,13 @@
- 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.80';
- 
- # 5.004's Exporter doesn't have export_to_level.
- my $_export_to_level = sub {
-@@ -83,6 +83,9 @@ import_extra().
- 
- 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;
- 
-Common subdirectories: perl-5.10.0/lib/Test/Builder.bla/Tester and perl-5.10.0/lib/Test/Builder/Tester
-diff -up perl-5.10.0/lib/Test/Builder.bla/Tester.pm perl-5.10.0/lib/Test/Builder/Tester.pm
---- perl-5.10.0/lib/Test/Builder.bla/Tester.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Tester.pm	2008-04-06 17:26:21.000000000 +0200
-@@ -1,8 +1,7 @@
- package Test::Builder::Tester;
- 
- use strict;
--use vars qw(@EXPORT $VERSION @ISA);
--$VERSION = "1.09";
-+our $VERSION = "1.13";
- 
- use Test::Builder;
- use Symbol;
-@@ -56,9 +55,9 @@ my $t = Test::Builder->new;
- ###
- 
- 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 ;-)
-@@ -188,7 +187,7 @@ output filehandles)
- 
- =cut
- 
--sub test_out(@)
-+sub test_out
- {
-     # do we need to do any setup?
-     _start_testing() unless $testing;
-@@ -196,7 +195,7 @@ sub test_out(@)
-     $out->expect(@_)
- }
- 
--sub test_err(@)
-+sub test_err
- {
-     # do we need to do any setup?
-     _start_testing() unless $testing;
-@@ -549,36 +548,36 @@ sub complaint
-     if (Test::Builder::Tester::color)
-     {
-       # get color
--      eval "require Term::ANSIColor";
-+      eval { require Term::ANSIColor };
-       unless ($@)
-       {
--	# colours
-+        # colours
- 
--	my $green = Term::ANSIColor::color("black").
--	            Term::ANSIColor::color("on_green");
-+        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");
-+        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;
-+        # 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;
-       }
-     }
- 
-diff -up perl-5.10.0/lib/Test/Builder.pm.bla perl-5.10.0/lib/Test/Builder.pm
---- perl-5.10.0/lib/Test/Builder.pm.bla	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder.pm	2008-04-06 17:26:10.000000000 +0200
-@@ -1,15 +1,10 @@
- package Test::Builder;
- 
--use 5.004;
--
--# $^C was only introduced in 5.005-ish.  We do this to prevent
--# use of uninitialized value warnings in older perls.
--$^C ||= 0;
--
-+use 5.006;
- use strict;
--use vars qw($VERSION);
--$VERSION = '0.72';
--$VERSION = eval $VERSION;    # make the alpha version come out as a number
-+
-+our $VERSION = '0.80';
-+$VERSION = eval { $VERSION }; # make the alpha version come out as a number
- 
- # Make Test::Builder thread-safe for ithreads.
- BEGIN {
-@@ -73,28 +68,15 @@ Test::Builder - Backend for building tes
- =head1 SYNOPSIS
- 
-   package My::Test::Module;
--  use Test::Builder;
--  require Exporter;
--  @ISA = qw(Exporter);
--  @EXPORT = qw(ok);
--
--  my $Test = Test::Builder->new;
--  $Test->output('my_logfile');
--
--  sub import {
--      my($self) = shift;
--      my $pack = caller;
-+  use base 'Test::Builder::Module';
- 
--      $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);
-   }
- 
- 
-@@ -177,7 +159,6 @@ sub reset {
-     # 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->{Original_Pid} = $$;
-@@ -196,9 +177,11 @@ sub reset {
-     $self->{No_Header}  = 0;
-     $self->{No_Ending}  = 0;
- 
-+    $self->{TODO}       = undef;
-+
-     $self->_dup_stdhandles unless $^C;
- 
--    return undef;
-+    return;
- }
- 
- =back
-@@ -210,25 +193,6 @@ are.  You usually only want to call one 
- 
- =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');
-@@ -360,6 +324,29 @@ sub skip_all {
-     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
-@@ -401,9 +388,12 @@ sub ok {
-     Very confusing.
- ERR
- 
--    my($pack, $file, $line) = $self->caller;
-+    my $todo = $self->todo();
-+    
-+    # Capture the value of $TODO for the rest of this ok() call
-+    # so it can more easily be found by other routines.
-+    local $self->{TODO} = $todo;
- 
--    my $todo = $self->todo($pack);
-     $self->_unoverload_str(\$todo);
- 
-     my $out;
-@@ -448,13 +438,14 @@ ERR
-         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]);
--	}
-+    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;
-@@ -584,6 +575,7 @@ sub _is_diag {
-         }
-     }
- 
-+    local $Level = $Level + 1;
-     return $self->diag(sprintf <<DIAGNOSTIC, $got, $expect);
-          got: %s
-     expected: %s
-@@ -705,7 +697,8 @@ sub cmp_ok {
- 
-         my $code = $self->_caller_context;
- 
--        # 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" . "\$got $type \$expect;";
-@@ -730,6 +723,8 @@ sub _cmp_diag {
-     
-     $got    = defined $got    ? "'$got'"    : 'undef';
-     $expect = defined $expect ? "'$expect'" : 'undef';
-+    
-+    local $Level = $Level + 1;
-     return $self->diag(sprintf <<DIAGNOSTIC, $got, $type, $expect);
-     %s
-         %s
-@@ -925,7 +920,7 @@ sub maybe_regex {
-     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,'
-@@ -937,7 +932,18 @@ sub maybe_regex {
-     }
- 
-     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) = @_;
-@@ -956,7 +962,8 @@ sub _regex_ok {
- 
-         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};
-@@ -970,6 +977,8 @@ $code" . q{$test = $this =~ /$usable_reg
-     unless( $ok ) {
-         $this = defined $this ? "'$this'" : 'undef';
-         my $match = $cmp eq '=~' ? "doesn't match" : "matches";
-+
-+        local $Level = $Level + 1;
-         $self->diag(sprintf <<DIAGNOSTIC, $this, $match, $regex);
-                   %s
-     %13s '%s'
-@@ -1145,7 +1154,7 @@ foreach my $attribute (qw(No_Header No_E
-         return $self->{$attribute};
-     };
- 
--    no strict 'refs';
-+    no strict 'refs';   ## no critic
-     *{__PACKAGE__.'::'.$method} = $code;
- }
- 
-@@ -1332,10 +1341,9 @@ sub _new_fh {
-         $fh = $file_or_fh;
-     }
-     else {
--        $fh = do { local *FH };
--        open $fh, ">$file_or_fh" or
-+        open $fh, ">", $file_or_fh or
-             $self->croak("Can't open test output log $file_or_fh: $!");
--	_autoflush($fh);
-+        _autoflush($fh);
-     }
- 
-     return $fh;
-@@ -1350,6 +1358,7 @@ sub _autoflush {
- }
- 
- 
-+my($Testout, $Testerr);
- sub _dup_stdhandles {
-     my $self = shift;
- 
-@@ -1357,28 +1366,46 @@ sub _dup_stdhandles {
- 
-     # Set everything to unbuffered else plain prints to STDOUT will
-     # come out in the wrong order from our own prints.
--    _autoflush(\*TESTOUT);
-+    _autoflush($Testout);
-     _autoflush(\*STDOUT);
--    _autoflush(\*TESTERR);
-+    _autoflush($Testerr);
-     _autoflush(\*STDERR);
- 
--    $self->output(\*TESTOUT);
--    $self->failure_output(\*TESTERR);
--    $self->todo_output(\*TESTOUT);
-+    $self->output        ($Testout);
-+    $self->failure_output($Testerr);
-+    $self->todo_output   ($Testout);
- }
- 
- 
- my $Opened_Testhandles = 0;
- sub _open_testhandles {
-+    my $self = shift;
-+    
-     return if $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:  $!";
-+    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 );
-+    
-     $Opened_Testhandles = 1;
- }
- 
- 
-+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;
-+    });
-+}
-+
- =item carp
- 
-   $tb->carp(@message);
-@@ -1558,9 +1585,10 @@ will be considered 'todo' (see Test::Mor
- 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.
-+todo() is about finding the right package to look for $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
-@@ -1571,10 +1599,12 @@ what $pack to use.
- sub todo {
-     my($self, $pack) = @_;
- 
--    $pack = $pack || $self->exported_to || $self->caller($Level);
-+    return $self->{TODO} if defined $self->{TODO};
-+
-+    $pack = $pack || $self->caller(1) || $self->exported_to;
-     return 0 unless $pack;
- 
--    no strict 'refs';
-+    no strict 'refs';   ## no critic
-     return defined ${$pack.'::TODO'} ? ${$pack.'::TODO'}
-                                      : 0;
- }
-@@ -1587,6 +1617,8 @@ sub todo {
- 
- Like the normal caller(), except it reports according to your level().
- 
-+C<$height> will be added to the level().
-+
- =cut
- 
- sub caller {
-@@ -1671,35 +1703,27 @@ sub _my_exit {
- 
- =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;
- 
-+    my $real_exit_code = $?;
-     $self->_sanity_check();
- 
-     # Don't bother with an ending if this is a forked copy.  Only the parent
-     # should do the ending.
-+    if( $self->{Original_Pid} != $$ ) {
-+        return;
-+    }
-+    
-     # 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.
-@@ -1749,7 +1773,7 @@ Looks like you failed $num_failed test$s
- FAIL
-         }
- 
--        if( $self->{Test_Died} ) {
-+        if( $real_exit_code ) {
-             $self->diag(<<"FAIL");
- Looks like your test died just after $self->{Curr_Test}.
- FAIL
-@@ -1773,7 +1797,7 @@ FAIL
-     elsif ( $self->{Skip_All} ) {
-         _my_exit( 0 ) && return;
-     }
--    elsif ( $self->{Test_Died} ) {
-+    elsif ( $real_exit_code ) {
-         $self->diag(<<'FAIL');
- Looks like your test died before it could output anything.
- FAIL
-diff -up perl-5.10.0/lib/Test/More.pm.bla perl-5.10.0/lib/Test/More.pm
---- perl-5.10.0/lib/Test/More.pm.bla	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/More.pm	2008-04-06 17:26:10.000000000 +0200
-@@ -1,7 +1,6 @@
- package Test::More;
- 
--use 5.004;
--
-+use 5.006;
- use strict;
- 
- 
-@@ -16,7 +15,7 @@ sub _carp {
- 
- 
- use vars qw($VERSION @ISA @EXPORT %EXPORT_TAGS $TODO);
--$VERSION = '0.72';
-+$VERSION = '0.80';
- $VERSION = eval $VERSION;    # make the alpha version come out as a number
- 
- use Test::Builder::Module;
-@@ -31,7 +30,7 @@ use Test::Builder::Module;
-              plan
-              can_ok  isa_ok
-              diag
--	     BAIL_OUT
-+             BAIL_OUT
-             );
- 
- 
-@@ -659,32 +658,35 @@ sub use_ok ($;@) {
- 
-     my($pack,$filename,$line) = caller;
- 
--    local($@,$!,$SIG{__DIE__});   # isolate eval
--
-+    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 $@;
-+        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 +694,20 @@ DIAGNOSTIC
-     return $ok;
- }
- 
-+
-+sub _eval {
-+    my($code) = shift;
-+    my @args = @_;
-+
-+    # Work around oddities surrounding resetting of $@ by immediately
-+    # storing it.
-+    local($@,$!,$SIG{__DIE__});   # isolate eval
-+    my $eval_result = eval $code;
-+    my $eval_error  = $@;
-+
-+    return($eval_result, $eval_error);
-+}
-+
- =item B<require_ok>
- 
-    require_ok($module);
-@@ -711,20 +727,20 @@ sub require_ok ($) {
-     # 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 $@;
-+        chomp $eval_error;
-         $tb->diag(<<DIAGNOSTIC);
-     Tried to require '$module'.
--    Error:  $@
-+    Error:  $eval_error
- DIAGNOSTIC
- 
-     }
-@@ -1438,7 +1454,7 @@ B<NOTE>  This behavior may go away in fu
- 
- =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 Overloaded objects
-diff -up perl-5.10.0/lib/Test/Simple.pm.bla perl-5.10.0/lib/Test/Simple.pm
---- perl-5.10.0/lib/Test/Simple.pm.bla	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple.pm	2008-04-06 17:26:10.000000000 +0200
-@@ -4,7 +4,7 @@ use 5.004;
- 
- use strict 'vars';
- use vars qw($VERSION @ISA @EXPORT);
--$VERSION = '0.72';
-+$VERSION = '0.80';
- $VERSION = eval $VERSION;    # make the alpha version come out as a number
- 
- use Test::Builder::Module;
-diff -up perl-5.10.0/lib/Test/Tutorial.pod.bla perl-5.10.0/lib/Test/Tutorial.pod
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/BEGIN_require_ok.t perl-5.10.0/lib/Test/Simple/t/BEGIN_require_ok.t
---- perl-5.10.0/lib/Test/Simple/t.bla/BEGIN_require_ok.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/BEGIN_require_ok.t	2007-12-04 04:32:40.000000000 +0100
-@@ -0,0 +1,24 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ('../lib', 'lib');
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use Test::More;
-+
-+my $result;
-+BEGIN {
-+    eval {
-+        require_ok("Wibble");
-+    };
-+    $result = $@;
-+}
-+
-+plan tests => 1;
-+like $result, '/^You tried to run a test without a plan/';
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/BEGIN_use_ok.t perl-5.10.0/lib/Test/Simple/t/BEGIN_use_ok.t
---- perl-5.10.0/lib/Test/Simple/t.bla/BEGIN_use_ok.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/BEGIN_use_ok.t	2007-09-20 05:16:02.000000000 +0200
-@@ -0,0 +1,28 @@
-+#!/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 {
-+    eval {
-+        use_ok("Wibble");
-+    };
-+    $result = $@;
-+}
-+
-+plan tests => 1;
-+like $result, '/^You tried to run a test without a plan/';
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/dont_overwrite_die_handler.t perl-5.10.0/lib/Test/Simple/t/dont_overwrite_die_handler.t
---- perl-5.10.0/lib/Test/Simple/t.bla/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	2008-02-24 04:33:47.000000000 +0100
-@@ -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/lib/Test/Simple/t.bla/exit.t perl-5.10.0/lib/Test/Simple/t/exit.t
---- perl-5.10.0/lib/Test/Simple/t.bla/exit.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/exit.t	2008-02-24 04:29:39.000000000 +0100
-@@ -25,18 +25,9 @@
-     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;
-@@ -59,10 +50,11 @@
-              'pre_plan_death.plx'       => ['not zero',    'not zero'],
-              'death_in_eval.plx'        => [0,      0],
-              'require.plx'              => [0,      0],
--	     'exit.plx'                 => [1,      4],
-+             'death_with_handler.plx'   => [255,    4],
-+             'exit.plx'                 => [1,      4],
-             );
- 
--print "1..".keys(%Tests)."\n";
-+$TB->plan( tests => scalar keys(%Tests) );
- 
- eval { require POSIX; &POSIX::WEXITSTATUS(0) };
- if( $@ ) {
-@@ -93,12 +85,12 @@
-     my $actual_exit = exitstatus($wait_stat);
- 
-     if( $exit_code eq 'not zero' ) {
--        My::Test::ok( $actual_exit != 0,
-+        $TB->isnt_num( $actual_exit, 0,
-                       "$test_name exited with $actual_exit ".
-                       "(expected $exit_code)");
-     }
-     else {
--        My::Test::ok( $actual_exit == $exit_code, 
-+        $TB->is_num( $actual_exit, $exit_code, 
-                       "$test_name exited with $actual_exit ".
-                       "(expected $exit_code)");
-     }
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/filehandles.t perl-5.10.0/lib/Test/Simple/t/filehandles.t
---- perl-5.10.0/lib/Test/Simple/t.bla/filehandles.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/filehandles.t	2008-02-29 11:07:33.000000000 +0100
-@@ -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/lib/Test/Simple/t.bla/is_deeply_with_threads.t perl-5.10.0/lib/Test/Simple/t/is_deeply_with_threads.t
---- perl-5.10.0/lib/Test/Simple/t.bla/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	2008-02-24 04:12:32.000000000 +0100
-@@ -22,12 +22,17 @@
-         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;
-+    }
- }
- use Test::More;
- 
- 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/lib/Test/Simple/t.bla/lib/Dev/Null.pm perl-5.10.0/lib/Test/Simple/t/lib/Dev/Null.pm
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Dev/Null.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Dev/Null.pm	2008-02-24 04:44:15.000000000 +0100
-@@ -0,0 +1,6 @@
-+package Dev::Null;
-+
-+sub TIEHANDLE { bless {} }
-+sub PRINT { 1 }
-+
-+1;
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/NoExporter.pm perl-5.10.0/lib/Test/Simple/t/lib/NoExporter.pm
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/NoExporter.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/NoExporter.pm	2008-02-24 04:03:27.000000000 +0100
-@@ -0,0 +1,10 @@
-+package NoExporter;
-+
-+$VERSION = 1.02;
-+sub import { 
-+    shift;
-+    die "NoExporter exports nothing.  You asked for: @_" if @_;
-+}
-+
-+1;
-+
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/Catch.pm perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/Catch.pm
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/Catch.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/Catch.pm	2008-02-24 04:03:15.000000000 +0100
-@@ -0,0 +1,18 @@
-+# For testing Test::Simple;
-+package Test::Simple::Catch;
-+
-+use Symbol;
-+use TieOut;
-+my($out_fh, $err_fh) = (gensym, gensym);
-+my $out = tie *$out_fh, 'TieOut';
-+my $err = tie *$err_fh, 'TieOut';
-+
-+use Test::Builder;
-+my $t = Test::Builder->new;
-+$t->output($out_fh);
-+$t->failure_output($err_fh);
-+$t->todo_output($err_fh);
-+
-+sub caught { return($out, $err) }
-+
-+1;
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death_in_eval.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death_in_eval.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death_in_eval.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death_in_eval.plx	2006-08-31 07:24:16.000000000 +0200
-@@ -0,0 +1,22 @@
-+require Test::Simple;
-+use Carp;
-+
-+push @INC, 't/lib';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+
-+Test::Simple->import(tests => 5);
-+
-+ok(1);
-+ok(1);
-+ok(1);
-+eval {
-+        die "Foo";
-+};
-+ok(1);
-+eval "die 'Bar'";
-+ok(1);
-+
-+eval {
-+        croak "Moo";
-+};
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death.plx	2008-02-24 05:39:20.000000000 +0100
-@@ -0,0 +1,15 @@
-+require Test::Simple;
-+
-+push @INC, 't/lib';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+
-+require Dev::Null;
-+
-+Test::Simple->import(tests => 5);
-+tie *STDERR, 'Dev::Null';
-+
-+ok(1);
-+ok(1);
-+ok(1);
-+die "This is a test";
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death_with_handler.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death_with_handler.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/death_with_handler.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/death_with_handler.plx	2008-02-24 05:38:55.000000000 +0100
-@@ -0,0 +1,18 @@
-+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);
-+die "This is a test";
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/exit.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/exit.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/exit.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/exit.plx	2006-08-31 07:24:17.000000000 +0200
-@@ -0,0 +1,3 @@
-+require Test::Builder;
-+
-+exit 1;
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/extras.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/extras.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/extras.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/extras.plx	2006-08-31 07:24:16.000000000 +0200
-@@ -0,0 +1,16 @@
-+require Test::Simple;
-+
-+push @INC, 't/lib';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+
-+Test::Simple->import(tests => 5);
-+
-+
-+ok(1);
-+ok(1);
-+ok(1);
-+ok(1);
-+ok(0);
-+ok(1);
-+ok(0);
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/five_fail.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/five_fail.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/five_fail.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/five_fail.plx	2006-08-31 07:24:16.000000000 +0200
-@@ -0,0 +1,13 @@
-+require Test::Simple;
-+
-+use lib 't/lib';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+
-+Test::Simple->import(tests => 5);
-+
-+ok(0);
-+ok(0);
-+ok('');
-+ok(0);
-+ok(0);
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/last_minute_death.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/last_minute_death.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/last_minute_death.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2008-02-24 05:39:07.000000000 +0100
-@@ -0,0 +1,18 @@
-+require Test::Simple;
-+
-+push @INC, 't/lib';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+
-+Test::Simple->import(tests => 5);
-+
-+require Dev::Null;
-+tie *STDERR, 'Dev::Null';
-+
-+ok(1);
-+ok(1);
-+ok(1);
-+ok(1);
-+ok(1);
-+
-+die "This is a test";
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/one_fail.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/one_fail.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/one_fail.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/one_fail.plx	2006-08-31 07:24:17.000000000 +0200
-@@ -0,0 +1,14 @@
-+require Test::Simple;
-+
-+push @INC, 't/lib';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+
-+Test::Simple->import(tests => 5);
-+
-+
-+ok(1);
-+ok(2);
-+ok(0);
-+ok(1);
-+ok(2);
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/pre_plan_death.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/pre_plan_death.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/pre_plan_death.plx	2006-08-31 07:24:16.000000000 +0200
-@@ -0,0 +1,17 @@
-+# ID 20020716.013, the exit code would become 0 if the test died
-+# before a plan.
-+
-+require Test::Simple;
-+
-+push @INC, 't/lib';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+
-+close STDERR;
-+die "Knife?";
-+
-+Test::Simple->import(tests => 3);
-+
-+ok(1);
-+ok(1);
-+ok(1);
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/require.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/require.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/require.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/require.plx	2006-08-31 07:24:17.000000000 +0200
-@@ -0,0 +1 @@
-+require Test::Simple;
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/success.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/success.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/success.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/success.plx	2006-08-31 07:24:16.000000000 +0200
-@@ -0,0 +1,13 @@
-+require Test::Simple;
-+
-+push @INC, 't/lib';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+
-+Test::Simple->import(tests => 5);
-+
-+ok(1);
-+ok(5, 'yep');
-+ok(3, 'beer');
-+ok("wibble", "wibble");
-+ok(1);
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/too_few_fail.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/too_few_fail.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/too_few_fail.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/too_few_fail.plx	2006-08-31 07:24:16.000000000 +0200
-@@ -0,0 +1,12 @@
-+require Test::Simple;
-+
-+push @INC, 't/lib';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+
-+Test::Simple->import(tests => 5);
-+
-+
-+ok(0);
-+ok(1);
-+ok(0);
-\ No newline at end of file
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/too_few.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/too_few.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/too_few.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/too_few.plx	2006-08-31 07:24:16.000000000 +0200
-@@ -0,0 +1,11 @@
-+require Test::Simple;
-+
-+push @INC, 't/lib';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+
-+Test::Simple->import(tests => 5);
-+
-+
-+ok(1);
-+ok(1);
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/two_fail.plx perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/two_fail.plx
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/Test/Simple/sample_tests/two_fail.plx	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/Test/Simple/sample_tests/two_fail.plx	2006-08-31 07:24:16.000000000 +0200
-@@ -0,0 +1,14 @@
-+require Test::Simple;
-+
-+push @INC, 't/lib';
-+require Test::Simple::Catch;
-+my($out, $err) = Test::Simple::Catch::caught();
-+
-+Test::Simple->import(tests => 5);
-+
-+
-+ok(0);
-+ok(1);
-+ok(1);
-+ok(0);
-+ok(1);
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/lib/TieOut.pm perl-5.10.0/lib/Test/Simple/t/lib/TieOut.pm
---- perl-5.10.0/lib/Test/Simple/t.bla/lib/TieOut.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/lib/TieOut.pm	2008-02-24 04:03:15.000000000 +0100
-@@ -0,0 +1,28 @@
-+package TieOut;
-+
-+sub TIEHANDLE {
-+    my $scalar = '';
-+    bless( \$scalar, $_[0]);
-+}
-+
-+sub PRINT {
-+    my $self = shift;
-+    $$self .= join('', @_);
-+}
-+
-+sub PRINTF {
-+    my $self = shift;
-+    my $fmt  = shift;
-+    $$self .= sprintf $fmt, @_;
-+}
-+
-+sub FILENO {}
-+
-+sub read {
-+    my $self = shift;
-+    my $data = $$self;
-+    $$self = '';
-+    return $data;
-+}
-+
-+1;
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/maybe_regex.t perl-5.10.0/lib/Test/Simple/t/maybe_regex.t
---- perl-5.10.0/lib/Test/Simple/t.bla/maybe_regex.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/maybe_regex.t	2008-02-24 05:08:29.000000000 +0100
-@@ -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/lib/Test/Simple/t.bla/pod-coverage.t perl-5.10.0/lib/Test/Simple/t/pod-coverage.t
---- perl-5.10.0/lib/Test/Simple/t.bla/pod-coverage.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/pod-coverage.t	2007-03-14 01:21:10.000000000 +0100
-@@ -0,0 +1,27 @@
-+#!/usr/bin/perl -w
-+
-+use Test::More;
-+
-+# 1.08 added the coverage_class option.
-+eval "use Test::Pod::Coverage 1.08";
-+plan skip_all => "Test::Pod::Coverage 1.08 required for testing POD coverage" if $@;
-+eval "use Pod::Coverage::CountParents";
-+plan skip_all => "Pod::Coverage::CountParents required for testing POD coverage" if $@;
-+
-+my @modules = Test::Pod::Coverage::all_modules();
-+plan tests => scalar @modules;
-+
-+my %coverage_params = (
-+    "Test::Builder" => {
-+        also_private => [ '^(share|lock|BAILOUT)$' ]
-+    },
-+    "Test::More" => {
-+        trustme => [ '^(skip|todo)$' ]
-+    },
-+);
-+
-+for my $module (@modules) {
-+    pod_coverage_ok( $module, { coverage_class => 'Pod::Coverage::CountParents',
-+                                %{$coverage_params{$module} || {}} }
-+                   );
-+}
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/pod.t perl-5.10.0/lib/Test/Simple/t/pod.t
---- perl-5.10.0/lib/Test/Simple/t.bla/pod.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/pod.t	2006-10-24 23:08:10.000000000 +0200
-@@ -0,0 +1,6 @@
-+#!/usr/bin/perl -w
-+
-+use Test::More;
-+eval "use Test::Pod 1.00";
-+plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
-+all_pod_files_ok();
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/reset.t perl-5.10.0/lib/Test/Simple/t/reset.t
---- perl-5.10.0/lib/Test/Simple/t.bla/reset.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/reset.t	2008-02-24 05:31:07.000000000 +0100
-@@ -16,6 +16,11 @@
- 
- use Test::Builder;
- my $tb = Test::Builder->new;
-+
-+my %Original_Output;
-+$Original_Output{$_} = $tb->$_ for qw(output failure_output todo_output);
-+
-+
- $tb->plan(tests => 14);
- $tb->level(0);
- 
-@@ -66,11 +71,11 @@
- 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,    
-+ok( fileno $tb->output         == fileno $Original_Output{output},    
-                                         'output' );
--ok( fileno $tb->failure_output == fileno *Test::Builder::TESTERR,    
-+ok( fileno $tb->failure_output == fileno $Original_Output{failure_output},    
-                                         'failure_output' );
--ok( fileno $tb->todo_output    == fileno *Test::Builder::TESTOUT,
-+ok( fileno $tb->todo_output    == fileno $Original_Output{todo_output},
-                                         'todo_output' );
- ok( $tb->current_test   == 0,           'current_test' );
- ok( $tb->summary        == 0,           'summary' );
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/tbm_doesnt_set_exported_to.t perl-5.10.0/lib/Test/Simple/t/tbm_doesnt_set_exported_to.t
---- perl-5.10.0/lib/Test/Simple/t.bla/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	2008-02-26 21:45:20.000000000 +0100
-@@ -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()'
-+);
-\ No newline at end of file
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/todo.t perl-5.10.0/lib/Test/Simple/t/todo.t
---- perl-5.10.0/lib/Test/Simple/t.bla/todo.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/todo.t	2008-02-27 10:37:18.000000000 +0100
-@@ -9,7 +9,7 @@
- 
- use Test::More;
- 
--plan tests => 18;
-+plan tests => 19;
- 
- 
- $Why = 'Just testing the todo interface.';
-@@ -69,11 +69,20 @@
-         # perl gets the line number a little wrong on the first
-         # statement inside a block.
-         1 == 1;
--#line 82
-+#line 73
-         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 73\n",
-         'todo_skip without $how_many warning' );
- }
-+
-+
-+TODO: {
-+    Test::More->builder->exported_to("Wibble");
-+    
-+    local $TODO = "testing \$TODO with an incorrect exported_to()";
-+    
-+    fail("Just testing todo");
-+}
-diff -urN perl-5.10.0/lib/Test/Simple/t.bla/utf8.t perl-5.10.0/lib/Test/Simple/t/utf8.t
---- perl-5.10.0/lib/Test/Simple/t.bla/utf8.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Simple/t/utf8.t	2008-04-06 17:24:44.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 -up perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx
-diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx
---- perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx.bla	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx	2008-02-24 05:39:20.000000000 +0100
-@@ -4,10 +4,12 @@ push @INC, 't/lib';
- 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?";
-+die "This is a test";
-diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx
---- perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx.bla	2008-09-16 14:55:33.000000000 +0200
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx	2008-02-24 05:38:55.000000000 +0100
-@@ -0,0 +1,18 @@
-+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);
-+die "This is a test";
-diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx
-diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx
-diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx
-diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx
---- perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx.bla	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx	2008-02-24 05:39:07.000000000 +0100
-@@ -5,7 +5,9 @@ require Test::Simple::Catch;
- 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,4 @@ ok(1);
- ok(1);
- ok(1);
- 
--die "Almost there...";
-+die "This is a test";
-diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx
-diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
-diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx
-diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx
-diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx
-diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx
-diff -up perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx.bla perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx
diff --git a/perl-5.10.0-links.patch b/perl-5.10.0-links.patch
index 7a02ad5..3eba439 100644
--- a/perl-5.10.0-links.patch
+++ b/perl-5.10.0-links.patch
@@ -1,16 +1,16 @@
 diff -up perl-5.10.0/lib/File/Fetch.pm.BAD perl-5.10.0/lib/File/Fetch.pm
---- perl-5.10.0/lib/File/Fetch.pm.BAD	2007-12-21 10:41:39.000000000 -0500
-+++ perl-5.10.0/lib/File/Fetch.pm	2007-12-21 10:43:00.000000000 -0500
-@@ -37,7 +37,7 @@ $WARN           = 1;
+--- perl-5.10.0.orig/lib/File/Fetch.pm	2009-03-11 14:21:00.000000000 +0100
++++ perl-5.10.0/lib/File/Fetch.pm	2009-03-11 14:23:26.000000000 +0100
+@@ -35,7 +35,7 @@ $WARN           = 1;
  
  ### methods available to fetch the file depending on the scheme
  $METHODS = {
--    http    => [ qw|lwp wget curl lynx| ],
-+    http    => [ qw|lwp wget curl links| ],
-     ftp     => [ qw|lwp netftp wget curl ncftp ftp| ],
-     file    => [ qw|lwp file| ],
+-    http    => [ qw|lwp wget curl lftp lynx| ],
++    http    => [ qw|lwp wget curl lftp links| ],
+     ftp     => [ qw|lwp netftp wget curl lftp ncftp ftp| ],
+     file    => [ qw|lwp lftp file| ],
      rsync   => [ qw|rsync| ]
-@@ -694,9 +694,9 @@ sub _ftp_fetch {
+@@ -772,9 +772,9 @@ sub _ftp_fetch {
      }
  }
  
@@ -23,7 +23,7 @@ diff -up perl-5.10.0/lib/File/Fetch.pm.BAD perl-5.10.0/lib/File/Fetch.pm
      my $self = shift;
      my %hash = @_;
  
-@@ -706,25 +706,25 @@ sub _lynx_fetch {
+@@ -784,21 +784,21 @@ sub _lynx_fetch {
      };
      check( $tmpl, \%hash ) or return;
  
@@ -42,6 +42,18 @@ diff -up perl-5.10.0/lib/File/Fetch.pm.BAD perl-5.10.0/lib/File/Fetch.pm
 +                'links' ));
          }            
  
+         ### check if the HTTP resource exists ###
+         if ($self->uri =~ /^https?:\/\//i) {
+             my $cmd = [
+-                $lynx,
++                $links,
+                 '-head',
+                 '-source',
+                 "-auth=anonymous:$FROM_EMAIL",
+@@ -822,14 +822,14 @@ sub _lynx_fetch {
+             }
+         }
+ 
 -        ### write to the output file ourselves, since lynx ass_u_mes to much
 +        ### write to the output file ourselves, since links ass_u_mes to much
          my $local = FileHandle->new(">$to")
@@ -55,7 +67,7 @@ diff -up perl-5.10.0/lib/File/Fetch.pm.BAD perl-5.10.0/lib/File/Fetch.pm
              '-source',
              "-auth=anonymous:$FROM_EMAIL",
          ];
-@@ -750,7 +750,7 @@ sub _lynx_fetch {
+@@ -860,7 +860,7 @@ sub _lynx_fetch {
          ### XXX on a 404 with a special error page, $captured will actually
          ### hold the contents of that page, and make it *appear* like the
          ### request was a success, when really it wasn't :(
@@ -64,7 +76,7 @@ diff -up perl-5.10.0/lib/File/Fetch.pm.BAD perl-5.10.0/lib/File/Fetch.pm
          ### code based on a 4XX status or so.
          ### the closest we can come is using --error_file and parsing that,
          ### which is very unreliable ;(
-@@ -760,7 +760,7 @@ sub _lynx_fetch {
+@@ -870,7 +870,7 @@ sub _lynx_fetch {
          return $to;
  
      } else {
@@ -73,16 +85,16 @@ diff -up perl-5.10.0/lib/File/Fetch.pm.BAD perl-5.10.0/lib/File/Fetch.pm
          return;
      }
  }
-@@ -1031,7 +1031,7 @@ Below is a mapping of what utilities wil
+@@ -1150,7 +1150,7 @@ Below is a mapping of what utilities wil
  for what schemes, if available:
  
-     file    => LWP, file
--    http    => LWP, wget, curl, lynx
-+    http    => LWP, wget, curl, links
-     ftp     => LWP, Net::FTP, wget, curl, ncftp, ftp
+     file    => LWP, lftp, file
+-    http    => LWP, wget, curl, lftp, lynx
++    http    => LWP, wget, curl, lftp, links
+     ftp     => LWP, Net::FTP, wget, curl, lftp, ncftp, ftp
      rsync   => rsync
  
-@@ -1143,7 +1143,7 @@ the $BLACKLIST, $METHOD_FAIL and other i
+@@ -1262,7 +1262,7 @@ the $BLACKLIST, $METHOD_FAIL and other i
      LWP         => lwp
      Net::FTP    => netftp
      wget        => wget
@@ -91,7 +103,7 @@ diff -up perl-5.10.0/lib/File/Fetch.pm.BAD perl-5.10.0/lib/File/Fetch.pm
      ncftp       => ncftp
      ftp         => ftp
      curl        => curl
-@@ -1161,17 +1161,17 @@ example, to use an ftp proxy:
+@@ -1281,17 +1281,17 @@ example, to use an ftp proxy:
  
  Refer to the LWP::UserAgent manpage for more details.
  
@@ -114,20 +126,20 @@ diff -up perl-5.10.0/lib/File/Fetch.pm.BAD perl-5.10.0/lib/File/Fetch.pm
  
  =head2 Files I'm trying to fetch have reserved characters or non-ASCII characters in them. What do I do?
 diff -up perl-5.10.0/lib/File/Fetch/t/01_File-Fetch.t.BAD perl-5.10.0/lib/File/Fetch/t/01_File-Fetch.t
---- perl-5.10.0/lib/File/Fetch/t/01_File-Fetch.t.BAD	2007-12-21 10:43:38.000000000 -0500
-+++ perl-5.10.0/lib/File/Fetch/t/01_File-Fetch.t	2007-12-21 10:43:45.000000000 -0500
-@@ -169,7 +169,7 @@ for my $entry (@map) {
- {   for my $uri ( 'http://www.cpan.org/index.html',
-                   'http://www.cpan.org/index.html?q=1&y=2'
+--- perl-5.10.0.orig/lib/File/Fetch/t/01_File-Fetch.t	2009-03-11 14:21:00.000000000 +0100
++++ perl-5.10.0/lib/File/Fetch/t/01_File-Fetch.t	2009-03-11 14:22:10.000000000 +0100
+@@ -177,7 +177,7 @@ for my $entry (@map) {
+                   '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 links]) {
+-        for (qw[lwp wget curl lftp lynx]) {
++        for (qw[lwp wget curl lftp links]) {
              _fetch_uri( http => $uri, $_ );
          }
      }
 diff -up perl-5.10.0/lib/CPAN.pm.BAD perl-5.10.0/lib/CPAN.pm
---- perl-5.10.0/lib/CPAN.pm.BAD	2007-12-21 10:39:16.000000000 -0500
-+++ perl-5.10.0/lib/CPAN.pm	2007-12-21 10:41:13.000000000 -0500
+--- perl-5.10.0.orig/lib/CPAN.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/CPAN.pm	2009-03-11 14:21:21.000000000 +0100
 @@ -4318,7 +4318,7 @@ sub hostdlhard {
  
          # Try the most capable first and leave ncftp* for last as it only
@@ -250,8 +262,8 @@ diff -up perl-5.10.0/lib/CPAN.pm.BAD perl-5.10.0/lib/CPAN.pm
  That's all. Similarly for ncftp or ftp, you would configure something
  like
 diff -up perl-5.10.0/lib/CPAN/HandleConfig.pm.BAD perl-5.10.0/lib/CPAN/HandleConfig.pm
---- perl-5.10.0/lib/CPAN/HandleConfig.pm.BAD	2007-12-21 10:43:14.000000000 -0500
-+++ perl-5.10.0/lib/CPAN/HandleConfig.pm	2007-12-21 10:43:21.000000000 -0500
+--- perl-5.10.0.orig/lib/CPAN/HandleConfig.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/CPAN/HandleConfig.pm	2009-03-11 14:21:21.000000000 +0100
 @@ -49,7 +49,7 @@ $VERSION = sprintf "%.6f", substr(q$Rev:
       "inhibit_startup_message",
       "keep_source_where",
@@ -262,8 +274,8 @@ diff -up perl-5.10.0/lib/CPAN/HandleConfig.pm.BAD perl-5.10.0/lib/CPAN/HandleCon
       "make_arg",
       "make_install_arg",
 diff -up perl-5.10.0/lib/CPAN/FirstTime.pm.BAD perl-5.10.0/lib/CPAN/FirstTime.pm
---- perl-5.10.0/lib/CPAN/FirstTime.pm.BAD	2007-12-21 10:38:30.000000000 -0500
-+++ perl-5.10.0/lib/CPAN/FirstTime.pm	2007-12-21 10:38:58.000000000 -0500
+--- perl-5.10.0.orig/lib/CPAN/FirstTime.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/CPAN/FirstTime.pm	2009-03-11 14:21:21.000000000 +0100
 @@ -813,7 +813,7 @@ Shall we use it as the general CPAN buil
  
                              make
@@ -274,8 +286,8 @@ diff -up perl-5.10.0/lib/CPAN/FirstTime.pm.BAD perl-5.10.0/lib/CPAN/FirstTime.pm
                              gpg
  
 diff -up perl-5.10.0/pod/perltoc.pod.BAD perl-5.10.0/pod/perltoc.pod
---- perl-5.10.0/pod/perltoc.pod.BAD	2007-12-21 10:44:44.000000000 -0500
-+++ perl-5.10.0/pod/perltoc.pod	2007-12-21 10:44:53.000000000 -0500
+--- perl-5.10.0.orig/pod/perltoc.pod	2007-12-18 11:47:08.000000000 +0100
++++ perl-5.10.0/pod/perltoc.pod	2009-03-11 14:21:21.000000000 +0100
 @@ -14682,7 +14682,7 @@ has_inst($module), has_usable($module), 
  
  http firewall, ftp firewall, One way visibility, SOCKS, IP Masquerade
@@ -295,8 +307,8 @@ diff -up perl-5.10.0/pod/perltoc.pod.BAD perl-5.10.0/pod/perltoc.pod
  =item Files I'm trying to fetch have reserved characters or non-ASCII
  characters in them. What do I do?
 diff -up perl-5.10.0/pod/perlfaq9.pod.BAD perl-5.10.0/pod/perlfaq9.pod
---- perl-5.10.0/pod/perlfaq9.pod.BAD	2007-12-21 10:44:08.000000000 -0500
-+++ perl-5.10.0/pod/perlfaq9.pod	2007-12-21 10:44:32.000000000 -0500
+--- perl-5.10.0.orig/pod/perlfaq9.pod	2007-12-18 11:47:08.000000000 +0100
++++ perl-5.10.0/pod/perlfaq9.pod	2009-03-11 14:21:21.000000000 +0100
 @@ -212,14 +212,14 @@ examples.
  
  =head2 How do I fetch an HTML file?
diff --git a/perl-5.10.0-removeTestHarness.patch b/perl-5.10.0-removeTestHarness.patch
deleted file mode 100644
index 40ddd84..0000000
--- a/perl-5.10.0-removeTestHarness.patch
+++ /dev/null
@@ -1,5972 +0,0 @@
-diff -urN Test.old/Harness/Assert.pm Test/Harness/Assert.pm
---- perl-5.10.0/lib/Test.old/Harness/Assert.pm	2007-12-18 11:47:07.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 Test.old/Harness/bin/prove Test/Harness/bin/prove
---- perl-5.10.0/lib/Test.old/Harness/bin/prove	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/bin/prove	1970-01-01 01:00:00.000000000 +0100
-@@ -1,292 +0,0 @@
--#!/usr/bin/perl -w
--
--use strict;
--
--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 );
--}
--
--__END__
--
--=head1 NAME
--
--prove -- A command-line tool for running tests against Test::Harness
--
--=head1 SYNOPSIS
--
--prove [options] [files/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
--
--Single-character options may be stacked.  Default options may be set by
--specifying the PROVE_SWITCHES environment variable.
--
--=head1 OVERVIEW
--
--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.
--
--Shell metacharacters may be used with command lines options and will be exanded 
--via C<File::Glob::bsd_glob>.
--
--=head1 PROVE VS. "MAKE TEST"
--
--F<prove> has a number of advantages over C<make test> when doing development.
--
--=over 4
--
--=item * F<prove> is designed as a development tool
--
--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.
--
--=item * F<prove> is granular 
--
--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>.
--
--=item * F<prove> has an easy verbose mode
--
--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.
--
--=item * F<prove> can run under taint mode
--
--F<prove>'s C<-T> runs your tests under C<perl -T>, and C<-t> runs them
--under C<perl -t>.
--
--=item * F<prove> can shuffle tests
--
--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.
--
--=item * F<prove> doesn't rely on a make tool
--
--Not everyone wants to write a makefile, or use L<ExtUtils::MakeMaker>
--to do so.  F<prove> has no external dependencies.
--
--=item * Not everything is a module
--
--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.
--
--=back
--
--=head1 COMMAND LINE OPTIONS
--
--=head2 -b, --blib
--
--Adds blib/lib to the path for your tests, a la "use blib".
--
--=head2 -d, --debug
--
--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.
--
--=head2 -D, --dry
--
--Dry run: Show the tests to run, but don't run them.
--
--=head2 -I
--
--Add libraries to @INC, as Perl's -I.
--
--=head2 -l, --lib
--
--Add C<lib> to @INC.  Equivalent to C<-Ilib>.
--
--=head2 --perl
--
--Sets the C<HARNESS_PERL> environment variable, which controls what
--Perl executable will run the tests.
--
--=head2 -r, --recurse
--
--Descends into subdirectories of any directories specified, looking for tests.
--
--=head2 -s, --shuffle
--
--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.
--
--=head2 --strap
--
--Sets the HARNESS_STRAP_CLASS variable to set which Test::Harness::Straps
--variable to use in running the tests.
--
--=head2 -t
--
--Runs test programs under perl's -t taint warning mode.
--
--=head2 -T
--
--Runs test programs under perl's -T taint mode.
--
--=head2 --timer
--
--Print elapsed time after each test file
--
--=head2 -v, --verbose
--
--Display standard output of test scripts while running them.  Also sets
--TEST_VERBOSE in case your tests rely on them.
--
--=head2 -V, --version
--
--Display version info.
--
--=head1 BUGS
--
--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> >>.
--
--=head1 TODO
--
--=over 4
--
--=item *
--
--Shuffled tests must be recreatable
--
--=back
--
--=head1 AUTHORS
--
--Andy Lester C<< <andy at petdance.com> >>
--
--=head1 COPYRIGHT
--
--Copyright 2004-2006 by Andy Lester C<< <andy at 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 Test.old/Harness/Changes Test/Harness/Changes
---- perl-5.10.0/lib/Test.old/Harness/Changes	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/Changes	1970-01-01 01:00:00.000000000 +0100
-@@ -1,727 +0,0 @@
--Revision history for Perl extension Test::Harness
--
--NEXT
--    [FIXES]
--    * prove's --perl=/path/to/file wasn't taking a value.
--    * prove's version number was not getting incremented.  From now on,
--      prove's $VERSION will match Test::Harness's $VERSION, and I added
--      a test to make sure this is the case.
--
--    [ENHANCEMENTS]
--    * Added test straps overload via HARNESS_STRAP_OVERLOAD environment
--      variable.  prove now takes a --strap=class parameter.  Thanks,
--      Adam Kennedy.
--
--2.63_01 Fri Jun 30 16:59:50 CDT 2006
--    [ENHANCEMENTS]
--    * Failed tests used to say "NOK x", and now say "NOK x/y".
--      Thanks to Will Coleda.
--
--    * Added the Test::Harness::Results object, so we have a well-defined
--      object, and not just a hash that we pass around.  Thanks to YAPC::NA
--      2006 Hackathon!
--
--2.62 Thu Jun  8 14:11:57 CDT 2006
--    [FIXES]
--    * Restored the behavior of dying if any subtests failed.  This is a
--      pretty crucial bug that I should have fixed long ago.  Not having this
--      means that CPANPLUS will install modules even if their tests fail. :-(
--
--2.60 Wed May 24 14:48:44 CDT 2006
--    [FIXES]
--    * Fixed the headers in the summary failure table.
--
--2.58 Sat May 13 22:53:53 CDT 2006
--    No changes.  Released to the world with a non-beta number.
--
--2.57_06 Sun Apr 23 00:55:43 CDT 2006
--    [THINGS THAT MIGHT BREAK YOUR CODE]
--    * Anything that displays a percentage of tests passed has been
--      removed.  Output at the end of failing runs is now different.
--
--    [FIXES]
--    * Fixed the TODO-passing patch from 2.57_05.
--
--    [ENHANCEMENTS]
--    * The unnecessary display of percentages of tests passing and failing
--      have been removed.  Tests are not a percentage game.
--
--    * Caches the results of _default_inc(), which is expensive because
--      of shelling out to get the pathnames.  Benchmarking was showing that
--      15% of Test::Harness's time was spent in this function.  For test
--      suites with many test files, this can be significant.  With this
--      speedup, the "make test" for the Perl core speeds up 2.5%.
--      Thanks to Nicholas Clark for finding this.
--
--    [DOCUMENTATION]
--    * Fixed HARNESS_PERL_SWITCHES typo.  Thanks, Andreas Koenig.
--
--    * Added docs on HARNESS_TIMER and --timer.  Thanks, Mike O'Regan.
--
--2.57_05 Wed Apr 19 00:31:10 CDT 2006
--    [ENHANCEMENTS]
--    * Now shows details of the tests that unexpectedly pass, instead of
--      just giving a number.  Thanks, demerphq!
--
--    [INTERNALS]
--    * Fixed globbing to work under Perls before 5.6.0.  Before Perl 5.6.0,
--      prove just uses the internal glob() function.
--
--2.57_04 Mon Apr 17 13:35:10 CDT 2006
--    [ENHANCEMENTS]
--    * prove's globbing is now done with File::Glob::bsd_glob().
--      Otherwise, "prove c:\program files\svk\t\*" fails because glob()
--      considers it to be two patterns, splitting on whitespace.  Thanks to
--      Audrey Tang.
--
--    [DOCUMENTATION]
--    * Added information about other TAP implementations in other languages.
--
--2.57_03 Dec 31 2005
--
--    [THINGS THAT MAY BREAK YOUR CODE]
--    * Internal functions _run_all_tests() and _show_results() no longer
--      exist.  You shouldn't have been using them anyway since they're
--      prepended with underscores.
--
--    [INTERNALS]
--    * Added the ability to send test output to a filehandle of
--      one's choosing.  Two internal functions are now exposed:
--      execute_tests() and get_results() (formerly _run_all_tests() and
--      _show_results()).  This should allow CPANPLUS to work properly
--      with Module::Build.  Thanks to Ken Williams.
--
--    [DOCUMENTATION]
--    * Hid the documentation for the private methods in Test::Harness::Straps.
--
--2.57_02 Fri Dec 30 23:51:17 CST 2005
--    [THINGS THAT MAY BREAK YOUR CODE]
--    * prove's --ext option has been removed.  I'm betting that nobody used it.
--
--    [ENHANCEMENTS]
--    * prove can now take -w and -W switches, analogous to those in perl.
--      This means that "prove -wlb t/*.t" is exactly the same as "make test".
--      Thanks to Rob Kinyon.
--    * Started a Test::Harness::Util module for code that may be reused
--      by other Harness-using modules.
--
--    [INTERNALS]
--    * The t/prove*.t tests now use $^X to call prove.  Thanks to Yves Orton.
--    * Test::Harness::Straps no longer uses Win32::GetShortPathName().
--      Thanks to Gisle Aas.
--
--2.57_01 Mon Dec 26 01:39:07 CST 2005
--    [FIXES]
--    * Removed code and docs mentioning HARNESS_IGNORE_EXITCODE, which
--      is not used anywhere.
--
--    [ENHANCEMENTS]
--    * If we have hi-res timings, then they're shown in integer
--      milliseconds, rather than fractional seconds.
--
--    * Added the --perl switch to prove.
--
--    [DOCUMENTATION]
--    * Added links to CPAN support sites.
--
--2.56 Wed Sep 28 16:04:00 CDT 2005
--    [FIXES]
--    * Incorporate bleadperl patch to fix Test::Harness on VMS.
--
--2.54 Wed Sep 28 09:52:19 CDT 2005
--    [FIXES]
--    * Test counts were wrong, so wouldn't install on Perls < 5.8.0.
--
--2.53_02 Thu Aug 25 21:37:01 CDT 2005
--    [FIXES]
--    * File order in prove is now sorted within the directory.  It's not
--      the sorting that's important as much as the deterministic results.
--      Thanks to Adam Kennedy and Casey West for pointing this out,
--      independently of each other, with 12 hours of the other.
--
--    [INTERNALS]
--    * Fix calls to podusage() to not use the DATA typeglob.  Thanks sungo.
--
--2.53_01 Sun Jul 10 10:45:27 CDT 2005
--    [FIXES]
--    * If we go over 100,000 tests, it used to print out a warning for
--      every test over 100,000.  Now, we stop after the first.  Thanks to
--      Sebastien Aperghis-Tramoni.
--
--2.52 Sun Jun 26 23:05:19 CDT 2005
--    No changes
--
--2.51_02
--    [ENHANCEMENTS]
--    * The Test::Harness timer is now off by default.  Set HARNESS_TIMER
--      true if you want it.  Added --timer flag to prove.
--
--2.50_01
--    [FIXES]
--    * Call CORE::time() to figure out if we should print when we're
--      printing once per second.  Otherwise, we're using Time::HiRes'
--      version of it.  Thanks, Nicholas Clark.
--
--2.50 Tue Jun 21 14:32:12 CDT 2005
--    [FIXES]
--    * Added some includes in t/strap-analyze.t to make Cygwin happy.
--
--2.49_02 Tue Jun 21 09:54:44 CDT 2005
--    [FIXES]
--    * Added some includes in t/test_harness.t to make Cygwin happy.
--
--2.49_01 Fri Jun 10 15:37:31 CDT 2005
--    [ENHANCEMENTS]
--    * Now shows elapsed time in 1000ths of a second if Time::HiRes
--      is available.
--
--    [FIXES]
--    * Test::Harness::Iterator didn't have a 1; at the end.  Thanks to
--      Steve Peters for finding it.
--
--2.48    Fri Apr 22 22:41:46 CDT 2005
--    Released after weeks of non-complaint.
--
--2.47_03 Wed Mar  2 16:52:55 CST 2005
--    [THINGS THAT MIGHT BREAK YOUR CODE]
--    * Test::Harness now requires Perl 5.005_03 or above.
--
--    [FIXES]
--    * Fixed incorrect "confused by tests in wrong order" error in 2.47_02.
--
--2.47_02 Tue Mar  1 23:15:47 CST 2005
--    [THINGS THAT MIGHT BREAK YOUR CODE]
--    * Test directives for skip tests used to be anything that matches
--      /^skip/i, like the word "skipped", but now it must match
--      /^skip\s+/i.
--
--    [ENHANCEMENTS]
--    * T::H now sets environment variable HARNESS_VERSION, in case a test
--      program wants to know what version of T::H it's running under.
--
--2.47_01 Mon Feb 21 01:14:13 CST 2005
--    [FIXES]
--    * Fixed a problem submitted by Craig Berry:
--
--        Several of the Test::Harness tests now fail on VMS with the
--        following warning:
--
--        Can't find string terminator "]" anywhere before EOF at -e line 1.
--
--        The problem is that when a command is piped to the shell and that
--        command has a newline character embedded in it, the part after
--        the newline is invisible to the shell. The patch below corrects
--        that by escaping the newline so it is not subject to variable
--        interpolation until it gets to the child's Perl one-liner.
--
--    [ENHANCEMENTS]
--    * Test::Harness::Straps now has diagnostic gathering without changing
--      how tests are run.  It also adds these messages by default.
--      Note that the new method, _is_diagnostic(), is for internal
--      use only.  It may change soon.  Thanks to chromatic.
--
--    [DOCUMENTATION]
--    * Expanded Test::Harness::TAP.pod, and added examples.
--
--    * Fixed a crucial documentation typo in Test::Harness::Straps.
--
--2.46    Thu Jan 20 11:50:59 CST 2005
--    Released.
--
--2.45_02 Fri Dec 31 14:57:33 CST 2004
--    [ENHANCEMENTS]
--    * Turns off buffering on both STDERR and STDOUT, so that the two
--      output handles don't get out of sync with each other.  Thanks to
--      David Wheeler.
--
--    * No longer requires, or supports, the HARNESS_OK_SLOW environment
--      variable.  Test counts are only updated once per second, which
--      used to require having HARNESS_OK_SLOW set.
--
--2.45_01 Fri Dec 17 22:39:17 CST 2004
--    [THINGS THAT MIGHT BREAK YOUR CODE]
--    * Test::Harness now requires Perl 5.004_05.
--
--    * We no longer try to print a stack if a coredump is detected.
--
--    [FIXES]
--    * Reverted Test::Harness::Iterator::next()'s use of readline, since
--      it fails under Perl 5.5.4.
--
--    * We no longer try to print a stack if a coredump is detected.
--      This means that the external problems we've had with wait.ph
--      now disappear.  This resolves a number of problems that various
--      Linux distros have, and closes a couple of RT tickets like #2729
--      and #7716.
--
--    [ENHANCEMENTS]
--    * Added Test::Harness->strap() method to access the internal strap.
--
--    [DOCUMENTATION]
--    * Obfuscated the rt.cpan.org email address.  The damage is already
--      done, but at least we'll have it hidden going forward.
--
--2.44 Tue Nov 30 18:38:17 CST 2004
--    [INTERNALS]
--    * De-anonymized the callbacks and handlers in Test::Harness, mostly
--      so I can profile better.
--
--    * Checks _is_header() only if _is_line() fails first.  No point
--      in checking every line of the input for something that can only
--      occur once.
--
--    * Inline the _detailize() function, which was getting called once
--      per line of input.  Reduced execution time about 5-7%.
--
--    * Removed unnecessary temporary variables in Test::Harness::Straps
--      and in Test::Harness::Iterator.
--
--2.43_02 Thu Nov 25 00:20:36 CST 2004
--    [ENHANCEMENTS]
--    * Added more debug output if $Test::Harness::Debug is on.
--
--    [FIXES]
--    * Test::Harness now removes default paths from the paths that it
--      sets in PERL5LIB.  This fixes RT #5649.  Thanks, Schwern.
--
--    [THINGS THAT MIGHT BREAK YOUR CODE]
--    * Test::Harness::Straps' constructor no longer will work as an
--      object method.  You can't say $strap->new any more, but that's
--      OK because you never really wanted to anyway.
--
--2.43_01
--    [FIXES]
--    * Added workaround for local $ENV{} bug on Cygwin to
--    t/prove-switches.t.  See the following RT tickets for details.
--
--    https://rt.cpan.org/Ticket/Display.html?id=6452
--    http://rt.perl.org/rt3/Ticket/Display.html?id=30952
--
--
--2.42        Wed Apr 28 22:13:11 CDT 2004
--    [ENHANCEMENTS]
--    * prove -v now sets TEST_VERBOSE in case your tests rely on them.
--    * prove globs the command line, since Win32's shell doesn't.
--
--    [FIXES]
--    * Cross-platform test fixes on t/prove-globbing.t
--
--
--2.40        Tue Dec 30 20:38:59 CST 2003
--    [FIXES]
--    * Test::Harness::Straps should now properly quote on VMS.
--
--    [ENHANCEMENTS]
--    * prove now takes a -l option to add lib/ to @INC.  Now when you're
--      building a module, you don't have to do a make before you run
--      the prove.  Thanks to David Wheeler for the idea.
--
--    [INTERNALS]
--    * Internal functions corestatus() and canonfailed() prepended with
--      underscores, to indicate such.
--
--    * Gratuitous text-only changes in Test::Harness::Iterator.
--
--    * All tests now do their use_ok() in a BEGIN block.  Some of the
--      use_ok() calls were too much of a hassle to put into a BEGIN block,
--      so I changed them to regular use calls.
--
--
--2.38        Mon Nov 24 22:36:18 CST 2003
--    Released.  See changes below.
--
--2.37_03     Tue Nov 18 23:51:38 CST 2003
--    [ENHANCEMENTS]
--    * prove -V now shows the Perl version being used.
--    * Now there's a HARNESS_DEBUG flag that shows diagnostics as the
--      harness runs the tests.  This is different from HARNESS_VERBOSE,
--      which shows test output, but not information about the harness
--      itself.
--    * Added _command_line() to the Strap API.
--
--    [FIXES]
--    * Bad interaction with Module::Build:  The strap was only checking
--      $ENV{HARNESS_PERL_SWITCHES} for definedness, but not emptiness.
--      It now also strips any leading or trailing whitesapce from the
--      switches.
--    * Test::Harness and prove only quote those parms that actually need
--      to be quoted: Have some whitespace and aren't already quoted.
--
--2.36        Fri Nov 14 09:24:44 CST 2003
--    [FIXES]
--    * t/prove-includes.t properly ignores PROVE_SWITCHES that you may
--      already have set.
--
--2.35_02     Thu Nov 13 09:57:36 CST 2003
--    [ENHANCEMENTS]
--    * prove's --blib now works just like the blib pragma.
--
--2.35_01     Wed Nov 12 23:08:45 CST 2003
--    [FIXES]
--    * Fixed taint-handling and path preservation under MacOS.  Thanks to
--      Schwern for the patch and the tests.
--
--    * Preserves case of -t or -T in the shebang line of the test.
--
--    [ENHANCEMENTS]
--    * Added -t to prove analogous to Perl's -t.  Removed the --taint
--      switch.
--
--    * prove can take default options from the PROVE_SWITCHES variable.
--
--    * Added HARNESS_PERL to allow you to specify the Perl interpreter
--      to run the tests as.
--
--    * prove's --perl switch sets the HARNESS_PERL on the fly for you.
--
--    * Quotes the switches and filename in the subprogram.  This helps
--      with filenames with spaces that are subject to shell mangling.
--
--
--2.34        Sat Nov  8 22:09:15 CST 2003
--    [FIXES]
--    * Allowed prove to run on Perl versions < 5.6.0.
--
--    [ENHANCEMENTS]
--    * Command-line switches to prove may now be stacked.
--    * Added check for proper Pod::Usage version.
--    * "make clean" does a better job of cleaning up after itself.
--
--
--2.32        Fri Nov  7 09:41:21 CST 2003
--    Test::Harness now includes a powerful development tool to help
--    programmers work with automated tests.  The prove utility runs
--    test files against the harness, like a "make test", but with many
--    advantages:
--
--    * prove is designed as a development tool
--        Perl users typically run the test harness through a makefile via
--        "make test". That's fine for module distributions, but it's
--        suboptimal for a test/code/debug development cycle.
--
--    * prove is granular
--        prove lets your run against only the files you want to check.
--        Running "prove t/live/ t/master.t" checks every *.t in t/live, plus
--        t/master.t.
--
--    * prove has an easy verbose mode
--        To get full test program output from "make test", you must set
--        "HARNESS_VERBOSE" in the environment. prove has a "-v" option.
--
--    * prove can run under taint mode
--        prove's "-T" runs your tests under "perl -T".
--
--    * prove can shuffle tests
--        You can use prove's "--shuffle" option to try to excite problems
--        that don't show up when tests are run in the same order every time.
--
--    * Not everything is a module
--        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 requires Pod::Usage, which is standard after Perl 5.004.
--
--    I'm very excited about prove, and hope that developers will begin
--    adopting it to their coding cycles.  I welcome your comments at
--    andy@petdance.com.
--
--    There are also some minor bug fixes in Test::Harness itself, listed
--    below in the 2.31_* notes.
--     
--
--2.31_05     Thu Nov  6 14:56:22 CST 2003
--    [FIXES]
--    - If a MacPerl script had a shebang with -T, the -T wouldn't get
--      passed as a switch.
--    - Removed the -T on three *.t files, which didn't need them, and 
--      which were causing problems.
--    - Conditionally installs bin/prove, depending on whether Pod::Usage
--      is available, which prove needs.
--    - Removed old leftover code from Makefile.PL.
--
--2.31_04     Mon Nov  3 23:36:06 CST 2003
--    Minor tweaks here and there, almost ready to release.
--
--2.31_03     Mon Nov  3 08:50:36 CST 2003
--    [FEATURES]
--    - prove is almost feature-complete.  Removed the handling of
--      --exclude for excluding certain tests.  It may go back in the
--      future.
--    - prove -d is now debug.  Dry is prove -D.
--
--2.31_02     Fri Oct 31 23:46:03 CST 2003
--    [FEATURES]
--    - Added many more switches to prove: -d for dry run, and -b for
--      blib.
--
--    [FIXES]
--    - T:H:Straps now recognizes MSWin32 in $^0.
--    - RT#3811: Could do regex matching on garbage in _is_test().
--      Fixed by Yves Orton
--    - RT#3827: Strips backslashes from and normalizes @INC entries
--      for Win32.  Fixed by Yves Orton.
--
--    [INTERNALS]
--    - Added $self->{_is_macos} to the T:H:Strap object.
--    - t/test-harness.t sorts its test results, rather than relying on
--      internal key order.
--
--2.31_01
--    [FEATURES]
--    - Added "prove" script to run a test or set of tests through the
--      harness.  Thanks to Curtis Poe for the foundation.
--
--    [DOCUMENTATION]
--    - Fixed POD problem in Test::Harness::Assert
--
--2.30        Thu Aug 14 20:04:00 CDT 2003
--    No functional changes in this version.  It's only to make some doc
--    tweaks, and bump up the version number in T:H:Straps.
--
--    [DOCUMENTATION]
--    - Changed Schwern to Andy as the maintainer.
--    - Incorporated the TODO file into Harness.pm proper.
--    - Cleaned up formatting in Test::Harness::Straps.
--
--2.29        Wed Jul 17 14:08:00 CDT 2003
--    - Released as 2.29.
--
--2.28_91     Sun Jul 13 00:10:00 CDT 2003
--    [ENHANCEMENTS]
--    - Added support for HARNESS_OK_SLOW.  This will make a significant
--      speedup for slower connections.
--    - Folded in some changes from bleadperl that spiff up the
--      failure reports.
--
--    [INTERNALS]
--    - Added some isa_ok() checks to the tests.
--    - All Test::Harness* modules are used by use_ok()
--    - Fixed the prototype for the canonfailed() function, not that
--      it matters since it's never called without parens.
--
--2.28_90     Sat Jul 05 20:21:00 CDT 2003
--    [ENHANCEMENTS]
--    - Now, when you run a test harnessed, the numbers don't fly by one
--      at a time, one update per second.  This significantly speeds
--      up the run time for running thousands of tests.  *COUGH*
--      Regexp::Common *COUGH*
--
--2.28     Thu Apr 24 14:39:00 CDT 2003
--    - No functional changes.
--
--2.27_05  Mon Apr 21 15:55:00 CDT 2003
--    - No functional changes.
--    - Fixed circular depency in the test suite.  Thanks, Rob Brown.
--
--2.27_04  Sat Apr 12 21:42:00 CDT 2003
--    - Added test for $Test::Harness::Switches patch below.
--
--2.27_03  Thu Apr 03 10:47:00 CDT 2003
--    - Fixed straps not respecting $Test::Harness::Switches.  Thanks
--      to Miyagawa for the patch.
--    - Added t/pod.t to test POD validity.
--
--2.27_02  Mon Mar 24 13:17:00 CDT 2003
--2.27_01  Sun Mar 23 19:46:00 CDT 2003
--    - Handed over to Andy Lester for further maintenance.
--    - Fixed when the path to perl contains spaces on Windows
--    * Stas Bekman noticed that tests with no output at all were
--      interpreted as passing
--    - MacPerl test tweak for busted exit codes (bleadperl 17345)
--    - Abigail and Nick Clark both hit the 100000 "huge test that will
--      suck up all your memory" limit with legit tests.  Made the check
--      smarter to allow large, planned tests to work.
--    - Partial fix of stats display when a test fails only because there's
--      too many tests.
--    - Made wait.ph and WCOREDUMP anti-vommit protection more robust in
--      cases where wait.ph loads but WCOREDUMP() pukes when run.
--    - Added a LICENSE.
--    - Ilya noticed the per test skip reason was accumlating between tests.
--
--2.26  Wed Jun 19 16:58:02 EDT 2002
--    - Workaround for MacPerl's lack of a working putenv.  It will never 
--      see the PERL5LIB environment variable (perl@16942).
--
--2.25  Sun Jun 16 03:00:33 EDT 2002
--    - $Strap is now a global to allow Test::Harness::Straps
--      experimentation.
--    - Little spelling nit in a diagnostic.
--    - Chris Richmond noted that the runtests() docs were wrong.  It will
--      die, not return false, when any tests fail.  This is silly, but
--      historically necessary for 'make test'.  Docs corrected.
--    - MacPerl test fixes from Pudge. (mutation of bleadperl@16989)
--    - Undef warning introduced in 2.24 on skipped tests with no reasons 
--      fixed.
--    * Test::Harness now depends on File::Spec
--
--2.24  Wed May 29 19:02:18 EDT 2002
--    * Nikola Knezevic found a bug when tests are completely skipped
--      but no reason is given it was considered a failure.
--    * Made Test::Harness::Straps->analyze_file & Test::Harness a bit
--      more graceful when the test doesn't exist.
--
--2.23  Wed May 22 12:59:47 EDT 2002
--    - reason for all skip wasn't being displayed.  Broken in 2.20.
--    - Changed the wait status tests to conform with POSIX standards.
--    - Quieted some SYSTEM$ABORT noise leaking out from dying test tests
--      on VMS.
--
--2.22  Fri May 17 19:01:35 EDT 2002
--    - Fixed parsing of #!/usr/bin/perl-current to not see a -t.
--      (RT #574)
--    - Fixed exit codes on MPE/iX
--
--2.21  Mon May  6 00:43:22 EDT 2002
--    - removed a bunch of dead code left over after 2.20's gutting.
--    - The fix for the $^X "bug" added in 2.02 has been removed.  It
--      caused more trouble than the old bug (I'd never seen a problem
--      before anyway)
--    - 2.20 broke $verbose
--
--2.20  Sat May  4 22:31:20 EDT 2002
--    * An almost complete conversion of the Test::Harness test parsing
--      to use Test::Harness::Straps.
--
--2.04  Tue Apr 30 00:54:49 EDT 2002
--    * Changing the output format of skips
--    - Taking into account VMS's special exit codes in the tests.
--
--2.03  Thu Apr 25 01:01:34 EDT 2002
--    * $^X fix made safer.
--    - Noise from loading wait.ph to analyze core files supressed
--    - MJD found a situation where a test could run Test::Harness
--      out of memory.  Protecting against that specific case.
--    - Made the 1..M docs a bit clearer.
--    - Fixed TODO tests so Test::Harness does not display a NOK for
--      them.
--    - Test::Harness::Straps->analyze_file() docs were not clear as to
--      its effects
--
--2.02  Thu Mar 14 18:06:04 EST 2002
--    * Ken Williams fixed the long standing $^X bug.
--    * Added HARNESS_VERBOSE
--    * Fixed a bug where Test::Harness::Straps was considering a test that 
--      is ok but died as passing.
--    - Added the exit and wait codes of the test to the 
--      analyze_file() results.
--
--2.01  Thu Dec 27 18:54:36 EST 2001
--    * Added 'passing' to the results to tell you if the test passed
--    * Added Test::Harness::Straps example (examples/mini_harness.plx)
--    * Header-at-end tests were being interpreted as failing sometimes
--    - The 'skip_all' results from analyze* was not being set
--    - analyze_fh() and analyze_file() now work more efficiently, reading
--      line-by-line instead of slurping as before.
--
--2.00  Sun Dec 23 19:13:57 EST 2001
--    - Fixed a warning on VMS.
--    - Removed a little unnecessary code from analyze_file()
--    - Made sure filehandles are getting closed
--    - analyze() now considers "not \nok" to be a failure (VMSism)
--      but Test::Harness still doesn't.
--
--2.00_05 Mon Dec 17 22:08:02 EST 2001
--    * Wasn't filtering @INC properly when a test is run with -T, caused the 
--      command line to be too long on VMS.  VMS should be 100% now.
--    - Little bug in the skip 'various reasons' logic.
--    - Minor POD nit in 5.004_04
--    - Little speling mistak
--
--2.00_04 Sun Dec 16 00:33:32 EST 2001
--    * Major Test::Harness::Straps doc bug.
--
--2.00_03 Sat Dec 15 23:52:17 EST 2001
--    * First release candidate
--    * 'summary' is now 'details'
--    * Test #1 is now element 0 on the details array.  It works out better
--      that way.
--    * analyze_file() is more portable, but no longer taint clean
--    * analyze_file() properly preserves @INC and handles -T switches
--    - minor mistake in the test header line parsing
--
--1.26  Mon Nov 12 15:44:01 EST 2001
--    * An excuse to upload a new version to CPAN to get Test::Harness
--      back on the index.
--
--2.00_00  Sat Sep 29 00:12:03 EDT 2001
--    * Partial gutting of the internals
--    * Added Test::Harness::Straps
--
--1.25  Tue Aug  7 08:51:09 EDT 2001
--    * Fixed a bug with tests failing if they're all skipped
--      reported by Stas Bekman.
--    - Fixed a very minor warning in 5.004_04
--    - Fixed displaying filenames not from @ARGV
--    - Merging with bleadperl
--    -  minor fixes to the filename in the report
--    -  '[no reason given]' skip reason
--
--1.24  Tue Aug  7 08:51:09 EDT 2001
--    - Added internal information about number of todo tests
--
--1.23  Tue Jul 31 15:06:47 EDT 2001
--    - Merged in Ilya's "various reasons" patch
--    * Fixed "not ok 23 - some name # TODO" style tests
--
--1.22  Mon Jun 25 02:00:02 EDT 2001
--    * Fixed bug with failing tests using header at end.
--    - Documented how Test::Harness deals with garbage input
--    - Turned on test counter mismatch warning
--
--1.21  Wed May 23 19:22:53 BST 2001
--    * No longer considered unstable.  Merging back with the perl core.
--    - Fixed minor nit about the report summary
--    - Added docs on the meaning of the failure report
--    - Minor POD nits fixed mirroring perl change 9176
--    - TODO and SEE ALSO expanded
--
--1.20  Wed Mar 14 23:09:20 GMT 2001 by Michael G Schwern    *UNSTABLE*
--    * Fixed and tested with 5.004!
--    - Added EXAMPLE docs
--    - Added TODO docs
--    - Now uneffected by -l, $\ or $,
--
--1.19  Sat Mar 10 00:43:29 GMT 2001 by Michael G Schwern    *UNSTABLE*
--    - More internal reworking
--    * Removed use of experimental /(?>...)/ feature for backwards compat
--    * Removed use of open(my $fh, $file) for backwards compatibility
--    * Removed use of Tie::StdHandle in tests for backwards compat
--    * Added dire warning that this is unstable.
--    - Added some tests from the old CPAN release
--
--1.18  Mon Mar  5 17:35:11 GMT 2001 by Michael G Schwern
--    * Under new management!
--    * Test::Harness is now being concurrently shipped on CPAN as well
--      as in the core.
--    - Switched "our" for "use vars" and moved the minimum version back
--      to 5.004.  This may be optimistic.
--
--
--*** Missing version history to be extracted from Perl changes ***
--
--
--1.07  Fri Feb 23 1996 by Andreas Koenig
--    - Gisle sent me a documentation patch that showed me, that the
--      unless(/^#/) is unnessessary. Applied the patch and deleted the block
--      checking for "comment" lines. -- All lines are comment lines that do
--      not match /^1\.\.([0-9]+)/ or /^(not\s+)?ok\b/.
--    - Ilyaz request to print "ok (empty test case)" whenever we say 1..0
--      implemented.
--    - Harness now doesn't abort anymore if we received confused test output,
--      just warns instead.
--
--1.05  Wed Jan 31 1996 by Andreas Koenig
--    - More updates on docu and introduced the liberality that the script
--      output may omit the test numbers.
--
--1.03  Mon January 28 1996 by Andreas Koenig
--    - Added the statistics for subtests. Updated the documentation.
--
--1.02  by Andreas Koenig
--    - This version reports a list of the tests that failed accompanied by
--      some trivial statistics. The older (unnumbered) version stopped
--      processing after the first failed test.
--    - Additionally it reports the exit status if there is one.
--
--
-diff -urN Test.old/Harness/Iterator.pm Test/Harness/Iterator.pm
---- perl-5.10.0/lib/Test.old/Harness/Iterator.pm	2007-12-18 11:47:07.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 Test.old/Harness/Point.pm Test/Harness/Point.pm
---- perl-5.10.0/lib/Test.old/Harness/Point.pm	2007-12-18 11:47:07.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 Test.old/Harness/Results.pm Test/Harness/Results.pm
---- perl-5.10.0/lib/Test.old/Harness/Results.pm	2007-12-18 11:47:07.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 Test.old/Harness/Straps.pm Test/Harness/Straps.pm
---- perl-5.10.0/lib/Test.old/Harness/Straps.pm	2007-12-18 11:47:07.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 Test.old/Harness/t/00compile.t Test/Harness/t/00compile.t
---- perl-5.10.0/lib/Test.old/Harness/t/00compile.t	2007-12-18 11:47:07.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 Test.old/Harness/t/assert.t Test/Harness/t/assert.t
---- perl-5.10.0/lib/Test.old/Harness/t/assert.t	2007-12-18 11:47:07.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 Test.old/Harness/t/base.t Test/Harness/t/base.t
---- perl-5.10.0/lib/Test.old/Harness/t/base.t	2007-12-18 11:47:07.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 Test.old/Harness/t/callback.t Test/Harness/t/callback.t
---- perl-5.10.0/lib/Test.old/Harness/t/callback.t	2007-12-18 11:47:07.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 Test.old/Harness/t/failure.t Test/Harness/t/failure.t
---- perl-5.10.0/lib/Test.old/Harness/t/failure.t	2007-12-18 11:47:07.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 Test.old/Harness/t/from_line.t Test/Harness/t/from_line.t
---- perl-5.10.0/lib/Test.old/Harness/t/from_line.t	2007-12-18 11:47:07.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 Test.old/Harness/t/harness.t Test/Harness/t/harness.t
---- perl-5.10.0/lib/Test.old/Harness/t/harness.t	2007-12-18 11:47:07.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 Test.old/Harness/t/inc_taint.t Test/Harness/t/inc_taint.t
---- perl-5.10.0/lib/Test.old/Harness/t/inc_taint.t	2007-12-18 11:47:07.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 Test.old/Harness/t/nonumbers.t Test/Harness/t/nonumbers.t
---- perl-5.10.0/lib/Test.old/Harness/t/nonumbers.t	2007-12-18 11:47:07.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 Test.old/Harness/t/ok.t Test/Harness/t/ok.t
---- perl-5.10.0/lib/Test.old/Harness/t/ok.t	2007-12-18 11:47:07.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 Test.old/Harness/t/point-parse.t Test/Harness/t/point-parse.t
---- perl-5.10.0/lib/Test.old/Harness/t/point-parse.t	2007-12-18 11:47:07.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 Test.old/Harness/t/point.t Test/Harness/t/point.t
---- perl-5.10.0/lib/Test.old/Harness/t/point.t	2007-12-18 11:47:07.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 Test.old/Harness/t/prove-globbing.t Test/Harness/t/prove-globbing.t
---- perl-5.10.0/lib/Test.old/Harness/t/prove-globbing.t	2007-12-18 11:47:07.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 Test.old/Harness/t/prove-switches.t Test/Harness/t/prove-switches.t
---- perl-5.10.0/lib/Test.old/Harness/t/prove-switches.t	2007-12-18 11:47:07.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 Test.old/Harness/t/strap-analyze.t Test/Harness/t/strap-analyze.t
---- perl-5.10.0/lib/Test.old/Harness/t/strap-analyze.t	2007-12-18 11:47:07.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 Test.old/Harness/t/strap.t Test/Harness/t/strap.t
---- perl-5.10.0/lib/Test.old/Harness/t/strap.t	2007-12-18 11:47:07.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 Test.old/Harness/t/test-harness.t Test/Harness/t/test-harness.t
---- perl-5.10.0/lib/Test.old/Harness/t/test-harness.t	2007-12-18 11:47:07.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 Test.old/Harness/t/version.t Test/Harness/t/version.t
---- perl-5.10.0/lib/Test.old/Harness/t/version.t	2007-12-18 11:47:07.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 Test.old/Harness/TAP.pod Test/Harness/TAP.pod
---- perl-5.10.0/lib/Test.old/Harness/TAP.pod	2007-12-18 11:47:07.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 Test.old/Harness/Util.pm Test/Harness/Util.pm
---- perl-5.10.0/lib/Test.old/Harness/Util.pm	2007-12-18 11:47:07.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 Test.old/Harness.pm Test/Harness.pm
---- perl-5.10.0/lib/Test.old/Harness.pm	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness.pm	1970-01-01 01:00:00.000000000 +0100
-@@ -1,1169 +0,0 @@
--# -*- 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 vars qw(
--    $VERSION 
--    @ISA @EXPORT @EXPORT_OK 
--    $Verbose $Switches $Debug
--    $verbose $switches $debug
--    $Columns
--    $Timer
--    $ML $Last_ML_Print
--    $Strap
--    $has_time_hires
--);
--
--BEGIN {
--    eval q{use Time::HiRes 'time'};
--    $has_time_hires = !$@;
--}
--
--=head1 NAME
--
--Test::Harness - Run Perl standard test scripts with statistics
--
--=head1 VERSION
--
--Version 2.64
--
--=cut
--
--$VERSION = '2.64';
--
--# Backwards compatibility for exportable variable names.
--*verbose  = *Verbose;
--*switches = *Switches;
--*debug    = *Debug;
--
--$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');
--@EXPORT    = qw(&runtests);
--@EXPORT_OK = qw(&execute_tests $verbose $switches);
--
--$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;
--
--=head1 SYNOPSIS
--
--  use Test::Harness;
--
--  runtests(@test_files);
--
--=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.
--
--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>.
--
--C<Test::Harness::runtests(@tests)> runs all the testscripts named
--as arguments and checks standard output for the expected strings
--in TAP format.
--
--The F<prove> utility is a thin wrapper around Test::Harness.
--
--=head2 Taint mode
--
--Test::Harness will honor the C<-T> or C<-t> in the #! line on your
--test files.  So if you begin a test with:
--
--    #!perl -T
--
--the test will be run with taint mode on.
--
--=head2 Configuration variables.
--
--These variables can be used to configure the behavior of
--Test::Harness.  They are exported on request.
--
--=over 4
--
--=item C<$Test::Harness::Verbose>
--
--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.
--
--=item C<$Test::Harness::switches>
--
--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>.
--
--=item C<$Test::Harness::Timer>
--
--If set to true, and C<Time::HiRes> is available, print elapsed seconds
--after each test file.
--
--=back
--
--
--=head2 Failure
--
--When tests fail, analyze the summary report:
--
--  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.
--
--Everything passed but F<t/waterloo.t>.  It failed 10 of 20 tests and
--exited with non-zero status indicating something dubious happened.
--
--The columns in the summary report mean:
--
--=over 4
--
--=item B<Failed Test>
--
--The test file which failed.
--
--=item B<Stat>
--
--If the test exited with non-zero, this is its exit status.
--
--=item B<Wstat>
--
--The wait status of the test.
--
--=item B<Total>
--
--Total number of tests expected to run.
--
--=item B<Fail>
--
--Number which failed, either from "not ok" or because they never ran.
--
--=item B<List of Failed>
--
--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).
--
--=back
--
--
--=head1 FUNCTIONS
--
--The following functions are available.
--
--=head2 runtests( @test_files )
--
--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.
--
--It returns true if everything was ok.  Otherwise it will C<die()> with
--one of the messages in the DIAGNOSTICS section.
--
--=cut
--
--sub runtests {
--    my(@tests) = @_;
--
--    local ($\, $,);
--
--    my ($tot, $failedtests,$todo_passed) = execute_tests(tests => \@tests);
--    print get_results($tot, $failedtests,$todo_passed);
--
--    my $ok = _all_ok($tot);
--
--    assert(($ok xor keys %$failedtests), 
--           q{ok status jives with $failedtests});
--
--    if (! $ok) {
--        die("Failed $tot->{bad}/$tot->{tests} test programs. " .
--            "@{[$tot->{max} - $tot->{ok}]}/$tot->{max} subtests failed.\n");
--    }
--
--    return $ok;
--}
--
--# my $ok = _all_ok(\%tot);
--# Tells you if this test run is overall successful or not.
--
--sub _all_ok {
--    my($tot) = shift;
--
--    return $tot->{bad} == 0 && ($tot->{max} || $tot->{skipped}) ? 1 : 0;
--}
--
--# Returns all the files in a directory.  This is shorthand for backwards
--# compatibility on systems where C<glob()> doesn't work right.
--
--sub _globdir {
--    local *DIRH;
--
--    opendir DIRH, shift;
--    my @f = readdir DIRH;
--    closedir DIRH;
--
--    return @f;
--}
--
--=head2 execute_tests( tests => \@test_files, out => \*FH )
--
--Runs all the given C<@test_files> (just like C<runtests()>) but
--doesn't generate the final report.  During testing, progress
--information will be written to the currently selected output
--filehandle (usually C<STDOUT>), or to the filehandle given by the
--C<out> parameter.  The I<out> is optional.
--
--Returns a list of two values, C<$total> and C<$failed>, describing the
--results.  C<$total> is a hash ref summary of all the tests run.  Its
--keys and values are this:
--
--    bonus           Number of individual todo tests unexpectedly passed
--    max             Number of individual tests ran
--    ok              Number of individual tests passed
--    sub_skipped     Number of individual tests skipped
--    todo            Number of individual todo tests
--
--    files           Number of test files ran
--    good            Number of test files passed
--    bad             Number of test files failed
--    tests           Number of test files originally given
--    skipped         Number of test files skipped
--
--If C<< $total->{bad} == 0 >> and C<< $total->{max} > 0 >>, you've
--got a successful test.
--
--C<$failed> is a hash ref of all the test scripts that failed.  Each key
--is the name of a test script, each value is another hash representing
--how that script failed.  Its keys are these:
--
--    name        Name of the test which failed
--    estat       Script's exit value
--    wstat       Script's wait status
--    max         Number of individual tests
--    failed      Number which failed
--    canon       List of tests which failed (as string).
--
--C<$failed> should be empty if everything passed.
--
--=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<&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.
--
--=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.
--
--=over 4
--
--=item C<HARNESS_ACTIVE>
--
--This is set to a true value.  It allows the tests to determine if they
--are being executed through the harness or by any other means.
--
--=item C<HARNESS_VERSION>
--
--This is the version of Test::Harness.
--
--=back
--
--=head1 ENVIRONMENT VARIABLES THAT AFFECT TEST::HARNESS
--
--=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
--milliseconds each test took.  You can also use F<prove>'s C<--timer>
--switch.
--
--=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
--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>
--
--Defines the Test::Harness::Straps subclass to use.  The value may either
--be a filename or a class name.
--
--If HARNESS_STRAP_CLASS is a class name, the class must be in C<@INC>
--like any other class.
--
--If HARNESS_STRAP_CLASS is a filename, the .pm file must return the name
--of the class, instead of the canonical "1".
--
--=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.
--
--Fix HARNESS_COMPILE_TEST without breaking its core usage.
--
--Figure a way to report test names in the failure summary.
--
--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.
--
--Straps->analyze_file() not taint clean, don't know if it can be
--
--Fix that damned VMS nit.
--
--Add a test for verbose.
--
--Change internal list of test results to a hash.
--
--Fix stats display when there's an overrun.
--
--Fix so perls with spaces in the filename work.
--
--Keeping whittling away at _run_all_tests()
--
--Clean up how the summary is printed.  Get rid of those damned formats.
--
--=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>.
--
--=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.
--
--Current maintainer is Andy Lester C<< <andy at petdance.com> >>.
--
--=head1 COPYRIGHT
--
--Copyright 2002-2006
--by Michael G Schwern C<< <schwern at pobox.com> >>,
--Andy Lester C<< <andy at 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 --git a/perl-update-Archive-Extract.patch b/perl-update-Archive-Extract.patch
new file mode 100644
index 0000000..fae8ed9
--- /dev/null
+++ b/perl-update-Archive-Extract.patch
@@ -0,0 +1,978 @@
+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
new file mode 100644
index 0000000..fe0503f
--- /dev/null
+++ b/perl-update-Archive-Tar.patch
@@ -0,0 +1,3202 @@
+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-5.10.0-CGI-3.38.patch b/perl-update-CGI.patch
similarity index 62%
rename from perl-5.10.0-CGI-3.38.patch
rename to perl-update-CGI.patch
index f37286d..8aff5a8 100644
--- a/perl-5.10.0-CGI-3.38.patch
+++ b/perl-update-CGI.patch
@@ -1,8 +1,9 @@
-diff -up perl-5.10.0/lib/CGI/Apache.pm.olde perl-5.10.0/lib/CGI/Apache.pm
-diff -up perl-5.10.0/lib/CGI/Carp.pm.olde perl-5.10.0/lib/CGI/Carp.pm
---- perl-5.10.0/lib/CGI/Carp.pm.olde	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Carp.pm	2008-03-27 15:23:36.000000000 +0100
-@@ -323,7 +323,7 @@ use File::Spec;
+CGI.pm-3.42
+
+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	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/CGI/Carp.pm	2009-02-13 18:08:50.000000000 +0100
+@@ -323,7 +323,7 @@
  
  $main::SIG{__WARN__}=\&CGI::Carp::warn;
  
@@ -11,7 +12,7 @@ diff -up perl-5.10.0/lib/CGI/Carp.pm.olde perl-5.10.0/lib/CGI/Carp.pm
  $CGI::Carp::CUSTOM_MSG  = undef;
  $CGI::Carp::DIE_HANDLER = undef;
  
-@@ -575,6 +575,7 @@ END
+@@ -575,6 +575,7 @@
          print STDOUT $mess;
      }
      else {
@@ -19,10 +20,34 @@ diff -up perl-5.10.0/lib/CGI/Carp.pm.olde perl-5.10.0/lib/CGI/Carp.pm
          print STDOUT "Content-type: text/html\n\n";
          print STDOUT $mess;
      }
-diff -up perl-5.10.0/lib/CGI/Changes.olde perl-5.10.0/lib/CGI/Changes
---- perl-5.10.0/lib/CGI/Changes.olde	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Changes	2008-06-25 16:51:35.000000000 +0200
-@@ -1,3 +1,46 @@
+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	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/CGI/Changes	2009-02-13 18:09:15.000000000 +0100
+@@ -1,3 +1,70 @@
++
++  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
@@ -69,10 +94,10 @@ diff -up perl-5.10.0/lib/CGI/Changes.olde perl-5.10.0/lib/CGI/Changes
    Version 3.29
    1. The position of file handles is now reset to zero when CGI->new is called.
      (Mark Stosberg)
-diff -up perl-5.10.0/lib/CGI/Cookie.pm.olde perl-5.10.0/lib/CGI/Cookie.pm
---- perl-5.10.0/lib/CGI/Cookie.pm.olde	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Cookie.pm	2008-03-28 18:15:51.000000000 +0100
-@@ -13,7 +13,7 @@ package CGI::Cookie;
+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	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/CGI/Cookie.pm	2009-02-13 18:08:50.000000000 +0100
+@@ -13,7 +13,7 @@
  # wish, but if you redistribute a modified version, please attach a note
  # listing the modifications you have made.
  
@@ -81,7 +106,7 @@ diff -up perl-5.10.0/lib/CGI/Cookie.pm.olde perl-5.10.0/lib/CGI/Cookie.pm
  
  use CGI::Util qw(rearrange unescape escape);
  use CGI;
-@@ -51,7 +51,7 @@ sub fetch {
+@@ -51,7 +51,7 @@
     my %results;
     my($key,$value);
     
@@ -90,7 +115,7 @@ diff -up perl-5.10.0/lib/CGI/Cookie.pm.olde perl-5.10.0/lib/CGI/Cookie.pm
     foreach (@pairs) {
       s/\s*(.*?)\s*/$1/;
       if (/^([^=]+)=(.*)/) {
-@@ -88,7 +88,7 @@ sub parse {
+@@ -88,7 +88,7 @@
    my ($self,$raw_cookie) = @_;
    my %results;
  
@@ -99,32 +124,10 @@ diff -up perl-5.10.0/lib/CGI/Cookie.pm.olde perl-5.10.0/lib/CGI/Cookie.pm
    foreach (@pairs) {
      s/\s*(.*?)\s*/$1/;
      my($key,$value) = split("=",$_,2);
-diff -up perl-5.10.0/lib/CGI/eg/caution.xbm.olde perl-5.10.0/lib/CGI/eg/caution.xbm
-diff -up perl-5.10.0/lib/CGI/eg/clickable_image.cgi.olde perl-5.10.0/lib/CGI/eg/clickable_image.cgi
-diff -up perl-5.10.0/lib/CGI/eg/cookie.cgi.olde perl-5.10.0/lib/CGI/eg/cookie.cgi
-diff -up perl-5.10.0/lib/CGI/eg/crash.cgi.olde perl-5.10.0/lib/CGI/eg/crash.cgi
-diff -up perl-5.10.0/lib/CGI/eg/customize.cgi.olde perl-5.10.0/lib/CGI/eg/customize.cgi
-diff -up perl-5.10.0/lib/CGI/eg/diff_upload.cgi.olde perl-5.10.0/lib/CGI/eg/diff_upload.cgi
-diff -up perl-5.10.0/lib/CGI/eg/dna_small_gif.uu.olde perl-5.10.0/lib/CGI/eg/dna_small_gif.uu
-diff -up perl-5.10.0/lib/CGI/eg/file_upload.cgi.olde perl-5.10.0/lib/CGI/eg/file_upload.cgi
-diff -up perl-5.10.0/lib/CGI/eg/frameset.cgi.olde perl-5.10.0/lib/CGI/eg/frameset.cgi
-diff -up perl-5.10.0/lib/CGI/eg/index.html.olde perl-5.10.0/lib/CGI/eg/index.html
-diff -up perl-5.10.0/lib/CGI/eg/internal_links.cgi.olde perl-5.10.0/lib/CGI/eg/internal_links.cgi
-diff -up perl-5.10.0/lib/CGI/eg/javascript.cgi.olde perl-5.10.0/lib/CGI/eg/javascript.cgi
-diff -up perl-5.10.0/lib/CGI/eg/make_links.pl.olde perl-5.10.0/lib/CGI/eg/make_links.pl
-diff -up perl-5.10.0/lib/CGI/eg/monty.cgi.olde perl-5.10.0/lib/CGI/eg/monty.cgi
-diff -up perl-5.10.0/lib/CGI/eg/multiple_forms.cgi.olde perl-5.10.0/lib/CGI/eg/multiple_forms.cgi
-diff -up perl-5.10.0/lib/CGI/eg/nph-clock.cgi.olde perl-5.10.0/lib/CGI/eg/nph-clock.cgi
-diff -up perl-5.10.0/lib/CGI/eg/nph-multipart.cgi.olde perl-5.10.0/lib/CGI/eg/nph-multipart.cgi
-diff -up perl-5.10.0/lib/CGI/eg/popup.cgi.olde perl-5.10.0/lib/CGI/eg/popup.cgi
-diff -up perl-5.10.0/lib/CGI/eg/RunMeFirst.olde perl-5.10.0/lib/CGI/eg/RunMeFirst
-diff -up perl-5.10.0/lib/CGI/eg/save_state.cgi.olde perl-5.10.0/lib/CGI/eg/save_state.cgi
-diff -up perl-5.10.0/lib/CGI/eg/tryit.cgi.olde perl-5.10.0/lib/CGI/eg/tryit.cgi
-diff -up perl-5.10.0/lib/CGI/eg/wilogo_gif.uu.olde perl-5.10.0/lib/CGI/eg/wilogo_gif.uu
-diff -up perl-5.10.0/lib/CGI/Fast.pm.olde perl-5.10.0/lib/CGI/Fast.pm
---- perl-5.10.0/lib/CGI/Fast.pm.olde	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Fast.pm	2008-04-14 19:53:12.000000000 +0200
-@@ -55,6 +55,7 @@ sub new {
+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	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/CGI/Fast.pm	2009-02-13 18:08:50.000000000 +0100
+@@ -55,6 +55,7 @@
       }
       }
       CGI->_reset_globals;
@@ -132,21 +135,264 @@ diff -up perl-5.10.0/lib/CGI/Fast.pm.olde perl-5.10.0/lib/CGI/Fast.pm
       return $CGI::Q = $self->SUPER::new($initializer, @param);
  }
  
-diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
---- perl-5.10.0/lib/CGI.pm.olde	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI.pm	2008-06-25 16:52:19.000000000 +0200
-@@ -18,8 +18,8 @@ use Carp 'croak';
+@@ -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	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/CGI/Pretty.pm	2009-02-13 18:08:50.000000000 +0100
+@@ -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/t/request.t perl-5.10.0/lib/CGI/t/request.t
+--- perl-5.10.0.orig/lib/CGI/t/request.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/CGI/t/request.t	2009-02-13 18:09:57.000000000 +0100
+@@ -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/Util.pm perl-5.10.0/lib/CGI/Util.pm
+--- perl-5.10.0.orig/lib/CGI/Util.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/CGI/Util.pm	2009-02-13 18:08:50.000000000 +0100
+@@ -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) {
+@@ -189,6 +214,17 @@
+     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;
+     }
+@@ -200,8 +236,12 @@
+   shift() if @_ > 1 and ( ref($_[0]) || (defined $_[1] && $_[0] eq $CGI::DefaultClass));
+   my $toencode = shift;
+   return undef unless defined($toencode);
++  $toencode = eval { pack("C*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
++
+   # force bytes while preserving backward compatibility -- dankogai
+-  $toencode = pack("C*", unpack("U0C*", $toencode));
++  # but commented out because it was breaking CGI::Compress -- lstein
++  # $toencode = eval { pack("U*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $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.pm perl-5.10.0/lib/CGI.pm
+--- perl-5.10.0.orig/lib/CGI.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/CGI.pm	2009-02-13 18:08:55.000000000 +0100
+@@ -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.254 2008/06/25 14:52:19 lstein Exp $';
-+$CGI::VERSION='3.38';
++$CGI::revision = '$Id: CGI.pm,v 1.260 2008/09/08 14:13:23 lstein Exp $';
++$CGI::VERSION='3.42';
  
  # HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES.
  # UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING.
-@@ -37,7 +37,12 @@ use constant XHTML_DTD => ['-//W3C//DTD 
+ # $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);
  }
  
@@ -160,7 +406,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  @SAVED_SYMBOLS = ();
  
  
-@@ -91,13 +96,6 @@ sub initialize_globals {
+@@ -91,13 +96,6 @@
      # it can just be renamed, instead of read and written.
      $CLOSE_UPLOAD_FILES = 0;
  
@@ -174,7 +420,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      # Automatically determined -- don't change
      $EBCDIC = 0;
  
-@@ -111,6 +109,9 @@ sub initialize_globals {
+@@ -111,6 +109,9 @@
      # use CGI qw(-no_undef_params);
      $NO_UNDEF_PARAMS = 0;
  
@@ -184,7 +430,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      # Other globals that you shouldn't worry about.
      undef $Q;
      $BEEN_THERE = 0;
-@@ -226,7 +227,7 @@ if ($needs_binmode) {
+@@ -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/],
@@ -193,7 +439,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  			   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 
-@@ -352,6 +353,7 @@ sub new {
+@@ -352,6 +353,7 @@
        $self->r(Apache->request) unless $self->r;
        my $r = $self->r;
        $r->register_cleanup(\&CGI::_reset_globals);
@@ -201,7 +447,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      }
      else {
        # XXX: once we have the new API
-@@ -360,6 +362,7 @@ sub new {
+@@ -360,6 +362,7 @@
        my $r = $self->r;
        $r->subprocess_env unless exists $ENV{REQUEST_METHOD};
        $r->pool->cleanup_register(\&CGI::_reset_globals);
@@ -209,7 +455,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      }
      undef $NPH;
    }
-@@ -437,23 +440,22 @@ sub param {
+@@ -437,23 +440,22 @@
  	# If values is provided, then we set it.
  	if (@values or defined $value) {
  	    $self->add_parameter($name);
@@ -242,7 +488,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  }
  
  sub self_or_default {
-@@ -574,14 +576,14 @@ sub init {
+@@ -574,14 +576,14 @@
                        $self->add_parameter($param);
                        $self->read_from_client(\$value,$content_length,0)
                          if $content_length > 0;
@@ -259,7 +505,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
                        if ($MOD_PERL) {
                                $query_string = $self->r->args;
                        } else {
-@@ -641,7 +643,7 @@ sub init {
+@@ -641,7 +643,7 @@
  	  last METHOD;
        }
  
@@ -268,7 +514,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  	  $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 @@ sub init {
+@@ -667,13 +669,13 @@
    }
  
  # YL: Begin Change for XML handler 10/19/2001
@@ -285,7 +531,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
        undef $query_string ;
      }
  # YL: End Change for XML handler 10/19/2001
-@@ -685,7 +687,7 @@ sub init {
+@@ -685,7 +687,7 @@
  	    $self->parse_params($query_string);
  	} else {
  	    $self->add_parameter('keywords');
@@ -294,7 +540,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  	}
      }
  
-@@ -752,7 +754,7 @@ sub save_request {
+@@ -752,7 +754,7 @@
      @QUERY_PARAM = $self->param; # save list of parameters
      foreach (@QUERY_PARAM) {
        next unless defined $_;
@@ -303,7 +549,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      }
      $QUERY_CHARSET = $self->charset;
      %QUERY_FIELDNAMES = %{$self->{'.fieldnames'}};
-@@ -771,7 +773,7 @@ sub parse_params {
+@@ -771,7 +773,7 @@
  	$param = unescape($param);
  	$value = unescape($value);
  	$self->add_parameter($param);
@@ -312,7 +558,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      }
  }
  
-@@ -779,7 +781,7 @@ sub add_parameter {
+@@ -779,7 +781,7 @@
      my($self,$param)=@_;
      return unless defined $param;
      push (@{$self->{'.parameters'}},$param) 
@@ -321,7 +567,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  }
  
  sub all_parameters {
-@@ -904,6 +906,7 @@ sub _setup_symbols {
+@@ -904,6 +906,7 @@
  	$DEBUG=0,                next if /^[:-]no_?[Dd]ebug$/;
  	$DEBUG=2,                next if /^[:-][Dd]ebug$/;
  	$USE_PARAM_SEMICOLONS++, next if /^[:-]newstyle_urls$/;
@@ -329,7 +575,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  	$XHTML++,                next if /^[:-]xhtml$/;
  	$XHTML=0,                next if /^[:-]no_?xhtml$/;
  	$USE_PARAM_SEMICOLONS=0, next if /^[:-]oldstyle_urls$/;
-@@ -1005,7 +1008,7 @@ sub delete {
+@@ -1005,7 +1008,7 @@
      my %to_delete;
      foreach my $name (@to_delete)
      {
@@ -338,7 +584,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
          CORE::delete $self->{'.fieldnames'}->{$name};
          $to_delete{$name}++;
      }
-@@ -1054,8 +1057,8 @@ END_OF_FUNC
+@@ -1054,8 +1057,8 @@
  sub keywords {
      my($self,@values) = self_or_default(@_);
      # If values is provided, then we set it.
@@ -349,7 +595,16 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      @result;
  }
  END_OF_FUNC
-@@ -1200,7 +1203,7 @@ sub append {
+@@ -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);
@@ -358,7 +613,16 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      }
      return $self->param($name);
  }
-@@ -1519,7 +1522,7 @@ sub header {
+@@ -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";
+@@ -1519,7 +1522,7 @@
      push(@header,map {ucfirst $_} @other);
      push(@header,"Content-Type: $type") if $type ne '';
      my $header = join($CRLF,@header)."${CRLF}${CRLF}";
@@ -367,7 +631,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
          $self->r->send_cgi_header($header);
          return '';
      }
-@@ -1663,12 +1666,22 @@ sub start_html {
+@@ -1663,12 +1666,22 @@
  			: qq(<meta name="$_" content="$meta->{$_}">)); }
      }
  
@@ -392,7 +656,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  
      # handle -noscript parameter
      push(@result,<<END) if $noscript;
-@@ -1699,6 +1712,7 @@ sub _style {
+@@ -1699,6 +1712,7 @@
      my $cdata_end   = $XHTML ? "\n/* ]]> */-->\n" : " -->\n";
  
      my @s = ref($style) eq 'ARRAY' ? @$style : $style;
@@ -400,7 +664,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  
      for my $s (@s) {
        if (ref($s)) {
-@@ -1708,7 +1722,7 @@ sub _style {
+@@ -1708,7 +1722,7 @@
                         ref($s) eq 'ARRAY' ? @$s : %$s));
         my $type = defined $stype ? $stype : 'text/css';
         my $rel  = $alternate ? 'alternate stylesheet' : 'stylesheet';
@@ -409,7 +673,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  
         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
-@@ -1831,7 +1845,7 @@ sub startform {
+@@ -1831,7 +1845,7 @@
      my($method,$action,$enctype,@other) = 
  	rearrange([METHOD,ACTION,ENCTYPE],@p);
  
@@ -418,7 +682,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      $enctype = $self->escapeHTML($enctype || &URL_ENCODED);
      if (defined $action) {
         $action = $self->escapeHTML($action);
-@@ -2147,8 +2161,9 @@ END_OF_FUNC
+@@ -2147,8 +2161,9 @@
  sub checkbox {
      my($self,@p) = self_or_default(@_);
  
@@ -430,7 +694,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  
      $value = defined $value ? $value : 'on';
  
-@@ -2165,7 +2180,8 @@ sub checkbox {
+@@ -2165,7 +2180,8 @@
      my($other) = @other ? "@other " : '';
      $tabindex = $self->element_tab($tabindex);
      $self->register_parameter($name);
@@ -440,7 +704,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
                    : qq{<input type="checkbox" name="$name" value="$value"$checked$other>$the_label};
  }
  END_OF_FUNC
-@@ -2192,9 +2208,11 @@ sub escapeHTML {
+@@ -2192,9 +2208,11 @@
           else {
  	     $toencode =~ s{"}{&quot;}gso;
           }
@@ -455,7 +719,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
                  $toencode =~ s{'}{&#39;}gso;
                  $toencode =~ s{\x8b}{&#8249;}gso;
                  $toencode =~ s{\x9b}{&#8250;}gso;
-@@ -2327,13 +2345,14 @@ sub _box_group {
+@@ -2327,13 +2345,14 @@
      my $self     = shift;
      my $box_type = shift;
  
@@ -476,7 +740,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  
      my($result,$checked,@elements,@values);
  
-@@ -2393,7 +2412,7 @@ sub _box_group {
+@@ -2393,7 +2412,7 @@
  
          if ($XHTML) {
             push @elements,
@@ -485,7 +749,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
                     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}/);
-@@ -2428,12 +2447,14 @@ sub popup_menu {
+@@ -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);
@@ -504,7 +768,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      }
      $name=$self->escapeHTML($name);
      my($other) = @other ? " @other" : '';
-@@ -2444,20 +2465,22 @@ sub popup_menu {
+@@ -2444,20 +2465,22 @@
      $result = qq/<select name="$name" $tabindex$other>\n/;
      foreach (@values) {
          if (/<optgroup/) {
@@ -537,7 +801,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
          }
      }
  
-@@ -2560,6 +2583,7 @@ sub scrolling_list {
+@@ -2560,6 +2583,7 @@
      $size = $size || scalar(@values);
  
      my(%selected) = $self->previous_or_default($name,$defaults,$override);
@@ -545,7 +809,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      my($is_multiple) = $multiple ? qq/ multiple="multiple"/ : '';
      my($has_size) = $size ? qq/ size="$size"/: '';
      my($other) = @other ? " @other" : '';
-@@ -2692,7 +2716,7 @@ sub url {
+@@ -2692,12 +2716,13 @@
      my $request_uri =  unescape($self->request_uri) || '';
      my $query_str   =  $self->query_string;
  
@@ -554,7 +818,15 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      undef $path if $rewrite_in_use && $rewrite;  # path not valid when rewriting active
  
      my $uri         =  $rewrite && $request_uri ? $request_uri : $script_name;
-@@ -2723,6 +2747,7 @@ sub url {
+-    $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 '';
@@ -562,7 +834,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      $url =~ s/([^a-zA-Z0-9_.%;&?\/\\:+=~-])/sprintf("%%%02X",ord($1))/eg;
      return $url;
  }
-@@ -2793,12 +2818,12 @@ END_OF_FUNC
+@@ -2793,12 +2819,12 @@
  sub param_fetch {
      my($self,@p) = self_or_default(@_);
      my($name) = rearrange([NAME],@p);
@@ -578,7 +850,88 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  }
  END_OF_FUNC
  
-@@ -2931,7 +2956,9 @@ sub Accept {
+@@ -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
+ 
+@@ -2931,7 +2985,9 @@
      my($self,$search) = self_or_CGI(@_);
      my(%prefs,$type,$pref,$pat);
      
@@ -589,7 +942,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  
      foreach (@accept) {
  	($pref) = /q=(\d\.\d+|\d+)/;
-@@ -3284,10 +3311,10 @@ sub previous_or_default {
+@@ -3284,10 +3340,10 @@
  
      if (!$override && ($self->{'.fieldnames'}->{$name} || 
  		       defined($self->param($name)) ) ) {
@@ -602,7 +955,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      } else {
  	$selected{$defaults}++ if defined($defaults);
      }
-@@ -3368,11 +3395,20 @@ sub read_multipart {
+@@ -3368,11 +3424,20 @@
  	    return;
  	}
  
@@ -625,7 +978,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  	# Test for Opera's multiple upload feature
  	my($multipart) = ( defined( $header{'Content-Type'} ) &&
  		$header{'Content-Type'} =~ /multipart\/mixed/ ) ?
-@@ -3386,7 +3422,7 @@ sub read_multipart {
+@@ -3386,7 +3451,7 @@
  	if ( ( !defined($filename) || $filename eq '' ) && !$multipart ) {
  	    my($value) = $buffer->readBody;
              $value .= $TAINTED;
@@ -634,7 +987,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  	    next;
  	}
  
-@@ -3431,7 +3467,7 @@ sub read_multipart {
+@@ -3431,7 +3496,7 @@
  
  	  my ($data);
  	  local($\) = '';
@@ -643,7 +996,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
            while (defined($data = $buffer->read)) {
                if (defined $self->{'.upload_hook'})
                 {
-@@ -3462,7 +3498,7 @@ sub read_multipart {
+@@ -3462,7 +3527,7 @@
  	      name => $tmpfile,
  	      info => {%header},
  	  };
@@ -652,7 +1005,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
        }
      }
  }
-@@ -3564,7 +3600,7 @@ sub read_multipart_related {
+@@ -3564,7 +3629,7 @@
  	      name => $tmpfile,
  	      info => {%header},
  	  };
@@ -661,16 +1014,39 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
        }
      }
      return $returnvalue;
-@@ -3696,7 +3732,7 @@ sub new {
+@@ -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;
++    $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;
-@@ -3768,7 +3804,7 @@ sub new {
+@@ -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,
@@ -679,7 +1055,31 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  		BOUNDARY=>$boundary,
  		INTERFACE=>$interface,
  		BUFFER=>'',
-@@ -4032,10 +4068,10 @@ sub new {
+@@ -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
+@@ -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++) {
@@ -688,11 +1088,11 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
      }
      # 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_\+ \'\":/.\$\\-]+)$!;
++    return unless $filename =~ m!^([a-zA-Z0-9_\+ \'\":/.\$\\~-]+)$!;
      # this used to untaint, now it doesn't
      # $filename = $1;
      return bless \$filename;
-@@ -4109,6 +4145,8 @@ CGI - Simple Common Gateway Interface Cl
+@@ -4109,6 +4191,8 @@
  	     hr;
     }
  
@@ -701,7 +1101,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  =head1 ABSTRACT
  
  This perl library uses perl5 objects to make it easy to create Web
-@@ -4392,8 +4430,7 @@ selections in a scrolling list), you can
+@@ -4392,8 +4476,7 @@
  the method will return a single value.
  
  If a value is not given in the query string, as in the queries
@@ -711,7 +1111,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  
  
  If the parameter does not exist at all, then param() will return undef
-@@ -4477,6 +4514,10 @@ it, use code like this:
+@@ -4477,6 +4560,10 @@
  
     my $data = $query->param('POSTDATA');
  
@@ -722,7 +1122,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  (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.)
-@@ -4812,6 +4853,16 @@ If start_html()'s -dtd parameter specifi
+@@ -4812,6 +4899,16 @@
  XHTML will automatically be disabled without needing to use this 
  pragma.
  
@@ -739,7 +1139,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  =item -nph
  
  This makes CGI.pm produce a header appropriate for an NPH (no
-@@ -5388,7 +5439,7 @@ Generate just the protocol and net locat
+@@ -5388,7 +5485,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
@@ -748,7 +1148,41 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  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.
-@@ -6102,7 +6153,7 @@ recognized.  See textfield() for details
+@@ -5987,24 +6084,27 @@
+ 
+ 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
+@@ -6102,7 +6202,7 @@
  
     print popup_menu(-name=>'menu_name',
  			    -values=>['eenie','meenie','minie'],
@@ -757,7 +1191,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
            -labels=>\%labels,
            -attributes=>\%attributes);
  
-@@ -6125,7 +6176,8 @@ a named array, such as "\@foo".
+@@ -6125,7 +6225,8 @@
  
  The optional third parameter (-default) is the name of the default
  menu choice.  If not specified, the first item will be the default.
@@ -767,7 +1201,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  
  =item 4.
  
-@@ -6389,6 +6441,9 @@ are the tab indexes of each button.  Exa
+@@ -6389,6 +6490,9 @@
    -tabindex => ['moe','minie','eenie','meenie']  # tab in this order
    -tabindex => {meenie=>100,moe=>101,minie=>102,eenie=>200} # tab in this order
  
@@ -777,7 +1211,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  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:
-@@ -6546,6 +6601,9 @@ an associative array relating menu value
+@@ -6546,6 +6650,9 @@
  with the attribute's name as the key and the attribute's value as the
  value.
  
@@ -787,7 +1221,7 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  When the form is processed, the selected radio button can
  be retrieved using:
  
-@@ -7658,10 +7716,8 @@ of CGI.pm without rewriting your old scr
+@@ -7658,10 +7765,8 @@
  
  =head1 AUTHOR INFORMATION
  
@@ -800,90 +1234,3 @@ diff -up perl-5.10.0/lib/CGI.pm.olde perl-5.10.0/lib/CGI.pm
  
  Address bug reports and comments to: lstein@cshl.org.  When sending
  bug reports, please provide the version of CGI.pm, the version of
-diff -up perl-5.10.0/lib/CGI/Pretty.pm.olde perl-5.10.0/lib/CGI/Pretty.pm
-diff -up perl-5.10.0/lib/CGI/Push.pm.olde perl-5.10.0/lib/CGI/Push.pm
-diff -up perl-5.10.0/lib/CGI/Switch.pm.olde perl-5.10.0/lib/CGI/Switch.pm
-diff -up perl-5.10.0/lib/CGI/t/apache.t.olde perl-5.10.0/lib/CGI/t/apache.t
-diff -up perl-5.10.0/lib/CGI/t/can.t.olde perl-5.10.0/lib/CGI/t/can.t
-diff -up perl-5.10.0/lib/CGI/t/carp.t.olde perl-5.10.0/lib/CGI/t/carp.t
-diff -up perl-5.10.0/lib/CGI/t/cookie.t.olde perl-5.10.0/lib/CGI/t/cookie.t
-diff -up perl-5.10.0/lib/CGI/t/fast.t.olde perl-5.10.0/lib/CGI/t/fast.t
-diff -up perl-5.10.0/lib/CGI/t/form.t.olde perl-5.10.0/lib/CGI/t/form.t
-diff -up perl-5.10.0/lib/CGI/t/function.t.olde perl-5.10.0/lib/CGI/t/function.t
-diff -up perl-5.10.0/lib/CGI/t/html.t.olde perl-5.10.0/lib/CGI/t/html.t
-diff -up perl-5.10.0/lib/CGI/t/no_tabindex.t.olde perl-5.10.0/lib/CGI/t/no_tabindex.t
-diff -up perl-5.10.0/lib/CGI/t/pretty.t.olde perl-5.10.0/lib/CGI/t/pretty.t
-diff -up perl-5.10.0/lib/CGI/t/push.t.olde perl-5.10.0/lib/CGI/t/push.t
-diff -up perl-5.10.0/lib/CGI/t/request.t.olde perl-5.10.0/lib/CGI/t/request.t
-diff -up perl-5.10.0/lib/CGI/t/start_end_asterisk.t.olde perl-5.10.0/lib/CGI/t/start_end_asterisk.t
-diff -up perl-5.10.0/lib/CGI/t/start_end_end.t.olde perl-5.10.0/lib/CGI/t/start_end_end.t
-diff -up perl-5.10.0/lib/CGI/t/start_end_start.t.olde perl-5.10.0/lib/CGI/t/start_end_start.t
-diff -up perl-5.10.0/lib/CGI/t/switch.t.olde perl-5.10.0/lib/CGI/t/switch.t
-diff -up perl-5.10.0/lib/CGI/t/util-58.t.olde perl-5.10.0/lib/CGI/t/util-58.t
---- perl-5.10.0/lib/CGI/t/util-58.t.olde	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/t/util-58.t	2003-04-14 20:32:22.000000000 +0200
-@@ -11,11 +11,6 @@ BEGIN {
- use Test::More tests => 2;
- use_ok("CGI::Util");
- my $uri = "\x{5c0f}\x{98fc} \x{5f3e}.txt"; # KOGAI, Dan, in Kanji
--if (ord('A') == 193) { # EBCDIC.
--    is(CGI::Util::escape($uri), "%FC%C3%A0%EE%F9%E5%E7%F8%20%FC%C3%C7%CA.txt",
--       "# Escape string with UTF-8 (UTF-EBCDIC) flag");
--} else {
--    is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
--       "# Escape string with UTF-8 flag");
--}
-+is(CGI::Util::escape($uri), "%E5%B0%8F%E9%A3%BC%20%E5%BC%BE.txt",
-+   "# Escape string with UTF-8 flag");
- __END__
-diff -up perl-5.10.0/lib/CGI/t/util.t.olde perl-5.10.0/lib/CGI/t/util.t
-diff -up perl-5.10.0/lib/CGI/Util.pm.olde perl-5.10.0/lib/CGI/Util.pm
---- perl-5.10.0/lib/CGI/Util.pm.olde	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/CGI/Util.pm	2008-03-14 15:25:54.000000000 +0100
-@@ -141,8 +141,12 @@ sub simple_escape {
- 
- 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) {
-@@ -189,6 +193,17 @@ sub unescape {
-     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;
-     }
-@@ -200,8 +215,12 @@ sub escape {
-   shift() if @_ > 1 and ( ref($_[0]) || (defined $_[1] && $_[0] eq $CGI::DefaultClass));
-   my $toencode = shift;
-   return undef unless defined($toencode);
-+  $toencode = eval { pack("C*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-+
-   # force bytes while preserving backward compatibility -- dankogai
--  $toencode = pack("C*", unpack("U0C*", $toencode));
-+  # but commented out because it was breaking CGI::Compress -- lstein
-+  # $toencode = eval { pack("U*", unpack("U0C*", $toencode))} || pack("C*", unpack("C*", $toencode));
-+
-     if ($EBCDIC) {
-       $toencode=~s/([^a-zA-Z0-9_.~-])/uc sprintf("%%%02x",$E2A[ord($1)])/eg;
-     } else {
diff --git a/perl-update-ExtUtils-CBuilder.patch b/perl-update-ExtUtils-CBuilder.patch
new file mode 100644
index 0000000..f43fcea
--- /dev/null
+++ b/perl-update-ExtUtils-CBuilder.patch
@@ -0,0 +1,444 @@
+perl-update-ExtUtils-CBuilder-0.24
+
+diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Base.pm perl-5.10.0/lib/ExtUtils/CBuilder/Base.pm
+--- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Base.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/ExtUtils/CBuilder/Base.pm	2009-03-11 20:12:36.000000000 +0100
+@@ -6,9 +6,10 @@
+ use Cwd ();
+ use Config;
+ use Text::ParseWords;
++use IO::File;
+ 
+ use vars qw($VERSION);
+-$VERSION = '0.21';
++$VERSION = '0.24';
+ 
+ sub new {
+   my $class = shift;
+@@ -118,10 +119,8 @@
+   
+   my $tmpfile = File::Spec->catfile(File::Spec->tmpdir, 'compilet.c');
+   {
+-    local *FH;
+-    open FH, "> $tmpfile" or die "Can't create $tmpfile: $!";
+-    print FH "int boot_compilet() { return 1; }\n";
+-    close FH;
++    my $FH = IO::File->new("> $tmpfile") or die "Can't create $tmpfile: $!";
++    print $FH "int boot_compilet() { return 1; }\n";
+   }
+ 
+   my ($obj_file, @lib_files);
+diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Changes perl-5.10.0/lib/ExtUtils/CBuilder/Changes
+--- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Changes	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/ExtUtils/CBuilder/Changes	2009-03-11 20:13:30.000000000 +0100
+@@ -1,5 +1,31 @@
+ Revision history for Perl extension ExtUtils::CBuilder.
+ 
++ - Added 'gnu' and 'gnukfreebsd' as Unix variants. [Niko Tyni]
++
++ - Brought in some VMS fixes from bleadperl: "Correct and complete
++   CBuilder's handling of external libraries when linking on VMS."
++   [Craig Berry]
++
++0.23 - Sat Apr 19 22:28:03 2008
++
++ - Fixed some problems (some old, some new) with Strawberry Perl on
++   Windows. [Alberto Simo~es]
++
++ - Will now install in the core perl lib directory when the user's
++   perl is new enough to have us in core. [Yi Ma Mao]
++
++0.22 - Fri Feb  8 21:52:21 2008
++
++ - Replaced the split_like_shell() method on Windows with a
++   near-no-op, which is probably more correct and has the benefit of
++   not messing up UNC paths. [John R. LoVerso, see
++   http://rt.cpan.org/Ticket/Display.html?id=26545]
++
++ - Fixed extra_compiler_flags on Windows, they were being
++   ignored. [Robert May]
++
++0.21 - Tue Oct 30 06:46:01 2007
++
+  - Clean up perl_src path using Cwd::realpath().  Only affects usage
+    as part of the perl core.
+ 
+diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/Unix.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/Unix.pm
+--- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/Unix.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/Unix.pm	2009-03-11 20:12:36.000000000 +0100
+@@ -4,7 +4,7 @@
+ use ExtUtils::CBuilder::Base;
+ 
+ use vars qw($VERSION @ISA);
+-$VERSION = '0.21';
++$VERSION = '0.24';
+ @ISA = qw(ExtUtils::CBuilder::Base);
+ 
+ sub link_executable {
+diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/VMS.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/VMS.pm
+--- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/VMS.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/VMS.pm	2009-03-11 20:12:36.000000000 +0100
+@@ -4,7 +4,7 @@
+ use ExtUtils::CBuilder::Base;
+ 
+ use vars qw($VERSION @ISA);
+-$VERSION = '0.22';
++$VERSION = '0.24';
+ @ISA = qw(ExtUtils::CBuilder::Base);
+ 
+ use File::Spec::Functions qw(catfile catdir);
+@@ -134,7 +134,7 @@
+   # In general, we pass through the basic libraries from %Config unchanged.
+   # The one exception is that if we're building in the Perl source tree, and
+   # a library spec could be resolved via a logical name, we go to some trouble
+-  # to insure that the copy in the local tree is used, rather than one to
++  # to ensure that the copy in the local tree is used, rather than one to
+   # which a system-wide logical may point.
+   if ($self->perl_src) {
+     my($lib,$locspec,$type);
+diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/Windows.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/Windows.pm
+--- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/Windows.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/Windows.pm	2009-03-11 20:12:36.000000000 +0100
+@@ -7,9 +7,10 @@
+ use File::Spec;
+ 
+ use ExtUtils::CBuilder::Base;
++use IO::File;
+ 
+ use vars qw($VERSION @ISA);
+-$VERSION = '0.21';
++$VERSION = '0.24';
+ @ISA = qw(ExtUtils::CBuilder::Base);
+ 
+ sub new {
+@@ -33,61 +34,24 @@
+ }
+ 
+ sub split_like_shell {
+-  # 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.
+-  
++  # Since Windows will pass the whole command string (not an argument
++  # array) to the target program and make the program parse it itself,
++  # we don't actually need to do any processing here.
+   (my $self, local $_) = @_;
+   
+   return @$_ if defined() && UNIVERSAL::isa($_, 'ARRAY');
+-  
+-  my @argv;
+-  return @argv unless defined() && length();
+-  
+-  my $arg = '';
+-  my( $i, $quote_mode ) = ( 0, 0 );
+-  
+-  while ( $i < length() ) {
+-    
+-    my $ch      = substr( $_, $i  , 1 );
+-    my $next_ch = substr( $_, $i+1, 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;
++  return unless defined() && length();
++  return ($_);
++}
++
++sub do_system {
++  # See above
++  my $self = shift;
++  my $cmd = join(" ",
++		 grep length,
++		 map {$a=$_;$a=~s/\t/ /g;$a=~s/^\s+|\s+$//;$a}
++		 grep defined, @_);
++  return $self->SUPER::do_system($cmd);
+ }
+ 
+ sub arg_defines {
+@@ -119,7 +83,7 @@
+     cflags      => [
+                      $self->split_like_shell($cf->{ccflags}),
+                      $self->split_like_shell($cf->{cccdlflags}),
+-                     $self->split_like_shell($cf->{extra_compiler_flags}),
++                     $self->split_like_shell($args{extra_compiler_flags}),
+                    ],
+     optimize    => [ $self->split_like_shell($cf->{optimize})    ],
+     defines     => \@defines,
+@@ -329,18 +293,16 @@
+   $self->add_to_cleanup($script);
+   print "Generating script '$script'\n" if !$self->{quiet};
+ 
+-  open( SCRIPT, ">$script" )
++  my $SCRIPT = IO::File->new( ">$script" )
+     or die( "Could not create script '$script': $!" );
+ 
+-  print SCRIPT join( "\n",
++  print $SCRIPT join( "\n",
+     map { ref $_ ? @{$_} : $_ }
+     grep defined,
+     delete(
+       @spec{ qw(includes cflags optimize defines perlinc) } )
+   );
+ 
+-  close SCRIPT;
+-
+   push @{$spec{includes}}, '@"' . $script . '"';
+ 
+   return %spec;
+@@ -402,10 +364,10 @@
+ 
+   print "Generating script '$script'\n" if !$self->{quiet};
+ 
+-  open( SCRIPT, ">$script" )
++  my $SCRIPT = IO::File->new( ">$script" )
+     or die( "Could not create script '$script': $!" );
+ 
+-  print SCRIPT join( "\n",
++  print $SCRIPT join( "\n",
+     map { ref $_ ? @{$_} : $_ }
+     grep defined,
+     delete(
+@@ -414,8 +376,6 @@
+                 def_file implib map_file)            } )
+   );
+ 
+-  close SCRIPT;
+-
+   push @{$spec{lddlflags}}, '@"' . $script . '"';
+ 
+   return %spec;
+@@ -459,7 +419,7 @@
+ 
+   print "Generating script '$script'\n" if !$self->{quiet};
+ 
+-  open( SCRIPT, ">$script" )
++  my $SCRIPT = IO::File->new( ">$script" )
+     or die( "Could not create script '$script': $!" );
+ 
+   # XXX Borland "response files" seem to be unable to accept macro
+@@ -467,15 +427,13 @@
+   # backslash doesn't work, and any level of quotes are stripped. The
+   # result is is a floating point number in the source file where a
+   # string is expected. So we leave the macros on the command line.
+-  print SCRIPT join( "\n",
++  print $SCRIPT join( "\n",
+     map { ref $_ ? @{$_} : $_ }
+     grep defined,
+     delete(
+       @spec{ qw(includes cflags optimize perlinc) } )
+   );
+ 
+-  close SCRIPT;
+-
+   push @{$spec{includes}}, '@"' . $script . '"';
+ 
+   return %spec;
+@@ -525,29 +483,25 @@
+   print "Generating scripts '$ld_script' and '$ld_libs'.\n" if !$self->{quiet};
+ 
+   # Script 1: contains options & names of object files.
+-  open( LD_SCRIPT, ">$ld_script" )
++  my $LD_SCRIPT = IO::File->new( ">$ld_script" )
+     or die( "Could not create linker script '$ld_script': $!" );
+ 
+-  print LD_SCRIPT join( " +\n",
++  print $LD_SCRIPT join( " +\n",
+     map { @{$_} }
+     grep defined,
+     delete(
+       @spec{ qw(lddlflags libpath other_ldflags startup objects) } )
+   );
+ 
+-  close LD_SCRIPT;
+-
+   # Script 2: contains name of libs to link against.
+-  open( LD_LIBS, ">$ld_libs" )
++  my $LD_LIBS = IO::File->new( ">$ld_libs" )
+     or die( "Could not create linker script '$ld_libs': $!" );
+ 
+-  print LD_LIBS join( " +\n",
++  print $LD_LIBS join( " +\n",
+      (delete $spec{libperl}  || ''),
+     @{delete $spec{perllibs} || []},
+   );
+ 
+-  close LD_LIBS;
+-
+   push @{$spec{lddlflags}}, '@"' . $ld_script  . '"';
+   push @{$spec{perllibs}},  '@"' . $ld_libs    . '"';
+ 
+@@ -669,32 +623,30 @@
+ 
+   print "Generating script '$script'\n" if !$self->{quiet};
+ 
+-  open( SCRIPT, ">$script" )
++  my $SCRIPT = IO::File->new( ">$script" )
+     or die( "Could not create script '$script': $!" );
+ 
+-  print( SCRIPT 'SEARCH_DIR(' . $_ . ")\n" )
++  print $SCRIPT ( 'SEARCH_DIR(' . $_ . ")\n" )
+     for @{delete $spec{libpath} || []};
+ 
+   # gcc takes only one startup file, so the first object in startup is
+   # specified as the startup file and any others are shifted into the
+   # beginning of the list of objects.
+   if ( $spec{startup} && @{$spec{startup}} ) {
+-    print SCRIPT 'STARTUP(' . shift( @{$spec{startup}} ) . ")\n";
++    print $SCRIPT 'STARTUP(' . shift( @{$spec{startup}} ) . ")\n";
+     unshift @{$spec{objects}},
+       @{delete $spec{startup} || []};
+   }
+ 
+-  print SCRIPT 'INPUT(' . join( ',',
++  print $SCRIPT 'INPUT(' . join( ',',
+     @{delete $spec{objects}  || []}
+   ) . ")\n";
+ 
+-  print SCRIPT 'INPUT(' . join( ' ',
++  print $SCRIPT 'INPUT(' . join( ' ',
+      (delete $spec{libperl}  || ''),
+     @{delete $spec{perllibs} || []},
+   ) . ")\n";
+ 
+-  close SCRIPT;
+-
+   push @{$spec{other_ldflags}}, '"' . $script . '"';
+ 
+   return %spec;
+diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/aix.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/aix.pm
+--- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/aix.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/aix.pm	2009-03-11 20:12:36.000000000 +0100
+@@ -5,7 +5,7 @@
+ use File::Spec;
+ 
+ use vars qw($VERSION @ISA);
+-$VERSION = '0.21';
++$VERSION = '0.24';
+ @ISA = qw(ExtUtils::CBuilder::Platform::Unix);
+ 
+ sub need_prelink { 1 }
+diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/cygwin.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/cygwin.pm
+--- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/cygwin.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/cygwin.pm	2009-03-11 20:12:36.000000000 +0100
+@@ -5,7 +5,7 @@
+ use ExtUtils::CBuilder::Platform::Unix;
+ 
+ use vars qw($VERSION @ISA);
+-$VERSION = '0.21';
++$VERSION = '0.24';
+ @ISA = qw(ExtUtils::CBuilder::Platform::Unix);
+ 
+ sub link_executable {
+diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/darwin.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/darwin.pm
+--- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/darwin.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/darwin.pm	2009-03-11 20:12:36.000000000 +0100
+@@ -4,7 +4,7 @@
+ use ExtUtils::CBuilder::Platform::Unix;
+ 
+ use vars qw($VERSION @ISA);
+-$VERSION = '0.21';
++$VERSION = '0.24';
+ @ISA = qw(ExtUtils::CBuilder::Platform::Unix);
+ 
+ sub compile {
+diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/dec_osf.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/dec_osf.pm
+--- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/dec_osf.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/dec_osf.pm	2009-03-11 20:12:36.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ use vars qw($VERSION @ISA);
+ @ISA = qw(ExtUtils::CBuilder::Platform::Unix);
+-$VERSION = '0.21';
++$VERSION = '0.24';
+ 
+ sub link_executable {
+   my $self = shift;
+diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/os2.pm perl-5.10.0/lib/ExtUtils/CBuilder/Platform/os2.pm
+--- perl-5.10.0.orig/lib/ExtUtils/CBuilder/Platform/os2.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/ExtUtils/CBuilder/Platform/os2.pm	2009-03-11 20:12:36.000000000 +0100
+@@ -4,7 +4,7 @@
+ use ExtUtils::CBuilder::Platform::Unix;
+ 
+ use vars qw($VERSION @ISA);
+-$VERSION = '0.21';
++$VERSION = '0.24';
+ @ISA = qw(ExtUtils::CBuilder::Platform::Unix);
+ 
+ sub need_prelink { 1 }
+diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder/t/01-basic.t perl-5.10.0/lib/ExtUtils/CBuilder/t/01-basic.t
+--- perl-5.10.0.orig/lib/ExtUtils/CBuilder/t/01-basic.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/ExtUtils/CBuilder/t/01-basic.t	2009-03-11 20:08:15.000000000 +0100
+@@ -53,6 +53,16 @@
+ }
+ 
+ my @words = $b->split_like_shell(' foo bar');
+-ok @words, 2;
+-ok $words[0], 'foo';
+-ok $words[1], 'bar';
++
++skip(
++    $^O =~ m/MSWin/ ? "Skip under MSWindows" : 0,  # whether to skip
++    @words, 2
++  );
++skip(
++    $^O =~ m/MSWin/ ? "Skip under MSWindows" : 0,  # whether to skip
++    $words[0], 'foo'
++);
++skip(
++    $^O =~ m/MSWin/ ? "Skip under MSWindows" : 0,  # whether to skip
++    $words[1], 'bar'
++);
+diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder.pm perl-5.10.0/lib/ExtUtils/CBuilder.pm
+--- perl-5.10.0.orig/lib/ExtUtils/CBuilder.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/ExtUtils/CBuilder.pm	2009-03-11 20:12:36.000000000 +0100
+@@ -5,7 +5,7 @@
+ use File::Basename ();
+ 
+ use vars qw($VERSION @ISA);
+-$VERSION = '0.21';
++$VERSION = '0.24';
+ $VERSION = eval $VERSION;
+ 
+ # Okay, this is the brute-force method of finding out what kind of
+@@ -36,6 +36,8 @@
+ 		 sunos     Unix
+ 		 cygwin    Unix
+ 		 os2       Unix
++		 gnu       Unix
++		 gnukfreebsd Unix
+ 		 
+ 		 dos       Windows
+ 		 MSWin32   Windows
diff --git a/perl-update-File-Fetch.patch b/perl-update-File-Fetch.patch
new file mode 100644
index 0000000..a4359bc
--- /dev/null
+++ b/perl-update-File-Fetch.patch
@@ -0,0 +1,371 @@
+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-Path.patch b/perl-update-File-Path.patch
new file mode 100644
index 0000000..64ffbb0
--- /dev/null
+++ b/perl-update-File-Path.patch
@@ -0,0 +1,1215 @@
+File-Path-2.07
+
+diff -urN perl-5.10.0.orig/lib/File/Path.pm perl-5.10.0/lib/File/Path.pm
+--- perl-5.10.0.orig/lib/File/Path.pm	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/File/Path.pm	2009-02-17 14:50:05.000000000 +0100
+@@ -16,13 +16,14 @@
+ }
+ 
+ use Exporter ();
+-use vars qw($VERSION @ISA @EXPORT);
+-$VERSION = '2.04';
+-@ISA     = qw(Exporter);
+-@EXPORT  = qw(mkpath rmtree);
++use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
++$VERSION   = '2.07';
++@ISA       = qw(Exporter);
++@EXPORT    = qw(mkpath rmtree);
++@EXPORT_OK = qw(make_path remove_tree);
+ 
+-my $Is_VMS   = $^O eq 'VMS';
+-my $Is_MacOS = $^O eq 'MacOS';
++my $Is_VMS     = $^O eq 'VMS';
++my $Is_MacOS   = $^O eq 'MacOS';
+ 
+ # These OSes complain if you want to remove a file that you have no
+ # write permission to:
+@@ -45,22 +46,21 @@
+ 
+     if ($arg->{error}) {
+         $object = '' unless defined $object;
+-        push @{${$arg->{error}}}, {$object => "$message: $!"};
++        $message .= ": $!" if $!;
++        push @{${$arg->{error}}}, {$object => $message};
+     }
+     else {
+         _carp(defined($object) ? "$message for $object: $!" : "$message: $!");
+     }
+ }
+ 
++sub make_path {
++    push @_, {} unless @_ and UNIVERSAL::isa($_[-1],'HASH');
++    goto &mkpath;
++}
++
+ sub mkpath {
+-    my $old_style = (
+-        UNIVERSAL::isa($_[0],'ARRAY')
+-        or (@_ == 2 and (defined $_[1] ? $_[1] =~ /\A\d+\z/ : 1))
+-        or (@_ == 3
+-            and (defined $_[1] ? $_[1] =~ /\A\d+\z/ : 1)
+-            and (defined $_[2] ? $_[2] =~ /\A\d+\z/ : 1)
+-        )
+-    ) ? 1 : 0;
++    my $old_style = !(@_ and UNIVERSAL::isa($_[-1],'HASH'));
+ 
+     my $arg;
+     my $paths;
+@@ -69,19 +69,14 @@
+         my ($verbose, $mode);
+         ($paths, $verbose, $mode) = @_;
+         $paths = [$paths] unless UNIVERSAL::isa($paths,'ARRAY');
+-        $arg->{verbose} = defined $verbose ? $verbose : 0;
+-        $arg->{mode}    = defined $mode    ? $mode    : 0777;
++        $arg->{verbose} = $verbose;
++        $arg->{mode}    = defined $mode ? $mode : 0777;
+     }
+     else {
+-        if (@_ > 0 and UNIVERSAL::isa($_[-1], 'HASH')) {
+-            $arg = pop @_;
+-            exists $arg->{mask} and $arg->{mode} = delete $arg->{mask};
+-            $arg->{mode} = 0777 unless exists $arg->{mode};
+-            ${$arg->{error}} = [] if exists $arg->{error};
+-        }
+-        else {
+-            @{$arg}{qw(verbose mode)} = (0, 0777);
+-        }
++        $arg = pop @_;
++        $arg->{mode}      = delete $arg->{mask} if exists $arg->{mask};
++        $arg->{mode}      = 0777 unless exists $arg->{mode};
++        ${$arg->{error}}  = [] if exists $arg->{error};
+         $paths = [@_];
+     }
+     return _mkpath($arg, $paths);
+@@ -91,10 +86,9 @@
+     my $arg   = shift;
+     my $paths = shift;
+ 
+-    local($")=$Is_MacOS ? ":" : "/";
+     my(@created,$path);
+     foreach $path (@$paths) {
+-        next unless length($path);
++        next unless defined($path) and length($path);
+         $path .= '/' if $^O eq 'os2' and $path =~ /^\w:\z/s; # feature of CRT 
+         # Logic wants Unix paths, so go with the flow.
+         if ($Is_VMS) {
+@@ -129,15 +123,13 @@
+     return @created;
+ }
+ 
++sub remove_tree {
++    push @_, {} unless @_ and UNIVERSAL::isa($_[-1],'HASH');
++    goto &rmtree;
++}
++
+ sub rmtree {
+-    my $old_style = (
+-        UNIVERSAL::isa($_[0],'ARRAY')
+-        or (@_ == 2 and (defined $_[1] ? $_[1] =~ /\A\d+\z/ : 1))
+-        or (@_ == 3
+-            and (defined $_[1] ? $_[1] =~ /\A\d+\z/ : 1)
+-            and (defined $_[2] ? $_[2] =~ /\A\d+\z/ : 1)
+-        )
+-    ) ? 1 : 0;
++    my $old_style = !(@_ and UNIVERSAL::isa($_[-1],'HASH'));
+ 
+     my $arg;
+     my $paths;
+@@ -145,7 +137,7 @@
+     if ($old_style) {
+         my ($verbose, $safe);
+         ($paths, $verbose, $safe) = @_;
+-        $arg->{verbose} = defined $verbose ? $verbose : 0;
++        $arg->{verbose} = $verbose;
+         $arg->{safe}    = defined $safe    ? $safe    : 0;
+ 
+         if (defined($paths) and length($paths)) {
+@@ -157,32 +149,55 @@
+         }
+     }
+     else {
+-        if (@_ > 0 and UNIVERSAL::isa($_[-1],'HASH')) {
+-            $arg = pop @_;
+-            ${$arg->{error}}  = [] if exists $arg->{error};
+-            ${$arg->{result}} = [] if exists $arg->{result};
+-        }
+-        else {
+-            @{$arg}{qw(verbose safe)} = (0, 0);
+-        }
++        $arg = pop @_;
++        ${$arg->{error}}  = [] if exists $arg->{error};
++        ${$arg->{result}} = [] if exists $arg->{result};
+         $paths = [@_];
+     }
+ 
+     $arg->{prefix} = '';
+     $arg->{depth}  = 0;
+ 
++    my @clean_path;
+     $arg->{cwd} = getcwd() or do {
+         _error($arg, "cannot fetch initial working directory");
+         return 0;
+     };
+     for ($arg->{cwd}) { /\A(.*)\Z/; $_ = $1 } # untaint
+ 
+-    @{$arg}{qw(device inode)} = (stat $arg->{cwd})[0,1] or do {
++    for my $p (@$paths) {
++        # need to fixup case and map \ to / on Windows
++        my $ortho_root = $^O eq 'MSWin32' ? _slash_lc($p)          : $p;
++        my $ortho_cwd  = $^O eq 'MSWin32' ? _slash_lc($arg->{cwd}) : $arg->{cwd};
++        my $ortho_root_length = length($ortho_root);
++        $ortho_root_length-- if $^O eq 'VMS'; # don't compare '.' with ']'
++        if ($ortho_root_length
++            && (substr($ortho_root, 0, $ortho_root_length) 
++             eq substr($ortho_cwd, 0, $ortho_root_length))) {
++            local $! = 0;
++            _error($arg, "cannot remove path when cwd is $arg->{cwd}", $p);
++            next;
++        }
++
++        if ($Is_MacOS) {
++            $p  = ":$p" unless $p =~ /:/;
++            $p .= ":"   unless $p =~ /:\z/;
++        }
++        elsif ($^O eq 'MSWin32') {
++            $p =~ s{[/\\]\z}{};
++        }
++        else {
++            $p =~ s{/\z}{};
++        }
++        push @clean_path, $p;
++    }
++
++    @{$arg}{qw(device inode perm)} = (lstat $arg->{cwd})[0,1] or do {
+         _error($arg, "cannot stat initial working directory", $arg->{cwd});
+         return 0;
+     };
+ 
+-    return _rmtree($arg, $paths);
++    return _rmtree($arg, \@clean_path);
+ }
+ 
+ sub _rmtree {
+@@ -196,14 +211,6 @@
+     my (@files, $root);
+     ROOT_DIR:
+     foreach $root (@$paths) {
+-        if ($Is_MacOS) {
+-            $root  = ":$root" unless $root =~ /:/;
+-            $root .= ":"      unless $root =~ /:\z/;
+-        }
+-        else {
+-            $root =~ s{/\z}{};
+-        }
+-
+         # since we chdir into each directory, it may not be obvious
+         # to figure out where we are if we generate a message about
+         # a file name. We therefore construct a semi-canonical
+@@ -234,13 +241,13 @@
+                 }
+             }
+ 
+-            my ($device, $inode, $perm) = (stat $curdir)[0,1,2] or do {
++            my ($cur_dev, $cur_inode, $perm) = (stat $curdir)[0,1,2] or do {
+                 _error($arg, "cannot stat current working directory", $canon);
+                 next ROOT_DIR;
+             };
+ 
+-            ($ldev eq $device and $lino eq $inode)
+-                or _croak("directory $canon changed before chdir, expected dev=$ldev inode=$lino, actual dev=$device ino=$inode, aborting.");
++            ($ldev eq $cur_dev and $lino eq $cur_inode)
++                or _croak("directory $canon changed before chdir, expected dev=$ldev ino=$lino, actual dev=$cur_dev ino=$cur_inode, aborting.");
+ 
+             $perm &= 07777; # don't forget setuid, setgid, sticky bits
+             my $nperm = $perm | 0700;
+@@ -287,7 +294,7 @@
+                 # remove the contained files before the directory itself
+                 my $narg = {%$arg};
+                 @{$narg}{qw(device inode cwd prefix depth)}
+-                    = ($device, $inode, $updir, $canon, $arg->{depth}+1);
++                    = ($cur_dev, $cur_inode, $updir, $canon, $arg->{depth}+1);
+                 $count += _rmtree($narg, \@files);
+             }
+ 
+@@ -304,11 +311,11 @@
+ 
+             # ensure that a chdir upwards didn't take us somewhere other
+             # than we expected (see CVE-2002-0435)
+-            ($device, $inode) = (stat $curdir)[0,1]
++            ($cur_dev, $cur_inode) = (stat $curdir)[0,1]
+                 or _croak("cannot stat prior working directory $arg->{cwd}: $!, aborting.");
+ 
+-            ($arg->{device} eq $device and $arg->{inode} eq $inode)
+-                or _croak("previous directory $arg->{cwd} changed before entering $canon, expected dev=$ldev inode=$lino, actual dev=$device ino=$inode, aborting.");
++            ($arg->{device} eq $cur_dev and $arg->{inode} eq $cur_inode)
++                or _croak("previous directory $arg->{cwd} changed before entering $canon, expected dev=$ldev ino=$lino, actual dev=$cur_dev ino=$cur_inode, aborting.");
+ 
+             if ($arg->{depth} or !$arg->{keep_root}) {
+                 if ($arg->{safe} &&
+@@ -316,10 +323,8 @@
+                     print "skipped $root\n" if $arg->{verbose};
+                     next ROOT_DIR;
+                 }
+-                if (!chmod $perm | 0700, $root) {
+-                    if ($Force_Writeable) {
+-                        _error($arg, "cannot make directory writeable", $canon);
+-                    }
++                if ($Force_Writeable and !chmod $perm | 0700, $root) {
++                    _error($arg, "cannot make directory writeable", $canon);
+                 }
+                 print "rmdir $root\n" if $arg->{verbose};
+                 if (rmdir $root) {
+@@ -338,7 +343,7 @@
+         else {
+             # not a directory
+             $root = VMS::Filespec::vmsify("./$root")
+-                if $Is_VMS 
++                if $Is_VMS
+                    && !File::Spec->file_name_is_absolute($root)
+                    && ($root !~ m/(?<!\^)[\]>]+/);  # not already in VMS syntax
+ 
+@@ -351,10 +356,8 @@
+             }
+ 
+             my $nperm = $perm & 07777 | 0600;
+-            if ($nperm != $perm and not chmod $nperm, $root) {
+-                if ($Force_Writeable) {
+-                    _error($arg, "cannot make file writeable", $canon);
+-                }
++            if ($Force_Writeable and $nperm != $perm and not chmod $nperm, $root) {
++                _error($arg, "cannot make file writeable", $canon);
+             }
+             print "unlink $canon\n" if $arg->{verbose};
+             # delete all versions under VMS
+@@ -373,10 +376,17 @@
+             }
+         }
+     }
+-
+     return $count;
+ }
+ 
++sub _slash_lc {
++    # fix up slashes and case on MSWin32 so that we can determine that
++    # c:\path\to\dir is underneath C:/Path/To
++    my $path = shift;
++    $path =~ tr{\\}{/};
++    return lc($path);
++}
++
+ 1;
+ __END__
+ 
+@@ -386,59 +396,65 @@
+ 
+ =head1 VERSION
+ 
+-This document describes version 2.04 of File::Path, released
+-2007-11-13.
++This document describes version 2.07 of File::Path, released
++2008-11-09.
+ 
+ =head1 SYNOPSIS
+ 
+-    use File::Path;
+-
+-    # modern
+-    mkpath( 'foo/bar/baz', '/zug/zwang', {verbose => 1} );
++  use File::Path qw(make_path remove_tree);
+ 
+-    rmtree(
+-        'foo/bar/baz', '/zug/zwang',
+-        { verbose => 1, error  => \my $err_list }
+-    );
+-
+-    # traditional
+-    mkpath(['/foo/bar/baz', 'blurfl/quux'], 1, 0711);
+-    rmtree(['foo/bar/baz', 'blurfl/quux'], 1, 1);
++  make_path('foo/bar/baz', '/zug/zwang');
++  make_path('foo/bar/baz', '/zug/zwang', {
++      verbose => 1,
++      mode => 0711,
++  });
++
++  remove_tree('foo/bar/baz', '/zug/zwang');
++  remove_tree('foo/bar/baz', '/zug/zwang', {
++      verbose => 1,
++      error  => \my $err_list,
++  });
++
++  # legacy (interface promoted before v2.00)
++  mkpath('/foo/bar/baz');
++  mkpath('/foo/bar/baz', 1, 0711);
++  mkpath(['/foo/bar/baz', 'blurfl/quux'], 1, 0711);
++  rmtree('foo/bar/baz', 1, 1);
++  rmtree(['foo/bar/baz', 'blurfl/quux'], 1, 1);
++
++  # legacy (interface promoted before v2.06)
++  mkpath('foo/bar/baz', '/zug/zwang', { verbose => 1, mode => 0711 });
++  rmtree('foo/bar/baz', '/zug/zwang', { verbose => 1, mode => 0711 });
+ 
+ =head1 DESCRIPTION
+ 
+-The C<mkpath> function provides a convenient way to create directories
+-of arbitrary depth. Similarly, the C<rmtree> function provides a
+-convenient way to delete an entire directory subtree from the
+-filesystem, much like the Unix command C<rm -r>.
+-
+-Both functions may be called in one of two ways, the traditional,
+-compatible with code written since the dawn of time, and modern,
+-that offers a more flexible and readable idiom. New code should use
+-the modern interface.
+-
+-=head2 FUNCTIONS
+-
+-The modern way of calling C<mkpath> and C<rmtree> is with a list
+-of directories to create, or remove, respectively, followed by an
+-optional hash reference containing keys to control the
+-function's behaviour.
+-
+-=head3 C<mkpath>
+-
+-The following keys are recognised as parameters to C<mkpath>.
+-The function returns the list of files actually created during the
+-call.
+-
+-  my @created = mkpath(
+-    qw(/tmp /flub /home/nobody),
+-    {verbose => 1, mode => 0750},
+-  );
+-  print "created $_\n" for @created;
++This module provide a convenient way to create directories of
++arbitrary depth and to delete an entire directory subtree from the
++filesystem.
+ 
+-=over 4
++The following functions are provided:
++
++=over
++
++=item make_path( $dir1, $dir2, .... )
+ 
+-=item mode
++=item make_path( $dir1, $dir2, ...., \%opts )
++
++The C<make_path> function creates the given directories if they don't
++exists before, much like the Unix command C<mkdir -p>.
++
++The function accepts a list of directories to be created. Its
++behaviour may be tuned by an optional hashref appearing as the last
++parameter on the call.
++
++The function returns the list of directories actually created during
++the call; in scalar context the number of directories created.
++
++The following keys are recognised in the option hash:
++
++=over
++
++=item mode => $num
+ 
+ The numeric permissions mode to apply to each created directory
+ (defaults to 0777), to be modified by the current C<umask>. If the
+@@ -447,16 +463,17 @@
+ 
+ C<mask> is recognised as an alias for this parameter.
+ 
+-=item verbose
++=item verbose => $bool
+ 
+-If present, will cause C<mkpath> to print the name of each directory
++If present, will cause C<make_path> to print the name of each directory
+ as it is created. By default nothing is printed.
+ 
+-=item error
++=item error => \$err
+ 
+-If present, will be interpreted as a reference to a list, and will
+-be used to store any errors that are encountered.  See the ERROR
+-HANDLING section for more information.
++If present, it should be a reference to a scalar.
++This scalar will be made to reference an array, which will
++be used to store any errors that are encountered.  See the L</"ERROR
++HANDLING"> section for more information.
+ 
+ If this parameter is not used, certain error conditions may raise
+ a fatal error that will cause the program will halt, unless trapped
+@@ -464,53 +481,80 @@
+ 
+ =back
+ 
+-=head3 C<rmtree>
++=item mkpath( $dir )
+ 
+-=over 4
++=item mkpath( $dir, $verbose, $mode )
++
++=item mkpath( [$dir1, $dir2,...], $verbose, $mode )
++
++=item mkpath( $dir1, $dir2,..., \%opt )
++
++The mkpath() function provide the legacy interface of make_path() with
++a different interpretation of the arguments passed.  The behaviour and
++return value of the function is otherwise identical to make_path().
+ 
+-=item verbose
++=item remove_tree( $dir1, $dir2, .... )
+ 
+-If present, will cause C<rmtree> to print the name of each file as
++=item remove_tree( $dir1, $dir2, ...., \%opts )
++
++The C<remove_tree> function deletes the given directories and any
++files and subdirectories they might contain, much like the Unix
++command C<rm -r> or C<del /s> on Windows.
++
++The function accepts a list of directories to be
++removed. Its behaviour may be tuned by an optional hashref
++appearing as the last parameter on the call.
++
++The functions returns the number of files successfully deleted.
++
++The following keys are recognised in the option hash:
++
++=over
++
++=item verbose => $bool
++
++If present, will cause C<remove_tree> to print the name of each file as
+ it is unlinked. By default nothing is printed.
+ 
+-=item safe
++=item safe => $bool
+ 
+-When set to a true value, will cause C<rmtree> to skip the files
++When set to a true value, will cause C<remove_tree> to skip the files
+ for which the process lacks the required privileges needed to delete
+ files, such as delete privileges on VMS. In other words, the code
+ will make no attempt to alter file permissions. Thus, if the process
+ is interrupted, no filesystem object will be left in a more
+ permissive mode.
+ 
+-=item keep_root
++=item keep_root => $bool
+ 
+ When set to a true value, will cause all files and subdirectories
+ to be removed, except the initially specified directories. This comes
+ in handy when cleaning out an application's scratch directory.
+ 
+-  rmtree( '/tmp', {keep_root => 1} );
++  remove_tree( '/tmp', {keep_root => 1} );
+ 
+-=item result
++=item result => \$res
+ 
+-If present, will be interpreted as a reference to a list, and will
+-be used to store the list of all files and directories unlinked
+-during the call. If nothing is unlinked, a reference to an empty
+-list is returned (rather than C<undef>).
++If present, it should be a reference to a scalar.
++This scalar will be made to reference an array, which will
++be used to store all files and directories unlinked
++during the call. If nothing is unlinked, the array will be empty.
+ 
+-  rmtree( '/tmp', {result => \my $list} );
++  remove_tree( '/tmp', {result => \my $list} );
+   print "unlinked $_\n" for @$list;
+ 
+ This is a useful alternative to the C<verbose> key.
+ 
+-=item error
++=item error => \$err
+ 
+-If present, will be interpreted as a reference to a list,
+-and will be used to store any errors that are encountered.
+-See the ERROR HANDLING section for more information.
++If present, it should be a reference to a scalar.
++This scalar will be made to reference an array, which will
++be used to store any errors that are encountered.  See the L</"ERROR
++HANDLING"> section for more information.
+ 
+ Removing things is a much more dangerous proposition than
+ creating things. As such, there are certain conditions that
+-C<rmtree> may encounter that are so dangerous that the only
++C<remove_tree> may encounter that are so dangerous that the only
+ sane action left is to kill the program.
+ 
+ Use C<error> to trap all that is reasonable (problems with
+@@ -519,131 +563,67 @@
+ 
+ =back
+ 
+-=head2 TRADITIONAL INTERFACE
+-
+-The old interfaces of C<mkpath> and C<rmtree> take a reference to
+-a list of directories (to create or remove), followed by a series
+-of positional, numeric, modal parameters that control their behaviour.
+-
+-This design made it difficult to add additional functionality, as
+-well as posed the problem of what to do when the calling code only
+-needs to set the last parameter. Even though the code doesn't care
+-how the initial positional parameters are set, the programmer is
+-forced to learn what the defaults are, and specify them.
+-
+-Worse, if it turns out in the future that it would make more sense
+-to change the default behaviour of the first parameter (for example,
+-to avoid a security vulnerability), all existing code will remain
+-hard-wired to the wrong defaults.
+-
+-Finally, a series of numeric parameters are much less self-documenting
+-in terms of communicating to the reader what the code is doing. Named
+-parameters do not have this problem.
+-
+-In the traditional API, C<mkpath> takes three arguments:
+-
+-=over 4
+-
+-=item *
+-
+-The name of the path to create, or a reference to a list of paths
+-to create,
++=item rmtree( $dir )
+ 
+-=item *
++=item rmtree( $dir, $verbose, $safe )
+ 
+-a boolean value, which if TRUE will cause C<mkpath> to print the
+-name of each directory as it is created (defaults to FALSE), and
++=item rmtree( [$dir1, $dir2,...], $verbose, $safe )
+ 
+-=item *
++=item rmtree( $dir1, $dir2,..., \%opt )
+ 
+-the numeric mode to use when creating the directories (defaults to
+-0777), to be modified by the current umask.
++The rmtree() function provide the legacy interface of remove_tree()
++with a different interpretation of the arguments passed. The behaviour
++and return value of the function is otherwise identical to
++remove_tree().
+ 
+ =back
+ 
+-It returns a list of all directories (including intermediates, determined
+-using the Unix '/' separator) created.  In scalar context it returns
+-the number of directories created.
+-
+-If a system error prevents a directory from being created, then the
+-C<mkpath> function throws a fatal error with C<Carp::croak>. This error
+-can be trapped with an C<eval> block:
+-
+-  eval { mkpath($dir) };
+-  if ($@) {
+-    print "Couldn't create $dir: $@";
+-  }
+-
+-In the traditional API, C<rmtree> takes three arguments:
++=head2 ERROR HANDLING
+ 
+ =over 4
+ 
+-=item *
++=item B<NOTE:>
+ 
+-the root of the subtree to delete, or a reference to a list of
+-roots. All of the files and directories below each root, as well
+-as the roots themselves, will be deleted. If you want to keep
+-the roots themselves, you must use the modern API.
+-
+-=item *
+-
+-a boolean value, which if TRUE will cause C<rmtree> to print a
+-message each time it examines a file, giving the name of the file,
+-and indicating whether it's using C<rmdir> or C<unlink> to remove
+-it, or that it's skipping it.  (defaults to FALSE)
+-
+-=item *
+-
+-a boolean value, which if TRUE will cause C<rmtree> to skip any
+-files to which you do not have delete access (if running under VMS)
+-or write access (if running under another OS). This will change
+-in the future when a criterion for 'delete permission' under OSs
+-other than VMS is settled.  (defaults to FALSE)
++The following error handling mechanism is considered
++experimental and is subject to change pending feedback from
++users.
+ 
+ =back
+ 
+-It returns the number of files, directories and symlinks successfully
+-deleted.  Symlinks are simply deleted and not followed.
+-
+-Note also that the occurrence of errors in C<rmtree> using the
+-traditional interface can be determined I<only> by trapping diagnostic
+-messages using C<$SIG{__WARN__}>; it is not apparent from the return
+-value. (The modern interface may use the C<error> parameter to
+-record any problems encountered).
+-
+-=head2 ERROR HANDLING
+-
+-If C<mkpath> or C<rmtree> encounter an error, a diagnostic message
+-will be printed to C<STDERR> via C<carp> (for non-fatal errors),
+-or via C<croak> (for fatal errors).
++If C<make_path> or C<remove_tree> encounter an error, a diagnostic
++message will be printed to C<STDERR> via C<carp> (for non-fatal
++errors), or via C<croak> (for fatal errors).
+ 
+ If this behaviour is not desirable, the C<error> attribute may be
+ used to hold a reference to a variable, which will be used to store
+-the diagnostics. The result is a reference to a list of hash
+-references. For each hash reference, the key is the name of the
+-file, and the value is the error message (usually the contents of
+-C<$!>). An example usage looks like:
+-
+-  rmpath( 'foo/bar', 'bar/rat', {error => \my $err} );
+-  for my $diag (@$err) {
+-    my ($file, $message) = each %$diag;
+-    print "problem unlinking $file: $message\n";
++the diagnostics. The variable is made a reference to an array of hash
++references.  Each hash contain a single key/value pair where the key
++is the name of the file, and the value is the error message (including
++the contents of C<$!> when appropriate).  If a general error is
++encountered the diagnostic key will be empty.
++
++An example usage looks like:
++
++  remove_tree( 'foo/bar', 'bar/rat', {error => \my $err} );
++  if (@$err) {
++      for my $diag (@$err) {
++          my ($file, $message) = %$diag;
++          if ($file eq '') {
++              print "general error: $message\n";
++          }
++          else {
++              print "problem unlinking $file: $message\n";
++          }
++      }
+   }
+-
+-If no errors are encountered, C<$err> will point to an empty list
+-(thus there is no need to test for C<undef>). If a general error
+-is encountered (for instance, C<rmtree> attempts to remove a directory
+-tree that does not exist), the diagnostic key will be empty, only
+-the value will be set:
+-
+-  rmpath( '/no/such/path', {error => \my $err} );
+-  for my $diag (@$err) {
+-    my ($file, $message) = each %$diag;
+-    if ($file eq '') {
+-      print "general error: $message\n";
+-    }
++  else {
++      print "No error encountered\n";
+   }
+ 
++Note that if no errors are encountered, C<$err> will reference an
++empty array.  This means that C<$err> will always end up TRUE; so you
++need to test C<@$err> to determine if errors occured.
++
+ =head2 NOTES
+ 
+ C<File::Path> blindly exports C<mkpath> and C<rmtree> into the
+@@ -653,38 +633,18 @@
+ 
+   use File::Path 'rmtree';
+ 
+-=head3 HEURISTICS
++The routines C<make_path> and C<remove_tree> are B<not> exported
++by default. You must specify which ones you want to use.
+ 
+-The functions detect (as far as possible) which way they are being
+-called and will act appropriately. It is important to remember that
+-the heuristic for detecting the old style is either the presence
+-of an array reference, or two or three parameters total and second
+-and third parameters are numeric. Hence...
++  use File::Path 'remove_tree';
+ 
+-    mkpath 486, 487, 488;
++Note that a side-effect of the above is that C<mkpath> and C<rmtree>
++are no longer exported at all. This is due to the way the C<Exporter>
++module works. If you are migrating a codebase to use the new
++interface, you will have to list everything explicitly. But that's
++just good practice anyway.
+ 
+-... will not assume the modern style and create three directories, rather
+-it will create one directory verbosely, setting the permission to
+-0750 (488 being the decimal equivalent of octal 750). Here, old
+-style trumps new. It must, for backwards compatibility reasons.
+-
+-If you want to ensure there is absolutely no ambiguity about which
+-way the function will behave, make sure the first parameter is a
+-reference to a one-element list, to force the old style interpretation:
+-
+-    mkpath [486], 487, 488;
+-
+-and get only one directory created. Or add a reference to an empty
+-parameter hash, to force the new style:
+-
+-    mkpath 486, 487, 488, {};
+-
+-... and hence create the three directories. If the empty hash
+-reference seems a little strange to your eyes, or you suspect a
+-subsequent programmer might I<helpfully> optimise it away, you
+-can add a parameter set to a default value:
+-
+-    mkpath 486, 487, 488, {verbose => 0};
++  use File::Path qw(remove_tree rmtree);
+ 
+ =head3 SECURITY CONSIDERATIONS
+ 
+@@ -701,7 +661,7 @@
+ 
+ Additionally, unless the C<safe> parameter is set (or the
+ third parameter in the traditional interface is TRUE), should a
+-C<rmtree> be interrupted, files that were originally in read-only
++C<remove_tree> be interrupted, files that were originally in read-only
+ mode may now have their permissions set to a read-write (or "delete
+ OK") mode.
+ 
+@@ -723,43 +683,43 @@
+ 
+ =item mkdir [path]: [errmsg] (SEVERE)
+ 
+-C<mkpath> was unable to create the path. Probably some sort of
++C<make_path> was unable to create the path. Probably some sort of
+ permissions error at the point of departure, or insufficient resources
+ (such as free inodes on Unix).
+ 
+ =item No root path(s) specified
+ 
+-C<mkpath> was not given any paths to create. This message is only
++C<make_path> was not given any paths to create. This message is only
+ emitted if the routine is called with the traditional interface.
+ The modern interface will remain silent if given nothing to do.
+ 
+ =item No such file or directory
+ 
+-On Windows, if C<mkpath> gives you this warning, it may mean that
++On Windows, if C<make_path> gives you this warning, it may mean that
+ you have exceeded your filesystem's maximum path length.
+ 
+ =item cannot fetch initial working directory: [errmsg]
+ 
+-C<rmtree> attempted to determine the initial directory by calling
++C<remove_tree> attempted to determine the initial directory by calling
+ C<Cwd::getcwd>, but the call failed for some reason. No attempt
+ will be made to delete anything.
+ 
+ =item cannot stat initial working directory: [errmsg]
+ 
+-C<rmtree> attempted to stat the initial directory (after having
++C<remove_tree> attempted to stat the initial directory (after having
+ successfully obtained its name via C<getcwd>), however, the call
+ failed for some reason. No attempt will be made to delete anything.
+ 
+ =item cannot chdir to [dir]: [errmsg]
+ 
+-C<rmtree> attempted to set the working directory in order to
++C<remove_tree> attempted to set the working directory in order to
+ begin deleting the objects therein, but was unsuccessful. This is
+ usually a permissions issue. The routine will continue to delete
+ other things, but this directory will be left intact.
+ 
+-=item directory [dir] changed before chdir, expected dev=[n] inode=[n], actual dev=[n] ino=[n], aborting. (FATAL)
++=item directory [dir] changed before chdir, expected dev=[n] ino=[n], actual dev=[n] ino=[n], aborting. (FATAL)
+ 
+-C<rmtree> recorded the device and inode of a directory, and then
++C<remove_tree> recorded the device and inode of a directory, and then
+ moved into it. It then performed a C<stat> on the current directory
+ and detected that the device and inode were no longer the same. As
+ this is at the heart of the race condition problem, the program
+@@ -767,14 +727,14 @@
+ 
+ =item cannot make directory [dir] read+writeable: [errmsg]
+ 
+-C<rmtree> attempted to change the permissions on the current directory
++C<remove_tree> attempted to change the permissions on the current directory
+ to ensure that subsequent unlinkings would not run into problems,
+ but was unable to do so. The permissions remain as they were, and
+ the program will carry on, doing the best it can.
+ 
+ =item cannot read [dir]: [errmsg]
+ 
+-C<rmtree> tried to read the contents of the directory in order
++C<remove_tree> tried to read the contents of the directory in order
+ to acquire the names of the directory entries to be unlinked, but
+ was unsuccessful. This is usually a permissions issue. The
+ program will continue, but the files in this directory will remain
+@@ -782,61 +742,70 @@
+ 
+ =item cannot reset chmod [dir]: [errmsg]
+ 
+-C<rmtree>, after having deleted everything in a directory, attempted
++C<remove_tree>, after having deleted everything in a directory, attempted
+ to restore its permissions to the original state but failed. The
+ directory may wind up being left behind.
+ 
++=item cannot remove [dir] when cwd is [dir]
++
++The current working directory of the program is F</some/path/to/here>
++and you are attempting to remove an ancestor, such as F</some/path>.
++The directory tree is left untouched.
++
++The solution is to C<chdir> out of the child directory to a place
++outside the directory tree to be removed.
++
+ =item cannot chdir to [parent-dir] from [child-dir]: [errmsg], aborting. (FATAL)
+ 
+-C<rmtree>, after having deleted everything and restored the permissions
+-of a directory, was unable to chdir back to the parent. This is usually
+-a sign that something evil this way comes.
++C<remove_tree>, after having deleted everything and restored the permissions
++of a directory, was unable to chdir back to the parent. The program
++halts to avoid a race condition from occurring.
+ 
+ =item cannot stat prior working directory [dir]: [errmsg], aborting. (FATAL)
+ 
+-C<rmtree> was unable to stat the parent directory after have returned
++C<remove_tree> was unable to stat the parent directory after have returned
+ from the child. Since there is no way of knowing if we returned to
+ where we think we should be (by comparing device and inode) the only
+ way out is to C<croak>.
+ 
+-=item previous directory [parent-dir] changed before entering [child-dir], expected dev=[n] inode=[n], actual dev=[n] ino=[n], aborting. (FATAL)
++=item previous directory [parent-dir] changed before entering [child-dir], expected dev=[n] ino=[n], actual dev=[n] ino=[n], aborting. (FATAL)
+ 
+-When C<rmtree> returned from deleting files in a child directory, a
++When C<remove_tree> returned from deleting files in a child directory, a
+ check revealed that the parent directory it returned to wasn't the one
+ it started out from. This is considered a sign of malicious activity.
+ 
+ =item cannot make directory [dir] writeable: [errmsg]
+ 
+ Just before removing a directory (after having successfully removed
+-everything it contained), C<rmtree> attempted to set the permissions
++everything it contained), C<remove_tree> attempted to set the permissions
+ on the directory to ensure it could be removed and failed. Program
+ execution continues, but the directory may possibly not be deleted.
+ 
+ =item cannot remove directory [dir]: [errmsg]
+ 
+-C<rmtree> attempted to remove a directory, but failed. This may because
++C<remove_tree> attempted to remove a directory, but failed. This may because
+ some objects that were unable to be removed remain in the directory, or
+ a permissions issue. The directory will be left behind.
+ 
+ =item cannot restore permissions of [dir] to [0nnn]: [errmsg]
+ 
+-After having failed to remove a directory, C<rmtree> was unable to
++After having failed to remove a directory, C<remove_tree> was unable to
+ restore its permissions from a permissive state back to a possibly
+ more restrictive setting. (Permissions given in octal).
+ 
+ =item cannot make file [file] writeable: [errmsg]
+ 
+-C<rmtree> attempted to force the permissions of a file to ensure it
++C<remove_tree> attempted to force the permissions of a file to ensure it
+ could be deleted, but failed to do so. It will, however, still attempt
+ to unlink the file.
+ 
+ =item cannot unlink file [file]: [errmsg]
+ 
+-C<rmtree> failed to remove a file. Probably a permissions issue.
++C<remove_tree> failed to remove a file. Probably a permissions issue.
+ 
+ =item cannot restore permissions of [file] to [0nnn]: [errmsg]
+ 
+-After having failed to remove a file, C<rmtree> was also unable
++After having failed to remove a file, C<remove_tree> was also unable
+ to restore the permissions on the file to a possibly less permissive
+ setting. (Permissions given in octal).
+ 
+@@ -879,16 +848,18 @@
+ That code was used as a basis for the current code. Their efforts
+ are greatly appreciated.
+ 
++Gisle Aas made a number of improvements to the documentation for
++2.07 and his advice and assistance is also greatly appreciated.
++
+ =head1 AUTHORS
+ 
+-Tim Bunce <F<Tim.Bunce@ig.co.uk>> and Charles Bailey
+-<F<bailey@newman.upenn.edu>>. Currently maintained by David Landgren
++Tim Bunce and Charles Bailey. Currently maintained by David Landgren
+ <F<david@landgren.net>>.
+ 
+ =head1 COPYRIGHT
+ 
+ This module is copyright (C) Charles Bailey, Tim Bunce and
+-David Landgren 1995-2007.  All rights reserved.
++David Landgren 1995-2008. All rights reserved.
+ 
+ =head1 LICENSE
+ 
+diff -urN perl-5.10.0.orig/lib/File/Path.t perl-5.10.0/lib/File/Path.t
+--- perl-5.10.0.orig/lib/File/Path.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/File/Path.t	2009-02-17 14:53:32.000000000 +0100
+@@ -2,17 +2,19 @@
+ 
+ use strict;
+ 
+-use Test::More tests => 99;
++use Test::More tests => 114;
++use Config;
+ 
+ BEGIN {
+-    use_ok('File::Path');
++    use_ok('Cwd');
++    use_ok('File::Path', qw(rmtree mkpath make_path remove_tree));
+     use_ok('File::Spec::Functions');
+ }
+ 
+ eval "use Test::Output";
+ my $has_Test_Output = $@ ? 0 : 1;
+ 
+-my $Is_VMS   = $^O eq 'VMS';
++my $Is_VMS = $^O eq 'VMS';
+ 
+ # first check for stupid permissions second for full, so we clean up
+ # behind ourselves
+@@ -45,7 +47,7 @@
+ );
+ 
+ # create them
+-my @created = mkpath(@dir);
++my @created = mkpath([@dir]);
+ 
+ is(scalar(@created), 7, "created list of directories");
+ 
+@@ -79,18 +81,98 @@
+ my $dir;
+ my $dir2;
+ 
++sub gisle {
++    # background info: @_ = 1; !shift # gives '' not 0
++    # Message-Id: <3C820CE6-4400-4E91-AF43-A3D19B356E68@activestate.com>
++    # http://www.nntp.perl.org/group/perl.perl5.porters/2008/05/msg136625.html
++    mkpath(shift, !shift, 0755);
++}
++
++sub count {
++    opendir D, shift or return -1;
++    my $count = () = readdir D;
++    closedir D or return -1;
++    return $count;
++}
++
++{
++    mkdir 'solo', 0755;
++    chdir 'solo';
++    open my $f, '>', 'foo.dat';
++    close $f;
++    my $before = count(curdir());
++    cmp_ok($before, '>', 0, "baseline $before");
++
++    gisle('1st', 1);
++    is(count(curdir()), $before + 1, "first after $before");
++
++    $before = count(curdir());
++    gisle('2nd', 1);
++    is(count(curdir()), $before + 1, "second after $before");
++
++    chdir updir();
++    rmtree 'solo';
++}
++
++{
++    mkdir 'solo', 0755;
++    chdir 'solo';
++    open my $f, '>', 'foo.dat';
++    close $f;
++    my $before = count(curdir());
++    cmp_ok($before, '>', 0, "ARGV $before");
++    {
++        local @ARGV = (1);
++        mkpath('3rd', !shift, 0755);
++    }
++    is(count(curdir()), $before + 1, "third after $before");
++
++    $before = count(curdir());
++    {
++        local @ARGV = (1);
++        mkpath('4th', !shift, 0755);
++    }
++    is(count(curdir()), $before + 1, "fourth after $before");
++
++    chdir updir();
++    rmtree 'solo';
++}
++
+ SKIP: {
+-    $dir = catdir($tmp_base, 'B');
+-    $dir2 = catdir($dir, updir());
+-    # IOW: File::Spec->catdir( qw(foo bar), File::Spec->updir ) eq 'foo'
+-    # rather than foo/bar/..    
+-    skip "updir() canonicalises path on this platform", 2
+-        if $dir2 eq $tmp_base
+-            or $^O eq 'cygwin';
+-        
+-    @created = mkpath($dir2, {mask => 0700});
+-    is(scalar(@created), 1, "make directory with trailing parent segment");
+-    is($created[0], $dir, "made parent");
++    # tests for rmtree() of ancestor directory
++    my $nr_tests = 6;
++    my $cwd = getcwd() or skip "failed to getcwd: $!", $nr_tests;
++    my $dir  = catdir($cwd, 'remove');
++    my $dir2 = catdir($cwd, 'remove', 'this', 'dir');
++
++    skip "failed to mkpath '$dir2': $!", $nr_tests
++        unless mkpath($dir2, {verbose => 0});
++    skip "failed to chdir dir '$dir2': $!", $nr_tests
++        unless chdir($dir2);
++
++    rmtree($dir, {error => \$error});
++    my $nr_err = @$error;
++    is($nr_err, 1, "ancestor error");
++
++    if ($nr_err) {
++        my ($file, $message) = each %{$error->[0]};
++        is($file, $dir, "ancestor named");
++        my $ortho_dir = $^O eq 'MSWin32' ? File::Path::_slash_lc($dir2) : $dir2;
++        $^O eq 'MSWin32' and $message
++            =~ s/\A(cannot remove path when cwd is )(.*)\Z/$1 . File::Path::_slash_lc($2)/e;
++        is($message, "cannot remove path when cwd is $ortho_dir", "ancestor reason");
++        ok(-d $dir2, "child not removed");
++        ok(-d $dir, "ancestor not removed");
++    }
++    else {
++        fail( "ancestor 1");
++        fail( "ancestor 2");
++        fail( "ancestor 3");
++        fail( "ancestor 4");
++    }
++    chdir $cwd;
++    rmtree($dir);
++    ok(!(-d $dir), "ancestor now removed");
+ };
+ 
+ my $count = rmtree({error => \$error});
+@@ -104,7 +186,7 @@
+ $dir = catdir($tmp_base,'C');
+ # mkpath returns unix syntax filespecs on VMS
+ $dir = VMS::Filespec::unixify($dir) if $Is_VMS;
+-@created = mkpath($tmp_base, $dir);
++@created = make_path($tmp_base, $dir);
+ is(scalar(@created), 1, "created directory (new style 1)");
+ is($created[0], $dir, "created directory (new style 1) cross-check");
+ 
+@@ -115,7 +197,7 @@
+ $dir2 = catdir($tmp_base,'D');
+ # mkpath returns unix syntax filespecs on VMS
+ $dir2 = VMS::Filespec::unixify($dir2) if $Is_VMS;
+-@created = mkpath($tmp_base, $dir, $dir2);
++@created = make_path($tmp_base, $dir, $dir2);
+ is(scalar(@created), 1, "created directory (new style 2)");
+ is($created[0], $dir2, "created directory (new style 2) cross-check");
+ 
+@@ -123,8 +205,7 @@
+ is($count, 1, "removed directory unsafe mode");
+ 
+ $count = rmtree($dir2, 0, 1);
+-my $removed = $Is_VMS ? 0 : 1;
+-is($count, $removed, "removed directory safe mode");
++is($count, 1, "removed directory safe mode");
+ 
+ # mkdir foo ./E/../Y
+ # Y should exist
+@@ -135,7 +216,7 @@
+ cmp_ok(scalar(@created), '<=', 2, "made less than two dirs because of ..");
+ ok( -d catdir($tmp_base, 'Y'), "directory after parent" );
+ 
+-@created = mkpath(catdir(curdir(), $tmp_base));
++@created = make_path(catdir(curdir(), $tmp_base));
+ is(scalar(@created), 0, "nothing created")
+     or diag(@created);
+ 
+@@ -195,22 +276,22 @@
+ $dir   = catdir('a', 'd1');
+ $dir2  = catdir('a', 'd2');
+ 
+-@created = mkpath( $dir, 0, $dir2 );
++@created = make_path( $dir, 0, $dir2 );
+ is(scalar @created, 3, 'new-style 3 dirs created');
+ 
+-$count = rmtree( $dir, 0, $dir2, );
++$count = remove_tree( $dir, 0, $dir2, );
+ is($count, 3, 'new-style 3 dirs removed');
+ 
+-@created = mkpath( $dir, $dir2, 1 );
++@created = make_path( $dir, $dir2, 1 );
+ is(scalar @created, 3, 'new-style 3 dirs created (redux)');
+ 
+-$count = rmtree( $dir, $dir2, 1 );
++$count = remove_tree( $dir, $dir2, 1 );
+ is($count, 3, 'new-style 3 dirs removed (redux)');
+ 
+-@created = mkpath( $dir, $dir2 );
++@created = make_path( $dir, $dir2 );
+ is(scalar @created, 2, 'new-style 2 dirs created');
+ 
+-$count = rmtree( $dir, $dir2 );
++$count = remove_tree( $dir, $dir2 );
+ is($count, 2, 'new-style 2 dirs removed');
+ 
+ if (chdir updir()) {
+@@ -220,6 +301,43 @@
+     fail("chdir parent: $!");
+ }
+ 
++SKIP: {
++    # test bug http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=487319
++    skip "Don't need Force_Writeable semantics on $^O", 4
++        if grep {$^O eq $_} qw(amigaos dos epoc MSWin32 MacOS os2);
++    skip "Symlinks not available", 4 unless $Config{'d_symlink'};
++    $dir  = 'bug487319';
++    $dir2 = 'bug487319-symlink';
++    @created = make_path($dir, {mask => 0700});
++    is(scalar @created, 1, 'bug 487319 setup');
++    symlink($dir, $dir2);
++    ok(-e $dir2, "debian bug 487319 setup symlink") or diag($dir2);
++
++    chmod 0500, $dir;
++    my $mask_initial = (stat $dir)[2];
++    remove_tree($dir2);
++
++    my $mask = (stat $dir)[2];
++    is( $mask, $mask_initial, 'mask of symlink target dir unchanged (debian bug 487319)');
++
++    # now try a file
++    my $file = catfile($dir, 'file');
++    open my $out, '>', $file;
++    close $out;
++
++    chmod 0500, $file;
++    $mask_initial = (stat $file)[2];
++
++    my $file2 = catfile($dir, 'symlink');
++    symlink($file, $file2);
++    remove_tree($file2);
++
++    $mask = (stat $file)[2];
++    is( $mask, $mask_initial, 'mask of symlink target file unchanged (debian bug 487319)');
++
++    remove_tree($dir);
++}
++
+ # see what happens if a file exists where we want a directory
+ SKIP: {
+     my $entry = catdir($tmp_base, "file");
+@@ -245,6 +363,7 @@
+ SKIP: {
+     skip "extra scenarios not set up, see eg/setup-extra-tests", 14
+         unless -e $extra;
++    skip "Symlinks not available", 14 unless $Config{'d_symlink'};
+ 
+     my ($list, $err);
+     $dir = catdir( 'EXTRA', '1' );
+@@ -355,8 +474,8 @@
+         "rmtree of empty dir carps sensibly"
+     );
+ 
+-    stderr_is( sub { mkpath() }, '', "mkpath no args does not carp" );
+-    stderr_is( sub { rmtree() }, '', "rmtree no args does not carp" );
++    stderr_is( sub { make_path() }, '', "make_path no args does not carp" );
++    stderr_is( sub { remove_tree() }, '', "remove_tree no args does not carp" );
+ 
+     stdout_is(
+         sub {@created = mkpath($dir, 1)},
diff --git a/perl-update-File-Temp.patch b/perl-update-File-Temp.patch
new file mode 100644
index 0000000..6d03b85
--- /dev/null
+++ b/perl-update-File-Temp.patch
@@ -0,0 +1,1398 @@
+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-5.10.0-IPC_Cmd-0.42.patch b/perl-update-IPC-Cmd.patch
similarity index 82%
rename from perl-5.10.0-IPC_Cmd-0.42.patch
rename to perl-update-IPC-Cmd.patch
index 76089e8..ee30640 100644
--- a/perl-5.10.0-IPC_Cmd-0.42.patch
+++ b/perl-update-IPC-Cmd.patch
@@ -1,820 +1,9 @@
-diff -up perl-5.10.0/lib/IPC/Cmd.pm.ddd perl-5.10.0/lib/IPC/Cmd.pm
---- perl-5.10.0/lib/IPC/Cmd.pm.ddd	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/IPC/Cmd.pm	2008-10-10 11:44:19.000000000 +0200
-@@ -4,16 +4,19 @@ use strict;
- 
- 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 @@ BEGIN {
-     $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 @@ IPC::Cmd - finding and running system co
-     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 @@ IPC::Cmd - finding and running system co
-     ### 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 @@ as adhere to your verbosity settings.
- 
- =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 @@ sub can_use_ipc_run     { 
-                     );
-                     
-     ### 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 @@ sub can_use_ipc_open3   { 
-     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 @@ sub can_run {
-     }
- }
- 
--=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 @@ and inspect the individual buffers.
- 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 @@ In list context, you will be returned a 
- 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 @@ what modules or function calls to use wh
- 
- =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 @@ sub run {
-     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 @@ sub run {
-     
- 
-     ### 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 @@ sub run {
-     ### 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 @@ sub _open3_run { 
-                             ? 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 @@ sub _open3_run { 
-                 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 @@ sub _open3_run { 
- 
-     ### 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 @@ sub _system_run { 
-     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 @@ sub _debug {
-     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 @@ Defaults to true. Turn this off at your 
- 
- =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 @@ But take care not to pass it as, for exa
- 
- 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 -up perl-5.10.0/lib/IPC/Cmd/t/01_IPC-Cmd.t.ddd perl-5.10.0/lib/IPC/Cmd/t/01_IPC-Cmd.t
---- perl-5.10.0/lib/IPC/Cmd/t/01_IPC-Cmd.t.ddd	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/IPC/Cmd/t/01_IPC-Cmd.t	2008-10-09 16:08:48.000000000 +0200
-@@ -4,30 +4,43 @@ BEGIN { chdir 't' if -d 't' };
+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];
@@ -872,7 +61,7 @@ diff -up perl-5.10.0/lib/IPC/Cmd/t/01_IPC-Cmd.t.ddd perl-5.10.0/lib/IPC/Cmd/t/01
  
  ### can_run tests
  {
-@@ -35,59 +48,92 @@ my @Prefs = ( 
+@@ -35,59 +48,92 @@
      ok( !can_run('10283lkjfdalskfjaf'), q[Not found non-existant binary] );
  }
  
@@ -989,7 +178,7 @@ diff -up perl-5.10.0/lib/IPC/Cmd/t/01_IPC-Cmd.t.ddd perl-5.10.0/lib/IPC/Cmd/t/01
  
                  SKIP: {
                      skip "No buffers available", 6 
-@@ -97,188 +143,81 @@ my @Prefs = ( 
+@@ -97,188 +143,81 @@
                      isa_ok( $list[$_], 'ARRAY' ) for 2..4;
  
                      like( "@{$list[2]}", $regex,
@@ -1225,233 +414,9 @@ diff -up perl-5.10.0/lib/IPC/Cmd/t/01_IPC-Cmd.t.ddd perl-5.10.0/lib/IPC/Cmd/t/01
 +    
  
  
-diff -up perl-5.10.0/lib/IPC/Cmd/t/02_Interactive.t.ddd perl-5.10.0/lib/IPC/Cmd/t/02_Interactive.t
---- perl-5.10.0/lib/IPC/Cmd/t/02_Interactive.t.ddd	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/IPC/Cmd/t/02_Interactive.t	2007-10-16 11:01:27.000000000 +0200
-@@ -1,110 +1,110 @@
--BEGIN { chdir 't' if -d 't' };
--BEGIN { use lib '../lib' };
--
--use strict;
--use File::Spec;
--
--### only run interactive tests when there's someone that can answer them
--use Test::More -t STDOUT
--                    ? 'no_plan' 
--                    : ( skip_all => "No interactive tests from harness" );
--
--my $Class   = 'IPC::Cmd';
--my $Child   = File::Spec->catfile( qw[src child.pl] );
--my @FDs     = 0..20;
--my $IsWin32 = $^O eq 'MSWin32';
--
--use_ok( $Class, 'run' );
--$IPC::Cmd::DEBUG = 1;
--
--my $Have_IPC_Run    = $Class->can_use_ipc_run;
--my $Have_IPC_Open3  = $Class->can_use_ipc_open3;
--
--### configurations to test IPC::Cmd with
--my @Conf = ( 
--    [ $Have_IPC_Run, $Have_IPC_Open3 ], 
--    [ 0,             $Have_IPC_Open3 ], 
--    [ 0,             0 ] 
--);
--
--
--
--
--### first, check which FD's are open. they should be open
--### /after/ we run our tests as well.
--### 0, 1 and 2 should be open, as they are STDOUT, STDERR and STDIN
--### XXX 2 are opened by Test::Builder at least.. this is 'whitebox'
--### knowledge, so unsafe to test against. around line 1322:
--# sub _open_testhandles {
--#     return if $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;
--# }
--
--my @Opened;
--{   for ( @FDs ) {
--        my $fh;
--        my $rv = open $fh, "<&$_";
--        push @Opened, $_ if $rv;
--    }
--    diag( "Opened FDs: @Opened" );
--    cmp_ok( scalar(@Opened), '>=', 3,
--                                "At least 3 FDs are opened" );
--}
--
--for my $aref ( @Conf ) {
--
--    ### stupid warnings
--    local $IPC::Cmd::USE_IPC_RUN    = $aref->[0];
--    local $IPC::Cmd::USE_IPC_RUN    = $aref->[0];
--
--    local $IPC::Cmd::USE_IPC_OPEN3  = $aref->[1];
--    local $IPC::Cmd::USE_IPC_OPEN3  = $aref->[1];
--
--    diag("Config: IPC::Run = $aref->[0] IPC::Open3 = $aref->[1]");
--    ok( -t STDIN,               "STDIN attached to a tty" );
--    
--    for my $cmd ( qq[$^X $Child], qq[$^X $Child | $^X -neprint] ) {
--    
--        diag("Please enter some input. It will be echo'd back to you");
--        my $buffer;
--        my $ok = run( command => $cmd, verbose => 1, buffer => \$buffer );
--    
--        ok( $ok,                    "   Command '$cmd' ran succesfully" );
--    
--        SKIP: {
--            skip "No buffers available", 1 unless $Class->can_capture_buffer;
--            ok( defined $buffer,    "   Input captured" );
--        }
--    }
--}
--
--### check we didnt leak any FHs
--{   ### should be opened
--    my %open = map { $_ => 1 } @Opened;
--    
--    for ( @FDs ) {
--        my $fh;
--        my $rv = open $fh, "<&=$_";
--     
--        ### these should be open 
--        if( $open{$_} ) {
--            ok( $rv,                "FD $_ opened" );
--            ok( $fh,                "   FH indeed opened" );
--            is( fileno($fh), $_,    "   Opened at the correct fileno($_)" );
--        } else {
--            ok( !$rv,               "FD $_ not opened" );
--            ok( !(fileno($fh)),     "   FH indeed closed" );
--
--            ### extra debug info if tests fail
--#             use Devel::Peek;
--#             use Data::Dumper;
--#             diag( "RV=$rv FH=$fh Fileno=". fileno($fh). Dump($fh) ) if $rv;
--#             diag( Dumper( [stat $fh] ) )                            if $rv;
--
--        }
--    }
--}
-+BEGIN { chdir 't' if -d 't'; };
-+BEGIN { use lib '../lib'; };
-+
-+use strict;
-+use File::Spec;
-+
-+### only run interactive tests when there's someone that can answer them
-+use Test::More -t STDOUT
-+                    ? 'no_plan' 
-+                    : ( skip_all => "No interactive tests from harness" );
-+
-+my $Class   = 'IPC::Cmd';
-+my $Child   = File::Spec->catfile( qw[src child.pl] );
-+my @FDs     = 0..20;
-+my $IsWin32 = $^O eq 'MSWin32';
-+
-+use_ok( $Class, 'run' );
-+$IPC::Cmd::DEBUG = 1;
-+
-+my $Have_IPC_Run    = $Class->can_use_ipc_run;
-+my $Have_IPC_Open3  = $Class->can_use_ipc_open3;
-+
-+### configurations to test IPC::Cmd with
-+my @Conf = ( 
-+    [ $Have_IPC_Run, $Have_IPC_Open3 ], 
-+    [ 0,             $Have_IPC_Open3 ], 
-+    [ 0,             0 ] 
-+);
-+
-+
-+
-+
-+### first, check which FD's are open. they should be open
-+### /after/ we run our tests as well.
-+### 0, 1 and 2 should be open, as they are STDOUT, STDERR and STDIN
-+### XXX 2 are opened by Test::Builder at least.. this is 'whitebox'
-+### knowledge, so unsafe to test against. around line 1322:
-+# sub _open_testhandles {
-+#     return if $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;
-+# }
-+
-+my @Opened;
-+{   for ( @FDs ) {
-+        my $fh;
-+        my $rv = open $fh, "<&$_";
-+        push @Opened, $_ if $rv;
-+    }
-+    diag( "Opened FDs: @Opened" );
-+    cmp_ok( scalar(@Opened), '>=', 3,
-+                                "At least 3 FDs are opened" );
-+}
-+
-+for my $aref ( @Conf ) {
-+
-+    ### stupid warnings
-+    local $IPC::Cmd::USE_IPC_RUN    = $aref->[0];
-+    local $IPC::Cmd::USE_IPC_RUN    = $aref->[0];
-+
-+    local $IPC::Cmd::USE_IPC_OPEN3  = $aref->[1];
-+    local $IPC::Cmd::USE_IPC_OPEN3  = $aref->[1];
-+
-+    diag("Config: IPC::Run = $aref->[0] IPC::Open3 = $aref->[1]");
-+    ok( -t STDIN,               "STDIN attached to a tty" );
-+    
-+    for my $cmd ( qq[$^X $Child], qq[$^X $Child | $^X -neprint] ) {
-+    
-+        diag("Please enter some input. It will be echo'd back to you");
-+        my $buffer;
-+        my $ok = run( command => $cmd, verbose => 1, buffer => \$buffer );
-+    
-+        ok( $ok,                    "   Command '$cmd' ran succesfully" );
-+    
-+        SKIP: {
-+            skip "No buffers available", 1 unless $Class->can_capture_buffer;
-+            ok( defined $buffer,    "   Input captured" );
-+        }
-+    }
-+}
-+
-+### check we didnt leak any FHs
-+{   ### should be opened
-+    my %open = map { $_ => 1 } @Opened;
-+    
-+    for ( @FDs ) {
-+        my $fh;
-+        my $rv = open $fh, "<&=$_";
-+     
-+        ### these should be open 
-+        if( $open{$_} ) {
-+            ok( $rv,                "FD $_ opened" );
-+            ok( $fh,                "   FH indeed opened" );
-+            is( fileno($fh), $_,    "   Opened at the correct fileno($_)" );
-+        } else {
-+            ok( !$rv,               "FD $_ not opened" );
-+            ok( !(fileno($fh)),     "   FH indeed closed" );
-+
-+            ### extra debug info if tests fail
-+#             use Devel::Peek;
-+#             use Data::Dumper;
-+#             diag( "RV=$rv FH=$fh Fileno=". fileno($fh). Dump($fh) ) if $rv;
-+#             diag( Dumper( [stat $fh] ) )                            if $rv;
-+
-+        }
-+    }
-+}
-diff -urN perl-5.10.0/lib/IPC/Cmd/t/src.bbb/output.pl perl-5.10.0/lib/IPC/Cmd/t/src/output.pl
---- perl-5.10.0/lib/IPC/Cmd/t/src.bbb/output.pl	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/IPC/Cmd/t/src/output.pl	2008-07-14 15:33:46.000000000 +0200
+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;
@@ -1466,4 +431,838 @@ diff -urN perl-5.10.0/lib/IPC/Cmd/t/src.bbb/output.pl perl-5.10.0/lib/IPC/Cmd/t/
 +        ? print STDOUT $_
 +        : print STDERR $_;
 +}
-Binary files perl-5.10.0/lib/IPC/Cmd/t/src.bbb/x.tgz and perl-5.10.0/lib/IPC/Cmd/t/src/x.tgz differ
+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-Build.patch b/perl-update-Module-Build.patch
new file mode 100644
index 0000000..db6fce0
--- /dev/null
+++ b/perl-update-Module-Build.patch
@@ -0,0 +1,5715 @@
+Module-Build-0.32
+perl-5.10.0 contained some fixes in the Module::Build testsuite; all
+these have been integrated to Module-Build-0.31012
+
+--- perl-5.10.0.orig/MANIFEST	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/MANIFEST	2009-03-10 17:07:04.000000000 +0100
+@@ -2156,8 +2156,10 @@
+ lib/Module/Build/PodParser.pm	Module::Build
+ lib/Module/Build/PPMMaker.pm	Module::Build
+ lib/Module/Build/scripts/config_data	Module::Build
++lib/Module/Build/t/add_property.t	Module::Build
+ lib/Module/Build/t/basic.t	Module::Build
+ lib/Module/Build/t/bundled/Tie/CPHash.pm	Module::Build.pm
++lib/Module/Build/t/compat/exit.t	Module::Build
+ lib/Module/Build/t/compat.t	Module::Build
+ lib/Module/Build/t/destinations.t	Module::Build
+ lib/Module/Build/t/extend.t	Module::Build
+@@ -2178,9 +2180,12 @@
+ lib/Module/Build/t/pod_parser.t	Module::Build
+ lib/Module/Build/t/ppm.t	Module::Build
+ lib/Module/Build/t/runthrough.t	Module::Build
++lib/Module/Build/t/script_dist.t	Module::Build
++lib/Module/Build/t/test_file_exts.t	Module::Build
+ lib/Module/Build/t/test_types.t	Module::Build
+ lib/Module/Build/t/test_type.t	Module::Build
+ lib/Module/Build/t/tilde.t	Module::Build
++lib/Module/Build/t/use_tap_harness.t	Module::Build
+ lib/Module/Build/t/versions.t	Module::Build
+ lib/Module/Build/t/xs.t		Module::Build
+ lib/Module/Build/Version.pm	Module::Build
+diff -urN perl-5.10.0.orig/lib/Module/Build/API.pod perl-5.10.0/lib/Module/Build/API.pod
+--- perl-5.10.0.orig/lib/Module/Build/API.pod	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/API.pod	2009-03-10 16:49:12.000000000 +0100
+@@ -211,12 +211,12 @@
+ 
+ [version 0.20]
+ 
+-This should be a short description of the distribution.  This is used
+-when generating metadata for F<META.yml> and PPD files.  If it is not
+-given then C<Module::Build> looks in the POD of the module from which
+-it gets the distribution's version.  It looks for the first line
+-matching C<$package\s-\s(.+)>, and uses the captured text as the
+-abstract.
++This should be a short description of the distribution.  This is used when
++generating metadata for F<META.yml> and PPD files.  If it is not given
++then C<Module::Build> looks in the POD of the module from which it gets
++the distribution's version.  If it finds a POD section marked "=head1
++NAME", then it looks for the first line matching C<\s+-\s+(.+)>,
++and uses the captured text as the abstract.
+ 
+ =item dist_author
+ 
+@@ -268,6 +268,10 @@
+ this process, so there's no real opportunity to change to something
+ better.
+ 
++If the target file of L</dist_version_from> contains more than one package
++declaration, the version returned will be the one matching the configured
++L</module_name>.
++
+ =item dynamic_config
+ 
+ [version 0.07]
+@@ -502,16 +506,16 @@
+ sync with your written documentation if you ever change your licensing
+ terms.
+ 
++You may also use a license type of C<unknown> if you don't wish to
++specify your terms in the metadata.
++
+ It is a fatal error to use a license other than the ones mentioned
+ above.  This is not because I wish to impose licensing terms on you -
+ please let me know if you would like another license option to be
+-added to the list.  You may also use a license type of C<unknown> if
+-you don't wish to specify your terms (but this is usually not a good
+-idea for you to do!).
+-
+-I just started out with a small set of licenses to keep things simple,
+-figuring I'd let people with actual working knowledge in this area
+-tell me what to do.  So if that's you, drop me a line.
++added to the list.  I just started out with a small set of licenses to
++keep things simple, figuring I'd let people with actual working
++knowledge in this area tell me what to do.  So if that's you, drop me
++a line.
+ 
+ =item meta_add
+ 
+@@ -683,13 +687,13 @@
+ 
+ An optional parameter specifying a set of files that should be
+ installed as executable Perl scripts when the module is installed.
+-May be given as an array reference of the files, or as a hash
+-reference whose keys are the files (and whose values will currently be
+-ignored).
++May be given as an array reference of the files, as a hash reference
++whose keys are the files (and whose values will currently be ignored),
++as a string giving the name of a directory in which to find scripts,
++or as a string giving the name of a single script file.
+ 
+-The default is to install no script files - in other words, there is
+-no default location where Module::Build will look for script files to
+-install.
++The default is to install any scripts found in a F<bin> directory at
++the top level of the distribution.
+ 
+ For backward compatibility, you may use the parameter C<scripts>
+ instead of C<script_files>.  Please consider this usage deprecated,
+@@ -725,6 +729,26 @@
+ property is true, then the C<t/> directory will be scanned recursively
+ for C<*.t> files.
+ 
++=item use_tap_harness
++
++[version 0.2808_03]
++
++An optional parameter indicating whether or not to use TAP::Harness for
++testing rather than Test::Harness. Defaults to false. If set to true, you must
++therefore be sure to add TAP::Harness as a requirement for your module in
++L</build_requires>. Implicitly set to a true value if C<tap_harness_args> is
++specified.
++
++=item tap_harness_args
++
++[version 0.2808_03]
++
++An optional parameter specifying parameters to be passed to TAP::Harness when
++running tests. Must be given as a hash reference of parameters; see the
++L<TAP::Harness|TAP::Harness> documentation for details. Note that specifying
++this parameter will implicitly set C<use_tap_harness> to a true value. You
++must therefore be sure to add TAP::Harness as a requirement for your module in
++L</build_requires>.
+ 
+ =item xs_files
+ 
+@@ -771,6 +795,86 @@
+ defaults to C<MyModuleBuilder>.  The C<code> parameter specifies Perl
+ code to use as the body of the subclass.
+ 
++=item add_property
++
++[version 0.31]
++
++  package 'My::Build';
++  use base 'Module::Build';
++  __PACKAGE__->add_property( 'pedantic' );
++  __PACKAGE__->add_property( answer => 42 );
++  __PACKAGE__->add_property(
++     'epoch',
++      default => sub { time },
++      check   => sub {
++          return 1 if /^\d+$/;
++          shift->property_error( "'$_' is not an epoch time" );
++          return 0;
++      },
++  );
++
++Adds a property to a Module::Build class. Properties are those attributes of a
++Module::Build object which can be passed to the constructor and which have
++accessors to get and set them. All of the core properties, such as
++C<module_name> and C<license>, are defined using this class method.
++
++The first argument to C<add_property()> is always the name of the property.
++The second argument can be either a default value for the property, or a list
++of key/value pairs. The supported keys are:
++
++=over
++
++=item C<default>
++
++The default value. May optionally be specified as a code reference, in which
++case the return value from the execution of the code reference will be used.
++If you need the default to be a code reference, just use a code reference to
++return it, e.g.:
++
++      default => sub { sub { ... } },
++
++=item C<check>
++
++A code reference that checks that a value specified for the property is valid.
++During the execution of the code reference, the new value will be included in
++the C<$_> variable. If the value is correct, the C<check> code reference
++should return true. If the value is not correct, it sends an error message to
++C<property_error()> and returns false.
++
++=back
++
++When this method is called, a new property will be installed in the
++Module::Build class, and an accessor will be built to allow the property to be
++get or set on the build object.
++
++  print $build->pedantic, $/;
++  $build->pedantic(0);
++
++If the default value is a hash reference, this generetes a special-case
++accessor method, wherein individual key/value pairs may be set or fetched:
++
++  print "stuff{foo} is: ", $build->stuff( 'foo' ), $/;
++  $build->stuff( foo => 'bar' );
++  print $build->stuff( 'foo' ), $/; # Outputs "bar"
++
++Of course, you can still set the entire hash reference at once, as well:
++
++  $build->stuff( { foo => 'bar', baz => 'yo' } );
++
++In either case, if a C<check> has been specified for the property, it will be
++applied to the entire hash. So the check code reference should look something
++like:
++
++      check => sub {
++            return 1 if defined $_ && exists $_->{foo};
++            shift->property_error(qq{Property "stuff" needs "foo"});
++            return 0;
++      },
++
++=item property_error
++
++[version 0.31]
++
+ =back
+ 
+ 
+@@ -855,6 +959,14 @@
+ Returns a hash reference indicating the C<build_requires>
+ prerequisites that were passed to the C<new()> method.
+ 
++=item cbuilder()
++
++[version 0.2809]
++
++Returns the internal ExtUtils::CBuilder object that can be used for
++compiling & linking C code.  If no such object is available (e.g. if
++the system has no compiler installed) an exception will be thrown.
++
+ =item check_installed_status($module, $version)
+ 
+ [version 0.11]
+@@ -1166,6 +1278,19 @@
+ Module::Build's main support for configuration of installed modules.
+ See also L<Module::Build::Authoring/"SAVING CONFIGURATION INFORMATION">.
+ 
++=item fix_shebang_line(@files)
++
++[version 0.??]
++
++Modify any "shebang" line in the specified files to use the path to the
++perl executable being used for the current build.  Files are modified
++in-place.  The existing shebang line must have a command that contains
++"C<perl>"; arguments to the command do not count.  In particular, this
++means that the use of C<#!/usr/bin/env perl> will not be changed.
++
++For an explanation of shebang lines, see
++L<http://en.wikipedia.org/wiki/Shebang_%28Unix%29>.
++
+ =item have_c_compiler()
+ 
+ [version 0.21]
+@@ -1423,6 +1548,18 @@
+     }
+   }
+ 
++=item prereq_data()
++
++[version 0.32]
++
++Returns a reference to a hash describing all prerequisites.  The keys of the
++hash will the various prerequisite types ('requires', 'build_requires',
++'configure_requires', 'recommends', or 'conflicts') and the values will
++references to hashes of module names and version numbers.  Only prerequisites
++types that are defined will be included.  The C<prereq_data> action is just a
++thin wrapper around the C<prereq_data()> method and dumps the hash as a string
++that can be loaded using C<eval()>.
++
+ =item prereq_report()
+ 
+ [version 0.28]
+@@ -1606,6 +1743,8 @@
+ 
+ =item conflicts()
+ 
++=item create_license()
++
+ =item create_makefile_pl()
+ 
+ =item create_packlist()
+@@ -1660,6 +1799,8 @@
+ 
+ =item prereq_action_types()
+ 
++=item program_name()
++
+ =item quiet()
+ 
+ =item recommends()
+@@ -1672,8 +1813,16 @@
+ 
+ =item scripts()
+ 
++=item sign()
++
++=item tap_harness_args()
++
++=item test_file_exts()
++
+ =item use_rcfile()
+ 
++=item use_tap_harness()
++
+ =item verbose()
+ 
+ =item xs_files()
+diff -urN perl-5.10.0.orig/lib/Module/Build/Base.pm perl-5.10.0/lib/Module/Build/Base.pm
+--- perl-5.10.0.orig/lib/Module/Build/Base.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Base.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -1,12 +1,15 @@
++# -*- mode: cperl; tab-width: 8; indent-tabs-mode: nil; basic-offset: 2 -*-
++# vim:ts=8:sw=2:et:sta:sts=2
+ package Module::Build::Base;
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ BEGIN { require 5.00503 }
+ 
+ use Carp;
++use Cwd ();
+ use File::Copy ();
+ use File::Find ();
+ use File::Path ();
+@@ -82,6 +85,8 @@
+   }
+   
+   $self->{invoked_action} = $self->{action} ||= 'build';
++
++  $self->_set_install_paths;
+   
+   return $self;
+ }
+@@ -172,8 +177,14 @@
+ 
+ ################## End constructors #########################
+ 
+-sub log_info { print @_ unless shift()->quiet }
+-sub log_verbose { shift()->log_info(@_) if $_[0]->verbose }
++sub log_info {
++  my $self = shift;
++  print @_ unless(ref($self) and $self->quiet);
++}
++sub log_verbose {
++  my $self = shift;
++  $self->log_info(@_) if(ref($self) and $self->verbose);
++}
+ sub log_warn {
+   # Try to make our call stack invisible
+   shift;
+@@ -319,7 +330,6 @@
+ }
+ 
+ sub cwd {
+-  require Cwd;
+   return Cwd::cwd();
+ }
+ 
+@@ -328,18 +338,17 @@
+   # proper quoting so that the subprocess sees this same list of args.
+   my ($self, @args) = @_;
+ 
+-  my $return_args = '';
+   my @quoted;
+ 
+   for (@args) {
+-    if ( /^[^\s*?!$<>;\\|'"\[\]\{\}]+$/ ) {
++    if ( /^[^\s*?!\$<>;\\|'"\[\]\{\}]+$/ ) {
+       # Looks pretty safe
+       push @quoted, $_;
+     } else {
+       # XXX this will obviously have to improve - is there already a
+       # core module lying around that does proper quoting?
+-      s/"/"'"'"/g;
+-      push @quoted, qq("$_");
++      s/('+)/'"$1"'/g;
++      push @quoted, qq('$_');
+     }
+   }
+ 
+@@ -363,6 +372,8 @@
+   }
+ }
+ 
++# Tells us whether the construct open($fh, '-|', @command) is
++# supported.  It would probably be better to dynamically sense this.
+ sub have_forkpipe { 1 }
+ 
+ # Determine whether a given binary is the same as the perl
+@@ -435,7 +446,7 @@
+ 
+     # CBuilder is also in the core, so it should be available here
+     require ExtUtils::CBuilder;
+-    my $perl_src = ExtUtils::CBuilder->perl_src;
++    my $perl_src = Cwd::realpath( ExtUtils::CBuilder->perl_src );
+     if ( defined($perl_src) && length($perl_src) ) {
+       my $uninstperl =
+         File::Spec->rel2abs(File::Spec->catfile( $perl_src, $perl_basename ));
+@@ -639,123 +650,172 @@
+       );
+ }
+ 
+-{
+-    my %valid_properties = ( __PACKAGE__,  {} );
+-    my %additive_properties;
++########################################################################
++{ # enclosing these lexicals -- TODO 
++  my %valid_properties = ( __PACKAGE__,  {} );
++  my %additive_properties;
+ 
+-    sub _mb_classes {
+-      my $class = ref($_[0]) || $_[0];
+-      return ($class, $class->mb_parents);
+-    }
++  sub _mb_classes {
++    my $class = ref($_[0]) || $_[0];
++    return ($class, $class->mb_parents);
++  }
+ 
+-    sub valid_property {
+-      my ($class, $prop) = @_;
+-      return grep exists( $valid_properties{$_}{$prop} ), $class->_mb_classes;
++  sub valid_property {
++    my ($class, $prop) = @_;
++    return grep exists( $valid_properties{$_}{$prop} ), $class->_mb_classes;
++  }
++
++  sub valid_properties {
++    return keys %{ shift->valid_properties_defaults() };
++  }
++
++  sub valid_properties_defaults {
++    my %out;
++    for (reverse shift->_mb_classes) {
++      @out{ keys %{ $valid_properties{$_} } } = map {
++        $_->()
++      } values %{ $valid_properties{$_} };
+     }
++    return \%out;
++  }
+ 
+-    sub valid_properties {
+-      return keys %{ shift->valid_properties_defaults() };
++  sub array_properties {
++    for (shift->_mb_classes) {
++      return @{$additive_properties{$_}->{ARRAY}}
++        if exists $additive_properties{$_}->{ARRAY};
+     }
++  }
+ 
+-    sub valid_properties_defaults {
+-      my %out;
+-      for (reverse shift->_mb_classes) {
+-	@out{ keys %{ $valid_properties{$_} } } = values %{ $valid_properties{$_} };
+-      }
+-      return \%out;
++  sub hash_properties {
++    for (shift->_mb_classes) {
++      return @{$additive_properties{$_}->{'HASH'}}
++        if exists $additive_properties{$_}->{'HASH'};
+     }
++  }
+ 
+-    sub array_properties {
+-      for (shift->_mb_classes) {
+-        return @{$additive_properties{$_}->{ARRAY}}
+-	  if exists $additive_properties{$_}->{ARRAY};
+-      }
++  sub add_property {
++    my ($class, $property) = (shift, shift);
++    die "Property '$property' already exists"
++      if $class->valid_property($property);
++    my %p = @_ == 1 ? ( default => shift ) : @_;
++
++    my $type = ref $p{default};
++    $valid_properties{$class}{$property} = $type eq 'CODE'
++      ? $p{default}
++      : sub { $p{default} };
++
++    push @{$additive_properties{$class}->{$type}}, $property
++      if $type;
++
++    unless ($class->can($property)) {
++      # TODO probably should put these in a util package
++      my $sub = $type eq 'HASH'
++        ? _make_hash_accessor($property, \%p)
++        : _make_accessor($property, \%p);
++      no strict 'refs';
++      *{"$class\::$property"} = $sub;
+     }
+ 
+-    sub hash_properties {
+-      for (shift->_mb_classes) {
+-        return @{$additive_properties{$_}->{'HASH'}}
+-	  if exists $additive_properties{$_}->{'HASH'};
+-      }
++    return $class;
++  }
++
++    sub property_error {
++      my $self = shift;
++      die 'ERROR: ', @_;
+     }
+ 
+-    sub add_property {
+-      my ($class, $property, $default) = @_;
+-      die "Property '$property' already exists" if $class->valid_property($property);
+-
+-      $valid_properties{$class}{$property} = $default;
+-
+-      my $type = ref $default;
+-      if ($type) {
+-	push @{$additive_properties{$class}->{$type}}, $property;
+-      }
++  sub _set_defaults {
++    my $self = shift;
+ 
+-      unless ($class->can($property)) {
+-        no strict 'refs';
+-	if ( $type eq 'HASH' ) {
+-          *{"$class\::$property"} = sub {
+-	    my $self = shift;
+-	    my $x = $self->{properties};
+-	    return $x->{$property} unless @_;
+-
+-	    if ( defined($_[0]) && !ref($_[0]) ) {
+-	      if ( @_ == 1 ) {
+-		return exists( $x->{$property}{$_[0]} ) ?
+-		         $x->{$property}{$_[0]} : undef;
+-              } elsif ( @_ % 2 == 0 ) {
+-	        my %args = @_;
+-	        while ( my($k, $v) = each %args ) {
+-	          $x->{$property}{$k} = $v;
+-	        }
+-	      } else {
+-		die "Unexpected arguments for property '$property'\n";
+-	      }
+-	    } else {
+-	      $x->{$property} = $_[0];
+-	    }
+-	  };
+-
+-        } else {
+-          *{"$class\::$property"} = sub {
+-	    my $self = shift;
+-	    $self->{properties}{$property} = shift if @_;
+-	    return $self->{properties}{$property};
+-	  }
+-        }
++    # Set the build class.
++    $self->{properties}{build_class} ||= ref $self;
+ 
+-      }
+-      return $class;
++    # If there was no orig_dir, set to the same as base_dir
++    $self->{properties}{orig_dir} ||= $self->{properties}{base_dir};
++
++    my $defaults = $self->valid_properties_defaults;
++
++    foreach my $prop (keys %$defaults) {
++      $self->{properties}{$prop} = $defaults->{$prop}
++        unless exists $self->{properties}{$prop};
+     }
+ 
+-    sub _set_defaults {
+-      my $self = shift;
++    # Copy defaults for arrays any arrays.
++    for my $prop ($self->array_properties) {
++      $self->{properties}{$prop} = [@{$defaults->{$prop}}]
++        unless exists $self->{properties}{$prop};
++    }
++    # Copy defaults for arrays any hashes.
++    for my $prop ($self->hash_properties) {
++      $self->{properties}{$prop} = {%{$defaults->{$prop}}}
++        unless exists $self->{properties}{$prop};
++    }
++  }
+ 
+-      # Set the build class.
+-      $self->{properties}{build_class} ||= ref $self;
++} # end closure
++########################################################################
++sub _make_hash_accessor {
++  my ($property, $p) = @_;
++  my $check = $p->{check} || sub { 1 };
+ 
+-      # If there was no orig_dir, set to the same as base_dir
+-      $self->{properties}{orig_dir} ||= $self->{properties}{base_dir};
++  return sub {
++    my $self = shift;
+ 
+-      my $defaults = $self->valid_properties_defaults;
+-      
+-      foreach my $prop (keys %$defaults) {
+-	$self->{properties}{$prop} = $defaults->{$prop}
+-	  unless exists $self->{properties}{$prop};
+-      }
+-      
+-      # Copy defaults for arrays any arrays.
+-      for my $prop ($self->array_properties) {
+-	$self->{properties}{$prop} = [@{$defaults->{$prop}}]
+-	  unless exists $self->{properties}{$prop};
+-      }
+-      # Copy defaults for arrays any hashes.
+-      for my $prop ($self->hash_properties) {
+-	$self->{properties}{$prop} = {%{$defaults->{$prop}}}
+-	  unless exists $self->{properties}{$prop};
++    # This is only here to deprecate the historic accident of calling
++    # properties as class methods - I suspect it only happens in our
++    # test suite.
++    unless(ref($self)) {
++      carp("\n$property not a class method (@_)");
++      return;
++    }
++
++    my $x = $self->{properties};
++    return $x->{$property} unless @_;
++
++    my $prop = $x->{$property};
++    if ( defined $_[0] && !ref $_[0] ) {
++      if ( @_ == 1 ) {
++        return exists $prop->{$_[0]} ? $prop->{$_[0]} : undef;
++      } elsif ( @_ % 2 == 0 ) {
++        my %new = (%{ $prop }, @_);
++        local $_ = \%new;
++        $x->{$property} = \%new if $check->($self);
++        return $x->{$property};
++      } else {
++        die "Unexpected arguments for property '$property'\n";
+       }
++    } else {
++      die "Unexpected arguments for property '$property'\n"
++          if defined $_[0] && ref $_[0] ne 'HASH';
++      local $_ = $_[0];
++      $x->{$property} = shift if $check->($self);
+     }
++  };
++}
++########################################################################
++sub _make_accessor {
++  my ($property, $p) = @_;
++  my $check = $p->{check} || sub { 1 };
+ 
++  return sub {
++    my $self = shift;
++
++    # This is only here to deprecate the historic accident of calling
++    # properties as class methods - I suspect it only happens in our
++    # test suite.
++    unless(ref($self)) {
++      carp("\n$property not a class method (@_)");
++      return;
++    }
++
++    my $x = $self->{properties};
++    return $x->{$property} unless @_;
++    local $_ = $_[0];
++    $x->{$property} = shift if $check->($self);
++    return $x->{$property};
++  };
+ }
++########################################################################
+ 
+ # Add the default properties.
+ __PACKAGE__->add_property(blib => 'blib');
+@@ -765,13 +825,29 @@
+ __PACKAGE__->add_property(build_bat => 0);
+ __PACKAGE__->add_property(config_dir => '_build');
+ __PACKAGE__->add_property(include_dirs => []);
+-__PACKAGE__->add_property(installdirs => 'site');
+ __PACKAGE__->add_property(metafile => 'META.yml');
+ __PACKAGE__->add_property(recurse_into => []);
+ __PACKAGE__->add_property(use_rcfile => 1);
+ __PACKAGE__->add_property(create_packlist => 1);
+ __PACKAGE__->add_property(allow_mb_mismatch => 0);
+ __PACKAGE__->add_property(config => undef);
++__PACKAGE__->add_property(test_file_exts => ['.t']);
++__PACKAGE__->add_property(use_tap_harness => 0);
++__PACKAGE__->add_property(tap_harness_args => {});
++__PACKAGE__->add_property(
++  'installdirs',
++  default => 'site',
++  check   => sub {
++    return 1 if /^(core|site|vendor)$/;
++    return shift->property_error(
++      $_ eq 'perl'
++      ? 'Perhaps you meant installdirs to be "core" rather than "perl"?'
++      : 'installdirs must be one of "core", "site", or "vendor"'
++    );
++    return shift->property_error("Perhaps you meant 'core'?") if $_ eq 'perl';
++    return 0;
++  },
++);
+ 
+ {
+   my $Is_ActivePerl = eval {require ActivePerl::DocTools};
+@@ -804,6 +880,7 @@
+   base_dir
+   bindoc_dirs
+   c_source
++  create_license
+   create_makefile_pl
+   create_readme
+   debugger
+@@ -828,10 +905,12 @@
+   pod_files
+   pollute
+   prefix
++  program_name
+   quiet
+   recursive_test_files
+   script_files
+   scripts
++  sign
+   test_files
+   verbose
+   xs_files
+@@ -1072,10 +1151,19 @@
+ 
+   $self->log_info("Checking features:\n");
+ 
+-  my $max_name_len;
+-  $max_name_len = ( length($_) > $max_name_len ) ?
+-                    length($_) : $max_name_len
+-    for keys %$features;
++  # TODO refactor into ::Util
++  my $longest = sub {
++    my @str = @_ or croak("no strings given");
++
++    my @len = map({length($_)} @str);
++    my $max = 0;
++    my $longest;
++    for my $i (0..$#len) {
++      ($max, $longest) = ($len[$i], $str[$i]) if($len[$i] > $max);
++    }
++    return($longest);
++  };
++  my $max_name_len = length($longest->(keys %$features));
+ 
+   while (my ($name, $info) = each %$features) {
+     $self->log_info("  $name" . '.' x ($max_name_len - length($name) + 4));
+@@ -1100,7 +1188,7 @@
+     }
+   }
+ 
+-  $self->log_warn("\n");
++  $self->log_warn("\n") unless $self->quiet;
+ }
+ 
+ sub prereq_failures {
+@@ -1285,7 +1373,7 @@
+   my $status = $self->check_installed_status($modname, $spec);
+   
+   if ($status->{ok}) {
+-    return $status->{have} if $status->{have} and $status->{have} ne '<none>';
++    return $status->{have} if $status->{have} and "$status->{have}" ne '<none>';
+     return '0 but true';
+   }
+   
+@@ -1501,9 +1589,17 @@
+   return $self->$method();
+ }
+ 
++# cuts the user-specified options out of the command-line args
+ sub cull_options {
+     my $self = shift;
+-    my $specs = $self->get_options or return ({}, @_);
++    my (@argv) = @_;
++
++    # XXX is it even valid to call this as a class method?
++    return({}, @argv) unless(ref($self)); # no object
++
++    my $specs = $self->get_options;
++    return({}, @argv) unless($specs and %$specs); # no user options
++
+     require Getopt::Long;
+     # XXX Should we let Getopt::Long handle M::B's options? That would
+     # be easy-ish to add to @specs right here, but wouldn't handle options
+@@ -1522,7 +1618,7 @@
+         $args->{$k} = $v->{default} if exists $v->{default};
+     }
+ 
+-    local @ARGV = @_; # No other way to dupe Getopt::Long
++    local @ARGV = @argv; # No other way to dupe Getopt::Long
+ 
+     # Get the options values and return them.
+     # XXX Add option to allow users to set options?
+@@ -1553,6 +1649,8 @@
+     return $self->{args}{$key};
+ }
+ 
++# allows select parameters (with underscores) to be spoken with dashes
++# when used as command-line options
+ sub _translate_option {
+   my $self = shift;
+   my $opt  = shift;
+@@ -1560,6 +1658,7 @@
+   (my $tr_opt = $opt) =~ tr/-/_/;
+ 
+   return $tr_opt if grep $tr_opt =~ /^(?:no_?)?$_$/, qw(
++    create_license
+     create_makefile_pl
+     create_readme
+     extra_compiler_flags
+@@ -1571,6 +1670,8 @@
+     meta_merge
+     test_files
+     use_rcfile
++    use_tap_harness
++    tap_harness_args
+   ); # normalize only selected option names
+ 
+   return $opt;
+@@ -1589,6 +1690,7 @@
+   }
+ }
+ 
++# decide whether or not an option requires/has an opterand
+ sub _optional_arg {
+   my $self = shift;
+   my $opt  = shift;
+@@ -1598,12 +1700,15 @@
+ 
+   my @bool_opts = qw(
+     build_bat
++    create_license
+     create_readme
+     pollute
+     quiet
+     uninst
+     use_rcfile
+     verbose
++    sign
++    use_tap_harness
+   );
+ 
+   # inverted boolean options; eg --noverbose or --no-verbose
+@@ -1618,7 +1723,7 @@
+ 
+   # we're punting a bit here, if an option appears followed by a digit
+   # we take the digit as the argument for the option. If there is
+-  # nothing that looks like a digit, we pretent the option is a flag
++  # nothing that looks like a digit, we pretend the option is a flag
+   # that is being set and has no argument.
+   my $arg = 1;
+   $arg = shift(@$argv) if @$argv && $argv->[0] =~ /^\d+$/;
+@@ -1628,12 +1733,13 @@
+ 
+ sub read_args {
+   my $self = shift;
+-  my ($action, @argv);
++
+   (my $args, @_) = $self->cull_options(@_);
+   my %args = %$args;
+ 
+   my $opt_re = qr/[\w\-]+/;
+ 
++  my ($action, @argv);
+   while (@_) {
+     local $_ = shift;
+     if ( /^(?:--)?($opt_re)=(.*)$/ ) {
+@@ -1828,9 +1934,9 @@
+     if ($key eq 'config') {
+       $self->config($_ => $val->{$_}) foreach keys %$val;
+     } else {
+-      my $add_to = ( $additive{$key} ? $self->{properties}{$key}
+-		     : $self->valid_property($key) ? $self->{properties}
+-		     : $self->{args});
++      my $add_to = $additive{$key}             ? $self->{properties}{$key} :
++                   $self->valid_property($key) ? $self->{properties}       :
++                   $self->{args}               ;
+ 
+       if ($additive{$key}) {
+ 	$add_to->{$_} = $val->{$_} foreach keys %$val;
+@@ -1948,15 +2054,25 @@
+   $self->log_info( $self->prereq_report );
+ }
+ 
+-sub prereq_report {
++sub ACTION_prereq_data {
++  my $self = shift;
++  $self->log_info( Module::Build::Dumper->_data_dump( $self->prereq_data ) );
++}
++
++sub prereq_data {
+   my $self = shift;
+   my @types = @{ $self->prereq_action_types };
+-  my $info = { map { $_ => $self->$_() } @types };
++  my $info = { map { $_ => $self->$_() } grep { %{$self->$_()} } @types };
++  return $info;
++}
++
++sub prereq_report {
++  my $self = shift;
++  my $info = $self->prereq_data;
+ 
+   my $output = '';
+-  foreach my $type (@types) {
++  foreach my $type (keys %$info) {
+     my $prereqs = $info->{$type};
+-    next unless %$prereqs;
+     $output .= "\n$type:\n";
+     my $mod_len = 2;
+     my $ver_len = 4;
+@@ -2094,7 +2210,7 @@
+   @types or croak "need some types of tests to check";
+ 
+   my %test_types = (
+-    default => '.t',
++    default => $p->{test_file_exts},
+     (defined($p->{test_types}) ? %{$p->{test_types}} : ()),
+   );
+ 
+@@ -2104,7 +2220,7 @@
+   }
+ 
+   # we use local here because it ends up two method calls deep
+-  local $p->{test_file_exts} = [ @test_types{@types} ];
++  local $p->{test_file_exts} = [ map { ref $_ ? @$_ : $_ } @test_types{@types} ];
+   $self->depends_on('code');
+ 
+   # Protect others against our @INC changes
+@@ -2123,40 +2239,77 @@
+ 
+ sub do_tests {
+   my $self = shift;
+-  my $p = $self->{properties};
+-  require Test::Harness;
+-
+-  # Do everything in our power to work with all versions of Test::Harness
+-  my @harness_switches = $p->{debugger} ? qw(-w -d) : ();
+-  local $Test::Harness::switches    = join ' ', grep defined, $Test::Harness::switches, @harness_switches;
+-  local $Test::Harness::Switches    = join ' ', grep defined, $Test::Harness::Switches, @harness_switches;
+-  local $ENV{HARNESS_PERL_SWITCHES} = join ' ', grep defined, $ENV{HARNESS_PERL_SWITCHES}, @harness_switches;
+-  
+-  $Test::Harness::switches = undef   unless length $Test::Harness::switches;
+-  $Test::Harness::Switches = undef   unless length $Test::Harness::Switches;
+-  delete $ENV{HARNESS_PERL_SWITCHES} unless length $ENV{HARNESS_PERL_SWITCHES};
+-  
+-  local ($Test::Harness::verbose,
+-	 $Test::Harness::Verbose,
+-	 $ENV{TEST_VERBOSE},
+-         $ENV{HARNESS_VERBOSE}) = ($p->{verbose} || 0) x 4;
+ 
+   my $tests = $self->find_test_files;
+ 
+-  if (@$tests) {
++  if(@$tests) {
++    my $args = $self->tap_harness_args;
++    if($self->use_tap_harness or ($args and %$args)) {
++      $self->run_tap_harness($tests);
++    }
++    else {
++      $self->run_test_harness($tests);
++    }
++  }
++  else {
++    $self->log_info("No tests defined.\n");
++  }
++
++  $self->run_visual_script;
++}
++
++sub run_tap_harness {
++  my ($self, $tests) = @_;
++
++  require TAP::Harness;
++
++  # TODO allow the test @INC to be set via our API?
++
++  TAP::Harness->new({
++    lib => [@INC],
++    verbosity => $self->{properties}{verbose},
++    switches  => [ $self->harness_switches ],
++    %{ $self->tap_harness_args },
++  })->runtests(@$tests);
++}
++
++sub run_test_harness {
++    my ($self, $tests) = @_;
++    require Test::Harness;
++    my $p = $self->{properties};
++    my @harness_switches = $self->harness_switches;
++
+     # Work around a Test::Harness bug that loses the particular perl
+     # we're running under.  $self->perl is trustworthy, but $^X isn't.
+     local $^X = $self->perl;
++
++    # Do everything in our power to work with all versions of Test::Harness
++    local $Test::Harness::switches    = join ' ', grep defined, $Test::Harness::switches, @harness_switches;
++    local $Test::Harness::Switches    = join ' ', grep defined, $Test::Harness::Switches, @harness_switches;
++    local $ENV{HARNESS_PERL_SWITCHES} = join ' ', grep defined, $ENV{HARNESS_PERL_SWITCHES}, @harness_switches;
++
++    $Test::Harness::switches = undef   unless length $Test::Harness::switches;
++    $Test::Harness::Switches = undef   unless length $Test::Harness::Switches;
++    delete $ENV{HARNESS_PERL_SWITCHES} unless length $ENV{HARNESS_PERL_SWITCHES};
++
++    local ($Test::Harness::verbose,
++           $Test::Harness::Verbose,
++           $ENV{TEST_VERBOSE},
++           $ENV{HARNESS_VERBOSE}) = ($p->{verbose} || 0) x 4;
++
+     Test::Harness::runtests(@$tests);
+-  } else {
+-    $self->log_info("No tests defined.\n");
+-  }
++}
+ 
+-  # This will get run and the user will see the output.  It doesn't
+-  # emit Test::Harness-style output.
+-  if (-e 'visual.pl') {
+-    $self->run_perl_script('visual.pl', '-Mblib='.$self->blib);
+-  }
++sub run_visual_script {
++    my $self = shift;
++    # This will get run and the user will see the output.  It doesn't
++    # emit Test::Harness-style output.
++    $self->run_perl_script('visual.pl', '-Mblib='.$self->blib)
++        if -e 'visual.pl';
++}
++
++sub harness_switches {
++    shift->{properties}{debugger} ? qw(-w -d) : ();
+ }
+ 
+ sub test_files {
+@@ -2170,7 +2323,7 @@
+ 
+ sub expand_test_dir {
+   my ($self, $dir) = @_;
+-  my $exts = $self->{properties}{test_file_exts} || ['.t'];
++  my $exts = $self->{properties}{test_file_exts};
+ 
+   return sort map { @{$self->rscan_dir($dir, qr{^[^.].*\Q$_\E$})} } @$exts
+     if $self->recursive_test_files;
+@@ -2392,7 +2545,6 @@
+ 
+ sub localize_file_path {
+   my ($self, $path) = @_;
+-  $path =~ s/\.\z// if $self->is_vmsish;
+   return File::Spec->catfile( split m{/}, $path );
+ }
+ 
+@@ -2807,6 +2959,14 @@
+ sub ACTION_fakeinstall {
+   my ($self) = @_;
+   require ExtUtils::Install;
++  my $eui_version = ExtUtils::Install->VERSION;
++  if ( $eui_version < 1.32 ) {
++    $self->log_warn(
++      "The 'fakeinstall' action requires Extutils::Install 1.32 or later.\n"
++      . "(You only have version $eui_version)."
++    );
++    return;
++  }
+   $self->depends_on('build');
+   ExtUtils::Install::install($self->install_map, !$self->quiet, 1, $self->{args}{uninst}||0);
+ }
+@@ -2879,7 +3039,7 @@
+ 	File::Spec->abs2rel( File::Spec->rel2abs( $file ),
+ 			     File::Spec->rel2abs( $dir  ) );
+       my $to_file  =
+-	File::Spec->catdir( $ppm, 'blib',
++	File::Spec->catfile( $ppm, 'blib',
+ 			    exists( $types{$type} ) ? $types{$type} : $type,
+ 			    $rel_file );
+       $self->copy_if_modified( from => $file, to => $to_file );
+@@ -3034,12 +3194,37 @@
+ sub do_create_makefile_pl {
+   my $self = shift;
+   require Module::Build::Compat;
+-  $self->delete_filetree('Makefile.PL');
+   $self->log_info("Creating Makefile.PL\n");
+   Module::Build::Compat->create_makefile_pl($self->create_makefile_pl, $self, @_);
+   $self->_add_to_manifest('MANIFEST', 'Makefile.PL');
+ }
+ 
++sub do_create_license {
++  my $self = shift;
++  $self->log_info("Creating LICENSE file");
++
++  my $l = $self->license
++    or die "No license specified";
++
++  my $key = $self->valid_licenses->{$l}
++    or die "'$l' isn't a license key we know about";
++  my $class = "Software::License::$key";
++
++  eval "use $class; 1"
++    or die "Can't load Software::License to create LICENSE file: $@";
++
++  $self->delete_filetree('LICENSE');
++
++  my $author = join " & ", @{ $self->dist_author };
++  my $license = $class->new({holder => $author});
++  my $fh = IO::File->new('> LICENSE')
++    or die "Can't write LICENSE file: $!";
++  print $fh $license->fulltext;
++  close $fh;
++
++  $self->_add_to_manifest('MANIFEST', 'LICENSE');
++}
++
+ sub do_create_readme {
+   my $self = shift;
+   $self->delete_filetree('README');
+@@ -3179,10 +3364,18 @@
+ \bblibdirs$
+ ^MANIFEST\.SKIP$
+ 
++# Avoid VMS specific Makmaker generated files
++\bDescrip.MMS$
++\bDESCRIP.MMS$
++\bdescrip.mms$
++
+ # Avoid Module::Build generated and utility files.
+ \bBuild$
+ \bBuild.bat$
+ \b_build
++\bBuild.COM$
++\bBUILD.COM$
++\bbuild.com$
+ 
+ # Avoid Devel::Cover generated files
+ \bcover_db
+@@ -3278,13 +3471,39 @@
+ 
+ {
+   my %licenses = (
++    perl         => 'Perl_5',
++    apache       => 'Apache_2_0',
++    artistic     => 'Artistic_1_0',
++    artistic_2   => 'Artistic_2_0',
++    lgpl         => 'LGPL_2_1',
++    lgpl2        => 'LGPL_2_1',
++    lgpl3        => 'LGPL_3_0',
++    bsd          => 'BSD',
++    gpl          => 'GPL_1',
++    gpl2         => 'GPL_2',
++    gpl3         => 'GPL_3',
++    mit          => 'MIT',
++    mozilla      => 'Mozilla_1_1',
++    open_source  => undef,
++    unrestricted => undef,
++    restrictive  => undef,
++    unknown      => undef,
++  );
++
++  # TODO - would be nice to not have these here, since they're more
++  # properly stored only in Software::License
++  my %license_urls = (
+     perl         => 'http://dev.perl.org/licenses/',
+     apache       => 'http://apache.org/licenses/LICENSE-2.0',
+     artistic     => 'http://opensource.org/licenses/artistic-license.php',
+     artistic_2   => 'http://opensource.org/licenses/artistic-license-2.0.php',
+     lgpl         => 'http://opensource.org/licenses/lgpl-license.php',
++    lgpl2        => 'http://opensource.org/licenses/lgpl-2.1.php',
++    lgpl3        => 'http://opensource.org/licenses/lgpl-3.0.html',
+     bsd          => 'http://opensource.org/licenses/bsd-license.php',
+     gpl          => 'http://opensource.org/licenses/gpl-license.php',
++    gpl2         => 'http://opensource.org/licenses/gpl-2.0.php',
++    gpl3         => 'http://opensource.org/licenses/gpl-3.0.html',
+     mit          => 'http://opensource.org/licenses/mit-license.php',
+     mozilla      => 'http://opensource.org/licenses/mozilla1.1.php',
+     open_source  => undef,
+@@ -3295,6 +3514,9 @@
+   sub valid_licenses {
+     return \%licenses;
+   }
++  sub _license_url {
++    return $license_urls{$_[1]};
++  }
+ }
+ 
+ sub _hash_merge {
+@@ -3313,6 +3535,7 @@
+ 
+   $self->do_create_makefile_pl if $self->create_makefile_pl;
+   $self->do_create_readme if $self->create_readme;
++  $self->do_create_license if $self->create_license;
+   $self->do_create_metafile;
+ }
+ 
+@@ -3392,9 +3615,19 @@
+   }
+   $node->{version} = '' . $node->{version}; # Stringify version objects
+ 
+-  if (defined( $self->license ) &&
+-      defined( my $url = $self->valid_licenses->{ $self->license } )) {
+-    $node->{resources}{license} = $url;
++  if (defined( my $l = $self->license )) {
++    die "Unknown license string '$l'"
++      unless exists $self->valid_licenses->{ $self->license };
++
++    if (my $key = $self->valid_licenses->{ $self->license }) {
++      my $class = "Software::License::$key";
++      if (eval "use $class; 1") {
++        # S::L requires a 'holder' key
++        $node->{resources}{license} = $class->new({holder=>"nobody"})->url;
++      } else {
++        $node->{resources}{license} = $self->_license_url($key);
++      }
++    }
+   }
+ 
+   if (exists $p->{configure_requires}) {
+@@ -3627,11 +3860,18 @@
+     $self->do_system($self->split_like_shell($self->{args}{gzip}), "$file.tar") if $self->{args}{gzip};
+   } else {
+     require Archive::Tar;
++
+     # Archive::Tar versions >= 1.09 use the following to enable a compatibility
+     # hack so that the resulting archive is compatible with older clients.
+     $Archive::Tar::DO_NOT_USE_PREFIX = 0;
++
+     my $files = $self->rscan_dir($dir);
+-    Archive::Tar->create_archive("$file.tar.gz", 1, @$files);
++    my $tar   = Archive::Tar->new;
++    $tar->add_files(@$files);
++    for my $f ($tar->get_files) {
++      $f->mode($f->mode & ~022); # chmod go-w
++    }
++    $tar->write("$file.tar.gz", 1);
+   }
+ }
+ 
+@@ -3744,8 +3984,6 @@
+     return $self->_prefixify_default( $type, $rprefix );
+   } elsif( !File::Spec->file_name_is_absolute($path) ) {
+     $self->log_verbose("    path is relative, not prefixifying.\n");
+-  } elsif( $sprefix eq $rprefix ) {
+-    $self->log_verbose("  no new prefix.\n");
+   } elsif( $path !~ s{^\Q$sprefix\E\b}{}s ) {
+     $self->log_verbose("    cannot prefixify, falling back to default.\n");
+     return $self->_prefixify_default( $type, $rprefix );
+@@ -3902,16 +4140,20 @@
+   AutoSplit::autosplit($file, $dir);
+ }
+ 
+-sub _cbuilder {
++sub cbuilder {
+   # Returns a CBuilder object
+ 
+   my $self = shift;
+   my $p = $self->{properties};
+   return $p->{_cbuilder} if $p->{_cbuilder};
+-  return unless $self->_mb_feature('C_support');
++  die "Module::Build is not configured with C_support"
++	  unless $self->_mb_feature('C_support');
+ 
+   require ExtUtils::CBuilder;
+-  return $p->{_cbuilder} = ExtUtils::CBuilder->new(config => $self->config);
++  return $p->{_cbuilder} = ExtUtils::CBuilder->new(
++    config => $self->config,
++    ($self->quiet ? (quiet => 1 ) : ()),
++  );
+ }
+ 
+ sub have_c_compiler {
+@@ -3921,7 +4163,7 @@
+   return $p->{have_compiler} if defined $p->{have_compiler};
+   
+   $self->log_verbose("Checking if compiler tools configured... ");
+-  my $b = $self->_cbuilder;
++  my $b = eval { $self->cbuilder };
+   my $have = $b && $b->have_compiler;
+   $self->log_verbose($have ? "ok.\n" : "failed.\n");
+   return $p->{have_compiler} = $have;
+@@ -3929,8 +4171,7 @@
+ 
+ sub compile_c {
+   my ($self, $file, %args) = @_;
+-  my $b = $self->_cbuilder
+-    or die "Module::Build is not configured with C_support";
++  my $b = $self->cbuilder;
+ 
+   my $obj_file = $b->object_file($file);
+   $self->add_to_cleanup($obj_file);
+@@ -3963,9 +4204,7 @@
+   my $module_name = $self->module_name;
+   $module_name  ||= $spec->{module_name};
+ 
+-  my $b = $self->_cbuilder
+-    or die "Module::Build is not configured with C_support";
+-  $b->link(
++  $self->cbuilder->link(
+     module_name => $module_name,
+     objects     => [$spec->{obj_file}, @$objects],
+     lib_file    => $spec->{lib_file},
+@@ -3993,11 +4232,13 @@
+       or die "Can't find ExtUtils::xsubpp in INC (@INC)";
+     
+     my @typemaps;
+-    push @typemaps, Module::Build::ModuleInfo->find_module_by_name('ExtUtils::typemap', \@INC);
+-    my $lib_typemap = Module::Build::ModuleInfo->find_module_by_name('typemap', ['lib']);
+-    if (defined $lib_typemap and -e $lib_typemap) {
+-      push @typemaps, 'typemap';
+-    }
++    push @typemaps, Module::Build::ModuleInfo->find_module_by_name(
++        'ExtUtils::typemap', \@INC
++    );
++    my $lib_typemap = Module::Build::ModuleInfo->find_module_by_name(
++        'typemap', [File::Basename::dirname($file)]
++    );
++    push @typemaps, $lib_typemap if $lib_typemap;
+     @typemaps = map {+'-typemap', $_} @typemaps;
+ 
+     my $cf = $self->{config};
+@@ -4024,6 +4265,26 @@
+   return Text::ParseWords::shellwords($string);
+ }
+ 
++sub oneliner {
++  # Returns a string that the shell can evaluate as a perl command.
++  # This should be avoided whenever possible, since "the shell" really
++  # means zillions of shells on zillions of platforms and it's really
++  # hard to get it right all the time.
++
++  # Some of this code is stolen with permission from ExtUtils::MakeMaker.
++
++  my($self, $cmd, $switches, $args) = @_;
++  $switches = [] unless defined $switches;
++  $args = [] unless defined $args;
++
++  # Strip leading and trailing newlines
++  $cmd =~ s{^\n+}{};
++  $cmd =~ s{\n+$}{};
++
++  my $perl = ref($self) ? $self->perl : $self->find_perl_interpreter;
++  return $self->_quote_args($perl, @$switches, '-e', $cmd, @$args);
++}
++
+ sub run_perl_script {
+   my ($self, $script, $preargs, $postargs) = @_;
+   foreach ($preargs, $postargs) {
+@@ -4155,12 +4416,15 @@
+ 	     );
+   $args{verbose} = !$self->quiet
+     unless exists $args{verbose};
+-  
++
+   my $file = $args{from};
+   unless (defined $file and length $file) {
+     die "No 'from' parameter given to copy_if_modified";
+   }
+-  
++ 
++  # makes no sense to replicate an absolute path, so assume flatten 
++  $args{flatten} = 1 if File::Spec->file_name_is_absolute( $file );
++
+   my $to_path;
+   if (defined $args{to} and length $args{to}) {
+     $to_path = $args{to};
+@@ -4282,5 +4546,3 @@
+ perl(1), Module::Build(3)
+ 
+ =cut
+-
+-# vim:ts=8:sw=2:et:sta:sts=2
+diff -urN perl-5.10.0.orig/lib/Module/Build/Changes perl-5.10.0/lib/Module/Build/Changes
+--- perl-5.10.0.orig/lib/Module/Build/Changes	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Changes	2009-03-10 16:48:30.000000000 +0100
+@@ -1,5 +1,251 @@
+ Revision history for Perl extension Module::Build.
+ 
++0.32 - Wed Feb 25 17:40:02 PST 2009
++
++ No changes since 0.31_04.
++
++0.31_04 - Fri Feb 20 11:04:59 PST 2009
++
++ Other
++ - Bumped Test::Harness prereq to 3.16 for latest PERL5LIB fixes (solves
++   test failures when installing Module::Build using CPANPLUS::Dist::Build)
++   [David Golden]
++
++0.31_03 - Sun Feb  8 14:54:01 PST 2009
++
++ Enhancements
++ - added a "prereq_data" action that prints a Perl data structure of
++   all prerequisites; can be loaded by external tools using eval()
++   [David Golden]
++
++ Bug-fixes
++ - 'fakeinstall' action warns and skips without ExtUtils::Install 1.32+
++   [David Golden, reported by Zefram]
++ - allows Module::Build version mismatch when installing self; works around
++   limitations in CPANPLUS::Dist::Build [David Golden]
++
++0.31_02 - Tue Jan 27 09:16:43 PST 2009
++
++ Other
++ - tests now use File::Temp (added to build_requires); appears to fix
++   Win32 testing heisenbug on directory removal during high system loads
++ - use_tap_harness.t will skip unless a release version of TAP::Harness
++   is installed
++ - improved diagnostics to ensure_blib() tests in t/lib/MBTest.pm
++
++ Compat
++ - passthrough Makefile.PL will now play nice with cpantesters' on
++   exit(0) (RT#32018) [Eric Wilhelm]
++
++ Bug Fixes
++ - fix for doubling-up of --prefix (RT#19951)
++
++0.31012 - Wed Jan 14 01:36:19 PST 2009
++
++ Bug Fixes
++ - t/tilde.t maybe actually fixed on MSWin32 now.
++
++0.31011 - Mon Jan 12 21:57:04 PST 2009
++
++ Bug Fixes
++ - t/tilde.t had been failing on MSWin32 (RT#42349)
++
++0.3101 - Mon Jan 12 13:52:36 PST 2009
++
++ Other
++ - added 'mirbsd' as a Unix-type OS [BinGOs]
++ - added 'haiku' as a Unix-type OS (backported from bleadperl)
++ - skips certain tests on VMS (backported from bleadperl)
++ - sets $^X to absolute path in tests (backported from bleadperl)
++
++0.31 - Sat Dec 20 15:03:33 2008
++
++ Deprecations
++ - Use of attributes as class methods is deprecated (this was never a
++   documented feature and appears to only have worked accidentally.)
++
++0.30_02 - Mon Dec 15 12:23:55 PST 2008
++
++ Bug Fixes
++ - make Software::License dependency "softer".
++
++0.30_01 - Thu Dec 11 18:25:53 PST 2008
++
++ New Docs
++ - Added a recipe for writing a new action to the Cookbook
++ - Added a recipe for bundling Module::Build to the Cookbook.
++
++ Doc Fixes
++ - Clarified dist_abstract search procedure in API.pod (RT#41056) [Mario
++   Domgoergen]
++
++ Bug Fixes
++ - Workaround HARNESS_TIMER env issue in t/compat.t (RT#39635)
++ - Fix ~ expansion when $HOME is different from /etc/passwd as
++   when running sudo.  [rt.cpan.org 39662]
++ - Fixed a small POD error in the Cookbook. [Damyan Ivanov]
++ - Unset group/other write permission bits when using Archive::Tar to
++   build the dist tarball. (RT#39804) [David Golden]
++
++ Enhancements
++ - We now support a 'create_license' parameter to new() that will
++   create a LICENSE file during the 'dist' phase with the full text of
++   the license.  This requires Software::License on the author's
++   machine.  THIS ALSO STILL NEEDS DOCS.
++ - Added lgpl2/lgpl3 entries to the supported licenses (RT#40532).
++ - Support for validating properties with a check subref. [David
++   Wheeler]
++
++ Test Fixes
++ - Defend against more stray environment variables interfering
++   with the tests.
++
++ Other
++ - Updated our embedded version.pm to 0.76, enhanced documentation on
++   dist_version_from.  [John Peacock]
++
++0.30 - Thu Sep 25 20:57:36 2008
++
++ - First non-beta release since April 2007.  In the meantime, Sarkozy
++   became president of France, the 35W bridge fell in Minneapolis,
++   Phelps won a lot of gold, a new tribe of indigenous people was
++   discovered in the Amazon, and Bob Barker stopped doing The Price Is
++   Right.  As of this moment though, the U.S. economy still hasn't
++   collapsed completely.
++
++0.2808_05 - Thu Sep 18 23:30:39 PDT 2008
++
++ - Skip test in t/ext.t which tickles shellwords() in Text::ParseWords
++   below 3.23 [David Wheeler, Ken]
++
++ - Fixed some shell-quoting issues in do_system() on Windows [Ken,
++   Schwern, reported by Curtis Jewell]
++
++ - Fixed t/xs.t failure for missing 'const char *' typemap in 5.6
++   [Schwern]
++
++ - Added build_requires for Test::More 0.49 and Test::Harness 2.03.
++   Removed bundled Test::More (was not working for 5.005x anyway).
++   [Schwern]
++
++ - Minimum required perl version is now 5.6.1. [Schwern]
++
++0.2808_04 - Thu Sep 11 22:51:27 PDT 2008
++
++ - Backed-out incompatible Module::Build::ModuleInfo change (first in
++   0.2808_02.)
++
++0.2808_03 - Mon Sep  1 14:43:27 PDT 2008
++
++ - Made adjustments for the format changes of recent Test::Harness
++   output. [Nicholas Clark]
++
++ - Fixed the documentation for script_files to indicate that we search
++   bin/ for scripts by default.  It has been this way for several
++   years. [Spotted by Ron Savage]
++
++0.2808_02 - Wed Jul  9 16:45:08 PDT 2008
++
++ - Experimental support for TAP::Harness with --use-tap-harness option
++   and the tap_harness_args property. [David Wheeler & Eric Wilhelm]
++
++ - Added test_file_exts property for main-run tests other than '*.t'.
++   [David Wheeler]
++
++ - Fixed getcwd()/rmtree() failure case on 5.10+mac where something is
++   unhappy about all of the tests deleting their distgen directory
++   before leaving it. [Eric Wilhelm & David Wheeler]
++
++ - Improved support for parsing qv() in modules' $VERSION
++   declarations, and made $VERSION-parsing errors more verbose. [Jos
++   Boumans]
++
++ - Integrated an omnibus patch for various VMS fixes. [Craig Berry &
++   John E. Malmberg]
++
++ - Some versions of Test::Harness (or something) seem to not be
++   stripping the ".t" suffix when outputting test reports, which was
++   causing one of our tests in t/compat.t to fail.  Fixed. [Spotted by
++   a smoke tester]
++
++ - Most Unix platforms seem to allow hyphens in usernames, so we honor
++   this in our de-tilde-fying methods now. [Spotted by s-murata]
++
++ - If there are multiple assignments to the $VERSION variable in
++   someone's module and this generates warnings, tell the user what
++   line number the problem is at.
++
++ - Added 'gnu' and 'gnukfreebsd' as Unix variants. [Niko Tyni]
++
++ - Fixed a couple bugs in how we quote arguments to external processes
++   when they have to pass through the shell.  Also much more
++   thoroughly tested our quoting now.
++
++ - Edited the Module::Build::API docs prose about the 'license' field
++   in response to some comments on the module-authors mailing list.
++
++ - Fixed a typo in some example code in the Cookbook. [Jeremy Leader]
++
++ - Custom typemaps were being looked for in places that don't quite
++   exist; fixed. [Michael G Schwern]
++
++ - QNX/Neutrino is now considered to be Unix. [rt.cpan.org 32214]
++
++ - Added 'gpl2' and 'gpl3' to the list of valid licenses. [Allen
++   Engelhardt]
++
++ - Fixed our Data::Dumper wrapper's sensitivity to users who might set
++   $Data::Dumper::Terse. [Spotted by Dominique Dumont]
++
++ - Documented the fix_shebang_line() method. [Elliot Shank]
++
++ - Applied the 'const' modifier to version() and xs_version() XS
++   functions we use during testing. [Robin Barker]
++
++ - Fixed processing of INC=, POLLUTE=, INSTALLDIRS=, and LIB= for
++   passthrough/small Makefile.PLs.
++
++ - perl Build.PL --sign=1 now signs. [Michael G Schwern]
++
++ - Fixed processing of INSTALLDIRS=whatever for compatibility
++   Makefiles. [Spotted by John Peacock]
++
++ - Zillions of special-cases have been added in Compat.pm for dealing
++   with the special Makefile system on VMS. [John E. Malmberg]
++
++ - Fixed some stuff in how VMS command-args get quoted. [John E. Malmberg]
++
++ - VMS now overrides localize_file_path() and localize_dir_path() so
++   we don't need to do special stuff in the general case. [John
++   E. Malmberg]
++
++ - Added a few more VMS-specific entries to the default MANIFEST.SKIP
++   file that (sometimes) gets created during the 'manifest'
++   action. [John E. Malmberg]
++
++ - Fixed a catdir() that should have been a catfile() when creating a
++   ppmdist. [John E. Malmberg]
++
++ - Removed some assumptions about what makefiles are called (not
++   necessarily "Makefile") and how they take their arguments, to get
++   VMS tests working better. [John E. Malmberg]
++
++ - Fixed our check for Archive::Tar in the t/runthrough.t test, which
++   fixes a common failure on Win32. [Spotted by Chris Williams]
++
++ - Fixed a File::Spec mal-ism in t/destinations.t [Craig A. Berry]
++
++ - Exposed the internal ExtUtils::CBuilder object as part of our API,
++   via the cbuilder() method. [Zefram]
++
++ - Upgraded to version.pm 0.74 (fixes bug #30004.)
++
++ - Overwrite core (post-5.9.4) Module::Build installs (bug #20528.)
++
++ - Pass quiet() option to ExtUtils::CBuilder object.
++
++0.2808_01 - Wed Oct 24 11:51:25 2007
++
+  - All .pm files in the Module-Build distribution (except for
+    M::B::Version.pm, which is kind of tied to version.pm) now have the
+    same $VERSION number explicitly specified.
+@@ -1806,3 +2052,592 @@
+  - Added documentation for 'extra_linker_flags' parameter, and added a
+    corresponding 'extra_compiler_flags' parameter. [original patch by
+    Richard Clamp]
++
++ - The pass-through Makefile created by Module::Build::Compat now
++   supports MakeMaker options like POLLUTE=1 and INC.  We also just
++   warn & skip when we see any unknown MM parameters, rather than
++   dying.  [Dave Rolsky]
++
++ - Fixed an error about how @INC and $ENV{PERL5LIB} interact during
++   the testing of M::B itself. [jk <billy2000@fastmail.fm>]
++
++ - The pass-through Makefile doesn't include 'recommended' M::B
++   dependencies in the Makefile anymore, since they're not strictly
++   necessary.  In particular, this makes installing M::B itself
++   easier.
++
++ - A new 'create_makefile_pl' parameter lets you use
++   Module::Build::Compat during the 'distdir' (or 'dist') action to
++   automatically create a Makefile.PL for compatibility with
++   ExtUtils::MakeMaker.  The parameter's value should be one of the
++   styles named in the Module::Build::Compat documentation.
++
++ - When compiling C code, we now respect 'pollute' and 'inc'
++   parameters. (XXX - needs docs) [Dave Rolsky]
++   
++ - Made the creation of the "install map" more generic.  (XXX - needs
++   documentation)
++
++ - Fixed a problem in which add_to_cleanup() didn't note cleanup files
++   unless create_build_script() had been called already. [Dave Rolsky]
++
++ - During 'Build dist', we no longer have to load each .pm file (via
++   Module::Info) to determine the $VERSION numbers inside.  Instead,
++   we call our internal version_from_file() method, which is the same
++   thing MakeMaker and PAUSE and search.cpan.org do.  Also fixes a
++   failure when Module::Info is installed in a nonstandard directory.
++   [reported by Teun Burgers]
++
++ - Fixed some failing test code on Windows - open files can't be
++   deleted. [Andrew Savige]
++
++ - The Cygwin platform is now treated as a flavor of Unix rather than
++   a flavor of Windows. [chocolateboy]
++
++ - We're now more aggressive about adding temporary C compilation
++   files (*.c, *.bs) to the cleanup list. [Dave Rolsky]
++
++ - When constructing the list in META.yml of packages provided by this
++   distribution, we now use the same rules as the PAUSE scanner does
++   when a single .pm file contains multiple VERSIONs.  [Andreas Koenig]
++
++ - check_installed_status() now works as both a class method and an
++   object method (and is documented so).  [Spotted by Dave Rolsky]
++
++0.18  Tue Apr  8 13:24:23 CDT 2003
++
++ - We now rewrite the shebang lines of scripts ourselves, rather than
++   relying on MakeMaker routines to do it.  MakeMaker changed the way
++   this happened (not the result, but where the code lived) a few
++   times.  [Suggested by Richard Clamp]
++
++ - The scripts() method has changed to script_files(), and likewise
++   the 'scripts' parameter has changed to 'script_files'.  The old
++   names can still be used for backward compatibility.
++
++ - Support for the 'scripts' parameter (which is now 'script_files')
++   was broken in 0.17, now it's fixed.  [Richard Clamp]
++
++ - We now recommend ExtUtils::ParseXS 2.02, which will fail to load
++   with perl 5.005 or earlier (which is proper, because it doesn't
++   work with those versions).  When it fails to load, we still fall
++   back to using the xsubpp script for XS parsing. [spotted by Dave
++   Rolsky, fix suggested by Richard Clamp]
++
++ - Now works on VMS - the Build script's shebang-line-equivalent
++   wasn't being formed correctly there - though just about everything
++   else worked fine.  [Tested & patched by Michael Schwern]
++
++ - Eliminated a warning that occurred if 'perl Build.PL' or the
++   check_installed_status() method was run with -w.  [Spotted by
++   Michael Schwern]
++
++0.17  Sat Mar 29 18:06:01 CST 2003
++
++ - Now works under perl 5.005_03.  [Richard Clamp]
++
++ - When building blib/ , .PL files are now processed before doing
++   anything else.  This means .PL files can be used in any of the
++   other contexts.
++
++ - The locating and processing of .pm, .pod, .xs, .PL files and script
++   files are now isolated into their own methods.  This is aimed
++   toward providing a stable interface for this stuff, so they can be
++   overridden, parameterized, etc.  They're not quite stable yet,
++   though.
++
++ - The internal lib_to_blib() method has gone away, because processing
++   is now done by smaller specialized methods.  This method had some
++   duplicate assumptions about filenames that it's nice to get rid of.
++
++ - .PL files are no longer automatically processed in the c_source
++   directory, they must be specified manually in a 'PL_files'
++   parameter.
++
++ - Mention in the docs that it's useful to do "PL_FILES => {}" in a
++   Makefile.PL if you're using both a Makefile.PL and a
++   Build.PL. [Dom]
++
++ - Add several options to the 'license' field, so that we're in better
++   sync with PAUSE and CPAN options. [Andreas Koenig]
++
++ - Created a find_perl_interpreter() method that tries to locate the
++   currently executing perl interpreter.  Following a suggestion from
++   Nicholas Clark <nick@ccl4.org> for Inline, we prefer an absolute
++   path in $^X, then an existent path in $Config{perlpath}, then
++   whatever's in $^X.
++
++ - Use the aforementioned perl to run scripts in run_perl_script().
++   This fixes the spurious warning "WARNING: Configuration was
++   initially created with 'foo', but we are now using 'bar'" that
++   appeared a lot in version 0.16.
++
++
++0.16  Mon Feb 24 13:06:47 CST 2003
++
++ - All three C compilers that perl supports on Windows environments
++   (MSVC, BCC, and GCC) are now supported by Module::Build.  We now
++   reportedly pass all tests on Windows.  [Randy W. Sims]
++
++ - The test t/xs.t, which tests building of XS modules, will be
++   skipped if no C compiler is found. [suggested by Randy W. Sims]
++
++ - The "install" action accepts new "destdir" [motivated by Michael
++   Schwern and Chip Salzenberg] and "uninst" parameters [by Dave
++   Rolsky].  The former prepends an arbitrary directory to all
++   installation paths (useful for package management), and the latter
++   will tell ExtUtils::Install to remove any differing files that are
++   "shadowing" the stuff you're installing from a different location,
++   just like MakeMaker's "make install UNINST=1" command will do.
++
++ - Made changes to the generated Makefile in Module::Build::Compat
++   that much better support Windows platforms [after suggestions by
++   James Freeman]
++
++ - Added experimental support for creating distribution SIGNATURE
++   files via Module::Signature. [Dave Rolsky]
++
++ - Added experimental support for installing via the "only.pm" module,
++   which allows loading specific versions of modules.  Since this
++   module is so new, the interface may still be changing. [Brian
++   Ingerson]
++
++ - Added support for installing executable scripts, via the 'scripts'
++   parameter to new(), and the scripts() accessor method.
++
++ - Fix an infinite loop that occurred when doing 'perl Build.PL
++   config="foo=bar"'
++
++ - Fix up the formatting of the error message the user gets when
++   prereqs aren't satisfied.
++
++0.15  Fri Jan 17 15:00:24 CST 2003
++
++ - In link_c(), extra object files were mistakenly being treated as
++   output files, not input files, in the up-to-date check.  Fixed.
++
++ - In up_to_date(), don't make an unnecessary copy of the file lists
++   when they're specified as array references.
++
++ - Split off the C compilation phase into its own method,
++   compile_support_files(), for easier subclassing.
++
++ - Start a stub of a 'manifypods' action.
++
++ - Compiler optimizations weren't being included in C compilation
++   statements.  Fixed.
++
++ - The 'extra_linker_flags' parameter wasn't being honored.  Fixed.
++
++ - The 'ccflags' Config.pm entry wasn't being properly split into
++   separate arguments.  Fixed.
++
++
++0.14  Fri Dec 13 14:06:29 AEST 2002
++
++  - Added support for MacPerl (Mac OS version 9 and below), which (as
++    far as I know) was never natively supported by MakeMaker.  Still
++    lacks support for the 'test' action (because Test::Harness
++    requires forking, which MacPerl won't do) and compiling XS/C files
++    (because I don't know how to invoke a compiler on MacOS, and one
++    may not even be available).  This change is brought to you by
++    Michael Schwern and the letter '('.
++
++  - Improved processing of .xs files.  Now we use the new
++    ExtUtils::ParseXS module if it's available, otherwise we use
++    backticks and write the result to a .c file ourselves.  This
++    avoids the need to do cross-platform shell redirection.
++
++  - Make sure all parts of 'Build test' use the not-yet-installed
++    version of Module::Build.  This only affects the tests for this
++    module, not any of the module code itself.  [Spotted by Schwern]
++
++  - Oopsie - use $Config{ld} instead of $Config{cc} for linking.
++
++  - Added a 'diff' action, which is useful for comparing the details
++    of what you're about to install with what is already installed on
++    your system.  This uses File::Compare, which is in the core.
++
++  - Fixed a problem on Windows in which the _build/ directory wasn't
++    getting deleted during the 'realclean' action, because we had a
++    file open in that directory. [Spotted by Michael Schwern]
++
++  - delete_filetree() now always uses File::Path::rmtree(), regardless
++    of whether the thing being deleted is a file or a directory.  This
++    helps remove things on obscure platforms with strange locking
++    rules (or even not so obscure ones like MacOS).  It also now
++    reports the number of files or directories deleted (without
++    recursing directory contents).
++
++  - rm_previous_build_script() is gone, replaced by calls to
++    delete_filetree().
++
++  - 'Build' now chdir()s in a BEGIN block, so the 'use Module::Build'
++    statement will work correctly.  Solves a problem on MacOS, where
++    the 'Build' script may often be invoked from the wrong working
++    directory.  [Fix by Michael Schwern]
++
++  - Internally we now use the multi-argument form of system() to run
++    external commands (such as 'diff' or 'cc') whenever possible (and
++    whenever we can't avoid system() altogether).  Note that this
++    means we have to handle splitting some strings (such as
++    $Config{ccflags}) into argument lists like the shell would, which
++    is a drag.  However, the alternative would be to handle shell
++    quoting of all arguments to commands ourselves, which is an even
++    bigger drag across platforms and involves arbitrary filenames and
++    so on.
++
++  - To handle the argument splitting mentioned above, a method
++    split_like_shell() has been created.  So far it's just doing naive
++    processing.  In practice, I've yet to actually see a %Config entry
++    that uses quotes & spaces, so the splitting task is usually not
++    very error-prone.
++
++  - The 'test' action now takes a 'test_files' parameter, similar to
++    the (undocumented) ExtUtils::MakeMaker TEST_FILES argument.  Handy
++    during development when fixing bugs.
++
++  - Internally, the rscan_dir() method can now accept a predicate
++    function that decides whether a file/directory should be matched.
++
++  - We now issue a warning message when the author hasn't specified a
++    license type.
++
++0.13  Wed Nov 20 20:07:53 AEST 2002
++
++  - 'cleanup' file lists are now written immediately, rather than at
++    program termination.  This helps avoid "phantom files" that don't
++    get handled by the 'realclean' action.  The internal
++    write_cleanup() method (which was never documented) is now gone.
++
++  - The 'blib/' directory is now properly cleaned up in more (all?)
++    circumstances.  Previously it could become a phantom if
++    create_build_script() was never called.
++
++  - Now scan the 'c_source' directory for .cpp (C++) files as well as
++    .c files, and compiles them.
++
++  - Use a 'phony' target for 'make manifest' in the pass-through
++    Makefile, for the same reason as 'make install' (see version 0.12
++    notes below).
++
++  - Module::Build::Compat now accepts any known Config.pm key and
++    passes it through to the Build.PL.  Fixes a problem with CPANPLUS,
++    which was passing INSTALLMAN1DIR.
++
++  - The file 'META.yaml' has been re-named to 'META.yml' in order to
++    cooperate better with systems that can only handle 3 characters
++    after the dot.
++
++  - The t/xs.t test should give more informative error messages upon
++    failure.
++
++0.12  Thu Nov 14 18:31:47 AEST 2002
++
++  - The META.yaml file was erroneously looking for 'build_depends'
++    instead of 'build_requires'. [spotted by Iain Truskett]
++
++  - Add prompt() and y_n() methods for use in Build.PLs
++
++  - Do more to work with all versions of Test::Harness when setting
++    the TEST_VERBOSE flag and running under the debugger [patch by
++    Dave Rolsky]
++
++  - Include a test for verbosity handling
++
++  - Make sure the blib/ directory is always cleaned up with the
++    'clean' or 'realclean' action.
++
++  - In a pass-through Makefile.PL, inform 'make' that 'install' is a
++    "fake target", so that it works properly on case-insensitive
++    filesystems like HFS+ with distributions that contain an INSTALL
++    file. [patch by Brian Ingerson]
++
++  - In Module::Build::Compat, show an example Makefile.PL that can
++    install Module::Build and re-invoke itself in one fell swoop [Dave
++    Rolsky and Autrijus Tang]
++
++  - Improve the formatting of the Module::Build and
++    Module::Build::Compat documentation.
++
++0.11  Fri Aug 23 18:50:46 AEST 2002
++
++  - 'module_version' and 'module_version_from' have been replaced by
++    'dist_version' and 'dist_version_from', which is what they really
++    meant in the first place.  'dist_name' has been added.
++
++  - 'module_name' is now just a way to set 'dist_name' and
++    'dist_version_from' in a convenient way.
++
++  - The 'name' in META.yaml is now the distribution name, not the
++    (incorrect) module name. [spotted by Graham Barr]
++
++  - Added the check_installed_status() and prereq_failures() methods
++    for checking prerequisite information with the programmatic
++    interface
++
++  - check_installed_version() now uses check_installed_status()
++    internally
++
++  - Documented the create_build_script() method, which had escaped
++    documentation.
++
++  - create_build_script() now writes prerequisite information to the
++    _build/ directory, for use by Module::Build::Compat.
++
++  - Module::Build::Compat has documentation for a safer way to write a
++    dummy Makefile.PL. [patch by Autrijus Tang]
++
++0.10  Wed Aug  7 19:36 2002
++  - Recommend YAML 0.35 instead of 0.30.
++
++  - Don't die during 'Build disttest' if YAML isn't installed.  This
++    fixes tests 5-10 in runthrough.t if YAML isn't installed.
++
++  - Die if an unknown license type is used, but still default to
++    'unknown' if no license is specified.
++
++  - Use YAML::DumpFile() if we're using a recent YAML,
++    YAML::StoreFile() otherwise.
++
++  - Show specific error messages in runthrough.t.
++
++  - Add a generated_by entry to the META.yaml file.
++
++  - Skip a few tests if YAML isn't installed.
++
++0.09  Fri Jun 28 11:07:08 EST 2002
++
++  - The 'distdir' action wasn't deleting the distribution directory
++    before building it again.  This meant that, say, if you did 'Build
++    disttest' then 'Build dist', you'd end up with a blib/ directory
++    in your distribution.  I actually had this happen for version
++    0.08, and it's not nice to distribute a blib/ on CPAN.
++
++  - We now keep track of the 'base_dir', i.e. the top-level build
++    directory, so we can change back into it if we change out of it.
++    This necessitated a cwd() method, which uses the Cwd.pm module.
++    I'm aware of Cwd's limitations, particularly under taint-mode, but
++    I don't know a way around using it here.
++
++  - The 'dist_dir' action now changes back into 'base_dir' directory.
++
++  - We now do write_config() inside the create_build_script() method,
++    not inside the new() method.
++
++  - Simplified the find_version() method, and improved its error
++    messages.
++
++  - Renamed module_name_to_file() to find_module_by_name(), and added
++    a parameter specifying the directories to search in.  Previously
++    we searched in 'lib' and @INC, which wasn't correct in all
++    situations. 
++
++  - Patched the docs to change "Build test" to "./Build test"
++    [Elizabeth Mattijsen]
++
++0.08  Wed Jun 26 20:30:56 EST 2002
++
++  - Fixed the 'prereq' alias for the 'requires' parameter
++
++  - Added some tests in t/basic.t to test the dependency checking
++
++  - Added 'artistic' as a licensing option [Arthur Bergman]
++
++  - Fixed some bugs in requires/prereq/recommends/conflicts/build_depends
++
++  - Fixed a typo in the 'distclean' action that prevented its
++    execution [Arthur Bergman]
++
++  - Separated the linking phase of building XS items into its own
++    link_c() method.  Its interface is still unstable, so it's not
++    documented yet. [suggested by Arthur Bergman]
++
++0.07  Jun  9 2002 15:46
++
++  - We now generate a 'META.yaml' metadata file during 'Build dist'.
++    This can be very useful for lots of things, none of which are
++    implemented yet.
++
++  - Added a 'dynamic_config' parameter, defaulting to false.  This
++    lets distribution systems (CPAN.pm, etc.) build, test, and install
++    "easy" modules without having to execute the Build.PL at runtime.
++    It's also a guarantee that the list of dependencies is exactly
++    what is present in the metadata file, and won't be changed during
++    the build process.
++
++  - Added support for "recommended" and "build-time requirement"
++    modules, besides those that are absolutely required.  Also added a
++    "conflicts" field.
++
++  - Changed the 'prereq' field to 'requires' (the old name will
++    continue to work).
++
++  - Added support for checking the installed version of perl as an
++    explicit dependency.
++
++  - Added a 'license' parameter to specify one of a fixed number of
++    licenses for the distribution.
++
++  - Fixed a bug in Module::Build::Compat that was preventing arguments
++    from being processed properly. [patch by Ilya Martynov]
++
++  - Make sure we're in the right directory when we write the cleanup
++    file, since various ExtUtils::Install errors might leave us in an
++    unknown directory. [patch by Ilya Martynov]
++
++  - Specified the 'license', 'recommends', and 'dynamic_config'
++    values in Build.PL, and changed 'prereq' to 'requires'.
++
++0.06  Apr 2 2002 17:44
++
++  - Added the Module::Build::Compat module for assisting and
++    explaining compatibility with ExtUtils::Makemaker and cohorts.
++
++  - State is now saved using Data::Dumper instead of my ad-hoc
++    mechanism, guaranteeing data integrity.  Whitespace values broke
++    in the former scheme.
++
++  - Added the 'recommended' option, which works like 'prereq' but
++    isn't insistent.
++
++  - Separated the various parameters into three groups: parameters
++    that tell Module::Build what to do, Config.pm parameters, and
++    user-defined parameters for each build (the module author is the
++    'user' here).  This helps avoid conflicts between names, and it
++    was silly to have them all together.  The three groups of
++    parameters are subject to the same rules for overriding: values
++    specified during a Build action take precedence over values
++    specified at 'perl Build.PL' time, which in turn take precedence
++    over values specified in the call to new().
++
++  - Improved support for .PL files.  Any .PL file in the lib/
++    directory or the directory specified by 'c_source' will now get
++    properly executed.  I also added a 'PL_files' parameter that you
++    can use in case the .PL doesn't create an obviously-named output
++    file.
++
++  - If a prerequisite condition is malformed, we now report a prereq
++    failure and say why.  Previously we issued a warning and kept
++    going.
++
++
++0.05   10-Jan-2002 20:26
++  - Added the Module::Build->subclass() method, which makes it easier to
++    make quick-and-dirty subclasses of Module::Build.
++
++  - Reorganized the docs a bit.
++
++  - Added the 'testdb' action, and the 'debugger=1' argument to the
++    'test' action, both of which run tests under the perl
++    debugger. (idea: Dave Rolsky)
++
++  - Added prerequisite checking (Dave Rolsky)
++
++  - Fixed an unlikely-to-occur bug with misquoted strings in the
++    'Build' script (spot: Dave Rolsky)
++
++  - We're more careful about shush-ing warnings that
++    ExtUtils::Manifest might emit (Dave Rolsky)
++
++  - The 'help' action now auto-generates the list of actions (Dave Rolsky)
++
++  - Added the 'distcheck', 'skipcheck', 'distclean', 'distdir', and
++    'disttest' actions (Dave Rolsky)
++
++  - We're a little more aggressive about cleaning up temporary files -
++    we'll try to clean them up even when we don't have write permission
++    on them.  This isn't as dastardly as it sounds; if we /really/
++    don't have permission, we won't be able to remove them no matter
++    how hard we try.
++
++0.04   Fri Nov 16 16:55 2001
++  - Added a 'manifest' action.  It's just like MakeMaker's 'make manifest', it
++    brings your MANIFEST file up to date with your distribution directory.
++
++  - Reorganized some of the responsibilities of various methods, which
++    allows modules to be built and tested programmatically.
++
++  - The 'clean' action will now clean up files that were created more
++    recently than the on-disk cleanup registry was written.
++
++  - Undefined values from Config.pm are handled correctly now.
++
++  - The dispatch() method will now accept explicit dispatch
++    parameters, for use in a programmatic setting.
++
++  - $ENV{TEST_VERBOSE} will be set in test scripts if the 'verbose=1'
++    parameter is set.
++
++  - Moved the test.pl script to t/basic.t
++
++  - Created the t/xs.t script, which tests building a module with a
++    .xs component.
++
++  - Fixed the loading of $^O-specific modules (there were no such
++    modules before).
++
++  - Added a 'darwin' platform module, which removes -flat_namespace
++    from $Config{ccflags} while building .xs modules (it's a linker
++    flag, not a compiler flag).
++
++  - Now uses $^W instead of the 'warnings' pragma, which apparently
++    provides compatibility with perl 5.005 (I've only tested it with
++    5.6.x myself).
++
++  - If a file called C<visual.pl> exists in the top-level directory,
++    this file will be executed as a Perl script during 'Build test' and
++    its output will be shown to the user.  This is a good place to put
++    speed tests or other tests that don't use the C<Test::Harness> format
++    for output.
++
++  - The 'Build install' step will now put .xs-related things in the
++    correct architecture-dependent libraries.
++
++  - Added the 'autosplit' option, even though I think autosplitting is
++    a load of hooie.
++
++0.03  Sun Nov 11 14:58 CDT 2001
++  - The 'perl Build.PL' step will now detect whether the current
++    environment is "unixish", "windowsish", etc., and load the correct
++    module (i.e. Module::Build::Platform::Unix).  More specific
++    modules may also be written for particular values of $^O.
++
++  - Module::Build will now process any .xs files in the lib/
++    directory.  Please let me know whether this works or not with your
++    distribution & platform.  I'll be trying out various distributions
++    on my platform.
++
++  - Corrected some embarassing errors in the POD documentation.  Also
++    added a long documentation section on the various build actions
++    (test, install, build, etc.) and added some neato ASCII art.
++
++  - Added a 'cleanup' mechanism - any method may call the
++    $self->add_to_cleanup(@files) method to register files which need
++    to be cleaned up during 'Build clean'.
++
++  - Added a 'Build help' action that gives a little syntax help, and
++    lists all the actions available.
++
++  - Fixed a bug in which 'blib/' wasn't properly being added to @INC
++    when running 'Build test'.
++
++  - For the 'Build dist' action, we'll use the 'tar' and 'gzip'
++    programs (as specified by Config.pm) on Unix platforms, otherwise
++    we'll use Archive::Tar and Compress::Zlib.
++ 
++0.02  Wed Sep  5 00:53:04 CDT 2001
++  - Added POD documentation.
++
++  - Added the 'install', 'fakeinstall', and 'dist' actions.
++
++  - new() will now determine version string based on 'module_version', or
++    'module_version_from', or 'module_name', in that order.
++
++  - Module::Build::Base handles its file paths in a platform-independent
++    way, using the File:: modules
++
++
++0.01  Sun Aug  5 01:23:10 2001
++  - original version; created by h2xs 1.1.1.4 with options -XA -n Module::Build
++
+diff -urN perl-5.10.0.orig/lib/Module/Build/Compat.pm perl-5.10.0/lib/Module/Build/Compat.pm
+--- perl-5.10.0.orig/lib/Module/Build/Compat.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Compat.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ 
+ use File::Spec;
+ use IO::File;
+@@ -11,19 +11,50 @@
+ use Module::Build::ModuleInfo;
+ use Data::Dumper;
+ 
++my %convert_installdirs = (
++    PERL        => 'core',
++    SITE        => 'site',
++    VENDOR      => 'vendor',
++);
++
+ my %makefile_to_build = 
+   (
+    TEST_VERBOSE => 'verbose',
+    VERBINST     => 'verbose',
+-   INC     => sub { map {('--extra_compiler_flags', $_)} Module::Build->split_like_shell(shift) },
+-   POLLUTE => sub { ('--extra_compiler_flags', '-DPERL_POLLUTE') },
+-   INSTALLDIRS => sub {local $_ = shift; 'installdirs=' . (/^perl$/ ? 'core' : $_) },
+-   LIB => sub { ('--install_path', 'lib='.shift()) },
++   INC          => sub { map {(extra_compiler_flags => $_)} Module::Build->split_like_shell(shift) },
++   POLLUTE      => sub { (extra_compiler_flags => '-DPERL_POLLUTE') },
++   INSTALLDIRS  => sub { (installdirs => $convert_installdirs{uc shift()}) },
++   LIB          => sub {
++       my $lib = shift;
++       my %config = (
++           installprivlib  => $lib,
++           installsitelib  => $lib,
++           installarchlib  => "$lib/$Config{archname}",
++           installsitearch => "$lib/$Config{archname}"
++       );
++       return map { (config => "$_=$config{$_}") } keys %config;
++   },
++
++   # Convert INSTALLVENDORLIB and friends.
++   (
++       map {
++           my $name = "INSTALL".$_."LIB";
++           $name => sub {
++                 my @ret = (config => { lc $name => shift });
++                 print STDERR "# Converted to @ret\n";
++
++                 return @ret;
++           }
++       } keys %convert_installdirs
++   ),
+ 
+    # Some names they have in common
+    map {$_, lc($_)} qw(DESTDIR PREFIX INSTALL_BASE UNINST),
+   );
+ 
++my %macro_to_build = %makefile_to_build;
++# "LIB=foo make" is not the same as "perl Makefile.PL LIB=foo"
++delete $macro_to_build{LIB};
+ 
+ 
+ sub create_makefile_pl {
+@@ -37,6 +68,8 @@
+     $fh = $args{fh};
+   } else {
+     $args{file} ||= 'Makefile.PL';
++    local $build->{properties}{quiet} = 1;
++    $build->delete_filetree($args{file});
+     $fh = IO::File->new("> $args{file}") or die "Can't write $args{file}: $!";
+   }
+ 
+@@ -50,7 +83,7 @@
+   }
+ 
+   # If a *bundled* custom subclass is being used, make sure we add its
+-  # directory to @INC.
++  # directory to @INC.  Also, lib.pm always needs paths in Unix format.
+   my $subclass_load = '';
+   if (ref($build) ne "Module::Build") {
+     my $subclass_dir = $package->subclass_dir($build);
+@@ -60,10 +93,13 @@
+ 
+       if ($build->dir_contains($base_dir, $subclass_dir)) {
+ 	$subclass_dir = File::Spec->abs2rel($subclass_dir, $base_dir);
++	$subclass_dir = $package->unixify_dir($subclass_dir);
+         $subclass_load = "use lib '$subclass_dir';";
+       }
++      # Otherwise, leave it the empty string
+ 
+     } else {
++      $subclass_dir = $package->unixify_dir($subclass_dir);
+       $subclass_load = "use lib '$subclass_dir';";
+     }
+   }
+@@ -107,6 +143,7 @@
+     eval "use Module::Build::Compat 0.02; 1" or die $@;
+     %s
+     Module::Build::Compat->run_build_pl(args => \@ARGV);
++    exit(0) unless(-e 'Build'); # cpantesters convention
+     require %s;
+     Module::Build::Compat->write_makefile(build_class => '%s');
+ EOF
+@@ -139,7 +176,7 @@
+     
+     $MM_Args{EXE_FILES} = [ sort keys %{$build->script_files} ] if $build->script_files;
+     
+-    $MM_Args{PL_FILES} = {};
++    $MM_Args{PL_FILES} = $build->PL_files if $build->PL_files;
+     
+     local $Data::Dumper::Terse = 1;
+     my $args = Data::Dumper::Dumper(\%MM_Args);
+@@ -161,8 +198,13 @@
+ 	  || File::Spec->catdir($build->config_dir, 'lib'));
+ }
+ 
++sub unixify_dir {
++  my ($self, $path) = @_;
++  return join '/', File::Spec->splitdir($path);
++}
++
+ sub makefile_to_build_args {
+-  shift;
++  my $class = shift;
+   my @out;
+   foreach my $arg (@_) {
+     next if $arg eq '';
+@@ -171,24 +213,34 @@
+ 		       die "Malformed argument '$arg'");
+ 
+     # Do tilde-expansion if it looks like a tilde prefixed path
+-    ( $val ) = glob( $val ) if $val =~ /^~/;
++    ( $val ) = Module::Build->_detildefy( $val ) if $val =~ /^~/;
+ 
+     if (exists $makefile_to_build{$key}) {
+       my $trans = $makefile_to_build{$key};
+-      push @out, ref($trans) ? $trans->($val) : ("--$trans", $val);
++      push @out, $class->_argvify( ref($trans) ? $trans->($val) : ($trans => $val) );
+     } elsif (exists $Config{lc($key)}) {
+-      push @out, '--config', lc($key) . "=$val";
++      push @out, $class->_argvify( config => lc($key) . "=$val" );
+     } else {
+       # Assume M::B can handle it in lowercase form
+-      push @out, "--\L$key", $val;
++      push @out, $class->_argvify("\L$key" => $val);
+     }
+   }
+   return @out;
+ }
+ 
++sub _argvify {
++  my ($self, @pairs) = @_;
++  my @out;
++  while (@pairs) {
++    my ($k, $v) = splice @pairs, 0, 2;
++    push @out, ("--$k", $v);
++  }
++  return @out;
++}
++
+ sub makefile_to_build_macros {
+   my @out;
+-  while (my ($macro, $trans) = each %makefile_to_build) {
++  while (my ($macro, $trans) = each %macro_to_build) {
+     # On some platforms (e.g. Cygwin with 'make'), the mere presence
+     # of "EXPORT: FOO" in the Makefile will make $ENV{FOO} defined.
+     # Therefore we check length() too.
+@@ -216,18 +268,26 @@
+   my $class = $args{build_class};
+ 
+   my $perl = $class->find_perl_interpreter;
++
++  # VMS MMS/MMK need to use MCR to run the Perl image.
++  $perl = 'MCR ' . $perl if $self->_is_vms_mms;
++
+   my $noop = ($class->is_windowsish ? 'rem>nul'  :
+-	      $class->is_vmsish     ? 'Continue' :
++	      $self->_is_vms_mms    ? 'Continue' :
+ 	      'true');
+-  my $Build = 'Build --makefile_env_macros 1';
+ 
+-  # Start with a couple special actions
++  my $filetype = $class->is_vmsish ? '.COM' : '';
++
++  my $Build = 'Build' . $filetype . ' --makefile_env_macros 1';
++  my $unlink = $class->oneliner('1 while unlink $ARGV[0]', [], [$args{makefile}]);
++  $unlink =~ s/\$/\$\$/g;
++
+   my $maketext = <<"EOF";
+ all : force_do_it
+ 	$perl $Build
+ realclean : force_do_it
+ 	$perl $Build realclean
+-	$perl -e unlink -e shift $args{makefile}
++	$unlink
+ 
+ force_do_it :
+ 	@ $noop
+@@ -241,7 +301,17 @@
+ EOF
+   }
+   
+-  $maketext .= "\n.EXPORT : " . join(' ', keys %makefile_to_build) . "\n\n";
++  if ($self->_is_vms_mms) {
++    # Roll our own .EXPORT as MMS/MMK don't honor that directive.
++    $maketext .= "\n.FIRST\n\t\@ $noop\n"; 
++    for my $macro (keys %macro_to_build) {
++      $maketext .= ".IFDEF $macro\n\tDEFINE $macro \"\$($macro)\"\n.ENDIF\n";
++    }
++    $maketext .= "\n"; 
++  }
++  else {
++    $maketext .= "\n.EXPORT : " . join(' ', keys %macro_to_build) . "\n\n";
++  }
+   
+   return $maketext;
+ }
+@@ -267,13 +337,24 @@
+ 
+ sub write_makefile {
+   my ($pack, %in) = @_;
+-  $in{makefile} ||= 'Makefile';
++
++  unless (exists $in{build_class}) {
++    warn "Unknown 'build_class', defaulting to 'Module::Build'\n";
++    $in{build_class} = 'Module::Build';
++  }
++  my $class = $in{build_class};
++  $in{makefile} ||= $pack->_is_vms_mms ? 'Descrip.MMS' : 'Makefile';
++
+   open  MAKE, "> $in{makefile}" or die "Cannot write $in{makefile}: $!";
+   print MAKE $pack->fake_prereqs;
+   print MAKE $pack->fake_makefile(%in);
+   close MAKE;
+ }
+ 
++sub _is_vms_mms {
++  return Module::Build->is_vmsish && ($Config{make} =~ m/MM[SK]/i);
++}
++
+ 1;
+ __END__
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/Config.pm perl-5.10.0/lib/Module/Build/Config.pm
+--- perl-5.10.0.orig/lib/Module/Build/Config.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Config.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Config;
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/Cookbook.pm perl-5.10.0/lib/Module/Build/Cookbook.pm
+--- perl-5.10.0.orig/lib/Module/Build/Cookbook.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Cookbook.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -1,4 +1,7 @@
+ package Module::Build::Cookbook;
++use strict;
++use vars qw($VERSION);
++$VERSION = '0.32';
+ 
+ 
+ =head1 NAME
+@@ -245,7 +248,7 @@
+ 
+   # Process pod files first
+   my @e = @{$build->build_elements};
+-  my $i = grep {$e[$_] eq 'pod'} 0..$#e;
++  my ($i) = grep {$e[$_] eq 'pod'} 0..$#e;
+   unshift @e, splice @e, $i, 1;
+ 
+ Currently, C<build_elements> has the following default value:
+@@ -392,7 +395,7 @@
+ I'm sure I could not have handled this complexity with EU::MM, but it
+ was very easy to do with M::B.
+ 
+-=back 4
++=back
+ 
+ 
+ =head2 Modifying an action
+@@ -428,6 +431,84 @@
+   )->create_build_script;
+ 
+ 
++=head2 Adding an action
++
++You can add a new C<./Build> action simply by writing the method for
++it in your subclass.  Use C<depends_on> to declare that another action
++must have been run before your action.
++
++For example, let's say you wanted to be able to write C<./Build
++commit> to test your code and commit it to Subversion.
++
++  # Build.PL
++  use Module::Build;
++  my $class = Module::Build->subclass(
++      class => "Module::Build::Custom",
++      code => <<'SUBCLASS' );
++
++  sub ACTION_commit {
++      my $self = shift;
++
++      $self->depends_on("test");
++      $self->do_system(qw(svn commit));
++  }
++  SUBCLASS
++
++
++=head2 Bundling Module::Build
++
++Note: This section probably needs an update as the technology improves
++(see scripts/bundle.pl in the distribution).
++
++Suppose you want to use some new-ish features of Module::Build,
++e.g. newer than the version of Module::Build your users are likely to
++already have installed on their systems.  The first thing you should
++do is set C<configure_requires> to your minimum version of
++Module::Build.  See L<Module::Build::Authoring>.
++
++But not every build system honors C<configure_requires> yet.  Here's
++how you can ship a copy of Module::Build, but still use a newer
++installed version to take advantage of any bug fixes and upgrades.
++
++First, install Module::Build into F<Your-Project/inc/Module-Build>.
++CPAN will not index anything in the F<inc> directory so this copy will
++not show up in CPAN searches.
++
++    cd Module-Build
++    perl Build.PL --install_base /path/to/Your-Project/inc/Module-Build
++    ./Build test
++    ./Build install
++
++You should now have all the Module::Build .pm files in
++F<Your-Project/inc/Module-Build/lib/perl5>.
++
++Next, add this to the top of your F<Build.PL>.
++
++    my $Bundled_MB = 0.30;  # or whatever version it was.
++
++    # Find out what version of Module::Build is installed or fail quietly.
++    # This should be cross-platform.
++    my $Installed_MB = 
++        `$^X -e "eval q{require Module::Build; print Module::Build->VERSION} or exit 1";
++
++    # some operating systems put a newline at the end of every print.
++    chomp $Installed_MB;
++
++    $Installed_MB = 0 if $?;
++
++    # Use our bundled copy of Module::Build if it's newer than the installed.
++    unshift @INC, "inc/Module-Build/lib/perl5" if $Bundled_MB > $Installed_MB;
++
++    require Module::Build;
++
++And write the rest of your F<Build.PL> normally.  Module::Build will
++remember your change to C<@INC> and use it when you run F<./Build>.
++
++In the future, we hope to provide a more automated solution for this
++scenario; see C<inc/latest.pm> in the Module::Build distribution for
++one indication of the direction we're moving.
++
++
+ =head1 AUTHOR
+ 
+ Ken Williams <kwilliams@cpan.org>
+@@ -435,7 +516,7 @@
+ 
+ =head1 COPYRIGHT
+ 
+-Copyright (c) 2001-2006 Ken Williams.  All rights reserved.
++Copyright (c) 2001-2008 Ken Williams.  All rights reserved.
+ 
+ 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/lib/Module/Build/Dumper.pm perl-5.10.0/lib/Module/Build/Dumper.pm
+--- perl-5.10.0.orig/lib/Module/Build/Dumper.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Dumper.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -1,4 +1,7 @@
+ package Module::Build::Dumper;
++use strict;
++use vars qw($VERSION);
++$VERSION = '0.32';
+ 
+ # This is just a split-out of a wrapper function to do Data::Dumper
+ # stuff "the right way".  See:
+@@ -9,7 +12,7 @@
+ sub _data_dump {
+   my ($self, $data) = @_;
+   return ("do{ my "
+-	  . Data::Dumper->new([$data],['x'])->Purity(1)->Dump()
++	  . Data::Dumper->new([$data],['x'])->Purity(1)->Terse(0)->Dump()
+ 	  . '$x; }')
+ }
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/ModuleInfo.pm perl-5.10.0/lib/Module/Build/ModuleInfo.pm
+--- perl-5.10.0.orig/lib/Module/Build/ModuleInfo.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/ModuleInfo.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -1,3 +1,5 @@
++# -*- mode: cperl; tab-width: 8; indent-tabs-mode: nil; basic-offset: 2 -*-
++# vim:ts=8:sw=2:et:sta:sts=2
+ package Module::Build::ModuleInfo;
+ 
+ # This module provides routines to gather information about
+@@ -6,7 +8,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ 
+ use File::Spec;
+@@ -14,16 +16,16 @@
+ use Module::Build::Version;
+ 
+ 
+-my $PKG_REGEXP  = qr/   # match a package declaration
++my $PKG_REGEXP  = qr{   # match a package declaration
+   ^[\s\{;]*             # intro chars on a line
+   package               # the word 'package'
+   \s+                   # whitespace
+   ([\w:]+)              # a package name
+   \s*                   # optional whitespace
+   ;                     # semicolon line terminator
+-/x;
++}x;
+ 
+-my $VARNAME_REGEXP = qr/ # match fully-qualified VERSION name
++my $VARNAME_REGEXP = qr{ # match fully-qualified VERSION name
+   ([\$*])         # sigil - $ or *
+   (
+     (             # optional leading package name
+@@ -32,9 +34,9 @@
+     )?
+     VERSION
+   )\b
+-/x;
++}x;
+ 
+-my $VERS_REGEXP = qr/ # match a VERSION definition
++my $VERS_REGEXP = qr{ # match a VERSION definition
+   (?:
+     \(\s*$VARNAME_REGEXP\s*\) # with parens
+   |
+@@ -42,43 +44,45 @@
+   )
+   \s*
+   =[^=~]  # = but not ==, nor =~
+-/x;
++}x;
+ 
+ 
+ sub new_from_file {
+-  my $package  = shift;
++  my $class    = shift;
+   my $filename = File::Spec->rel2abs( shift );
++
+   return undef unless defined( $filename ) && -f $filename;
+-  return $package->_init( undef, $filename, @_ );
++  return $class->_init(undef, $filename, @_);
+ }
+ 
+ sub new_from_module {
+-  my $package = shift;
++  my $class   = shift;
+   my $module  = shift;
+   my %props   = @_;
++
+   $props{inc} ||= \@INC;
+-  my $filename = $package->find_module_by_name( $module, $props{inc} );
++  my $filename = $class->find_module_by_name( $module, $props{inc} );
+   return undef unless defined( $filename ) && -f $filename;
+-  return $package->_init( $module, $filename, %props );
++  return $class->_init($module, $filename, %props);
+ }
+ 
+ sub _init {
+-  my $package  = shift;
++  my $class    = shift;
+   my $module   = shift;
+   my $filename = shift;
+-
+   my %props = @_;
++
+   my( %valid_props, @valid_props );
+   @valid_props = qw( collect_pod inc );
+   @valid_props{@valid_props} = delete( @props{@valid_props} );
+   warn "Unknown properties: @{[keys %props]}\n" if scalar( %props );
+ 
+   my %data = (
+-    module   => $module,
+-    filename => $filename,
+-    version  => undef,
+-    packages => [],
+-    versions => {},
++    module       => $module,
++    filename     => $filename,
++    version      => undef,
++    packages     => [],
++    versions     => {},
+     pod          => {},
+     pod_headings => [],
+     collect_pod  => 0,
+@@ -86,20 +90,22 @@
+     %valid_props,
+   );
+ 
+-  my $self = bless( \%data, $package );
++  my $self = bless(\%data, $class);
+ 
+   $self->_parse_file();
+ 
+-  unless ( $self->{module} && length( $self->{module} ) ) {
+-    my( $v, $d, $f ) = File::Spec->splitpath( $self->{filename} );
+-    if ( $f =~ /\.pm$/ ) {
++  unless($self->{module} and length($self->{module})) {
++    my ($v, $d, $f) = File::Spec->splitpath($self->{filename});
++    if($f =~ /\.pm$/) {
+       $f =~ s/\..+$//;
+       my @candidates = grep /$f$/, @{$self->{packages}};
+-      $self->{module} = shift( @candidates ); # punt
+-    } else {
+-      if ( grep /main/, @{$self->{packages}} ) {
+-	$self->{module} = 'main';
+-      } else {
++      $self->{module} = shift(@candidates); # punt
++    }
++    else {
++      if(grep /main/, @{$self->{packages}}) {
++        $self->{module} = 'main';
++      }
++      else {
+         $self->{module} = $self->{packages}[0] || '';
+       }
+     }
+@@ -113,7 +119,7 @@
+ 
+ # class method
+ sub _do_find_module {
+-  my $package = shift;
++  my $class   = shift;
+   my $module  = shift || die 'find_module_by_name() requires a package name';
+   my $dirs    = shift || \@INC;
+ 
+@@ -179,6 +185,7 @@
+   my $pod_data = '';
+ 
+   while (defined( my $line = <$fh> )) {
++    my $line_num = $.;
+ 
+     chomp( $line );
+     next if $line =~ /^\s*#/;
+@@ -233,7 +240,7 @@
+ 	  # that we should watch out for...)
+ 	  warn <<"EOM" unless $line =~ /=\s*eval/;
+ Package '$vers_pkg' already declared with version '$vers{$vers_pkg}',
+-ignoring subsequent declaration.
++ignoring subsequent declaration on line $line_num.
+ EOM
+ 	}
+ 
+@@ -263,7 +270,7 @@
+ 	} else {
+ 	  warn <<"EOM";
+ Package '$pkg' already declared with version '$vers{$pkg}'
+-ignoring new version '$v'.
++ignoring new version '$v' on line $line_num.
+ EOM
+ 	}
+ 
+@@ -283,6 +290,8 @@
+   $self->{pod_headings} = \@pod;
+ }
+ 
++{
++my $pn = 0;
+ sub _evaluate_version_line {
+   my $self = shift;
+   my( $sigil, $var, $line ) = @_;
+@@ -292,8 +301,10 @@
+   # We compile into $vsub because 'use version' would cause
+   # compiletime/runtime issues with local()
+   my $vsub;
++  $pn++; # everybody gets their own package
+   my $eval = qq{BEGIN { q#  Hide from _packages_inside()
+-    #; package Module::Build::ModuleInfo::_version;
++    #; package Module::Build::ModuleInfo::_version::p$pn;
++    use Module::Build::Version;
+     no strict;
+ 
+     local $sigil$var;
+@@ -311,13 +322,16 @@
+     if $@;
+   (ref($vsub) eq 'CODE') or
+     die "failed to build version sub for $self->{filename}";
+-  my $result = $vsub->();
++  my $result = eval { $vsub->() };
++
++  die "Could not get version from $self->{filename} by executing:\n$eval\n\nThe fatal error was: $@\n" if $@;
+ 
+   # Bless it into our own version class
+   $result = Module::Build::Version->new($result);
+ 
+   return $result;
+ }
++}
+ 
+ 
+ ############################################################
+diff -urN perl-5.10.0.orig/lib/Module/Build/Notes.pm perl-5.10.0/lib/Module/Build/Notes.pm
+--- perl-5.10.0.orig/lib/Module/Build/Notes.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Notes.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -4,7 +4,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Data::Dumper;
+ use IO::File;
+diff -urN perl-5.10.0.orig/lib/Module/Build/PPMMaker.pm perl-5.10.0/lib/Module/Build/PPMMaker.pm
+--- perl-5.10.0.orig/lib/Module/Build/PPMMaker.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/PPMMaker.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ 
+ # This code is mostly borrowed from ExtUtils::MM_Unix 6.10_03, with a
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/Amiga.pm perl-5.10.0/lib/Module/Build/Platform/Amiga.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/Amiga.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/Amiga.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Module::Build::Base;
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/Default.pm perl-5.10.0/lib/Module/Build/Platform/Default.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/Default.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/Default.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Module::Build::Base;
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/EBCDIC.pm perl-5.10.0/lib/Module/Build/Platform/EBCDIC.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/EBCDIC.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/EBCDIC.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Module::Build::Base;
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/MPEiX.pm perl-5.10.0/lib/Module/Build/Platform/MPEiX.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/MPEiX.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/MPEiX.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Module::Build::Base;
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/MacOS.pm perl-5.10.0/lib/Module/Build/Platform/MacOS.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/MacOS.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/MacOS.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Module::Build::Base;
+ use vars qw(@ISA);
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/RiscOS.pm perl-5.10.0/lib/Module/Build/Platform/RiscOS.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/RiscOS.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/RiscOS.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Module::Build::Base;
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/Unix.pm perl-5.10.0/lib/Module/Build/Platform/Unix.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/Unix.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/Unix.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Module::Build::Base;
+ 
+@@ -44,10 +44,10 @@
+ 
+ sub _detildefy {
+   my ($self, $value) = @_;
+-  $value =~ s[^~(\w*)(?=/|$)]   # tilde with optional username
++  $value =~ s[^~(\w[-\w]*)?(?=/|$)]   # tilde with optional username
+     [$1 ?
+      ((getpwnam $1)[7] || "~$1") :
+-     (getpwuid $>)[7]
++     ($ENV{HOME} || (getpwuid $>)[7])
+     ]ex;
+   return $value;
+ }
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/VMS.pm perl-5.10.0/lib/Module/Build/Platform/VMS.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/VMS.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/VMS.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Module::Build::Base;
+ 
+@@ -136,10 +136,15 @@
+                    ? 1 
+                    : 0;
+ 
+-  map { $_ = q(").$_.q(") if !/^\"/ && length($_) > 0 }
+-     ($got_arrayref ? @{$args[0]} 
+-                    : @args
+-     );
++  # Do not quote qualifiers that begin with '/'.
++  map { if (!/^\//) { 
++          $_ =~ s/\"/""/g;     # escape C<"> by doubling
++          $_ = q(").$_.q(");
++        }
++  }
++    ($got_arrayref ? @{$args[0]} 
++                   : @args
++    );
+ 
+   return $got_arrayref ? $args[0] 
+                        : join(' ', @args);
+@@ -357,6 +362,29 @@
+ 
+ sub find_perl_interpreter { return $^X; }
+ 
++=item localize_file_path
++
++Convert the file path to the local syntax
++
++=cut
++
++sub localize_file_path {
++  my ($self, $path) = @_;
++  $path =~ s/\.\z//;
++  return VMS::Filespec::vmsify($path);
++}
++
++=item localize_dir_path
++
++Convert the directory path to the local syntax
++
++=cut
++
++sub localize_dir_path {
++  my ($self, $path) = @_;
++  return VMS::Filespec::vmspath($path);
++}
++
+ =back
+ 
+ =head1 AUTHOR
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/VOS.pm perl-5.10.0/lib/Module/Build/Platform/VOS.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/VOS.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/VOS.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Module::Build::Base;
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/Windows.pm perl-5.10.0/lib/Module/Build/Platform/Windows.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/Windows.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/Windows.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ 
+ use Config;
+@@ -175,6 +175,29 @@
+ }
+ 
+ 
++sub _quote_args {
++  # Returns a string that can become [part of] a command line with
++  # proper quoting so that the subprocess sees this same list of args.
++  my ($self, @args) = @_;
++
++  my @quoted;
++
++  for (@args) {
++    if ( /^[^\s*?!\$<>;|'"\[\]\{\}]+$/ ) {
++      # Looks pretty safe
++      push @quoted, $_;
++    } else {
++      # XXX this will obviously have to improve - is there already a
++      # core module lying around that does proper quoting?
++      s/"/\\"/g;
++      push @quoted, qq("$_");
++    }
++  }
++
++  return join " ", @quoted;
++}
++
++
+ sub split_like_shell {
+   # As it turns out, Windows command-parsing is very different from
+   # Unix command-parsing.  Double-quotes mean different things,
+@@ -233,6 +256,23 @@
+   return @argv;
+ }
+ 
++
++# system(@cmd) does not like having double-quotes in it on Windows.
++# So we quote them and run it as a single command.
++sub do_system {
++  my ($self, @cmd) = @_;
++
++  my $cmd = $self->_quote_args(@cmd);
++  my $status = system($cmd);
++  if ($status and $! =~ /Argument list too long/i) {
++    my $env_entries = '';
++    foreach (sort keys %ENV) { $env_entries .= "$_=>".length($ENV{$_})."; " }
++    warn "'Argument list' was 'too long', env lengths are $env_entries";
++  }
++  return !$status;
++}
++
++
+ 1;
+ 
+ __END__
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/aix.pm perl-5.10.0/lib/Module/Build/Platform/aix.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/aix.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/aix.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Module::Build::Platform::Unix;
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/cygwin.pm perl-5.10.0/lib/Module/Build/Platform/cygwin.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/cygwin.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/cygwin.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Module::Build::Platform::Unix;
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/darwin.pm perl-5.10.0/lib/Module/Build/Platform/darwin.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/darwin.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/darwin.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Module::Build::Platform::Unix;
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/Platform/os2.pm perl-5.10.0/lib/Module/Build/Platform/os2.pm
+--- perl-5.10.0.orig/lib/Module/Build/Platform/os2.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Platform/os2.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use Module::Build::Platform::Unix;
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/PodParser.pm perl-5.10.0/lib/Module/Build/PodParser.pm
+--- perl-5.10.0.orig/lib/Module/Build/PodParser.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/PodParser.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use vars qw($VERSION);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ use vars qw(@ISA);
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/Version.pm perl-5.10.0/lib/Module/Build/Version.pm
+--- perl-5.10.0.orig/lib/Module/Build/Version.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/Version.pm	2009-03-10 16:45:37.000000000 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ 
+ use vars qw($VERSION);
+-$VERSION = 0.7203;
++$VERSION = 0.74;
+ 
+ eval "use version $VERSION";
+ if ($@) { # can't locate version files, use our own
+@@ -69,13 +69,12 @@
+ 
+ 1;
+ # replace everything from here to the end with the current version/vpp.pm
+-
+ package version::vpp;
+ use strict;
+ 
+ use locale;
+ use vars qw ($VERSION @ISA @REGEXS);
+-$VERSION = 0.7203;
++$VERSION = 0.76;
+ 
+ push @REGEXS, qr/
+ 	^v?	# optional leading 'v'
+@@ -93,6 +92,17 @@
+     'nomethod' => \&vnoop,
+ );
+ 
++my $VERSION_MAX = 0x7FFFFFFF;
++
++eval "use warnings";
++if ($@) {
++    eval '
++	package warnings;
++	sub enabled {return $^W;}
++	1;
++    ';
++}
++
+ sub new
+ {
+ 	my ($class, $value) = @_;
+@@ -145,6 +155,7 @@
+ 	my $alpha = 0;
+ 	my $width = 3;
+ 	my $saw_period = 0;
++	my $vinf = 0;
+ 	my ($start, $last, $pos, $s);
+ 	$s = 0;
+ 
+@@ -163,9 +174,8 @@
+ 	while ( substr($value,$pos,1) =~ /[._\d]/ ) {
+ 	    if ( substr($value,$pos,1) eq '.' ) {
+ 		if ($alpha) {
+-		    require Carp;
+ 		    Carp::croak("Invalid version format ".
+-		    	"(underscores before decimal)");
++		      "(underscores before decimal)");
+ 		}
+ 		$saw_period++;
+ 		$last = $pos;
+@@ -174,7 +184,7 @@
+ 		if ($alpha) {
+ 		    require Carp;
+ 		    Carp::croak("Invalid version format ".
+-		    	"(multiple underscores)");
++			"(multiple underscores)");
+ 		}
+ 		$alpha = 1;
+ 		$width = $pos - $last - 1; # natural width of sub-version
+@@ -184,18 +194,21 @@
+ 
+ 	if ( $alpha && !$saw_period ) {
+ 	    require Carp;
+-	    Carp::croak("Invalid version format (alpha without decimal)");
++	    Carp::croak("Invalid version format ".
++		"(alpha without decimal)");
+ 	}
+ 
+ 	if ( $alpha && $saw_period && $width == 0 ) {
+ 	    require Carp;
+-	    Carp::croak("Invalid version format (misplaced _ in number)");
++	    Carp::croak("Invalid version format ".
++		"(misplaced _ in number)");
+ 	}
+ 
+ 	if ( $saw_period > 1 ) {
+ 	    $qv = 1; # force quoted version processing
+ 	}
+ 
++	$last = $pos;
+ 	$pos = $s;
+ 
+ 	if ( $qv ) {
+@@ -235,9 +248,14 @@
+ 			    $orev = $rev;
+ 			    $rev += substr($value,$s,1) * $mult;
+ 			    $mult /= 10;
+-			    if ( abs($orev) > abs($rev) ) {
+-				require Carp;
+-				Carp::croak("Integer overflow in version");
++			    if (   abs($orev) > abs($rev) 
++				|| abs($rev) > abs($VERSION_MAX) ) {
++				if ( warnings::enabled("overflow") ) {
++				    require Carp;
++				    Carp::carp("Integer overflow in version");
++				}
++				$s = $end - 1;
++				$rev = $VERSION_MAX;
+ 			    }
+ 			    $s++;
+ 			    if ( substr($value,$s,1) eq '_' ) {
+@@ -250,9 +268,14 @@
+ 			    $orev = $rev;
+ 			    $rev += substr($value,$end,1) * $mult;
+ 			    $mult *= 10;
+-			    if ( abs($orev) > abs($rev) ) {
+-				require Carp;
+-				Carp::croak("Integer overflow in version");
++			    if (   abs($orev) > abs($rev) 
++				|| abs($rev) > abs($VERSION_MAX) ) {
++				if ( warnings::enabled("overflow") ) {
++				    require Carp;
++				    Carp::carp("Integer overflow in version");
++				}
++				$end = $s - 1;
++				$rev = $VERSION_MAX;
+ 			    }
+ 			}
+ 		    }
+@@ -300,12 +323,21 @@
+ 	}
+ 
+ 	if ( substr($value,$pos) ) { # any remaining text
+-	    warn "Version string '$value' contains invalid data; ".
+-	         "ignoring: '".substr($value,$pos)."'";
++	    if ( warnings::enabled("misc") ) {
++		require Carp;
++		Carp::carp("Version string '$value' contains invalid data; ".
++		     "ignoring: '".substr($value,$pos)."'");
++	    }
+ 	}
+ 
+ 	# cache the original value for use when stringification
+-	$self->{original} = substr($value,0,$pos);
++	if ( $vinf ) {
++	    $self->{vinf} = 1;
++	    $self->{original} = 'v.Inf';
++	}
++	else {
++	    $self->{original} = substr($value,0,$pos);
++	}
+ 
+ 	return ($self);
+ }
+@@ -394,7 +426,11 @@
+ 	require Carp;
+ 	Carp::croak("Invalid version object");
+     }
+-    return $self->{original};
++    return exists $self->{original} 
++    	? $self->{original} 
++	: exists $self->{qv} 
++	    ? $self->normal
++	    : $self->numify;
+ }
+ 
+ sub vcmp
+@@ -525,7 +561,8 @@
+ # Thanks to Yitzchak Scott-Thoennes for this mode of operation
+ {
+     local $^W;
+-    *UNIVERSAL::VERSION = sub {
++    *UNIVERSAL::VERSION # Module::Build::ModuleInfo doesn't see this now
++      = sub {
+ 	my ($obj, $req) = @_;
+ 	my $class = ref($obj) || $obj;
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/scripts/bundle.pl perl-5.10.0/lib/Module/Build/scripts/bundle.pl
+--- perl-5.10.0.orig/lib/Module/Build/scripts/bundle.pl	1970-01-01 01:00:00.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/scripts/bundle.pl	2009-03-10 16:45:37.000000000 +0100
+@@ -0,0 +1,53 @@
++#!/usr/bin/perl
++
++# this is just a first crack and it uses File::Fu because I'm lazy.
++
++=head1 using
++
++This installs from a fresh Module::Build to your inc/inc_Module-Build
++directory.  Use it from within your dist:
++
++  perl /path/to/Module-Build/scripts/bundle.pl
++
++You still need to manually add the following to your Build.PL
++
++  use lib 'inc';
++  use latest 'Module::Build';
++
++You also need to regen your manifest.
++
++  perl Build.PL
++  ./Build distmeta; >MANIFEST; ./Build manifest; svn diff MANIFEST
++
++=cut
++
++use warnings;
++use strict;
++
++use File::Fu;
++use File::Copy ();
++
++my $inc_dir = shift(@ARGV);
++$inc_dir = File::Fu->dir($inc_dir || 'inc/inc_Module-Build');
++$inc_dir->create unless($inc_dir->e);
++$inc_dir = $inc_dir->absolutely;
++
++
++my $mb_dir = File::Fu->program_dir->dirname;
++
++$mb_dir->chdir_for(sub {
++  my $temp = File::Fu->temp_dir('mb_bundle');
++  local @INC = @INC;
++  unshift(@INC, 'lib', 'inc');
++  require Module::Build;
++  my $builder = Module::Build->new_from_context;
++  $builder->dispatch(install =>
++    install_base => $temp,
++    install_path => {lib => $inc_dir},
++  );
++});
++
++my $latest = $mb_dir/'inc'+'latest.pm';
++File::Copy::copy($latest, 'inc');
++
++# vim:ts=2:sw=2:et:sta
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/add_property.t perl-5.10.0/lib/Module/Build/t/add_property.t
+--- perl-5.10.0.orig/lib/Module/Build/t/add_property.t	1970-01-01 01:00:00.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/add_property.t	2009-03-10 16:45:37.000000000 +0100
+@@ -0,0 +1,93 @@
++#!/usr/bin/perl -w
++
++use strict;
++use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
++use MBTest tests => 29;
++#use MBTest 'no_plan';
++use DistGen;
++
++BEGIN { use_ok 'Module::Build' or die; }
++ensure_blib 'Module::Build';
++
++my $tmp = MBTest->tmpdir;
++my $dist = DistGen->new( dir => $tmp );
++$dist->regen;
++$dist->chdir_in;
++
++ADDPROP: {
++  package My::Build::Prop;
++  use base 'Module::Build';
++  __PACKAGE__->add_property( 'foo' );
++  __PACKAGE__->add_property( 'bar', 'howdy' );
++  __PACKAGE__->add_property( 'baz', default => 'howdy' );
++  __PACKAGE__->add_property( 'code', default => sub { 'yay' } );
++  __PACKAGE__->add_property(
++    'check',
++    default => sub { 'howdy' },
++    check   => sub {
++      return 1 if $_ eq 'howdy';
++      shift->property_error(qq{"$_" is invalid});
++      return 0;
++    },
++  );
++  __PACKAGE__->add_property(
++    'hash',
++    default => { foo => 1 },
++    check   => sub {
++      return 1 if !defined $_ or exists $_->{foo};
++      shift->property_error(qq{hash is invalid});
++      return 0;
++    },
++  );
++}
++
++ok my $build = My::Build::Prop->new(
++  'module_name' => 'Simple',
++  quiet => 1,
++), 'Create new build object';
++
++is $build->foo, undef, 'Property "foo" should be undef';
++ok $build->foo(42), 'Set "foo"';
++is $build->foo, 42, 'Now "foo" should have new value';
++
++is $build->bar, 'howdy', 'Property "bar" should be its default';
++ok $build->bar('yo'), 'Set "bar"';
++is $build->bar, 'yo', 'Now "bar" should have new value';
++
++is $build->check, 'howdy', 'Property "check" should be its default';
++
++eval { $build->check('yo') };
++ok my $err = $@, 'Should get an error for an invalid value';
++like $err, qr/^ERROR: "yo" is invalid/, 'It should be the correct error';
++
++is $build->code, 'yay', 'Property "code" should have its code value';
++
++is_deeply $build->hash, { foo => 1 }, 'Property "hash" should be default';
++is $build->hash('foo'), 1, 'Should be able to get key in hash';
++ok $build->hash( bar => 3 ), 'Add a key to the hash prop';
++is_deeply $build->hash, { foo => 1, bar => 3 }, 'New key should be in hash';
++
++eval { $build->hash({ bar => 3 }) };
++ok $err = $@, 'Should get exception for assigning invalid hash';
++like $err, qr/^ERROR: hash is invalid/, 'It should be the correct error';
++
++eval { $build->hash( []) };
++ok $err = $@, 'Should get exception for assigning an array for a hash';
++like $err, qr/^Unexpected arguments for property 'hash'/,
++  'It should be the proper error';
++is $build->hash(undef), undef, 'Should be able to set hash to undef';
++
++# Check core properties.
++is $build->installdirs, 'site', 'Property "installdirs" should be default';
++ok $build->installdirs('core'), 'Set "installdirst" to "core"';
++is $build->installdirs, 'core', 'Now "installdirs" should be "core"';
++
++eval { $build->installdirs('perl') };
++ok $err = $@, 'Should have caught exception setting "installdirs" to "perl"';
++like $err, qr/^ERROR: Perhaps you meant installdirs to be "core" rather than "perl"\?/,
++  'And it should suggest "core" in the error message';
++
++eval { $build->installdirs('foo') };
++ok $err = $@, 'Should catch exception for invalid "installdirs" value';
++like $err, qr/ERROR: installdirs must be one of "core", "site", or "vendor"/,
++  'And it should suggest the proper values in the error message';
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/basic.t perl-5.10.0/lib/Module/Build/t/basic.t
+--- perl-5.10.0.orig/lib/Module/Build/t/basic.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/basic.t	2009-03-10 16:45:37.000000000 +0100
+@@ -4,27 +4,20 @@
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+ use MBTest tests => 52;
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
++
+ my $tmp = MBTest->tmpdir;
+ 
+ use DistGen;
+ my $dist = DistGen->new( dir => $tmp );
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ #########################
+ 
+ 
+-use_ok 'Module::Build';
+-
+-SKIP: {
+-  skip "no blib in core", 1 if $ENV{PERL_CORE};
+-  like $INC{'Module/Build.pm'}, qr/\bblib\b/, "Make sure Module::Build was loaded from blib/";
+-}
+-
+-
+ # Test object creation
+ {
+   my $mb = Module::Build->new( module_name => $dist->name );
+@@ -112,7 +105,7 @@
+   $mb->add_to_cleanup('save_out');
+   # Use uc() so we don't confuse the current test output
+   like uc(stdout_of( sub {$mb->dispatch('test', verbose => 1)} )), qr/^OK \d/m;
+-  like uc(stdout_of( sub {$mb->dispatch('test', verbose => 0)} )), qr/\.\.OK/;
++  like uc(stdout_of( sub {$mb->dispatch('test', verbose => 0)} )), qr/\.\. ?OK/;
+ 
+   $mb->dispatch('realclean');
+   $dist->clean;
+@@ -170,11 +163,10 @@
+   is $args{foo}, 1;
+ 
+   # revert test distribution to pristine state because we modified a file
+-  chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+   $dist->remove;
+   $dist = DistGen->new( dir => $tmp );
+   $dist->regen;
+-  chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++  $dist->chdir_in;
+ }
+ 
+ # Test author stuff
+@@ -213,8 +205,4 @@
+ 
+ 
+ # cleanup
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/bundled/Tie/CPHash.pm perl-5.10.0/lib/Module/Build/t/bundled/Tie/CPHash.pm
+--- perl-5.10.0.orig/lib/Module/Build/t/bundled/Tie/CPHash.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/bundled/Tie/CPHash.pm	2009-03-10 16:45:37.000000000 +0100
+@@ -5,7 +5,7 @@
+ #
+ # Author: Christopher J. Madsen <cjm@pobox.com>
+ # Created: 08 Nov 1997
+-# $Revision: 5841 $  $Date: 2006-03-21 07:27:29 -0600 (Tue, 21 Mar 2006) $
++# $Revision: 5841 $  $Date: 2006-03-21 05:27:29 -0800 (Tue, 21 Mar 2006) $
+ #
+ # 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/Module/Build/t/compat/exit.t perl-5.10.0/lib/Module/Build/t/compat/exit.t
+--- perl-5.10.0.orig/lib/Module/Build/t/compat/exit.t	1970-01-01 01:00:00.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/compat/exit.t	2009-03-10 16:50:35.000000000 +0100
+@@ -0,0 +1,52 @@
++#!/usr/bin/perl -w
++
++use strict;
++
++use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
++use MBTest tests => 5;
++
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
++
++#########################
++
++my $tmp = MBTest->tmpdir;
++
++# Create test distribution; set requires and build_requires
++use DistGen;
++my $dist = DistGen->new( dir => $tmp );
++
++$dist->regen;
++
++$dist->chdir_in;
++
++#########################
++
++my $mb; stdout_of(sub{ $mb = Module::Build->new_from_context});
++
++use Module::Build::Compat;
++
++$dist->regen;
++
++Module::Build::Compat->create_makefile_pl('passthrough', $mb);
++
++# as silly as all of this exit(0) business is, that is what the cpan
++# testers have instructed everybody to do so...
++$dist->change_file('Build.PL' =>
++  "warn qq(you have no libthbbt\n); exit;\n" . $dist->get_file('Build.PL')
++);
++
++$dist->regen;
++
++stdout_of(sub{ $mb->ACTION_realclean });
++
++my $result;
++my ($stdout, $stderr ) = stdout_stderr_of (sub {
++  $result = $mb->run_perl_script('Makefile.PL');
++});
++ok $result, "Makefile.PL exit";
++like $stdout, qr/running Build\.PL/;
++like $stderr, qr/you have no libthbbt$/;
++#warn "out: $stdout"; warn "err: $stderr";
++
++# vim:ts=2:sw=2:et:sta
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/compat.t perl-5.10.0/lib/Module/Build/t/compat.t
+--- perl-5.10.0.orig/lib/Module/Build/t/compat.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/compat.t	2009-03-10 16:50:35.000000000 +0100
+@@ -13,19 +13,24 @@
+ delete @ENV{@makefile_keys};
+ 
+ my @makefile_types = qw(small passthrough traditional);
+-my $tests_per_type = 14;
+-if ( $Config{make} && find_in_path($Config{make}) ) {
+-    plan tests => 38 + @makefile_types*$tests_per_type*2;
++my $tests_per_type = 15;
++
++#find_in_path does not understand VMS.
++
++if ( $Config{make} && $^O ne 'VMS' ? find_in_path($Config{make}) : 1 ) {
++    plan 'no_plan';
+ } else {
+     plan skip_all => "Don't know how to invoke 'make'";
+ }
+-ok 1, "Loaded";
++
++my $is_vms_mms = ($^O eq 'VMS') && ($Config{make} =~ /MM[SK]/i);
++
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
+ 
+ 
+ #########################
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
+ my $tmp = MBTest->tmpdir;
+ 
+ # Create test distribution; set requires and build_requires
+@@ -33,7 +38,7 @@
+ my $dist = DistGen->new( dir => $tmp );
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ 
+ #########################
+@@ -45,13 +50,21 @@
+ 
+ my @make = $Config{make} eq 'nmake' ? ('nmake', '-nologo') : ($Config{make});
+ 
++my $makefile = 'Makefile';
++
++# VMS MMK/MMS by convention use Descrip.MMS
++if ($is_vms_mms) {
++    $makefile = 'Descrip.MMS';
++}
++
++
+ #########################
+ 
+ # Test without requires
+ 
+ test_makefile_types();
+ 
+-# Test with requires
++# Test with requires and PL_files
+ 
+ my $distname = $dist->name;
+ $dist->change_build_pl({ 
+@@ -64,15 +77,26 @@
+   build_requires      => {
+     'Test::More'  => 0,
+   },
++  PL_files            => { 'foo.PL' => 'foo' },
+ });
+ 
++$dist->add_file("foo.PL", <<'END');
++open my $fh, ">$ARGV[0]" or die $!;
++print $fh "foo\n";
++END
++
+ $dist->regen;
+ 
+-test_makefile_types( requires => {
+-    'perl' => $],
+-    'File::Spec' => 0,
+-    'Test::More' => 0,
+-});
++test_makefile_types(
++    requires => {
++        'perl' => $],
++        'File::Spec' => 0,
++        'Test::More' => 0,
++    },
++    PL_files => {
++        'foo.PL' => 'foo',
++    },
++);
+ 
+ ######################
+ 
+@@ -95,7 +119,8 @@
+   # in older-generated Makefile.PLs
+   my $warning = '';
+   local $SIG{__WARN__} = sub { $warning = shift; };
+-  my $maketext = eval { Module::Build::Compat->fake_makefile(makefile => 'Makefile') };
++
++  my $maketext = eval { Module::Build::Compat->fake_makefile(makefile => $makefile) };
+   is $@, '', "fake_makefile lived";
+   like $maketext, qr/^realclean/m, "found 'realclean' in fake_makefile output";
+   like $warning, qr/build_class/, "saw warning about 'build_class'";
+@@ -142,7 +167,7 @@
+   # Make sure various Makefile.PL arguments are supported
+   Module::Build::Compat->create_makefile_pl('passthrough', $mb);
+ 
+-  my $libdir = File::Spec->catdir( $cwd, 't', 'libdir' );
++  my $libdir = File::Spec->catdir( $tmp, 'libdir' );
+   my $result;
+   stdout_of( sub {
+     $result = $mb->run_perl_script('Makefile.PL', [],
+@@ -171,20 +196,58 @@
+   like $output, qr/(?:# ok \d+\s+)+/, 'Should be verbose';
+ 
+   # Make sure various Makefile arguments are supported
+-  $output = stdout_of( sub { $ran_ok = $mb->do_system(@make, 'test', 'TEST_VERBOSE=0') } );
++  my $make_macro = 'TEST_VERBOSE=0';
++
++  # VMS MMK/MMS macros use different syntax.
++  if ($is_vms_mms) {
++    $make_macro = '/macro=("' . $make_macro . '")';
++  }
++
++  $output = stdout_of( sub {
++    local $ENV{HARNESS_TIMER}; # RT#39635 - timer messes with output
++    $ran_ok = $mb->do_system(@make, 'test', $make_macro)
++  } );
++
+   ok $ran_ok, "make test without verbose ran ok";
+   $output =~ s/^/# /gm;  # Don't confuse our own test output
+-  like $output, qr/(?:# .+basic\.+ok\s+(?:[\d.]+\s*m?s\s*)?)# All tests/,
+-      'Should be non-verbose';
++  like $output,
++       qr/# .+basic(\.t)?[.\s#]+ok[.\s#]+All tests successful/,
++       'Should be non-verbose';
++
++  (my $libdir2 = $libdir) =~ s/libdir/lbiidr/;
++
++  SKIP: {
++    require ExtUtils::Install;
++    skip "Needs ExtUtils::Install 1.32 or later", 2
++      if ExtUtils::Install->VERSION < 1.32;
++
++    my @make_args = ('INSTALLDIRS=vendor', "INSTALLVENDORLIB=$libdir2");
++
++    if ($is_vms_mms) { # VMS MMK/MMS macros use different syntax.
++      $make_args[0] = '/macro=("' . join('","',@make_args) . '")';
++      pop @make_args while scalar(@make_args) > 1;
++    }
++
++    ($output) = stdout_stderr_of(
++      sub {
++        $ran_ok = $mb->do_system(@make, 'fakeinstall', @make_args);
++      }
++    );
+ 
+-  $mb->delete_filetree($libdir);
+-  ok ! -e $libdir, "Sample installation directory should be cleaned up";
++    ok $ran_ok, "make fakeinstall with INSTALLDIRS=vendor ran ok";
++    $output =~ s/^/# /gm;  # Don't confuse our own test output
++    like $output,
++        qr/\Q$libdir2\E .* Simple\.pm/x,
++        'Should have installdirs=vendor';
++  }
+ 
+   stdout_of( sub { $mb->do_system(@make, 'realclean'); } );
+-  ok ! -e 'Makefile', "Makefile shouldn't exist";
++  ok ! -e $makefile, "$makefile shouldn't exist";
+ 
+   1 while unlink 'Makefile.PL';
+   ok ! -e 'Makefile.PL', "Makefile.PL cleaned up";
++
++  1 while unlink $libdir, $libdir2;
+ }
+ 
+ { # Make sure tilde-expansion works
+@@ -202,17 +265,21 @@
+   unlike $b2->install_base, qr/^~/, "Tildes should be expanded";
+   
+   stdout_of( sub { $mb->do_system(@make, 'realclean'); } );
+-  ok ! -e 'Makefile', "Makefile shouldn't exist";
++  ok ! -e $makefile, "$makefile shouldn't exist";
+ 
+   1 while unlink 'Makefile.PL';
+   ok ! -e 'Makefile.PL', "Makefile.PL cleaned up";
+ }
+ 
++# cleanup
++$dist->remove;
++
+ #########################################################
+ 
+ sub test_makefile_types {
+   my %opts = @_;
+   $opts{requires} ||= {};
++  $opts{PL_files} ||= {};
+ 
+   foreach my $type (@makefile_types) {
+     # Create M::B instance 
+@@ -228,6 +295,7 @@
+     test_makefile_pl_requires_perl( $opts{requires}{perl} );
+     test_makefile_creation($mb);
+     test_makefile_prereq_pm( $opts{requires} );
++    test_makefile_pl_files( $opts{PL_files} ) if $type eq 'traditional';
+       
+     my ($output,$success);
+     # Capture output to keep our STDOUT clean
+@@ -236,6 +304,10 @@
+     });
+     ok $success, "make ran without error";
+ 
++    for my $file (values %{ $opts{PL_files} }) {
++        ok -e $file, "PL_files generated - $file";
++    }
++
+     # Can't let 'test' STDOUT go to our STDOUT, or it'll confuse Test::Harness.
+     $output = stdout_of( sub {
+       $success = $mb->do_system(@make, 'test');
+@@ -269,13 +341,13 @@
+     $label .= " (postargs: $postargs)";
+   }
+   ok $result, $label;
+-  ok -e 'Makefile', "Makefile exists";
++  ok -e $makefile, "$makefile exists";
+   
+   if ($cleanup) {
+     $output = stdout_of( sub {
+       $build->do_system(@make, 'realclean');
+     });
+-    ok ! -e 'Makefile', "Makefile cleaned up";
++    ok ! -e '$makefile', "$makefile cleaned up";
+   }
+   else {
+     pass '(skipping cleanup)'; # keep test count constant
+@@ -286,10 +358,21 @@
+   my %requires = %{ $_[0] };
+   delete $requires{perl}; # until EU::MM supports this
+   SKIP: {
+-    skip 'Makefile not found', 1 unless -e 'Makefile';
+-    my $prereq_pm = find_makefile_prereq_pm();
++    skip "$makefile not found", 1 unless -e $makefile;
++    my $prereq_pm = find_params_in_makefile()->{PREREQ_PM} || {};
+     is_deeply $prereq_pm, \%requires,
+-      "Makefile has correct PREREQ_PM line";
++      "$makefile has correct PREREQ_PM line";
++  }
++}
++
++sub test_makefile_pl_files {
++  my $expected = shift;
++
++  SKIP: {
++    skip "$makefile not found", 1 unless -e $makefile;
++    my $pl_files = find_params_in_makefile()->{PL_FILES} || {};
++    is_deeply $pl_files, $expected,
++      "$makefile has correct PL_FILES line";
+   }
+ }
+ 
+@@ -309,37 +392,28 @@
+   }
+ }
+ 
+-# Following subroutine adapted from code in CPAN.pm 
+-# by Andreas Koenig and A. Speer.
+-sub find_makefile_prereq_pm {
+-  my $fh = IO::File->new( 'Makefile', 'r' ) 
+-    or die "Can't read Makefile: $!";
+-  my $req = {};
++sub find_params_in_makefile {
++  my $fh = IO::File->new( $makefile, 'r' ) 
++    or die "Can't read $makefile: $!";
+   local($/) = "\n";
++
++  my %params;
+   while (<$fh>) {
+-    # locate PREREQ_PM
+-    last if /MakeMaker post_initialize section/;
+-    my($p) = m{^[\#]
+-      \s+PREREQ_PM\s+=>\s+(.+)
+-    }x;
+-    next unless $p;
++    # Blank line after params.
++    last if keys %params and !/\S+/;
++
++    next unless m{^\# \s+ ( [A-Z_]+ ) \s+ => \s+ ( .* )$}x;
+ 
+-    # extract modules
+-    while ( $p =~ m/(?:\s)([\w\:]+)=>(q\[.*?\]|undef),?/g ){
++    my($key, $val) = ($1, $2);
++    # extract keys and values
++    while ( $val =~ m/(?:\s)(\S+)=>(q\[.*?\]|undef),?/g ) {
+       my($m,$n) = ($1,$2);
+       if ($n =~ /^q\[(.*?)\]$/) {
+         $n = $1;
+       }
+-      $req->{$m} = $n;
++      $params{$key}{$m} = $n;
+     }
+-    last;
+   }
+-  return $req;
+-}
+ 
+-# cleanup
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+-$dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
++  return \%params;
++}
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/destinations.t perl-5.10.0/lib/Module/Build/t/destinations.t
+--- perl-5.10.0.orig/lib/Module/Build/t/destinations.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/destinations.t	2009-03-10 16:45:37.000000000 +0100
+@@ -2,17 +2,18 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 113;
++use MBTest tests => 115;
++
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
+ my $tmp = MBTest->tmpdir;
+ 
+ use DistGen;
+ my $dist = DistGen->new( dir => $tmp );
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ 
+ use Config;
+@@ -23,7 +24,6 @@
+ # We need to create a well defined environment to test install paths.
+ # We do this by setting up appropriate Config entries.
+ 
+-use Module::Build;
+ my @installstyle = qw(lib perl5);
+ my $mb = Module::Build->new_from_context(
+   installdirs => 'site',
+@@ -321,8 +321,4 @@
+ }
+ 
+ 
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/ext.t perl-5.10.0/lib/Module/Build/t/ext.t
+--- perl-5.10.0.orig/lib/Module/Build/t/ext.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/ext.t	2009-03-10 16:50:35.000000000 +0100
+@@ -4,10 +4,15 @@
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+ use MBTest;
+ 
++use Module::Build;
++
+ my @unix_splits = 
+   (
+    { q{one t'wo th'ree f"o\"ur " "five" } => [ 'one', 'two three', 'fo"ur ', 'five' ] },
+    { q{ foo bar }                         => [ 'foo', 'bar'                         ] },
++   { q{ D\'oh f\{g\'h\"i\]\* }            => [ "D'oh", "f{g'h\"i]*"                 ] },
++   { q{ D\$foo }                          => [ 'D$foo'                              ] },
++   { qq{one\\\ntwo}                       => [ "one\ntwo"                           ] },  # TODO
+   );
+ 
+ my @win_splits = 
+@@ -53,12 +58,11 @@
+    { 'a " b " c'            => [ 'a', ' b ', 'c' ] },
+ );
+ 
+-plan tests => 10 + 2*@unix_splits + 2*@win_splits;
++plan tests => 10 + 4*@unix_splits + 4*@win_splits;
+ 
+-#########################
++ensure_blib('Module::Build');
+ 
+-use Module::Build;
+-ok(1);
++#########################
+ 
+ # Should always return an array unscathed
+ foreach my $platform ('', '::Platform::Unix', '::Platform::Windows') {
+@@ -68,8 +72,13 @@
+   is "@result", "foo bar baz", "Split using $pkg";
+ }
+ 
++# I think 3.24 isn't actually the majik version, my 3.23 seems to pass...
++my $low_TPW_version = Text::ParseWords->VERSION < 3.24;
+ use Module::Build::Platform::Unix;
+ foreach my $test (@unix_splits) {
++  # Text::ParseWords bug:
++  local $TODO = $low_TPW_version && ((keys %$test)[0] =~ m{\\\n});
++
+   do_split_tests('Module::Build::Platform::Unix', $test);
+ }
+ 
+@@ -94,13 +103,43 @@
+ }
+ 
+ {
++  # Make sure data can make a round-trip through an external perl
++  # process, which can involve the shell command line
++
++  # silence the printing for easier matching
++  local *Module::Build::log_info = sub {};
++
++  my @data = map values(%$_), @unix_splits, @win_splits;
++  for my $d (@data) {
++    my $out = stdout_of
++      ( sub {
++	  Module::Build->run_perl_script('-le', [], ['print join " ", map "{$_}", @ARGV', @$d]);
++	} );
++    chomp $out;
++    is($out, join(' ', map "{$_}", @$d), "perl round trip for ".join('',map "{$_}", @$d));
++  }
++}
++
++{
++  # Make sure data can make a round-trip through an external backtick
++  # process, which can involve the shell command line
++
++  # silence the printing for easier matching
++  local *Module::Build::log_info = sub {};
++
++  my @data = map values(%$_), @unix_splits, @win_splits;
++  for my $d (@data) {
++    chomp(my $out = Module::Build->_backticks('perl', '-le', 'print join " ", map "{$_}", @ARGV', @$d));
++    is($out, join(' ', map "{$_}", @$d), "backticks round trip for ".join('',map "{$_}", @$d));
++  }
++}
++
++{
+   # Make sure run_perl_script() propagates @INC
+-  my $dir = 'whosiewhatzit';
+-  mkdir $dir, 0777;
++  my $dir = MBTest->tmpdir;
+   local @INC = ($dir, @INC);
+-  my $output = stdout_of( sub { Module::Build->run_perl_script('', ['-le', 'print for @INC']) } );
+-  like $output, qr{^$dir}m;
+-  rmdir $dir;
++  my $output = stdout_of( sub { Module::Build->run_perl_script('-le', [], ['print for @INC']) } );
++  like $output, qr{^\Q$dir\E}m;
+ }
+ 
+ ##################################################################
+@@ -112,5 +151,7 @@
+   is( 0 + grep( !defined(), @result ), # all defined
+       0,
+       "'$string' result all defined" );
+-  is_deeply(\@result, $expected);
++  is_deeply(\@result, $expected) or
++    diag("$package split_like_shell error \n" .
++      ">$string< is not splitting as >" . join("|", @$expected) . '<');
+ }
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/extend.t perl-5.10.0/lib/Module/Build/t/extend.t
+--- perl-5.10.0.orig/lib/Module/Build/t/extend.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/extend.t	2009-03-10 16:45:37.000000000 +0100
+@@ -2,23 +2,21 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 65;
++use MBTest tests => 66;
++
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
+ my $tmp = MBTest->tmpdir;
+ 
+ use DistGen;
+ my $dist = DistGen->new( dir => $tmp );
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ #########################
+ 
+-use Module::Build;
+-ok 1;
+-
+ # Here we make sure actions are only called once per dispatch()
+ $::x = 0;
+ my $mb = Module::Build->subclass
+@@ -276,8 +274,4 @@
+ }
+ 
+ # cleanup
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/files.t perl-5.10.0/lib/Module/Build/t/files.t
+--- perl-5.10.0.orig/lib/Module/Build/t/files.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/files.t	2009-03-10 16:50:35.000000000 +0100
+@@ -4,49 +4,36 @@
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+ use MBTest tests => 6;
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
++
++use IO::File;
+ my $tmp = MBTest->tmpdir;
+ 
+ use DistGen;
+ my $dist = DistGen->new( dir => $tmp );
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+-
+-use IO::File;
+-
+-
+-use Module::Build;
+ my $mb = Module::Build->new_from_context;
+-my @files;
+ 
+ {
+   # Make sure copy_if_modified() can handle spaces in filenames
+   
+   my @tmp;
+-  foreach (1..2) {
+-    my $tmp = File::Spec->catdir('t', "tmp$_");
+-    $mb->add_to_cleanup($tmp);
+-    push @files, $tmp;
+-    unless (-d $tmp) {
+-      mkdir($tmp, 0777) or die "Can't create $tmp: $!";
+-    }
+-    ok -d $tmp;
+-    $tmp[$_] = $tmp;
+-  }
++  push @tmp, MBTest->tmpdir for (0 .. 1);
+   
+   my $filename = 'file with spaces.txt';
+   
+-  my $file = File::Spec->catfile($tmp[1], $filename);
++  my $file = File::Spec->catfile($tmp[0], $filename);
+   my $fh = IO::File->new($file, '>') or die "Can't create $file: $!";
+   print $fh "Foo\n";
+   $fh->close;
+   ok -e $file;
+   
+   
+-  my $file2 = $mb->copy_if_modified(from => $file, to_dir => $tmp[2]);
++  my $file2 = $mb->copy_if_modified(from => $file, to_dir => $tmp[1]);
+   ok $file2;
+   ok -e $file2;
+ }
+@@ -60,8 +47,4 @@
+ }
+ 
+ # cleanup
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/help.t perl-5.10.0/lib/Module/Build/t/help.t
+--- perl-5.10.0.orig/lib/Module/Build/t/help.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/help.t	2009-03-10 16:45:37.000000000 +0100
+@@ -2,7 +2,10 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest 'no_plan';#tests => 0;
++use MBTest tests => 25;
++
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
+ 
+ use Cwd ();
+ use File::Path ();
+@@ -31,8 +34,6 @@
+ 
+ chdir($dist->dirname) or die "Can't chdir to '@{[$dist->dirname]}': $!";
+ 
+-use_ok 'Module::Build';
+-
+ ########################################################################
+ { # check the =item style
+ my $mb = Module::Build->subclass(
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/install.t perl-5.10.0/lib/Module/Build/t/install.t
+--- perl-5.10.0.orig/lib/Module/Build/t/install.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/install.t	2009-03-10 16:45:37.000000000 +0100
+@@ -2,8 +2,12 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 34;
++use MBTest tests => 36;
+ 
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
++
++use Config;
+ use Cwd ();
+ my $cwd = Cwd::cwd;
+ my $tmp = MBTest->tmpdir;
+@@ -11,14 +15,10 @@
+ use DistGen;
+ my $dist = DistGen->new( dir => $tmp );
+ $dist->regen;
+-
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ #########################
+ 
+-use Module::Build;
+-use Config;
+-
+ 
+ $dist->add_file( 'script', <<'---' );
+ #!perl -w
+@@ -225,11 +225,10 @@
+   is keys %$pms, 0;
+ 
+   # revert to pristine state
+-  chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+   $dist->remove;
+   $dist = DistGen->new( dir => $tmp );
+   $dist->regen;
+-  chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++  $dist->chdir_in;
+ }
+ 
+ sub strip_volume {
+@@ -246,8 +245,4 @@
+ 
+ 
+ # cleanup
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/lib/DistGen.pm perl-5.10.0/lib/Module/Build/t/lib/DistGen.pm
+--- perl-5.10.0.orig/lib/Module/Build/t/lib/DistGen.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/lib/DistGen.pm	2009-03-10 16:50:35.000000000 +0100
+@@ -8,6 +8,8 @@
+ $VERBOSE = 0;
+ 
+ 
++use Carp;
++
+ use Cwd ();
+ use File::Basename ();
+ use File::Find ();
+@@ -18,11 +20,11 @@
+ use Data::Dumper;
+ 
+ BEGIN {
+-    if( $^O eq 'VMS' ) {
+-        # For things like vmsify()
+-        require VMS::Filespec;
+-        VMS::Filespec->import;
+-    }
++  if( $^O eq 'VMS' ) {
++    # For things like vmsify()
++    require VMS::Filespec;
++    VMS::Filespec->import;
++  }
+ }
+ BEGIN {
+   require Exporter;
+@@ -32,6 +34,16 @@
+   );
+ }
+ 
++sub undent {
++  my ($string) = @_;
++
++  my ($space) = $string =~ m/^(\s+)/;
++  $string =~ s/^$space//gm;
++
++  return($string);
++}
++########################################################################
++
+ sub new {
+   my $package = shift;
+   my %options = @_;
+@@ -46,6 +58,9 @@
+   );
+   my $self = bless( \%data, $package );
+ 
++  # So we can clean up later even if the caller chdir()s
++  $self->{dir} = File::Spec->rel2abs($self->{dir});
++
+   tie %{$self->{filedata}}, 'Tie::CPHash';
+ 
+   tie %{$self->{pending}{change}}, 'Tie::CPHash';
+@@ -60,16 +75,6 @@
+   return $self;
+ }
+ 
+-# not a method
+-sub undent {
+-  my ($string) = @_;
+-
+-  my ($space) = $string =~ m/^(\s+)/;
+-  $string =~ s/^$space//gm;
+-
+-  return($string);
+-}
+-
+ sub _gen_default_filedata {
+   my $self = shift;
+ 
+@@ -180,14 +185,14 @@
+           OUTPUT:
+               RETVAL
+ 
+-      char *
++      const char *
+       xs_version()
+           CODE:
+         RETVAL = XS_VERSION;
+           OUTPUT:
+         RETVAL
+ 
+-      char *
++      const char *
+       version()
+           CODE:
+         RETVAL = VERSION;
+@@ -195,6 +200,11 @@
+         RETVAL
+       ---
+ 
++  # 5.6 is missing const char * in its typemap
++  $self->$add_unless('typemap', undent(<<"      ---"));
++      const char *              T_PV
++      ---
++
+   $self->$add_unless('t/basic.t', undent(<<"    ---"));
+     use Test::More tests => 2;
+     use strict;
+@@ -358,7 +368,11 @@
+ 
+ sub remove {
+   my $self = shift;
+-  File::Path::rmtree( File::Spec->canonpath($self->dirname) );
++  croak("invalid usage -- remove()") if(@_);
++  $self->chdir_original if($self->did_chdir);
++  File::Path::rmtree( $self->dirname );
++  # might as well check
++  croak("\nthis test should have used chdir_in()") unless(Cwd::getcwd);
+ }
+ 
+ sub revert {
+@@ -391,6 +405,12 @@
+     use strict;
+     use Module::Build;
+     my \$b = Module::Build->new(
++    # Some CPANPLUS::Dist::Build versions need to allow mismatches 
++    # On logic: thanks to Module::Install, CPAN.pm must set both keys, but
++    # CPANPLUS sets only the one
++    allow_mb_mismatch => ( 
++      \$ENV{PERL5_CPANPLUS_IS_RUNNING} && ! \$ENV{PERL5_CPAN_IS_RUNNING} ? 1 : 0
++    ),
+     $args
+     );
+     \$b->create_build_script();
+@@ -405,6 +425,38 @@
+   $self->{pending}{change}{$file} = 1;
+ }
+ 
++sub get_file {
++  my $self = shift;
++  my $file = shift;
++  exists($self->{filedata}{$file}) or croak("no such entry: '$file'");
++  return $self->{filedata}{$file};
++}
++
++sub chdir_in {
++  my $self = shift;
++
++  $self->{original_dir} ||= Cwd::cwd; # only once
++  my $dir = $self->dirname;
++  chdir($dir) or die "Can't chdir to '$dir': $!";
++}
++########################################################################
++
++sub did_chdir {
++  my $self = shift;
++
++  return exists($self->{original_dir});
++}
++########################################################################
++
++sub chdir_original {
++  my $self = shift;
++
++  croak("never called chdir_in()") unless($self->{original_dir});
++  my $dir = $self->{original_dir};
++  chdir($dir) or die "Can't chdir to '$dir': $!";
++}
++########################################################################
++
+ 1;
+ 
+ __END__
+@@ -482,6 +534,19 @@
+ If the optional C<clean> argument is given, it also removes any
+ extraneous files that do not belong to the distribution.
+ 
++=head2 chdir_in
++
++Change directory into the dist root.
++
++  $dist->chdir_in;
++
++=head2 chdir_original
++
++Returns to whatever directory you were in before chdir_in() (regardless
++of the cwd.)
++
++  $dist->chdir_original;
++
+ =head3 clean()
+ 
+ Removes any files that are not part of the distribution.
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/lib/MBTest.pm perl-5.10.0/lib/Module/Build/t/lib/MBTest.pm
+--- perl-5.10.0.orig/lib/Module/Build/t/lib/MBTest.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/lib/MBTest.pm	2009-03-10 16:50:35.000000000 +0100
+@@ -3,23 +3,61 @@
+ use strict;
+ 
+ use File::Spec;
++use File::Temp ();
+ use File::Path ();
+ 
++
++# Setup the code to clean out %ENV
++BEGIN {
++    # Environment variables which might effect our testing
++    my @delete_env_keys = qw(
++        DEVEL_COVER_OPTIONS
++        MODULEBUILDRC
++        HARNESS_TIMER
++        HARNESS_OPTIONS
++        HARNESS_VERBOSE
++        PREFIX
++        INSTALL_BASE
++        INSTALLDIRS
++    );
++
++    # Remember the ENV values because on VMS %ENV is global
++    # to the user, not the process.
++    my %restore_env_keys;
++
++    sub clean_env {
++        for my $key (@delete_env_keys) {
++            if( exists $ENV{$key} ) {
++                $restore_env_keys{$key} = delete $ENV{$key};
++            }
++            else {
++                delete $ENV{$key};
++            }
++        }
++    }
++
++    END {
++        while( my($key, $val) = each %restore_env_keys ) {
++            $ENV{$key} = $val;
++        }
++    }
++}
++
++
+ BEGIN {
+-  # Make sure none of our tests load the users ~/.modulebuildrc file
+-  $ENV{MODULEBUILDRC} = 'NONE';
++  clean_env();
+ 
+-  # In case the test wants to use Test::More or our other bundled
+-  # modules, make sure they can be loaded.  They'll still do "use
+-  # Test::More" in the test script.
++  # In case the test wants to use our other bundled
++  # modules, make sure they can be loaded.
+   my $t_lib = File::Spec->catdir('t', 'bundled');
+ 
+   unless ($ENV{PERL_CORE}) {
+     push @INC, $t_lib; # Let user's installed version override
+   } else {
+-    # We change directories, so expand @INC to absolute paths
++    # We change directories, so expand @INC and $^X to absolute paths
+     # Also add .
+     @INC = (map(File::Spec->rel2abs($_), @INC), ".");
++    $^X = File::Spec->rel2abs($^X);
+ 
+     # we are in 't', go up a level so we don't create t/t/_tmp
+     chdir '..' or die "Couldn't chdir to ..";
+@@ -54,22 +92,22 @@
+   find_in_path
+   check_compiler
+   have_module
++  ensure_blib
+ );
+ push @EXPORT, @extra_exports;
+ __PACKAGE__->export(scalar caller, @extra_exports);
+ # XXX ^-- that should really happen in import()
++
++
+ ########################################################################
+ 
+-{ # Setup a temp directory if it doesn't exist
++# always return to the current directory
++{ 
+   my $cwd = Cwd::cwd;
+-  my $tmp = File::Spec->catdir( $cwd, 't', '_tmp' . $$);
+-  mkdir $tmp, 0777 unless -d $tmp;
+ 
+-  sub tmpdir { $tmp }
+   END {
+-    if(-d $tmp) {
+-      File::Path::rmtree($tmp) or warn "cannot clean dir '$tmp'";
+-    }
++    # Go back to where you came from!
++    chdir $cwd or die "Couldn't chdir to $cwd";
+   }
+ }
+ ########################################################################
+@@ -83,6 +121,13 @@
+ }
+ ########################################################################
+ 
++# Setup a temp directory 
++sub tmpdir { 
++  return File::Temp::tempdir( 'MB-XXXXXXXX', 
++    CLEANUP => 1, DIR => File::Spec->tmpdir 
++  );
++}
++
+ sub save_handle {
+   my ($handle, $subr) = @_;
+   my $outfile = temp_file_name();
+@@ -163,5 +208,20 @@
+   return eval "use $module; 1";
+ }
+ 
++sub ensure_blib {
++  # Make sure the given module was loaded from blib/, not the larger system
++  my $mod = shift;
++  (my $path = $mod) =~ s{::}{/}g;
++ 
++  local $Test::Builder::Level = $Test::Builder::Level + 1; 
++ SKIP: {
++    skip "no blib in core", 1 if $ENV{PERL_CORE};
++    like $INC{"$path.pm"}, qr/\bblib\b/, "Make sure $mod was loaded from blib/"
++      or diag "PERL5LIB: " . ($ENV{PERL5LIB} || '') . "\n" .
++              "PERL5OPT: " . ($ENV{PERL5OPT} || '') . "\n" .
++              "\@INC contains:\n  " . join("\n  ", @INC) . "\n"; 
++  }
++}
++
+ 1;
+ # vim:ts=2:sw=2:et:sta
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/manifypods.t perl-5.10.0/lib/Module/Build/t/manifypods.t
+--- perl-5.10.0.orig/lib/Module/Build/t/manifypods.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/manifypods.t	2009-03-10 16:45:37.000000000 +0100
+@@ -7,10 +7,12 @@
+ use Module::Build::ConfigData;
+ 
+ if ( Module::Build::ConfigData->feature('manpage_support') ) {
+-  plan tests => 21;
++  plan tests => 22;
+ } else {
+   plan skip_all => 'manpage_support feature is not enabled';
+ }
++ensure_blib('Module::Build');
++
+ 
+ #########################
+ 
+@@ -55,7 +57,7 @@
+ $dist->regen;
+ 
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ use File::Spec::Functions qw( catdir );
+ my $destdir = catdir($cwd, 't', 'install_test' . $$);
+@@ -137,11 +139,10 @@
+ 
+ 
+ # revert to a pristine state
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+ $dist = DistGen->new( dir => $tmp );
+ $dist->regen;
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ 
+ my $mb2 = Module::Build->new(
+@@ -164,8 +165,4 @@
+ 
+ 
+ # cleanup
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/mbyaml.t perl-5.10.0/lib/Module/Build/t/mbyaml.t
+--- perl-5.10.0.orig/lib/Module/Build/t/mbyaml.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/mbyaml.t	2009-03-10 16:45:37.000000000 +0100
+@@ -4,12 +4,14 @@
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+ use MBTest 'no_plan';
+ 
++use_ok 'Module::Build::YAML';
++ensure_blib('Module::Build::YAML');
++
+ my ($dir);
+ $dir = ".";
+ $dir = "t" if (-d "t");
+ 
+ {
+-    use_ok("Module::Build::YAML");
+     my ($expected, $got, $var);
+     ##########################################################
+     # Test a typical-looking Module::Build structure (alphabetized)
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/metadata.t perl-5.10.0/lib/Module/Build/t/metadata.t
+--- perl-5.10.0.orig/lib/Module/Build/t/metadata.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/metadata.t	2009-03-10 16:45:37.000000000 +0100
+@@ -2,14 +2,13 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 49;
++use MBTest tests => 51;
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
+-my $tmp = MBTest->tmpdir;
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
+ 
++my $tmp = MBTest->tmpdir;
+ 
+-use Module::Build;
+ use Module::Build::ConfigData;
+ 
+ my %metadata = 
+@@ -45,7 +44,7 @@
+    }
+ 
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ use Module::Build;
+ my $mb = Module::Build->new_from_context;
+@@ -582,8 +581,4 @@
+ 
+ ############################################################
+ # cleanup
+-chdir( $cwd ) or die "Can't chdir to '$cwd': $!";
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/metadata2.t perl-5.10.0/lib/Module/Build/t/metadata2.t
+--- perl-5.10.0.orig/lib/Module/Build/t/metadata2.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/metadata2.t	2009-03-10 16:45:37.000000000 +0100
+@@ -2,13 +2,13 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 18;
++use MBTest tests => 20;
++
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
+ my $tmp = MBTest->tmpdir;
+ 
+-use Module::Build;
+ use Module::Build::ConfigData;
+ use DistGen;
+ 
+@@ -22,7 +22,7 @@
+   my $dist = DistGen->new( dir => $tmp, skip_manifest => 1 );
+   $dist->regen;
+ 
+-  chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++  $dist->chdir_in;
+ 
+   ok ! -e 'MANIFEST';
+ 
+@@ -36,7 +36,6 @@
+ 
+   ok -e 'META.yml';
+ 
+-  chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+   $dist->remove;
+ }
+ 
+@@ -74,7 +73,7 @@
+ });
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ 
+ # .pm File with pod
+@@ -143,8 +142,4 @@
+ 
+ ############################################################
+ # cleanup
+-chdir( $cwd ) or die "Can't chdir to '$cwd': $!";
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/moduleinfo.t perl-5.10.0/lib/Module/Build/t/moduleinfo.t
+--- perl-5.10.0.orig/lib/Module/Build/t/moduleinfo.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/moduleinfo.t	2009-03-10 16:45:37.000000000 +0100
+@@ -1,24 +1,24 @@
+ #!/usr/bin/perl -w
++# -*- mode: cperl; tab-width: 8; indent-tabs-mode: nil; basic-offset: 2 -*-
++# vim:ts=8:sw=2:et:sta:sts=2
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 81;
++use MBTest tests => 82;
++
++use_ok 'Module::Build::ModuleInfo';
++ensure_blib('Module::Build::ModuleInfo');
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
+ my $tmp = MBTest->tmpdir;
+ 
+ use DistGen;
+ my $dist = DistGen->new( dir => $tmp );
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ #########################
+ 
+-
+-use_ok( 'Module::Build::ModuleInfo' );
+-
+ # class method C<find_module_by_name>
+ my $module = Module::Build::ModuleInfo->find_module_by_name(
+                'Module::Build::ModuleInfo' );
+@@ -199,11 +199,10 @@
+ }
+ 
+ # revert to pristine state
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+ $dist = DistGen->new( dir => $tmp );
+ $dist->regen;
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ 
+ # Find each package only once
+@@ -258,11 +257,10 @@
+ ok( $pm_info->version > 1.23, 'alpha version greater than non');
+ 
+ # revert to pristine state
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+ $dist = DistGen->new( dir => $tmp );
+ $dist->regen;
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ 
+ # parse $VERSION lines scripts for package main
+@@ -427,8 +425,4 @@
+ 
+ 
+ # cleanup
+-chdir( $cwd ) or die "Can't chdir to '$cwd': $!";
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/new_from_context.t perl-5.10.0/lib/Module/Build/t/new_from_context.t
+--- perl-5.10.0.orig/lib/Module/Build/t/new_from_context.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/new_from_context.t	2009-03-10 16:45:37.000000000 +0100
+@@ -2,10 +2,12 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 2;
++use MBTest tests => 4;
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
++
++use IO::File;
+ my $tmp = MBTest->tmpdir;
+ 
+ use DistGen;
+@@ -15,10 +17,8 @@
+ $dist->add_file("$libdir/Build.PL", 'die');
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+-use IO::File;
+-use Module::Build;
+ 
+ unshift(@INC, $libdir);
+ my $mb = eval { Module::Build->new_from_context};
+@@ -26,10 +26,6 @@
+ ok($mb);
+ 
+ # cleanup
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+ 
+-use File::Path;
+-rmtree( $tmp );
+-
+ # vim:ts=2:sw=2:et:sta
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/notes.t perl-5.10.0/lib/Module/Build/t/notes.t
+--- perl-5.10.0.orig/lib/Module/Build/t/notes.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/notes.t	2009-03-10 16:45:37.000000000 +0100
+@@ -2,20 +2,19 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 11;
++use MBTest tests => 13;
++
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
+ my $tmp = MBTest->tmpdir;
+ 
+ use DistGen;
+ my $dist = DistGen->new( dir => $tmp );
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
+-
++$dist->chdir_in;
+ 
+-use Module::Build;
+ 
+ ###################################
+ $dist->change_file( 'Build.PL', <<"---" );
+@@ -68,8 +67,4 @@
+ 
+ 
+ # cleanup
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/parents.t perl-5.10.0/lib/Module/Build/t/parents.t
+--- perl-5.10.0.orig/lib/Module/Build/t/parents.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/parents.t	2009-03-10 16:45:37.000000000 +0100
+@@ -2,12 +2,12 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 27;
++use MBTest tests => 28;
+ 
+-#########################
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
+ 
+-use Module::Build;
+-ok(1);
++#########################
+ 
+ package Foo;
+ sub foo;
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/pod_parser.t perl-5.10.0/lib/Module/Build/t/pod_parser.t
+--- perl-5.10.0.orig/lib/Module/Build/t/pod_parser.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/pod_parser.t	2009-03-10 16:45:37.000000000 +0100
+@@ -2,15 +2,13 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 7;
++use MBTest tests => 8;
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
++use_ok 'Module::Build::PodParser';
++ensure_blib('Module::Build::PodParser');
+ 
+ #########################
+ 
+-use_ok 'Module::Build::PodParser';
+-
+ {
+   package IO::StringBased;
+   
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/ppm.t perl-5.10.0/lib/Module/Build/t/ppm.t
+--- perl-5.10.0.orig/lib/Module/Build/t/ppm.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/ppm.t	2009-03-10 16:45:37.000000000 +0100
+@@ -3,13 +3,13 @@
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+ use MBTest;
++
+ use Module::Build;
+ use Module::Build::ConfigData;
+ 
+ my $manpage_support = Module::Build::ConfigData->feature('manpage_support');
+ my $HTML_support = Module::Build::ConfigData->feature('HTML_support');
+ 
+-
+ {
+   my ($have_c_compiler, $C_support_feature) = check_compiler();
+   if (! $C_support_feature) {
+@@ -23,13 +23,12 @@
+   } elsif ( $^O eq 'VMS' ) {
+     plan skip_all => "Needs porting work on VMS";
+   } else {
+-    plan tests => 12;
++    plan tests => 13;
+   }
+ }
++ensure_blib('Module::Build');
+ 
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
+ my $tmp = MBTest->tmpdir;
+ 
+ 
+@@ -60,7 +59,7 @@
+ });
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ use File::Spec::Functions qw(catdir);
+ 
+@@ -183,12 +182,8 @@
+ }
+ 
+ 
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+ 
+-use File::Path;
+-rmtree( $tmp );
+-
+ 
+ ########################################
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/runthrough.t perl-5.10.0/lib/Module/Build/t/runthrough.t
+--- perl-5.10.0.orig/lib/Module/Build/t/runthrough.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/runthrough.t	2009-03-10 16:45:37.000000000 +0100
+@@ -3,15 +3,15 @@
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+ use MBTest tests => 32;
+-use Module::Build;
+-use Module::Build::ConfigData;
+ 
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
++
++use Module::Build::ConfigData;
+ my $have_yaml = Module::Build::ConfigData->feature('YAML_support');
+ 
+ #########################
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
+ my $tmp = MBTest->tmpdir;
+ 
+ use DistGen;
+@@ -55,17 +55,8 @@
+ ---
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
+-
+-#########################
++$dist->chdir_in;
+ 
+-use Module::Build;
+-ok(1);
+-
+-SKIP: {
+-  skip "no blib in core", 1 if $ENV{PERL_CORE};
+-  like $INC{'Module/Build.pm'}, qr/\bblib\b/, "Make sure version from blib/ is loaded";
+-}
+ 
+ #########################
+ 
+@@ -149,7 +140,7 @@
+ 
+   SKIP: {
+     skip( "not sure if we can create a tarball on this platform", 1 )
+-      unless $mb->check_installed_status('Archive::Tar', 0) ||
++      unless $mb->check_installed_version('Archive::Tar', 0) ||
+ 	     $mb->isa('Module::Build::Platform::Unix');
+ 
+     $mb->add_to_cleanup($mb->dist_dir . ".tar.gz");
+@@ -206,7 +197,6 @@
+ ok ! -e $mb->config_dir;
+ ok ! -e $mb->dist_dir;
+ 
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+ 
+ SKIP: {
+@@ -227,7 +217,7 @@
+   $dist->add_file( 'bin/script.bat', $script_data );
+ 
+   $dist->regen;
+-  chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++  $dist->chdir_in;
+ 
+   $mb = Module::Build->new_from_context;
+   ok $mb;
+@@ -241,13 +231,8 @@
+   my $out = slurp( $script_file );
+   is $out, $script_data, '  unmodified by pl2bat';
+ 
+-  chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+   $dist->remove;
+ }
+ 
+ # cleanup
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/script_dist.t perl-5.10.0/lib/Module/Build/t/script_dist.t
+--- perl-5.10.0.orig/lib/Module/Build/t/script_dist.t	1970-01-01 01:00:00.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/script_dist.t	2009-03-10 16:45:37.000000000 +0100
+@@ -0,0 +1,79 @@
++#!/usr/bin/perl -w
++# -*- mode: cperl; tab-width: 8; indent-tabs-mode: nil; basic-offset: 2 -*-
++# vim:ts=8:sw=2:et:sta:sts=2
++
++use strict;
++use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
++use MBTest 'no_plan';
++
++use DistGen qw(undent);
++
++use Module::Build;
++
++# XXX DistGen shouldn't be assuming module-ness?
++my $dist = DistGen->new(dir => MBTest->tmpdir);
++$dist->add_file('bin/foo', undent(<<'  ---'));
++  #!/usr/bin/perl
++  
++  package bin::foo;
++  $VERSION = 0.01;
++
++  =head1 NAME
++
++  foo - does stuff
++
++  =head1 AUTHOR
++
++  A. U. Thor, a.u.thor@a.galaxy.far.far.away
++
++  =cut
++
++  print "hello world\n";
++  ---
++
++my %details = (
++  dist_name => 'bin-foo',
++  dist_version_from => 'bin/foo',
++  dist_author => ['A. U. Thor, a.u.thor@a.galaxy.far.far.away'],
++  dist_version => '0.01',
++);
++my %meta_provides = (
++  'bin-foo' => {
++    file => 'bin/foo',
++    version => '0.01',
++  }
++);
++$dist->change_build_pl({
++  # TODO need to get all of this data out of the program itself
++  ! $ENV{EXTRA_TEST} ? (
++    %details, meta_merge => { provides => \%meta_provides, },
++  ) : (),
++  program_name        => 'bin/foo',
++  license             => 'perl',
++});
++
++# hmm... the old assumption of what a dist looks like is wrong here
++$dist->remove_file('lib/Simple.pm'); $dist->regen;
++
++$dist->chdir_in;
++rmdir('lib');
++
++#system('konsole');
++my $mb = Module::Build->new_from_context;
++ok($mb);
++is($mb->program_name, 'bin/foo');
++is($mb->license, 'perl');
++is($mb->dist_name, 'bin-foo');
++is($mb->dist_version, '0.01');
++is_deeply($mb->dist_author,
++  ['A. U. Thor, a.u.thor@a.galaxy.far.far.away']);
++ok $mb->dispatch('distmeta');
++
++use Module::Build::ConfigData;
++SKIP: {
++  skip( 'YAML_support feature is not enabled', 1 )
++      unless Module::Build::ConfigData->feature('YAML_support');
++  require YAML;
++  my $yml = YAML::LoadFile('META.yml');
++  is_deeply($yml->{provides}, \%meta_provides);
++}
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/test_file_exts.t perl-5.10.0/lib/Module/Build/t/test_file_exts.t
+--- perl-5.10.0.orig/lib/Module/Build/t/test_file_exts.t	1970-01-01 01:00:00.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/test_file_exts.t	2009-03-10 16:45:37.000000000 +0100
+@@ -0,0 +1,45 @@
++#!/usr/bin/perl -w
++
++use strict;
++use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
++use MBTest tests => 5;
++use DistGen;
++
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
++
++my $tmp = MBTest->tmpdir;
++my $dist = DistGen->new( dir => $tmp );
++
++$dist->add_file('t/mytest.s', <<'---' );
++#!perl
++use Test::More tests => 2;
++ok(1, 'first mytest.s');
++ok(1, 'second mytest.s');
++---
++
++$dist->regen;
++$dist->chdir_in;
++
++#########################
++
++# So make sure that the test gets run with the alternate extension.
++ok my $mb = Module::Build->new(
++    module_name    => $dist->name,
++    test_file_exts => ['.s'],
++    quiet          => 1,
++), 'Construct build object with test_file_exts parameter';
++
++$mb->add_to_cleanup('save_out');
++# Use uc() so we don't confuse the current test output
++my $out = uc(stdout_of(
++    sub {$mb->dispatch('test', verbose => 1)}
++));
++
++like $out, qr/^OK 1 - FIRST MYTEST[.]S/m, 'Should see first test output';
++like $out, qr/^OK 2 - SECOND MYTEST[.]S/m, 'Should see second test output';
++
++# Cleanup.
++$dist->remove;
++
++# vim:ts=4:sw=4:et:sta
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/test_type.t perl-5.10.0/lib/Module/Build/t/test_type.t
+--- perl-5.10.0.orig/lib/Module/Build/t/test_type.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/test_type.t	2009-03-10 16:45:37.000000000 +0100
+@@ -9,10 +9,11 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 8;
++use MBTest tests => 9;
++
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
+ my $tmp = MBTest->tmpdir;
+ 
+ use DistGen;
+@@ -29,12 +30,10 @@
+ 
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ #########################
+ 
+-use_ok 'Module::Build';
+-
+ # Here we make sure we can define an action that will test a particular type
+ $::x = 0;
+ my $mb = Module::Build->subclass(
+@@ -69,11 +68,10 @@
+ my $output = uc(stdout_of(
+     sub {$mb->dispatch('testspecial', verbose => 0)}
+ ));
+-like($output, qr/\.\.OK/);
++like($output, qr/\.\. ?OK/);
+ 
+ is($::x, 3, "called a third time");
+ 
+-chdir( $cwd ) or die "Can't chdir to '$cwd': $!";
+ $dist->remove;
+ 
+ # vim:ts=4:sw=4:et:sta
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/test_types.t perl-5.10.0/lib/Module/Build/t/test_types.t
+--- perl-5.10.0.orig/lib/Module/Build/t/test_types.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/test_types.t	2009-03-10 16:45:37.000000000 +0100
+@@ -2,10 +2,11 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 14 + 12;
++use MBTest tests => 15 + 12;
++
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd();
+ my $tmp = MBTest->tmpdir;
+ 
+ use DistGen;
+@@ -33,13 +34,9 @@
+ ---
+ 
+ $dist->regen;
+-
+-chdir($dist->dirname) or die "Can't chdir to '@{[$dist->dirname]}': $!";
+-
++$dist->chdir_in;
+ #########################
+ 
+-use_ok 'Module::Build';
+-
+ my $mb = Module::Build->subclass(
+    code => q#
+         sub ACTION_testspecial { 
+@@ -101,7 +98,6 @@
+ is(scalar(@{[$all_output =~ m/OK/mg]}),   8 );
+ is(scalar(@{[$all_output =~ m/ALL TESTS SUCCESSFUL\./mg]}),   1);
+ 
+-chdir($cwd) or die "Can't chdir to '$cwd': $!";
+ $dist->remove;
+ 
+ { # once-again
+@@ -118,8 +114,7 @@
+ ok 1;
+ ---
+ $dist->regen;
+-
+-chdir($dist->dirname) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ my $mb = Module::Build->subclass(
+    code => q#
+@@ -179,7 +174,6 @@
+ is(scalar(@{[$all_output =~ m/(OK 1)/mg]}), 5 );
+ is(scalar(@{[$all_output =~ m/(OK)/mg]}),   13 );
+ 
+-chdir($cwd) or die "Can't chdir to '$cwd': $!";
+ $dist->remove;
+ } # end once-again
+ 
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/tilde.t perl-5.10.0/lib/Module/Build/t/tilde.t
+--- perl-5.10.0.orig/lib/Module/Build/t/tilde.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/tilde.t	2009-03-10 16:45:37.000000000 +0100
+@@ -4,20 +4,19 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 15;
++use MBTest tests => 18;
++
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
+ my $tmp = MBTest->tmpdir;
+ 
+ use DistGen;
+ my $dist = DistGen->new( dir => $tmp );
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
+-
++$dist->chdir_in;
+ 
+-use Module::Build;
+ 
+ sub run_sample {
+     my @args = @_;
+@@ -39,10 +38,16 @@
+ 
+ SKIP: {
+     my $home = $ENV{HOME} ? $ENV{HOME} : undef;
+-    skip "Needs case and syntax tweaks for VMS", 14 if $^O eq 'VMS';
++
++    if ($^O eq 'VMS') {
++        # Convert the path to UNIX format, trim off the trailing slash
++        $home = VMS::Filespec::unixify($home);
++        $home =~ s#/$##;
++    }
++
+     unless (defined $home) {
+       my @info = eval { getpwuid $> };
+-      skip "No home directory for tilde-expansion tests", 14 if $@;
++      skip "No home directory for tilde-expansion tests", 15 if $@;
+       $home = $info[7];
+     }
+ 
+@@ -63,6 +68,13 @@
+     is( run_sample( prefix => '~' )->prefix,
+ 	$home );
+ 
++    # Test when HOME is different from getpwuid(), as in sudo.
++    {
++        local $ENV{HOME} = '/wibble/whomp';
++
++        is( run_sample( $p => '~' )->$p(),    "/wibble/whomp" );
++    }
++
+     my $mb = run_sample( install_path => { html => '~/html',
+ 					   lib  => '~/lib'   }
+ 		       );
+@@ -83,18 +95,22 @@
+ 
+ # Again, with named users
+ SKIP: {
+-    skip "Needs case and syntax tweaks for VMS", 1 if $^O eq 'VMS';
+     my @info = eval { getpwuid $> };
+     skip "No home directory for tilde-expansion tests", 1 if $@;
+     my ($me, $home) = @info[0,7];
+     
+-    is( run_sample( $p => "~$me/foo")->$p(),  "$home/foo" );
++    my $expected = "$home/foo";
++
++    if ($^O eq 'VMS') {
++        # Convert the path to UNIX format and trim off the trailing slash
++        $home = VMS::Filespec::unixify($home);
++        $home =~ s#/$##;
++        $expected = $home . '/../[^/]+' . '/foo';
++    }
++
++    like( run_sample( $p => "~$me/foo")->$p(),  qr($expected)i );
+ }
+ 
+ 
+ # cleanup
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/use_tap_harness.t perl-5.10.0/lib/Module/Build/t/use_tap_harness.t
+--- perl-5.10.0.orig/lib/Module/Build/t/use_tap_harness.t	1970-01-01 01:00:00.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/use_tap_harness.t	2009-03-10 16:50:35.000000000 +0100
+@@ -0,0 +1,61 @@
++#!/usr/bin/perl -w
++
++use strict;
++use Test::More;
++use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
++if (eval { require TAP::Harness } && TAP::Harness->VERSION >= 3) {
++    plan tests => 8;
++} else {
++    plan skip_all => 'TAP::Harness 3+ not installed'
++}
++
++use MBTest;
++use DistGen;
++
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
++my $tmp = MBTest->tmpdir;
++my $dist = DistGen->new( dir => $tmp );
++$dist->regen;
++
++$dist->chdir_in;
++#########################
++
++# Make sure that TAP::Harness properly does its thing.
++ok my $mb = Module::Build->new(
++    module_name     => $dist->name,
++    use_tap_harness => 1,
++    quiet           => 1,
++), 'Construct build object with test_file_exts parameter';
++
++$mb->add_to_cleanup('save_out');
++# Use uc() so we don't confuse the current test output
++my $out = uc(stdout_of(
++    sub {$mb->dispatch('test', verbose => 1)}
++));
++
++like $out, qr/^OK 1/m, 'Should see first test output';
++like $out, qr/^ALL TESTS SUCCESSFUL/m, 'Should see test success message';
++
++#########################
++
++# Make sure that arguments are passed through to TAP::Harness.
++ok $mb = Module::Build->new(
++    module_name     => $dist->name,
++    use_tap_harness => 1,
++    tap_harness_args => { verbosity => 0 },
++    quiet           => 1,
++), 'Construct build object with test_file_exts parameter';
++
++$mb->add_to_cleanup('save_out');
++# Use uc() so we don't confuse the current test output
++$out = uc(stdout_of(
++    sub {$mb->dispatch('test', verbose => 1)}
++));
++
++unlike $out, qr/^OK 1/m, 'Should not see first test output';
++like $out, qr/^ALL TESTS SUCCESSFUL/m, 'Should see test success message';
++
++$dist->remove;
++
++# vim:ts=4:sw=4:et:sta
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/versions.t perl-5.10.0/lib/Module/Build/t/versions.t
+--- perl-5.10.0.orig/lib/Module/Build/t/versions.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/versions.t	2009-03-10 16:45:37.000000000 +0100
+@@ -2,10 +2,11 @@
+ 
+ use strict;
+ use lib $ENV{PERL_CORE} ? '../lib/Module/Build/t/lib' : 't/lib';
+-use MBTest tests => 2;
++use MBTest tests => 4;
++
++use_ok 'Module::Build';
++ensure_blib('Module::Build');
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
+ my $tmp = MBTest->tmpdir;
+ 
+ use DistGen;
+@@ -14,8 +15,6 @@
+ 
+ #########################
+ 
+-use Module::Build;
+-
+ my @mod = split( /::/, $dist->name );
+ my $file = File::Spec->catfile( $dist->dirname, 'lib', @mod ) . '.pm';
+ is( Module::Build->version_from_file( $file ), '0.01', 'version_from_file' );
+@@ -25,6 +24,3 @@
+ 
+ # cleanup
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build/t/xs.t perl-5.10.0/lib/Module/Build/t/xs.t
+--- perl-5.10.0.orig/lib/Module/Build/t/xs.t	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build/t/xs.t	2009-03-10 16:45:37.000000000 +0100
+@@ -15,22 +15,23 @@
+   } elsif ( $^O eq 'VMS' ) {
+     plan skip_all => 'Child test output confuses harness';
+   } else {
+-    plan tests => 22;
++    plan tests => 23;
+   }
+ }
+ 
++ensure_blib('Module::Build');
++
++
+ #########################
+ 
+ 
+-use Cwd ();
+-my $cwd = Cwd::cwd;
+ my $tmp = MBTest->tmpdir;
+ 
+ use DistGen;
+ my $dist = DistGen->new( dir => $tmp, xs => 1 );
+ $dist->regen;
+ 
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ my $mb = Module::Build->new_from_context;
+ 
+ 
+@@ -103,7 +104,6 @@
+ 
+ 
+ # cleanup
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+ 
+ 
+@@ -114,7 +114,7 @@
+ $dist = DistGen->new( name => 'Simple::With::Deep::Name',
+ 		      dir => $tmp, xs => 1 );
+ $dist->regen;
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ $mb = Module::Build->new_from_context;
+ is $@, '';
+@@ -129,7 +129,6 @@
+ is $@, '';
+ 
+ # cleanup
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+ 
+ 
+@@ -208,7 +207,7 @@
+ ---
+ 
+ $dist->regen;
+-chdir( $dist->dirname ) or die "Can't chdir to '@{[$dist->dirname]}': $!";
++$dist->chdir_in;
+ 
+ 
+ $mb = Module::Build->new_from_context;
+@@ -224,8 +223,4 @@
+ is $@, '';
+ 
+ # cleanup
+-chdir( $cwd ) or die "Can''t chdir to '$cwd': $!";
+ $dist->remove;
+-
+-use File::Path;
+-rmtree( $tmp );
+diff -urN perl-5.10.0.orig/lib/Module/Build.pm perl-5.10.0/lib/Module/Build.pm
+--- perl-5.10.0.orig/lib/Module/Build.pm	2009-02-20 18:22:32.000000000 +0100
++++ perl-5.10.0/lib/Module/Build.pm	2009-03-10 16:49:12.000000000 +0100
+@@ -15,7 +15,7 @@
+ 
+ use vars qw($VERSION @ISA);
+ @ISA = qw(Module::Build::Base);
+-$VERSION = '0.2808_01';
++$VERSION = '0.32';
+ $VERSION = eval $VERSION;
+ 
+ # Okay, this is the brute-force method of finding out what kind of
+@@ -30,15 +30,18 @@
+ 		 dynixptx  Unix
+ 		 freebsd   Unix
+ 		 linux     Unix
++		 haiku     Unix
+ 		 hpux      Unix
+ 		 irix      Unix
+ 		 darwin    Unix
+ 		 machten   Unix
+ 		 midnightbsd Unix
++		 mirbsd    Unix
+ 		 next      Unix
+ 		 openbsd   Unix
+ 		 netbsd    Unix
+ 		 dec_osf   Unix
++		 nto       Unix
+ 		 svr4      Unix
+ 		 svr5      Unix
+ 		 sco_sv    Unix
+@@ -49,7 +52,9 @@
+ 		 cygwin    Unix
+ 		 os2       Unix
+ 		 interix   Unix
+-		 
++		 gnu       Unix
++		 gnukfreebsd Unix
++
+ 		 dos       Windows
+ 		 MSWin32   Windows
+ 
+@@ -156,11 +161,11 @@
+ 'actions'.  In this case the actions run are 'build' (the default
+ action), 'test', and 'install'.  Other actions defined so far include:
+ 
+-  build                          manifest    
+-  clean                          manpages    
+-  code                           pardist     
+-  config_data                    ppd         
+-  diff                           ppmdist     
++  build                          manpages    
++  clean                          pardist     
++  code                           ppd         
++  config_data                    ppmdist     
++  diff                           prereq_data 
+   dist                           prereq_report
+   distcheck                      pure_install
+   distclean                      realclean   
+@@ -173,6 +178,7 @@
+   help                           testpod     
+   html                           testpodcoverage
+   install                        versioninstall
++  manifest                                   
+ 
+ 
+ You can run the 'help' action for a complete list of actions.
+@@ -508,6 +514,14 @@
+ output, so you can supply C<tar> and/or C<gzip> parameters to affect
+ the result.
+ 
++=item prereq_data
++
++[version 0.32]
++
++This action prints out a Perl data structure of all prerequsites and the versions
++required.  The output can be loaded again using C<eval()>.  This can be useful for
++external tools that wish to query a Build script for prerequisites.
++
+ =item prereq_report
+ 
+ [version 0.28]
+@@ -557,10 +571,10 @@
+ 
+ [version 0.01]
+ 
+-This will use C<Test::Harness> to run any regression tests and report
+-their results.  Tests can be defined in the standard places: a file
+-called C<test.pl> in the top-level directory, or several files ending
+-with C<.t> in a C<t/> directory.
++This will use C<Test::Harness> or C<TAP::Harness> to run any regression
++tests and report their results. Tests can be defined in the standard
++places: a file called C<test.pl> in the top-level directory, or several
++files ending with C<.t> in a C<t/> directory.
+ 
+ If you want tests to be 'verbose', i.e. show details of test execution
+ rather than just summary information, pass the argument C<verbose=1>.
+@@ -568,6 +582,14 @@
+ If you want to run tests under the perl debugger, pass the argument
+ C<debugger=1>.
+ 
++If you want to have Module::Build find test files with different file
++name extensions, pass the C<test_file_exts> argument with an array
++of extensions, such as C<[qw( .t .s .z )]>.
++
++If you want test to be run by C<TAP::Harness>, rather than C<Test::Harness>,
++pass the argument C<tap_harness_args> as an array reference of arguments to
++pass to the TAP::Harness constructor.
++
+ In addition, if a file called C<visual.pl> exists in the top-level
+ directory, this file will be executed as a Perl script and its output
+ will be shown to the user.  This is a good place to put speed tests or
+@@ -611,7 +633,7 @@
+     ...
+     test_types  => {
+       special => '.st',
+-      author  => '.at',
++      author  => ['.at', '.pt' ],
+     },
+     ...
+ 
diff --git a/perl-update-Module-CoreList.patch b/perl-update-Module-CoreList.patch
new file mode 100644
index 0000000..74b6be2
--- /dev/null
+++ b/perl-update-Module-CoreList.patch
@@ -0,0 +1,788 @@
+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
new file mode 100644
index 0000000..5ad22f4
--- /dev/null
+++ b/perl-update-Module-Load-Conditional.patch
@@ -0,0 +1,178 @@
+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-5.10.0-PodSimple.patch b/perl-update-Pod-Simple.patch
similarity index 64%
rename from perl-5.10.0-PodSimple.patch
rename to perl-update-Pod-Simple.patch
index 9d44ceb..57c9c77 100644
--- a/perl-5.10.0-PodSimple.patch
+++ b/perl-update-Pod-Simple.patch
@@ -1,7 +1,21 @@
-diff -up perl-5.10.0/lib/Pod/Simple/BlackBox.pm.old perl-5.10.0/lib/Pod/Simple/BlackBox.pm
---- perl-5.10.0/lib/Pod/Simple/BlackBox.pm.old	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/BlackBox.pm	2008-06-03 17:08:18.000000000 +0200
-@@ -910,17 +910,10 @@ sub _ponder_begin {
+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;
    }
    
@@ -23,7 +37,7 @@ diff -up perl-5.10.0/lib/Pod/Simple/BlackBox.pm.old perl-5.10.0/lib/Pod/Simple/B
  
    $content =~ s/^:!/!:/s;
    my $neg;  # whether this is a negation-match
-@@ -1681,8 +1674,11 @@ sub _treelet_from_formatting_codes {
+@@ -1681,8 +1674,11 @@
                [A-Z](?!<)
              )
              |
@@ -36,37 +50,49 @@ diff -up perl-5.10.0/lib/Pod/Simple/BlackBox.pm.old perl-5.10.0/lib/Pod/Simple/B
              )
            )+
          )
-diff -U0 perl-5.10.0/lib/Pod/Simple/ChangeLog.old perl-5.10.0/lib/Pod/Simple/ChangeLog
-diff -up perl-5.10.0/lib/Pod/Simple/Checker.pm.old perl-5.10.0/lib/Pod/Simple/Checker.pm
-diff -up perl-5.10.0/lib/Pod/Simple/Debug.pm.old perl-5.10.0/lib/Pod/Simple/Debug.pm
-diff -up perl-5.10.0/lib/Pod/Simple/DumpAsText.pm.old perl-5.10.0/lib/Pod/Simple/DumpAsText.pm
-diff -up perl-5.10.0/lib/Pod/Simple/DumpAsXML.pm.old perl-5.10.0/lib/Pod/Simple/DumpAsXML.pm
-diff -up perl-5.10.0/lib/Pod/Simple/HTMLBatch.pm.old perl-5.10.0/lib/Pod/Simple/HTMLBatch.pm
---- perl-5.10.0/lib/Pod/Simple/HTMLBatch.pm.old	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/HTMLBatch.pm	2008-05-29 19:33:26.000000000 +0200
-@@ -607,7 +607,7 @@ sub _spray_css {
-     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 @@ sub _spray_javascript {
-     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 -up perl-5.10.0/lib/Pod/Simple/HTMLLegacy.pm.old perl-5.10.0/lib/Pod/Simple/HTMLLegacy.pm
-diff -up perl-5.10.0/lib/Pod/Simple/HTML.pm.old perl-5.10.0/lib/Pod/Simple/HTML.pm
---- perl-5.10.0/lib/Pod/Simple/HTML.pm.old	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/HTML.pm	2008-05-29 19:33:26.000000000 +0200
-@@ -164,7 +164,7 @@ sub changes2 {
+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 @@
  }
  
  #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -75,1134 +101,30 @@ diff -up perl-5.10.0/lib/Pod/Simple/HTML.pm.old perl-5.10.0/lib/Pod/Simple/HTML.
   # Just so we can run from the command line.  No options.
   #  For that, use perldoc!
  #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-diff -up perl-5.10.0/lib/Pod/Simple/LinkSection.pm.old perl-5.10.0/lib/Pod/Simple/LinkSection.pm
-diff -up perl-5.10.0/lib/Pod/Simple/Methody.pm.old perl-5.10.0/lib/Pod/Simple/Methody.pm
-diff -up perl-5.10.0/lib/Pod/Simple.pm.old perl-5.10.0/lib/Pod/Simple.pm
---- perl-5.10.0/lib/Pod/Simple.pm.old	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple.pm	2008-06-05 00:04:27.000000000 +0200
-@@ -18,7 +18,7 @@ use vars qw(
- );
- 
- @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 @@ sub _treat_Ls {  # Process our dear dear
-   # 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 @@ sub _treat_Ls {  # Process our dear dear
-       
-       
-       # 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 @@ sub _treat_Ls {  # Process our dear dear
-       }
-      
-       # 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 @@ sub _treat_Ls {  # Process our dear dear
-           # 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 @@ sub _treat_Ls {  # Process our dear dear
-       
-       
-       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 @@ sub _out {
-    "\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 -up perl-5.10.0/lib/Pod/Simple.pod.old perl-5.10.0/lib/Pod/Simple.pod
---- perl-5.10.0/lib/Pod/Simple.pod.old	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple.pod	2008-06-03 15:27:24.000000000 +0200
-@@ -211,7 +211,15 @@ merchantability or fitness for a particu
- 
- 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 -urN perl-5.10.0/lib/Pod/Simple/t.old/accept05.t perl-5.10.0/lib/Pod/Simple/t/accept05.t
---- perl-5.10.0/lib/Pod/Simple/t.old/accept05.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/accept05.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,3 +1,4 @@
-+# Testing extend and accept_codes
- BEGIN {
-     if($ENV{PERL_CORE}) {
-         chdir 't';
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/corpus.t perl-5.10.0/lib/Pod/Simple/t/corpus.t
---- perl-5.10.0/lib/Pod/Simple/t.old/corpus.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/corpus.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,3 +1,4 @@
-+# Testing a corpus of Pod files
- BEGIN {
-     if($ENV{PERL_CORE}) {
-         chdir 't';
-@@ -128,9 +129,7 @@
-   
-   next if $f =~ /nonesuch/;
- 
--  # foo.xml.out is not a portable filename. foo.xml_out may be a bit more portable
--
--  my $outfilename = ($HACK > 1) ? $wouldxml{$f} : "$wouldxml{$f}_out";
-+  my $outfilename = ($HACK > 1) ? $wouldxml{$f} : "$wouldxml{$f}\_out";
-   if($HACK) {
-     open OUT, ">$outfilename" or die "Can't write-open $outfilename: $!\n";
-     binmode(OUT);
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/encod01.t perl-5.10.0/lib/Pod/Simple/t/encod01.t
---- perl-5.10.0/lib/Pod/Simple/t.old/encod01.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/encod01.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,3 +1,4 @@
-+# encoding nonesuch
- BEGIN {
-     if($ENV{PERL_CORE}) {
-         chdir 't';
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/encod02.t perl-5.10.0/lib/Pod/Simple/t/encod02.t
---- perl-5.10.0/lib/Pod/Simple/t.old/encod02.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/encod02.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,3 +1,4 @@
-+# encoding not error
- BEGIN {
-     if($ENV{PERL_CORE}) {
-         chdir 't';
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/encod03.t perl-5.10.0/lib/Pod/Simple/t/encod03.t
---- perl-5.10.0/lib/Pod/Simple/t.old/encod03.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/encod03.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,3 +1,4 @@
-+# encoding not error 0
- BEGIN {
-     if($ENV{PERL_CORE}) {
-         chdir 't';
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/end_over.t perl-5.10.0/lib/Pod/Simple/t/end_over.t
---- perl-5.10.0/lib/Pod/Simple/t.old/end_over.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/end_over.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,3 +1,4 @@
-+# head ends over
- BEGIN {
-     if($ENV{PERL_CORE}) {
-         chdir 't';
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/fcodes_e.t perl-5.10.0/lib/Pod/Simple/t/fcodes_e.t
---- perl-5.10.0/lib/Pod/Simple/t.old/fcodes_e.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/fcodes_e.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,3 +1,4 @@
-+# fcodes E
- BEGIN {
-     if($ENV{PERL_CORE}) {
-         chdir 't';
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/fcodes_l.t perl-5.10.0/lib/Pod/Simple/t/fcodes_l.t
---- perl-5.10.0/lib/Pod/Simple/t.old/fcodes_l.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/fcodes_l.t	2008-06-03 15:27:24.000000000 +0200
-@@ -1,3 +1,4 @@
-+# fcodes L
- BEGIN {
-     if($ENV{PERL_CORE}) {
-         chdir 't';
-@@ -7,7 +8,7 @@
- 
- use strict;
- use Test;
--BEGIN { plan tests => 93 };
-+BEGIN { plan tests => 99 };
- 
- #use Pod::Simple::Debug (10);
- 
-@@ -398,6 +399,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/lib/Pod/Simple/t.old/fcodes_s.t perl-5.10.0/lib/Pod/Simple/t/fcodes_s.t
---- perl-5.10.0/lib/Pod/Simple/t.old/fcodes_s.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/fcodes_s.t	2008-06-03 15:27:24.000000000 +0200
-@@ -1,3 +1,4 @@
-+# fcodes S
- BEGIN {
-     if($ENV{PERL_CORE}) {
-         chdir 't';
-@@ -7,7 +8,7 @@
- 
- use strict;
- use Test;
--BEGIN { plan tests => 13 };
-+BEGIN { plan tests => 14 };
- 
- #use Pod::Simple::Debug (6);
- 
-@@ -76,7 +77,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/lib/Pod/Simple/t.old/fullstop.t perl-5.10.0/lib/Pod/Simple/t/fullstop.t
---- perl-5.10.0/lib/Pod/Simple/t.old/fullstop.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/fullstop.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,3 +1,4 @@
-+# Testing hardening fullstop spaces
- BEGIN {
-     if($ENV{PERL_CORE}) {
-         chdir 't';
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/html01.t perl-5.10.0/lib/Pod/Simple/t/html01.t
---- perl-5.10.0/lib/Pod/Simple/t.old/html01.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/html01.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,4 +1,4 @@
--# t/html-para.t
-+# Testing HTML paragraphs
- 
- BEGIN {
-     if($ENV{PERL_CORE}) {
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/html02.t perl-5.10.0/lib/Pod/Simple/t/html02.t
---- perl-5.10.0/lib/Pod/Simple/t.old/html02.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/html02.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,4 +1,4 @@
--# t/html-styles.t
-+# Testing HTML text styles
- 
- BEGIN {
-     if($ENV{PERL_CORE}) {
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/html03.t perl-5.10.0/lib/Pod/Simple/t/html03.t
---- perl-5.10.0/lib/Pod/Simple/t.old/html03.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/html03.t	2008-06-03 17:10:07.000000000 +0200
-@@ -1,4 +1,4 @@
--# t/html-para.t
-+# Testing HTML titles
- 
- BEGIN {
-     if($ENV{PERL_CORE}) {
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/items02.t perl-5.10.0/lib/Pod/Simple/t/items02.t
---- perl-5.10.0/lib/Pod/Simple/t.old/items02.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/items02.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,44 +1,44 @@
--#!perl
--BEGIN {
--    if($ENV{PERL_CORE}) {
--        chdir 't';
--        @INC = '../lib';
--    }
--}
--
--use strict;
--use Test;
--BEGIN { plan tests => 4 };
--
--my $d;
--#use Pod::Simple::Debug (\$d,0);
--
--ok 1;
--
--use Pod::Simple::DumpAsXML;
--use Pod::Simple::XMLOutStream;
--print "# Pod::Simple version $Pod::Simple::VERSION\n";
--sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
--
--my $x = 'Pod::Simple::XMLOutStream';
--
--print "##### Tests for =item directives via class $x\n";
--
--$Pod::Simple::XMLOutStream::ATTR_PAD   = ' ';
--$Pod::Simple::XMLOutStream::SORT_ATTRS = 1; # for predictably testable output
--
--
--print "#\n# Tests for =item [number] that are icky...\n";
--ok( $x->_out("\n=over\n\n=item 5\n\nStuff\n\n=cut\n\nCrunk\nZorp\n\n=item 4\n\nQuux\n\n=back\n\n"),
--    '<Document><over-text indent="4"><item-text>5</item-text><Para>Stuff</Para><item-text>4</item-text><Para>Quux</Para></over-text></Document>'
--);
--
--ok( $x->_out("\n=over\n\n=item 5.\n\nStuff\n\n=cut\n\nCrunk\nZorp\n\n=item 4.\n\nQuux\n\n=back\n\n"),
--    '<Document><over-text indent="4"><item-text>5.</item-text><Para>Stuff</Para><item-text>4.</item-text><Para>Quux</Para></over-text></Document>'
--);
--
--
--print "# Wrapping up... one for the road...\n";
--ok 1;
--print "# --- Done with ", __FILE__, " --- \n";
--
-+# Testing the =item directive
-+BEGIN {
-+    if($ENV{PERL_CORE}) {
-+        chdir 't';
-+        @INC = '../lib';
-+    }
-+}
-+
-+use strict;
-+use Test;
-+BEGIN { plan tests => 4 };
-+
-+my $d;
-+#use Pod::Simple::Debug (\$d,0);
-+
-+ok 1;
-+
-+use Pod::Simple::DumpAsXML;
-+use Pod::Simple::XMLOutStream;
-+print "# Pod::Simple version $Pod::Simple::VERSION\n";
-+sub e ($$) { Pod::Simple::DumpAsXML->_duo(@_) }
-+
-+my $x = 'Pod::Simple::XMLOutStream';
-+
-+print "##### Tests for =item directives via class $x\n";
-+
-+$Pod::Simple::XMLOutStream::ATTR_PAD   = ' ';
-+$Pod::Simple::XMLOutStream::SORT_ATTRS = 1; # for predictably testable output
-+
-+
-+print "#\n# Tests for =item [number] that are icky...\n";
-+ok( $x->_out("\n=over\n\n=item 5\n\nStuff\n\n=cut\n\nCrunk\nZorp\n\n=item 4\n\nQuux\n\n=back\n\n"),
-+    '<Document><over-text indent="4"><item-text>5</item-text><Para>Stuff</Para><item-text>4</item-text><Para>Quux</Para></over-text></Document>'
-+);
-+
-+ok( $x->_out("\n=over\n\n=item 5.\n\nStuff\n\n=cut\n\nCrunk\nZorp\n\n=item 4.\n\nQuux\n\n=back\n\n"),
-+    '<Document><over-text indent="4"><item-text>5.</item-text><Para>Stuff</Para><item-text>4.</item-text><Para>Quux</Para></over-text></Document>'
-+);
-+
-+
-+print "# Wrapping up... one for the road...\n";
-+ok 1;
-+print "# --- Done with ", __FILE__, " --- \n";
-+
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/linkclas.t perl-5.10.0/lib/Pod/Simple/t/linkclas.t
---- perl-5.10.0/lib/Pod/Simple/t.old/linkclas.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/linkclas.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,3 +1,4 @@
-+# Testing the LinkSection class
- BEGIN {
-     if($ENV{PERL_CORE}) {
-         chdir 't';
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/search20.t perl-5.10.0/lib/Pod/Simple/t/search20.t
---- perl-5.10.0/lib/Pod/Simple/t.old/search20.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/search20.t	2007-09-02 08:21:41.000000000 +0200
-@@ -69,16 +69,12 @@
- 
- {
- my $names = join "|", sort values %$where2name;
--skip $^O eq 'VMS' ? '-- case may or may not be preserved' : 0, 
--     $names, 
--     "Blorm|Suzzle|Zonk::Pronk|hinkhonk::Glunk|hinkhonk::Vliff|perlflif|perlthng|perlzuk|squaa|squaa::Glunk|squaa::Vliff|squaa::Wowo|zikzik";
-+ok $names, "Blorm|Suzzle|Zonk::Pronk|hinkhonk::Glunk|hinkhonk::Vliff|perlflif|perlthng|perlzuk|squaa|squaa::Glunk|squaa::Vliff|squaa::Wowo|zikzik";
- }
- 
- {
- my $names = join "|", sort keys %$name2where;
--skip $^O eq 'VMS' ? '-- case may or may not be preserved' : 0, 
--     $names, 
--     "Blorm|Suzzle|Zonk::Pronk|hinkhonk::Glunk|hinkhonk::Vliff|perlflif|perlthng|perlzuk|squaa|squaa::Glunk|squaa::Vliff|squaa::Wowo|zikzik";
-+ok $names, "Blorm|Suzzle|Zonk::Pronk|hinkhonk::Glunk|hinkhonk::Vliff|perlflif|perlthng|perlzuk|squaa|squaa::Glunk|squaa::Vliff|squaa::Wowo|zikzik";
- }
- 
- ok( ($name2where->{'squaa'} || 'huh???'), '/squaa\.pm$/');
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/search22.t perl-5.10.0/lib/Pod/Simple/t/search22.t
---- perl-5.10.0/lib/Pod/Simple/t.old/search22.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/search22.t	2007-09-02 08:21:41.000000000 +0200
-@@ -71,17 +71,13 @@
- {
- print "# won't show any shadows, since we're just looking at the name2where keys\n";
- my $names = join "|", sort keys %$name2where;
--skip $^O eq 'VMS' ? '-- case may or may not be preserved' : 0, 
--     $names, 
--     "Blorm|Suzzle|Zonk::Pronk|hinkhonk::Glunk|hinkhonk::Vliff|perlflif|perlthng|perlzuk|squaa|squaa::Glunk|squaa::Vliff|squaa::Wowo|zikzik";
-+ok $names, "Blorm|Suzzle|Zonk::Pronk|hinkhonk::Glunk|hinkhonk::Vliff|perlflif|perlthng|perlzuk|squaa|squaa::Glunk|squaa::Vliff|squaa::Wowo|zikzik";
- }
- 
- {
- print "# but here we'll see shadowing:\n";
- my $names = join "|", sort values %$where2name;
--skip $^O eq 'VMS' ? '-- case may or may not be preserved' : 0, 
--     $names, 
--     "Blorm|Suzzle|Zonk::Pronk|hinkhonk::Glunk|hinkhonk::Glunk|hinkhonk::Vliff|hinkhonk::Vliff|perlflif|perlthng|perlthng|perlzuk|squaa|squaa::Glunk|squaa::Vliff|squaa::Vliff|squaa::Vliff|squaa::Wowo|zikzik";
-+ok $names, "Blorm|Suzzle|Zonk::Pronk|hinkhonk::Glunk|hinkhonk::Glunk|hinkhonk::Vliff|hinkhonk::Vliff|perlflif|perlthng|perlthng|perlzuk|squaa|squaa::Glunk|squaa::Vliff|squaa::Vliff|squaa::Vliff|squaa::Wowo|zikzik";
- 
- my %count;
- for(values %$where2name) { ++$count{$_} };
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/search50.t perl-5.10.0/lib/Pod/Simple/t/search50.t
---- perl-5.10.0/lib/Pod/Simple/t.old/search50.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/search50.t	2007-09-02 08:21:41.000000000 +0200
-@@ -11,7 +11,7 @@
- 
- use Pod::Simple::Search;
- use Test;
--BEGIN { plan tests => 7 }
-+BEGIN { plan tests => 8 }
- 
- print "#  Test the scanning of the whole of \@INC ...\n";
- 
-@@ -45,9 +45,12 @@
- print $p;
- 
- print "# OK, making sure strict and strict.pm were in there...\n";
--ok( ($name2where->{'strict'} || 'huh???'), '/strict\.(pod|pm)$/');
-+print "# (On Debian-based distributions Pod is stripped from\n",
-+      "# strict.pm, so skip these tests.)\n";
-+my $nopod = not exists ($name2where->{'strict'});
-+skip($nopod, ($name2where->{'strict'} || 'huh???'), '/strict\.(pod|pm)$/');
- 
--ok grep( m/strict\.(pod|pm)/, keys %$where2name );
-+skip($nopod, grep( m/strict\.(pod|pm)/, keys %$where2name ));
- 
- my  $strictpath = $name2where->{'strict'};
- if( $strictpath ) {
-@@ -56,8 +59,27 @@
-   for(@x) { s{[/\\]}{/}g; }
-   print "#        => \"$x[0]\" to \"$x[1]\"\n";
-   ok $x[0], $x[1], " find('strict') should match survey's name2where{strict}";
-+} elsif ($nopod) {
-+  skip "skipping find() for strict.pm"; # skipping find() for 'thatpath/strict.pm
- } else {
--  ok 0;  # no 'thatpath/strict.pm' means can't test find()
-+  ok 0;  # an entry without a defined path means can't test find()
-+}
-+
-+print "# Test again on a module we know is present, in case the
-+strict.pm tests were skipped...\n";
-+
-+# Grab the first item in $name2where, since it doesn't matter which we
-+# use.
-+my $testmod = (keys %$name2where)[0];
-+my  $testpath = $name2where->{$testmod};
-+if( $testmod ) {
-+  my @x = ($x->find($testmod)||'(nil)', $testpath);
-+  print "# Comparing \"$x[0]\" to \"$x[1]\"\n";
-+  for(@x) { s{[/\\]}{/}g; }
-+  print "#        => \"$x[0]\" to \"$x[1]\"\n";
-+  ok $x[0], $x[1], " find('$testmod') should match survey's name2where{$testmod}";
-+} else {
-+  ok 0;  # no 'thatpath/<name>.pm' means can't test find()
- }
- 
- ok 1;
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/testlib2/squaa/Wowo.pod perl-5.10.0/lib/Pod/Simple/t/testlib2/squaa/Wowo.pod
---- perl-5.10.0/lib/Pod/Simple/t.old/testlib2/squaa/Wowo.pod	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/testlib2/squaa/Wowo.pod	2007-09-02 08:21:35.000000000 +0200
-@@ -1,7 +1,7 @@
- 
- =head1 NAME
- 
--squaa::Wowo -- blorpoesu
-+squaa::Glunk -- blorpoesu
- 
- =head1 DESCRIPTION
- 
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/tiedfh.t perl-5.10.0/lib/Pod/Simple/t/tiedfh.t
---- perl-5.10.0/lib/Pod/Simple/t.old/tiedfh.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/tiedfh.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,3 +1,4 @@
-+# Testing tied output filehandle
- BEGIN {
-     if($ENV{PERL_CORE}) {
-         chdir 't';
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/verbatim.t perl-5.10.0/lib/Pod/Simple/t/verbatim.t
---- perl-5.10.0/lib/Pod/Simple/t.old/verbatim.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/verbatim.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,4 +1,4 @@
--
-+# Testing verbatim sections
- use strict;
- use Test;
- BEGIN { plan tests => 31 };
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/verb_fmt.t perl-5.10.0/lib/Pod/Simple/t/verb_fmt.t
---- perl-5.10.0/lib/Pod/Simple/t.old/verb_fmt.t	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/verb_fmt.t	2007-09-02 08:21:41.000000000 +0200
-@@ -1,4 +1,4 @@
--
-+# Testing verbatim formatted sections
- use strict;
- use Test;
- BEGIN { plan tests => 62 };
-diff -urN perl-5.10.0/lib/Pod/Simple/t.old/xhtml01.t perl-5.10.0/lib/Pod/Simple/t/xhtml01.t
---- perl-5.10.0/lib/Pod/Simple/t.old/xhtml01.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/xhtml01.t	2008-06-05 00:06:00.000000000 +0200
-@@ -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/lib/Pod/Simple/t.old/xhtml05.t perl-5.10.0/lib/Pod/Simple/t/xhtml05.t
---- perl-5.10.0/lib/Pod/Simple/t.old/xhtml05.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/xhtml05.t	2007-09-02 08:21:41.000000000 +0200
-@@ -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 -up perl-5.10.0/lib/Pod/Simple/t/begin.t.old perl-5.10.0/lib/Pod/Simple/t/begin.t
---- perl-5.10.0/lib/Pod/Simple/t/begin.t.old	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/begin.t	2008-06-03 17:06:00.000000000 +0200
-@@ -7,7 +7,7 @@ BEGIN {
- 
- use strict;
- use Test;
--BEGIN { plan tests => 61 };
-+BEGIN { plan tests => 62 };
- 
- my $d;
- #use Pod::Simple::Debug (\$d, 0);
-@@ -114,7 +114,6 @@ ok( $x->_out( "=pod\n\nI like pie.\n\n=b
-   '<Document><Para>I like pie.</Para><Para>Yup.</Para></Document>'
- );
- 
--
- #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- 
- print "# Testing matching because of negated non-acceptance...\n";
-@@ -448,8 +447,14 @@ ok( $x->_out( \&mojprok,  join "\n\n" =>
-  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 -up perl-5.10.0/lib/Pod/Simple/t/reinit.t.ooo perl-5.10.0/lib/Pod/Simple/t/reinit.t
---- perl-5.10.0/lib/Pod/Simple/t/reinit.t.ooo	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/t/reinit.t	2008-10-06 17:31:38.000000000 +0200
-@@ -13,14 +13,14 @@ BEGIN { plan tests => 5 };
- 
- sub source_path {
-     my $file = shift;
--    if ($ENV{PERL_CORE}) {
-+#    if ($ENV{PERL_CORE}) {
-         require File::Spec;
-         my $updir = File::Spec->updir;
-         my $dir = File::Spec->catdir ($updir, 'lib', 'Pod', 'Simple', 't');
-         return File::Spec->catfile ($dir, $file);
--    } else {
--        return $file;
--    }
-+#    } else {
-+#        return $file;
-+#    }
- }
- 
- use Pod::Simple::Text;
-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";
+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 {
-         print "not ok $n\n";
-diff -up perl-5.10.0/lib/Pod/Simple/XHTML.pm.miss perl-5.10.0/lib/Pod/Simple/XHTML.pm
---- perl-5.10.0/lib/Pod/Simple/XHTML.pm.miss	2008-12-22 10:42:49.000000000 +0100
-+++ perl-5.10.0/lib/Pod/Simple/XHTML.pm	2008-06-04 23:54:58.000000000 +0200
+       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
 +
@@ -1604,3 +526,753 @@ diff -up perl-5.10.0/lib/Pod/Simple/XHTML.pm.miss perl-5.10.0/lib/Pod/Simple/XHT
 +
 +=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-Sys-Syslog.patch b/perl-update-Sys-Syslog.patch
new file mode 100644
index 0000000..e401b77
--- /dev/null
+++ b/perl-update-Sys-Syslog.patch
@@ -0,0 +1,965 @@
+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-5.10.0-TestHarness3.12.patch b/perl-update-Test-Harness.patch
similarity index 69%
rename from perl-5.10.0-TestHarness3.12.patch
rename to perl-update-Test-Harness.patch
index aac9322..5938cce 100644
--- a/perl-5.10.0-TestHarness3.12.patch
+++ b/perl-update-Test-Harness.patch
@@ -1,17 +1,893 @@
-diff -urN perl-5.10.0/t.ble/lib/App/Prove/Plugin/Dummy.pm perl-5.10.0/t/lib/App/Prove/Plugin/Dummy.pm
---- perl-5.10.0/t.ble/lib/App/Prove/Plugin/Dummy.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/App/Prove/Plugin/Dummy.pm	2008-06-18 01:26:47.000000000 +0200
-@@ -0,0 +1,7 @@
-+package App::Prove::Plugin::Dummy;
+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
 +
-+sub import {
-+    main::test_log_import(@_);
++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;
 +}
 +
-+1;
-diff -urN perl-5.10.0/t.ble/lib/compat/env.t perl-5.10.0/t/lib/compat/env.t
---- perl-5.10.0/t.ble/lib/compat/env.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/compat/env.t	2008-06-18 01:26:17.000000000 +0200
++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
 +
@@ -52,10 +928,10 @@ diff -urN perl-5.10.0/t.ble/lib/compat/env.t perl-5.10.0/t/lib/compat/env.t
 +}
 +
 +1;
-diff -urN perl-5.10.0/t.ble/lib/compat/failure.t perl-5.10.0/t/lib/compat/failure.t
---- perl-5.10.0/t.ble/lib/compat/failure.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/compat/failure.t	2008-06-18 01:26:12.000000000 +0200
-@@ -0,0 +1,59 @@
+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;
@@ -77,11 +953,18 @@ diff -urN perl-5.10.0/t.ble/lib/compat/failure.t perl-5.10.0/t/lib/compat/failur
 +        return sub { $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' );
++    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();
@@ -115,10 +998,10 @@ diff -urN perl-5.10.0/t.ble/lib/compat/failure.t perl-5.10.0/t/lib/compat/failur
 +}
 +
 +# vim:ts=4:sw=4:et:sta
-diff -urN perl-5.10.0/t.ble/lib/compat/inc-propagation.t perl-5.10.0/t/lib/compat/inc-propagation.t
---- perl-5.10.0/t.ble/lib/compat/inc-propagation.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/compat/inc-propagation.t	2008-06-22 03:29:51.000000000 +0200
-@@ -0,0 +1,54 @@
+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
@@ -126,6 +1009,10 @@ diff -urN perl-5.10.0/t.ble/lib/compat/inc-propagation.t perl-5.10.0/t/lib/compa
 +
 +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';
@@ -153,9 +1040,8 @@ diff -urN perl-5.10.0/t.ble/lib/compat/inc-propagation.t perl-5.10.0/t/lib/compa
 +
 +use Test::More tests => 2;
 +
-+# Make sure we did something sensible with PERL5LIB
++is $INC[0], "wibble", 'basic order of @INC preserved' or diag "\@INC: @INC";
 +like $ENV{PERL5LIB}, qr{wibble};
-+ok grep { $_ eq 'wibble' } @INC;
 +
 +END
 +
@@ -173,16 +1059,16 @@ diff -urN perl-5.10.0/t.ble/lib/compat/inc-propagation.t perl-5.10.0/t/lib/compa
 +    is $tot->{bad}, 0;
 +}
 +1;
-diff -urN perl-5.10.0/t.ble/lib/compat/inc_taint.t perl-5.10.0/t/lib/compat/inc_taint.t
---- perl-5.10.0/t.ble/lib/compat/inc_taint.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/compat/inc_taint.t	2008-06-18 01:26:19.000000000 +0200
+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', 'lib' );
++        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
 +    }
 +    else {
 +        use lib 't/lib';
@@ -214,7 +1100,7 @@ diff -urN perl-5.10.0/t.ble/lib/compat/inc_taint.t perl-5.10.0/t/lib/compat/inc_
 +    my ( $tot, $failed ) = Test::Harness::execute_tests(
 +        tests => [
 +            $ENV{PERL_CORE}
-+            ? 'lib/sample-tests/inc_taint'
++            ? '../ext/Test/Harness/t/sample-tests/inc_taint'
 +            : 't/sample-tests/inc_taint'
 +        ]
 +    );
@@ -222,9 +1108,9 @@ diff -urN perl-5.10.0/t.ble/lib/compat/inc_taint.t perl-5.10.0/t/lib/compat/inc_
 +
 +    ok( _all_ok($tot), 'tests with taint on preserve @INC' );
 +}
-diff -urN perl-5.10.0/t.ble/lib/compat/nonumbers.t perl-5.10.0/t/lib/compat/nonumbers.t
---- perl-5.10.0/t.ble/lib/compat/nonumbers.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/compat/nonumbers.t	2008-06-18 01:26:46.000000000 +0200
+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";
@@ -240,10 +1126,10 @@ diff -urN perl-5.10.0/t.ble/lib/compat/nonumbers.t perl-5.10.0/t/lib/compat/nonu
 +ok
 +ok
 +END
-diff -urN perl-5.10.0/t.ble/lib/compat/regression.t perl-5.10.0/t/lib/compat/regression.t
---- perl-5.10.0/t.ble/lib/compat/regression.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/compat/regression.t	2008-06-18 01:27:21.000000000 +0200
-@@ -0,0 +1,17 @@
+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;
@@ -252,19 +1138,21 @@ diff -urN perl-5.10.0/t.ble/lib/compat/regression.t perl-5.10.0/t/lib/compat/reg
 +use Test::More tests => 1;
 +use Test::Harness;
 +
++# 28567
++my ( @before, @after );
 +{
-+
-+    #28567
++    local @INC;
 +    unshift @INC, 'wibble';
-+    my @before = Test::Harness::_filtered_inc();
++    @before = Test::Harness::_filtered_inc();
 +    unshift @INC, sub {die};
-+    my @after = Test::Harness::_filtered_inc();
-+    is_deeply \@after, \@before, 'subref removed from @INC';
++    @after = Test::Harness::_filtered_inc();
 +}
-diff -urN perl-5.10.0/t.ble/lib/compat/test-harness-compat.t perl-5.10.0/t/lib/compat/test-harness-compat.t
---- perl-5.10.0/t.ble/lib/compat/test-harness-compat.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/compat/test-harness-compat.t	2008-06-22 03:19:58.000000000 +0200
-@@ -0,0 +1,857 @@
++
++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 {
@@ -288,7 +1176,8 @@ diff -urN perl-5.10.0/t.ble/lib/compat/test-harness-compat.t perl-5.10.0/t/lib/c
 +# unset this global when self-testing ('testcover' and etc issue)
 +local $ENV{HARNESS_PERL_SWITCHES};
 +
-+my $TEST_DIR = $ENV{PERL_CORE} ? 'lib/sample-tests' : 't/sample-tests';
++my $TEST_DIR
++  = $ENV{PERL_CORE} ? '../ext/Test/Harness/t/sample-tests' : 't/sample-tests';
 +
 +{
 +
@@ -1122,9 +2011,9 @@ diff -urN perl-5.10.0/t.ble/lib/compat/test-harness-compat.t perl-5.10.0/t/lib/c
 +        }
 +    }
 +}
-diff -urN perl-5.10.0/t.ble/lib/compat/version.t perl-5.10.0/t/lib/compat/version.t
---- perl-5.10.0/t.ble/lib/compat/version.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/compat/version.t	2008-06-18 01:27:04.000000000 +0200
+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
 +
@@ -1137,16783 +2026,9 @@ diff -urN perl-5.10.0/t.ble/lib/compat/version.t perl-5.10.0/t/lib/compat/versio
 +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/t.ble/lib/data/catme.1 perl-5.10.0/t/lib/data/catme.1
---- perl-5.10.0/t.ble/lib/data/catme.1	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/data/catme.1	2008-06-09 02:41:01.000000000 +0200
-@@ -0,0 +1,2 @@
-+1..1
-+ok 1
-diff -urN perl-5.10.0/t.ble/lib/data/proverc perl-5.10.0/t/lib/data/proverc
---- perl-5.10.0/t.ble/lib/data/proverc	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/data/proverc	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/data/sample.yml perl-5.10.0/t/lib/data/sample.yml
---- perl-5.10.0/t.ble/lib/data/sample.yml	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/data/sample.yml	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/EmptyParser.pm perl-5.10.0/t/lib/EmptyParser.pm
---- perl-5.10.0/t.ble/lib/EmptyParser.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/EmptyParser.pm	2008-06-18 01:26:57.000000000 +0200
-@@ -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/t.ble/lib/if.pm perl-5.10.0/t/lib/if.pm
---- perl-5.10.0/t.ble/lib/if.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/if.pm	2008-06-18 01:26:47.000000000 +0200
-@@ -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/t.ble/lib/IO/c55Capture.pm perl-5.10.0/t/lib/IO/c55Capture.pm
---- perl-5.10.0/t.ble/lib/IO/c55Capture.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/IO/c55Capture.pm	2008-06-18 01:26:16.000000000 +0200
-@@ -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/t.ble/lib/MyCustom.pm perl-5.10.0/t/lib/MyCustom.pm
---- perl-5.10.0/t.ble/lib/MyCustom.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/MyCustom.pm	2008-06-18 01:27:08.000000000 +0200
-@@ -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/t.ble/lib/MyGrammar.pm perl-5.10.0/t/lib/MyGrammar.pm
---- perl-5.10.0/t.ble/lib/MyGrammar.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/MyGrammar.pm	2008-06-18 01:27:00.000000000 +0200
-@@ -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/t.ble/lib/MyIteratorFactory.pm perl-5.10.0/t/lib/MyIteratorFactory.pm
---- perl-5.10.0/t.ble/lib/MyIteratorFactory.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/MyIteratorFactory.pm	2008-06-22 03:03:03.000000000 +0200
-@@ -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/t.ble/lib/MyIterator.pm perl-5.10.0/t/lib/MyIterator.pm
---- perl-5.10.0/t.ble/lib/MyIterator.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/MyIterator.pm	2008-06-18 01:27:19.000000000 +0200
-@@ -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/t.ble/lib/MyPerlSource.pm perl-5.10.0/t/lib/MyPerlSource.pm
---- perl-5.10.0/t.ble/lib/MyPerlSource.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/MyPerlSource.pm	2008-06-18 01:26:58.000000000 +0200
-@@ -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/t.ble/lib/MyResultFactory.pm perl-5.10.0/t/lib/MyResultFactory.pm
---- perl-5.10.0/t.ble/lib/MyResultFactory.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/MyResultFactory.pm	2008-06-22 03:03:03.000000000 +0200
-@@ -0,0 +1,22 @@
-+# 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/t.ble/lib/MyResult.pm perl-5.10.0/t/lib/MyResult.pm
---- perl-5.10.0/t.ble/lib/MyResult.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/MyResult.pm	2008-06-18 01:27:21.000000000 +0200
-@@ -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/t.ble/lib/MySource.pm perl-5.10.0/t/lib/MySource.pm
---- perl-5.10.0/t.ble/lib/MySource.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/MySource.pm	2008-06-18 01:26:27.000000000 +0200
-@@ -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/t.ble/lib/NoFork.pm perl-5.10.0/t/lib/NoFork.pm
---- perl-5.10.0/t.ble/lib/NoFork.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/NoFork.pm	2008-06-18 01:27:32.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/bailout perl-5.10.0/t/lib/sample-tests/bailout
---- perl-5.10.0/t.ble/lib/sample-tests/bailout	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/bailout	2008-06-09 02:41:01.000000000 +0200
-@@ -1,3 +1,5 @@
-+# Sleep makes Mac OS open3 race problem more repeatable
-+sleep 1;
- print <<DUMMY_TEST;
- 1..5
- ok 1
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/combined perl-5.10.0/t/lib/sample-tests/combined
---- perl-5.10.0/t.ble/lib/sample-tests/combined	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/combined	2008-06-09 02:41:01.000000000 +0200
-@@ -1,13 +1,13 @@
- print <<DUMMY_TEST;
--1..10 todo 4 10
-+1..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 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/t.ble/lib/sample-tests/combined_compat perl-5.10.0/t/lib/sample-tests/combined_compat
---- perl-5.10.0/t.ble/lib/sample-tests/combined_compat	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/combined_compat	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/delayed perl-5.10.0/t/lib/sample-tests/delayed
---- perl-5.10.0/t.ble/lib/sample-tests/delayed	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/delayed	2008-06-09 02:41:01.000000000 +0200
-@@ -0,0 +1,33 @@
-+# Used to test Process.pm
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        unshift @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/t.ble/lib/sample-tests/descriptive_trailing perl-5.10.0/t/lib/sample-tests/descriptive_trailing
---- perl-5.10.0/t.ble/lib/sample-tests/descriptive_trailing	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/descriptive_trailing	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/die perl-5.10.0/t/lib/sample-tests/die
---- perl-5.10.0/t.ble/lib/sample-tests/die	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/die	2008-06-09 02:41:01.000000000 +0200
-@@ -1,2 +1,2 @@
--use if ($^O eq 'VMS'), vmsish => 'hushed';
-+eval "use vmsish 'hushed'" if ($^O eq 'VMS');
- exit 1;  # exit because die() can be noisy
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/die_head_end perl-5.10.0/t/lib/sample-tests/die_head_end
---- perl-5.10.0/t.ble/lib/sample-tests/die_head_end	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/die_head_end	2008-06-09 02:41:01.000000000 +0200
-@@ -5,5 +5,5 @@
- ok 4
- DUMMY_TEST
- 
--use if $^O eq 'VMS', vmsish => 'hushed';
-+eval "use vmsish 'hushed'" if ($^O eq 'VMS');
- exit 1;
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/die_last_minute perl-5.10.0/t/lib/sample-tests/die_last_minute
---- perl-5.10.0/t.ble/lib/sample-tests/die_last_minute	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/die_last_minute	2008-06-09 02:41:01.000000000 +0200
-@@ -6,5 +6,5 @@
- 1..4
- DUMMY_TEST
- 
--use if $^O eq 'VMS', vmsish => 'hushed';
-+eval "use vmsish 'hushed'" if ($^O eq 'VMS');
- exit 1;
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/die_unfinished perl-5.10.0/t/lib/sample-tests/die_unfinished
---- perl-5.10.0/t.ble/lib/sample-tests/die_unfinished	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/die_unfinished	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/echo perl-5.10.0/t/lib/sample-tests/echo
---- perl-5.10.0/t.ble/lib/sample-tests/echo	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/echo	2008-06-09 02:41:01.000000000 +0200
-@@ -0,0 +1,2 @@
-+print '1..', scalar(@ARGV), "\n";
-+print "ok $_ ", $ARGV[ $_ - 1 ], "\n" for 1 .. @ARGV;
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/empty perl-5.10.0/t/lib/sample-tests/empty
---- perl-5.10.0/t.ble/lib/sample-tests/empty	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/empty	2008-06-09 02:41:01.000000000 +0200
-@@ -0,0 +1,2 @@
-+__END__
-+Used to exercise the "empty test" case.
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/escape_eol perl-5.10.0/t/lib/sample-tests/escape_eol
---- perl-5.10.0/t.ble/lib/sample-tests/escape_eol	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/escape_eol	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/escape_hash perl-5.10.0/t/lib/sample-tests/escape_hash
---- perl-5.10.0/t.ble/lib/sample-tests/escape_hash	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/escape_hash	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/inc_taint perl-5.10.0/t/lib/sample-tests/inc_taint
---- perl-5.10.0/t.ble/lib/sample-tests/inc_taint	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/inc_taint	2008-06-09 02:41:01.000000000 +0200
-@@ -1,7 +1,15 @@
- #!/usr/bin/perl -Tw
- 
--use lib qw(t/lib);
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        unshift @INC, '../lib';
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
- use Test::More tests => 1;
- 
--ok( grep(/we_added_this_lib/, @INC) );
-+ok( grep( /examples/, @INC ) );
- 
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/junk_before_plan perl-5.10.0/t/lib/sample-tests/junk_before_plan
---- perl-5.10.0/t.ble/lib/sample-tests/junk_before_plan	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/junk_before_plan	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/out_err_mix perl-5.10.0/t/lib/sample-tests/out_err_mix
---- perl-5.10.0/t.ble/lib/sample-tests/out_err_mix	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/out_err_mix	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/schwern perl-5.10.0/t/lib/sample-tests/schwern
---- perl-5.10.0/t.ble/lib/sample-tests/schwern	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/schwern	2008-06-09 02:41:01.000000000 +0200
-@@ -0,0 +1,3 @@
-+use Test::More;
-+plan tests => 1;
-+ok 23, 42;
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/schwern-todo-quiet perl-5.10.0/t/lib/sample-tests/schwern-todo-quiet
---- perl-5.10.0/t.ble/lib/sample-tests/schwern-todo-quiet	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/schwern-todo-quiet	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/sequence_misparse perl-5.10.0/t/lib/sample-tests/sequence_misparse
---- perl-5.10.0/t.ble/lib/sample-tests/sequence_misparse	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/sequence_misparse	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/shbang_misparse perl-5.10.0/t/lib/sample-tests/shbang_misparse
---- perl-5.10.0/t.ble/lib/sample-tests/shbang_misparse	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/shbang_misparse	2008-06-09 02:41:01.000000000 +0200
-@@ -8,5 +8,5 @@
- print "ok 1\n";
- my $warning = '';
- $SIG{__WARN__} = sub { $warning .= $_[0] };
--eval("#" . substr($0, 0, 0));
-+eval( "#" . substr( $0, 0, 0 ) );
- print $warning ? "not ok 2\n" : "ok 2\n";
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/simple_yaml perl-5.10.0/t/lib/sample-tests/simple_yaml
---- perl-5.10.0/t.ble/lib/sample-tests/simple_yaml	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/simple_yaml	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/skipall perl-5.10.0/t/lib/sample-tests/skipall
---- perl-5.10.0/t.ble/lib/sample-tests/skipall	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/skipall	2008-06-09 02:41:01.000000000 +0200
-@@ -1,3 +1,3 @@
- print <<DUMMY_TEST;
--1..0 # skip: rope
-+1..0 # skipping: rope
- DUMMY_TEST
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/skipall_v13 perl-5.10.0/t/lib/sample-tests/skipall_v13
---- perl-5.10.0/t.ble/lib/sample-tests/skipall_v13	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/skipall_v13	2008-06-09 02:41:01.000000000 +0200
-@@ -0,0 +1,4 @@
-+print <<DUMMY_TEST;
-+TAP version 13
-+1..0 # skipping: rope
-+DUMMY_TEST
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/space_after_plan perl-5.10.0/t/lib/sample-tests/space_after_plan
---- perl-5.10.0/t.ble/lib/sample-tests/space_after_plan	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/space_after_plan	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/stdout_stderr perl-5.10.0/t/lib/sample-tests/stdout_stderr
---- perl-5.10.0/t.ble/lib/sample-tests/stdout_stderr	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/stdout_stderr	2008-06-09 02:41:01.000000000 +0200
-@@ -0,0 +1,14 @@
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        unshift @INC, '../lib';
-+    }
-+}
-+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/t.ble/lib/sample-tests/strict perl-5.10.0/t/lib/sample-tests/strict
---- perl-5.10.0/t.ble/lib/sample-tests/strict	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/strict	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/taint perl-5.10.0/t/lib/sample-tests/taint
---- perl-5.10.0/t.ble/lib/sample-tests/taint	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/taint	2008-06-09 02:41:01.000000000 +0200
-@@ -4,4 +4,4 @@
- use Test::More tests => 1;
- 
- eval { kill 0, $^X };
--like( $@, '/^Insecure dependency/',   '-T honored' );
-+like( $@, '/^Insecure dependency/', '-T honored' );
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/taint_warn perl-5.10.0/t/lib/sample-tests/taint_warn
---- perl-5.10.0/t.ble/lib/sample-tests/taint_warn	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/taint_warn	2008-06-09 02:41:01.000000000 +0200
-@@ -8,4 +8,4 @@
-     local $SIG{__WARN__} = sub { $warnings .= join '', @_ };
-     kill 0, $^X;
- }
--like( $warnings, '/^Insecure dependency/',   '-t honored' );
-+like( $warnings, '/^Insecure dependency/', '-t honored' );
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/todo perl-5.10.0/t/lib/sample-tests/todo
---- perl-5.10.0/t.ble/lib/sample-tests/todo	2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/todo	2008-06-09 02:41:01.000000000 +0200
-@@ -1,5 +1,5 @@
- print <<DUMMY_TEST;
--1..5 todo 3   2;
-+1..5 todo 3 2;
- ok 1
- ok 2
- not ok 3
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/todo_misparse perl-5.10.0/t/lib/sample-tests/todo_misparse
---- perl-5.10.0/t.ble/lib/sample-tests/todo_misparse	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/todo_misparse	2008-06-09 02:41:01.000000000 +0200
-@@ -0,0 +1,5 @@
-+print <<'END';
-+1..1
-+not ok 1 Hamlette # TODOORNOTTODO
-+END
-+
-diff -urN perl-5.10.0/t.ble/lib/sample-tests/version_good perl-5.10.0/t/lib/sample-tests/version_good
---- perl-5.10.0/t.ble/lib/sample-tests/version_good	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/version_good	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/version_late perl-5.10.0/t/lib/sample-tests/version_late
---- perl-5.10.0/t.ble/lib/sample-tests/version_late	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/version_late	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/sample-tests/version_old perl-5.10.0/t/lib/sample-tests/version_old
---- perl-5.10.0/t.ble/lib/sample-tests/version_old	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/sample-tests/version_old	2008-06-09 02:41:01.000000000 +0200
-@@ -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/t.ble/lib/source_tests/harness perl-5.10.0/t/lib/source_tests/harness
---- perl-5.10.0/t.ble/lib/source_tests/harness	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/source_tests/harness	2008-06-09 02:41:00.000000000 +0200
-@@ -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/t.ble/lib/source_tests/harness_badtap perl-5.10.0/t/lib/source_tests/harness_badtap
---- perl-5.10.0/t.ble/lib/source_tests/harness_badtap	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/source_tests/harness_badtap	2008-06-09 02:41:00.000000000 +0200
-@@ -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/t.ble/lib/source_tests/harness_complain perl-5.10.0/t/lib/source_tests/harness_complain
---- perl-5.10.0/t.ble/lib/source_tests/harness_complain	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/source_tests/harness_complain	2008-06-09 02:41:00.000000000 +0200
-@@ -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/t.ble/lib/source_tests/harness_directives perl-5.10.0/t/lib/source_tests/harness_directives
---- perl-5.10.0/t.ble/lib/source_tests/harness_directives	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/source_tests/harness_directives	2008-06-09 02:41:00.000000000 +0200
-@@ -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/t.ble/lib/source_tests/harness_failure perl-5.10.0/t/lib/source_tests/harness_failure
---- perl-5.10.0/t.ble/lib/source_tests/harness_failure	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/source_tests/harness_failure	2008-06-09 02:41:00.000000000 +0200
-@@ -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/t.ble/lib/source_tests/source perl-5.10.0/t/lib/source_tests/source
---- perl-5.10.0/t.ble/lib/source_tests/source	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/source_tests/source	2008-06-09 02:41:00.000000000 +0200
-@@ -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/t.ble/lib/subclass_tests/non_perl_source perl-5.10.0/t/lib/subclass_tests/non_perl_source
---- perl-5.10.0/t.ble/lib/subclass_tests/non_perl_source	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/subclass_tests/non_perl_source	2008-06-10 00:31:18.000000000 +0200
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+echo "1..1"
-+echo "ok 1 - this is a test"
-diff -urN perl-5.10.0/t.ble/lib/subclass_tests/perl_source perl-5.10.0/t/lib/subclass_tests/perl_source
---- perl-5.10.0/t.ble/lib/subclass_tests/perl_source	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/subclass_tests/perl_source	2008-06-10 00:31:18.000000000 +0200
-@@ -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/t.ble/lib/TAP/Parser/SubclassTest.pm perl-5.10.0/t/lib/TAP/Parser/SubclassTest.pm
---- perl-5.10.0/t.ble/lib/TAP/Parser/SubclassTest.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/TAP/Parser/SubclassTest.pm	2008-06-18 01:26:56.000000000 +0200
-@@ -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/t.ble/lib/Test/Builder/Module.pm perl-5.10.0/t/lib/Test/Builder/Module.pm
---- perl-5.10.0/t.ble/lib/Test/Builder/Module.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Builder/Module.pm	2008-06-18 01:26:53.000000000 +0200
-@@ -0,0 +1,177 @@
-+package Test::Builder::Module;
-+
-+use Test::Builder;
-+
-+require Exporter;
-+@ISA = qw(Exporter);
-+
-+$VERSION = '0.72';
-+
-+use strict;
-+
-+# 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, @_ );
-+};
-+
-+=head1 NAME
-+
-+Test::Builder::Module - Base class for test modules
-+
-+=head1 SYNOPSIS
-+
-+  # Emulates Test::Simple
-+  package Your::Module;
-+
-+  my $CLASS = __PACKAGE__;
-+
-+  use base 'Test::Builder::Module';
-+  @EXPORT = qw(ok);
-+
-+  sub ok ($;$) {
-+      my $tb = $CLASS->builder;
-+      return $tb->ok(@_);
-+  }
-+  
-+  1;
-+
-+
-+=head1 DESCRIPTION
-+
-+This is a superclass for Test::Builder-based modules.  It provides a
-+handful of common functionality and a method of getting at the underlying
-+Test::Builder object.
-+
-+
-+=head2 Importing
-+
-+Test::Builder::Module is a subclass of Exporter which means your
-+module is also a subclass of Exporter.  @EXPORT, @EXPORT_OK, etc...
-+all act normally.
-+
-+A few methods are provided to do the C<use Your::Module tests => 23> part
-+for you.
-+
-+=head3 import
-+
-+Test::Builder::Module provides an import() method which acts in the
-+same basic way as Test::More's, setting the plan and controling
-+exporting of functions and variables.  This allows your module to set
-+the plan independent of Test::More.
-+
-+All arguments passed to import() are passed onto 
-+C<< Your::Module->builder->plan() >> with the exception of 
-+C<import =>[qw(things to import)]>.
-+
-+    use Your::Module import => [qw(this that)], tests => 23;
-+
-+says to import the functions this() and that() as well as set the plan
-+to be 23 tests.
-+
-+import() also sets the exported_to() attribute of your builder to be
-+the caller of the import() function.
-+
-+Additional behaviors can be added to your import() method by overriding
-+import_extra().
-+
-+=cut
-+
-+sub import {
-+    my ($class) = shift;
-+
-+    my $test = $class->builder;
-+
-+    my $caller = caller;
-+
-+    $test->exported_to($caller);
-+
-+    $class->import_extra( \@_ );
-+    my (@imports) = $class->_strip_imports( \@_ );
-+
-+    $test->plan(@_);
-+
-+    $class->$_export_to_level( 1, $class, @imports );
-+}
-+
-+sub _strip_imports {
-+    my $class = shift;
-+    my $list  = shift;
-+
-+    my @imports = ();
-+    my @other   = ();
-+    my $idx     = 0;
-+    while ( $idx <= $#{$list} ) {
-+        my $item = $list->[$idx];
-+
-+        if ( defined $item and $item eq 'import' ) {
-+            push @imports, @{ $list->[ $idx + 1 ] };
-+            $idx++;
-+        }
-+        else {
-+            push @other, $item;
-+        }
-+
-+        $idx++;
-+    }
-+
-+    @$list = @other;
-+
-+    return @imports;
-+}
-+
-+=head3 import_extra
-+
-+    Your::Module->import_extra(\@import_args);
-+
-+import_extra() is called by import().  It provides an opportunity for you
-+to add behaviors to your module based on its import list.
-+
-+Any extra arguments which shouldn't be passed on to plan() should be 
-+stripped off by this method.
-+
-+See Test::More for an example of its use.
-+
-+B<NOTE> This mechanism is I<VERY ALPHA AND LIKELY TO CHANGE> as it
-+feels like a bit of an ugly hack in its current form.
-+
-+=cut
-+
-+sub import_extra { }
-+
-+=head2 Builder
-+
-+Test::Builder::Module provides some methods of getting at the underlying
-+Test::Builder object.
-+
-+=head3 builder
-+
-+  my $builder = Your::Class->builder;
-+
-+This method returns the Test::Builder object associated with Your::Class.
-+It is not a constructor so you can call it as often as you like.
-+
-+This is the preferred way to get the Test::Builder object.  You should
-+I<not> get it via C<< Test::Builder->new >> as was previously
-+recommended.
-+
-+The object returned by builder() may change at runtime so you should
-+call builder() inside each function rather than store it in a global.
-+
-+  sub ok {
-+      my $builder = Your::Class->builder;
-+
-+      return $builder->ok(@_);
-+  }
-+
-+
-+=cut
-+
-+sub builder {
-+    return Test::Builder->new;
-+}
-+
-+1;
-diff -urN perl-5.10.0/t.ble/lib/Test/Builder.pm perl-5.10.0/t/lib/Test/Builder.pm
---- perl-5.10.0/t.ble/lib/Test/Builder.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Builder.pm	2008-06-18 01:27:12.000000000 +0200
-@@ -0,0 +1,1850 @@
-+package Test::Builder;
-+
-+use 5.004;
-+
-+# $^C was only introduced in 5.005-ish.  We do this to prevent
-+# use of uninitialized value warnings in older perls.
-+$^C ||= 0;
-+
-+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'} ) {
-+        require threads::shared;
-+
-+        # 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 (\[$@%]) {
-+            my $type = ref $_[0];
-+            my $data;
-+
-+            if ( $type eq 'HASH' ) {
-+                %$data = %{ $_[0] };
-+            }
-+            elsif ( $type eq 'ARRAY' ) {
-+                @$data = @{ $_[0] };
-+            }
-+            elsif ( $type eq 'SCALAR' ) {
-+                $$data = ${ $_[0] };
-+            }
-+            else {
-+                die( "Unknown type: " . $type );
-+            }
-+
-+            $_[0] = &threads::shared::share( $_[0] );
-+
-+            if ( $type eq 'HASH' ) {
-+                %{ $_[0] } = %$data;
-+            }
-+            elsif ( $type eq 'ARRAY' ) {
-+                @{ $_[0] } = @$data;
-+            }
-+            elsif ( $type eq 'SCALAR' ) {
-+                ${ $_[0] } = $$data;
-+            }
-+            else {
-+                die( "Unknown type: " . $type );
-+            }
-+
-+            return $_[0];
-+        };
-+    }
-+
-+    # 5.8.0's threads::shared is busted when threads are off
-+    # and earlier Perls just don't have that module at all.
-+    else {
-+        *share = sub { return $_[0] };
-+        *lock  = sub {0};
-+    }
-+}
-+
-+=head1 NAME
-+
-+Test::Builder - Backend for building test libraries
-+
-+=head1 SYNOPSIS
-+
-+  package My::Test::Module;
-+  use Test::Builder;
-+  require Exporter;
-+  @ISA = qw(Exporter);
-+  @EXPORT = qw(ok);
-+
-+  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');
-+  }
-+
-+  sub ok {
-+      my($test, $name) = @_;
-+
-+      $Test->ok($test, $name);
-+  }
-+
-+
-+=head1 DESCRIPTION
-+
-+Test::Simple and Test::More have proven to be popular testing modules,
-+but they're not always flexible enough.  Test::Builder provides the a
-+building block upon which to write your own test libraries I<which can
-+work together>.
-+
-+=head2 Construction
-+
-+=over 4
-+
-+=item B<new>
-+
-+  my $Test = Test::Builder->new;
-+
-+Returns a Test::Builder object representing the current state of the
-+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
-+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.
-+
-+If you want a completely new Test::Builder object different from the
-+singleton, use C<create>.
-+
-+=cut
-+
-+my $Test = Test::Builder->new;
-+
-+sub new {
-+    my ($class) = shift;
-+    $Test ||= $class->create;
-+    return $Test;
-+}
-+
-+=item B<create>
-+
-+  my $Test = Test::Builder->create;
-+
-+Ok, so there can be more than one Test::Builder object and this is how
-+you get it.  You might use this instead of C<new()> if you're testing
-+a Test::Builder based module, but otherwise you probably want C<new>.
-+
-+B<NOTE>: the implementation is not complete.  C<level>, for example, is
-+still shared amongst B<all> Test::Builder objects, even ones created using
-+this method.  Also, the method name may change in the future.
-+
-+=cut
-+
-+sub create {
-+    my $class = shift;
-+
-+    my $self = bless {}, $class;
-+    $self->reset;
-+
-+    return $self;
-+}
-+
-+=item B<reset>
-+
-+  $Test->reset;
-+
-+Reinitializes the Test::Builder singleton to its original state.
-+Mostly useful for tests run in persistent environments where the same
-+test might be run multiple times in the same process.
-+
-+=cut
-+
-+use vars qw($Level);
-+
-+sub reset {
-+    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->{Original_Pid} = $$;
-+
-+    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->{Use_Nums} = 1;
-+
-+    $self->{No_Header} = 0;
-+    $self->{No_Ending} = 0;
-+
-+    $self->_dup_stdhandles unless $^C;
-+
-+    return undef;
-+}
-+
-+=back
-+
-+=head2 Setting up tests
-+
-+These methods are for setting up tests and declaring how many there
-+are.  You usually only want to call one of these methods.
-+
-+=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');
-+  $Test->plan( skip_all => $reason );
-+  $Test->plan( tests => $num_tests );
-+
-+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.
-+
-+=cut
-+
-+sub plan {
-+    my ( $self, $cmd, $arg ) = @_;
-+
-+    return unless $cmd;
-+
-+    local $Level = $Level + 1;
-+
-+    if ( $self->{Have_Plan} ) {
-+        $self->croak("You tried to plan twice");
-+    }
-+
-+    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");
-+        }
-+    }
-+    else {
-+        my @args = grep {defined} ( $cmd, $arg );
-+        $self->croak("plan() doesn't understand @args");
-+    }
-+
-+    return 1;
-+}
-+
-+=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
-+the appropriate headers.
-+
-+=cut
-+
-+sub expected_tests {
-+    my $self = shift;
-+    my ($max) = @_;
-+
-+    if (@_) {
-+        $self->croak(
-+            "Number of tests must be a positive integer.  You gave it '$max'")
-+          unless $max =~ /^\+?\d+$/ and $max > 0;
-+
-+        $self->{Expected_Tests} = $max;
-+        $self->{Have_Plan}      = 1;
-+
-+        $self->_print("1..$max\n") 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.
-+
-+=cut
-+
-+sub no_plan {
-+    my $self = shift;
-+
-+    $self->{No_Plan}   = 1;
-+    $self->{Have_Plan} = 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).
-+
-+=cut
-+
-+sub has_plan {
-+    my $self = shift;
-+
-+    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.
-+
-+=cut
-+
-+sub skip_all {
-+    my ( $self, $reason ) = @_;
-+
-+    my $out = "1..0";
-+    $out .= " # Skip $reason" if $reason;
-+    $out .= "\n";
-+
-+    $self->{Skip_All} = 1;
-+
-+    $self->_print($out) unless $self->no_header;
-+    exit(0);
-+}
-+
-+=back
-+
-+=head2 Running tests
-+
-+These actually run the tests, analogous to the functions in Test::More.
-+
-+They all return true if the test passed, false if the test failed.
-+
-+$name is always optional.
-+
-+=over 4
-+
-+=item B<ok>
-+
-+  $Test->ok($test, $name);
-+
-+Your basic test.  Pass if $test is true, fail if $test is false.  Just
-+like Test::Simple's ok().
-+
-+=cut
-+
-+sub ok {
-+    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->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;
-+
-+    my $todo = $self->todo($pack);
-+    $self->_unoverload_str( \$todo );
-+
-+    my $out;
-+    my $result = &share( {} );
-+
-+    unless ($test) {
-+        $out .= "not ";
-+        @$result{ 'ok', 'actual_ok' } = ( ( $todo ? 1 : 0 ), 0 );
-+    }
-+    else {
-+        @$result{ 'ok', 'actual_ok' } = ( 1, $test );
-+    }
-+
-+    $out .= "ok";
-+    $out .= " $self->{Curr_Test}" if $self->use_numbers;
-+
-+    if ( defined $name ) {
-+        $name =~ s|#|\\#|g;    # # in a name can confuse Test::Harness.
-+        $out .= " - $name";
-+        $result->{name} = $name;
-+    }
-+    else {
-+        $result->{name} = '';
-+    }
-+
-+    if ($todo) {
-+        $out .= " # TODO $todo";
-+        $result->{reason} = $todo;
-+        $result->{type}   = 'todo';
-+    }
-+    else {
-+        $result->{reason} = '';
-+        $result->{type}   = '';
-+    }
-+
-+    $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]);
-+        }
-+    }
-+
-+    return $test ? 1 : 0;
-+}
-+
-+sub _unoverload {
-+    my $self = shift;
-+    my $type = shift;
-+
-+    $self->_try( sub { require overload } ) || return;
-+
-+    foreach my $thing (@_) {
-+        if ( $self->_is_object($$thing) ) {
-+            if ( my $string_meth = overload::Method( $$thing, $type ) ) {
-+                $$thing = $$thing->$string_meth();
-+            }
-+        }
-+    }
-+}
-+
-+sub _is_object {
-+    my ( $self, $thing ) = @_;
-+
-+    return $self->_try( sub { ref $thing && $thing->isa('UNIVERSAL') } )
-+      ? 1
-+      : 0;
-+}
-+
-+sub _unoverload_str {
-+    my $self = shift;
-+
-+    $self->_unoverload( q[""], @_ );
-+}
-+
-+sub _unoverload_num {
-+    my $self = shift;
-+
-+    $self->_unoverload( '0+', @_ );
-+
-+    for my $val (@_) {
-+        next unless $self->_is_dualvar($$val);
-+        $$val = $$val + 0;
-+    }
-+}
-+
-+# 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;
-+}
-+
-+=item B<is_eq>
-+
-+  $Test->is_eq($got, $expected, $name);
-+
-+Like Test::More's is().  Checks if $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
-+numeric version.
-+
-+=cut
-+
-+sub is_eq {
-+    my ( $self, $got, $expect, $name ) = @_;
-+    local $Level = $Level + 1;
-+
-+    $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;
-+        return $test;
-+    }
-+
-+    return $self->cmp_ok( $got, 'eq', $expect, $name );
-+}
-+
-+sub is_num {
-+    my ( $self, $got, $expect, $name ) = @_;
-+    local $Level = $Level + 1;
-+
-+    $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;
-+        return $test;
-+    }
-+
-+    return $self->cmp_ok( $got, '==', $expect, $name );
-+}
-+
-+sub _is_diag {
-+    my ( $self, $got, $type, $expect ) = @_;
-+
-+    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);
-+            }
-+        }
-+        else {
-+            $$val = 'undef';
-+        }
-+    }
-+
-+    return $self->diag( sprintf <<DIAGNOSTIC, $got, $expect );
-+         got: %s
-+    expected: %s
-+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
-+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
-+the numeric version.
-+
-+=cut
-+
-+sub isnt_eq {
-+    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;
-+        return $test;
-+    }
-+
-+    return $self->cmp_ok( $got, 'ne', $dont_expect, $name );
-+}
-+
-+sub isnt_num {
-+    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;
-+        return $test;
-+    }
-+
-+    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.
-+
-+You'll want to avoid 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.
-+
-+=cut
-+
-+sub like {
-+    my ( $self, $this, $regex, $name ) = @_;
-+
-+    local $Level = $Level + 1;
-+    $self->_regex_ok( $this, $regex, '=~', $name );
-+}
-+
-+sub unlike {
-+    my ( $self, $this, $regex, $name ) = @_;
-+
-+    local $Level = $Level + 1;
-+    $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().
-+
-+    $Test->cmp_ok($big_num, '!=', $other_big_num);
-+
-+=cut
-+
-+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 $test;
-+    {
-+        local ( $@, $!, $SIG{__DIE__} );    # isolate eval
-+
-+        my $code = $self->_caller_context;
-+
-+       # 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;";
-+
-+    }
-+    local $Level = $Level + 1;
-+    my $ok = $self->ok( $test, $name );
-+
-+    unless ($ok) {
-+        if ( $type =~ /^(eq|==)$/ ) {
-+            $self->_is_diag( $got, $type, $expect );
-+        }
-+        else {
-+            $self->_cmp_diag( $got, $type, $expect );
-+        }
-+    }
-+    return $ok;
-+}
-+
-+sub _cmp_diag {
-+    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
-+DIAGNOSTIC
-+}
-+
-+sub _caller_context {
-+    my $self = shift;
-+
-+    my ( $pack, $file, $line ) = $self->caller(1);
-+
-+    my $code = '';
-+    $code .= "#line $line $file\n" if defined $file and defined $line;
-+
-+    return $code;
-+}
-+
-+=back
-+
-+
-+=head2 Other Testing Methods
-+
-+These are methods which are used in the course of writing a test but are not themselves tests.
-+
-+=over 4
-+
-+=item B<BAIL_OUT>
-+
-+    $Test->BAIL_OUT($reason);
-+
-+Indicates to the Test::Harness that things are going so badly all
-+testing should terminate.  This includes running any additional test
-+scripts.
-+
-+It will exit with 255.
-+
-+=cut
-+
-+sub BAIL_OUT {
-+    my ( $self, $reason ) = @_;
-+
-+    $self->{Bailed_Out} = 1;
-+    $self->_print("Bail out!  $reason");
-+    exit 255;
-+}
-+
-+=for deprecated
-+BAIL_OUT() used to be BAILOUT()
-+
-+=cut
-+
-+*BAILOUT = \&BAIL_OUT;
-+
-+=item B<skip>
-+
-+    $Test->skip;
-+    $Test->skip($why);
-+
-+Skips the current test, reporting $why.
-+
-+=cut
-+
-+sub skip {
-+    my ( $self, $why ) = @_;
-+    $why ||= '';
-+    $self->_unoverload_str( \$why );
-+
-+    $self->_plan_check;
-+
-+    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,
-+        }
-+    );
-+
-+    my $out = "ok";
-+    $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
-+to
-+
-+    print "not ok $tnum # TODO $why\n";
-+
-+=cut
-+
-+sub todo_skip {
-+    my ( $self, $why ) = @_;
-+    $why ||= '';
-+
-+    $self->_plan_check;
-+
-+    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,
-+        }
-+    );
-+
-+    my $out = "not ok";
-+    $out .= " $self->{Curr_Test}" if $self->use_numbers;
-+    $out .= " # TODO & SKIP $why\n";
-+
-+    $self->_print($out);
-+
-+    return 1;
-+}
-+
-+=begin _unimplemented
-+
-+=item B<skip_rest>
-+
-+  $Test->skip_rest;
-+  $Test->skip_rest($reason);
-+
-+Like 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
-+test.
-+
-+=end _unimplemented
-+
-+=back
-+
-+
-+=head2 Test building utility methods
-+
-+These methods are useful when writing your own test methods.
-+
-+=over 4
-+
-+=item B<maybe_regex>
-+
-+  $Test->maybe_regex(qr/$regex/);
-+  $Test->maybe_regex('/$regex/');
-+
-+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
-+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.
-+
-+For example, a version of like(), sans the useful diagnostic messages,
-+could be written as:
-+
-+  sub laconic_like {
-+      my ($self, $this, $regex, $name) = @_;
-+      my $usable_regex = $self->maybe_regex($regex);
-+      die "expecting regex, found '$regex'\n"
-+          unless $usable_regex;
-+      $self->ok($this =~ m/$usable_regex/, $name);
-+  }
-+
-+=cut
-+
-+sub maybe_regex {
-+    my ( $self, $regex ) = @_;
-+    my $usable_regex = undef;
-+
-+    return $usable_regex unless defined $regex;
-+
-+    my ( $re, $opts );
-+
-+    # Check for qr/foo/
-+    if ( ref $regex eq 'Regexp' ) {
-+        $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 )
-+    {
-+        $usable_regex = length $opts ? "(?$opts)$re" : $re;
-+    }
-+
-+    return $usable_regex;
-+}
-+
-+sub _regex_ok {
-+    my ( $self, $this, $regex, $cmp, $name ) = @_;
-+
-+    my $ok           = 0;
-+    my $usable_regex = $self->maybe_regex($regex);
-+    unless ( defined $usable_regex ) {
-+        $ok = $self->ok( 0, $name );
-+        $self->diag("    '$regex' doesn't look much like a regex to me.");
-+        return $ok;
-+    }
-+
-+    {
-+        my $test;
-+        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" . q{$test = $this =~ /$usable_regex/ ? 1 : 0};
-+
-+        $test = !$test if $cmp eq '!~';
-+
-+        local $Level = $Level + 1;
-+        $ok = $self->ok( $test, $name );
-+    }
-+
-+    unless ($ok) {
-+        $this = defined $this ? "'$this'" : 'undef';
-+        my $match = $cmp eq '=~' ? "doesn't match" : "matches";
-+        $self->diag( sprintf <<DIAGNOSTIC, $this, $match, $regex );
-+                  %s
-+    %13s '%s'
-+DIAGNOSTIC
-+
-+    }
-+
-+    return $ok;
-+}
-+
-+# I'm not ready to publish this.  It doesn't deal with array return
-+# values from the code or context.
-+
-+=begin private
-+
-+=item B<_try>
-+
-+    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.
-+
-+$error is what would normally be in $@.
-+
-+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;
-+}
-+
-+=end private
-+
-+
-+=item B<is_fh>
-+
-+    my $is_fh = $Test->is_fh($thing);
-+
-+Determines if the given $thing can be used as a filehandle.
-+
-+=cut
-+
-+sub is_fh {
-+    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 eval { $maybe_fh->isa("IO::Handle") } ||
-+
-+      # 5.5.4's tied() and can() doesn't like getting undef
-+      eval { ( tied($maybe_fh) || '' )->can('TIEHANDLE') };
-+}
-+
-+=back
-+
-+
-+=head2 Test style
-+
-+
-+=over 4
-+
-+=item B<level>
-+
-+    $Test->level($how_high);
-+
-+How far up the call stack should $Test look when reporting where the
-+test failed.
-+
-+Defaults to 1.
-+
-+Setting L<$Test::Builder::Level> overrides.  This is typically useful
-+localized:
-+
-+    sub my_ok {
-+        my $test = shift;
-+
-+        local $Test::Builder::Level = $Test::Builder::Level + 1;
-+        $TB->ok($test);
-+    }
-+
-+To be polite to other functions wrapping your own you usually want to increment C<$Level> rather than set it to a constant.
-+
-+=cut
-+
-+sub level {
-+    my ( $self, $level ) = @_;
-+
-+    if ( defined $level ) {
-+        $Level = $level;
-+    }
-+    return $Level;
-+}
-+
-+=item B<use_numbers>
-+
-+    $Test->use_numbers($on_or_off);
-+
-+Whether or not the test should output numbers.  That is, this if true:
-+
-+  ok 1
-+  ok 2
-+  ok 3
-+
-+or this if false
-+
-+  ok
-+  ok
-+  ok
-+
-+Most useful when you can't depend on the test output order, such as
-+when threads or forking is involved.
-+
-+Defaults to on.
-+
-+=cut
-+
-+sub use_numbers {
-+    my ( $self, $use_nums ) = @_;
-+
-+    if ( defined $use_nums ) {
-+        $self->{Use_Nums} = $use_nums;
-+    }
-+    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().
-+
-+=item B<no_ending>
-+
-+    $Test->no_ending($no_ending);
-+
-+Normally, Test::Builder does some extra diagnostics when the test
-+ends.  It also changes the exit code as described below.
-+
-+If this is true, none of that will be done.
-+
-+=item B<no_header>
-+
-+    $Test->no_header($no_header);
-+
-+If set to true, no "1..N" header will be printed.
-+
-+=cut
-+
-+foreach my $attribute (qw(No_Header No_Ending No_Diag)) {
-+    my $method = lc $attribute;
-+
-+    my $code = sub {
-+        my ( $self, $no ) = @_;
-+
-+        if ( defined $no ) {
-+            $self->{$attribute} = $no;
-+        }
-+        return $self->{$attribute};
-+    };
-+
-+    no strict 'refs';
-+    *{ __PACKAGE__ . '::' . $method } = $code;
-+}
-+
-+=back
-+
-+=head2 Output
-+
-+Controlling where the test output goes.
-+
-+It's ok for your test to change where STDOUT and STDERR point to,
-+Test::Builder's default output settings will not be affected.
-+
-+=over 4
-+
-+=item B<diag>
-+
-+    $Test->diag(@msgs);
-+
-+Prints out the given @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.
-+
-+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
-+already.
-+
-+We encourage using this rather than calling print directly.
-+
-+Returns false.  Why?  Because diag() is often used in conjunction with
-+a failing test (C<ok() || diag()>) it "passes through" the failure.
-+
-+    return ok(...) || diag(...);
-+
-+=for blame transfer
-+Mark Fowler <mark@twoshortplanks.com>
-+
-+=cut
-+
-+sub diag {
-+    my ( $self, @msgs ) = @_;
-+
-+    return if $self->no_diag;
-+    return unless @msgs;
-+
-+    # Prevent printing headers when compiling (i.e. -c)
-+    return if $^C;
-+
-+    # Smash args together like print does.
-+    # 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/;
-+
-+    local $Level = $Level + 1;
-+    $self->_print_diag($msg);
-+
-+    return 0;
-+}
-+
-+=begin _private
-+
-+=item B<_print>
-+
-+    $Test->_print(@msgs);
-+
-+Prints to the output() filehandle.
-+
-+=end _private
-+
-+=cut
-+
-+sub _print {
-+    my ( $self, @msgs ) = @_;
-+
-+    # Prevent printing headers when only compiling.  Mostly for when
-+    # tests are deparsed with B::Deparse
-+    return if $^C;
-+
-+    my $msg = join '', @msgs;
-+
-+    local ( $\, $", $, ) = ( undef, ' ', '' );
-+    my $fh = $self->output;
-+
-+    # Escape each line after the first with a # so we don't
-+    # confuse Test::Harness.
-+    $msg =~ s/\n(.)/\n# $1/sg;
-+
-+    # Stick a newline on the end if it needs it.
-+    $msg .= "\n" unless $msg =~ /\n\Z/;
-+
-+    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);
-+
-+Where normal "ok/not ok" test output should go.
-+
-+Defaults to STDOUT.
-+
-+=item B<failure_output>
-+
-+    $Test->failure_output($fh);
-+    $Test->failure_output($file);
-+
-+Where diagnostic output on test failures and diag() should go.
-+
-+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.
-+
-+Defaults to STDOUT.
-+
-+=cut
-+
-+sub output {
-+    my ( $self, $fh ) = @_;
-+
-+    if ( defined $fh ) {
-+        $self->{Out_FH} = $self->_new_fh($fh);
-+    }
-+    return $self->{Out_FH};
-+}
-+
-+sub failure_output {
-+    my ( $self, $fh ) = @_;
-+
-+    if ( defined $fh ) {
-+        $self->{Fail_FH} = $self->_new_fh($fh);
-+    }
-+    return $self->{Fail_FH};
-+}
-+
-+sub todo_output {
-+    my ( $self, $fh ) = @_;
-+
-+    if ( defined $fh ) {
-+        $self->{Todo_FH} = $self->_new_fh($fh);
-+    }
-+    return $self->{Todo_FH};
-+}
-+
-+sub _new_fh {
-+    my $self = shift;
-+    my ($file_or_fh) = shift;
-+
-+    my $fh;
-+    if ( $self->is_fh($file_or_fh) ) {
-+        $fh = $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);
-+    }
-+
-+    return $fh;
-+}
-+
-+sub _autoflush {
-+    my ($fh) = shift;
-+    my $old_fh = select $fh;
-+    $| = 1;
-+    select $old_fh;
-+}
-+
-+sub _dup_stdhandles {
-+    my $self = shift;
-+
-+    $self->_open_testhandles;
-+
-+    # 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 );
-+
-+    $self->output( \*TESTOUT );
-+    $self->failure_output( \*TESTERR );
-+    $self->todo_output( \*TESTOUT );
-+}
-+
-+my $Opened_Testhandles = 0;
-+
-+sub _open_testhandles {
-+    return if $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;
-+}
-+
-+=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>).
-+
-+=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>).
-+
-+=cut
-+
-+sub _message_at_caller {
-+    my $self = shift;
-+
-+    local $Level = $Level + 1;
-+    my ( $pack, $file, $line ) = $self->caller;
-+    return join( "", @_ ) . " at $file line $line.\n";
-+}
-+
-+sub carp {
-+    my $self = shift;
-+    warn $self->_message_at_caller(@_);
-+}
-+
-+sub croak {
-+    my $self = shift;
-+    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
-+
-+
-+=head2 Test Status and Info
-+
-+=over 4
-+
-+=item B<current_test>
-+
-+    my $curr_test = $Test->current_test;
-+    $Test->current_test($num);
-+
-+Gets/sets the current test number we're on.  You usually shouldn't
-+have to set this.
-+
-+If set forward, the details of the missing tests are filled in as 'unknown'.
-+if set backward, the details of the intervening tests are deleted.  You
-+can erase history if you really want to.
-+
-+=cut
-+
-+sub current_test {
-+    my ( $self, $num ) = @_;
-+
-+    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
-+                    }
-+                );
-+            }
-+        }
-+
-+        # If backward, wipe history.  Its their funeral.
-+        elsif ( $num < @$test_results ) {
-+            $#{$test_results} = $num - 1;
-+        }
-+    }
-+    return $self->{Curr_Test};
-+}
-+
-+=item B<summary>
-+
-+    my @tests = $Test->summary;
-+
-+A simple summary of the tests so far.  True for pass, false for fail.
-+This is a logical pass/fail, so todos are passes.
-+
-+Of course, test #1 is $tests[0], etc...
-+
-+=cut
-+
-+sub summary {
-+    my ($self) = shift;
-+
-+    return map { $_->{'ok'} } @{ $self->{Test_Results} };
-+}
-+
-+=item B<details>
-+
-+    my @tests = $Test->details;
-+
-+Like summary(), but with a lot more detail.
-+
-+    $tests[$test_num - 1] = 
-+            { 'ok'       => is the test considered a pass?
-+              actual_ok  => did it literally say 'ok'?
-+              name       => name of the test (if any)
-+              type       => type of test (if any, see below).
-+              reason     => reason for the above (if any)
-+            };
-+
-+'ok' is true if Test::Harness will consider the test to be a pass.
-+
-+'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.  
-+
-+'name' is the name of the test.
-+
-+'type' indicates if it was a special test.  Normal tests have a type
-+of ''.  Type can be one of the following:
-+
-+    skip        see skip()
-+    todo        see todo()
-+    todo_skip   see todo_skip()
-+    unknown     see below
-+
-+Sometimes the Test::Builder test counter is incremented without it
-+printing any test output, for example, when 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.
-+
-+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
-+        actual_ok => 0,   # in absolute terms, it failed
-+        name      => 'hole count',
-+        type      => 'todo',
-+        reason    => 'insufficient donuts'
-+      };
-+
-+=cut
-+
-+sub details {
-+    my $self = shift;
-+    return @{ $self->{Test_Results} };
-+}
-+
-+=item B<todo>
-+
-+    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.
-+
-+Sometimes there is some confusion about where todo() should be looking
-+for the $TODO variable.  If you want to be sure, tell it explicitly
-+what $pack to use.
-+
-+=cut
-+
-+sub todo {
-+    my ( $self, $pack ) = @_;
-+
-+    $pack = $pack || $self->exported_to || $self->caller($Level);
-+    return 0 unless $pack;
-+
-+    no strict 'refs';
-+    return defined ${ $pack . '::TODO' }
-+      ? ${ $pack . '::TODO' }
-+      : 0;
-+}
-+
-+=item B<caller>
-+
-+    my $package = $Test->caller;
-+    my($pack, $file, $line) = $Test->caller;
-+    my($pack, $file, $line) = $Test->caller($height);
-+
-+Like the normal caller(), except it reports according to your level().
-+
-+=cut
-+
-+sub caller {
-+    my ( $self, $height ) = @_;
-+    $height ||= 0;
-+
-+    my @caller = CORE::caller( $self->level + $height + 1 );
-+    return wantarray ? @caller : $caller[0];
-+}
-+
-+=back
-+
-+=cut
-+
-+=begin _private
-+
-+=over 4
-+
-+=item B<_sanity_check>
-+
-+  $self->_sanity_check();
-+
-+Runs a bunch of end of test sanity checks to make sure reality came
-+through ok.  If anything is wrong it will die with a fairly friendly
-+error message.
-+
-+=cut
-+
-+#'#
-+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!'
-+    );
-+}
-+
-+=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 note to contact the author.
-+
-+=cut
-+
-+sub _whoa {
-+    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
-+    }
-+}
-+
-+=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
-+doesn't actually exit, that's your job.
-+
-+=cut
-+
-+sub _my_exit {
-+    $? = $_[0];
-+
-+    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();
-+
-+    # 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"
-+    # doesn't puke.
-+    # 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;
-+    }
-+
-+    # Figure out if we passed or failed and print helpful messages.
-+    my $test_results = $self->{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->{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 ) {
-+            $test_results->[$idx] = $empty_result
-+              unless defined $test_results->[$idx];
-+        }
-+
-+        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 ) {
-+            my $s = $self->{Expected_Tests} == 1 ? '' : 's';
-+            $self->diag(<<"FAIL");
-+Looks like you planned $self->{Expected_Tests} test$s but ran $num_extra extra.
-+FAIL
-+        }
-+
-+        if ($num_failed) {
-+            my $num_tests = $self->{Curr_Test};
-+            my $s = $num_failed == 1 ? '' : 's';
-+
-+            my $qualifier = $num_extra == 0 ? '' : ' run';
-+
-+            $self->diag(<<"FAIL");
-+Looks like you failed $num_failed test$s of $num_tests$qualifier.
-+FAIL
-+        }
-+
-+        if ( $self->{Test_Died} ) {
-+            $self->diag(<<"FAIL");
-+Looks like your test died just after $self->{Curr_Test}.
-+FAIL
-+
-+            _my_exit(255) && return;
-+        }
-+
-+        my $exit_code;
-+        if ($num_failed) {
-+            $exit_code = $num_failed <= 254 ? $num_failed : 254;
-+        }
-+        elsif ( $num_extra != 0 ) {
-+            $exit_code = 255;
-+        }
-+        else {
-+            $exit_code = 0;
-+        }
-+
-+        _my_exit($exit_code) && 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.
-+FAIL
-+        _my_exit(255) && return;
-+    }
-+    else {
-+        $self->diag("No tests run!\n");
-+        _my_exit(255) && return;
-+    }
-+}
-+
-+END {
-+    $Test->_ending if defined $Test and !$Test->no_ending;
-+}
-+
-+=head1 EXIT CODES
-+
-+If all your tests passed, Test::Builder will exit with zero (which is
-+normal).  If anything failed it will exit with how many failed.  If
-+you run less (or more) tests than you planned, the missing (or extras)
-+will be considered failures.  If no tests were ever run Test::Builder
-+will throw a warning and exit with 255.  If the test died, even after
-+having successfully completed all its tests, it will still be
-+considered a failure and will exit with 255.
-+
-+So the exit codes are...
-+
-+    0                   all tests successful
-+    255                 test died or all passed but wrong # of tests run
-+    any other number    how many failed (including missing or extras)
-+
-+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.
-+
-+While versions earlier than 5.8.1 had threads they contain too many
-+bugs to support.
-+
-+Test::Builder is only thread-aware if threads.pm is loaded I<before>
-+Test::Builder.
-+
-+=head1 EXAMPLES
-+
-+CPAN can provide the best examples.  Test::Simple, Test::More,
-+Test::Exception and Test::Differences all use Test::Builder.
-+
-+=head1 SEE ALSO
-+
-+Test::Simple, Test::More, Test::Harness
-+
-+=head1 AUTHORS
-+
-+Original code by chromatic, maintained by Michael G Schwern
-+E<lt>schwern@pobox.comE<gt>
-+
-+=head1 COPYRIGHT
-+
-+Copyright 2002, 2004 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 
-+modify it under the same terms as Perl itself.
-+
-+See F<http://www.perl.com/perl/misc/Artistic.html>
-+
-+=cut
-+
-+1;
-diff -urN perl-5.10.0/t.ble/lib/Test/More.pm perl-5.10.0/t/lib/Test/More.pm
---- perl-5.10.0/t.ble/lib/Test/More.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/More.pm	2008-06-18 01:27:22.000000000 +0200
-@@ -0,0 +1,1546 @@
-+package Test::More;
-+
-+use 5.004;
-+
-+use strict;
-+
-+# 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";
-+}
-+
-+use vars qw($VERSION @ISA @EXPORT %EXPORT_TAGS $TODO);
-+$VERSION = '0.72';
-+$VERSION = eval $VERSION;    # make the alpha version come out as a number
-+
-+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
-+);
-+
-+=head1 NAME
-+
-+Test::More - yet another framework for writing test scripts
-+
-+=head1 SYNOPSIS
-+
-+  use Test::More tests => 23;
-+  # or
-+  use Test::More qw(no_plan);
-+  # or
-+  use Test::More skip_all => $reason;
-+
-+  BEGIN { use_ok( 'Some::Module' ); }
-+  require_ok( 'Some::Module' );
-+
-+  # Various ways to say "ok"
-+  ok($got eq $expected, $test_name);
-+
-+  is  ($got, $expected, $test_name);
-+  isnt($got, $expected, $test_name);
-+
-+  # Rather than print STDERR "# here's what went wrong\n"
-+  diag("here's what went wrong");
-+
-+  like  ($got, qr/expected/, $test_name);
-+  unlike($got, qr/expected/, $test_name);
-+
-+  cmp_ok($got, '==', $expected, $test_name);
-+
-+  is_deeply($got_complex_structure, $expected_complex_structure, $test_name);
-+
-+  SKIP: {
-+      skip $why, $how_many unless $have_some_feature;
-+
-+      ok( foo(),       $test_name );
-+      is( foo(42), 23, $test_name );
-+  };
-+
-+  TODO: {
-+      local $TODO = $why;
-+
-+      ok( foo(),       $test_name );
-+      is( foo(42), 23, $test_name );
-+  };
-+
-+  can_ok($module, @methods);
-+  isa_ok($object, $class);
-+
-+  pass($test_name);
-+  fail($test_name);
-+
-+  BAIL_OUT($why);
-+
-+  # UNIMPLEMENTED!!!
-+  my @status = Test::More::status;
-+
-+
-+=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
-+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
-+utilities.  Various ways to say "ok" with better diagnostics,
-+facilities to skip tests, test future features and compare complicated
-+data structures.  While you can do almost anything with a simple
-+C<ok()> function, it doesn't provide good diagnostic output.
-+
-+
-+=head2 I love it when a plan comes together
-+
-+Before anything else, you need a testing plan.  This basically declares
-+how many tests your script is going to run to protect against premature
-+failure.
-+
-+The preferred way to do this is to declare a plan when you C<use Test::More>.
-+
-+  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.)
-+
-+  use Test::More qw(no_plan);
-+
-+B<NOTE>: using no_plan requires a Test::Harness upgrade else it will
-+think everything has failed.  See L<CAVEATS and NOTES>).
-+
-+In some cases, you'll want to completely skip an entire testing script.
-+
-+  use Test::More skip_all => $skip_reason;
-+
-+Your script will declare a skip with the reason why you skipped and
-+exit immediately with a zero (success).  See L<Test::Harness> for
-+details.
-+
-+If you want to control what functions Test::More will export, you
-+have to use the 'import' option.  For example, to import everything
-+but 'fail', you'd do:
-+
-+  use Test::More tests => 23, import => ['!fail'];
-+
-+Alternatively, you can use the plan() function.  Useful for when you
-+have to calculate the number of tests.
-+
-+  use Test::More;
-+  plan tests => keys %Stuff * 3;
-+
-+or for deciding between running the tests at all:
-+
-+  use Test::More;
-+  if( $^O eq 'MacOS' ) {
-+      plan skip_all => 'Test irrelevant on MacOS';
-+  }
-+  else {
-+      plan tests => 42;
-+  }
-+
-+=cut
-+
-+sub plan {
-+    my $tb = Test::More->builder;
-+
-+    $tb->plan(@_);
-+}
-+
-+# This implements "use Test::More 'no_diag'" but the behavior is
-+# deprecated.
-+sub import_extra {
-+    my $class = shift;
-+    my $list  = shift;
-+
-+    my @other = ();
-+    my $idx   = 0;
-+    while ( $idx <= $#{$list} ) {
-+        my $item = $list->[$idx];
-+
-+        if ( defined $item and $item eq 'no_diag' ) {
-+            $class->builder->no_diag(1);
-+        }
-+        else {
-+            push @other, $item;
-+        }
-+
-+        $idx++;
-+    }
-+
-+    @$list = @other;
-+}
-+
-+=head2 Test names
-+
-+By convention, each test is assigned a number in order.  This is
-+largely done automatically for you.  However, it's often very useful to
-+assign a name to each test.  Which would you rather see:
-+
-+  ok 4
-+  not ok 5
-+  ok 6
-+
-+or
-+
-+  ok 4 - basic multi-variable
-+  not ok 5 - simple exponential
-+  ok 6 - force == mass * acceleration
-+
-+The later gives you some idea of what failed.  It also makes it easier
-+to find the test in your script, simply search for "simple
-+exponential".
-+
-+All test functions take a name argument.  It's optional, but highly
-+suggested that you use it.
-+
-+
-+=head2 I'm ok, you're not ok.
-+
-+The basic purpose of this module is to print out either "ok #" or "not
-+ok #" depending on if a given test succeeded or failed.  Everything
-+else is just gravy.
-+
-+All of the following print "ok" or "not ok" depending on if the test
-+succeeded or failed.  They all also return true or false,
-+respectively.
-+
-+=over 4
-+
-+=item B<ok>
-+
-+  ok($got eq $expected, $test_name);
-+
-+This simply evaluates any expression (C<$got eq $expected> is just a
-+simple example) and uses that to determine if the test succeeded or
-+failed.  A true expression passes, a false one fails.  Very simple.
-+
-+For example:
-+
-+    ok( $exp{9} == 81,                   'simple exponential' );
-+    ok( Film->can('db_Main'),            'set_db()' );
-+    ok( $p->tests == 4,                  'saw tests' );
-+    ok( !grep !defined $_, @items,       'items populated' );
-+
-+(Mnemonic:  "This is ok.")
-+
-+$test_name is a very short description of the test that will be printed
-+out.  It makes it very easy to find a test in your script when it fails
-+and gives others an idea of your intentions.  $test_name is optional,
-+but we B<very> strongly encourage its use.
-+
-+Should an ok() fail, it will produce some diagnostics:
-+
-+    not ok 18 - sufficient mucus
-+    #   Failed test 'sufficient mucus'
-+    #   in foo.t at line 42.
-+
-+This is the same as Test::Simple's ok() routine.
-+
-+=cut
-+
-+sub ok ($;$) {
-+    my ( $test, $name ) = @_;
-+    my $tb = Test::More->builder;
-+
-+    $tb->ok( $test, $name );
-+}
-+
-+=item B<is>
-+
-+=item B<isnt>
-+
-+  is  ( $got, $expected, $test_name );
-+  isnt( $got, $expected, $test_name );
-+
-+Similar to ok(), is() and isnt() compare their two arguments
-+with C<eq> and C<ne> respectively and use the result of that to
-+determine if the test succeeded or failed.  So these:
-+
-+    # Is the ultimate answer 42?
-+    is( ultimate_answer(), 42,          "Meaning of Life" );
-+
-+    # $foo isn't empty
-+    isnt( $foo, '',     "Got some foo" );
-+
-+are similar to these:
-+
-+    ok( ultimate_answer() eq 42,        "Meaning of Life" );
-+    ok( $foo ne '',     "Got some foo" );
-+
-+(Mnemonic:  "This is that."  "This isn't that.")
-+
-+So why use these?  They produce better diagnostics on failure.  ok()
-+cannot know what you are testing for (beyond the name), but is() and
-+isnt() know what the test was and why it failed.  For example this
-+test:
-+
-+    my $foo = 'waffle';  my $bar = 'yarblokos';
-+    is( $foo, $bar,   'Is foo the same as bar?' );
-+
-+Will produce something like this:
-+
-+    not ok 17 - Is foo the same as bar?
-+    #   Failed test 'Is foo the same as bar?'
-+    #   in foo.t at line 139.
-+    #          got: 'waffle'
-+    #     expected: 'yarblokos'
-+
-+So you can figure out what went wrong without rerunning the test.
-+
-+You are encouraged to use is() and isnt() over ok() where possible,
-+however do not be tempted to use them to find out if something is
-+true or false!
-+
-+  # XXX BAD!
-+  is( exists $brooklyn{tree}, 1, 'A tree grows in Brooklyn' );
-+
-+This does not check if C<exists $brooklyn{tree}> is true, it checks if
-+it returns 1.  Very different.  Similar caveats exist for false and 0.
-+In these cases, use ok().
-+
-+  ok( exists $brooklyn{tree},    'A tree grows in Brooklyn' );
-+
-+For those grammatical pedants out there, there's an C<isn't()>
-+function which is an alias of isnt().
-+
-+=cut
-+
-+sub is ($$;$) {
-+    my $tb = Test::More->builder;
-+
-+    $tb->is_eq(@_);
-+}
-+
-+sub isnt ($$;$) {
-+    my $tb = Test::More->builder;
-+
-+    $tb->isnt_eq(@_);
-+}
-+
-+*isn't = \&isnt;
-+
-+=item B<like>
-+
-+  like( $got, qr/expected/, $test_name );
-+
-+Similar to ok(), like() matches $got against the regex C<qr/expected/>.
-+
-+So this:
-+
-+    like($got, qr/expected/, 'this is like that');
-+
-+is similar to:
-+
-+    ok( $got =~ /expected/, 'this is like that');
-+
-+(Mnemonic "This is like that".)
-+
-+The second argument is a regular expression.  It may be given as a
-+regex reference (i.e. C<qr//>) or (for better compatibility with older
-+perls) as a string that looks like a regex (alternative delimiters are
-+currently not supported):
-+
-+    like( $got, '/expected/', 'this is like that' );
-+
-+Regex options may be placed on the end (C<'/expected/i'>).
-+
-+Its advantages over ok() are similar to that of is() and isnt().  Better
-+diagnostics on failure.
-+
-+=cut
-+
-+sub like ($$;$) {
-+    my $tb = Test::More->builder;
-+
-+    $tb->like(@_);
-+}
-+
-+=item B<unlike>
-+
-+  unlike( $got, qr/expected/, $test_name );
-+
-+Works exactly as like(), only it checks if $got B<does not> match the
-+given pattern.
-+
-+=cut
-+
-+sub unlike ($$;$) {
-+    my $tb = Test::More->builder;
-+
-+    $tb->unlike(@_);
-+}
-+
-+=item B<cmp_ok>
-+
-+  cmp_ok( $got, $op, $expected, $test_name );
-+
-+Halfway between ok() and is() lies cmp_ok().  This allows you to
-+compare two arguments using any binary perl operator.
-+
-+    # ok( $got eq $expected );
-+    cmp_ok( $got, 'eq', $expected, 'this eq that' );
-+
-+    # ok( $got == $expected );
-+    cmp_ok( $got, '==', $expected, 'this == that' );
-+
-+    # ok( $got && $expected );
-+    cmp_ok( $got, '&&', $expected, 'this && that' );
-+    ...etc...
-+
-+Its advantage over ok() is when the test fails you'll know what $got
-+and $expected were:
-+
-+    not ok 1
-+    #   Failed test in foo.t at line 12.
-+    #     '23'
-+    #         &&
-+    #     undef
-+
-+It's also useful in those cases where you are comparing numbers and
-+is()'s use of C<eq> will interfere:
-+
-+    cmp_ok( $big_hairy_number, '==', $another_big_hairy_number );
-+
-+=cut
-+
-+sub cmp_ok($$$;$) {
-+    my $tb = Test::More->builder;
-+
-+    $tb->cmp_ok(@_);
-+}
-+
-+=item B<can_ok>
-+
-+  can_ok($module, @methods);
-+  can_ok($object, @methods);
-+
-+Checks to make sure the $module or $object can do these @methods
-+(works with functions, too).
-+
-+    can_ok('Foo', qw(this that whatever));
-+
-+is almost exactly like saying:
-+
-+    ok( Foo->can('this') && 
-+        Foo->can('that') && 
-+        Foo->can('whatever') 
-+      );
-+
-+only without all the typing and with a better interface.  Handy for
-+quickly testing an interface.
-+
-+No matter how many @methods you check, a single can_ok() call counts
-+as one test.  If you desire otherwise, use:
-+
-+    foreach my $meth (@methods) {
-+        can_ok('Foo', $meth);
-+    }
-+
-+=cut
-+
-+sub can_ok ($@) {
-+    my ( $proto, @methods ) = @_;
-+    my $class = ref $proto || $proto;
-+    my $tb = Test::More->builder;
-+
-+    unless ($class) {
-+        my $ok = $tb->ok( 0, "->can(...)" );
-+        $tb->diag('    can_ok() called with empty class or reference');
-+        return $ok;
-+    }
-+
-+    unless (@methods) {
-+        my $ok = $tb->ok( 0, "$class->can(...)" );
-+        $tb->diag('    can_ok() called with no methods');
-+        return $ok;
-+    }
-+
-+    my @nok = ();
-+    foreach my $method (@methods) {
-+        $tb->_try( sub { $proto->can($method) } ) or push @nok, $method;
-+    }
-+
-+    my $name;
-+    $name
-+      = @methods == 1
-+      ? "$class->can('$methods[0]')"
-+      : "$class->can(...)";
-+
-+    my $ok = $tb->ok( !@nok, $name );
-+
-+    $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);
-+
-+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
-+of thing:
-+
-+    my $obj = Some::Module->new;
-+    isa_ok( $obj, 'Some::Module' );
-+
-+where you'd otherwise have to write
-+
-+    my $obj = Some::Module->new;
-+    ok( defined $obj && $obj->isa('Some::Module') );
-+
-+to safeguard against your test script blowing up.
-+
-+It works on references, too:
-+
-+    isa_ok( $array_ref, 'ARRAY' );
-+
-+The diagnostics of this test normally just refer to 'the object'.  If
-+you'd like them to be more specific, you can supply an $object_name
-+(for example 'Test customer').
-+
-+=cut
-+
-+sub isa_ok ($$;$) {
-+    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 ) {
-+        $diag = "$obj_name isn't defined";
-+    }
-+    elsif ( !ref $object ) {
-+        $diag = "$obj_name isn't a reference";
-+    }
-+    else {
-+
-+        # We can't use UNIVERSAL::isa because we want to honor isa() overrides
-+        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 ) ) {
-+                    my $ref = ref $object;
-+                    $diag = "$obj_name isn't a '$class' it's a '$ref'";
-+                }
-+            }
-+            else {
-+                die <<WHOA;
-+WHOA! I tried to call ->isa on your object 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'";
-+        }
-+    }
-+
-+    my $ok;
-+    if ($diag) {
-+        $ok = $tb->ok( 0, $name );
-+        $tb->diag("    $diag\n");
-+    }
-+    else {
-+        $ok = $tb->ok( 1, $name );
-+    }
-+
-+    return $ok;
-+}
-+
-+=item B<pass>
-+
-+=item B<fail>
-+
-+  pass($test_name);
-+  fail($test_name);
-+
-+Sometimes you just want to say that the tests have passed.  Usually
-+the case is you've got some complicated condition that is difficult to
-+wedge into an ok().  In this case, you can simply use pass() (to
-+declare the test ok) or fail (for not ok).  They are synonyms for
-+ok(1) and ok(0).
-+
-+Use these very, very, very sparingly.
-+
-+=cut
-+
-+sub pass (;$) {
-+    my $tb = Test::More->builder;
-+    $tb->ok( 1, @_ );
-+}
-+
-+sub fail (;$) {
-+    my $tb = Test::More->builder;
-+    $tb->ok( 0, @_ );
-+}
-+
-+=back
-+
-+
-+=head2 Module tests
-+
-+You usually want to test if the module you're testing loads ok, rather
-+than just vomiting if its load fails.  For such purposes we have
-+C<use_ok> and C<require_ok>.
-+
-+=over 4
-+
-+=item B<use_ok>
-+
-+   BEGIN { use_ok($module); }
-+   BEGIN { use_ok($module, @imports); }
-+
-+These simply use the given $module and test to make sure the load
-+happened ok.  It's recommended that you run use_ok() inside a BEGIN
-+block so its functions are exported at compile-time and prototypes are
-+properly honored.
-+
-+If @imports are given, they are passed through to the use.  So this:
-+
-+   BEGIN { use_ok('Some::Module', qw(foo bar)) }
-+
-+is like doing this:
-+
-+   use Some::Module qw(foo bar);
-+
-+Version numbers can be checked like so:
-+
-+   # Just like "use Some::Module 1.02"
-+   BEGIN { use_ok('Some::Module', 1.02) }
-+
-+Don't try to do this:
-+
-+   BEGIN {
-+       use_ok('Some::Module');
-+
-+       ...some code that depends on the use...
-+       ...happening at compile time...
-+   }
-+
-+because the notion of "compile-time" is relative.  Instead, you want:
-+
-+  BEGIN { use_ok('Some::Module') }
-+  BEGIN { ...some code that depends on the use... }
-+
-+
-+=cut
-+
-+sub use_ok ($;@) {
-+    my ( $module, @imports ) = @_;
-+    @imports = () unless @imports;
-+    my $tb = Test::More->builder;
-+
-+    my ( $pack, $filename, $line ) = caller;
-+
-+    local ( $@, $!, $SIG{__DIE__} );    # isolate eval
-+
-+    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;
-+package $pack;
-+use $module $imports[0];
-+USE
-+    }
-+    else {
-+        eval <<USE;
-+package $pack;
-+use $module \@imports;
-+USE
-+    }
-+
-+    my $ok = $tb->ok( !$@, "use $module;" );
-+
-+    unless ($ok) {
-+        chomp $@;
-+        $@ =~ s{^BEGIN failed--compilation aborted at .*$}
-+                {BEGIN failed--compilation aborted at $filename line $line.}m;
-+        $tb->diag(<<DIAGNOSTIC);
-+    Tried to use '$module'.
-+    Error:  $@
-+DIAGNOSTIC
-+
-+    }
-+
-+    return $ok;
-+}
-+
-+=item B<require_ok>
-+
-+   require_ok($module);
-+   require_ok($file);
-+
-+Like use_ok(), except it requires the $module or $file.
-+
-+=cut
-+
-+sub require_ok ($) {
-+    my ($module) = shift;
-+    my $tb = Test::More->builder;
-+
-+    my $pack = caller;
-+
-+    # Try to deterine if we've been given a module name or file.
-+    # 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;
-+package $pack;
-+require $module;
-+REQUIRE
-+
-+    my $ok = $tb->ok( !$@, "require $module;" );
-+
-+    unless ($ok) {
-+        chomp $@;
-+        $tb->diag(<<DIAGNOSTIC);
-+    Tried to require '$module'.
-+    Error:  $@
-+DIAGNOSTIC
-+
-+    }
-+
-+    return $ok;
-+}
-+
-+sub _is_module_name {
-+    my $module = shift;
-+
-+    # Module names start with a letter.
-+    # End with an alphanumeric.
-+    # The rest is an alphanumeric or ::
-+    $module =~ s/\b::\b//g;
-+    $module =~ /^[a-zA-Z]\w*$/;
-+}
-+
-+=back
-+
-+
-+=head2 Complex data structures
-+
-+Not everything is a simple eq check or regex.  There are times you
-+need to see if two data structures are equivalent.  For these
-+instances Test::More provides a handful of useful functions.
-+
-+B<NOTE> I'm not quite sure what will happen with filehandles.
-+
-+=over 4
-+
-+=item B<is_deeply>
-+
-+  is_deeply( $got, $expected, $test_name );
-+
-+Similar to is(), except that if $got and $expected are references, it
-+does a deep comparison walking each data structure to see if they are
-+equivalent.  If the two structures are different, it will display the
-+place where they start differing.
-+
-+is_deeply() compares the dereferenced values of references, the
-+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
-+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
-+along these lines.
-+
-+=cut
-+
-+use vars qw(@Data_Stack %Refs_Seen);
-+my $DNE = bless [], 'Does::Not::Exist';
-+
-+sub _dne {
-+    ref $_[0] eq ref $DNE;
-+}
-+
-+sub is_deeply {
-+    my $tb = Test::More->builder;
-+
-+    unless ( @_ == 2 or @_ == 3 ) {
-+        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
-+
-+        _carp sprintf $msg, scalar @_;
-+
-+        return $tb->ok(0);
-+    }
-+
-+    my ( $got, $expected, $name ) = @_;
-+
-+    $tb->_unoverload_str( \$expected, \$got );
-+
-+    my $ok;
-+    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 ] } ) );
-+    }
-+    else {                                      # both references
-+        local @Data_Stack = ();
-+        if ( _deep_check( $got, $expected ) ) {
-+            $ok = $tb->ok( 1, $name );
-+        }
-+        else {
-+            $ok = $tb->ok( 0, $name );
-+            $tb->diag( _format_stack(@Data_Stack) );
-+        }
-+    }
-+
-+    return $ok;
-+}
-+
-+sub _format_stack {
-+    my (@Stack) = @_;
-+
-+    my $var       = '$FOO';
-+    my $did_arrow = 0;
-+    foreach my $entry (@Stack) {
-+        my $type = $entry->{type} || '';
-+        my $idx = $entry->{'idx'};
-+        if ( $type eq 'HASH' ) {
-+            $var .= "->" unless $did_arrow++;
-+            $var .= "{$idx}";
-+        }
-+        elsif ( $type eq 'ARRAY' ) {
-+            $var .= "->" unless $did_arrow++;
-+            $var .= "[$idx]";
-+        }
-+        elsif ( $type eq 'REF' ) {
-+            $var = "\${$var}";
-+        }
-+    }
-+
-+    my @vals = @{ $Stack[-1]{vals} }[ 0, 1 ];
-+    my @vars = ();
-+    ( $vars[0] = $var ) =~ s/\$FOO/     \$got/;
-+    ( $vars[1] = $var ) =~ s/\$FOO/\$expected/;
-+
-+    my $out = "Structures begin differing at:\n";
-+    foreach my $idx ( 0 .. $#vals ) {
-+        my $val = $vals[$idx];
-+        $vals[$idx]
-+          = !defined $val ? 'undef'
-+          : _dne($val)    ? "Does not exist"
-+          : ref $val      ? "$val"
-+          :                 "'$val'";
-+    }
-+
-+    $out .= "$vars[0] = $vals[0]\n";
-+    $out .= "$vars[1] = $vals[1]\n";
-+
-+    $out =~ s/^/    /msg;
-+    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 '';
-+}
-+
-+=back
-+
-+
-+=head2 Diagnostics
-+
-+If you pick the right test function, you'll usually get a good idea of
-+what went wrong when it failed.  But sometimes it doesn't work out
-+that way.  So here we have ways for you to write your own diagnostic
-+messages which are safer than just C<print STDERR>.
-+
-+=over 4
-+
-+=item B<diag>
-+
-+  diag(@diagnostic_message);
-+
-+Prints a diagnostic message which is guaranteed not to interfere with
-+test output.  Like C<print> @diagnostic_message is simply concatenated
-+together.
-+
-+Handy for this sort of thing:
-+
-+    ok( grep(/foo/, @users), "There's a foo user" ) or
-+        diag("Since there's no foo, check that /etc/bar is set up right");
-+
-+which would produce:
-+
-+    not ok 42 - There's a foo user
-+    #   Failed test 'There's a foo user'
-+    #   in foo.t at line 52.
-+    # Since there's no foo, check that /etc/bar is set up right.
-+
-+You might remember C<ok() or diag()> with the mnemonic C<open() or
-+die()>.
-+
-+B<NOTE> The exact formatting of the diagnostic output is still
-+changing, but it is guaranteed that whatever you throw at it it won't
-+interfere with the test.
-+
-+=cut
-+
-+sub diag {
-+    my $tb = Test::More->builder;
-+
-+    $tb->diag(@_);
-+}
-+
-+=back
-+
-+
-+=head2 Conditional tests
-+
-+Sometimes running a test under certain conditions will cause the
-+test script to die.  A certain function or method isn't implemented
-+(such as fork() on MacOS), some resource isn't available (like a 
-+net connection) or a module isn't available.  In these cases it's
-+necessary to skip tests, or declare that they are supposed to fail
-+but will work in the future (a todo test).
-+
-+For more details on the mechanics of skip and todo tests see
-+L<Test::Harness>.
-+
-+The way Test::More handles this is with a named block.  Basically, a
-+block of tests which can be skipped over or made todo.  It's best if I
-+just show you...
-+
-+=over 4
-+
-+=item B<SKIP: BLOCK>
-+
-+  SKIP: {
-+      skip $why, $how_many if $condition;
-+
-+      ...normal testing code goes here...
-+  }
-+
-+This declares a block of tests that might be skipped, $how_many tests
-+there are, $why and under what $condition to skip them.  An example is
-+the easiest way to illustrate:
-+
-+    SKIP: {
-+        eval { require HTML::Lint };
-+
-+        skip "HTML::Lint not installed", 2 if $@;
-+
-+        my $lint = new HTML::Lint;
-+        isa_ok( $lint, "HTML::Lint" );
-+
-+        $lint->parse( $html );
-+        is( $lint->errors, 0, "No errors found in HTML" );
-+    }
-+
-+If the user does not have HTML::Lint installed, the whole block of
-+code I<won't be run at all>.  Test::More will output special ok's
-+which Test::Harness interprets as skipped, but passing, tests.
-+
-+It's important that $how_many accurately reflects the number of tests
-+in the SKIP block so the # of tests run will match up with your plan.
-+If your plan is C<no_plan> $how_many is optional and will default to 1.
-+
-+It's perfectly safe to nest SKIP blocks.  Each SKIP block must have
-+the label C<SKIP>, or Test::More can't work its magic.
-+
-+You don't skip tests which are failing because there's a bug in your
-+program, or for which you don't yet have code written.  For that you
-+use TODO.  Read on.
-+
-+=cut
-+
-+#'#
-+sub skip {
-+    my ( $why, $how_many ) = @_;
-+    my $tb = Test::More->builder;
-+
-+    unless ( defined $how_many ) {
-+
-+        # $how_many can only be avoided when no_plan is in use.
-+        _carp "skip() needs to know \$how_many tests are in the block"
-+          unless $tb->has_plan eq 'no_plan';
-+        $how_many = 1;
-+    }
-+
-+    if ( defined $how_many and $how_many =~ /\D/ ) {
-+        _carp
-+          "skip() was passed a non-numeric number of tests.  Did you get the arguments backwards?";
-+        $how_many = 1;
-+    }
-+
-+    for ( 1 .. $how_many ) {
-+        $tb->skip($why);
-+    }
-+
-+    local $^W = 0;
-+    last SKIP;
-+}
-+
-+=item B<TODO: BLOCK>
-+
-+    TODO: {
-+        local $TODO = $why if $condition;
-+
-+        ...normal testing code goes here...
-+    }
-+
-+Declares a block of tests you expect to fail and $why.  Perhaps it's
-+because you haven't fixed a bug or haven't finished a new feature:
-+
-+    TODO: {
-+        local $TODO = "URI::Geller not finished";
-+
-+        my $card = "Eight of clubs";
-+        is( URI::Geller->your_card, $card, 'Is THIS your card?' );
-+
-+        my $spoon;
-+        URI::Geller->bend_spoon;
-+        is( $spoon, 'bent',    "Spoon bending, that's original" );
-+    }
-+
-+With a todo block, the tests inside are expected to fail.  Test::More
-+will run the tests normally, but print out special flags indicating
-+they are "todo".  Test::Harness will interpret failures as being ok.
-+Should anything succeed, it will report it as an unexpected success.
-+You then know the thing you had todo is done and can remove the
-+TODO flag.
-+
-+The nice part about todo tests, as opposed to simply commenting out a
-+block of tests, is it's like having a programmatic todo list.  You know
-+how much work is left to be done, you're aware of what bugs there are,
-+and you'll know immediately when they're fixed.
-+
-+Once a todo test starts succeeding, simply move it outside the block.
-+When the block is empty, delete it.
-+
-+B<NOTE>: TODO tests require a Test::Harness upgrade else it will
-+treat it as a normal failure.  See L<CAVEATS and NOTES>).
-+
-+
-+=item B<todo_skip>
-+
-+    TODO: {
-+        todo_skip $why, $how_many if $condition;
-+
-+        ...normal testing code...
-+    }
-+
-+With todo tests, it's best to have the tests actually run.  That way
-+you'll know when they start passing.  Sometimes this isn't possible.
-+Often a failing test will cause the whole program to die or hang, even
-+inside an C<eval BLOCK> with and using C<alarm>.  In these extreme
-+cases you have no choice but to skip over the broken tests entirely.
-+
-+The syntax and behavior is similar to a C<SKIP: BLOCK> except the
-+tests will be marked as failing but todo.  Test::Harness will
-+interpret them as passing.
-+
-+=cut
-+
-+sub todo_skip {
-+    my ( $why, $how_many ) = @_;
-+    my $tb = Test::More->builder;
-+
-+    unless ( defined $how_many ) {
-+
-+        # $how_many can only be avoided when no_plan is in use.
-+        _carp "todo_skip() needs to know \$how_many tests are in the block"
-+          unless $tb->has_plan eq 'no_plan';
-+        $how_many = 1;
-+    }
-+
-+    for ( 1 .. $how_many ) {
-+        $tb->todo_skip($why);
-+    }
-+
-+    local $^W = 0;
-+    last TODO;
-+}
-+
-+=item When do I use SKIP vs. TODO?
-+
-+B<If it's something the user might not be able to do>, use SKIP.
-+This includes optional modules that aren't installed, running under
-+an OS that doesn't have some feature (like fork() or symlinks), or maybe
-+you need an Internet connection and one isn't available.
-+
-+B<If it's something the programmer hasn't done yet>, use TODO.  This
-+is for any code you haven't written yet, or bugs you have yet to fix,
-+but want to put tests in your testing script (always a good idea).
-+
-+
-+=back
-+
-+
-+=head2 Test control
-+
-+=over 4
-+
-+=item B<BAIL_OUT>
-+
-+    BAIL_OUT($reason);
-+
-+Indicates to the harness that things are going so badly all testing
-+should terminate.  This includes the running any additional test scripts.
-+
-+This is typically used when testing cannot continue such as a critical
-+module failing to compile or a necessary external utility not being
-+available such as a database connection failing.
-+
-+The test will exit with 255.
-+
-+=cut
-+
-+sub BAIL_OUT {
-+    my $reason = shift;
-+    my $tb     = Test::More->builder;
-+
-+    $tb->BAIL_OUT($reason);
-+}
-+
-+=back
-+
-+
-+=head2 Discouraged comparison functions
-+
-+The use of the following functions is discouraged as they are not
-+actually testing functions and produce no diagnostics to help figure
-+out what went wrong.  They were written before is_deeply() existed
-+because I couldn't figure out how to display a useful diff of two
-+arbitrary data structures.
-+
-+These functions are usually used inside an ok().
-+
-+    ok( eq_array(\@got, \@expected) );
-+
-+C<is_deeply()> can do that better and with diagnostics.  
-+
-+    is_deeply( \@got, \@expected );
-+
-+They may be deprecated in future versions.
-+
-+=over 4
-+
-+=item B<eq_array>
-+
-+  my $is_eq = eq_array(\@got, \@expected);
-+
-+Checks if two arrays are equivalent.  This is a deep check, so
-+multi-level structures are handled correctly.
-+
-+=cut
-+
-+#'#
-+sub eq_array {
-+    local @Data_Stack;
-+    _deep_check(@_);
-+}
-+
-+sub _eq_array {
-+    my ( $a1, $a2 ) = @_;
-+
-+    if ( grep !_type($_) eq 'ARRAY', $a1, $a2 ) {
-+        warn "eq_array passed a non-array ref";
-+        return 0;
-+    }
-+
-+    return 1 if $a1 eq $a2;
-+
-+    my $ok = 1;
-+    my $max = $#$a1 > $#$a2 ? $#$a1 : $#$a2;
-+    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 );
-+        pop @Data_Stack if $ok;
-+
-+        last unless $ok;
-+    }
-+
-+    return $ok;
-+}
-+
-+sub _deep_check {
-+    my ( $e1, $e2 ) = @_;
-+    my $tb = Test::More->builder;
-+
-+    my $ok = 0;
-+
-+    # Effectively turn %Refs_Seen into a stack.  This avoids picking up
-+    # the same referenced used twice (such as [\$a, \$a]) to be considered
-+    # circular.
-+    local %Refs_Seen = %Refs_Seen;
-+
-+    {
-+
-+        # Quiet uninitialized value warnings when comparing undefs.
-+        local $^W = 0;
-+
-+        $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 );
-+
-+        if ( defined $e1 xor defined $e2 ) {
-+            $ok = 0;
-+        }
-+        elsif ( _dne($e1) xor _dne($e2) ) {
-+            $ok = 0;
-+        }
-+        elsif ( $same_ref and ( $e1 eq $e2 ) ) {
-+            $ok = 1;
-+        }
-+        elsif ($not_ref) {
-+            push @Data_Stack, { type => '', vals => [ $e1, $e2 ] };
-+            $ok = 0;
-+        }
-+        else {
-+            if ( $Refs_Seen{$e1} ) {
-+                return $Refs_Seen{$e1} eq $e2;
-+            }
-+            else {
-+                $Refs_Seen{$e1} = "$e2";
-+            }
-+
-+            my $type = _type($e1);
-+            $type = 'DIFFERENT' unless _type($e2) eq $type;
-+
-+            if ( $type eq 'DIFFERENT' ) {
-+                push @Data_Stack, { type => $type, vals => [ $e1, $e2 ] };
-+                $ok = 0;
-+            }
-+            elsif ( $type eq 'ARRAY' ) {
-+                $ok = _eq_array( $e1, $e2 );
-+            }
-+            elsif ( $type eq 'HASH' ) {
-+                $ok = _eq_hash( $e1, $e2 );
-+            }
-+            elsif ( $type eq 'REF' ) {
-+                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 );
-+                pop @Data_Stack if $ok;
-+            }
-+            elsif ($type) {
-+                push @Data_Stack, { type => $type, vals => [ $e1, $e2 ] };
-+                $ok = 0;
-+            }
-+            else {
-+                _whoa( 1, "No type in _deep_check" );
-+            }
-+        }
-+    }
-+
-+    return $ok;
-+}
-+
-+sub _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);
-+
-+Determines if the two hashes contain the same keys and values.  This
-+is a deep check.
-+
-+=cut
-+
-+sub eq_hash {
-+    local @Data_Stack;
-+    return _deep_check(@_);
-+}
-+
-+sub _eq_hash {
-+    my ( $a1, $a2 ) = @_;
-+
-+    if ( grep !_type($_) eq 'HASH', $a1, $a2 ) {
-+        warn "eq_hash passed a non-hash ref";
-+        return 0;
-+    }
-+
-+    return 1 if $a1 eq $a2;
-+
-+    my $ok = 1;
-+    my $bigger = keys %$a1 > keys %$a2 ? $a1 : $a2;
-+    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 );
-+        pop @Data_Stack if $ok;
-+
-+        last unless $ok;
-+    }
-+
-+    return $ok;
-+}
-+
-+=item B<eq_set>
-+
-+  my $is_eq = eq_set(\@got, \@expected);
-+
-+Similar to eq_array(), except the order of the elements is B<not>
-+important.  This is a deep check, but the irrelevancy of order only
-+applies to the top level.
-+
-+    ok( eq_set(\@got, \@expected) );
-+
-+Is better written:
-+
-+    is_deeply( [sort @got], [sort @expected] );
-+
-+B<NOTE> By historical accident, this is not a true set comparison.
-+While the order of elements does not matter, duplicate elements do.
-+
-+B<NOTE> eq_set() does not know how to deal with references at the top
-+level.  The following is an example of a comparison which might not work:
-+
-+    eq_set([\1, \2], [\2, \1]);
-+
-+Test::Deep contains much better set comparison functions.
-+
-+=cut
-+
-+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;
-+
-+    # 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
-+    # string containing the reference.
-+    #
-+    # Have to inline the sort routine due to a threading/sort bug.
-+    # See [rt.cpan.org 6782]
-+    #
-+    # 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 ) ) ],
-+    );
-+}
-+
-+=back
-+
-+
-+=head2 Extending and Embedding Test::More
-+
-+Sometimes the Test::More interface isn't quite enough.  Fortunately,
-+Test::More is built on top of Test::Builder which provides a single,
-+unified backend for any test library to use.  This means two test
-+libraries which both use Test::Builder B<can be used together in the
-+same program>.
-+
-+If you simply want to do a little tweaking of how the tests behave,
-+you can access the underlying Test::Builder object like so:
-+
-+=over 4
-+
-+=item B<builder>
-+
-+    my $test_builder = Test::More->builder;
-+
-+Returns the Test::Builder object underlying Test::More for you to play
-+with.
-+
-+
-+=back
-+
-+
-+=head1 EXIT CODES
-+
-+If all your tests passed, Test::Builder will exit with zero (which is
-+normal).  If anything failed it will exit with how many failed.  If
-+you run less (or more) tests than you planned, the missing (or extras)
-+will be considered failures.  If no tests were ever run Test::Builder
-+will throw a warning and exit with 255.  If the test died, even after
-+having successfully completed all its tests, it will still be
-+considered a failure and will exit with 255.
-+
-+So the exit codes are...
-+
-+    0                   all tests successful
-+    255                 test died or all passed but wrong # of tests run
-+    any other number    how many failed (including missing or extras)
-+
-+If you fail more than 254 tests, it will be reported as 254.
-+
-+B<NOTE>  This behavior may go away in future versions.
-+
-+
-+=head1 CAVEATS and NOTES
-+
-+=over 4
-+
-+=item Backwards compatibility
-+
-+Test::More works with Perls as old as 5.004_05.
-+
-+
-+=item Overloaded objects
-+
-+String overloaded objects are compared B<as strings> (or in cmp_ok()'s
-+case, strings or numbers as appropriate to the comparison op).  This
-+prevents Test::More from piercing an object's interface allowing
-+better blackbox testing.  So if a function starts returning overloaded
-+objects instead of bare strings your tests won't notice the
-+difference.  This is good.
-+
-+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
-+complex data structures.
-+
-+
-+=item Threads
-+
-+Test::More will only be aware of threads if "use threads" has been done
-+I<before> Test::More is loaded.  This is ok:
-+
-+    use threads;
-+    use Test::More;
-+
-+This may cause problems:
-+
-+    use Test::More
-+    use threads;
-+
-+5.8.1 and above are supported.  Anything below that has too many bugs.
-+
-+
-+=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.
-+
-+Installing Test::More should also upgrade Test::Harness.
-+
-+=back
-+
-+
-+=head1 HISTORY
-+
-+This is a case of convergent evolution with Joshua Pritikin's Test
-+module.  I was largely unaware of its existence when I'd first
-+written my own ok() routines.  This module exists because I can't
-+figure out how to easily wedge test names into Test's interface (along
-+with a few other problems).
-+
-+The goal here is to have a testing utility that's simple to learn,
-+quick to use and difficult to trip yourself up with while still
-+providing more flexibility than the existing Test.pm.  As such, the
-+names of the most common routines are kept tiny, special cases and
-+magic side-effects are kept to a minimum.  WYSIWYG.
-+
-+
-+=head1 SEE ALSO
-+
-+L<Test::Simple> if all this confuses you and you just want to write
-+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::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::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.
-+
-+
-+=head1 AUTHORS
-+
-+Michael G Schwern E<lt>schwern@pobox.comE<gt> with much inspiration
-+from Joshua Pritikin's Test module and lots of help from Barrie
-+Slaymaker, Tony Bowden, blackstar.co.uk, chromatic, Fergal Daly and
-+the perl-qa gang.
-+
-+
-+=head1 BUGS
-+
-+See F<http://rt.cpan.org> to report and view bugs.
-+
-+
-+=head1 COPYRIGHT
-+
-+Copyright 2001-2002, 2004-2006 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.
-+
-+See F<http://www.perl.com/perl/misc/Artistic.html>
-+
-+=cut
-+
-+1;
-diff -urN perl-5.10.0/t.ble/lib/Test/Simple.pm perl-5.10.0/t/lib/Test/Simple.pm
---- perl-5.10.0/t.ble/lib/Test/Simple.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple.pm	2008-06-18 01:26:25.000000000 +0200
-@@ -0,0 +1,228 @@
-+package Test::Simple;
-+
-+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 Test::Builder::Module;
-+@ISA    = qw(Test::Builder::Module);
-+@EXPORT = qw(ok);
-+
-+my $CLASS = __PACKAGE__;
-+
-+=head1 NAME
-+
-+Test::Simple - Basic utilities for writing tests.
-+
-+=head1 SYNOPSIS
-+
-+  use Test::Simple tests => 1;
-+
-+  ok( $foo eq $bar, 'foo is bar' );
-+
-+
-+=head1 DESCRIPTION
-+
-+** If you are unfamiliar with testing B<read Test::Tutorial> first! **
-+
-+This is an extremely simple, extremely basic module for writing tests
-+suitable for CPAN modules and other pursuits.  If you wish to do more
-+complicated testing, use the Test::More module (a drop-in replacement
-+for this one).
-+
-+The basic unit of Perl testing is the ok.  For each thing you want to
-+test your program will print out an "ok" or "not ok" to indicate pass
-+or fail.  You do this with the ok() function (see below).
-+
-+The only other constraint is you must pre-declare how many tests you
-+plan to run.  This is in case something goes horribly wrong during the
-+test and your test program aborts, or skips a test or whatever.  You
-+do this like so:
-+
-+    use Test::Simple tests => 23;
-+
-+You must have a plan.
-+
-+
-+=over 4
-+
-+=item B<ok>
-+
-+  ok( $foo eq $bar, $name );
-+  ok( $foo eq $bar );
-+
-+ok() is given an expression (in this case C<$foo eq $bar>).  If it's
-+true, the test passed.  If it's false, it didn't.  That's about it.
-+
-+ok() prints out either "ok" or "not ok" along with a test number (it
-+keeps track of that for you).
-+
-+  # This produces "ok 1 - Hell not yet frozen over" (or not ok)
-+  ok( get_temperature($hell) > 0, 'Hell not yet frozen over' );
-+
-+If you provide a $name, that will be printed along with the "ok/not
-+ok" to make it easier to find your test when if fails (just search for
-+the name).  It also makes it easier for the next guy to understand
-+what your test is for.  It's highly recommended you use test names.
-+
-+All tests are run in scalar context.  So this:
-+
-+    ok( @stuff, 'I have some stuff' );
-+
-+will do what you mean (fail if stuff is empty)
-+
-+=cut
-+
-+sub ok ($;$) {
-+    $CLASS->builder->ok(@_);
-+}
-+
-+=back
-+
-+Test::Simple will start by printing number of tests run in the form
-+"1..M" (so "1..5" means you're going to run 5 tests).  This strange
-+format lets Test::Harness know how many tests you plan on running in
-+case something goes horribly wrong.
-+
-+If all your tests passed, Test::Simple will exit with zero (which is
-+normal).  If anything failed it will exit with how many failed.  If
-+you run less (or more) tests than you planned, the missing (or extras)
-+will be considered failures.  If no tests were ever run Test::Simple
-+will throw a warning and exit with 255.  If the test died, even after
-+having successfully completed all its tests, it will still be
-+considered a failure and will exit with 255.
-+
-+So the exit codes are...
-+
-+    0                   all tests successful
-+    255                 test died or all passed but wrong # of tests run
-+    any other number    how many failed (including missing or extras)
-+
-+If you fail more than 254 tests, it will be reported as 254.
-+
-+This module is by no means trying to be a complete testing system.
-+It's just to get you started.  Once you're off the ground its
-+recommended you look at L<Test::More>.
-+
-+
-+=head1 EXAMPLE
-+
-+Here's an example of a simple .t file for the fictional Film module.
-+
-+    use Test::Simple tests => 5;
-+
-+    use Film;  # What you're testing.
-+
-+    my $btaste = Film->new({ Title    => 'Bad Taste',
-+                             Director => 'Peter Jackson',
-+                             Rating   => 'R',
-+                             NumExplodingSheep => 1
-+                           });
-+    ok( defined($btaste) && ref $btaste eq 'Film,     'new() works' );
-+
-+    ok( $btaste->Title      eq 'Bad Taste',     'Title() get'    );
-+    ok( $btaste->Director   eq 'Peter Jackson', 'Director() get' );
-+    ok( $btaste->Rating     eq 'R',             'Rating() get'   );
-+    ok( $btaste->NumExplodingSheep == 1,        'NumExplodingSheep() get' );
-+
-+It will produce output like this:
-+
-+    1..5
-+    ok 1 - new() works
-+    ok 2 - Title() get
-+    ok 3 - Director() get
-+    not ok 4 - Rating() get
-+    #   Failed test 'Rating() get'
-+    #   in t/film.t at line 14.
-+    ok 5 - NumExplodingSheep() get
-+    # Looks like you failed 1 tests of 5
-+
-+Indicating the Film::Rating() method is broken.
-+
-+
-+=head1 CAVEATS
-+
-+Test::Simple will only report a maximum of 254 failures in its exit
-+code.  If this is a problem, you probably have a huge test script.
-+Split it into multiple files.  (Otherwise blame the Unix folks for
-+using an unsigned short integer as the exit status).
-+
-+Because VMS's exit codes are much, much different than the rest of the
-+universe, and perl does horrible mangling to them that gets in my way,
-+it works like this on VMS.
-+
-+    0     SS$_NORMAL        all tests successful
-+    4     SS$_ABORT         something went wrong
-+
-+Unfortunately, I can't differentiate any further.
-+
-+
-+=head1 NOTES
-+
-+Test::Simple is B<explicitly> tested all the way back to perl 5.004.
-+
-+Test::Simple is thread-safe in perl 5.8.0 and up.
-+
-+=head1 HISTORY
-+
-+This module was conceived while talking with Tony Bowden in his
-+kitchen one night about the problems I was having writing some really
-+complicated feature into the new Testing module.  He observed that the
-+main problem is not dealing with these edge cases but that people hate
-+to write tests B<at all>.  What was needed was a dead simple module
-+that took all the hard work out of testing and was really, really easy
-+to learn.  Paul Johnson simultaneously had this idea (unfortunately,
-+he wasn't in Tony's kitchen).  This is it.
-+
-+
-+=head1 SEE ALSO
-+
-+=over 4
-+
-+=item L<Test::More>
-+
-+More testing functions!  Once you outgrow Test::Simple, look at
-+Test::More.  Test::Simple is 100% forward compatible with Test::More
-+(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
-+
-+
-+=head1 AUTHORS
-+
-+Idea by Tony Bowden and Paul Johnson, code by Michael G Schwern
-+E<lt>schwern@pobox.comE<gt>, wardrobe by Calvin Klein.
-+
-+
-+=head1 COPYRIGHT
-+
-+Copyright 2001, 2002, 2004 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.
-+
-+See F<http://www.perl.com/perl/misc/Artistic.html>
-+
-+=cut
-+
-+1;
-diff -urN perl-5.10.0/lib.ble/App/Prove/State.pm perl-5.10.0/lib/App/Prove/State.pm
---- perl-5.10.0/lib.ble/App/Prove/State.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/App/Prove/State.pm	2008-06-18 01:27:27.000000000 +0200
-@@ -0,0 +1,438 @@
-+package App::Prove::State;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use File::Find;
-+use File::Spec;
-+use Carp;
-+use TAP::Parser::YAMLish::Reader ();
-+use TAP::Parser::YAMLish::Writer ();
-+use TAP::Base;
-+
-+@ISA = qw( TAP::Base );
-+
-+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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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>
-+
-+=cut
-+
-+# override TAP::Base::new:
-+sub new {
-+    my $class = shift;
-+    my %args = %{ shift || {} };
-+
-+    my $self = bless {
-+        _ => {
-+            tests      => {},
-+            generation => 1
-+        },
-+        select    => [],
-+        seq       => 1,
-+        store     => delete $args{store},
-+        extension => delete $args{extension} || '.t',
-+    }, $class;
-+
-+    my $store = $self->{store};
-+    $self->load($store)
-+      if defined $store && -f $store;
-+
-+    return $self;
-+}
-+
-+=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};
-+}
-+
-+sub DESTROY {
-+    my $self = shift;
-+    if ( $self->{should_save} && defined( my $store = $self->{store} ) ) {
-+        $self->save($store);
-+    }
-+}
-+
-+=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->{_}->{generation} - 1;
-+    my $now      = $self->get_time;
-+
-+    my @switches = map { split /,/ } @opts;
-+
-+    my %handler = (
-+        last => sub {
-+            $self->_select(
-+                where => sub { $_->{gen} >= $last_gen },
-+                order => sub { $_->{seq} }
-+            );
-+        },
-+        failed => sub {
-+            $self->_select(
-+                where => sub { $_->{last_result} != 0 },
-+                order => sub { -$_->{last_result} }
-+            );
-+        },
-+        passed => sub {
-+            $self->_select( where => sub { $_->{last_result} == 0 } );
-+        },
-+        all => sub {
-+            $self->_select();
-+        },
-+        todo => sub {
-+            $self->_select(
-+                where => sub { $_->{last_todo} != 0 },
-+                order => sub { -$_->{last_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} } );
-+        },
-+        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 keys %{ $self->{_}->{tests} };
-+        return map { $self->_query_clause($_) } @sel;
-+    }
-+    return;
-+}
-+
-+sub _query_clause {
-+    my ( $self, $clause ) = @_;
-+    my @got;
-+    my $tests = $self->{_}->{tests};
-+    my $where = $clause->{where} || sub {1};
-+
-+    # Select
-+    for my $test ( sort keys %$tests ) {
-+        next unless -f $test;
-+        local $_ = $tests->{$test};
-+        push @got, $test 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 $_ = $tests->{$_}; $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
-+            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
-+
-+sub observe_test {
-+    my ( $self, $test, $parser ) = @_;
-+    $self->_record_test(
-+        $test, scalar( $parser->failed ) + ( $parser->has_problems ? 1 : 0 ),
-+        scalar( $parser->todo ), $parser->start_time, $parser->end_time
-+    );
-+}
-+
-+# Store:
-+#     last fail time
-+#     last pass time
-+#     last run time
-+#     most recent result
-+#     most recent todos
-+#     total failures
-+#     total passes
-+#     state generation
-+
-+sub _record_test {
-+    my ( $self, $test, $fail, $todo, $start_time, $end_time ) = @_;
-+    my $rec = $self->{_}->{tests}->{ $test->[0] } ||= {};
-+
-+    $rec->{seq} = $self->{seq}++;
-+    $rec->{gen} = $self->{_}->{generation};
-+
-+    $rec->{last_run_time} = $end_time;
-+    $rec->{last_result}   = $fail;
-+    $rec->{last_todo}     = $todo;
-+    $rec->{elapsed}       = $end_time - $start_time;
-+
-+    if ($fail) {
-+        $rec->{total_failures}++;
-+        $rec->{last_fail_time} = $end_time;
-+    }
-+    else {
-+        $rec->{total_passes}++;
-+        $rec->{last_pass_time} = $end_time;
-+    }
-+}
-+
-+=head3 C<save>
-+
-+Write the state to a file.
-+
-+=cut
-+
-+sub save {
-+    my ( $self, $name ) = @_;
-+    my $writer = TAP::Parser::YAMLish::Writer->new;
-+    local *FH;
-+    open FH, ">$name" or croak "Can't write $name ($!)";
-+    $writer->write( $self->{_} || {}, \*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 ($!)";
-+    $self->{_} = $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->{_}->{generation}++;
-+}
-+
-+sub _prune_and_stamp {
-+    my $self = shift;
-+    for my $name ( keys %{ $self->{_}->{tests} || {} } ) {
-+        if ( my @stat = stat $name ) {
-+            $self->{_}->{tests}->{$name}->{mtime} = $stat[9];
-+        }
-+        else {
-+            delete $self->{_}->{tests}->{$name};
-+        }
-+    }
-+}
-+
-+sub _regen_seq {
-+    my $self = shift;
-+    for my $rec ( values %{ $self->{_}->{tests} || {} } ) {
-+        $self->{seq} = $rec->{seq} + 1
-+          if defined $rec->{seq} && $rec->{seq} >= $self->{seq};
-+    }
-+}
-diff -urN perl-5.10.0/lib.ble/App/Prove.pm perl-5.10.0/lib/App/Prove.pm
---- perl-5.10.0/lib.ble/App/Prove.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/App/Prove.pm	2008-06-18 01:27:28.000000000 +0200
-@@ -0,0 +1,636 @@
-+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;
-+
-+@ISA = qw(TAP::Object);
-+
-+=head1 NAME
-+
-+App::Prove - Implements the C<prove> command.
-+
-+=head1 VERSION
-+
-+Version 3.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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 {
-+    @ATTR = qw(
-+      archive argv blib 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 test_args state dry extension ignore_exit
-+    );
-+    for my $attr (@ATTR) {
-+        no strict 'refs';
-+        *$attr = sub {
-+            my $self = shift;
-+            croak "$attr is read-only" if @_;
-+            $self->{$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 )) {
-+        $self->{$key} = [];
-+    }
-+    $self->{harness_class} = 'TAP::Harness';
-+    $self->{_state} = App::Prove::State->new( { store => STATE_FILE } );
-+
-+    for my $attr (@ATTR) {
-+        if ( exists $args->{$attr} ) {
-+
-+            # TODO: Some validation here
-+            $self->{$attr} = $args->{$attr};
-+        }
-+    }
-+
-+    return $self;
-+}
-+
-+=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},
-+            '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},
-+        ) 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 ( $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;
-+    }
-+
-+    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 );
-+        print "$name\n";
-+        eval "require $name";
-+        return $name unless $@;
-+    }
-+
-+    eval "require $class";
-+    return $class unless $@;
-+    return;
-+}
-+
-+sub _load_extension {
-+    my ( $self, $class, @search ) = @_;
-+
-+    my @args = ();
-+    if ( $class =~ /^(.*?)=(.*)/ ) {
-+        $class = $1;
-+        @args = split( /,/, $2 );
-+    }
-+
-+    if ( my $name = $self->_find_module( $class, @search ) ) {
-+        $name->import(@args);
-+    }
-+    else {
-+        croak "Can't load module $class";
-+    }
-+}
-+
-+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);
-+    $app->run;
-+
-+=cut
-+
-+sub run {
-+    my $self = shift;
-+
-+    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};
-+    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);
-+
-+    $harness->callback(
-+        after_test => sub {
-+            $self->{_state}->observe_test(@_);
-+        }
-+    );
-+
-+    my $aggregator = $harness->runtests(@tests);
-+
-+    return $aggregator->has_problems ? 0 : 1;
-+}
-+
-+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<show_help>
-+
-+=item C<show_man>
-+
-+=item C<show_version>
-+
-+=item C<shuffle>
-+
-+=item C<state>
-+
-+=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
-diff -urN perl-5.10.0/lib.ble/TAP/Base.pm perl-5.10.0/lib/TAP/Base.pm
---- perl-5.10.0/lib.ble/TAP/Base.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Base.pm	2008-06-18 01:26:16.000000000 +0200
-@@ -0,0 +1,139 @@
-+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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+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
-+
-+=head3 C<new>
-+
-+=cut
-+
-+sub new {
-+    my ( $class, $arg_for ) = @_;
-+
-+    my $self = bless {}, $class;
-+    return $self->_initialize($arg_for);
-+}
-+
-+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/lib.ble/TAP/Formatter/Color.pm perl-5.10.0/lib/TAP/Formatter/Color.pm
---- perl-5.10.0/lib.ble/TAP/Formatter/Color.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Formatter/Color.pm	2008-06-18 01:26:28.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Formatter/Console/ParallelSession.pm perl-5.10.0/lib/TAP/Formatter/Console/ParallelSession.pm
---- perl-5.10.0/lib.ble/TAP/Formatter/Console/ParallelSession.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Formatter/Console/ParallelSession.pm	2008-06-18 01:27:03.000000000 +0200
-@@ -0,0 +1,186 @@
-+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,
-+    };
-+}
-+
-+sub _need_refresh {
-+    my $self      = shift;
-+    my $formatter = $self->formatter;
-+    $shared{$formatter}->{need_refresh}++;
-+}
-+
-+=head1 NAME
-+
-+TAP::Formatter::Console::ParallelSession - Harness output delegate for parallel console output
-+
-+=head1 VERSION
-+
-+Version 3.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=head1 DESCRIPTION
-+
-+This provides console orientated output formatting for L<TAP::Harness::Parallel>.
-+
-+=head1 SYNOPSIS
-+
-+=cut
-+
-+=head1 METHODS
-+
-+=head2 Class Methods
-+
-+=head3 C<header>
-+
-+Output test preamble
-+
-+=cut
-+
-+sub header {
-+    my $self = shift;
-+    $self->_need_refresh;
-+}
-+
-+sub _refresh {
-+}
-+
-+sub _clear_line {
-+    my $self = shift;
-+    $self->formatter->_output( "\r" . ( ' ' x WIDTH ) . "\r" );
-+}
-+
-+sub _output_ruler {
-+    my $self      = shift;
-+    my $formatter = $self->formatter;
-+    return if $formatter->really_quiet;
-+
-+    my $context = $shared{$formatter};
-+
-+    my $ruler = sprintf( "===( %7d )", $context->{tests} );
-+    $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 $parser    = $self->parser;
-+    my $formatter = $self->formatter;
-+    my $context   = $shared{$formatter};
-+
-+    $self->_refresh;
-+
-+    # my $really_quiet = $formatter->really_quiet;
-+    # my $show_count   = $self->_should_show_count;
-+    my $planned = $parser->tests_planned;
-+
-+    if ( $result->is_bailout ) {
-+        $formatter->_failure_output(
-+                "Bailout called.  Further testing stopped:  "
-+              . $result->explanation
-+              . "\n" );
-+    }
-+
-+    if ( $result->is_test ) {
-+        $context->{tests}++;
-+
-+        my $test_print_modulus = 1;
-+        my $ceiling            = $context->{tests} / 5;
-+        $test_print_modulus *= 2 while $test_print_modulus < $ceiling;
-+
-+        unless ( $context->{tests} % $test_print_modulus ) {
-+            $self->_output_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};
-+
-+    unless ( $formatter->really_quiet ) {
-+        $self->_clear_line;
-+
-+        # my $output = $self->_output_method;
-+        $formatter->_output(
-+            $formatter->_format_name( $self->name ),
-+            ' '
-+        );
-+    }
-+
-+    if ( $parser->has_problems ) {
-+        $self->_output_test_failure($parser);
-+    }
-+    else {
-+        $formatter->_output("ok\n")
-+          unless $formatter->really_quiet;
-+    }
-+
-+    $self->_output_ruler;
-+
-+    # $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;
-+
-+    $self->_need_refresh;
-+
-+    unless (@$active) {
-+
-+        # $self->formatter->_output("\n");
-+        delete $shared{$formatter};
-+    }
-+}
-+
-+1;
-diff -urN perl-5.10.0/lib.ble/TAP/Formatter/Console/Session.pm perl-5.10.0/lib/TAP/Formatter/Console/Session.pm
---- perl-5.10.0/lib.ble/TAP/Formatter/Console/Session.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Formatter/Console/Session.pm	2008-06-18 01:27:05.000000000 +0200
-@@ -0,0 +1,327 @@
-+package TAP::Formatter::Console::Session;
-+
-+use strict;
-+use TAP::Base;
-+
-+use vars qw($VERSION @ISA);
-+
-+@ISA = qw(TAP::Base);
-+
-+my @ACCESSOR;
-+
-+BEGIN {
-+
-+    @ACCESSOR = qw( name formatter parser );
-+
-+    for my $method (@ACCESSOR) {
-+        no strict 'refs';
-+        *$method = sub { shift->{$method} };
-+    }
-+
-+    my @CLOSURE_BINDING = qw( header result 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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=head1 DESCRIPTION
-+
-+This provides console orientated output formatting for TAP::Harness.
-+
-+=head1 SYNOPSIS
-+
-+=cut
-+
-+=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>
-+
-+=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 ( my @props = sort keys %arg_for ) {
-+        $self->_croak("Unknown arguments to TAP::Harness::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.
-+
-+=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 $show_count = $self->_should_show_count;
-+    my $pretty     = $formatter->_format_name( $self->name );
-+
-+    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 on first number, and roughly once per second
-+                if (   ( $number == 1 )
-+                    || ( $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");
-+            }
-+        },
-+
-+        close_test => sub {
-+            return if $really_quiet;
-+
-+            if ($show_count) {
-+                my $spaces = ' ' x
-+                  length( '.' . $pretty . $plan . $parser->tests_run );
-+                $formatter->$output("\r$spaces\r$pretty");
-+            }
-+
-+            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");
-+            }
-+        },
-+    };
-+}
-+
-+sub _should_show_count {
-+
-+    # we need this because if someone tries to redirect the output, it can get
-+    # very garbled from the carriage returns (\r) in the count line.
-+    return !shift->formatter->verbose && -t 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/lib.ble/TAP/Formatter/Console.pm perl-5.10.0/lib/TAP/Formatter/Console.pm
---- perl-5.10.0/lib.ble/TAP/Formatter/Console.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Formatter/Console.pm	2008-06-18 01:26:50.000000000 +0200
-@@ -0,0 +1,469 @@
-+package TAP::Formatter::Console;
-+
-+use strict;
-+use TAP::Base ();
-+use POSIX qw(strftime);
-+
-+use vars qw($VERSION @ISA);
-+
-+@ISA = qw(TAP::Base);
-+
-+my $MAX_ERRORS = 5;
-+my %VALIDATION_FOR;
-+
-+BEGIN {
-+    %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 },
-+        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
-+    );
-+
-+    for my $method ( @getter_setters, keys %VALIDATION_FOR ) {
-+        no strict 'refs';
-+        *$method = sub {
-+            my $self = shift;
-+            return $self->{$method} unless @_;
-+            $self->{$method} = shift;
-+        };
-+    }
-+}
-+
-+=head1 NAME
-+
-+TAP::Formatter::Console - Harness output delegate for default console output
-+
-+=head1 VERSION
-+
-+Version 3.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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.
-+
-+=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 + 4 - length $test );
-+
-+    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 {
-+    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
-+        }
-+    );
-+
-+    $session->header;
-+
-+    return $session;
-+}
-+
-+=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");
-+            }
-+
-+            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 } @_;
-+}
-+
-+# 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;
-+}
-+
-+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/lib.ble/TAP/Harness.pm perl-5.10.0/lib/TAP/Harness.pm
---- perl-5.10.0/lib.ble/TAP/Harness.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Harness.pm	2008-06-18 01:27:31.000000000 +0200
-@@ -0,0 +1,822 @@
-+package TAP::Harness;
-+
-+use strict;
-+use Carp;
-+
-+use File::Spec;
-+use File::Path;
-+use IO::Handle;
-+
-+use TAP::Base;
-+use TAP::Parser;
-+use TAP::Parser::Aggregator;
-+use TAP::Parser::Multiplexer;
-+use TAP::Parser::Scheduler;
-+
-+use vars qw($VERSION @ISA);
-+
-+@ISA = qw(TAP::Base);
-+
-+=head1 NAME
-+
-+TAP::Harness - Run test scripts with statistics
-+
-+=head1 VERSION
-+
-+Version 3.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+$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
-+    );
-+
-+    %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 },
-+        formatter_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.
-+
-+=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<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<formatter_class>
-+
-+The name of the class to use to format output. The default is
-+L<TAP::Formatter::Console>.
-+
-+=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<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
-+    );
-+
-+    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;
-+
-+        unless ( $self->formatter ) {
-+
-+            $self->formatter_class( my $class = $self->formatter_class
-+                  || 'TAP::Formatter::Console' );
-+
-+            croak "Bad module name $class"
-+              unless $class =~ /^ \w+ (?: :: \w+ ) *$/x;
-+
-+            eval "require $class";
-+            $self->_croak("Can't load $class") if $@;
-+
-+            # 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( $class->new( \%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 = TAP::Parser::Aggregator->new;
-+
-+    $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 ) ) {
-+                exit 1 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 _aggregate_parallel {
-+    my ( $self, $aggregate, $scheduler ) = @_;
-+
-+    my $jobs = $self->jobs;
-+    my $mux  = TAP::Parser::Multiplexer->new;
-+
-+    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);
-+                exit 1 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;
-+                exit 1;
-+            }
-+        }
-+
-+        $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;
-+
-+    # First transformation: turn scalars into single element arrays
-+    my @tests = map { 'ARRAY' eq ref $_ ? $_ : [$_] } @_;
-+
-+    # Work out how many different extensions we have
-+    my %ext;
-+    for my $test (@tests) {
-+        $ext{$1}++ if $test->[0] =~ /\.(\w+)$/;
-+    }
-+
-+    for my $test (@tests) {
-+        if ( @$test == 1 ) {
-+            $test->[1] = $test->[0];
-+            $test->[1] =~ s/\.\w+$//
-+              if keys %ext <= 1;
-+        }
-+    }
-+    return @tests;
-+}
-+
-+=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 TAP::Parser::Scheduler->new(
-+        tests => [ $self->_add_descriptions(@tests) ],
-+        rules => $self->rules
-+    );
-+}
-+
-+=head3 C<jobs>
-+
-+Returns the number of concurrent test runs the harness is handling. For the default
-+harness this value is always 1. A parallel harness such as L<TAP::Harness::Parallel>
-+will override this to return the number of jobs it is handling.
-+
-+=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 = TAP::Parser->new($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/lib.ble/TAP/Object.pm perl-5.10.0/lib/TAP/Object.pm
---- perl-5.10.0/lib.ble/TAP/Object.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Object.pm	2008-06-18 01:26:34.000000000 +0200
-@@ -0,0 +1,97 @@
-+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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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;
-+}
-+
-+1;
-+
-diff -urN perl-5.10.0/lib.ble/TAP/Parser/Aggregator.pm perl-5.10.0/lib/TAP/Parser/Aggregator.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Aggregator.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Aggregator.pm	2008-06-18 01:27:32.000000000 +0200
-@@ -0,0 +1,412 @@
-+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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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';
-+
-+    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 * 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 erros
-+
-+=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/lib.ble/TAP/Parser/Grammar.pm perl-5.10.0/lib/TAP/Parser/Grammar.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Grammar.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Grammar.pm	2008-06-22 03:03:04.000000000 +0200
-@@ -0,0 +1,581 @@
-+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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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,
-+                    uc $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 ) = @_;
-+    my %test = (
-+        ok          => $ok,
-+        test_num    => $num,
-+        description => _trim($desc),
-+        directive   => uc( defined $dir ? $dir : '' ),
-+        explanation => _trim($explanation),
-+        raw         => $line,
-+        type        => 'test',
-+    );
-+    return \%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/lib.ble/TAP/Parser/Iterator/Array.pm perl-5.10.0/lib/TAP/Parser/Iterator/Array.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Iterator/Array.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Iterator/Array.pm	2008-06-22 03:03:04.000000000 +0200
-@@ -0,0 +1,107 @@
-+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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/Iterator/Process.pm perl-5.10.0/lib/TAP/Parser/Iterator/Process.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Iterator/Process.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Iterator/Process.pm	2008-06-22 03:03:04.000000000 +0200
-@@ -0,0 +1,373 @@
-+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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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 = $?;
-+
-+    # 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/lib.ble/TAP/Parser/Iterator/Stream.pm perl-5.10.0/lib/TAP/Parser/Iterator/Stream.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Iterator/Stream.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Iterator/Stream.pm	2008-06-22 03:03:04.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/IteratorFactory.pm perl-5.10.0/lib/TAP/Parser/IteratorFactory.pm
---- perl-5.10.0/lib.ble/TAP/Parser/IteratorFactory.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/IteratorFactory.pm	2008-06-22 14:21:19.000000000 +0200
-@@ -0,0 +1,173 @@
-+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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/Iterator.pm perl-5.10.0/lib/TAP/Parser/Iterator.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Iterator.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Iterator.pm	2008-06-22 03:03:04.000000000 +0200
-@@ -0,0 +1,169 @@
-+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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/Multiplexer.pm perl-5.10.0/lib/TAP/Parser/Multiplexer.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Multiplexer.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Multiplexer.pm	2008-06-18 01:27:16.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/Result/Bailout.pm perl-5.10.0/lib/TAP/Parser/Result/Bailout.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Result/Bailout.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Bailout.pm	2008-06-18 01:26:33.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/Result/Comment.pm perl-5.10.0/lib/TAP/Parser/Result/Comment.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Result/Comment.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Comment.pm	2008-06-18 01:27:23.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/Result/Plan.pm perl-5.10.0/lib/TAP/Parser/Result/Plan.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Result/Plan.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Plan.pm	2008-06-18 01:26:45.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/Result/Pragma.pm perl-5.10.0/lib/TAP/Parser/Result/Pragma.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Result/Pragma.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Pragma.pm	2008-06-18 01:26:59.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/Result/Test.pm perl-5.10.0/lib/TAP/Parser/Result/Test.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Result/Test.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Test.pm	2008-06-18 01:27:21.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/Result/Unknown.pm perl-5.10.0/lib/TAP/Parser/Result/Unknown.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Result/Unknown.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Unknown.pm	2008-06-18 01:26:36.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/Result/Version.pm perl-5.10.0/lib/TAP/Parser/Result/Version.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Result/Version.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/Version.pm	2008-06-18 01:26:35.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/Result/YAML.pm perl-5.10.0/lib/TAP/Parser/Result/YAML.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Result/YAML.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result/YAML.pm	2008-06-18 01:27:06.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/ResultFactory.pm perl-5.10.0/lib/TAP/Parser/ResultFactory.pm
---- perl-5.10.0/lib.ble/TAP/Parser/ResultFactory.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/ResultFactory.pm	2008-06-22 14:21:19.000000000 +0200
-@@ -0,0 +1,187 @@
-+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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/Result.pm perl-5.10.0/lib/TAP/Parser/Result.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Result.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Result.pm	2008-06-22 14:21:19.000000000 +0200
-@@ -0,0 +1,297 @@
-+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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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) {
-+	# make a shallow copy of the token:
-+	$self->{$_} = $token->{$_} for (keys %$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/lib.ble/TAP/Parser/Scheduler/Job.pm perl-5.10.0/lib/TAP/Parser/Scheduler/Job.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Scheduler/Job.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Scheduler/Job.pm	2008-06-18 01:27:06.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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,
-+        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/lib.ble/TAP/Parser/Scheduler/Spinner.pm perl-5.10.0/lib/TAP/Parser/Scheduler/Spinner.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Scheduler/Spinner.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Scheduler/Spinner.pm	2008-06-18 01:27:33.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/Scheduler.pm perl-5.10.0/lib/TAP/Parser/Scheduler.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Scheduler.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Scheduler.pm	2008-06-18 01:27:18.000000000 +0200
-@@ -0,0 +1,241 @@
-+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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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 _expand {
-+    my ( $self, $name, $tests ) = @_;
-+
-+    $name =~ s{(.)}{
-+        $1 eq '?' ? '[^/]'
-+      : $1 eq '*' ? '[^/]*'
-+      :             quotemeta($1);
-+    }gex;
-+
-+    my $pattern = qr{^$name$};
-+    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;
-+    $self->_gather( $self->{schedule} );
-+}
-+
-+sub _gather {
-+    my ( $self, $rule ) = @_;
-+    return unless defined $rule;
-+    return $rule unless 'ARRAY' eq ref $rule;
-+    return map { $self->_gather($_) } grep {defined} 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;
-+    my @jobs = $self->_find_next_job( $self->{schedule} );
-+    return $jobs[0] if @jobs;
-+
-+    # TODO: This isn't very efficient...
-+    return TAP::Parser::Scheduler::Spinner->new
-+      if $self->get_all;
-+
-+    return;
-+}
-+
-+sub _not_empty {
-+    my $ar = shift;
-+    return 1 unless defined $ar && 'ARRAY' eq ref $ar;
-+    return 1 if grep { _not_empty($_) } @$ar;
-+    return;
-+}
-+
-+sub _is_empty { !_not_empty(@_) }
-+
-+sub _find_next_job {
-+    my ( $self, $rule ) = @_;
-+
-+    my @queue = ();
-+    for my $seq (@$rule) {
-+
-+        # Prune any exhausted items.
-+        shift @$seq while @$seq && _is_empty( $seq->[0] );
-+        if ( @$seq && 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;
-+            }
-+        }
-+    }
-+
-+    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 ) {
-+        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/lib.ble/TAP/Parser/Source/Perl.pm perl-5.10.0/lib/TAP/Parser/Source/Perl.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Source/Perl.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Source/Perl.pm	2008-06-22 14:21:19.000000000 +0200
-@@ -0,0 +1,322 @@
-+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;
-+@ISA = 'TAP::Parser::Source';
-+
-+=head1 NAME
-+
-+TAP::Parser::Source::Perl - Stream Perl output
-+
-+=head1 VERSION
-+
-+Version 3.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=head1 SYNOPSIS
-+
-+  use TAP::Parser::Source::Perl;
-+  my $perl = TAP::Parser::Source::Perl->new({ parser => $parser });
-+  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({ parser => $parser });
-+
-+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;
-+
-+Returns a stream of the output generated by executing C<source>.
-+
-+=cut
-+
-+sub get_stream {
-+    my $self = shift;
-+
-+    my @extra_libs;
-+
-+    my @switches = $self->_switches;
-+    my $path_sep = $Config{path_sep};
-+    my $path_pat = qr{$path_sep};
-+
-+    # 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;
-+    for ( grep { $_ !~ $path_pat } @switches ) {
-+        push @libs, $1 if / ^ ['"]? -I (.*?) ['"]? $ /x;
-+    }
-+
-+    my $previous = $ENV{PERL5LIB};
-+    if ($previous) {
-+        push @libs, split( $path_pat, $previous );
-+    }
-+
-+    my $setup = sub {
-+        if (@libs) {
-+            $ENV{PERL5LIB} = join( $path_sep, @libs );
-+        }
-+    };
-+
-+    # Cargo culted from comments seen elsewhere about VMS / environment
-+    # variables. I don't know if this is actually necessary.
-+    my $teardown = sub {
-+        if ($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" } @switches ) {
-+        push @switches,
-+          $self->_libs2switches(
-+            split $path_pat,
-+            $ENV{PERL5LIB} || $ENV{PERLLIB} || ''
-+          );
-+
-+        push @switches, $ENV{PERL5OPT} || ();
-+    }
-+
-+    my @command = $self->_get_command_for_switches(@switches)
-+      or $self->_croak("No command found!");
-+
-+    return $self->{parser}->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 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 (@switches) {
-+        $_ = qq["$_"] if ( ( /\s/ || IS_VMS ) && !/^".*"$/ );
-+    }
-+
-+    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/lib.ble/TAP/Parser/Source.pm perl-5.10.0/lib/TAP/Parser/Source.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Source.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Source.pm	2008-06-22 14:32:38.000000000 +0200
-@@ -0,0 +1,171 @@
-+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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=head1 SYNOPSIS
-+
-+  use TAP::Parser::Source;
-+  my $source = TAP::Parser::Source->new({ parser => $parser });
-+  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({ parser => $parser });
-+
-+Returns a new C<TAP::Parser::Source> object.
-+
-+=cut
-+
-+# new() implementation supplied by TAP::Object
-+
-+sub _initialize {
-+    my ( $self, $args ) = @_;
-+    $self->{switches} = [];
-+    $self->{parser}   = $args->{parser};    # TODO: accessor
-+    _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.
-+
-+=cut
-+
-+sub get_stream {
-+    my ($self) = @_;
-+    my @command = $self->_get_command
-+      or $self->_croak('No command found!');
-+
-+    return $self->{parser}->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/lib.ble/TAP/Parser/Utils.pm perl-5.10.0/lib/TAP/Parser/Utils.pm
---- perl-5.10.0/lib.ble/TAP/Parser/Utils.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/Utils.pm	2008-06-18 01:26:33.000000000 +0200
-@@ -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.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+=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/lib.ble/TAP/Parser/YAMLish/Reader.pm perl-5.10.0/lib/TAP/Parser/YAMLish/Reader.pm
---- perl-5.10.0/lib.ble/TAP/Parser/YAMLish/Reader.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/YAMLish/Reader.pm	2008-06-18 01:26:43.000000000 +0200
-@@ -0,0 +1,333 @@
-+package TAP::Parser::YAMLish::Reader;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Object ();
-+
-+@ISA     = 'TAP::Object';
-+$VERSION = '3.12';
-+
-+# 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.12
-+
-+=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/lib.ble/TAP/Parser/YAMLish/Writer.pm perl-5.10.0/lib/TAP/Parser/YAMLish/Writer.pm
---- perl-5.10.0/lib.ble/TAP/Parser/YAMLish/Writer.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser/YAMLish/Writer.pm	2008-06-18 01:27:16.000000000 +0200
-@@ -0,0 +1,255 @@
-+package TAP::Parser::YAMLish::Writer;
-+
-+use strict;
-+use vars qw($VERSION @ISA);
-+
-+use TAP::Object ();
-+
-+@ISA     = 'TAP::Object';
-+$VERSION = '3.12';
-+
-+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 enocde $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.12
-+
-+=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/lib.ble/TAP/Parser.pm perl-5.10.0/lib/TAP/Parser.pm
---- perl-5.10.0/lib.ble/TAP/Parser.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/TAP/Parser.pm	2008-06-22 14:21:19.000000000 +0200
-@@ -0,0 +1,1847 @@
-+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 );
-+
-+@ISA = qw(TAP::Base);
-+
-+=head1 NAME
-+
-+TAP::Parser - Parse L<TAP|Test::Harness::TAP> output
-+
-+=head1 VERSION
-+
-+Version 3.12
-+
-+=cut
-+
-+$VERSION = '3.12';
-+
-+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
-+    foreach my $method (
-+        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
-+        )
-+      )
-+    {
-+        no strict 'refs';
-+        *$method = sub {
-+            my $self = shift;
-+            return $self->{$method} unless @_;
-+            $self->{$method} = shift;
-+        };
-+    }
-+}    # 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(@_); }
-+
-+{
-+
-+    # 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->make_iterator( [ split "\n" => $tap ] );
-+        }
-+        elsif ($exec) {
-+            my $source = $self->make_source( { parser => $self } );
-+            $source->source( [ @$exec, @test_args ] );
-+            $source->merge($merge);    # XXX should just be arguments?
-+            $stream = $source->get_stream;
-+        }
-+        elsif ($source) {
-+            if ( my $ref = ref $source ) {
-+                $stream = $self->make_iterator($source);
-+            }
-+            elsif ( -e $source ) {
-+                my $perl = $self->make_perl_source( { parser => $self } );
-+
-+                $perl->switches($switches)
-+                  if $switches;
-+
-+                $perl->merge($merge);    # XXX args to new()?
-+                $perl->source( [ $source, @test_args ] );
-+                $stream = $perl->get_stream;
-+            }
-+            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 );
-+
-+    # 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
-+
-+=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>
-+
-+=head1 BUGS
-+
-+Please report any bugs or feature requests to
-+C<bug-tapx-parser@rt.cpan.org>, or through the web interface at
-+L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=TAP-Parser>.
-+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/lib.ble/Test/Harness/bin/prove perl-5.10.0/lib/Test/Harness/bin/prove
---- perl-5.10.0/lib.ble/Test/Harness/bin/prove	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/bin/prove	2008-06-18 01:27:34.000000000 +0200
-@@ -0,0 +1,258 @@
-+#!/usr/bin/perl -w
-+
-+use strict;
-+use App::Prove;
-+
-+my $app = App::Prove->new;
-+$app->process_args(@ARGV);
-+exit( $app->run ? 0 : 1 );
-+
-+__END__
-+
-+=head1 NAME
-+
-+prove - Run tests through a TAP harness.
-+
-+=head1 USAGE
-+
-+ prove [options] [files or directories]
-+
-+=head1 OPTIONS
-+
-+Boolean options:
-+
-+ -v,  --verbose     Print all test lines.
-+ -l,  --lib         Add 'lib' to the path for your tests (-Ilib).
-+ -b,  --blib        Add 'blib/lib' to the path for your tests (-Iblib/lib).
-+ -s,  --shuffle     Run the tests in random order.
-+ -c,  --color       Colored test output (default).
-+      --nocolor     Do not color test output.
-+ -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
-+
-+Options that take arguments:
-+
-+ -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
-+
-+=head1 NOTES
-+
-+=head2 .proverc
-+
-+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:
-+
-+    # .proverc
-+    --state=hot,fast,save
-+    -j9 --fork
-+
-+Additional option files may be specified with the C<--rc> option.
-+Default option file processing is disabled by the C<--norc> option.
-+
-+Under Windows and VMS the option file is named F<_proverc> rather than
-+F<.proverc> and is sought only in the current directory.
-+
-+=head2 Reading from C<STDIN>
-+
-+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 '-':
-+
-+ prove - < my_list_of_things_to_test.txt
-+
-+See the C<README> in the C<examples> directory of this distribution.
-+
-+=head2 Default Test Directory
-+
-+If no files or directories are supplied, C<prove> looks for all files
-+matching the pattern C<t/*.t>.
-+
-+=head2 Colored Test Output
-+
-+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.
-+
-+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.
-+
-+=head2 Arguments to Tests
-+
-+It is possible to supply arguments to tests. To do so separate them from
-+prove's own arguments with the arisdottle, '::'. For example
-+
-+ 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.
-+
-+=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 this time 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>
-+
-+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.
-+
-+    # Run all tests in random order
-+    $ prove -b --state=save --shuffle
-+
-+    # Run them again in the same order
-+    $ prove -b --state=last
-+
-+=item C<failed>
-+
-+Run only the tests that failed on the last run.
-+
-+    # Run all tests
-+    $ prove -b --state=save
-+    
-+    # Run failures
-+    $ prove -b --state=failed
-+
-+If you also specify the C<save> option newly passing tests will be
-+excluded from subsequent runs.
-+
-+    # Repeat until no more failures
-+    $ prove -b --state=failed,save
-+
-+=item C<passed>
-+
-+Run only the passed tests from last time. Useful to make sure that no
-+new problems have been introduced.
-+
-+=item C<all>
-+
-+Run all tests in normal order. Multple options may be specified, so to
-+run all tests with the failures from last time first:
-+
-+    $ prove -b --state=failed,all,save
-+
-+=item C<hot>
-+
-+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.
-+
-+    $ prove -b --state=hot,save
-+
-+Tests that have never failed will not be selected. To run all tests with
-+the most recently failed first use
-+
-+    $ prove -b --state=hot,all,save
-+
-+This combination of options may also be specified thus
-+
-+    $ prove -b --state=adrian
-+
-+=item C<todo>
-+
-+Run any tests with todos.
-+
-+=item C<slow>
-+
-+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.
-+
-+    $ prove -b --state=slow -j9 
-+
-+=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. The state is stored in a file called F<.prove>
-+(F<_prove> on Windows and VMS) in the current directory.
-+
-+=back
-+
-+The C<--state> switch may be used more than once.
-+
-+    $ prove -b --state=hot --state=all,save
-+
-+=head2 Taint Mode
-+
-+Normally when a Perl program is run in taint mode the contents of the
-+C<PERL5LIB> environment variable do not appear in C<@INC>.
-+
-+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.
-+
-+=cut
-+
-+# vim:ts=4:sw=4:et:sta
-diff -urN perl-5.10.0/lib.ble/Test/Harness/Changes perl-5.10.0/lib/Test/Harness/Changes
---- perl-5.10.0/lib.ble/Test/Harness/Changes	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/Changes	2008-06-22 03:03:49.000000000 +0200
-@@ -0,0 +1,630 @@
-+Revision history for Test-Harness
-+
-+3.12    ****-**-**
-+        - 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 ...
-diff -urN perl-5.10.0/lib.ble/Test/Harness/Hook.pm perl-5.10.0/lib/Test/Harness/Hook.pm
---- perl-5.10.0/lib.ble/Test/Harness/Hook.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/Hook.pm	2007-11-28 22:34:00.000000000 +0100
-@@ -0,0 +1,30 @@
-+package Harness::Hook;
-+
-+use strict;
-+use warnings;
-+use Carp;
-+
-+sub new {
-+    my ( $class, $harness ) = @_;
-+    my $self = bless {}, $class;
-+
-+    $harness->callback(
-+        'before_runtests',
-+        sub {
-+            my ($aggregate) = @_;
-+            warn "Before runtests\n";
-+        }
-+    );
-+
-+    $harness->callback(
-+        'after_runtests',
-+        sub {
-+            my ( $aggregate, $results ) = @_;
-+            warn "After runtests\n";
-+        }
-+    );
-+
-+    return $self;
-+}
-+
-+1;
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/000-load.t perl-5.10.0/lib/Test/Harness/t/000-load.t
---- perl-5.10.0/lib.ble/Test/Harness/t/000-load.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/000-load.t	2008-06-18 01:26:57.000000000 +0200
-@@ -0,0 +1,59 @@
-+#!/usr/bin/perl -wT
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 74;
-+
-+BEGIN {
-+
-+    # TAP::Parser must come first
-+    my @classes = qw(
-+      TAP::Parser
-+      App::Prove
-+      App::Prove::State
-+      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/lib.ble/Test/Harness/t/aggregator.t perl-5.10.0/lib/Test/Harness/t/aggregator.t
---- perl-5.10.0/lib.ble/Test/Harness/t/aggregator.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/aggregator.t	2008-06-22 14:21:19.000000000 +0200
-@@ -0,0 +1,301 @@
-+#!/usr/bin/perl -wT
-+
-+use strict;
-+use lib 't/lib';
-+
-+use Test::More tests => 79;
-+
-+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, '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/lib.ble/Test/Harness/t/bailout.t perl-5.10.0/lib/Test/Harness/t/bailout.t
---- perl-5.10.0/lib.ble/Test/Harness/t/bailout.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/bailout.t	2008-06-18 01:27:17.000000000 +0200
-@@ -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/lib.ble/Test/Harness/t/base.t perl-5.10.0/lib/Test/Harness/t/base.t
---- perl-5.10.0/lib.ble/Test/Harness/t/base.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/base.t	2008-06-18 01:27:33.000000000 +0200
-@@ -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/lib.ble/Test/Harness/t/callbacks.t perl-5.10.0/lib/Test/Harness/t/callbacks.t
---- perl-5.10.0/lib.ble/Test/Harness/t/callbacks.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/callbacks.t	2008-06-22 14:21:19.000000000 +0200
-@@ -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/lib.ble/Test/Harness/t/console.t perl-5.10.0/lib/Test/Harness/t/console.t
---- perl-5.10.0/lib.ble/Test/Harness/t/console.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/console.t	2008-06-18 01:26:31.000000000 +0200
+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';
@@ -17962,9 +2077,59 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/console.t perl-5.10.0/lib/Test/Harn
 +}
 +
 +package main;
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/errors.t perl-5.10.0/lib/Test/Harness/t/errors.t
---- perl-5.10.0/lib.ble/Test/Harness/t/errors.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/errors.t	2008-06-18 01:26:45.000000000 +0200
+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
 +
@@ -18149,14 +2314,477 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/errors.t perl-5.10.0/lib/Test/Harne
 +      qr/good_plan[(][)] is deprecated.  Please use "is_good_plan[(][)]"/,
 +      '...and it fell-back like we expected';
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/grammar.t perl-5.10.0/lib/Test/Harness/t/grammar.t
---- perl-5.10.0/lib.ble/Test/Harness/t/grammar.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/grammar.t	2008-06-18 01:27:14.000000000 +0200
-@@ -0,0 +1,452 @@
+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 lib 't/lib';
++
++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;
 +
@@ -18605,16 +3233,160 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/grammar.t perl-5.10.0/lib/Test/Harn
 +
 +    is $aiter->exit, undef, '... and note we didnt exhaust the source';
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harness/t/harness.t
---- perl-5.10.0/lib.ble/Test/Harness/t/harness.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/harness.t	2008-06-18 01:27:20.000000000 +0200
-@@ -0,0 +1,889 @@
+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', 'lib' );
++        @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';
@@ -18630,8 +3402,10 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +
 +my $HARNESS = 'TAP::Harness';
 +
-+my $source_tests = $ENV{PERL_CORE} ? 'lib/source_tests' : 't/source_tests';
-+my $sample_tests = $ENV{PERL_CORE} ? 'lib/sample-tests' : 't/sample-tests';
++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;
 +
@@ -18692,8 +3466,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +{
 +    my @output;
 +    local $^W;
-+    local *TAP::Formatter::Console::_should_show_count = sub {0};
-+    local *TAP::Formatter::Console::_output = sub {
++    local *TAP::Formatter::Base::_output = sub {
 +        my $self = shift;
 +        push @output => grep { $_ ne '' }
 +          map {
@@ -18702,11 +3475,16 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +            trim($_)
 +          } @_;
 +    };
-+    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 } );
++    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);
 +
@@ -18722,7 +3500,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +    chomp(@output);
 +
 +    my @expected = (
-+        "$source_tests/harness....",
++        "$source_tests/harness ..",
 +        '1..1',
 +        '[[reset]]',
 +        'ok 1 - this is a test',
@@ -18753,7 +3531,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +    chomp(@output);
 +
 +    @expected = (
-+        'My Nice Test....',
++        'My Nice Test ..',
 +        '1..1',
 +        '[[reset]]',
 +        'ok 1 - this is a test',
@@ -18786,13 +3564,13 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +    chomp(@output);
 +
 +    @expected = (
-+        'My Nice Test..........',
++        'My Nice Test ........',
 +        '1..1',
 +        '[[reset]]',
 +        'ok 1 - this is a test',
 +        '[[reset]]',
 +        'ok',
-+        'My Nice Test Again....',
++        'My Nice Test Again ..',
 +        '1..1',
 +        '[[reset]]',
 +        'ok 1 - this is a test',
@@ -18818,7 +3596,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +
 +    chomp(@output);
 +    @expected = (
-+        "$source_tests/harness....",
++        "$source_tests/harness ..",
 +        'ok',
 +        'All tests successful.',
 +    );
@@ -18870,7 +3648,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +    @output = @output[ 0 .. 9 ];
 +
 +    @expected = (
-+        "$source_tests/harness_failure....",
++        "$source_tests/harness_failure ..",
 +        '1..2',
 +        '[[reset]]',
 +        'ok 1 - this is a test',
@@ -18911,7 +3689,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +    $status   = pop @output;
 +    $summary  = pop @output;
 +    @expected = (
-+        "$source_tests/harness_failure....",
++        "$source_tests/harness_failure ..",
 +        'Failed 1/2 subtests',
 +        'Test Summary Report',
 +        '-------------------',
@@ -18958,7 +3736,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +    chomp(@output);
 +
 +    @expected = (
-+        "$source_tests/harness_directives....",
++        "$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',
@@ -19016,7 +3794,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +    @summary  = @output[ 12 .. ( $#output - 1 ) ];
 +    @output   = @output[ 0 .. 11 ];
 +    @expected = (
-+        "$source_tests/harness_badtap....",
++        "$source_tests/harness_badtap ..",
 +        '1..2',
 +        '[[reset]]',
 +        'ok 1 - this is a test',
@@ -19070,7 +3848,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +    chomp(@output);
 +
 +    @expected = (
-+        "$source_tests/harness_failure....",
++        "$source_tests/harness_failure ..",
 +        'not ok 2 - this is another test',
 +        'Failed 1/2 subtests',
 +        'Test Summary Report',
@@ -19096,7 +3874,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +    chomp(@output);
 +
 +    @expected = (
-+        "$sample_tests/no_output....",
++        "$sample_tests/no_output ..",
 +        'No subtests run',
 +        'Test Summary Report',
 +        '-------------------',
@@ -19134,7 +3912,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +    eval {
 +        _runtests(
 +            $harness,
-+            $ENV{PERL_CORE} ? 'lib/data/catme.1' : 't/data/catme.1'
++            $ENV{PERL_CORE}
++            ? '../ext/Test/Harness/t/data/catme.1'
++            : 't/data/catme.1'
 +        );
 +    };
 +
@@ -19421,7 +4201,13 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +
 +    # coverage tests for the basically untested T::H::_open_spool
 +
-+    my @spool = ( $ENV{PERL_CORE} ? ('spool') : ( 't', '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
@@ -19460,14 +4246,15 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +        {   name   => 'all the same',
 +            input  => [ 'foo.t', 'bar.t', 'fletz.t' ],
 +            output => [
-+                [ 'foo.t', 'foo' ], [ 'bar.t', 'bar' ], [ 'fletz.t', 'fletz' ]
++                [ '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' ], [ 'bar.t', 'brip' ],
-+                [ 'fletz.t', 'fletz' ]
++                [ 'foo.t', 'foo.t' ], [ 'bar.t', 'brip' ],
++                [ 'fletz.t', 'fletz.t' ]
 +            ],
 +        },
 +        {   name   => 'different exts',
@@ -19498,10 +4285,10 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/harness.t perl-5.10.0/lib/Test/Harn
 +          $case->{output}, '_add_descriptions: ' . $case->{name};
 +    }
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/iterators.t perl-5.10.0/lib/Test/Harness/t/iterators.t
---- perl-5.10.0/lib.ble/Test/Harness/t/iterators.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/iterators.t	2008-06-22 14:21:19.000000000 +0200
-@@ -0,0 +1,212 @@
+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;
@@ -19546,8 +4333,13 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/iterators.t perl-5.10.0/lib/Test/Ha
 +            command => [
 +                $^X,
 +                File::Spec->catfile(
-+                    ( $ENV{PERL_CORE} ? 'lib' : 't' ),
-+                    'sample-tests', 'out_err_mix'
++                    (   $ENV{PERL_CORE}
++                        ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
++                        : ()
++                    ),
++                    't',
++                    'sample-tests',
++                    'out_err_mix'
 +                )
 +            ],
 +            merge    => 1,
@@ -19582,7 +4374,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/iterators.t perl-5.10.0/lib/Test/Ha
 +);
 +
 +sub _can_open3 {
-+    return $^O eq 'MSWin32' || $Config{d_fork};
++    return $Config{d_fork};
 +}
 +
 +my $factory = TAP::Parser::IteratorFactory->new;
@@ -19594,9 +4386,11 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/iterators.t perl-5.10.0/lib/Test/Ha
 +        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";
++        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';
@@ -19714,10 +4508,575 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/iterators.t perl-5.10.0/lib/Test/Ha
 +two
 +
 +three
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/multiplexer.t perl-5.10.0/lib/Test/Harness/t/multiplexer.t
---- perl-5.10.0/lib.ble/Test/Harness/t/multiplexer.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/multiplexer.t	2008-06-18 01:26:25.000000000 +0200
-@@ -0,0 +1,167 @@
+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;
@@ -19776,7 +5135,14 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/multiplexer.t perl-5.10.0/lib/Test/
 +            return [
 +                TAP::Parser->new(
 +                    {   source => File::Spec->catfile(
-+                            ( $ENV{PERL_CORE} ? 'lib' : 't' ), 'sample-tests',
++                            (   $ENV{PERL_CORE}
++                                ? ( File::Spec->updir(), 'ext', 'Test',
++                                    'Harness'
++                                  )
++                                : ()
++                            ),
++                            't',
++                            'sample-tests',
 +                            'simple'
 +                        ),
 +                    }
@@ -19796,8 +5162,15 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/multiplexer.t perl-5.10.0/lib/Test/
 +            return map {
 +                [   TAP::Parser->new(
 +                        {   source => File::Spec->catfile(
-+                                ( $ENV{PERL_CORE} ? 'lib' : 't' ),
-+                                'sample-tests', 'simple'
++                                (   $ENV{PERL_CORE}
++                                    ? ( File::Spec->updir(), 'ext', 'Test',
++                                        'Harness'
++                                      )
++                                    : ()
++                                ),
++                                't',
++                                'sample-tests',
++                                'simple'
 +                            ),
 +                        }
 +                    ),
@@ -19836,8 +5209,15 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/multiplexer.t perl-5.10.0/lib/Test/
 +              ( map {
 +                    [   TAP::Parser->new(
 +                            {   source => File::Spec->catfile(
-+                                    ( $ENV{PERL_CORE} ? 'lib' : 't' ),
-+                                    'sample-tests', 'simple'
++                                    (   $ENV{PERL_CORE}
++                                        ? ( File::Spec->updir(), 'ext',
++                                            'Test',              'Harness'
++                                          )
++                                        : ()
++                                    ),
++                                    't',
++                                    'sample-tests',
++                                    'simple'
 +                                ),
 +                            }
 +                        ),
@@ -19885,16 +5265,16 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/multiplexer.t perl-5.10.0/lib/Test/
 +}
 +
 +1;
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/nofork-mux.t perl-5.10.0/lib/Test/Harness/t/nofork-mux.t
---- perl-5.10.0/lib.ble/Test/Harness/t/nofork-mux.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/nofork-mux.t	2008-06-18 01:27:30.000000000 +0200
+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', 'lib' );
++        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
 +    }
 +    else {
 +        use lib 't/lib';
@@ -19905,10 +5285,10 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/nofork-mux.t perl-5.10.0/lib/Test/H
 +
 +use NoFork;
 +require(
-+    ( $ENV{PERL_CORE} ? '../lib/Test/Harness/' : '' ) . 't/multiplexer.t' );
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/nofork.t perl-5.10.0/lib/Test/Harness/t/nofork.t
---- perl-5.10.0/lib.ble/Test/Harness/t/nofork.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/nofork.t	2008-06-18 01:26:58.000000000 +0200
++    ( $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
 +
@@ -19918,7 +5298,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/nofork.t perl-5.10.0/lib/Test/Harne
 +BEGIN {
 +    if ( $ENV{PERL_CORE} ) {
 +        chdir 't';
-+        @INC = ( '../lib', 'lib' );
++        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
 +    }
 +    else {
 +        use lib 't/lib';
@@ -19969,8 +5349,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/nofork.t perl-5.10.0/lib/Test/Harne
 +            stdout    => $capture,
 +        }
 +    );
-+    $harness->runtests(
-+        ( $ENV{PERL_CORE} ? 'lib' : 't' ) . '/sample-tests/simple' );
++    $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
@@ -19978,9 +5358,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/nofork.t perl-5.10.0/lib/Test/Harne
 +}
 +
 +# vim:ts=4:sw=4:et:sta
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/object.t perl-5.10.0/lib/Test/Harness/t/object.t
---- perl-5.10.0/lib.ble/Test/Harness/t/object.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/object.t	2008-06-18 01:26:44.000000000 +0200
+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
 +
@@ -20019,152 +5399,10 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/object.t perl-5.10.0/lib/Test/Harne
 +my $err = $@;
 +like( $err, qr/^eek/, '_croak' );
 +
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/parser-config.t perl-5.10.0/lib/Test/Harness/t/parser-config.t
---- perl-5.10.0/lib.ble/Test/Harness/t/parser-config.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/parser-config.t	2008-06-18 01:26:27.000000000 +0200
-@@ -0,0 +1,46 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', 'lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+use vars qw(%INIT %CUSTOM);
-+
-+use Test::More tests => 11;
-+use File::Spec::Functions qw( catfile );
-+use TAP::Parser;
-+
-+use_ok('MySource');
-+use_ok('MyPerlSource');
-+use_ok('MyGrammar');
-+use_ok('MyIteratorFactory');
-+use_ok('MyResultFactory');
-+
-+my $t_dir = $ENV{PERL_CORE} ? 'lib' : 't';
-+my $source = catfile( $t_dir, '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/lib.ble/Test/Harness/t/parser-subclass.t perl-5.10.0/lib/Test/Harness/t/parser-subclass.t
---- perl-5.10.0/lib.ble/Test/Harness/t/parser-subclass.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/parser-subclass.t	2008-06-22 20:08:33.000000000 +0200
-@@ -0,0 +1,88 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', 'lib' );
-+    }
-+    else {
-+        unshift @INC, 't/lib';
-+    }
-+}
-+
-+use strict;
-+use vars qw(%INIT %CUSTOM);
-+
-+use Test::More tests => 24;
-+use File::Spec::Functions qw( catfile );
-+
-+use_ok('TAP::Parser::SubclassTest');
-+
-+# TODO: foreach my $source ( ... )
-+my $t_dir = $ENV{PERL_CORE} ? 'lib' : 't';
-+
-+{    # perl source
-+    %INIT = %CUSTOM = ();
-+    my $source = catfile( $t_dir, '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_dir, '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/lib.ble/Test/Harness/t/parse.t perl-5.10.0/lib/Test/Harness/t/parse.t
---- perl-5.10.0/lib.ble/Test/Harness/t/parse.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/parse.t	2008-06-22 14:21:19.000000000 +0200
-@@ -0,0 +1,1040 @@
+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;
@@ -20172,7 +5410,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/parse.t perl-5.10.0/lib/Test/Harnes
 +BEGIN {
 +    if ( $ENV{PERL_CORE} ) {
 +        chdir 't';
-+        @INC = ( '../lib', 'lib' );
++        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
 +    }
 +    else {
 +        use lib 't/lib';
@@ -20772,8 +6010,13 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/parse.t perl-5.10.0/lib/Test/Harnes
 +
 +    my $parser = TAP::Parser->new(
 +        {   source => File::Spec->catfile(
-+                ( $ENV{PERL_CORE} ? 'lib' : 't' ),
-+                'sample-tests', 'simple'
++                (   $ENV{PERL_CORE}
++                    ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
++                    : ()
++                ),
++                't',
++                'sample-tests',
++                'simple'
 +            ),
 +        }
 +    );
@@ -21113,7 +6356,10 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/parse.t perl-5.10.0/lib/Test/Harnes
 +    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
 +
@@ -21205,10 +6451,204 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/parse.t perl-5.10.0/lib/Test/Harnes
 +        );
 +    }
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/premature-bailout.t perl-5.10.0/lib/Test/Harness/t/premature-bailout.t
---- perl-5.10.0/lib.ble/Test/Harness/t/premature-bailout.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/premature-bailout.t	2008-06-22 14:21:19.000000000 +0200
-@@ -0,0 +1,126 @@
+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;
@@ -21317,8 +6757,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/premature-bailout.t perl-5.10.0/lib
 +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 ) ] ),
++    {   stream => $factory->make_iterator( [ split( /\n/, $more_tap ) ] ),
 +    }
 +);
 +
@@ -21335,10 +6774,10 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/premature-bailout.t perl-5.10.0/lib
 +# TEST
 +ok $result->is_ok(), "The event has passed";
 +
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/process.t perl-5.10.0/lib/Test/Harness/t/process.t
---- perl-5.10.0/lib.ble/Test/Harness/t/process.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/process.t	2008-06-18 01:26:54.000000000 +0200
-@@ -0,0 +1,52 @@
+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;
@@ -21369,8 +6808,13 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/process.t perl-5.10.0/lib/Test/Harn
 +);
 +
 +my $source = File::Spec->catfile(
-+    ( $ENV{PERL_CORE} ? 'lib' : 't' ),
-+    'sample-tests', 'delayed'
++    (   $ENV{PERL_CORE}
++        ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
++        : ()
++    ),
++    't',
++    'sample-tests',
++    'delayed'
 +);
 +
 +for my $chunk_size ( 1, 4, 65536 ) {
@@ -21391,221 +6835,16 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/process.t perl-5.10.0/lib/Test/Harn
 +          "I/O ok with delay at position $where, chunk size $chunk_size";
 +    }
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/proverc.t perl-5.10.0/lib/Test/Harness/t/proverc.t
---- perl-5.10.0/lib.ble/Test/Harness/t/proverc.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/proverc.t	2008-06-18 01:27:26.000000000 +0200
-@@ -0,0 +1,32 @@
+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', '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} ? 'lib' : '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/lib.ble/Test/Harness/t/proverun.t perl-5.10.0/lib/Test/Harness/t/proverun.t
---- perl-5.10.0/lib.ble/Test/Harness/t/proverun.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/proverun.t	2008-06-18 01:26:59.000000000 +0200
-@@ -0,0 +1,165 @@
-+#!/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 {
-+
-+    my $sample_test = File::Spec->catfile(
-+        split /\//,
-+        ( $ENV{PERL_CORE} ? 'lib' : 't' ) . '/sample-tests/simple'
-+    );
-+
-+    @SCHEDULE = (
-+        {   name   => 'Create empty',
-+            args   => [$sample_test],
-+            expect => [
-+                [   'new',
-+                    'TAP::Parser::Iterator::Process',
-+                    {   merge   => undef,
-+                        command => [
-+                            'PERL',
-+                            $sample_test
-+                        ],
-+                        setup    => \'CODE',
-+                        teardown => \'CODE',
-+
-+                    }
-+                ]
-+            ]
-+        },
-+    );
-+
-+    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';
-+
-+    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/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harness/t/prove.t
---- perl-5.10.0/lib.ble/Test/Harness/t/prove.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/prove.t	2008-06-18 01:27:30.000000000 +0200
-@@ -0,0 +1,1387 @@
-+#!/usr/bin/perl -w
-+
-+BEGIN {
-+    if ( $ENV{PERL_CORE} ) {
-+        chdir 't';
-+        @INC = ( '../lib', 'lib' );
++        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
 +    }
 +    else {
 +        unshift @INC, 't/lib';
@@ -21659,7 +6898,6 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +
 +{
 +    my @import_log = ();
-+
 +    sub test_log_import { push @import_log, [@_] }
 +
 +    sub get_import_log {
@@ -21667,6 +6905,15 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +        @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 );
@@ -21766,11 +7013,11 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => {},
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    {   verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
-+                    'one',
-+                    'two',
-+                    'three'
++                    'one', 'two', 'three'
 +                ]
 +            ],
 +        },
@@ -21803,7 +7050,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    { verbosity => 0, show_count => 1 },
 +                    'TAP::Harness',
 +                    'one', 'two',
 +                    'three'
@@ -21821,7 +7068,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            runlog => [
 +                [   '_runtests',
 +                    {   lib => mabs( [ 'blib/lib', 'blib/arch' ] ),
-+                        verbosity => 0
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -21839,8 +7087,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    {   color     => 1,
-+                        verbosity => 0
++                    {   color      => 1,
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -21859,7 +7108,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            runlog => [
 +                [   '_runtests',
 +                    {   directives => 1,
-+                        verbosity  => 0
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -21876,8 +7126,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    {   exec      => [1],
-+                        verbosity => 0
++                    {   exec       => [1],
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -21894,8 +7145,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    {   failures  => 1,
-+                        verbosity => 0
++                    {   failures   => 1,
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -21914,7 +7166,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            runlog => [
 +                [   '_runtests',
 +                    {   formatter_class => 'TAP::Harness',
-+                        verbosity       => 0
++                        verbosity       => 0,
++                        show_count      => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -21933,7 +7186,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            runlog => [
 +                [   '_runtests',
 +                    {   lib => mabs( [qw( four five six )] ),
-+                        verbosity => 0
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -21951,7 +7205,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            runlog => [
 +                [   '_runtests',
 +                    {   lib => mabs( ['lib'] ),
-+                        verbosity => 0
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -21968,8 +7223,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    {   merge     => 1,
-+                        verbosity => 0
++                    {   merge      => 1,
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -21986,8 +7242,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    {   errors    => 1,
-+                        verbosity => 0
++                    {   errors     => 1,
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -22004,7 +7261,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => -1
++                    {   verbosity  => -1,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -22021,7 +7279,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => -2
++                    {   verbosity  => -2,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -22038,7 +7297,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    {   verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
 +                ]
@@ -22054,7 +7315,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    {   verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
 +                    'three', 'two', 'one'
 +                ]
@@ -22071,7 +7334,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    {   verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
 +                    'xxxone', 'xxxtwo',
 +                    'xxxthree'
@@ -22088,8 +7353,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    {   switches  => ['-T'],
-+                        verbosity => 0
++                    {   switches   => ['-T'],
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -22106,8 +7372,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    {   switches  => ['-t'],
-+                        verbosity => 0
++                    {   switches   => ['-t'],
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -22124,7 +7391,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 1
++                    {   verbosity  => 1,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -22141,8 +7409,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    {   switches  => ['-W'],
-+                        verbosity => 0
++                    {   switches   => ['-W'],
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -22159,8 +7428,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    {   switches  => ['-w'],
-+                        verbosity => 0
++                    {   switches   => ['-w'],
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    'one', 'two', 'three'
@@ -22179,7 +7449,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 1
++                    {   verbosity  => 1,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22197,7 +7468,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 1
++                    {   verbosity  => 1,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22213,8 +7485,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { failures => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    {   failures  => 1,
-+                        verbosity => 0
++                    {   failures   => 1,
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22230,8 +7503,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { failures => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    {   failures  => 1,
-+                        verbosity => 0
++                    {   failures   => 1,
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22248,7 +7522,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            runlog => [
 +                [   '_runtests',
 +                    {   lib => mabs( ['lib'] ),
-+                        verbosity => 0
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22265,7 +7540,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            runlog => [
 +                [   '_runtests',
 +                    {   lib => mabs( ['lib'] ),
-+                        verbosity => 0
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22282,7 +7558,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            runlog => [
 +                [   '_runtests',
 +                    {   lib => mabs( [ 'blib/lib', 'blib/arch' ] ),
-+                        verbosity => 0
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22299,7 +7576,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            runlog => [
 +                [   '_runtests',
 +                    {   lib => mabs( [ 'blib/lib', 'blib/arch' ] ),
-+                        verbosity => 0
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22315,7 +7593,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { shuffle => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    {   verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
 +                    "xxx$dummy_test"
 +                ]
@@ -22330,7 +7610,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { shuffle => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    {   verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
 +                    "xxx$dummy_test"
 +                ]
@@ -22345,8 +7627,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { color => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    {   color     => 1,
-+                        verbosity => 0
++                    {   color      => 1,
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22362,7 +7645,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { recurse => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    {   verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
 +                    $dummy_test
 +                ]
@@ -22377,7 +7662,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { recurse => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    {   verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
 +                    $dummy_test
 +                ]
@@ -22392,7 +7679,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { backwards => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    {   verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
 +                    reverse @dummy_tests
 +                ]
@@ -22409,8 +7698,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    {   errors    => 1,
-+                        verbosity => 0
++                    {   errors     => 1,
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22428,8 +7718,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    {   errors    => 1,
-+                        verbosity => 0
++                    {   errors     => 1,
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22445,7 +7736,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { quiet => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => -1
++                    {   verbosity  => -1,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22461,7 +7753,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { quiet => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => -1
++                    {   verbosity  => -1,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22477,7 +7770,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { really_quiet => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => -2
++                    {   verbosity  => -2,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22493,7 +7787,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { really_quiet => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => -2
++                    {   verbosity  => -2,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22509,8 +7804,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { merge => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    {   merge     => 1,
-+                        verbosity => 0
++                    {   merge      => 1,
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22526,8 +7822,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { merge => 1 },
 +            runlog => [
 +                [   '_runtests',
-+                    {   merge     => 1,
-+                        verbosity => 0
++                    {   merge      => 1,
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22544,7 +7841,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            runlog => [
 +                [   '_runtests',
 +                    {   directives => 1,
-+                        verbosity  => 0
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22560,7 +7858,11 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            switches => [ '--exec', '-s', $dummy_test ],
 +            expect => { exec => '-s' },
 +            runlog => [
-+                [   '_runtests', { exec => ['-s'], verbosity => 0 },
++                [   '_runtests',
++                    {   exec       => ['-s'],
++                        verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
 +                    $dummy_test
 +                ]
@@ -22576,8 +7878,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            expect => { exec => '/foo/bar/perl -Ilib' },
 +            runlog => [
 +                [   '_runtests',
-+                    {   exec      => [qw(/foo/bar/perl -Ilib)],
-+                        verbosity => 0
++                    {   exec       => [qw(/foo/bar/perl -Ilib)],
++                        verbosity  => 0,
++                        show_count => 1,
 +                    },
 +                    'TAP::Harness',
 +                    $dummy_test
@@ -22594,7 +7897,10 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            },
 +            runlog => [
 +                [   '_runtests',
-+                    { exec => [], verbosity => 0 },
++                    {   exec       => [],
++                        verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
 +                    $dummy_test
 +                ]
@@ -22618,7 +7924,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            plan   => 1,
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    {   verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
 +                    $dummy_test
 +                ]
@@ -22645,7 +7953,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            plan   => 1,
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    {   verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
 +                    $dummy_test
 +                ]
@@ -22668,7 +7978,50 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            plan   => 1,
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    {   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
 +                ]
@@ -22691,7 +8044,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +            plan   => 1,
 +            runlog => [
 +                [   '_runtests',
-+                    { verbosity => 0 },
++                    {   verbosity  => 0,
++                        show_count => 1,
++                    },
 +                    'TAP::Harness',
 +                    $dummy_test
 +                ]
@@ -22918,6 +8273,8 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +    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";
 +
@@ -22987,10 +8344,262 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/prove.t perl-5.10.0/lib/Test/Harnes
 +        }
 +    }
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/regression.t perl-5.10.0/lib/Test/Harness/t/regression.t
---- perl-5.10.0/lib.ble/Test/Harness/t/regression.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/regression.t	2008-06-18 01:26:43.000000000 +0200
-@@ -0,0 +1,3181 @@
+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 {
@@ -23023,7 +8632,11 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/regression.t perl-5.10.0/lib/Test/H
 +
 +my $SAMPLE_TESTS = File::Spec->catdir(
 +    File::Spec->curdir,
-+    ( $ENV{PERL_CORE} ? 'lib' : 't' ),
++    (   $ENV{PERL_CORE}
++        ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
++        : ()
++    ),
++    't',
 +    'sample-tests'
 +);
 +
@@ -25551,97 +11164,102 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/regression.t perl-5.10.0/lib/Test/H
 +        version       => 12,
 +    },
 +
-+    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',
++    # 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,
-+            },
-+        ],
-+        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,
-+    },
++                tests_run     => 4,
++                parse_errors  => [],
++                'exit'        => 0,
++                wait          => 0,
++                version       => 12,
++                need_open3    => 1,
++            }
++        )
++    ),
 +
 +    junk_before_plan => {
 +        results => [
@@ -26172,10 +11790,10 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/regression.t perl-5.10.0/lib/Test/H
 +}
 +
 +# vms_nit
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/results.t perl-5.10.0/lib/Test/Harness/t/results.t
---- perl-5.10.0/lib.ble/Test/Harness/t/results.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/results.t	2008-06-22 14:21:19.000000000 +0200
-@@ -0,0 +1,294 @@
+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;
@@ -26201,7 +11819,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/results.t perl-5.10.0/lib/Test/Harn
 +# found in the regression tests.
 +#
 +
-+my $factory = TAP::Parser::ResultFactory->new;
++my $factory           = TAP::Parser::ResultFactory->new;
 +my %inherited_methods = (
 +    is_plan    => '',
 +    is_test    => '',
@@ -26237,6 +11855,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/results.t perl-5.10.0/lib/Test/Harn
 +can_ok $factory, 'class_for';
 +can_ok $factory, 'register_type';
 +{
++
 +    package MyResult;
 +    use strict;
 +    use vars qw($VERSION @ISA);
@@ -26470,9 +12089,711 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/results.t perl-5.10.0/lib/Test/Harn
 +        is $result->$method(), $value, "... and $method should be correct";
 +    }
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/scheduler.t perl-5.10.0/lib/Test/Harness/t/scheduler.t
---- perl-5.10.0/lib.ble/Test/Harness/t/scheduler.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/scheduler.t	2008-06-18 01:27:24.000000000 +0200
+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
 +
@@ -26699,16 +13020,16 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/scheduler.t perl-5.10.0/lib/Test/Ha
 +    is_deeply [ sort @got ], [ sort @$tests ], "$name: got all tests";
 +}
 +
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/source.t perl-5.10.0/lib/Test/Harness/t/source.t
---- perl-5.10.0/lib.ble/Test/Harness/t/source.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/source.t	2008-06-22 14:32:27.000000000 +0200
-@@ -0,0 +1,98 @@
+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', 'lib' );
++        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
 +    }
 +    else {
 +        unshift @INC, 't/lib';
@@ -26727,14 +13048,19 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/source.t perl-5.10.0/lib/Test/Harne
 +
 +my $parser = EmptyParser->new;
 +my $test   = File::Spec->catfile(
-+    ( $ENV{PERL_CORE} ? 'lib' : 't' ), 'source_tests',
++    (   $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( { parser => $parser } );
++my $source = TAP::Parser::Source->new;
 +isa_ok $source, 'TAP::Parser::Source';
 +
 +can_ok $source, 'source';
@@ -26746,7 +13072,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/source.t perl-5.10.0/lib/Test/Harne
 +  '... and calling it with valid args should succeed';
 +
 +can_ok $source, 'get_stream';
-+my $stream = $source->get_stream;
++my $stream = $source->get_stream($parser);
 +
 +isa_ok $stream, 'TAP::Parser::Iterator::Process',
 +  'get_stream returns the right object';
@@ -26756,7 +13082,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/source.t perl-5.10.0/lib/Test/Harne
 +ok !$stream->next, '... and we should have no more results';
 +
 +can_ok 'TAP::Parser::Source::Perl', 'new';
-+$source = TAP::Parser::Source::Perl->new( { parser => $parser } );
++$source = TAP::Parser::Source::Perl->new;
 +isa_ok $source, 'TAP::Parser::Source::Perl', '... and the object it returns';
 +
 +can_ok $source, 'source';
@@ -26764,7 +13090,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/source.t perl-5.10.0/lib/Test/Harne
 +  '... and calling it with valid args should succeed';
 +
 +can_ok $source, 'get_stream';
-+$stream = $source->get_stream;
++$stream = $source->get_stream($parser);
 +
 +isa_ok $stream, 'TAP::Parser::Iterator::Process',
 +  '... and the object it returns';
@@ -26801,9 +13127,84 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/source.t perl-5.10.0/lib/Test/Harne
 +    like pop @die, qr/No command found!/, '...and it failed as expect';
 +}
 +
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/spool.t perl-5.10.0/lib/Test/Harness/t/spool.t
---- perl-5.10.0/lib.ble/Test/Harness/t/spool.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/spool.t	2008-06-18 01:27:24.000000000 +0200
+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
 +
@@ -26950,10 +13351,10 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/spool.t perl-5.10.0/lib/Test/Harnes
 +    like pop @die, qr/ Error closing TAP spool file[(] /,
 +      '...with expected message';
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/state.t perl-5.10.0/lib/Test/Harness/t/state.t
---- perl-5.10.0/lib.ble/Test/Harness/t/state.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/state.t	2008-06-18 01:27:15.000000000 +0200
-@@ -0,0 +1,252 @@
+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 {
@@ -26969,9 +13370,10 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/state.t perl-5.10.0/lib/Test/Harnes
 +use strict;
 +use Test::More;
 +use App::Prove::State;
++use App::Prove::State::Result;
 +
 +sub mn {
-+    my $pfx = $ENV{PERL_CORE} ? '../lib/Test/Harness/' : '';
++    my $pfx = $ENV{PERL_CORE} ? '../ext/Test/Harness/' : '';
 +    return map {"$pfx$_"} @_;
 +}
 +
@@ -27106,6 +13508,13 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/state.t perl-5.10.0/lib/Test/Harnes
 +            't/source.t',
 +        ],
 +    },
++    {   options        => 'fresh',
++        get_tests_args => [],
++        expect         => [
++            't/compat/env.t',
++            't/compat/failure.t',
++        ],
++    },
 +);
 +
 +plan tests => @schedule * 2;
@@ -27131,10 +13540,170 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/state.t perl-5.10.0/lib/Test/Harnes
 +}
 +
 +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'      => {
-+            mn('t/compat/failure.t') => {
++            't/compat/failure.t' => {
 +                'last_result'    => '0',
 +                'last_run_time'  => '1196371471.57738',
 +                'last_pass_time' => '1196371471.57738',
@@ -27145,7 +13714,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/state.t perl-5.10.0/lib/Test/Harnes
 +                'last_todo'      => '1',
 +                'mtime'          => 1196285623,
 +            },
-+            mn('t/yamlish-writer.t') => {
++            't/yamlish-writer.t' => {
 +                'last_result'    => '0',
 +                'last_run_time'  => '1196371480.5761',
 +                'last_pass_time' => '1196371480.5761',
@@ -27157,7 +13726,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/state.t perl-5.10.0/lib/Test/Harnes
 +                'last_todo'      => '0',
 +                'mtime'          => 1196285400,
 +            },
-+            mn('t/compat/env.t') => {
++            't/compat/env.t' => {
 +                'last_result'    => '0',
 +                'last_run_time'  => '1196371471.42967',
 +                'last_pass_time' => '1196371471.42967',
@@ -27169,7 +13738,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/state.t perl-5.10.0/lib/Test/Harnes
 +                'last_todo'      => '0',
 +                'mtime'          => 1196285739,
 +            },
-+            mn('t/compat/version.t') => {
++            't/compat/version.t' => {
 +                'last_result'    => '2',
 +                'last_run_time'  => '1196371472.96476',
 +                'last_pass_time' => '1196371472.96476',
@@ -27181,7 +13750,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/state.t perl-5.10.0/lib/Test/Harnes
 +                'last_todo'      => '4',
 +                'mtime'          => 1196285239,
 +            },
-+            mn('t/compat/inc_taint.t') => {
++            't/compat/inc_taint.t' => {
 +                'last_result'    => '3',
 +                'last_run_time'  => '1196371471.89682',
 +                'last_pass_time' => '1196371471.89682',
@@ -27192,7 +13761,7 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/state.t perl-5.10.0/lib/Test/Harnes
 +                'last_todo'      => '0',
 +                'mtime'          => 1196185639,
 +            },
-+            mn('t/source.t') => {
++            't/source.t' => {
 +                'last_result'    => '0',
 +                'last_run_time'  => '1196371479.72508',
 +                'last_pass_time' => '1196371479.72508',
@@ -27206,9 +13775,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/state.t perl-5.10.0/lib/Test/Harnes
 +        }
 +    };
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/streams.t perl-5.10.0/lib/Test/Harness/t/streams.t
---- perl-5.10.0/lib.ble/Test/Harness/t/streams.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/streams.t	2008-06-22 14:21:19.000000000 +0200
+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
 +
@@ -27381,10 +13950,27 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/streams.t perl-5.10.0/lib/Test/Harn
 +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/lib.ble/Test/Harness/t/taint.t perl-5.10.0/lib/Test/Harness/t/taint.t
---- perl-5.10.0/lib.ble/Test/Harness/t/taint.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/taint.t	2008-06-18 01:27:26.000000000 +0200
-@@ -0,0 +1,79 @@
+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 {
@@ -27397,11 +13983,10 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/taint.t perl-5.10.0/lib/Test/Harnes
 +    }
 +}
 +
-+# Test that options in PERL5LIB and PERL5OPT are propogated to tainted
-+# tests
++# Test that options in PERL5OPT are propogated to tainted tests
 +
 +use strict;
-+use Test::More ( $^O eq 'VMS' ? ( skip_all => 'VMS' ) : ( tests => 3 ) );
++use Test::More ( $^O eq 'VMS' ? ( skip_all => 'VMS' ) : ( tests => 1 ) );
 +
 +use Config;
 +use TAP::Parser;
@@ -27417,7 +14002,13 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/taint.t perl-5.10.0/lib/Test/Harnes
 +    printf TEST $test_template, @args;
 +    close TEST;
 +
-+    my $p = TAP::Parser->new( { source => $test_file } );
++    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;
 +
@@ -27425,35 +14016,6 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/taint.t perl-5.10.0/lib/Test/Harnes
 +}
 +
 +{
-+    local $ENV{PERL5LIB} = join $Config{path_sep}, grep defined, 'wibble',
-+      $ENV{PERL5LIB};
-+    run_test_file( <<'END', $lib_path );
-+#!/usr/bin/perl -T
-+
-+BEGIN { unshift @INC, ( %s ); }
-+use Test::More tests => 1;
-+
-+ok grep(/^wibble$/, @INC) or diag join "\n", @INC;
-+END
-+}
-+
-+{
-+    my $perl5lib = $ENV{PERL5LIB};
-+    local $ENV{PERL5LIB};
-+    local $ENV{PERLLIB} = join $Config{path_sep}, grep defined, 'wibble',
-+      $perl5lib;
-+    run_test_file( <<'END', $lib_path );
-+#!/usr/bin/perl -T
-+
-+BEGIN { unshift @INC, ( %s ); }
-+use Test::More tests => 1;
-+
-+ok grep(/^wibble$/, @INC) or diag join "\n", @INC;
-+END
-+}
-+
-+{
-+    local $ENV{PERL5LIB} = join $Config{path_sep}, @INC;
 +    local $ENV{PERL5OPT} = '-Mstrict';
 +    run_test_file(<<'END');
 +#!/usr/bin/perl -T
@@ -27464,10 +14026,10 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/taint.t perl-5.10.0/lib/Test/Harnes
 +}
 +
 +1;
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/testargs.t perl-5.10.0/lib/Test/Harness/t/testargs.t
---- perl-5.10.0/lib.ble/Test/Harness/t/testargs.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/testargs.t	2008-06-18 01:26:34.000000000 +0200
-@@ -0,0 +1,131 @@
+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 {
@@ -27484,8 +14046,13 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/testargs.t perl-5.10.0/lib/Test/Har
 +use App::Prove;
 +
 +my $test = File::Spec->catfile(
-+    ( $ENV{PERL_CORE} ? 'lib' : 't' ),
-+    'sample-tests', 'echo'
++    (   $ENV{PERL_CORE}
++        ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' )
++        : ()
++    ),
++    't',
++    'sample-tests',
++    'echo'
 +);
 +
 +diag( "\n\n", bigness( join ' ', @ARGV ), "\n\n" ) if @ARGV;
@@ -27599,9 +14166,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/testargs.t perl-5.10.0/lib/Test/Har
 +    }
 +    return join '', @out;
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/unicode.t perl-5.10.0/lib/Test/Harness/t/unicode.t
---- perl-5.10.0/lib.ble/Test/Harness/t/unicode.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/unicode.t	2008-06-18 01:26:35.000000000 +0200
+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
 +
@@ -27728,9 +14295,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/unicode.t perl-5.10.0/lib/Test/Harn
 +        }
 +    }
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/utils.t perl-5.10.0/lib/Test/Harness/t/utils.t
---- perl-5.10.0/lib.ble/Test/Harness/t/utils.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/utils.t	2008-06-18 01:26:51.000000000 +0200
+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
 +
@@ -27797,9 +14364,9 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/utils.t perl-5.10.0/lib/Test/Harnes
 +        diag( Dumper( { want => $test->{out}, got => \@got } ) );
 +    }
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/yamlish-output.t perl-5.10.0/lib/Test/Harness/t/yamlish-output.t
---- perl-5.10.0/lib.ble/Test/Harness/t/yamlish-output.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/yamlish-output.t	2008-06-18 01:27:18.000000000 +0200
+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
 +
@@ -27901,9 +14468,287 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/yamlish-output.t perl-5.10.0/lib/Te
 +    my $got = $dest->{normalise}->();
 +    is_deeply $got, $out, "$name: Result matches";
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/yamlish.t perl-5.10.0/lib/Test/Harness/t/yamlish.t
---- perl-5.10.0/lib.ble/Test/Harness/t/yamlish.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/yamlish.t	2008-06-22 03:03:49.000000000 +0200
+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
 +
@@ -28434,344 +15279,3321 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness/t/yamlish.t perl-5.10.0/lib/Test/Harn
 +        is $raw,        $source, "$name: Captured source matches";
 +    }
 +}
-diff -urN perl-5.10.0/lib.ble/Test/Harness/t/yamlish-writer.t perl-5.10.0/lib/Test/Harness/t/yamlish-writer.t
---- perl-5.10.0/lib.ble/Test/Harness/t/yamlish-writer.t	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness/t/yamlish-writer.t	2008-06-18 01:26:15.000000000 +0200
-@@ -0,0 +1,274 @@
-+#!/usr/bin/perl
+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 lib 't/lib';
 +
-+use Test::More;
++use vars qw($VERSION);
 +
-+use TAP::Parser::YAMLish::Reader;
-+use TAP::Parser::YAMLish::Writer;
++=head1 NAME
 +
-+my @SCHEDULE;
++App::Prove::State::Result::Test - Individual test results.
 +
-+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",
-+                "...",
-+            ],
-+        },
-+    );
++=head1 VERSION
 +
-+    plan tests => @SCHEDULE * 6;
-+}
++Version 3.16
 +
-+sub iter {
-+    my $ar = shift;
-+    return sub {
-+        return shift @$ar;
++=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;
 +    };
 +}
 +
-+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';
++=head1 METHODS
 +
-+    my $got = [];
-+    my $writer = sub { push @$got, shift };
++=head2 Class Methods
 +
-+    my $data = $test->{in};
++=head3 C<new>
 +
-+    eval { $yaml->write( $data, $writer ) };
++=cut
 +
-+    if ( my $err = $test->{error} ) {
-+        unless ( like $@, $err, "$name: Error message" ) {
-+            diag "Error: $@\n";
++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;
 +        }
-+        is_deeply $got, [], "$name: No result";
-+        pass;
++        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 $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";
++        my $test = $self->test_class->new( { name => $name } );
++        $self->{tests}->{$name} = $test;
++        return $test;
 +    }
 +}
 +
-diff -urN perl-5.10.0/lib.ble/Test/Harness.pm perl-5.10.0/lib/Test/Harness.pm
---- perl-5.10.0/lib.ble/Test/Harness.pm	1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/lib/Test/Harness.pm	2008-06-18 01:27:15.000000000 +0200
-@@ -0,0 +1,601 @@
-+package Test::Harness;
++=head3 C<test_names>
 +
-+require 5.00405;
++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 constant IS_WIN32 => ( $^O =~ /^(MS)?Win32$/ );
-+use constant IS_VMS => ( $^O eq 'VMS' );
++use File::Find;
++use File::Spec;
++use Carp;
 +
-+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
-+  $Color
-+  $Directives
-+  $Timer
-+  $Strap
-+  $has_time_hires
-+  $IgnoreExit
-+);
-+
-+# $ML $Last_ML_Print
++use App::Prove::State::Result;
++use TAP::Parser::YAMLish::Reader ();
++use TAP::Parser::YAMLish::Writer ();
++use TAP::Base;
 +
 +BEGIN {
-+    eval q{use Time::HiRes 'time'};
-+    $has_time_hires = !$@;
++    @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
 +
-+Test::Harness - Run Perl standard test scripts with statistics
++TAP::Formatter::Console - Harness output delegate for default console output
 +
 +=head1 VERSION
 +
-+Version 3.12
++Version 3.16
 +
 +=cut
 +
-+$VERSION = '3.12';
++$VERSION = '3.16';
 +
-+# Backwards compatibility for exportable variable names.
-+*verbose  = *Verbose;
-+*switches = *Switches;
-+*debug    = *Debug;
++=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;
@@ -28783,27 +18605,13075 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness.pm perl-5.10.0/lib/Test/Harness.pm
 +    delete $ENV{HARNESS_VERSION};
 +}
 +
-+@ISA       = ('Exporter');
-+@EXPORT    = qw(&runtests);
-+@EXPORT_OK = qw(&execute_tests $verbose $switches);
++=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';
+ $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
-+
-+  use Test::Harness;
-+
-+  runtests(@test_files);
-+
-+=head1 DESCRIPTION
-+
+ 
+ =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
@@ -28814,121 +31684,151 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness.pm perl-5.10.0/lib/Test/Harness.pm
 +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};
-+
-+    if (IS_VMS) {
-+
-+        # Jiggery pokery doesn't appear to work on VMS - so disable it
-+        # pending investigation.
-+        _aggregate_tests( $harness, $aggregate, @tests );
-+    }
-+    else {
-+        my $path_sep  = $Config{path_sep};
-+        my $path_pat  = qr{$path_sep};
-+        my @extra_inc = _filtered_inc();
-+
-+        # Supply -I switches in taint mode
-+        $harness->callback(
-+            parser_args => sub {
-+                my ( $args, $test ) = @_;
-+                if ( _has_taint( $test->[0] ) ) {
-+                    push @{ $args->{switches} }, map {"-I$_"} _filtered_inc();
-+                }
-+            }
-+        );
-+
-+        my $previous = $ENV{PERL5LIB};
-+        local $ENV{PERL5LIB};
-+
-+        if ($previous) {
-+            push @extra_inc, split( $path_pat, $previous );
-+        }
-+
-+        if (@extra_inc) {
-+            $ENV{PERL5LIB} = join( $path_sep, @extra_inc );
-+        }
-+
-+        _aggregate_tests( $harness, $aggregate, @tests );
-+    }
+ 
+-=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;
@@ -28937,13 +31837,16 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness.pm perl-5.10.0/lib/Test/Harness.pm
 +          : 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 ) {
@@ -28953,13 +31856,16 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness.pm perl-5.10.0/lib/Test/Harness.pm
 +            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,
@@ -28969,10 +31875,12 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness.pm perl-5.10.0/lib/Test/Harness.pm
 +        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*)$/ ) {
@@ -28989,61 +31897,93 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness.pm perl-5.10.0/lib/Test/Harness.pm
 +            }
 +        }
 +    }
-+
+ 
+-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;
++        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;
-+        chomp( @inc = `$perl -le "print join qq[\\n], \@INC"` );
-+        return @inc;
-+    }
-+}
 +
++        # 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;
@@ -29053,14 +31993,18 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness.pm perl-5.10.0/lib/Test/Harness.pm
 +    }
 +
 +    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,
@@ -29090,12 +32034,18 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness.pm perl-5.10.0/lib/Test/Harness.pm
 +            );
 +        }
 +    );
-+
+ 
+-    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;
@@ -29150,7 +32100,10 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness.pm perl-5.10.0/lib/Test/Harness.pm
 +        else {
 +            $tot{good}++;
 +        }
-+
+ 
+-    opendir DIRH, shift;
+-    my @f = readdir DIRH;
+-    closedir DIRH;
 +        my @todo = $parser->todo_passed;
 +        if (@todo) {
 +            $todo_passed{$test} = {
@@ -29163,254 +32116,901 @@ diff -urN perl-5.10.0/lib.ble/Test/Harness.pm perl-5.10.0/lib/Test/Harness.pm
 +            };
 +        }
 +    }
-+
+ 
+-    return @f;
 +    return ( \%tot, \%failedtests, \%todo_passed );
-+}
-+
-+=head2 execute_tests( tests => \@test_files, out => \*FH )
-+
-+Runs all the given C<@test_files> (just like C<runtests()>) but
-+doesn't generate the final report.  During testing, progress
-+information will be written to the currently selected output
-+filehandle (usually C<STDOUT>), or to the filehandle given by the
-+C<out> parameter.  The I<out> is optional.
-+
-+Returns a list of two values, C<$total> and C<$failed>, describing the
-+results.  C<$total> is a hash ref summary of all the tests run.  Its
-+keys and values are this:
-+
-+    bonus           Number of individual todo tests unexpectedly passed
-+    max             Number of individual tests ran
-+    ok              Number of individual tests passed
-+    sub_skipped     Number of individual tests skipped
-+    todo            Number of individual todo tests
-+
-+    files           Number of test files ran
-+    good            Number of test files passed
-+    bad             Number of test files failed
-+    tests           Number of test files originally given
-+    skipped         Number of test files skipped
-+
-+If C<< $total->{bad} == 0 >> and C<< $total->{max} > 0 >>, you've
-+got a successful test.
-+
-+C<$failed> is a hash ref of all the test scripts that failed.  Each key
-+is the name of a test script, each value is another hash representing
-+how that script failed.  Its keys are these:
-+
-+    name        Name of the test which failed
-+    estat       Script's exit value
-+    wstat       Script's wait status
-+    max         Number of individual tests
-+    failed      Number which failed
-+    canon       List of tests which failed (as string).
-+
-+C<$failed> should be empty if everything passed.
-+
-+=cut
-+
-+1;
-+__END__
-+
-+=head1 EXPORT
-+
+ }
+ 
+ =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.
-+
+ 
+ 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
-+
-+=item C<HARNESS_ACTIVE>
-+
-+This is set to a true value.  It allows the tests to determine if they
-+are being executed through the harness or by any other means.
-+
-+=item C<HARNESS_VERSION>
-+
+ 
+ =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
-+
-+=head1 ENVIRONMENT VARIABLES THAT AFFECT TEST::HARNESS
-+
-+=over 4
-+
-+=item C<HARNESS_TIMER>
-+
-+Setting this to true will make the harness display the number of
-+milliseconds each test took.  You can also use F<prove>'s C<--timer>
-+switch.
-+
-+=item C<HARNESS_VERBOSE>
-+
+ 
+ =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.
-+
+ 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
+ 
+ =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
-+
+ 
+ =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>.
-+
-diff -up perl-5.10.0/MANIFEST.ble perl-5.10.0/MANIFEST
---- perl-5.10.0/MANIFEST.ble	2008-07-01 13:08:16.000000000 +0200
-+++ perl-5.10.0/MANIFEST	2008-07-01 13:10:35.000000000 +0200
-@@ -2593,34 +2593,40 @@ lib/Test/Builder/Module.pm	Base class fo
- 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/App/Prove.pm	Test::Harness::App
-+lib/App/Prove/State.pm
-+lib/TAP/Base.pm
-+lib/TAP/Formatter/Color.pm
-+lib/TAP/Formatter/Console.pm
-+lib/TAP/Formatter/Console/ParallelSession.pm
-+lib/TAP/Formatter/Console/Session.pm
-+lib/TAP/Harness.pm
-+lib/TAP/Parser.pm
-+lib/TAP/Parser/Aggregator.pm
-+lib/TAP/Parser/Grammar.pm
-+lib/TAP/Parser/Iterator.pm
-+lib/TAP/Parser/Iterator/Array.pm
-+lib/TAP/Parser/Iterator/Process.pm
-+lib/TAP/Parser/Iterator/Stream.pm
-+lib/TAP/Parser/Multiplexer.pm
-+lib/TAP/Parser/Result.pm
-+lib/TAP/Parser/Result/Bailout.pm
-+lib/TAP/Parser/Result/Comment.pm
-+lib/TAP/Parser/Result/Plan.pm
-+lib/TAP/Parser/Result/Pragma.pm
-+lib/TAP/Parser/Result/Test.pm
-+lib/TAP/Parser/Result/Unknown.pm
-+lib/TAP/Parser/Result/Version.pm
-+lib/TAP/Parser/Result/YAML.pm
-+lib/TAP/Parser/Scheduler.pm
-+lib/TAP/Parser/Scheduler/Job.pm
-+lib/TAP/Parser/Scheduler/Spinner.pm
-+lib/TAP/Parser/Source.pm
-+lib/TAP/Parser/Source/Perl.pm
-+lib/TAP/Parser/Utils.pm
-+lib/TAP/Parser/YAMLish/Reader.pm
-+lib/TAP/Parser/YAMLish/Writer.pm
-+lib/Test/Harness.pm
- 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 -up perl-5.10.0/lib/Module/Build/t/compat.t.ble perl-5.10.0/lib/Module/Build/t/compat.t
---- perl-5.10.0/lib/Module/Build/t/compat.t.ble	2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Module/Build/t/compat.t	2008-07-01 15:40:50.000000000 +0200
-@@ -174,8 +174,7 @@ ok $mb, "Module::Build->new_from_context
-   $output = stdout_of( sub { $ran_ok = $mb->do_system(@make, 'test', 'TEST_VERBOSE=0') } );
-   ok $ran_ok, "make test without verbose ran ok";
-   $output =~ s/^/# /gm;  # Don't confuse our own test output
--  like $output, qr/(?:# .+basic\.+ok\s+(?:[\d.]+\s*m?s\s*)?)# All tests/,
--      'Should be non-verbose';
-+  ##like $output, qr/(?:# .+basic\.+ok\s+(?:[\d.]+\s*m?s\s*)?)# All tests/, 'Should be non-verbose';
  
-   $mb->delete_filetree($libdir);
-   ok ! -e $libdir, "Sample installation directory should be cleaned up";
-diff -up perl-5.10.0/lib/Module/Build/t/compat.t.ble perl-5.10.0/lib/Module/Build/t/compat.t
---- perl-5.10.0/lib/Module/Build/t/compat.t.ble	2008-07-01 15:58:56.000000000 +0200
-+++ perl-5.10.0/lib/Module/Build/t/compat.t	2008-07-01 15:59:05.000000000 +0200
-@@ -15,7 +15,7 @@ delete @ENV{@makefile_keys};
- my @makefile_types = qw(small passthrough traditional);
- my $tests_per_type = 14;
- if ( $Config{make} && find_in_path($Config{make}) ) {
--    plan tests => 38 + @makefile_types*$tests_per_type*2;
-+    plan tests => 38 + @makefile_types*$tests_per_type*2 - 1;
- } else {
-     plan skip_all => "Don't know how to invoke 'make'";
- }
+-=cut
diff --git a/perl-update-Test-Simple.patch b/perl-update-Test-Simple.patch
new file mode 100644
index 0000000..6541cda
--- /dev/null
+++ b/perl-update-Test-Simple.patch
@@ -0,0 +1,6236 @@
+Test-Simple-0.86
+
+the following made the patch smaller:
+mv Test-Simple-0.86/t/{Builder,Tester,}
+
+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-17 17:16:40.000000000 +0100
+@@ -2626,11 +2626,16 @@
+ 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/BEGIN_require_ok.t
++lib/Test/Simple/t/BEGIN_use_ok.t
++lib/Test/Simple/t/Builder.t	Test::Builder tests
++lib/Test/Simple/t/More.t	Test::More test, basic stuff
+ 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/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
+@@ -2638,19 +2643,22 @@
+ lib/Test/Simple/t/curr_test.t	Test::Builder->curr_test tests
+ 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/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/extra_one.t	Test::Simple test
++lib/Test/Simple/t/explain.t
+ lib/Test/Simple/t/extra.t	Test::Simple test
++lib/Test/Simple/t/extra_one.t	Test::Simple test
+ lib/Test/Simple/t/fail-like.t	Test::More test, like() failures
+ lib/Test/Simple/t/fail-more.t	Test::More test, tests failing
+-lib/Test/Simple/t/fail_one.t	Test::Simple test
+ lib/Test/Simple/t/fail.t	Test::Simple test, test failures
++lib/Test/Simple/t/fail_one.t	Test::Simple test
+ 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/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
++lib/Test/Simple/t/has_plan2.t	Test::More->plan tests
+ lib/Test/Simple/t/import.t	Test::More test, importing functions
+ lib/Test/Simple/t/is_deeply_dne_bug.t	Test::More test
+ lib/Test/Simple/t/is_deeply_fail.t	Test::More test, is_deeply()
+@@ -2660,27 +2668,30 @@
+ lib/Test/Simple/t/lib/MyOverload.pm	Test::More test module 
+ 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/TODO		Test::Simple TODO
++lib/Test/Simple/t/no_tests.t
++lib/Test/Simple/t/note.t
+ lib/Test/Simple/t/ok_obj.t	Test::Builder object tests
+ lib/Test/Simple/t/output.t	Test::Builder test, output methods
+ lib/Test/Simple/t/overload.t		Test::Simple test
+ lib/Test/Simple/t/overload_threads.t	Test::Simple test
++lib/Test/Simple/t/plan.t	Test::More test, plan()
+ lib/Test/Simple/t/plan_bad.t		Test::Simple test
+ lib/Test/Simple/t/plan_is_noplan.t	Test::Simple test, no_plan
+ lib/Test/Simple/t/plan_no_plan.t	Test::More test, plan() w/no_plan
+ lib/Test/Simple/t/plan_shouldnt_import.t	Test::Simple test
+ lib/Test/Simple/t/plan_skip_all.t	Test::More test, plan() w/skip_all
+-lib/Test/Simple/t/plan.t	Test::More test, plan()
+ lib/Test/Simple/t/require_ok.t	Test::Simple test
+ lib/Test/Simple/t/reset.t	Test::Simple test
++lib/Test/Simple/t/reset_outputs.t
+ 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/skipall.t	Test::More test, skip all 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
+@@ -2688,13 +2699,14 @@
+ lib/Test/Simple/t/tbt_05faildiag.t	Test::Builder::Tester test
+ lib/Test/Simple/t/tbt_06errormess.t	Test::Builder::Tester test
+ lib/Test/Simple/t/tbt_07args.t	Test::Builder::Tester test
+-lib/Test/Simple/t/threads.t	Test::Builder thread-safe checks
+ lib/Test/Simple/t/thread_taint.t	Test::Simple test
++lib/Test/Simple/t/threads.t	Test::Builder thread-safe checks
+ lib/Test/Simple/t/todo.t	Test::More test, TODO tests
+ lib/Test/Simple/t/try.t		Test::More test
+ 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/useing.t	Test::More test, compile test
++lib/Test/Simple/t/utf8.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/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-02-17 17:16:40.000000000 +0100
+@@ -1,24 +1,24 @@
+ package Test::Builder::Module;
++# $Id$
++
++use strict;
+ 
+ use Test::Builder;
+ 
+ require Exporter;
+-@ISA = qw(Exporter);
++our @ISA = qw(Exporter);
+ 
+-$VERSION = '0.72';
+-
+-use strict;
++our $VERSION = '0.86';
+ 
+ # 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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ package Test::Builder::Tester::Color;
++# $Id$
+ 
+ use strict;
+ 
+@@ -25,8 +26,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-02-17 17:16:40.000000000 +0100
+@@ -1,8 +1,8 @@
+ package Test::Builder::Tester;
++# $Id$
+ 
+ use strict;
+-use vars qw(@EXPORT $VERSION @ISA);
+-$VERSION = "1.09";
++our $VERSION = "1.18";
+ 
+ use Test::Builder;
+ use Symbol;
+@@ -56,21 +56,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 +82,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 +123,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 +144,7 @@
+     $err->reset();
+ 
+     # remeber that we're testing
+-    $testing = 1;
++    $testing     = 1;
+     $testing_num = $t->current_test;
+     $t->current_test(0);
+ 
+@@ -188,20 +186,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 +226,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 +268,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 +316,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 +347,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 +376,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 +424,10 @@
+ =cut
+ 
+ my $color;
+-sub color
+-{
+-  $color = shift if @_;
+-  $color;
++
++sub color {
++    $color = shift if @_;
++    $color;
+ }
+ 
+ =back
+@@ -490,21 +482,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 +502,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 +525,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 +598,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-02-17 17:16:40.000000000 +0100
+@@ -1,25 +1,22 @@
+ package Test::Builder;
++# $Id$
+ 
+-use 5.004;
+-
+-# $^C was only introduced in 5.005-ish.  We do this to prevent
+-# use of uninitialized value warnings in older perls.
+-$^C ||= 0;
+-
++use 5.006;
+ use strict;
+-use vars qw($VERSION);
+-$VERSION = '0.72';
+-$VERSION = eval $VERSION;    # make the alpha version come out as a number
++use warnings;
++
++our $VERSION = '0.86';
++$VERSION = eval $VERSION;    ## no critic (BuiltinFunctions::ProhibitStringyEval)
+ 
+ # 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 +24,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 +62,6 @@
+     }
+ }
+ 
+-
+ =head1 NAME
+ 
+ Test::Builder - Backend for building test libraries
+@@ -73,28 +69,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);
+   }
+ 
+ 
+@@ -128,13 +111,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 +151,40 @@
+ 
+ =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->{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->_dup_stdhandles unless $^C;
++    $self->_dup_stdhandles;
+ 
+-    return undef;
++    return;
+ }
+ 
+ =back
+@@ -210,25 +196,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');
+@@ -243,36 +210,36 @@
+ =cut
+ 
+ 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->carp("no_plan takes no arguments") if $arg;
+         $self->no_plan;
+     }
+     elsif( $cmd eq 'skip_all' ) {
+         return $self->skip_all($arg);
+     }
+     elsif( $cmd eq 'tests' ) {
+-        if( $arg ) {
++        if($arg) {
+             local $Level = $Level + 1;
+             return $self->expected_tests($arg);
+         }
+         elsif( !defined $arg ) {
+             $self->croak("Got an undefined number of tests");
+         }
+-        elsif( !$arg ) {
++        else {
+             $self->croak("You said to run 0 tests");
+         }
+     }
+     else {
+-        my @args = grep { defined } ($cmd, $arg);
++        my @args = grep { defined } ( $cmd, $arg );
+         $self->croak("plan() doesn't understand @args");
+     }
+ 
+@@ -293,9 +260,9 @@
+     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;
+@@ -305,7 +272,6 @@
+     return $self->{Expected_Tests};
+ }
+ 
+-
+ =item B<no_plan>
+ 
+   $Test->no_plan;
+@@ -319,6 +285,8 @@
+ 
+     $self->{No_Plan}   = 1;
+     $self->{Have_Plan} = 1;
++
++    return 1;
+ }
+ 
+ =item B<has_plan>
+@@ -332,11 +300,10 @@
+ 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>
+ 
+@@ -348,7 +315,7 @@
+ =cut
+ 
+ sub skip_all {
+-    my($self, $reason) = @_;
++    my( $self, $reason ) = @_;
+ 
+     my $out = "1..0";
+     $out .= " # Skip $reason" if $reason;
+@@ -360,6 +327,28 @@
+     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
+@@ -382,7 +371,7 @@
+ =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.
+@@ -394,24 +383,27 @@
+     $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 +413,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,79 +431,81 @@
+         $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>
+ 
+@@ -530,66 +524,85 @@
+ =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;
++}
+ 
+-    return $self->diag(sprintf <<DIAGNOSTIC, $got, $expect);
+-         got: %s
+-    expected: %s
++sub _is_diag {
++    my( $self, $got, $type, $expect ) = @_;
++
++    $self->_diag_fmt( $type, $_ ) for \$got, \$expect;
++
++    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>
+ 
+@@ -608,38 +621,37 @@
+ =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);
+@@ -660,20 +672,19 @@
+ =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);
+@@ -684,64 +695,77 @@
+ 
+ =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 +795,7 @@
+ =cut
+ 
+ sub BAIL_OUT {
+-    my($self, $reason) = @_;
++    my( $self, $reason ) = @_;
+ 
+     $self->{Bailed_Out} = 1;
+     $self->_print("Bail out!  $reason");
+@@ -785,7 +809,6 @@
+ 
+ *BAILOUT = \&BAIL_OUT;
+ 
+-
+ =item B<skip>
+ 
+     $Test->skip;
+@@ -796,35 +819,36 @@
+ =cut
+ 
+ sub skip {
+-    my($self, $why) = @_;
++    my( $self, $why ) = @_;
+     $why ||= '';
+-    $self->_unoverload_str(\$why);
++    $self->_unoverload_str( \$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 => 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;
+@@ -838,32 +862,33 @@
+ =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>
+@@ -900,7 +925,7 @@
+ 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 undef if its argument is not recognised.
+ 
+ For example, a version of like(), sans the useful diagnostic messages,
+ could be written as:
+@@ -915,48 +940,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 +1004,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 +1019,6 @@
+     return $ok;
+ }
+ 
+-
+ # I'm not ready to publish this.  It doesn't deal with array return
+ # values from the code or context.
+ 
+@@ -991,7 +1029,10 @@
+     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. $@ is not set) nor is effected by outside
++interference (ie. $SIG{__DIE__}) and works around some quirks in older
++Perls.
+ 
+ $error is what would normally be in $@.
+ 
+@@ -1000,14 +1041,21 @@
+ =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
+@@ -1022,19 +1070,18 @@
+ =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
+ 
+ 
+@@ -1067,7 +1114,7 @@
+ =cut
+ 
+ sub level {
+-    my($self, $level) = @_;
++    my( $self, $level ) = @_;
+ 
+     if( defined $level ) {
+         $Level = $level;
+@@ -1075,7 +1122,6 @@
+     return $Level;
+ }
+ 
+-
+ =item B<use_numbers>
+ 
+     $Test->use_numbers($on_or_off);
+@@ -1100,7 +1146,7 @@
+ =cut
+ 
+ sub use_numbers {
+-    my($self, $use_nums) = @_;
++    my( $self, $use_nums ) = @_;
+ 
+     if( defined $use_nums ) {
+         $self->{Use_Nums} = $use_nums;
+@@ -1108,7 +1154,6 @@
+     return $self->{Use_Nums};
+ }
+ 
+-
+ =item B<no_diag>
+ 
+     $Test->no_diag($no_diag);
+@@ -1137,7 +1182,7 @@
+     my $method = lc $attribute;
+ 
+     my $code = sub {
+-        my($self, $no) = @_;
++        my( $self, $no ) = @_;
+ 
+         if( defined $no ) {
+             $self->{$attribute} = $no;
+@@ -1145,11 +1190,10 @@
+         return $self->{$attribute};
+     };
+ 
+-    no strict 'refs';
+-    *{__PACKAGE__.'::'.$method} = $code;
++    no strict 'refs';    ## no critic
++    *{ __PACKAGE__ . '::' . $method } = $code;
+ }
+ 
+-
+ =back
+ 
+ =head2 Output
+@@ -1188,7 +1232,35 @@
+ =cut
+ 
+ sub diag {
+-    my($self, @msgs) = @_;
++    my $self = shift;
++
++    $self->_print_comment( $self->_diag_fh, @_ );
++}
++
++=item B<note>
++
++    $Test->note(@msgs);
++
++Like 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,18 +1272,47 @@
+     # 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>
+@@ -1225,7 +1326,12 @@
+ =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,39 +1339,18 @@
+ 
+     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);
+@@ -1296,7 +1381,7 @@
+ =cut
+ 
+ sub output {
+-    my($self, $fh) = @_;
++    my( $self, $fh ) = @_;
+ 
+     if( defined $fh ) {
+         $self->{Out_FH} = $self->_new_fh($fh);
+@@ -1305,7 +1390,7 @@
+ }
+ 
+ sub failure_output {
+-    my($self, $fh) = @_;
++    my( $self, $fh ) = @_;
+ 
+     if( defined $fh ) {
+         $self->{Fail_FH} = $self->_new_fh($fh);
+@@ -1314,7 +1399,7 @@
+ }
+ 
+ sub todo_output {
+-    my($self, $fh) = @_;
++    my( $self, $fh ) = @_;
+ 
+     if( defined $fh ) {
+         $self->{Todo_FH} = $self->_new_fh($fh);
+@@ -1322,7 +1407,6 @@
+     return $self->{Todo_FH};
+ }
+ 
+-
+ sub _new_fh {
+     my $self = shift;
+     my($file_or_fh) = shift;
+@@ -1332,23 +1416,24 @@
+         $fh = $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,27 +1442,68 @@
+ 
+     # 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);
+-
+-    $self->output(\*TESTOUT);
+-    $self->failure_output(\*TESTERR);
+-    $self->todo_output(\*TESTOUT);
+-}
++    _autoflush($Testout);
++    _autoflush( \*STDOUT );
++    _autoflush($Testerr);
++    _autoflush( \*STDERR );
+ 
++    $self->reset_outputs;
++
++    return;
++}
+ 
+ my $Opened_Testhandles = 0;
++
+ sub _open_testhandles {
++    my $self = shift;
++
+     return if $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:  $!";
++    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 );
++
+     $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
+ 
+@@ -1399,18 +1525,18 @@
+     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 {
+@@ -1420,6 +1546,8 @@
+         local $Level = $Level + 2;
+         $self->croak("You tried to run a test without a plan");
+     }
++
++    return;
+ }
+ 
+ =back
+@@ -1444,13 +1572,12 @@
+ =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->croak("Can't change the current test number without a plan!")
++          unless $self->{Have_Plan};
+ 
+         $self->{Curr_Test} = $num;
+ 
+@@ -1458,14 +1585,16 @@
+         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 +1605,6 @@
+     return $self->{Curr_Test};
+ }
+ 
+-
+ =item B<summary>
+ 
+     my @tests = $Test->summary;
+@@ -1527,7 +1655,7 @@
+ Sometimes the Test::Builder test counter is incremented without it
+ printing any test output, for example, when 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.
++its type is 'unknown'.  These details for these tests are filled in.
+ They are considered ok, but the name and actual_ok is left undef.
+ 
+ For example "not ok 23 - hole count # TODO insufficient donuts" would
+@@ -1553,14 +1681,18 @@
+     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 $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.
++
++todo() is about finding the right package to look for $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
+@@ -1569,14 +1701,134 @@
+ =cut
+ 
+ sub todo {
+-    my($self, $pack) = @_;
++    my( $self, $pack ) = @_;
+ 
+-    $pack = $pack || $self->exported_to || $self->caller($Level);
+-    return 0 unless $pack;
++    return $self->{Todo} if defined $self->{Todo};
++
++    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>
+@@ -1587,13 +1839,22 @@
+ 
+ Like the normal caller(), except it reports according to your level().
+ 
++C<$height> will be added to the level().
++
++If 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,11 +1880,13 @@
+ 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->{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!' );
++
++    return;
+ }
+ 
+ =item B<_whoa>
+@@ -1637,14 +1900,16 @@
+ =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>
+@@ -1659,52 +1924,43 @@
+ =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;
+ 
++    my $real_exit_code = $?;
+     $self->_sanity_check();
+ 
+     # 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;
++    }
++
++    # 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;
+@@ -1714,31 +1970,24 @@
+         # 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 +1998,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 +2017,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 {
+@@ -1836,8 +2087,8 @@
+ 
+ =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 
+ modify it under the same terms as Perl itself.
+@@ -1847,3 +2098,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-02-17 17:16:40.000000000 +0100
+@@ -1,39 +1,40 @@
+ package Test::More;
++# $Id$
+ 
+-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.86';
++$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
++  can_ok isa_ok new_ok
++  diag note explain
++  BAIL_OUT
++);
+ 
+ =head1 NAME
+ 
+@@ -159,10 +160,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 +170,7 @@
+     my $list  = shift;
+ 
+     my @other = ();
+-    my $idx = 0;
++    my $idx   = 0;
+     while( $idx <= $#{$list} ) {
+         my $item = $list->[$idx];
+ 
+@@ -185,8 +185,9 @@
+     }
+ 
+     @$list = @other;
+-}
+ 
++    return;
++}
+ 
+ =head2 Test names
+ 
+@@ -257,10 +258,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>
+@@ -326,18 +327,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 +371,9 @@
+ sub like ($$;$) {
+     my $tb = Test::More->builder;
+ 
+-    $tb->like(@_);
++    return $tb->like(@_);
+ }
+ 
+-
+ =item B<unlike>
+ 
+   unlike( $got, qr/expected/, $test_name );
+@@ -387,10 +386,9 @@
+ sub unlike ($$;$) {
+     my $tb = Test::More->builder;
+ 
+-    $tb->unlike(@_);
++    return $tb->unlike(@_);
+ }
+ 
+-
+ =item B<cmp_ok>
+ 
+   cmp_ok( $got, $op, $expected, $test_name );
+@@ -427,10 +425,9 @@
+ 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 +458,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,16 +476,15 @@
+ 
+     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;
+ }
+@@ -523,7 +519,7 @@
+ =cut
+ 
+ sub isa_ok ($$;$) {
+-    my($object, $class, $obj_name) = @_;
++    my( $object, $class, $obj_name ) = @_;
+     my $tb = Test::More->builder;
+ 
+     my $diag;
+@@ -537,15 +533,16 @@
+     }
+     else {
+         # 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) ) {
++                if( !UNIVERSAL::isa( $object, $class ) ) {
+                     my $ref = ref $object;
+                     $diag = "$obj_name isn't a '$class' it's a '$ref'";
+                 }
+-            } else {
++            }
++            else {
+                 die <<WHOA;
+ WHOA! I tried to call ->isa on your object and got some weird error.
+ Here's the error.
+@@ -558,11 +555,9 @@
+             $diag = "$obj_name isn't a '$class' it's a '$ref'";
+         }
+     }
+-            
+-      
+ 
+     my $ok;
+-    if( $diag ) {
++    if($diag) {
+         $ok = $tb->ok( 0, $name );
+         $tb->diag("    $diag\n");
+     }
+@@ -573,6 +568,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 +631,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 +693,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 +734,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 +771,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 +792,6 @@
+     return $ok;
+ }
+ 
+-
+ sub _is_module_name {
+     my $module = shift;
+ 
+@@ -740,7 +799,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
+@@ -778,50 +838,50 @@
+ 
+ =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 +891,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 +909,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 +931,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 +963,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 +984,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<dump>.
++
++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 +1090,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 +1103,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 +1178,7 @@
+ =cut
+ 
+ sub todo_skip {
+-    my($why, $how_many) = @_;
++    my( $why, $how_many ) = @_;
+     my $tb = Test::More->builder;
+ 
+     unless( defined $how_many ) {
+@@ -1091,11 +1188,11 @@
+         $how_many = 1;
+     }
+ 
+-    for( 1..$how_many ) {
++    for( 1 .. $how_many ) {
+         $tb->todo_skip($why);
+     }
+ 
+-    local $^W = 0;
++    no warnings 'exiting';
+     last TODO;
+ }
+ 
+@@ -1135,7 +1232,7 @@
+ 
+ sub BAIL_OUT {
+     my $reason = shift;
+-    my $tb = Test::More->builder;
++    my $tb     = Test::More->builder;
+ 
+     $tb->BAIL_OUT($reason);
+ }
+@@ -1174,14 +1271,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 +1287,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 +1302,7 @@
+ }
+ 
+ sub _deep_check {
+-    my($e1, $e2) = @_;
++    my( $e1, $e2 ) = @_;
+     my $tb = Test::More->builder;
+ 
+     my $ok = 0;
+@@ -1217,27 +1314,27 @@
+ 
+     {
+         # 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( _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 +1347,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 +1399,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 +1415,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;
+@@ -1360,14 +1455,13 @@
+ 
+ =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 +1473,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 +1532,7 @@
+ 
+ =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 Overloaded objects
+@@ -1506,21 +1600,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.
+@@ -1541,7 +1635,7 @@
+ 
+ =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-02-17 17:16:40.000000000 +0100
+@@ -1,8 +1,165 @@
++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 +172,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-02-17 17:16:40.000000000 +0100
+@@ -1,3 +1,4 @@
++# $Id$
+ This is the README file for Test::Simple, basic utilities for 
+ writing tests, by Michael G Schwern <schwern@pobox.com>.
+ 
+diff -urN perl-5.10.0.orig/lib/Test/Simple/TODO perl-5.10.0/lib/Test/Simple/TODO
+--- perl-5.10.0.orig/lib/Test/Simple/TODO	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/TODO	2009-02-17 17:16:40.000000000 +0100
+@@ -1,3 +1,4 @@
++# $Id$
+ See https://rt.cpan.org/NoAuth/Bugs.html?Dist=Test-Simple plus here's
+ a few more I haven't put in RT yet.
+ 
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/00test_harness_check.t perl-5.10.0/lib/Test/Simple/t/00test_harness_check.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/00test_harness_check.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/00test_harness_check.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ # A test to make sure the new Test::Harness was installed properly.
+ 
+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-02-17 17:16:40.000000000 +0100
+@@ -0,0 +1,25 @@
++#!/usr/bin/perl -w
++# $Id$
++
++BEGIN {
++    if( $ENV{PERL_CORE} ) {
++        chdir 't';
++        @INC = ('../lib', 'lib');
++    }
++    else {
++        unshift @INC, 't/lib';
++    }
++}
++
++use Test::More;
++
++my $result;
++BEGIN {
++    eval {
++        require_ok("Wibble");
++    };
++    $result = $@;
++}
++
++plan tests => 1;
++like $result, '/^You tried to run a test without a plan/';
+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-02-17 17:16:40.000000000 +0100
+@@ -0,0 +1,29 @@
++#!/usr/bin/perl -w
++# $Id$
++
++# [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 {
++    eval {
++        use_ok("Wibble");
++    };
++    $result = $@;
++}
++
++plan tests => 1;
++like $result, '/^You tried to run a test without a plan/';
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/Builder.t perl-5.10.0/lib/Test/Simple/t/Builder.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/Builder.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/Builder.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+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-02-17 17:16:40.000000000 +0100
+@@ -1,9 +1,10 @@
+ #!perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+         chdir 't';
+-        @INC = qw(../lib lib);
++        @INC = qw(../lib lib ../lib/Test/Simple/t/lib);
+     }
+ }
+ 
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/buffer.t perl-5.10.0/lib/Test/Simple/t/buffer.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/buffer.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/buffer.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+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-02-17 17:16:40.000000000 +0100
+@@ -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/carp.t perl-5.10.0/lib/Test/Simple/t/carp.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/carp.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/carp.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/circular_data.t perl-5.10.0/lib/Test/Simple/t/circular_data.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/circular_data.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/circular_data.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ # Test is_deeply and friends with circular data structures [rt.cpan.org 7289]
+ 
+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-02-17 17:17:28.000000000 +0100
+@@ -1,9 +1,10 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ 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 +30,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 +50,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 +61,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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ #!perl -w
+ 
+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	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ # Dave Rolsky found a bug where if current_test() is used and no
+ # tests are run via Test::Builder it will blow up.
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -24,49 +25,66 @@
+ 
+ use strict;
+ 
+-use Test::More tests => 5;
++use Test::More tests => 7;
+ 
+-my $Test = Test::More->builder;
++my $test = Test::Builder->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;
+-{
+-    local $TODO = 1;
+-    $Test->todo_output(\*FAKEOUT);
+-
+-    diag("a single line");
+ 
+-    $ret = diag("multiple\n", "lines");
+-}
++# Test diag() goes to todo_output() in a todo test.
++{
++    $test->todo_start();
++    $test->todo_output(\*FAKEOUT);
+ 
+-is( $output->read, <<'DIAG',   'diag() with todo_output set' );
++    $test->diag("a single line");
++    is( $output->read, <<'DIAG',   'diag() with todo_output set' );
+ # a single line
++DIAG
++
++    my $ret = $test->diag("multiple\n", "lines");
++    is( $output->read, <<'DIAG',   '  multi line' );
+ # multiple
+ # lines
+ DIAG
++    ok( !$ret, 'diag returns false' );
++
++    $test->todo_end();
++}
++
++$test->reset_outputs();
+ 
+-ok( !$ret, 'diag returns false' );
+ 
++# Test diagnostic formatting
++$test->failure_output(\*FAKEOUT);
+ {
+-    $Test->failure_output(\*FAKEOUT);
+-    $ret = diag("# foo");
++    $test->diag("# foo");
++    is( $output->read, "# # foo\n", "diag() adds # even if there's one already" );
++
++    $test->diag("foo\n\nbar");
++    is( $output->read, <<'DIAG', "  blank lines get escaped" );
++# foo
++# 
++# bar
++DIAG
++
++
++    $test->diag("foo\n\nbar\n\n");
++    is( $output->read, <<'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]
+ {
+-    $Test->failure_output(\*FAKEOUT);
+-    diag(qw(one two));
++    $test->diag(qw(one two));
+ }
+-$Test->failure_output(\*STDERR);
+ is( $output->read, <<'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-02-17 17:16:40.000000000 +0100
+@@ -0,0 +1,46 @@
++#!perl -w
++# $Id$
++
++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/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-02-17 17:16:40.000000000 +0100
+@@ -0,0 +1,20 @@
++#!/usr/bin/perl -w
++# $Id$
++
++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/eq_set.t perl-5.10.0/lib/Test/Simple/t/eq_set.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/eq_set.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/eq_set.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ # Can't use Test.pm, that's a 5.005 thing.
+ package My::Test;
+@@ -25,18 +26,9 @@
+     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;
+@@ -59,10 +51,11 @@
+              'pre_plan_death.plx'       => ['not zero',    'not zero'],
+              'death_in_eval.plx'        => [0,      0],
+              'require.plx'              => [0,      0],
+-	     'exit.plx'                 => [1,      4],
++             'death_with_handler.plx'   => [255,    4],
++             'exit.plx'                 => [1,      4],
+             );
+ 
+-print "1..".keys(%Tests)."\n";
++$TB->plan( tests => scalar keys(%Tests) );
+ 
+ eval { require POSIX; &POSIX::WEXITSTATUS(0) };
+ if( $@ ) {
+@@ -72,13 +65,13 @@
+     *exitstatus = sub { POSIX::WEXITSTATUS($_[0]) }
+ }
+ 
++my $Perl = File::Spec->rel2abs($^X);
++
+ 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;
+-
+     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;
+@@ -93,12 +86,12 @@
+     my $actual_exit = exitstatus($wait_stat);
+ 
+     if( $exit_code eq 'not zero' ) {
+-        My::Test::ok( $actual_exit != 0,
++        $TB->isnt_num( $actual_exit, 0,
+                       "$test_name exited with $actual_exit ".
+                       "(expected $exit_code)");
+     }
+     else {
+-        My::Test::ok( $actual_exit == $exit_code, 
++        $TB->is_num( $actual_exit, $exit_code, 
+                       "$test_name exited with $actual_exit ".
+                       "(expected $exit_code)");
+     }
+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-02-17 17:16:40.000000000 +0100
+@@ -0,0 +1,28 @@
++#!/usr/bin/perl -w
++# $Id$
++
++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.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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -51,7 +52,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/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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -44,7 +45,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/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-02-17 17:16:40.000000000 +0100
+@@ -1,11 +1,5 @@
+-# 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
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -30,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 => 2);
++$TB->plan(tests => 4);
+ 
+ 
+ require Test::Simple::Catch;
+@@ -43,11 +37,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 +50,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 60
++    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 60.
++#     '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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -24,7 +25,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 => 23);
+ 
+ sub like ($$;$) {
+     $TB->like(@_);
+@@ -41,11 +42,18 @@
+     return $TB->is_eq( $got, $expect );
+ }
+ 
++sub main::err_like ($) {
++    my($expect) = @_;
++    my $got = $err->read;
++
++    return $TB->like( $got, qr/$expect/ );
++}
++
+ 
+ package main;
+ 
+ require Test::More;
+-my $Total = 30;
++my $Total = 36;
+ Test::More->import(tests => $Total);
+ 
+ # This should all work in the presence of a __DIE__ handler.
+@@ -96,19 +104,16 @@
+ err_ok( <<ERR );
+ #   Failed test 'foo isnt foo?'
+ #   at $0 line 45.
+-#     'foo'
+-#         ne
+-#     'foo'
++#          got: 'foo'
++#     expected: anything else
+ #   Failed test 'foo isn\'t foo?'
+ #   at $0 line 46.
+-#     'foo'
+-#         ne
+-#     'foo'
++#          got: 'foo'
++#     expected: anything else
+ #   Failed test 'undef isnt undef?'
+ #   at $0 line 47.
+-#     undef
+-#         ne
+-#     undef
++#          got: undef
++#     expected: anything else
+ ERR
+ 
+ #line 48
+@@ -183,6 +188,60 @@
+ #     The object isn't a 'HASH' it's a 'ARRAY'
+ ERR
+ 
++
++#line 188
++new_ok(undef);
++err_like( <<ERR );
++#   Failed test 'new\\(\\) died'
++#   at $Filename line 188.
++#     Error was:  Can't call method "new" on an undefined value at .*
++ERR
++
++#line 211
++new_ok( "Does::Not::Exist" );
++err_like( <<ERR );
++#   Failed test 'new\\(\\) died'
++#   at $Filename line 211.
++#     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 219
++new_ok( "Foo" );
++err_ok( <<ERR );
++#   Failed test 'The object isa Foo'
++#   at $0 line 219.
++#     The object isn't defined
++ERR
++
++# line 231
++new_ok( "Bar" );
++err_ok( <<ERR );
++#   Failed test 'The object isa Bar'
++#   at $0 line 231.
++#     The object isn't a 'Bar' it's a 'HASH'
++ERR
++
++#line 239
++new_ok( "Baz" );
++err_ok( <<ERR );
++#   Failed test 'The object isa Baz'
++#   at $0 line 239.
++#     The object isn't a 'Baz' it's a 'Wibble'
++ERR
++
++#line 247
++new_ok( "Baz", [], "no args" );
++err_ok( <<ERR );
++#   Failed test 'no args isa Baz'
++#   at $0 line 247.
++#     no args isn't a 'Baz' it's a 'Wibble'
++ERR
++
++
+ #line 68
+ cmp_ok( 'foo', 'eq', 'bar', 'cmp_ok eq' );
+ cmp_ok( 42.1,  '==', 23,  , '       ==' );
+@@ -199,9 +258,8 @@
+ #     expected: 23
+ #   Failed test '       !='
+ #   at $0 line 70.
+-#     '42'
+-#         !=
+-#     '42'
++#          got: 42
++#     expected: anything else
+ #   Failed test '       &&'
+ #   at $0 line 71.
+ #     '1'
+@@ -233,7 +291,7 @@
+ #     expected: foo
+ ERR
+     My::Test::like $warnings,
+-     qq[/^Argument "foo" isn't numeric in .* at $Filename line 211\\\.\n\$/];
++     qr/^Argument "foo" isn't numeric in .* at cmp_ok \[from $Filename line 211\] line 1\.\n$/;
+ 
+ }
+ 
+@@ -305,6 +363,12 @@
+ not ok - My Wibble isa Wibble
+ not ok - Another Wibble isa Wibble
+ not ok - The object isa HASH
++not ok - new() died
++not ok - new() died
++not ok - The object isa Foo
++not ok - The object isa Bar
++not ok - The object isa Baz
++not ok - no args isa Baz
+ not ok - cmp_ok eq
+ not ok -        ==
+ not ok -        !=
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+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-02-17 17:16:40.000000000 +0100
+@@ -1,21 +1,19 @@
+ #!perl -w
++# $Id$
+ 
+ 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.t perl-5.10.0/lib/Test/Simple/t/fork.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/fork.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/fork.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/harness_active.t perl-5.10.0/lib/Test/Simple/t/harness_active.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/harness_active.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/harness_active.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/has_plan.t perl-5.10.0/lib/Test/Simple/t/has_plan.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/has_plan.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/has_plan.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/has_plan2.t perl-5.10.0/lib/Test/Simple/t/has_plan2.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/has_plan2.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/has_plan2.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/import.t perl-5.10.0/lib/Test/Simple/t/import.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/import.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/import.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,3 +1,4 @@
++# $Id$
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+         chdir 't';
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ # test for rt.cpan.org 20768
+ #
+@@ -16,16 +17,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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -317,7 +318,8 @@
+ ERR
+ 
+ 
+-    if( eval { require overload } ) {
++    # Overloaded object tests
++    {
+ 	my $foo = bless [], "Foo";
+ 	my $bar = bless {}, "Bar";
+ 
+@@ -337,9 +339,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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ # Test to see if is_deeply() plays well with threads.
+ 
+@@ -19,7 +20,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 +33,7 @@
+ 
+ my $Num_Threads = 5;
+ 
+-plan tests => $Num_Threads * 100 + 5;
++plan tests => $Num_Threads * 100 + 6;
+ 
+ 
+ sub do_one_thread {
+@@ -56,3 +62,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/is_fh.t perl-5.10.0/lib/Test/Simple/t/is_fh.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/is_fh.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/is_fh.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+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-02-17 17:16:40.000000000 +0100
+@@ -0,0 +1,7 @@
++package Dev::Null;
++# $Id$
++
++sub TIEHANDLE { bless {} }
++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-02-17 17:16:40.000000000 +0100
+@@ -1,5 +1,6 @@
+ package Dummy;
++# $Id$
+ 
+ $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-02-17 17:16:40.000000000 +0100
+@@ -1,11 +1,11 @@
+ package Overloaded;
++# $Id$
+ 
+ sub new {
+     my $class = shift;
+     bless { string => shift, num => shift }, $class;
+ }
+ 
+-
+ package Overloaded::Compare;
+ use vars qw(@ISA);
+ @ISA = qw(Overloaded);
+@@ -13,17 +13,15 @@
+ # 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 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-02-17 17:16:40.000000000 +0100
+@@ -0,0 +1,6 @@
++package SigDie;
++
++use vars qw($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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -11,22 +12,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-02-17 17:16:40.000000000 +0100
+@@ -1,3 +1,4 @@
++# $Id$
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+         chdir 't';
+@@ -33,19 +34,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/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-02-17 17:16:40.000000000 +0100
+@@ -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_diag.t perl-5.10.0/lib/Test/Simple/t/no_diag.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/no_diag.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/no_diag.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ use Test::More 'no_diag', tests => 2;
+ 
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/no_ending.t perl-5.10.0/lib/Test/Simple/t/no_ending.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/no_ending.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/no_ending.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,3 +1,4 @@
++# $Id$
+ use Test::Builder;
+ 
+ BEGIN {
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/no_header.t perl-5.10.0/lib/Test/Simple/t/no_header.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/no_header.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/no_header.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,3 +1,4 @@
++# $Id$
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+         chdir 't';
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -10,19 +11,29 @@
+     }
+ }
+ 
+-use Test::More tests => 6;
++use Test::More tests => 9;
+ 
+ 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
++#line 28
+ ok !eval { $tb->ok(1) };
+-is( $@, "You tried to run a test without a plan at $0 line 27.\n");
++is( $@, "You tried to run a test without a plan at $0 line 28.\n");
++
++{
++    my $warning = '';
++    local $SIG{__WARN__} = sub { $warning .= join '', @_ };
++
++#line 36
++    ok $tb->plan(no_plan => 1);
++    is( $warning, "no_plan takes no arguments at $0 line 36.\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-02-17 17:16:40.000000000 +0100
+@@ -0,0 +1,45 @@
++#!perl -w
++# $Id$
++
++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-02-17 17:16:40.000000000 +0100
+@@ -0,0 +1,36 @@
++#!/usr/bin/perl -w
++# $Id$
++
++BEGIN {
++    if( $ENV{PERL_CORE} ) {
++        chdir 't';
++        @INC = ('../lib', 'lib');
++    }
++    else {
++        unshift @INC, 't/lib';
++    }
++}
++
++use strict;
++use warnings;
++
++use TieOut;
++
++use Test::More tests => 2;
++
++{
++    my $test = Test::More->builder;
++
++    my $output          = tie *FAKEOUT, "TieOut";
++    my $fail_output     = tie *FAKEERR, "TieOut";
++    $test->output        (*FAKEOUT);
++    $test->failure_output(*FAKEERR);
++
++    note("foo");
++
++    $test->reset_outputs;
++
++    is $output->read,      "# foo\n";
++    is $fail_output->read, '';
++}
++
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/ok_obj.t perl-5.10.0/lib/Test/Simple/t/ok_obj.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/ok_obj.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/ok_obj.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ # Testing to make sure Test::Builder doesn't accidentally store objects
+ # passed in as test arguments.
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -11,27 +12,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 => 15;
+ 
+ 
+ package Overloaded;
+ 
+ use overload
+-        q{""}    => sub { $_[0]->{string} },
+-        q{0+}    => sub { $_[0]->{num} };
++  q{eq}    => sub { $_[0]->{string} },
++  q{==}    => sub { $_[0]->{num} },
++  q{""}    => sub { $_[0]->{stringfy}++; $_[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;
+ }
+ 
+ 
+@@ -48,7 +48,9 @@
+ 
+ is $obj, 'foo',            'is() with string overloading';
+ cmp_ok $obj, 'eq', 'foo',  'cmp_ok() ...';
++is $obj->{stringify}, 0, 'cmp_ok() eq does not stringify';
+ cmp_ok $obj, '==', 42,     'cmp_ok() with number overloading';
++is $obj->{numify}, 0,    'cmp_ok() == does not numify';
+ 
+ is_deeply [$obj], ['foo'],                 'is_deeply with string overloading';
+ ok eq_array([$obj], ['foo']),              'eq_array ...';
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -17,16 +18,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.t perl-5.10.0/lib/Test/Simple/t/plan.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/plan.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/plan.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -8,7 +9,7 @@
+ }
+ 
+ 
+-use Test::More tests => 10;
++use Test::More tests => 12;
+ use Test::Builder;
+ my $tb = Test::Builder->create;
+ $tb->level(0);
+@@ -21,6 +22,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-02-17 17:16:40.000000000 +0100
+@@ -1,3 +1,4 @@
++# $Id$
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+         chdir 't';
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/plan_no_plan.t perl-5.10.0/lib/Test/Simple/t/plan_no_plan.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/plan_no_plan.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/plan_no_plan.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,3 +1,4 @@
++# $Id$
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+         chdir 't';
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/plan_shouldnt_import.t perl-5.10.0/lib/Test/Simple/t/plan_shouldnt_import.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/plan_shouldnt_import.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/plan_shouldnt_import.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ # plan() used to export functions by mistake [rt.cpan.org 8385]
+ 
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/plan_skip_all.t perl-5.10.0/lib/Test/Simple/t/plan_skip_all.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/plan_skip_all.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/plan_skip_all.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,3 +1,4 @@
++# $Id$
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+         chdir 't';
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/require_ok.t perl-5.10.0/lib/Test/Simple/t/require_ok.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/require_ok.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/require_ok.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ # Test Test::Builder->reset;
+ 
+@@ -16,6 +17,11 @@
+ 
+ use Test::Builder;
+ my $tb = Test::Builder->new;
++
++my %Original_Output;
++$Original_Output{$_} = $tb->$_ for qw(output failure_output todo_output);
++
++
+ $tb->plan(tests => 14);
+ $tb->level(0);
+ 
+@@ -66,11 +72,11 @@
+ 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,    
++ok( fileno $tb->output         == fileno $Original_Output{output},    
+                                         'output' );
+-ok( fileno $tb->failure_output == fileno *Test::Builder::TESTERR,    
++ok( fileno $tb->failure_output == fileno $Original_Output{failure_output},    
+                                         'failure_output' );
+-ok( fileno $tb->todo_output    == fileno *Test::Builder::TESTOUT,
++ok( fileno $tb->todo_output    == fileno $Original_Output{todo_output},
+                                         'todo_output' );
+ ok( $tb->current_test   == 0,           'current_test' );
+ ok( $tb->summary        == 0,           'summary' );
+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-02-17 17:16:40.000000000 +0100
+@@ -0,0 +1,36 @@
++#!perl -w
++# $Id$
++
++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/simple.t perl-5.10.0/lib/Test/Simple/t/simple.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/simple.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/simple.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,3 +1,4 @@
++# $Id$
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+         chdir 't';
+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-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+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-02-17 17:16:40.000000000 +0100
+@@ -1,3 +1,4 @@
++# $Id$
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+         chdir 't';
+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-02-17 17:16:40.000000000 +0100
+@@ -0,0 +1,25 @@
++#!/usr/bin/perl -w
++# $Id$
++
++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/tbt_01basic.t perl-5.10.0/lib/Test/Simple/t/tbt_01basic.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/tbt_01basic.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/tbt_01basic.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl
++# $Id$
+ 
+ use Test::Builder::Tester tests => 9;
+ use Test::More;
+@@ -22,7 +23,7 @@
+ test_test("multiple tests");
+ 
+ test_out("not ok 1 - should fail");
+-test_err("#     Failed test ($0 at line 28)");
++test_err("#     Failed test ($0 at line 29)");
+ test_err("#          got: 'foo'");
+ test_err("#     expected: 'bar'");
+ is("foo","bar","should fail");
+@@ -46,7 +47,7 @@
+ 
+ 
+ test_out("not ok 1 - name # TODO Something");
+-test_err("#     Failed (TODO) test ($0 at line 52)");
++test_err("#     Failed (TODO) test ($0 at line 53)");
+ TODO: { 
+     local $TODO = "Something";
+     fail("name");
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/tbt_02fhrestore.t perl-5.10.0/lib/Test/Simple/t/tbt_02fhrestore.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/tbt_02fhrestore.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/tbt_02fhrestore.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl
++# $Id$
+ 
+ use Test::Builder::Tester tests => 4;
+ use Test::More;
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/tbt_03die.t perl-5.10.0/lib/Test/Simple/t/tbt_03die.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/tbt_03die.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/tbt_03die.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl
++# $Id$
+ 
+ use Test::Builder::Tester tests => 1;
+ use Test::More;
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/tbt_04line_num.t perl-5.10.0/lib/Test/Simple/t/tbt_04line_num.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/tbt_04line_num.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/tbt_04line_num.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,8 +1,9 @@
+ #!/usr/bin/perl
++# $Id$
+ 
+ use Test::More tests => 3;
+ use Test::Builder::Tester;
+ 
+-is(line_num(),6,"normal line num");
+-is(line_num(-1),6,"line number minus one");
+-is(line_num(+2),10,"line number plus two");
++is(line_num(),7,"normal line num");
++is(line_num(-1),7,"line number minus one");
++is(line_num(+2),11,"line number plus two");
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/tbt_05faildiag.t perl-5.10.0/lib/Test/Simple/t/tbt_05faildiag.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/tbt_05faildiag.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/tbt_05faildiag.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl
++# $Id$
+ 
+ use Test::Builder::Tester tests => 5;
+ use Test::More;
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/tbt_06errormess.t perl-5.10.0/lib/Test/Simple/t/tbt_06errormess.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/tbt_06errormess.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/tbt_06errormess.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ use Test::More tests => 8;
+ use Symbol;
+diff -urN perl-5.10.0.orig/lib/Test/Simple/t/tbt_07args.t perl-5.10.0/lib/Test/Simple/t/tbt_07args.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/tbt_07args.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/tbt_07args.t	2009-02-17 17:16:40.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ use Test::More tests => 18;
+ use Symbol;
+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-02-17 17:16:40.000000000 +0100
+@@ -1,5 +1,6 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ 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/threads.t perl-5.10.0/lib/Test/Simple/t/threads.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/threads.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/threads.t	2009-02-17 17:16:41.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+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-02-17 17:16:41.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -9,7 +10,7 @@
+ 
+ use Test::More;
+ 
+-plan tests => 18;
++plan tests => 36;
+ 
+ 
+ $Why = 'Just testing the todo interface.';
+@@ -69,11 +70,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-02-17 17:16:41.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -17,19 +18,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;
++# 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 { 2 }), 2;
+-is $tb->_try(sub { return '' }), '';
++    is $tb->_try(sub { die; }), undef;
+ 
+-is $tb->_try(sub { die; }), undef;
++    is_deeply [$tb->_try(sub { die "Foo\n" })], [undef, "Foo\n"];
+ 
+-is_deeply [$tb->_try(sub { die "Foo\n" }, undef)],
+-          [undef, "Foo\n"];
++    is $@, 42;
++    cmp_ok $!, '==', 23;
++}
+ 
+-is $@, 42;
+-cmp_ok $!, '==', 23;
+\ No newline at end of file
++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-02-17 17:16:41.000000000 +0100
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+@@ -11,7 +12,7 @@
+ }
+ 
+ use strict;
+-use Test::More tests => 18;
++use Test::More tests => 20;
+ use TieOut;
+ 
+ BEGIN { $^W = 1; }
+@@ -31,7 +32,7 @@
+ }
+ 
+ sub warnings_like {
+-    $TB->like($warnings, "/$_[0]/");
++    $TB->like($warnings, $_[0]);
+     $warnings = '';
+ }
+ 
+@@ -48,9 +49,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");
++warnings_like(qr/Use of uninitialized value.* at $Filename line 45\.\n/);
+ 
+ eq_array( [undef, undef], [undef, 23] );
+ no_warnings;
+@@ -70,7 +74,7 @@
+ 
+ #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/);
+ 
+ 
+ 
+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-02-17 17:16:41.000000000 +0100
+@@ -1,16 +1,17 @@
+ #!/usr/bin/perl -w
++# $Id$
+ 
+ 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 +59,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/useing.t perl-5.10.0/lib/Test/Simple/t/useing.t
+--- perl-5.10.0.orig/lib/Test/Simple/t/useing.t	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Simple/t/useing.t	2009-02-17 17:16:41.000000000 +0100
+@@ -1,3 +1,4 @@
++# $Id$
+ BEGIN {
+     if( $ENV{PERL_CORE} ) {
+         chdir 't';
+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-02-17 17:16:41.000000000 +0100
+@@ -0,0 +1,70 @@
++#!/usr/bin/perl -w
++# $Id$
++
++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.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-02-17 17:16:41.000000000 +0100
+@@ -1,19 +1,19 @@
+ package Test::Simple;
++# $Id$
+ 
+ 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.86';
++$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 +77,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 +190,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 +203,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/lib/Test/Tutorial.pod perl-5.10.0/lib/Test/Tutorial.pod
+--- perl-5.10.0.orig/lib/Test/Tutorial.pod	2007-12-18 11:47:07.000000000 +0100
++++ perl-5.10.0/lib/Test/Tutorial.pod	2009-02-17 17:16:41.000000000 +0100
+@@ -1,3 +1,4 @@
++# $Id$
+ =head1 NAME
+ 
+ Test::Tutorial - A tutorial about writing really basic tests
+diff -urN perl-5.10.0.orig/t/lib/NoExporter.pm perl-5.10.0/t/lib/NoExporter.pm
+--- perl-5.10.0.orig/t/lib/NoExporter.pm	2007-12-18 11:47:08.000000000 +0100
++++ perl-5.10.0/t/lib/NoExporter.pm	2009-02-17 17:16:41.000000000 +0100
+@@ -1,7 +1,9 @@
+ package NoExporter;
++# $Id$
+ 
+ $VERSION = 1.02;
+-sub import { 
++
++sub import {
+     shift;
+     die "NoExporter exports nothing.  You asked for: @_" if @_;
+ }
+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-02-17 17:16:41.000000000 +0100
+@@ -1,9 +1,10 @@
+ # For testing Test::Simple;
++# $Id$
+ package Test::Simple::Catch;
+ 
+ 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 +14,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-02-17 17:16:41.000000000 +0100
+@@ -1,13 +1,16 @@
+ require Test::Simple;
++# $Id$
+ 
+ push @INC, 't/lib';
+ 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?";
++die "This is a test";
+diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_in_eval.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx
+--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_in_eval.plx	2007-12-18 11:47:08.000000000 +0100
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx	2009-02-17 17:16:41.000000000 +0100
+@@ -1,4 +1,5 @@
+ require Test::Simple;
++# $Id$
+ use Carp;
+ 
+ push @INC, 't/lib';
+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-02-17 17:16:41.000000000 +0100
+@@ -0,0 +1,19 @@
++require Test::Simple;
++# $Id$
++
++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);
++die "This is a test";
+diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/exit.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx
+--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/exit.plx	2007-12-18 11:47:08.000000000 +0100
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx	2009-02-17 17:16:41.000000000 +0100
+@@ -1,3 +1,4 @@
+ require Test::Builder;
++# $Id$
+ 
+ exit 1;
+diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/extras.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx
+--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/extras.plx	2007-12-18 11:47:08.000000000 +0100
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx	2009-02-17 17:16:41.000000000 +0100
+@@ -1,4 +1,5 @@
+ require Test::Simple;
++# $Id$
+ 
+ push @INC, 't/lib';
+ require Test::Simple::Catch;
+diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/five_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx
+--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/five_fail.plx	2007-12-18 11:47:08.000000000 +0100
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx	2009-02-17 17:16:41.000000000 +0100
+@@ -1,4 +1,5 @@
+ require Test::Simple;
++# $Id$
+ 
+ use lib 't/lib';
+ require Test::Simple::Catch;
+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-02-17 17:16:41.000000000 +0100
+@@ -1,11 +1,14 @@
+ require Test::Simple;
++# $Id$
+ 
+ push @INC, 't/lib';
+ require Test::Simple::Catch;
+ 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 +16,4 @@
+ ok(1);
+ ok(1);
+ 
+-die "Almost there...";
++die "This is a test";
+diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/one_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx
+--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/one_fail.plx	2007-12-18 11:47:08.000000000 +0100
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx	2009-02-17 17:16:41.000000000 +0100
+@@ -1,4 +1,5 @@
+ require Test::Simple;
++# $Id$
+ 
+ push @INC, 't/lib';
+ require Test::Simple::Catch;
+diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/pre_plan_death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
+--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/pre_plan_death.plx	2007-12-18 11:47:08.000000000 +0100
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx	2009-02-17 17:16:41.000000000 +0100
+@@ -1,4 +1,5 @@
+ # ID 20020716.013, the exit code would become 0 if the test died
++# $Id$
+ # before a plan.
+ 
+ require Test::Simple;
+diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/require.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx
+--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/require.plx	2007-12-18 11:47:08.000000000 +0100
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx	2009-02-17 17:16:41.000000000 +0100
+@@ -1 +1,2 @@
+ require Test::Simple;
++# $Id$
+diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/success.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx
+--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/success.plx	2007-12-18 11:47:08.000000000 +0100
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx	2009-02-17 17:16:41.000000000 +0100
+@@ -1,4 +1,5 @@
+ require Test::Simple;
++# $Id$
+ 
+ push @INC, 't/lib';
+ require Test::Simple::Catch;
+diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx
+--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few.plx	2007-12-18 11:47:08.000000000 +0100
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx	2009-02-17 17:16:41.000000000 +0100
+@@ -1,4 +1,5 @@
+ require Test::Simple;
++# $Id$
+ 
+ push @INC, 't/lib';
+ require Test::Simple::Catch;
+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-02-17 17:16:41.000000000 +0100
+@@ -1,4 +1,5 @@
+ require Test::Simple;
++# $Id$
+ 
+ push @INC, 't/lib';
+ require Test::Simple::Catch;
+@@ -9,4 +10,4 @@
+ 
+ ok(0);
+ ok(1);
+-ok(0);
+\ No newline at end of file
++ok(0);
+diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/two_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx
+--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/two_fail.plx	2007-12-18 11:47:08.000000000 +0100
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx	2009-02-17 17:16:41.000000000 +0100
+@@ -1,4 +1,5 @@
+ require Test::Simple;
++# $Id$
+ 
+ push @INC, 't/lib';
+ require Test::Simple::Catch;
+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-02-17 17:16:41.000000000 +0100
+@@ -1,13 +1,14 @@
+ package TieOut;
++# $Id$
+ 
+ sub TIEHANDLE {
+     my $scalar = '';
+-    bless( \$scalar, $_[0]);
++    bless( \$scalar, $_[0] );
+ }
+ 
+ sub PRINT {
+     my $self = shift;
+-    $$self .= join('', @_);
++    $$self .= join( '', @_ );
+ }
+ 
+ sub PRINTF {
+@@ -16,7 +17,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
new file mode 100644
index 0000000..a2fe610
--- /dev/null
+++ b/perl-update-Time-HiRes.patch
@@ -0,0 +1,686 @@
+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-constant.patch b/perl-update-constant.patch
new file mode 100644
index 0000000..c258faf
--- /dev/null
+++ b/perl-update-constant.patch
@@ -0,0 +1,115 @@
+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 f44873c..1c4e799 100644
--- a/perl.spec
+++ b/perl.spec
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        59%{?dist}
+Release:        60%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -16,20 +16,15 @@ Group:          Development/Languages
 License:        (GPL+ or Artistic) and (GPLv2+ or Artistic)
 Url:            http://www.perl.org/
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/perl-%{perl_version}.tar.gz
-Source1:        Tar-Archive.tar.gz
-# tgz which help testing module IPC::Cmd
-Source2:		x.tgz
 Source11:       filter-requires.sh
 Source12:       perl-5.8.0-libnet.cfg
+
 # Specific to Fedora/RHEL
 Patch1:         perl-5.8.0-root.patch
 
 # Removes date check, Fedora/RHEL specific
 Patch2:         perl-5.10.0-perlbug-tag.patch
 
-# Fedora/RHEL use links instead of lynx
-Patch3:         perl-5.10.0-links.patch
-
 # work around annoying rpath issue
 # This is only relevant for Fedora, as it is unlikely
 # that upstream will assume the existence of a libperl.so
@@ -42,15 +37,14 @@ Patch5:         perl-5.8.0-libdir64.patch
 Patch6:         perl-5.10.0-libresolv.patch
 
 # FIXME: May need the "Fedora" references removed before upstreaming
+# patches ExtUtils-MakeMaker
 Patch7:         perl-5.10.0-USE_MM_LD_RUN_PATH.patch
 
 # Skip hostname tests, since hostname lookup isn't available in Fedora
 # buildroots by design.
+# patches Net::Config from libnet
 Patch8:         perl-5.10.0-disable_test_hosts.patch
 
-# Bump Sys::Syslog to 0.24 to fix test failure case
-Patch9:         perl-5.10.0-SysSyslog-0.24.patch
-
 # The Fedora builders started randomly failing this futime test
 # only on x86_64, so we just don't run it. Works fine on normal
 # systems.
@@ -59,53 +53,22 @@ Patch10:        perl-5.10.0-x86_64-io-test-failure.patch
 # http://public.activestate.com/cgi-bin/perlbrowse/p/32891
 Patch11:        32891.patch
 
-# Update Module::Load::Conditional to 0.24 for clean upgrade
-Patch12:	perl-5.10.0-Module-Load-Conditional-0.24.patch
-
-# Upgrade Module::CoreList to 2.14
-Patch13:	perl-5.10.0-Module-CoreList2.14.patch
-
-# Upgrade CGI to 3.38
-Patch14:	perl-5.10.0-CGI-3.38.patch
-
 # Problem with assertion - add upstream patch
 Patch15:	perl-5.10.0-bz448392.patch
 
 # Wrong access test
 Patch16:	perl-5.10.0-accessXOK.patch
 
-# CVE-2008-2827 perl: insecure use of chmod in rmtree
-Patch17:	perl-5.10.0-CVE-2008-2827.patch
-
-# Upgrade Test::Harness
-# first remove old files
-Patch18:	perl-5.10.0-removeTestHarness.patch
-# now include new files perl-5.10.0-TestHarness3.12.patch
-Patch19:	perl-5.10.0-TestHarness3.12.patch
-# pos function handle unicode ok
+# fix function pos to handle unicode correctly
 Patch20:	perl-5.10.0-pos.patch
 
-# 457085  CGI.pm bug in exists() on tied param hash
-Patch21:        perl-5.10.0-CGI.patch
-
-# 462444	update Test::Simple to 0.80
-Patch22:        perl-5.10.0-TestSimple0.80.patch
-
-# Archive::Tar update to 1.38 version
-Patch23:    perl-5.10.0-ArchiveTar1.38.patch
-
 # Storable segfaults when objects are reblessed rt#33242
+# patches module Storable
 Patch24:    perl-5.10.0-Storable.patch
 
-# Pod::Simple 3.07
-Patch25:    perl-5.10.0-PodSimple.patch
-
 # Fix crash when localizing a symtab entry rt#52740
 Patch26:    perl-5.10.0-stlocal.patch
 
-# File::Temp 0.20
-Patch27:    perl-5.10.0-File-Temp-0.20.patch
-
 # Change 33640: More diagnostics for Fatal.pm, version bumps for all non-dual life modules affected
 # http://www.nntp.perl.org/group/perl.perl5.changes/2008/04/msg21478.html
 Patch28:    perl-5.10.0-Change33640.patch
@@ -124,11 +87,52 @@ Patch30:    perl-5.10.0-Change33896.patch
 # http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21733.html
 Patch31:    perl-5.10.0-Change33897.patch
 
-Patch32:	perl-5.10.0-ArchiveTar1.40.patch
 Patch33:	perl-5.10.0-PerlIO-via-change34025.patch
-Patch34:	perl-5.10.0-IPC_Cmd-0.42.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
+# Update some of the bundled modules
+# see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
+Patch100:	perl-update-constant.patch
+%define			    constant_version 1.17
+Patch101:	perl-update-Archive-Extract.patch
+%define			    Archive_Extract_version 0.30
+Patch102:	perl-update-Archive-Tar.patch
+%define			    Archive_Tar_version 1.46
+Patch103:	perl-update-CGI.patch
+%define			    CGI_version 3.42
+Patch104:	perl-update-ExtUtils-CBuilder.patch
+%define			    ExtUtils-CBuilder_version 0.24
+Patch105:	perl-update-File-Fetch.patch
+%define			    File_Fetch_version 0.18
+Patch106:	perl-update-File-Path.patch
+%define			    File_Path_version 2.07
+Patch107:	perl-update-File-Temp.patch
+%define			    File_Temp_version 0.21
+Patch108:	perl-update-IPC-Cmd.patch
+%define			    IPC_Cmd_version 0.42
+Patch109:	perl-update-Module-Build.patch
+%define			    Module_Build_real_version 0.32
+# For Module-Build-0.x, the second component has to have four digits.
+%define			    Module_Build_rpm_version  0.3200
+Patch110:	perl-update-Module-CoreList.patch
+%define			    Module_CoreList_version 2.17
+Patch111:	perl-update-Module-Load-Conditional.patch
+%define			    Module_Load_Conditional_version 0.30
+Patch112:	perl-update-Pod-Simple.patch
+%define			    Pod_Simple_version 3.07
+Patch113:	perl-update-Sys-Syslog.patch
+%define			    Sys_Syslog_version 0.27
+Patch114:	perl-update-Test-Harness.patch
+%define			    Test_Harness_version 3.16
+Patch115:	perl-update-Test-Simple.patch
+%define			    Test_Simple_version 0.86
+Patch116:	perl-update-Time-HiRes.patch
+%define			    Time_HiRes_version 1.9719
+
+# Fedora uses links instead of lynx
+# patches File-Fetch and CPAN
+Patch201:	perl-5.10.0-links.patch
+
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel, zlib-devel
 # For tests
@@ -190,11 +194,11 @@ Provides: perl(validate.pl)
 Provides: perl(Carp::Heavy)
 
 # Long history in 3rd-party repositories:
-Provides: perl-File-Temp = 0.20
+Provides: perl-File-Temp = %{File_Temp_version}
 Obsoletes: perl-File-Temp < 0.20
 
 # Use new testing module perl-Test-Harness, obsolete it outside of this package
-Provides: perl-TAP-Harness = 3.10
+Provides: perl-TAP-Harness = %{Test_Harness_version}
 Obsoletes: perl-TAP-Harness < 3.10
 
 Requires: perl-libs = %{perl_epoch}:%{perl_version}-%{release}
@@ -269,7 +273,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-Version:        0.24
+Version:        %{Archive_Extract_version}
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Archive-Extract
@@ -281,7 +285,7 @@ Summary:        A module for Perl manipulation of .tar files
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        1.40
+Version:        %{Archive_Tar_version}
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 Requires:       perl(Compress::Zlib), perl(IO::Zlib)
 
@@ -376,7 +380,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-Version:        0.21
+Version:        %{ExtUtils_CBuilder_version}
 Requires:       perl-devel
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
@@ -437,7 +441,7 @@ Summary:        Generic file fetching mechanism
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        0.14
+Version:        %{File_Fetch_version}
 Requires:       perl(IPC::Cmd) >= 0.36
 Requires:       perl(Module::Load::Conditional) >= 0.04
 Requires:       perl(Params::Check) >= 0.07
@@ -499,7 +503,7 @@ License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
 # do not upgrade in the future to _something version. They are testing!
-Version:        0.42
+Version:        %{IPC_Cmd_version}
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description IPC-Cmd
@@ -560,8 +564,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-# Really 0.2808_01, but we drop the _01.
-Version:        0.2808
+Version:        %{Module_Build_rpm_version}
 Requires:       perl(Archive::Tar) >= 1.08
 Requires:       perl(ExtUtils::CBuilder) >= 0.15
 Requires:       perl(ExtUtils::ParseXS) >= 1.02
@@ -584,7 +587,7 @@ Summary:        Perl core modules indexed by perl versions
 Group:          Development/Languages
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        2.15
+Version:        %{Module_CoreList_version}
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 Requires:       perl(version)
 
@@ -613,7 +616,7 @@ Summary:        Looking up module information / loading at runtime
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        0.24
+Version:        %{Module_Load_Conditional_version}
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Module-Load-Conditional
@@ -718,7 +721,7 @@ Group:          Development/Libraries
 License:        GPL+ or Artistic
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          1
-Version:        3.07
+Version:        %{Pod_Simple_version}
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
 %description Pod-Simple
@@ -747,7 +750,7 @@ Summary:        Run Perl standard test scripts with statistics
 Group:          Development/Languages
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        3.12
+Version:        %{Test_Harness_version}
 Requires:       perl-devel
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
@@ -760,7 +763,7 @@ Summary:        Basic utilities for writing tests
 Group:          Development/Languages
 License:        GPL+ or Artistic
 Epoch:          0
-Version:        0.80
+Version:        %{Test_Simple_version}
 Requires:       perl-devel
 Requires:       perl = %{perl_epoch}:%{perl_version}-%{release}
 
@@ -828,10 +831,9 @@ upstream tarball from perl.org.
 
 
 %prep
-%setup -q -a 1
+%setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 # This patch breaks sparc64 compilation
 # We should probably consider removing it for all arches.
 %ifnarch sparc64
@@ -843,32 +845,36 @@ upstream tarball from perl.org.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
 %patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
 %patch24 -p1
-%patch25 -p1
 %patch26 -p1
-%patch27 -p1
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
-%patch32 -p1
 %patch33 -p1
-%patch34 -p1
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+%patch108 -p1
+%patch109 -p1
+%patch110 -p1
+%patch111 -p1
+%patch112 -p1
+%patch113 -p1
+%patch114 -p1
+%patch115 -p1
+%patch116 -p1
+%patch201 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -972,11 +978,7 @@ echo "RPM Build arch: %{_arch}"
         -Ud_endprotoent_r_proto -Ud_setprotoent_r_proto \
         -Ud_endservent_r_proto -Ud_setservent_r_proto \
         -Dscriptdir='%{_bindir}' \
-%ifarch x86_64 ppc64 sparc64
-        -Dotherlibdirs=/usr/local/lib/perl5/site_perl:/usr/local/%{_lib}/perl5/site_perl:/usr/lib/perl5/site_perl \
-%else
-        -Dotherlibdirs=/usr/local/lib/perl5/site_perl:/usr/lib/perl5/site_perl
-%endif
+        -Dotherlibdirs=/usr/lib/perl5/site_perl
 
 %ifarch sparc64
 make
@@ -1025,7 +1027,6 @@ done
 #
 # libnet configuration file
 #
-mkdir -p -m 755 %{comp_perl_lib}/Net
 install -p -m 644 %{SOURCE12} %{comp_perl_lib}/Net/libnet.cfg
 
 #
@@ -1070,51 +1071,61 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 
 # Local patch tracking
 cd $RPM_BUILD_ROOT%{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/
-perl -x patchlevel.h 'Fedora Patch1: Permit suidperl to install as nonroot'
-perl -x patchlevel.h 'Fedora Patch2: Removes date check, Fedora/RHEL specific'
-perl -x patchlevel.h 'Fedora Patch3: Fedora/RHEL use links instead of lynx'
-%ifnarch sparc64
-perl -x patchlevel.h 'Fedora Patch4: Work around annoying rpath issue'
-%endif
-%ifarch %{multilib_64_archs}
-perl -x patchlevel.h 'Fedora Patch5: support for libdir64'
-%endif
-perl -x patchlevel.h 'Fedora Patch6: use libresolv instead of libbind'
-perl -x patchlevel.h 'Fedora Patch7: USE_MM_LD_RUN_PATH'
-perl -x patchlevel.h 'Fedora Patch8: Skip hostname tests, due to builders not being network capable'
-perl -x patchlevel.h 'Fedora Patch9: Update Sys::Syslog to 0.24'
-perl -x patchlevel.h 'Fedora Patch10: Dont run one io test due to random builder failures'
-perl -x patchlevel.h '32891 fix big slowdown in 5.10 @_ parameter passing'
-perl -x patchlevel.h 'Fedora Patch12: Update Module::Load::Conditional to 0.24'
-perl -x patchlevel.h 'Fedora Patch13: Upgrade Module::CoreList to 2.14'
-perl -x patchlevel.h 'Fedora Patch14: Upgrade CGI to 3.38'
-perl -x patchlevel.h 'Fedora Patch15: Adopt upstream commit for assertion'
-perl -x patchlevel.h 'Fedora Patch16: Access permission - rt49003'
-perl -x patchlevel.h 'Fedora Patch17: CVE-2008-2827 perl: insecure use of chmod in rmtree'
-perl -x patchlevel.h 'Fedora Patch18: Remove old Test::Harness'
-perl -x patchlevel.h 'Fedora Patch19: Update Test::Harness to 3.12'
-perl -x patchlevel.h 'Fedora Patch20: pos function handle unicode correct'
-perl -x patchlevel.h 'Fedora Patch21: CGI.pm bug in exists() on tied param hash'
-perl -x patchlevel.h 'Fedora Patch22: Update Test::Simple to 0.80'
-perl -x patchlevel.h 'Fedora Patch23: Update Archive::Tar 1.38'
-perl -x patchlevel.h 'Fedora Patch24: Storable fix'
-perl -x patchlevel.h 'Fedora Patch25: Update to Pod::Simple 3.07'
-perl -x patchlevel.h 'Fedora Patch26: Fix crash when localizing a symtab entry - rt52740'
-perl -x patchlevel.h 'Fedora Patch27: Update to File::Temp 0.20'
-perl -x patchlevel.h '33640 Integrate Changes 33399, 33621, 33622, 33623, 33624'
-perl -x patchlevel.h '33881 Integrate Changes 33825, 33826, 33829'
-perl -x patchlevel.h '33896 Eliminate POSIX::int_macro_int, and all the complex AUTOLOAD fandango'
-perl -x patchlevel.h '33897 Replaced the WEXITSTATUS, WIFEXITED, WIFSIGNALED, WIFSTOPPED, WSTOPSIG'
-perl -x patchlevel.h 'Fedora Patch32: CVE-2007-4829 Update Archive::Tar to 1.40'
-perl -x patchlevel.h '54934 Change 34025 refcount of the globs generated by PerlIO::via balanced'
-perl -x patchlevel.h 'Fedora Patch34: Update to IPC::Cmd 0.42'
+perl -x patchlevel.h \
+	'Fedora Patch1: Permit suidperl to install as nonroot' \
+	'Fedora Patch2: Removes date check, Fedora/RHEL specific' \
+%ifnarch sparc64 \
+	'Fedora Patch4: Work around annoying rpath issue' \
+%endif \
+%ifarch %{multilib_64_archs} \
+	'Fedora Patch5: support for libdir64' \
+%endif \
+	'Fedora Patch6: use libresolv instead of libbind' \
+	'Fedora Patch7: USE_MM_LD_RUN_PATH' \
+	'Fedora Patch8: Skip hostname tests, due to builders not being network capable' \
+	'Fedora Patch10: Dont run one io test due to random builder failures' \
+	'32891 fix big slowdown in 5.10 @_ parameter passing' \
+	'Fedora Patch15: Adopt upstream commit for assertion' \
+	'Fedora Patch16: Access permission - rt49003' \
+	'Fedora Patch20: pos function handle unicode correct' \
+	'Fedora Patch24: Storable fix' \
+	'Fedora Patch26: Fix crash when localizing a symtab entry - rt52740' \
+	'33640 Integrate Changes 33399, 33621, 33622, 33623, 33624' \
+	'33881 Integrate Changes 33825, 33826, 33829' \
+	'33896 Eliminate POSIX::int_macro_int, and all the complex AUTOLOAD fandango' \
+	'33897 Replaced the WEXITSTATUS, WIFEXITED, WIFSIGNALED, WIFSTOPPED, WSTOPSIG' \
+	'54934 Change 34025 refcount of the globs generated by PerlIO::via balanced' \
+	'Fedora Patch100: Update constant to %{constant_version}' \
+	'Fedora Patch101: Update Archive::Extract to %{Archive_Extract_version}' \
+	'Fedora Patch102: Update Archive::Tar to %{Archive_Tar_version}' \
+	'Fedora Patch103: Update CGI to %{CGI_version}' \
+	'Fedora Patch104: Update ExtUtils::CBuilder to %{ExtUtils_CBuilder_version}' \
+	'Fedora Patch105: Update File::Fetch to %{File_Fetch_version}' \
+	'Fedora Patch106: Update File::Path to %{File_Path_version}' \
+	'Fedora Patch107: Update File::Temp to %{File_Temp_version}' \
+	'Fedora Patch108: Update IPC::Cmd to %{IPC_Cmd_version}' \
+	'Fedora Patch109: Update Module::Build to %{Module_Build_version}' \
+	'Fedora Patch110: Update Module::CoreList to %{Module_CoreList_version}' \
+	'Fedora Patch111: Update Module::Load::Conditional to %{Module_Load_Conditional_version}' \
+	'Fedora Patch112: Update Pod::Simple to %{Pod_Simple_version}' \
+	'Fedora Patch113: Update Sys::Syslog to %{Sys_Syslog_version}' \
+	'Fedora Patch114: Update Test::Harness to %{Test_Harness_version}' \
+	'Fedora Patch115: Update Test::Simple to %{Test_Simple_version}' \
+	'Fedora Patch116: Update Time::HiRes to %{Time_HiRes_version}' \
+	'Fedora Patch201: Fedora uses links instead of lynx' \
+	%{nil}
+
+rm patchlevel.bak
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %check
 %ifnarch sparc64
-make test
+# work around a bug in Module::Build tests bu setting TMPDIR to a directory
+# inside the source tree
+mkdir "$PWD/tmp"
+TMPDIR="$PWD/tmp" make test
 %endif
 
 %post libs -p /sbin/ldconfig
@@ -1375,8 +1386,12 @@ make test
 
 # Test::Harness
 %exclude %{_bindir}/prove
+%exclude %{_prefix}/lib/perl5/%{perl_version}/App*
+%exclude %{_prefix}/lib/perl5/%{perl_version}/TAP*
 %exclude %{_prefix}/lib/perl5/%{perl_version}/Test/Harness*
 %exclude %{_mandir}/man1/prove.1*
+%exclude %{_mandir}/man3/App*
+%exclude %{_mandir}/man3/TAP*
 %exclude %{_mandir}/man3/Test::Harness*
 
 # Test::Simple
@@ -1681,8 +1696,12 @@ make test
 %files Test-Harness
 %defattr(-,root,root,-)
 %{_bindir}/prove
+%{_prefix}/lib/perl5/%{perl_version}/App*
+%{_prefix}/lib/perl5/%{perl_version}/TAP*
 %{_prefix}/lib/perl5/%{perl_version}/Test/Harness*
 %{_mandir}/man1/prove.1*
+%{_mandir}/man3/App*
+%{_mandir}/man3/TAP*
 %{_mandir}/man3/Test::Harness*
 
 %files Test-Simple
@@ -1715,6 +1734,20 @@ make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Mar 11 2009 Stepan Kasal <skasal@redhat.com> - 4:5.10.0-60
+- remove compatibility obsolete sitelib directories
+- use a better BuildRoot
+- drop a redundant mkdir in %%install
+- call patchlevel.h only once; rm patchlevel.bak
+- update modules Sys::Syslog, Module::Load::Conditional, Module::CoreList,
+  Test::Harness, Test::Simple, CGI.pm (dropping the upstreamed patch),
+  File::Path (that includes our perl-5.10.0-CVE-2008-2827.patch),
+  constant, Pod::Simple, Archive::Tar, Archive::Extract, File::Fetch,
+  File::Temp, IPC::Cmd, Time::HiRes, Module::Build, ExtUtils::CBuilder
+- standardize the patches for updating embedded modules
+- work around a bug in Module::Build tests bu setting TMPDIR to a directory
+  inside the source tree
+
 * Sun Mar 08 2009 Robert Scheck <robert@fedoraproject.org> - 4:5.10.0-59
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index d392520..72d3f8a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
 d2c39b002ebfd2c3c5dba589365c5a71  perl-5.10.0.tar.gz
-20fc625176668dd02a8b07ef0acd451d  Tar-Archive.tar.gz
-62965ff8dacdd3855fcb801ebe336332  x.tgz