diff options
author | Karl Berry <karl@freefriends.org> | 2017-04-18 23:10:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-04-18 23:10:57 +0000 |
commit | 40b4b6e177c62a14c166dbba6adf3abc415af4b2 (patch) | |
tree | 2996bf29509c806bd8064fb6cf38092c1b375ff8 /Master/tlpkg/tlperl/lib/IO | |
parent | 8e743c86b6872f30b7a35c72aa944455157d4b3f (diff) |
tlperl 5.24.1 from siep
git-svn-id: svn://tug.org/texlive/trunk@43914 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/tlperl/lib/IO')
28 files changed, 175 insertions, 157 deletions
diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Bzip2.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Bzip2.pm index 096c7530971..61955504c91 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Bzip2.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Bzip2.pm @@ -4,12 +4,12 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.068 qw(:Status); +use IO::Compress::Base::Common 2.069 qw(:Status); -use Compress::Raw::Bzip2 2.068 ; +use Compress::Raw::Bzip2 2.069 ; our ($VERSION); -$VERSION = '2.068'; +$VERSION = '2.069_001'; sub mkCompObject { diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Deflate.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Deflate.pm index a52b623352d..8ea7e69915f 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Deflate.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Deflate.pm @@ -4,13 +4,13 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.068 qw(:Status); -use Compress::Raw::Zlib 2.068 qw( !crc32 !adler32 ) ; +use IO::Compress::Base::Common 2.069 qw(:Status); +use Compress::Raw::Zlib 2.069 qw( !crc32 !adler32 ) ; require Exporter; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, @EXPORT, %DEFLATE_CONSTANTS); -$VERSION = '2.068'; +$VERSION = '2.069_001'; @ISA = qw(Exporter); @EXPORT_OK = @Compress::Raw::Zlib::DEFLATE_CONSTANTS; %EXPORT_TAGS = %Compress::Raw::Zlib::DEFLATE_CONSTANTS; diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Identity.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Identity.pm index b001abef576..7ec9b33f557 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Identity.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/Adapter/Identity.pm @@ -4,10 +4,10 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.068 qw(:Status); +use IO::Compress::Base::Common 2.069 qw(:Status); our ($VERSION); -$VERSION = '2.068'; +$VERSION = '2.069_001'; sub mkCompObject { diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Base.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Base.pm index 20adb0e19da..0b672914b6c 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/Base.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/Base.pm @@ -6,7 +6,7 @@ require 5.006 ; use strict ; use warnings; -use IO::Compress::Base::Common 2.068 ; +use IO::Compress::Base::Common 2.069 ; use IO::File (); ; use Scalar::Util (); @@ -20,7 +20,7 @@ use Symbol(); our (@ISA, $VERSION); @ISA = qw(Exporter IO::File); -$VERSION = '2.068'; +$VERSION = '2.069_001'; #Can't locate object method "SWASHNEW" via package "utf8" (perhaps you forgot to load "utf8"?) at .../ext/Compress-Zlib/Gzip/blib/lib/Compress/Zlib/Common.pm line 16. @@ -1041,7 +1041,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Base/Common.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Base/Common.pm index 86bcaa6ef88..ef0eb7257e1 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/Base/Common.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/Base/Common.pm @@ -11,7 +11,7 @@ use File::GlobMapper; require Exporter; our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE); @ISA = qw(Exporter); -$VERSION = '2.068'; +$VERSION = '2.069_001'; @EXPORT = qw( isaFilehandle isaFilename isaScalar whatIsInput whatIsOutput diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Bzip2.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Bzip2.pm index d6c2d66a79b..2ef5cb588e5 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/Bzip2.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/Bzip2.pm @@ -5,16 +5,16 @@ use warnings; use bytes; require Exporter ; -use IO::Compress::Base 2.068 ; +use IO::Compress::Base 2.069 ; -use IO::Compress::Base::Common 2.068 qw(); -use IO::Compress::Adapter::Bzip2 2.068 ; +use IO::Compress::Base::Common 2.069 qw(); +use IO::Compress::Adapter::Bzip2 2.069 ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error); -$VERSION = '2.068'; +$VERSION = '2.069_001'; $Bzip2Error = ''; @ISA = qw(Exporter IO::Compress::Base); @@ -51,7 +51,7 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.068 qw(:Parse); + use IO::Compress::Base::Common 2.069 qw(:Parse); return ( 'blocksize100k' => [IO::Compress::Base::Common::Parse_unsigned, 1], @@ -798,7 +798,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Deflate.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Deflate.pm index 4b8095343a8..33a262a444b 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/Deflate.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/Deflate.pm @@ -8,16 +8,16 @@ use bytes; require Exporter ; -use IO::Compress::RawDeflate 2.068 (); -use IO::Compress::Adapter::Deflate 2.068 ; +use IO::Compress::RawDeflate 2.069 (); +use IO::Compress::Adapter::Deflate 2.069 ; -use IO::Compress::Zlib::Constants 2.068 ; -use IO::Compress::Base::Common 2.068 qw(); +use IO::Compress::Zlib::Constants 2.069 ; +use IO::Compress::Base::Common 2.069 qw(); our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $DeflateError); -$VERSION = '2.068'; +$VERSION = '2.069_001'; $DeflateError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -932,7 +932,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/FAQ.pod b/Master/tlpkg/tlperl/lib/IO/Compress/FAQ.pod index 671824dc15f..7f51b6c4c15 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/FAQ.pod +++ b/Master/tlpkg/tlperl/lib/IO/Compress/FAQ.pod @@ -201,7 +201,7 @@ L<http://www.faqs.org/rfcs/rfc1952.html> The primary site for gzip is F<http://www.gzip.org>. -=head2 Dealing with Concatenated gzip files +=head2 Dealing with concatenated gzip files If the gunzip program encounters a file containing multiple gzip files concatenated together it will automatically uncompress them all. @@ -227,6 +227,17 @@ include the C<MultiStream> option, as shown below abc def +=head2 Reading bgzip files with IO::Uncompress::Gunzip + +A C<bgzip> file consists of a series of valid gzip-compliant data streams +concatenated together. To read a file created by C<bgzip> with +C<IO::Uncompress::Gunzip> use the C<MultiStream> option as shown in the +previous section. + +See the section titled "The BGZF compression format" in +F<http://samtools.github.io/hts-specs/SAMv1.pdf> for a definition of +C<bgzip>. + =head1 ZLIB =head2 Zlib Resources @@ -665,7 +676,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Gzip.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Gzip.pm index 01ee34ef15c..800421124b3 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/Gzip.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/Gzip.pm @@ -8,12 +8,12 @@ use bytes; require Exporter ; -use IO::Compress::RawDeflate 2.068 () ; -use IO::Compress::Adapter::Deflate 2.068 ; +use IO::Compress::RawDeflate 2.069 () ; +use IO::Compress::Adapter::Deflate 2.069 ; -use IO::Compress::Base::Common 2.068 qw(:Status ); -use IO::Compress::Gzip::Constants 2.068 ; -use IO::Compress::Zlib::Extra 2.068 ; +use IO::Compress::Base::Common 2.069 qw(:Status ); +use IO::Compress::Gzip::Constants 2.069 ; +use IO::Compress::Zlib::Extra 2.069 ; BEGIN { @@ -25,7 +25,7 @@ BEGIN our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $GzipError); -$VERSION = '2.068'; +$VERSION = '2.069_001'; $GzipError = '' ; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -1244,7 +1244,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Gzip/Constants.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Gzip/Constants.pm index 2b73a3c94c6..950bdb0ac44 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/Gzip/Constants.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/Gzip/Constants.pm @@ -9,7 +9,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT, %GZIP_OS_Names); our ($GZIP_FNAME_INVALID_CHAR_RE, $GZIP_FCOMMENT_INVALID_CHAR_RE); -$VERSION = '2.068'; +$VERSION = '2.069_001'; @ISA = qw(Exporter); diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/RawDeflate.pm b/Master/tlpkg/tlperl/lib/IO/Compress/RawDeflate.pm index 2209952cd2b..2a553014deb 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/RawDeflate.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/RawDeflate.pm @@ -6,15 +6,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base 2.068 ; -use IO::Compress::Base::Common 2.068 qw(:Status ); -use IO::Compress::Adapter::Deflate 2.068 ; +use IO::Compress::Base 2.069 ; +use IO::Compress::Base::Common 2.069 qw(:Status ); +use IO::Compress::Adapter::Deflate 2.069 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError); -$VERSION = '2.068'; +$VERSION = '2.069_001'; $RawDeflateError = ''; @ISA = qw(Exporter IO::Compress::Base); @@ -116,8 +116,8 @@ sub getExtraParams return getZlibParams(); } -use IO::Compress::Base::Common 2.068 qw(:Parse); -use Compress::Raw::Zlib 2.068 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); +use IO::Compress::Base::Common 2.069 qw(:Parse); +use Compress::Raw::Zlib 2.069 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); our %PARAMS = ( #'method' => [IO::Compress::Base::Common::Parse_unsigned, Z_DEFLATED], 'level' => [IO::Compress::Base::Common::Parse_signed, Z_DEFAULT_COMPRESSION], @@ -988,7 +988,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Zip.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Zip.pm index f8ec20cda70..98e4f501a3a 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/Zip.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/Zip.pm @@ -4,30 +4,30 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.068 qw(:Status ); -use IO::Compress::RawDeflate 2.068 (); -use IO::Compress::Adapter::Deflate 2.068 ; -use IO::Compress::Adapter::Identity 2.068 ; -use IO::Compress::Zlib::Extra 2.068 ; -use IO::Compress::Zip::Constants 2.068 ; +use IO::Compress::Base::Common 2.069 qw(:Status ); +use IO::Compress::RawDeflate 2.069 (); +use IO::Compress::Adapter::Deflate 2.069 ; +use IO::Compress::Adapter::Identity 2.069 ; +use IO::Compress::Zlib::Extra 2.069 ; +use IO::Compress::Zip::Constants 2.069 ; use File::Spec(); use Config; -use Compress::Raw::Zlib 2.068 (); +use Compress::Raw::Zlib 2.069 (); BEGIN { eval { require IO::Compress::Adapter::Bzip2 ; - import IO::Compress::Adapter::Bzip2 2.068 ; + import IO::Compress::Adapter::Bzip2 2.069 ; require IO::Compress::Bzip2 ; - import IO::Compress::Bzip2 2.068 ; + import IO::Compress::Bzip2 2.069 ; } ; eval { require IO::Compress::Adapter::Lzma ; - import IO::Compress::Adapter::Lzma 2.068 ; + import IO::Compress::Adapter::Lzma 2.069 ; require IO::Compress::Lzma ; - import IO::Compress::Lzma 2.068 ; + import IO::Compress::Lzma 2.069 ; } ; } @@ -36,7 +36,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $ZipError); -$VERSION = '2.068'; +$VERSION = '2.069_001'; $ZipError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -275,6 +275,9 @@ sub mkHeader my $x = ''; $x .= pack "V V", 0, 0 ; # uncompressedLength $x .= pack "V V", 0, 0 ; # compressedLength + + # Zip64 needs to be first in extra field to workaround a Windows Explorer Bug + # See http://www.info-zip.org/phpBB3/viewtopic.php?f=3&t=440 for details $extra .= IO::Compress::Zlib::Extra::mkSubField(ZIP_EXTRA_ID_ZIP64, $x); } @@ -397,13 +400,10 @@ sub mkHeader } $ctl .= $filename ; - $ctl .= $ctlExtra ; - $ctl .= $comment ; *$self->{ZipData}{Offset}->add32(length $hdr) ; - *$self->{ZipData}{CentralHeader} = $ctl; - + *$self->{ZipData}{CentralHeader} = [ $ctl, $ctlExtra, $comment]; return $hdr; } @@ -420,7 +420,7 @@ sub mkTrailer $crc32 = pack "V", *$self->{ZipData}{CRC32}; } - my $ctl = *$self->{ZipData}{CentralHeader} ; + my ($ctl, $ctlExtra, $comment) = @{ *$self->{ZipData}{CentralHeader} }; my $sizes ; if (! *$self->{ZipData}{Zip64}) { @@ -434,7 +434,6 @@ sub mkTrailer my $data = $crc32 . $sizes ; - my $xtrasize = *$self->{UnCompSize}->getPacked_V64() ; # Uncompressed size $xtrasize .= *$self->{CompSize}->getPacked_V64() ; # Compressed size @@ -456,38 +455,44 @@ sub mkTrailer substr($ctl, 16, length $crc32) = $crc32 ; - my $x = ''; + my $zip64Payload = ''; - # uncompressed length - if (*$self->{UnCompSize}->isAlmost64bit() || *$self->{ZipData}{Zip64} > 1) { - $x .= *$self->{UnCompSize}->getPacked_V64() ; + # uncompressed length - only set zip64 if needed + if (*$self->{UnCompSize}->isAlmost64bit()) { # || *$self->{ZipData}{Zip64}) { + $zip64Payload .= *$self->{UnCompSize}->getPacked_V64() ; } else { substr($ctl, 24, 4) = *$self->{UnCompSize}->getPacked_V32() ; } - # compressed length - if (*$self->{CompSize}->isAlmost64bit() || *$self->{ZipData}{Zip64} > 1) { - $x .= *$self->{CompSize}->getPacked_V64() ; + # compressed length - only set zip64 if needed + if (*$self->{CompSize}->isAlmost64bit()) { # || *$self->{ZipData}{Zip64}) { + $zip64Payload .= *$self->{CompSize}->getPacked_V64() ; } else { substr($ctl, 20, 4) = *$self->{CompSize}->getPacked_V32() ; } # Local Header offset - $x .= *$self->{ZipData}{LocalHdrOffset}->getPacked_V64() + $zip64Payload .= *$self->{ZipData}{LocalHdrOffset}->getPacked_V64() if *$self->{ZipData}{LocalHdrOffset}->is64bit() ; - # disk no - always zero, so don't need it - #$x .= pack "V", 0 ; + # disk no - always zero, so don't need to include it. + #$zip64Payload .= pack "V", 0 ; - if (length $x) { - my $xtra = IO::Compress::Zlib::Extra::mkSubField(ZIP_EXTRA_ID_ZIP64, $x); - $ctl .= $xtra ; + my $zip64Xtra = ''; + + if (length $zip64Payload) { + $zip64Xtra = IO::Compress::Zlib::Extra::mkSubField(ZIP_EXTRA_ID_ZIP64, $zip64Payload); + substr($ctl, *$self->{ZipData}{ExtraOffset}, 2) = - pack 'v', *$self->{ZipData}{ExtraSize} + length $xtra; + pack 'v', *$self->{ZipData}{ExtraSize} + length $zip64Xtra; *$self->{ZipData}{AnyZip64} = 1; } + # Zip64 needs to be first in extra field to workaround a Windows Explorer Bug + # See http://www.info-zip.org/phpBB3/viewtopic.php?f=3&t=440 for details + $ctl .= $zip64Xtra . $ctlExtra . $comment; + *$self->{ZipData}{Offset}->add32(length($hdr)); *$self->{ZipData}{Offset}->add( *$self->{CompSize} ); push @{ *$self->{ZipData}{CentralDir} }, $ctl ; @@ -1953,7 +1958,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Zip/Constants.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Zip/Constants.pm index bc56966a452..d72d0dc69c4 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/Zip/Constants.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/Zip/Constants.pm @@ -7,7 +7,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS); -$VERSION = '2.068'; +$VERSION = '2.069_001'; @ISA = qw(Exporter); diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Constants.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Constants.pm index f85364d5b7f..70f2db1997a 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Constants.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Constants.pm @@ -9,7 +9,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT); -$VERSION = '2.068'; +$VERSION = '2.069_001'; @ISA = qw(Exporter); diff --git a/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Extra.pm b/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Extra.pm index f99b9ed02b9..92ca20521f1 100644 --- a/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Extra.pm +++ b/Master/tlpkg/tlperl/lib/IO/Compress/Zlib/Extra.pm @@ -8,9 +8,9 @@ use bytes; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.068'; +$VERSION = '2.069_001'; -use IO::Compress::Gzip::Constants 2.068 ; +use IO::Compress::Gzip::Constants 2.069 ; sub ExtraFieldError { diff --git a/Master/tlpkg/tlperl/lib/IO/Handle.pm b/Master/tlpkg/tlperl/lib/IO/Handle.pm index aebf74e4c02..ce976b0f443 100644 --- a/Master/tlpkg/tlperl/lib/IO/Handle.pm +++ b/Master/tlpkg/tlperl/lib/IO/Handle.pm @@ -122,8 +122,8 @@ otherwise. This works like <$io> described in L<perlop/"I/O Operators"> except that it's more readable and can be safely called in a list context but still returns just one line. If used as the conditional -+within a C<while> or C-style C<for> loop, however, you will need to -+emulate the functionality of <$io> with C<< defined($_ = $io->getline) >>. +within a C<while> or C-style C<for> loop, however, you will need to +emulate the functionality of <$io> with C<< defined($_ = $io->getline) >>. =item $io->getlines @@ -271,7 +271,7 @@ use IO (); # Load the XS module require Exporter; @ISA = qw(Exporter); -$VERSION = "1.35"; +$VERSION = "1.36"; $VERSION = eval $VERSION; @EXPORT_OK = qw( diff --git a/Master/tlpkg/tlperl/lib/IO/Poll.pm b/Master/tlpkg/tlperl/lib/IO/Poll.pm index 47f1a135595..a02dc3db948 100644 --- a/Master/tlpkg/tlperl/lib/IO/Poll.pm +++ b/Master/tlpkg/tlperl/lib/IO/Poll.pm @@ -13,7 +13,7 @@ use Exporter (); our(@ISA, @EXPORT_OK, @EXPORT, $VERSION); @ISA = qw(Exporter); -$VERSION = "0.09"; +$VERSION = "0.10"; @EXPORT = qw( POLLIN POLLOUT @@ -83,7 +83,7 @@ sub poll { push(@poll,$fd => $mask); } - my $ret = @poll ? _poll(defined($timeout) ? $timeout * 1000 : -1,@poll) : 0; + my $ret = _poll(defined($timeout) ? $timeout * 1000 : -1,@poll); return $ret unless $ret > 0; diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Bunzip2.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Bunzip2.pm index 0161b8fe7b7..3d8fefcf7d1 100644 --- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Bunzip2.pm +++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Bunzip2.pm @@ -4,12 +4,12 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.068 qw(:Status); +use IO::Compress::Base::Common 2.069 qw(:Status); -use Compress::Raw::Bzip2 2.068 ; +use Compress::Raw::Bzip2 2.069 ; our ($VERSION, @ISA); -$VERSION = '2.068'; +$VERSION = '2.069_001'; sub mkUncompObject { diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Identity.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Identity.pm index ecc66b9a807..840a34fccd4 100644 --- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Identity.pm +++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Identity.pm @@ -4,14 +4,14 @@ use warnings; use strict; use bytes; -use IO::Compress::Base::Common 2.068 qw(:Status); +use IO::Compress::Base::Common 2.069 qw(:Status); use IO::Compress::Zip::Constants ; our ($VERSION); -$VERSION = '2.068'; +$VERSION = '2.069_001'; -use Compress::Raw::Zlib 2.068 (); +use Compress::Raw::Zlib 2.069 (); sub mkUncompObject { diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Inflate.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Inflate.pm index 2cfe61e865d..d23eb900bfb 100644 --- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Inflate.pm +++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Adapter/Inflate.pm @@ -4,11 +4,11 @@ use strict; use warnings; #use bytes; -use IO::Compress::Base::Common 2.068 qw(:Status); -use Compress::Raw::Zlib 2.068 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); +use IO::Compress::Base::Common 2.069 qw(:Status); +use Compress::Raw::Zlib 2.069 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); our ($VERSION); -$VERSION = '2.068'; +$VERSION = '2.069_001'; diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyInflate.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyInflate.pm index fd0bd69d8c7..637e6299b1b 100644 --- a/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyInflate.pm +++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyInflate.pm @@ -6,22 +6,22 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.068 (); +use IO::Compress::Base::Common 2.069 (); -use IO::Uncompress::Adapter::Inflate 2.068 (); +use IO::Uncompress::Adapter::Inflate 2.069 (); -use IO::Uncompress::Base 2.068 ; -use IO::Uncompress::Gunzip 2.068 ; -use IO::Uncompress::Inflate 2.068 ; -use IO::Uncompress::RawInflate 2.068 ; -use IO::Uncompress::Unzip 2.068 ; +use IO::Uncompress::Base 2.069 ; +use IO::Uncompress::Gunzip 2.069 ; +use IO::Uncompress::Inflate 2.069 ; +use IO::Uncompress::RawInflate 2.069 ; +use IO::Uncompress::Unzip 2.069 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError); -$VERSION = '2.068'; +$VERSION = '2.069_001'; $AnyInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -48,7 +48,7 @@ sub anyinflate sub getExtraParams { - use IO::Compress::Base::Common 2.068 qw(:Parse); + use IO::Compress::Base::Common 2.069 qw(:Parse); return ( 'rawinflate' => [Parse_boolean, 0] ) ; } @@ -995,7 +995,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyUncompress.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyUncompress.pm index 0d2568e5b3c..92a04a45d9d 100644 --- a/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyUncompress.pm +++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/AnyUncompress.pm @@ -4,16 +4,16 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.068 (); +use IO::Compress::Base::Common 2.069 (); -use IO::Uncompress::Base 2.068 ; +use IO::Uncompress::Base 2.069 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError); -$VERSION = '2.068'; +$VERSION = '2.069_001'; $AnyUncompressError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -27,22 +27,24 @@ Exporter::export_ok_tags('all'); BEGIN { - eval ' use IO::Uncompress::Adapter::Inflate 2.068 ;'; - eval ' use IO::Uncompress::Adapter::Bunzip2 2.068 ;'; - eval ' use IO::Uncompress::Adapter::LZO 2.068 ;'; - eval ' use IO::Uncompress::Adapter::Lzf 2.068 ;'; - eval ' use IO::Uncompress::Adapter::UnLzma 2.068 ;'; - eval ' use IO::Uncompress::Adapter::UnXz 2.068 ;'; - - eval ' use IO::Uncompress::Bunzip2 2.068 ;'; - eval ' use IO::Uncompress::UnLzop 2.068 ;'; - eval ' use IO::Uncompress::Gunzip 2.068 ;'; - eval ' use IO::Uncompress::Inflate 2.068 ;'; - eval ' use IO::Uncompress::RawInflate 2.068 ;'; - eval ' use IO::Uncompress::Unzip 2.068 ;'; - eval ' use IO::Uncompress::UnLzf 2.068 ;'; - eval ' use IO::Uncompress::UnLzma 2.068 ;'; - eval ' use IO::Uncompress::UnXz 2.068 ;'; + local @INC = @INC; + pop @INC if $INC[-1] eq '.'; + eval ' use IO::Uncompress::Adapter::Inflate 2.069 ;'; + eval ' use IO::Uncompress::Adapter::Bunzip2 2.069 ;'; + eval ' use IO::Uncompress::Adapter::LZO 2.069 ;'; + eval ' use IO::Uncompress::Adapter::Lzf 2.069 ;'; + eval ' use IO::Uncompress::Adapter::UnLzma 2.069 ;'; + eval ' use IO::Uncompress::Adapter::UnXz 2.069 ;'; + + eval ' use IO::Uncompress::Bunzip2 2.069 ;'; + eval ' use IO::Uncompress::UnLzop 2.069 ;'; + eval ' use IO::Uncompress::Gunzip 2.069 ;'; + eval ' use IO::Uncompress::Inflate 2.069 ;'; + eval ' use IO::Uncompress::RawInflate 2.069 ;'; + eval ' use IO::Uncompress::Unzip 2.069 ;'; + eval ' use IO::Uncompress::UnLzf 2.069 ;'; + eval ' use IO::Uncompress::UnLzma 2.069 ;'; + eval ' use IO::Uncompress::UnXz 2.069 ;'; } sub new @@ -1025,7 +1027,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Base.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Base.pm index 04348a23540..0906f34f2a8 100644 --- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Base.pm +++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Base.pm @@ -9,12 +9,12 @@ our (@ISA, $VERSION, @EXPORT_OK, %EXPORT_TAGS); @ISA = qw(Exporter IO::File); -$VERSION = '2.068'; +$VERSION = '2.069_001'; use constant G_EOF => 0 ; use constant G_ERR => -1 ; -use IO::Compress::Base::Common 2.068 ; +use IO::Compress::Base::Common 2.069 ; use IO::File ; use Symbol; @@ -1549,7 +1549,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Bunzip2.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Bunzip2.pm index c6e7f466ad6..97bc415878a 100644 --- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Bunzip2.pm +++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Bunzip2.pm @@ -4,15 +4,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.068 qw(:Status ); +use IO::Compress::Base::Common 2.069 qw(:Status ); -use IO::Uncompress::Base 2.068 ; -use IO::Uncompress::Adapter::Bunzip2 2.068 ; +use IO::Uncompress::Base 2.069 ; +use IO::Uncompress::Adapter::Bunzip2 2.069 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error); -$VERSION = '2.068'; +$VERSION = '2.069_001'; $Bunzip2Error = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -903,7 +903,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Gunzip.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Gunzip.pm index 1f33f0b2ae0..a27f39d5287 100644 --- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Gunzip.pm +++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Gunzip.pm @@ -9,12 +9,12 @@ use strict ; use warnings; use bytes; -use IO::Uncompress::RawInflate 2.068 ; +use IO::Uncompress::RawInflate 2.069 ; -use Compress::Raw::Zlib 2.068 () ; -use IO::Compress::Base::Common 2.068 qw(:Status ); -use IO::Compress::Gzip::Constants 2.068 ; -use IO::Compress::Zlib::Extra 2.068 ; +use Compress::Raw::Zlib 2.069 () ; +use IO::Compress::Base::Common 2.069 qw(:Status ); +use IO::Compress::Gzip::Constants 2.069 ; +use IO::Compress::Zlib::Extra 2.069 ; require Exporter ; @@ -28,7 +28,7 @@ Exporter::export_ok_tags('all'); $GunzipError = ''; -$VERSION = '2.068'; +$VERSION = '2.069_001'; sub new { @@ -1118,7 +1118,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Inflate.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Inflate.pm index 1330731e42a..db0f70cb2ea 100644 --- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Inflate.pm +++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Inflate.pm @@ -5,15 +5,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.068 qw(:Status ); -use IO::Compress::Zlib::Constants 2.068 ; +use IO::Compress::Base::Common 2.069 qw(:Status ); +use IO::Compress::Zlib::Constants 2.069 ; -use IO::Uncompress::RawInflate 2.068 ; +use IO::Uncompress::RawInflate 2.069 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError); -$VERSION = '2.068'; +$VERSION = '2.069_001'; $InflateError = ''; @ISA = qw( Exporter IO::Uncompress::RawInflate ); @@ -990,7 +990,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/RawInflate.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/RawInflate.pm index 3a375a7c16e..20a91626423 100644 --- a/Master/tlpkg/tlperl/lib/IO/Uncompress/RawInflate.pm +++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/RawInflate.pm @@ -5,16 +5,16 @@ use strict ; use warnings; #use bytes; -use Compress::Raw::Zlib 2.068 ; -use IO::Compress::Base::Common 2.068 qw(:Status ); +use Compress::Raw::Zlib 2.069 ; +use IO::Compress::Base::Common 2.069 qw(:Status ); -use IO::Uncompress::Base 2.068 ; -use IO::Uncompress::Adapter::Inflate 2.068 ; +use IO::Uncompress::Base 2.069 ; +use IO::Uncompress::Adapter::Inflate 2.069 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError); -$VERSION = '2.068'; +$VERSION = '2.069_001'; $RawInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -1118,7 +1118,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/Master/tlpkg/tlperl/lib/IO/Uncompress/Unzip.pm b/Master/tlpkg/tlperl/lib/IO/Uncompress/Unzip.pm index f73313fe8ed..5394ec899df 100644 --- a/Master/tlpkg/tlperl/lib/IO/Uncompress/Unzip.pm +++ b/Master/tlpkg/tlperl/lib/IO/Uncompress/Unzip.pm @@ -9,14 +9,14 @@ use warnings; #use bytes; use IO::File; -use IO::Uncompress::RawInflate 2.068 ; -use IO::Compress::Base::Common 2.068 qw(:Status ); -use IO::Uncompress::Adapter::Inflate 2.068 ; -use IO::Uncompress::Adapter::Identity 2.068 ; -use IO::Compress::Zlib::Extra 2.068 ; -use IO::Compress::Zip::Constants 2.068 ; +use IO::Uncompress::RawInflate 2.069 ; +use IO::Compress::Base::Common 2.069 qw(:Status ); +use IO::Uncompress::Adapter::Inflate 2.069 ; +use IO::Uncompress::Adapter::Identity 2.069 ; +use IO::Compress::Zlib::Extra 2.069 ; +use IO::Compress::Zip::Constants 2.069 ; -use Compress::Raw::Zlib 2.068 () ; +use Compress::Raw::Zlib 2.069 () ; BEGIN { @@ -31,7 +31,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup); -$VERSION = '2.068'; +$VERSION = '2.069_001'; $UnzipError = ''; @ISA = qw(Exporter IO::Uncompress::RawInflate); @@ -1861,7 +1861,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2014 Paul Marquess. All rights reserved. +Copyright (c) 2005-2015 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. |