Wed Jul 7 15:04:32 UTC 2010

Author: ppisar

Update of /cvs/pkgs/rpms/perl/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11836

Modified Files:
	perl-update-Archive-Tar.patch perl.spec 
Removed Files:
	perl-5.10.0-links.patch perl-update-Archive-Extract.patch 
	perl-update-CGI.patch perl-update-Compress-Raw-Zlib.patch 
	perl-update-Digest-SHA.patch perl-update-File-Fetch.patch 
	perl-update-File-Temp.patch perl-update-FileSpec.patch 
	perl-update-IO-Compress-Base.patch 
	perl-update-IO-Compress-Zlib.patch perl-update-IPC-Cmd.patch 
	perl-update-Module-CoreList.patch 
	perl-update-Module-Load-Conditional.patch 
	perl-update-Module-Pluggable.patch 
	perl-update-Pod-Simple.patch 
	perl-update-Scalar-List-Utils.patch perl-update-Storable.patch 
	perl-update-Sys-Syslog.patch perl-update-Test-Harness.patch 
	perl-update-Test-Simple.patch perl-update-Time-HiRes.patch 
	perl-update-autodie.patch perl-update-constant.patch 
Log Message:
Upgrade Archive::Tar to 1.62

perl-update-Archive-Tar.patch:
 MANIFEST                     |    1 
 lib/Archive/Tar.pm           |   53 +++++++++++++++++++++++++++++++------------
 lib/Archive/Tar/Constant.pm  |    2 -
 lib/Archive/Tar/File.pm      |    4 +--
 lib/Archive/Tar/t/06_error.t |   39 +++++++++++++++++++++++++++++++
 5 files changed, 82 insertions(+), 17 deletions(-)

View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 perl-update-Archive-Tar.patchIndex: perl-update-Archive-Tar.patch
===================================================================
RCS file: /cvs/pkgs/rpms/perl/F-13/perl-update-Archive-Tar.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2

--- perl-update-Archive-Tar.patch	11 Mar 2009 21:12:37 -0000	1.1
+++ perl-update-Archive-Tar.patch	7 Jul 2010 15:04:27 -0000	1.2
@@ -1,1261 +1,41 @@
-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 @@
- 
+Archive-Tar 1.62
+diff -Naur perl-5.10.1.orig/lib/Archive/Tar/Constant.pm perl-5.10.1/lib/Archive/Tar/Constant.pm
+--- perl-5.10.1.orig/lib/Archive/Tar/Constant.pm	2009-02-14 21:27:34.000000000 +0100
++++ perl-5.10.1/lib/Archive/Tar/Constant.pm	2010-07-07 13:37:29.750209009 +0200
+@@ -3,7 +3,7 @@
  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];
+     
+-    $VERSION    = '0.02';
++    $VERSION    = '1.62';
+     @ISA        = qw[Exporter];
  
      require Time::Local if $^O eq "MacOS";
- }
- 
-+use Package::Constants;
-+ at 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;
+diff -Naur perl-5.10.1.orig/lib/Archive/Tar/File.pm perl-5.10.1/lib/Archive/Tar/File.pm
+--- perl-5.10.1.orig/lib/Archive/Tar/File.pm	2009-04-15 21:07:10.000000000 +0200
++++ perl-5.10.1/lib/Archive/Tar/File.pm	2010-07-07 13:37:29.751208201 +0200
+@@ -13,7 +13,7 @@
  
  use vars qw[@ISA $VERSION];
-- at ISA        = qw[Archive::Tar];
-+#@ISA        = qw[Archive::Tar];
- $VERSION    = '0.02';
+ #@ISA        = qw[Archive::Tar];
+-$VERSION    = '0.02';
++$VERSION    = '1.62';
  
  ### 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 @@
[...3017 lines suppressed...]
-+
-+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?
+ =head1 FAQ
  
--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 at 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
+ =over 4
+diff -Naur perl-5.10.1.orig/MANIFEST perl-5.10.1/MANIFEST
+--- perl-5.10.1.orig/MANIFEST	2009-08-04 00:16:32.000000000 +0200
++++ perl-5.10.1/MANIFEST	2010-07-07 13:41:08.713206977 +0200
+@@ -1759,6 +1759,7 @@
+ 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/06_error.t	Archive::Tar tests
+ lib/Archive/Tar/t/90_symlink.t	Archive::Tar tests
+ lib/Archive/Tar/t/99_pod.t	Archive::Tar tests
+ lib/Archive/Tar/t/src/header/signed.tar.packed	Archive::Tar tests


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/F-13/perl.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -p -r1.255 -r1.256
--- perl.spec	15 Jun 2010 14:50:42 -0000	1.255
+++ perl.spec	7 Jul 2010 15:04:32 -0000	1.256
@@ -7,7 +7,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        112%{?dist}
+Release:        113%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@@ -56,120 +56,80 @@ Patch7:         perl-5.10.0-disable_test
 # 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.
-Patch8:        perl-5.10.0-x86_64-io-test-failure.patch
+Patch8:         perl-5.10.0-x86_64-io-test-failure.patch
 
 # Reorder @INC: Based on: http://github.com/rafl/perl/commit/b9ba2fadb18b54e35e5de54f945111a56cbcb249
-Patch9:	perl-5.10.0-reorderINC.patch
+Patch9:         perl-5.10.0-reorderINC.patch
 
 # http://rt.perl.org/rt3/Ticket/Display.html?id=39060 (#221113)
-Patch10:	perl-perlio-incorrect-errno.patch
+Patch10:        perl-perlio-incorrect-errno.patch
 
 # much better swap logic to support reentrancy and fix assert failure
 # http://perl5.git.perl.org/perl.git/commitdiff/e9105d30edfbaa7f444bc7984c9bafc8e991ad12
 # RT #60508
-Patch11:	perl-much-better-swap-logic.patch
+Patch11:        perl-much-better-swap-logic.patch
 
 # temporarily export debug symbols even though DEBUGGING is not set:
-Patch12:	perl-add-symbols.patch
+Patch12:        perl-add-symbols.patch
 
 # CVE_2009_3626 rhbz#547656 
-Patch13:	perl-5.10.1-CVE_2009_3626.patch
+Patch13:        perl-5.10.1-CVE_2009_3626.patch
 
-# version macros for some of the modules:
+# Version macros for some of the modules.
+# If comment starts with module name, distributed module is part of
+# perl bundle. Otherwise it belongs to module version macro
+# definition beneath:
+# could be 0.36
 %define			    Archive_Extract_version 0.34
-%define			    Archive_Tar_version 1.52
+# CGI could be 3.48
+%define			    Compress_Raw_Zlib_version 2.023
+# constant could be 1.19
+%define			    Digest_SHA_version 5.47
+# ExtUtils-ParseXS could be 2.21
+# could be 0.22
 %define			    File_Fetch_version 0.20
+# File-Spec (PathTools in CPAN) could be 3.31
 %define			    File_Temp_version 0.22
+# could be 2.023
+%define			    IO_Compress_Base_version 2.020
+# could be 2.023
+%define			    IO_Compress_Zlib_version 2.020
+# could be 0.54
 %define			    IPC_Cmd_version 0.46
+# could be 2.23
 %define			    Module_CoreList_version 2.18
+# could be 0.34
 %define			    Module_Load_Conditional_version 0.30
+# has to be 3.x0, not 3.x
+%define			    Module_Pluggable_version 3.90
+# could be 3.10
 %define			    Pod_Simple_version 3.07
+# Scalar-List-Utils could be 1.22
 %define			    Test_Harness_version 3.17
+# could be 0.94
 %define			    Test_Simple_version 0.92
-%define			    Digest_SHA_version 5.47
-# has to be 3.x0, not 3.x
-%define			    Module_Pluggable_version 3.90
 
 # Update some of the bundled modules
 # see http://fedoraproject.org/wiki/Perl/perl.spec for instructions
 
-Patch201:	perl-update-ExtUtils-CBuilder.patch
+Patch101:	perl-update-ExtUtils-CBuilder.patch
 %define			    ExtUtils_CBuilder_version 0.27
-Patch202:	perl-update-File-Path.patch
+Patch102:	perl-update-File-Path.patch
 %define			    File_Path_version 2.08
-Patch203:	perl-update-Module-Build.patch
+Patch103:	perl-update-Module-Build.patch
 %define			    Module_Build_real_version 0.35
 # For Module-Build-0.x, the second component has to have four digits.
 %define			    Module_Build_rpm_version  0.3500
-Patch204:       perl-update-Parse-CPAN-Meta.patch
-%define                     Parse_CPAN_Meta_version 1.40
+Patch104:	perl-update-Parse-CPAN-Meta.patch
+%define			    Parse_CPAN_Meta_version 1.40
+Patch105:	perl-update-Archive-Tar.patch
+%define				Archive_Tar_version 1.62
 
 #---
-# FIXME; is 2.18->2.21, should be 2.20->2.21
+# Storable FIXME; is 2.18->2.21, should be 2.20->2.21
 # - was 2.21 previously; but it is not a subpackage, can wait
-Patch99:	perl-update-Storable.patch
-%define             Storable_version 2.20
 
 # This patches are now unused:
-#could be 1.19
-Patch100:	perl-update-constant.patch
-%define			    constant_version 1.17
-# could be 0.36
-Patch101:	perl-update-Archive-Extract.patch
-# could be 1.54
-Patch102:	perl-update-Archive-Tar.patch
-# could be 3.43->3.48
-Patch103:	perl-update-CGI.patch
-# could be 0.22
-Patch105:	perl-update-File-Fetch.patch
-Patch107:	perl-update-File-Temp.patch
-# could be 0.54
-Patch108:	perl-update-IPC-Cmd.patch
-# could be 2.23
-Patch110:	perl-update-Module-CoreList.patch
-# could be 0.34
-Patch111:	perl-update-Module-Load-Conditional.patch
-# could be 3.10
-Patch112:	perl-update-Pod-Simple.patch
-Patch113:	perl-update-Sys-Syslog.patch
-%define			    Sys_Syslog_version 0.27
-Patch114:	perl-update-Test-Harness.patch
-# could be 0.94
-Patch115:	perl-update-Test-Simple.patch
-Patch116:	perl-update-Time-HiRes.patch
-%define			    Time_HiRes_version 1.9719
-Patch117:	perl-update-Digest-SHA.patch
-# includes Fatal.pm
-Patch118:	perl-update-autodie.patch
-%define			    autodie_version 1.999
-# cpan has it under PathTools-3.30
-# could be 3.31
-Patch119:	perl-update-FileSpec.patch
-%define			    File_Spec_version 3.30
-# FIXME should be 2.023, to preserve upgrade path
-# -- for now, we just cheat with the version number
-Patch120:	perl-update-Compress-Raw-Zlib.patch
-%define			    Compress_Raw_Zlib_version 2.023
-# could be 1.22
-Patch121:	perl-update-Scalar-List-Utils.patch
-%define			    Scalar_List_Utils 1.21
-Patch122:	perl-update-Module-Pluggable.patch
-
-# could be 2.023
-Patch124:	perl-update-IO-Compress-Base.patch
-%define			    IO_Compress_Base_version 2.020
-# could be 2.023
-Patch125:	perl-update-IO-Compress-Zlib.patch
-%define			    IO_Compress_Zlib_version 2.020
-#... also update version number of Compress::Zlib
-
-# FIXME: Compress-Raw-Zlib also contains Compress-Raw-Bzip2
-# and IO-Compress-Zlib contains IO-Compress-Bzip2
-# and some of these packages have been merged to IO-Compress on cpan,
-# we should merge as well
-
-# and also ExtUtils-ParseXS 2.2002 -> 2.21
-
 
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -938,10 +898,11 @@ upstream tarball from perl.org.
 %patch12 -p1
 %patch13 -p1
 
-%patch201 -p1
-%patch202 -p1
-%patch203 -p1
-%patch204 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1169,10 +1130,11 @@ pushd %{build_archlib}/CORE/
 	'Fedora Patch11: much better swap logic to support reentrancy and fix assert failure' \
 	'Fedora Patch12: backward compatibility for the trasition' \
         'Fedora Patch13: CVE_2009_3626' \
-	'Fedora Patch201: Update ExtUtils::CBuilder to %{ExtUtils_CBuilder_version}' \
-	'Fedora Patch202: Update File::Path to %{File_Path_version}' \
-	'Fedora Patch203: Update Module::Build to %{Module_Build_version}' \
-	'Fedora Patch204: Update Parse::CPAN::Meta::version to %{Parse_CPAN_Meta_version}'
+	'Fedora Patch101: Update ExtUtils::CBuilder to %{ExtUtils_CBuilder_version}' \
+	'Fedora Patch102: Update File::Path to %{File_Path_version}' \
+	'Fedora Patch103: Update Module::Build to %{Module_Build_version}' \
+	'Fedora Patch104: Update Parse::CPAN::Meta::version to %{Parse_CPAN_Meta_version}'
+	'Fedora Patch105: Update Archive::Tar to %{Archive_Tar_version}'
 	%{nil}
 
 rm patchlevel.bak
@@ -1830,6 +1792,11 @@ make test
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Wed Jul  7 2010 Petr Pisar <ppisar at redhat.com> - 4:5.10.1-113
+- fix incorrect return code on failed extraction by upgrading Archive::Tar
+  to 1.62 (bug #607687)
+- remove unused patches and renumber used ones
+
 * Fri Mar  5 2010 Marcela Mašláňová <mmaslano at redhat.com> - 4:5.10.1-112
 - fix license according to advice from legal
 - clean unused patches


--- perl-5.10.0-links.patch DELETED ---


--- perl-update-Archive-Extract.patch DELETED ---


--- perl-update-CGI.patch DELETED ---


--- perl-update-Compress-Raw-Zlib.patch DELETED ---


--- perl-update-Digest-SHA.patch DELETED ---


--- perl-update-File-Fetch.patch DELETED ---


--- perl-update-File-Temp.patch DELETED ---


--- perl-update-FileSpec.patch DELETED ---


--- perl-update-IO-Compress-Base.patch DELETED ---


--- perl-update-IO-Compress-Zlib.patch DELETED ---


--- perl-update-IPC-Cmd.patch DELETED ---


--- perl-update-Module-CoreList.patch DELETED ---


--- perl-update-Module-Load-Conditional.patch DELETED ---


--- perl-update-Module-Pluggable.patch DELETED ---


--- perl-update-Pod-Simple.patch DELETED ---


--- perl-update-Scalar-List-Utils.patch DELETED ---


--- perl-update-Storable.patch DELETED ---


--- perl-update-Sys-Syslog.patch DELETED ---


--- perl-update-Test-Harness.patch DELETED ---


--- perl-update-Test-Simple.patch DELETED ---


--- perl-update-Time-HiRes.patch DELETED ---


--- perl-update-autodie.patch DELETED ---


--- perl-update-constant.patch DELETED ---

