diff options
author | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2013-05-27 22:57:18 +0100 |
---|---|---|
committer | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2013-05-27 22:57:18 +0100 |
commit | 717a97bab95e1c5b372d6ecc681398092afcffd6 (patch) | |
tree | 58bd0a1a46d28c678d3260ae3777280dbda519ad /cpan | |
parent | 1cae22935619e1afdd20b077ec901cbee90536d7 (diff) | |
download | perl-717a97bab95e1c5b372d6ecc681398092afcffd6.tar.gz |
Update IO-Compress to CPAN version 2.061
[DELTA]
2.061 19 May 2013
* zipdetails (1.06)
Get it to cope with Android 'zipalign' non-standard extra fields.
These are used to make sure that a non-compressed member starts on
a 4 byte boundary.
* RT#84647: unzip example with IO::Uncompress::Unzip
Diffstat (limited to 'cpan')
32 files changed, 177 insertions, 144 deletions
diff --git a/cpan/IO-Compress/Changes b/cpan/IO-Compress/Changes index 0b82327368..e0dd8afeff 100644 --- a/cpan/IO-Compress/Changes +++ b/cpan/IO-Compress/Changes @@ -1,6 +1,15 @@ CHANGES ------- + 2.061 19 May 2013 + + * zipdetails (1.06) + Get it to cope with Android 'zipalign' non-standard extra fields. + These are used to make sure that a non-compressed member starts on + a 4 byte boundary. + + * RT#84647: unzip example with IO::Uncompress::Unzip + 2.060 7 January 2013 * Updated POD diff --git a/cpan/IO-Compress/Makefile.PL b/cpan/IO-Compress/Makefile.PL index a0e8ce3a7f..7c386f4085 100644 --- a/cpan/IO-Compress/Makefile.PL +++ b/cpan/IO-Compress/Makefile.PL @@ -3,7 +3,7 @@ use strict ; require 5.006 ; -$::VERSION = '2.060' ; +$::VERSION = '2.061' ; use private::MakeUtil; use ExtUtils::MakeMaker 5.16 ; diff --git a/cpan/IO-Compress/README b/cpan/IO-Compress/README index 1af8b7148d..0329ce9904 100644 --- a/cpan/IO-Compress/README +++ b/cpan/IO-Compress/README @@ -1,9 +1,9 @@ IO-Compress - Version 2.060 + Version 2.061 - 7th January 2013 + 19th May 2013 Copyright (c) 1995-2013 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -89,7 +89,7 @@ To help me help you, I need all of the following information: If you haven't installed IO-Compress then search IO::Compress::Gzip.pm for a line like this: - $VERSION = "2.060" ; + $VERSION = "2.061" ; 2. If you are having problems building IO-Compress, send me a complete log of what happened. Start by unpacking the IO-Compress diff --git a/cpan/IO-Compress/bin/zipdetails b/cpan/IO-Compress/bin/zipdetails index 2b5cd52cec..0249850457 100644 --- a/cpan/IO-Compress/bin/zipdetails +++ b/cpan/IO-Compress/bin/zipdetails @@ -177,7 +177,7 @@ my %Extras = ( ); -my $VERSION = "1.05" ; +my $VERSION = "1.06" ; my $FH; @@ -347,6 +347,8 @@ sub out $TEXT = $text; $VALUE = mySpr $format, @_; + no warnings; + write; } @@ -1064,6 +1066,17 @@ sub walkExtra my $count = 0 ; + if ($XLEN < ZIP_EXTRA_SUBFIELD_ID_SIZE + ZIP_EXTRA_SUBFIELD_LEN_SIZE) + { + # Android zipalign is prime candidate for this non-standard extra field. + myRead($payload, $XLEN); + my $data = hexDump($payload); + + out $payload, "Malformed Extra Data", $data; + + return undef; + } + while ($offset < $XLEN) { ++ $count; @@ -2089,7 +2102,7 @@ error message. The primary reference for Zip files is the "appnote" document available at L<http://www.pkware.com/documents/casestudies/APPNOTE.TXT>. -An alternative is the Info-Zip appnote. This is available from +An alternative reference is the Info-Zip appnote. This is available from L<ftp://ftp.info-zip.org/pub/infozip/doc/> @@ -2097,7 +2110,8 @@ The C<zipinfo> program that comes with the info-zip distribution (L<http://www.info-zip.org/>) can also display details of the structure of a zip file. -See also L<IO::Compress::Zip>, L<IO::Uncompress::Unzip>. +See also L<Archive::Zip::SimpleZip>, L<IO::Compress::Zip>, +L<IO::Uncompress::Unzip>. =head1 AUTHOR @@ -2106,7 +2120,7 @@ Paul Marquess F<pmqs@cpan.org>. =head1 COPYRIGHT -Copyright (c) 2011-2012 Paul Marquess. All rights reserved. +Copyright (c) 2011-2013 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/cpan/IO-Compress/lib/Compress/Zlib.pm b/cpan/IO-Compress/lib/Compress/Zlib.pm index c5525ce1f9..881a238add 100644 --- a/cpan/IO-Compress/lib/Compress/Zlib.pm +++ b/cpan/IO-Compress/lib/Compress/Zlib.pm @@ -7,17 +7,17 @@ use Carp ; use IO::Handle ; use Scalar::Util qw(dualvar); -use IO::Compress::Base::Common 2.060 ; -use Compress::Raw::Zlib 2.060 ; -use IO::Compress::Gzip 2.060 ; -use IO::Uncompress::Gunzip 2.060 ; +use IO::Compress::Base::Common 2.061 ; +use Compress::Raw::Zlib 2.061 ; +use IO::Compress::Gzip 2.061 ; +use IO::Uncompress::Gunzip 2.061 ; use strict ; use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.060'; +$VERSION = '2.061'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -461,7 +461,7 @@ sub inflate package Compress::Zlib ; -use IO::Compress::Gzip::Constants 2.060 ; +use IO::Compress::Gzip::Constants 2.061 ; sub memGzip($) { diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm index e665ca3ceb..73d929bff8 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm @@ -4,12 +4,12 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.060 qw(:Status); +use IO::Compress::Base::Common 2.061 qw(:Status); -use Compress::Raw::Bzip2 2.060 ; +use Compress::Raw::Bzip2 2.061 ; our ($VERSION); -$VERSION = '2.060'; +$VERSION = '2.061'; sub mkCompObject { diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm index d064a141e7..da7f9e5366 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm @@ -4,13 +4,13 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.060 qw(:Status); -use Compress::Raw::Zlib 2.060 qw( !crc32 !adler32 ) ; +use IO::Compress::Base::Common 2.061 qw(:Status); +use Compress::Raw::Zlib 2.061 qw( !crc32 !adler32 ) ; require Exporter; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, @EXPORT, %DEFLATE_CONSTANTS); -$VERSION = '2.060'; +$VERSION = '2.061'; @ISA = qw(Exporter); @EXPORT_OK = @Compress::Raw::Zlib::DEFLATE_CONSTANTS; %EXPORT_TAGS = %Compress::Raw::Zlib::DEFLATE_CONSTANTS; diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm index 73d911f68e..c4e2933d68 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm @@ -4,10 +4,10 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.060 qw(:Status); +use IO::Compress::Base::Common 2.061 qw(:Status); our ($VERSION); -$VERSION = '2.060'; +$VERSION = '2.061'; sub mkCompObject { diff --git a/cpan/IO-Compress/lib/IO/Compress/Base.pm b/cpan/IO-Compress/lib/IO/Compress/Base.pm index 9b8ef7552a..d6802526fb 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Base.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Base.pm @@ -6,7 +6,7 @@ require 5.006 ; use strict ; use warnings; -use IO::Compress::Base::Common 2.060 ; +use IO::Compress::Base::Common 2.061 ; use IO::File (); ; use Scalar::Util (); @@ -20,7 +20,7 @@ use Symbol(); our (@ISA, $VERSION); @ISA = qw(Exporter IO::File); -$VERSION = '2.060'; +$VERSION = '2.061'; #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. diff --git a/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm b/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm index cce097dd6d..f3b5350d28 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm +++ b/cpan/IO-Compress/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.060'; +$VERSION = '2.061'; @EXPORT = qw( isaFilehandle isaFilename isaScalar whatIsInput whatIsOutput diff --git a/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm index 7c5dc793e7..83f425d9f1 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm @@ -5,16 +5,16 @@ use warnings; use bytes; require Exporter ; -use IO::Compress::Base 2.060 ; +use IO::Compress::Base 2.061 ; -use IO::Compress::Base::Common 2.060 qw(); -use IO::Compress::Adapter::Bzip2 2.060 ; +use IO::Compress::Base::Common 2.061 qw(); +use IO::Compress::Adapter::Bzip2 2.061 ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error); -$VERSION = '2.060'; +$VERSION = '2.061'; $Bzip2Error = ''; @ISA = qw(Exporter IO::Compress::Base); @@ -51,7 +51,7 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.060 qw(:Parse); + use IO::Compress::Base::Common 2.061 qw(:Parse); return ( 'blocksize100k' => [IO::Compress::Base::Common::Parse_unsigned, 1], diff --git a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm index d6158deb5b..63b864126c 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm @@ -8,16 +8,16 @@ use bytes; require Exporter ; -use IO::Compress::RawDeflate 2.060 (); -use IO::Compress::Adapter::Deflate 2.060 ; +use IO::Compress::RawDeflate 2.061 (); +use IO::Compress::Adapter::Deflate 2.061 ; -use IO::Compress::Zlib::Constants 2.060 ; -use IO::Compress::Base::Common 2.060 qw(); +use IO::Compress::Zlib::Constants 2.061 ; +use IO::Compress::Base::Common 2.061 qw(); our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $DeflateError); -$VERSION = '2.060'; +$VERSION = '2.061'; $DeflateError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -238,7 +238,7 @@ section. The functional interface needs Perl5.005 or better. -=head2 deflate $input => $output [, OPTS] +=head2 deflate $input_filename_or_reference => $output_filename_or_reference [, OPTS] C<deflate> expects at least two parameters, C<$input_filename_or_reference> and C<$output_filename_or_reference>. diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm index 21141530e7..f5f87281d9 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm @@ -8,12 +8,12 @@ use bytes; require Exporter ; -use IO::Compress::RawDeflate 2.060 () ; -use IO::Compress::Adapter::Deflate 2.060 ; +use IO::Compress::RawDeflate 2.061 () ; +use IO::Compress::Adapter::Deflate 2.061 ; -use IO::Compress::Base::Common 2.060 qw(:Status ); -use IO::Compress::Gzip::Constants 2.060 ; -use IO::Compress::Zlib::Extra 2.060 ; +use IO::Compress::Base::Common 2.061 qw(:Status ); +use IO::Compress::Gzip::Constants 2.061 ; +use IO::Compress::Zlib::Extra 2.061 ; BEGIN { @@ -25,7 +25,7 @@ BEGIN our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $GzipError); -$VERSION = '2.060'; +$VERSION = '2.061'; $GzipError = '' ; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -347,7 +347,7 @@ section. The functional interface needs Perl5.005 or better. -=head2 gzip $input => $output [, OPTS] +=head2 gzip $input_filename_or_reference => $output_filename_or_reference [, OPTS] C<gzip> expects at least two parameters, C<$input_filename_or_reference> and C<$output_filename_or_reference>. diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm index b65f56b91f..8081ef6f6a 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm +++ b/cpan/IO-Compress/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.060'; +$VERSION = '2.061'; @ISA = qw(Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm index 0862e6e216..cc09b46086 100644 --- a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm +++ b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm @@ -6,15 +6,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base 2.060 ; -use IO::Compress::Base::Common 2.060 qw(:Status ); -use IO::Compress::Adapter::Deflate 2.060 ; +use IO::Compress::Base 2.061 ; +use IO::Compress::Base::Common 2.061 qw(:Status ); +use IO::Compress::Adapter::Deflate 2.061 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError); -$VERSION = '2.060'; +$VERSION = '2.061'; $RawDeflateError = ''; @ISA = qw(Exporter IO::Compress::Base); @@ -116,8 +116,8 @@ sub getExtraParams return getZlibParams(); } -use IO::Compress::Base::Common 2.060 qw(:Parse); -use Compress::Raw::Zlib 2.060 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); +use IO::Compress::Base::Common 2.061 qw(:Parse); +use Compress::Raw::Zlib 2.061 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], @@ -294,7 +294,7 @@ section. The functional interface needs Perl5.005 or better. -=head2 rawdeflate $input => $output [, OPTS] +=head2 rawdeflate $input_filename_or_reference => $output_filename_or_reference [, OPTS] C<rawdeflate> expects at least two parameters, C<$input_filename_or_reference> and C<$output_filename_or_reference>. diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip.pm b/cpan/IO-Compress/lib/IO/Compress/Zip.pm index a5bf89ecc4..a0b22d67e5 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Zip.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Zip.pm @@ -4,30 +4,30 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.060 qw(:Status ); -use IO::Compress::RawDeflate 2.060 (); -use IO::Compress::Adapter::Deflate 2.060 ; -use IO::Compress::Adapter::Identity 2.060 ; -use IO::Compress::Zlib::Extra 2.060 ; -use IO::Compress::Zip::Constants 2.060 ; +use IO::Compress::Base::Common 2.061 qw(:Status ); +use IO::Compress::RawDeflate 2.061 (); +use IO::Compress::Adapter::Deflate 2.061 ; +use IO::Compress::Adapter::Identity 2.061 ; +use IO::Compress::Zlib::Extra 2.061 ; +use IO::Compress::Zip::Constants 2.061 ; use File::Spec(); use Config; -use Compress::Raw::Zlib 2.060 (); +use Compress::Raw::Zlib 2.061 (); BEGIN { eval { require IO::Compress::Adapter::Bzip2 ; - import IO::Compress::Adapter::Bzip2 2.060 ; + import IO::Compress::Adapter::Bzip2 2.061 ; require IO::Compress::Bzip2 ; - import IO::Compress::Bzip2 2.060 ; + import IO::Compress::Bzip2 2.061 ; } ; eval { require IO::Compress::Adapter::Lzma ; - import IO::Compress::Adapter::Lzma 2.060 ; + import IO::Compress::Adapter::Lzma 2.061 ; require IO::Compress::Lzma ; - import IO::Compress::Lzma 2.060 ; + import IO::Compress::Lzma 2.061 ; } ; } @@ -36,7 +36,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $ZipError); -$VERSION = '2.060'; +$VERSION = '2.061'; $ZipError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -939,7 +939,7 @@ section. The functional interface needs Perl5.005 or better. -=head2 zip $input => $output [, OPTS] +=head2 zip $input_filename_or_reference => $output_filename_or_reference [, OPTS] C<zip> expects at least two parameters, C<$input_filename_or_reference> and C<$output_filename_or_reference>. diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm index 64cfc2685c..2b15ab4a0e 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm @@ -7,7 +7,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS); -$VERSION = '2.060'; +$VERSION = '2.061'; @ISA = qw(Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm index 328fc4aa8e..1bd38ada29 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm @@ -9,7 +9,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT); -$VERSION = '2.060'; +$VERSION = '2.061'; @ISA = qw(Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm b/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm index d320dccabd..a5b64ccee8 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm @@ -8,9 +8,9 @@ use bytes; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.060'; +$VERSION = '2.061'; -use IO::Compress::Gzip::Constants 2.060 ; +use IO::Compress::Gzip::Constants 2.061 ; sub ExtraFieldError { diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm index c35601cd3d..02bf7fd0e5 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm @@ -4,12 +4,12 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.060 qw(:Status); +use IO::Compress::Base::Common 2.061 qw(:Status); -use Compress::Raw::Bzip2 2.060 ; +use Compress::Raw::Bzip2 2.061 ; our ($VERSION, @ISA); -$VERSION = '2.060'; +$VERSION = '2.061'; sub mkUncompObject { diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm index 5c63b5ccbd..721c47374d 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm @@ -4,14 +4,14 @@ use warnings; use strict; use bytes; -use IO::Compress::Base::Common 2.060 qw(:Status); +use IO::Compress::Base::Common 2.061 qw(:Status); use IO::Compress::Zip::Constants ; our ($VERSION); -$VERSION = '2.060'; +$VERSION = '2.061'; -use Compress::Raw::Zlib 2.060 (); +use Compress::Raw::Zlib 2.061 (); sub mkUncompObject { diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm index 5d8e1a326d..c1fcaf9248 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm @@ -4,11 +4,11 @@ use strict; use warnings; #use bytes; -use IO::Compress::Base::Common 2.060 qw(:Status); -use Compress::Raw::Zlib 2.060 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); +use IO::Compress::Base::Common 2.061 qw(:Status); +use Compress::Raw::Zlib 2.061 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); our ($VERSION); -$VERSION = '2.060'; +$VERSION = '2.061'; diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm index 14c695f0d4..5f2062a506 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm @@ -6,22 +6,22 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.060 (); +use IO::Compress::Base::Common 2.061 (); -use IO::Uncompress::Adapter::Inflate 2.060 (); +use IO::Uncompress::Adapter::Inflate 2.061 (); -use IO::Uncompress::Base 2.060 ; -use IO::Uncompress::Gunzip 2.060 ; -use IO::Uncompress::Inflate 2.060 ; -use IO::Uncompress::RawInflate 2.060 ; -use IO::Uncompress::Unzip 2.060 ; +use IO::Uncompress::Base 2.061 ; +use IO::Uncompress::Gunzip 2.061 ; +use IO::Uncompress::Inflate 2.061 ; +use IO::Uncompress::RawInflate 2.061 ; +use IO::Uncompress::Unzip 2.061 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError); -$VERSION = '2.060'; +$VERSION = '2.061'; $AnyInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -48,7 +48,7 @@ sub anyinflate sub getExtraParams { - use IO::Compress::Base::Common 2.060 qw(:Parse); + use IO::Compress::Base::Common 2.061 qw(:Parse); return ( 'rawinflate' => [Parse_boolean, 0] ) ; } @@ -210,7 +210,7 @@ section. The functional interface needs Perl5.005 or better. -=head2 anyinflate $input => $output [, OPTS] +=head2 anyinflate $input_filename_or_reference => $output_filename_or_reference [, OPTS] C<anyinflate> expects at least two parameters, C<$input_filename_or_reference> and C<$output_filename_or_reference>. diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm index a202763c0a..ce73a56614 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm @@ -4,16 +4,16 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.060 (); +use IO::Compress::Base::Common 2.061 (); -use IO::Uncompress::Base 2.060 ; +use IO::Uncompress::Base 2.061 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError); -$VERSION = '2.060'; +$VERSION = '2.061'; $AnyUncompressError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -27,22 +27,22 @@ Exporter::export_ok_tags('all'); BEGIN { - eval ' use IO::Uncompress::Adapter::Inflate 2.060 ;'; - eval ' use IO::Uncompress::Adapter::Bunzip2 2.060 ;'; - eval ' use IO::Uncompress::Adapter::LZO 2.060 ;'; - eval ' use IO::Uncompress::Adapter::Lzf 2.060 ;'; - eval ' use IO::Uncompress::Adapter::UnLzma 2.060 ;'; - eval ' use IO::Uncompress::Adapter::UnXz 2.060 ;'; - - eval ' use IO::Uncompress::Bunzip2 2.060 ;'; - eval ' use IO::Uncompress::UnLzop 2.060 ;'; - eval ' use IO::Uncompress::Gunzip 2.060 ;'; - eval ' use IO::Uncompress::Inflate 2.060 ;'; - eval ' use IO::Uncompress::RawInflate 2.060 ;'; - eval ' use IO::Uncompress::Unzip 2.060 ;'; - eval ' use IO::Uncompress::UnLzf 2.060 ;'; - eval ' use IO::Uncompress::UnLzma 2.060 ;'; - eval ' use IO::Uncompress::UnXz 2.060 ;'; + eval ' use IO::Uncompress::Adapter::Inflate 2.061 ;'; + eval ' use IO::Uncompress::Adapter::Bunzip2 2.061 ;'; + eval ' use IO::Uncompress::Adapter::LZO 2.061 ;'; + eval ' use IO::Uncompress::Adapter::Lzf 2.061 ;'; + eval ' use IO::Uncompress::Adapter::UnLzma 2.061 ;'; + eval ' use IO::Uncompress::Adapter::UnXz 2.061 ;'; + + eval ' use IO::Uncompress::Bunzip2 2.061 ;'; + eval ' use IO::Uncompress::UnLzop 2.061 ;'; + eval ' use IO::Uncompress::Gunzip 2.061 ;'; + eval ' use IO::Uncompress::Inflate 2.061 ;'; + eval ' use IO::Uncompress::RawInflate 2.061 ;'; + eval ' use IO::Uncompress::Unzip 2.061 ;'; + eval ' use IO::Uncompress::UnLzf 2.061 ;'; + eval ' use IO::Uncompress::UnLzma 2.061 ;'; + eval ' use IO::Uncompress::UnXz 2.061 ;'; } sub new @@ -318,7 +318,7 @@ section. The functional interface needs Perl5.005 or better. -=head2 anyuncompress $input => $output [, OPTS] +=head2 anyuncompress $input_filename_or_reference => $output_filename_or_reference [, OPTS] C<anyuncompress> expects at least two parameters, C<$input_filename_or_reference> and C<$output_filename_or_reference>. diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm index 5d6336b947..b6df7c031c 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm @@ -9,12 +9,12 @@ our (@ISA, $VERSION, @EXPORT_OK, %EXPORT_TAGS); @ISA = qw(Exporter IO::File); -$VERSION = '2.060'; +$VERSION = '2.061'; use constant G_EOF => 0 ; use constant G_ERR => -1 ; -use IO::Compress::Base::Common 2.060 ; +use IO::Compress::Base::Common 2.061 ; use IO::File ; use Symbol; diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm index ccfb69b2bd..0aeef1fe0b 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm @@ -4,15 +4,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.060 qw(:Status ); +use IO::Compress::Base::Common 2.061 qw(:Status ); -use IO::Uncompress::Base 2.060 ; -use IO::Uncompress::Adapter::Bunzip2 2.060 ; +use IO::Uncompress::Base 2.061 ; +use IO::Uncompress::Adapter::Bunzip2 2.061 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error); -$VERSION = '2.060'; +$VERSION = '2.061'; $Bunzip2Error = ''; @ISA = qw( Exporter IO::Uncompress::Base ); diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm index 753d34a5bc..fa9fdcc1d7 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm @@ -9,12 +9,12 @@ use strict ; use warnings; use bytes; -use IO::Uncompress::RawInflate 2.060 ; +use IO::Uncompress::RawInflate 2.061 ; -use Compress::Raw::Zlib 2.060 () ; -use IO::Compress::Base::Common 2.060 qw(:Status ); -use IO::Compress::Gzip::Constants 2.060 ; -use IO::Compress::Zlib::Extra 2.060 ; +use Compress::Raw::Zlib 2.061 () ; +use IO::Compress::Base::Common 2.061 qw(:Status ); +use IO::Compress::Gzip::Constants 2.061 ; +use IO::Compress::Zlib::Extra 2.061 ; require Exporter ; @@ -28,7 +28,7 @@ Exporter::export_ok_tags('all'); $GunzipError = ''; -$VERSION = '2.060'; +$VERSION = '2.061'; sub new { @@ -345,7 +345,7 @@ section. The functional interface needs Perl5.005 or better. -=head2 gunzip $input => $output [, OPTS] +=head2 gunzip $input_filename_or_reference => $output_filename_or_reference [, OPTS] C<gunzip> expects at least two parameters, C<$input_filename_or_reference> and C<$output_filename_or_reference>. diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm index 4cea9aa002..7d33d5fa2c 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm @@ -5,15 +5,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.060 qw(:Status ); -use IO::Compress::Zlib::Constants 2.060 ; +use IO::Compress::Base::Common 2.061 qw(:Status ); +use IO::Compress::Zlib::Constants 2.061 ; -use IO::Uncompress::RawInflate 2.060 ; +use IO::Uncompress::RawInflate 2.061 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError); -$VERSION = '2.060'; +$VERSION = '2.061'; $InflateError = ''; @ISA = qw( Exporter IO::Uncompress::RawInflate ); @@ -267,7 +267,7 @@ section. The functional interface needs Perl5.005 or better. -=head2 inflate $input => $output [, OPTS] +=head2 inflate $input_filename_or_reference => $output_filename_or_reference [, OPTS] C<inflate> expects at least two parameters, C<$input_filename_or_reference> and C<$output_filename_or_reference>. diff --git a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm index 9a57eb343c..320186581a 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm @@ -5,16 +5,16 @@ use strict ; use warnings; #use bytes; -use Compress::Raw::Zlib 2.060 ; -use IO::Compress::Base::Common 2.060 qw(:Status ); +use Compress::Raw::Zlib 2.061 ; +use IO::Compress::Base::Common 2.061 qw(:Status ); -use IO::Uncompress::Base 2.060 ; -use IO::Uncompress::Adapter::Inflate 2.060 ; +use IO::Uncompress::Base 2.061 ; +use IO::Uncompress::Adapter::Inflate 2.061 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError); -$VERSION = '2.060'; +$VERSION = '2.061'; $RawInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -415,7 +415,7 @@ section. The functional interface needs Perl5.005 or better. -=head2 rawinflate $input => $output [, OPTS] +=head2 rawinflate $input_filename_or_reference => $output_filename_or_reference [, OPTS] C<rawinflate> expects at least two parameters, C<$input_filename_or_reference> and C<$output_filename_or_reference>. diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm index 4175136fc3..1a3474b353 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm @@ -9,14 +9,14 @@ use warnings; #use bytes; use IO::File; -use IO::Uncompress::RawInflate 2.060 ; -use IO::Compress::Base::Common 2.060 qw(:Status ); -use IO::Uncompress::Adapter::Inflate 2.060 ; -use IO::Uncompress::Adapter::Identity 2.060 ; -use IO::Compress::Zlib::Extra 2.060 ; -use IO::Compress::Zip::Constants 2.060 ; +use IO::Uncompress::RawInflate 2.061 ; +use IO::Compress::Base::Common 2.061 qw(:Status ); +use IO::Uncompress::Adapter::Inflate 2.061 ; +use IO::Uncompress::Adapter::Identity 2.061 ; +use IO::Compress::Zlib::Extra 2.061 ; +use IO::Compress::Zip::Constants 2.061 ; -use Compress::Raw::Zlib 2.060 () ; +use Compress::Raw::Zlib 2.061 () ; BEGIN { @@ -31,7 +31,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup); -$VERSION = '2.060'; +$VERSION = '2.061'; $UnzipError = ''; @ISA = qw(Exporter IO::Uncompress::RawInflate); @@ -1101,7 +1101,7 @@ section. The functional interface needs Perl5.005 or better. -=head2 unzip $input => $output [, OPTS] +=head2 unzip $input_filename_or_reference => $output_filename_or_reference [, OPTS] C<unzip> expects at least two parameters, C<$input_filename_or_reference> and C<$output_filename_or_reference>. @@ -1821,6 +1821,13 @@ It is also worth noting that C<nextStream> can be called at any time -- you don't have to wait until you have exhausted a compressed data stream before skipping to the next one. +=head2 Unzipping a complete zip file to disk + +Daniel S. Sterling has written a script that uses C<IO::Uncompress::UnZip> +to read a zip file and unzip its contents to disk. + +The script is available from L<https://gist.github.com/eqhmcow/5389877> + =head1 SEE ALSO L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzma>, L<IO::Uncompress::UnLzma>, L<IO::Compress::Xz>, L<IO::Uncompress::UnXz>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress> diff --git a/cpan/IO-Compress/t/000prereq.t b/cpan/IO-Compress/t/000prereq.t index 764821e9e2..9511eeef9f 100644 --- a/cpan/IO-Compress/t/000prereq.t +++ b/cpan/IO-Compress/t/000prereq.t @@ -25,7 +25,7 @@ BEGIN if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 }; - my $VERSION = '2.060'; + my $VERSION = '2.061'; my @NAMES = qw( Compress::Raw::Bzip2 Compress::Raw::Zlib diff --git a/cpan/IO-Compress/t/compress/truncate.pl b/cpan/IO-Compress/t/compress/truncate.pl index 9f5eec9bb3..9de19b194c 100644 --- a/cpan/IO-Compress/t/compress/truncate.pl +++ b/cpan/IO-Compress/t/compress/truncate.pl @@ -189,14 +189,17 @@ sub run { next if $i == 0 ; - my $lex = new LexFile my $name ; - my $input; - +# my $lex = new LexFile my $name ; +# my $input; +# for my $mode (qw(block line)) { title "Compressed Data Truncation - length $i, MOde $mode, Source $fb, Transparent $trans"; + my $lex = new LexFile my $name ; + my $input; + my $part = substr($compressed, 0, $i); if ($fb eq 'filehandle') { |