diff options
author | Ricardo Signes <rjbs@cpan.org> | 2012-03-13 21:01:00 -0400 |
---|---|---|
committer | Ricardo Signes <rjbs@cpan.org> | 2012-03-13 21:14:31 -0400 |
commit | 30faa5652ea0cfe6248ed70f321dcfdf9cea7bcd (patch) | |
tree | e88e20db9e33a43886723d6cf89250bb0819eaf9 /cpan/Archive-Tar | |
parent | cba8842c354197460eeef36ed34e9e904fc9836b (diff) | |
download | perl-30faa5652ea0cfe6248ed70f321dcfdf9cea7bcd.tar.gz |
Revert changes to compression librariesrjbs/revert-compress
Revert "Ran zlib2ansi script against zlib-src/ to fix K&R-isms"
This reverts commit a7026383bc5a2ca5f518f670ee6d74d55cd994aa.
Revert "Some files in cpan/Compress-Raw-Zlib have the x bit set."
This reverts commit adace0595a25c5339a4c1fff6b4704945abf8814.
Revert "Fixes type in commit 14c554185"
This reverts commit d588a46d9335dc093e4046b68ae0e2c7925ef095.
Revert "Upgrade Compress::Raw::Zlib to 2.051."
This reverts commit 14c554185b51c8646198cbf62fe6e94e9890b3a5.
Revert "Upgrade Compress-Raw-Bzip2 to version 2.049."
This reverts commit 616f340ab90cf805b145b81fd31c2017a4e7783f.
Revert "Upgrade cpan/Archive-Tar to 1.84"
This reverts commit c06ee8c824f270b42cb440453df0e44858492aed.
Revert "Upgrade Archive-Extract to 0.60"
This reverts commit dc16b9e468c516c95140dc2b6eac778872c79239.
Diffstat (limited to 'cpan/Archive-Tar')
-rw-r--r-- | cpan/Archive-Tar/bin/ptar | 23 | ||||
-rw-r--r-- | cpan/Archive-Tar/lib/Archive/Tar.pm | 8 | ||||
-rw-r--r-- | cpan/Archive-Tar/lib/Archive/Tar/Constant.pm | 2 | ||||
-rw-r--r-- | cpan/Archive-Tar/lib/Archive/Tar/File.pm | 2 |
4 files changed, 6 insertions, 29 deletions
diff --git a/cpan/Archive-Tar/bin/ptar b/cpan/Archive-Tar/bin/ptar index 0eaffa7ccb..14c09128fc 100644 --- a/cpan/Archive-Tar/bin/ptar +++ b/cpan/Archive-Tar/bin/ptar @@ -6,13 +6,8 @@ use Getopt::Std; use Archive::Tar; use Data::Dumper; -# Allow historic support for dashless bundled options -# tar cvf file.tar -# is valid (GNU) tar style -@ARGV && $ARGV[0] =~ m/^[DdcvzthxIC]+[fT]?$/ and - unshift @ARGV, map { "-$_" } split m// => shift @ARGV; my $opts = {}; -getopts('Ddcvzthxf:ICT:', $opts) or die usage(); +getopts('Ddcvzthxf:IC', $opts) or die usage(); ### show the help message ### die usage() if $opts->{h}; @@ -33,21 +28,11 @@ my $verbose = $opts->{v} ? 1 : 0; my $file = $opts->{f} ? $opts->{f} : 'default.tar'; my $tar = Archive::Tar->new(); + if( $opts->{c} ) { my @files; - my @src = @ARGV; - if( $opts->{T} ) { - if( $opts->{T} eq "-" ) { - chomp( @src = <STDIN> ); - } elsif( open my $fh, "<", $opts->{T} ) { - chomp( @src = <$fh> ); - } else { - die "$0: $opts->{T}: $!\n"; - } - } - find( sub { push @files, $File::Find::name; - print $File::Find::name.$/ if $verbose }, @src ); + print $File::Find::name.$/ if $verbose }, @ARGV ); if ($file eq '-') { use IO::Handle; @@ -103,7 +88,6 @@ sub usage { =head1 SYNOPSIS ptar -c [-v] [-z] [-C] [-f ARCHIVE_FILE | -] FILE FILE ... - ptar -c [-v] [-z] [-C] [-T index | -] [-f ARCHIVE_FILE | -] ptar -x [-v] [-z] [-f ARCHIVE_FILE | -] ptar -t [-z] [-f ARCHIVE_FILE | -] ptar -h @@ -118,7 +102,6 @@ sub usage { v Print filenames as they are added or extracted from ARCHIVE_FILE h Prints this help message C CPAN mode - drop 022 from permissions - T get names to create from file =head1 SEE ALSO diff --git a/cpan/Archive-Tar/lib/Archive/Tar.pm b/cpan/Archive-Tar/lib/Archive/Tar.pm index c57f56b91a..4ed3ae0386 100644 --- a/cpan/Archive-Tar/lib/Archive/Tar.pm +++ b/cpan/Archive-Tar/lib/Archive/Tar.pm @@ -31,7 +31,7 @@ use vars qw[$DEBUG $error $VERSION $WARN $FOLLOW_SYMLINK $CHOWN $CHMOD $DEBUG = 0; $WARN = 1; $FOLLOW_SYMLINK = 0; -$VERSION = "1.84"; +$VERSION = "1.82"; $CHOWN = 1; $CHMOD = 1; $SAME_PERMISSIONS = $> == 0 ? 1 : 0; @@ -1451,12 +1451,6 @@ sub add_files { next; } - eval { - if( utf8::is_utf8( $file )) { - utf8::encode( $file ); - } - }; - unless( -e $file || -l $file ) { $self->_error( qq[No such file: '$file'] ); next; diff --git a/cpan/Archive-Tar/lib/Archive/Tar/Constant.pm b/cpan/Archive-Tar/lib/Archive/Tar/Constant.pm index b01e2266bb..1bea5ce12d 100644 --- a/cpan/Archive-Tar/lib/Archive/Tar/Constant.pm +++ b/cpan/Archive-Tar/lib/Archive/Tar/Constant.pm @@ -3,7 +3,7 @@ package Archive::Tar::Constant; BEGIN { require Exporter; - $VERSION = '1.84'; + $VERSION = '1.82'; @ISA = qw[Exporter]; require Time::Local if $^O eq "MacOS"; diff --git a/cpan/Archive-Tar/lib/Archive/Tar/File.pm b/cpan/Archive-Tar/lib/Archive/Tar/File.pm index 8607caa71a..9067de1086 100644 --- a/cpan/Archive-Tar/lib/Archive/Tar/File.pm +++ b/cpan/Archive-Tar/lib/Archive/Tar/File.pm @@ -13,7 +13,7 @@ use Archive::Tar::Constant; use vars qw[@ISA $VERSION]; #@ISA = qw[Archive::Tar]; -$VERSION = '1.84'; +$VERSION = '1.82'; ### set value to 1 to oct() it during the unpack ### |