diff options
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/tlperl/lib/Archive')
3 files changed, 14 insertions, 12 deletions
diff --git a/systems/texlive/tlnet/tlpkg/tlperl/lib/Archive/Tar.pm b/systems/texlive/tlnet/tlpkg/tlperl/lib/Archive/Tar.pm index af6786ee51..91311619d7 100644 --- a/systems/texlive/tlnet/tlpkg/tlperl/lib/Archive/Tar.pm +++ b/systems/texlive/tlnet/tlpkg/tlperl/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 = "2.36"; +$VERSION = "2.38"; $CHOWN = 1; $CHMOD = 1; $SAME_PERMISSIONS = $> == 0 ? 1 : 0; @@ -48,7 +48,7 @@ BEGIN { ### switch between perlio and IO::String $HAS_IO_STRING = eval { require IO::String; - import IO::String; + IO::String->import; 1; } || 0; } @@ -918,7 +918,7 @@ sub _extract_file { } if( $CHOWN && CAN_CHOWN->() and not -l $full ) { - chown $entry->uid, $entry->gid, $full or + CORE::chown( $entry->uid, $entry->gid, $full ) or $self->_error( qq[Could not set uid/gid on '$full'] ); } @@ -929,7 +929,7 @@ sub _extract_file { unless ($SAME_PERMISSIONS) { $mode &= ~(oct(7000) | umask); } - chmod $mode, $full or + CORE::chmod( $mode, $full ) or $self->_error( qq[Could not chown '$full' to ] . $entry->mode ); } @@ -2284,7 +2284,7 @@ write a C<.tar.Z> file use Archive::Tar; use IO::File; - my $fh = new IO::File "| compress -c >$filename"; + my $fh = IO::File->new( "| compress -c >$filename" ); my $tar = Archive::Tar->new(); ... $tar->write($fh); diff --git a/systems/texlive/tlnet/tlpkg/tlperl/lib/Archive/Tar/Constant.pm b/systems/texlive/tlnet/tlpkg/tlperl/lib/Archive/Tar/Constant.pm index 398c4799a5..825f2b1656 100644 --- a/systems/texlive/tlnet/tlpkg/tlperl/lib/Archive/Tar/Constant.pm +++ b/systems/texlive/tlnet/tlpkg/tlperl/lib/Archive/Tar/Constant.pm @@ -1,9 +1,14 @@ package Archive::Tar::Constant; +use strict; +use warnings; + +use vars qw[$VERSION @ISA @EXPORT]; + BEGIN { require Exporter; - $VERSION = '2.36'; + $VERSION = '2.38'; @ISA = qw[Exporter]; require Time::Local if $^O eq "MacOS"; @@ -11,9 +16,6 @@ BEGIN { @EXPORT = Archive::Tar::Constant->_list_consts( __PACKAGE__ ); -use strict; -use warnings; - use constant FILE => 0; use constant HARDLINK => 1; use constant SYMLINK => 2; diff --git a/systems/texlive/tlnet/tlpkg/tlperl/lib/Archive/Tar/File.pm b/systems/texlive/tlnet/tlpkg/tlperl/lib/Archive/Tar/File.pm index 0887a923bd..be380a5eb1 100644 --- a/systems/texlive/tlnet/tlpkg/tlperl/lib/Archive/Tar/File.pm +++ b/systems/texlive/tlnet/tlpkg/tlperl/lib/Archive/Tar/File.pm @@ -7,13 +7,11 @@ 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]; -$VERSION = '2.36'; +$VERSION = '2.38'; ### set value to 1 to oct() it during the unpack ### @@ -469,6 +467,8 @@ sub extract { local $Carp::CarpLevel += 1; + ### avoid circular use, so only require; + require Archive::Tar; return Archive::Tar->_extract_file( $self, @_ ); } |