From 513b1ee2ffc66290ce706625c54422114d634f98 Mon Sep 17 00:00:00 2001 From: Steve Hay Date: Wed, 8 Aug 2012 14:15:41 +0100 Subject: [PATCH] Upgrade IO-Compress to 2.055 --- Porting/Maintainers.pl | 2 +- cpan/IO-Compress/Changes | 11 +++ cpan/IO-Compress/Makefile.PL | 2 +- cpan/IO-Compress/README | 6 +- cpan/IO-Compress/lib/Compress/Zlib.pm | 93 +++++++++++++--------- cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm | 6 +- .../IO-Compress/lib/IO/Compress/Adapter/Deflate.pm | 6 +- .../lib/IO/Compress/Adapter/Identity.pm | 4 +- cpan/IO-Compress/lib/IO/Compress/Base.pm | 4 +- cpan/IO-Compress/lib/IO/Compress/Base/Common.pm | 2 +- cpan/IO-Compress/lib/IO/Compress/Bzip2.pm | 10 +-- cpan/IO-Compress/lib/IO/Compress/Deflate.pm | 10 +-- cpan/IO-Compress/lib/IO/Compress/FAQ.pod | 71 +++++++++++++++++ cpan/IO-Compress/lib/IO/Compress/Gzip.pm | 12 +-- cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm | 2 +- cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm | 12 +-- cpan/IO-Compress/lib/IO/Compress/Zip.pm | 28 +++---- cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm | 2 +- cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm | 2 +- cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm | 4 +- .../lib/IO/Uncompress/Adapter/Bunzip2.pm | 6 +- .../lib/IO/Uncompress/Adapter/Identity.pm | 6 +- .../lib/IO/Uncompress/Adapter/Inflate.pm | 6 +- cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm | 18 ++--- .../IO-Compress/lib/IO/Uncompress/AnyUncompress.pm | 40 +++++----- cpan/IO-Compress/lib/IO/Uncompress/Base.pm | 4 +- cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm | 10 +-- cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm | 14 ++-- cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm | 8 +- cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm | 10 +-- cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm | 20 ++--- cpan/IO-Compress/t/000prereq.t | 2 +- 32 files changed, 268 insertions(+), 165 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 77599e8..841e5bd 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1022,7 +1022,7 @@ use File::Glob qw(:case); 'IO-Compress' => { 'MAINTAINER' => 'pmqs', - 'DISTRIBUTION' => 'PMQS/IO-Compress-2.052.tar.gz', + 'DISTRIBUTION' => 'PMQS/IO-Compress-2.055.tar.gz', 'FILES' => q[cpan/IO-Compress], 'EXCLUDED' => [qr{t/Test/}], 'UPSTREAM' => 'cpan', diff --git a/cpan/IO-Compress/Changes b/cpan/IO-Compress/Changes index 3af9472..d02b19f 100644 --- a/cpan/IO-Compress/Changes +++ b/cpan/IO-Compress/Changes @@ -1,6 +1,17 @@ CHANGES ------- + 2.055 5 August 2012 + + * FAQ + Added a few paragraphs on how to deal with pbzip2 files + [RT# #77743: Interoperability problems with pbzip2] + + * Compress::Zip + speed up compress, uncompress, memGzip & memGunzip. + [RT# #77350: Compress::Zlib::uncompress() is slowed down needlessly + by parameter validation + 2.052 29 April 2012 * IO::Compress::Zip diff --git a/cpan/IO-Compress/Makefile.PL b/cpan/IO-Compress/Makefile.PL index 0e679d3..9252165 100644 --- a/cpan/IO-Compress/Makefile.PL +++ b/cpan/IO-Compress/Makefile.PL @@ -3,7 +3,7 @@ use strict ; require 5.006 ; -$::VERSION = '2.052' ; +$::VERSION = '2.055' ; use private::MakeUtil; use ExtUtils::MakeMaker 5.16 ; diff --git a/cpan/IO-Compress/README b/cpan/IO-Compress/README index 552645b..af73e99 100644 --- a/cpan/IO-Compress/README +++ b/cpan/IO-Compress/README @@ -1,9 +1,9 @@ IO-Compress - Version 2.052 + Version 2.055 - 29th April 2012 + 5th August 2012 Copyright (c) 1995-2012 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.052" ; + $VERSION = "2.055" ; 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/lib/Compress/Zlib.pm b/cpan/IO-Compress/lib/Compress/Zlib.pm index b78bfb4..3f28578 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.052 ; -use Compress::Raw::Zlib 2.052 ; -use IO::Compress::Gzip 2.052 ; -use IO::Uncompress::Gunzip 2.052 ; +use IO::Compress::Base::Common 2.055 ; +use Compress::Raw::Zlib 2.055 ; +use IO::Compress::Gzip 2.055 ; +use IO::Uncompress::Gunzip 2.055 ; use strict ; use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.052'; +$VERSION = '2.055'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -315,7 +315,14 @@ sub compress($;$) my $level = (@_ == 2 ? $_[1] : Z_DEFAULT_COMPRESSION() ); - $x = new Compress::Raw::Zlib::Deflate -AppendOutput => 1, -Level => $level + $x = Compress::Raw::Zlib::_deflateInit(FLAG_APPEND, + $level, + Z_DEFLATED, + MAX_WBITS, + MAX_MEM_LEVEL, + Z_DEFAULT_STRATEGY, + 4096, + '') or return undef ; $err = $x->deflate($in, $output) ; @@ -325,12 +332,11 @@ sub compress($;$) return undef unless $err == Z_OK() ; return $output ; - } sub uncompress($) { - my ($x, $output, $err, $in) =('', '', '', '') ; + my ($output, $in) =('', '') ; if (ref $_[0] ) { $in = $_[0] ; @@ -341,17 +347,19 @@ sub uncompress($) } $] >= 5.008 and (utf8::downgrade($$in, 1) - or croak "Wide character in uncompress"); - - $x = new Compress::Raw::Zlib::Inflate -ConsumeInput => 0 or return undef ; - - $err = $x->inflate($in, $output) ; - return undef unless $err == Z_STREAM_END() ; - - return $output ; + or croak "Wide character in uncompress"); + + my ($obj, $status) = Compress::Raw::Zlib::_inflateInit(0, + MAX_WBITS, 4096, "") ; + + $status == Z_OK + or return undef; + + $obj->inflate($in, $output) == Z_STREAM_END + or return undef; + + return $output; } - - sub deflateInit(@) { @@ -453,28 +461,42 @@ sub inflate package Compress::Zlib ; -use IO::Compress::Gzip::Constants 2.052 ; +use IO::Compress::Gzip::Constants 2.055 ; sub memGzip($) { - my $out; - - # if the deflation buffer isn't a reference, make it one - my $string = (ref $_[0] ? $_[0] : \$_[0]) ; + _set_gzerr(0); + my $x = Compress::Raw::Zlib::_deflateInit(FLAG_APPEND|FLAG_CRC, + Z_BEST_COMPRESSION, + Z_DEFLATED, + -MAX_WBITS(), + MAX_MEM_LEVEL, + Z_DEFAULT_STRATEGY, + 4096, + '') + or return undef ; + + # if the deflation buffer isn't a reference, make it one + my $string = (ref $_[0] ? $_[0] : \$_[0]) ; - $] >= 5.008 and (utf8::downgrade($$string, 1) - or croak "Wide character in memGzip"); + $] >= 5.008 and (utf8::downgrade($$string, 1) + or croak "Wide character in memGzip"); - _set_gzerr(0); - if ( ! IO::Compress::Gzip::gzip($string, \$out, Minimal => 1) ) - { - $Compress::Zlib::gzerrno = $IO::Compress::Gzip::GzipError; - return undef ; - } + my $out; + my $status ; - return $out; + $x->deflate($string, $out) == Z_OK + or return undef ; + + $x->flush($out) == Z_OK + or return undef ; + + return IO::Compress::Gzip::Constants::GZIP_MINIMUM_HEADER . + $out . + pack("V V", $x->crc32(), $x->total_in()); } + sub _removeGzipHeader($) { my $string = shift ; @@ -555,12 +577,11 @@ sub memGunzip($) or return _set_gzerr_undef($status); my $bufsize = length $$string > 4096 ? length $$string : 4096 ; - my $x = new Compress::Raw::Zlib::Inflate({-WindowBits => - MAX_WBITS(), - -Bufsize => $bufsize}) - + my $x = Compress::Raw::Zlib::_inflateInit(FLAG_CRC | FLAG_CONSUME_INPUT, + -MAX_WBITS(), $bufsize, '') or return _ret_gun_error(); - my $output = "" ; + my $output = '' ; $status = $x->inflate($string, $output); if ( $status == Z_OK() ) diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm index 9bec93e..1628017 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.052 qw(:Status); +use IO::Compress::Base::Common 2.055 qw(:Status); -use Compress::Raw::Bzip2 2.052 ; +use Compress::Raw::Bzip2 2.055 ; our ($VERSION); -$VERSION = '2.052'; +$VERSION = '2.055'; 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 3194587..1bb2013 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.052 qw(:Status); -use Compress::Raw::Zlib 2.052 qw( !crc32 !adler32 ) ; +use IO::Compress::Base::Common 2.055 qw(:Status); +use Compress::Raw::Zlib 2.055 qw( !crc32 !adler32 ) ; require Exporter; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, @EXPORT, %DEFLATE_CONSTANTS); -$VERSION = '2.052'; +$VERSION = '2.055'; @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 cd06d31..e15e107 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.052 qw(:Status); +use IO::Compress::Base::Common 2.055 qw(:Status); our ($VERSION); -$VERSION = '2.052'; +$VERSION = '2.055'; sub mkCompObject { diff --git a/cpan/IO-Compress/lib/IO/Compress/Base.pm b/cpan/IO-Compress/lib/IO/Compress/Base.pm index 3bb330e..6427eea 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.052 ; +use IO::Compress::Base::Common 2.055 ; use IO::File qw(SEEK_SET SEEK_END); ; use Scalar::Util qw(blessed readonly); @@ -20,7 +20,7 @@ use bytes; our (@ISA, $VERSION); @ISA = qw(Exporter IO::File); -$VERSION = '2.052'; +$VERSION = '2.055'; #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 5f53bc9..a125ca5 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.052'; +$VERSION = '2.055'; @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 597950e..f96d28d 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.052 ; +use IO::Compress::Base 2.055 ; -use IO::Compress::Base::Common 2.052 qw(createSelfTiedObject); -use IO::Compress::Adapter::Bzip2 2.052 ; +use IO::Compress::Base::Common 2.055 qw(createSelfTiedObject); +use IO::Compress::Adapter::Bzip2 2.055 ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error); -$VERSION = '2.052'; +$VERSION = '2.055'; $Bzip2Error = ''; @ISA = qw(Exporter IO::Compress::Base); @@ -51,7 +51,7 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.052 qw(:Parse); + use IO::Compress::Base::Common 2.055 qw(:Parse); return ( 'BlockSize100K' => [0, 1, Parse_unsigned, 1], diff --git a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm index 1a902fa..825d2de 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.052 (); -use IO::Compress::Adapter::Deflate 2.052 ; +use IO::Compress::RawDeflate 2.055 (); +use IO::Compress::Adapter::Deflate 2.055 ; -use IO::Compress::Zlib::Constants 2.052 ; -use IO::Compress::Base::Common 2.052 qw(createSelfTiedObject); +use IO::Compress::Zlib::Constants 2.055 ; +use IO::Compress::Base::Common 2.055 qw(createSelfTiedObject); our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $DeflateError); -$VERSION = '2.052'; +$VERSION = '2.055'; $DeflateError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); diff --git a/cpan/IO-Compress/lib/IO/Compress/FAQ.pod b/cpan/IO-Compress/lib/IO/Compress/FAQ.pod index 577ab05..745979f 100644 --- a/cpan/IO-Compress/lib/IO/Compress/FAQ.pod +++ b/cpan/IO-Compress/lib/IO/Compress/FAQ.pod @@ -201,6 +201,32 @@ L The primary site for gzip is F. +=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. +The example below illustrates this behaviour + + $ echo abc | gzip -c >x.gz + $ echo def | gzip -c >>x.gz + $ gunzip -c x.gz + abc + def + +By default C will I bahave like the gunzip +program. It will only uncompress the first gzip data stream in the file, as +shown below + + $ perl -MIO::Uncompress::Gunzip=:all -e 'gunzip "x.gz" => \*STDOUT' + abc + +To force C to uncompress all the gzip data streams, +include the C option, as shown below + + $ perl -MIO::Uncompress::Gunzip=:all -e 'gunzip "x.gz" => \*STDOUT, MultiStream => 1' + abc + def + =head1 ZLIB =head2 Zlib Resources @@ -208,6 +234,51 @@ The primary site for gzip is F. The primary site for the I compression library is F. +=head1 Bzip2 + +=head2 Bzip2 Resources + +The primary site for bzip2 is F. + +=head2 Dealing with Concatenated bzip2 files + +If the bunzip2 program encounters a file containing multiple bzip2 files +concatenated together it will automatically uncompress them all. +The example below illustrates this behaviour + + $ echo abc | bzip2 -c >x.bz2 + $ echo def | bzip2 -c >>x.bz2 + $ bunzip2 -c x.bz2 + abc + def + +By default C will I bahave like the bunzip2 +program. It will only uncompress the first bunzip2 data stream in the file, as +shown below + + $ perl -MIO::Uncompress::Bunzip2=:all -e 'bunzip2 "x.bz2" => \*STDOUT' + abc + +To force C to uncompress all the bzip2 data streams, +include the C option, as shown below + + $ perl -MIO::Uncompress::Bunzip2=:all -e 'bunzip2 "x.bz2" => \*STDOUT, MultiStream => 1' + abc + def + +=head2 Interoperating with Pbzip2 + +Pbzip2 (L) is a parallel implementation of +bzip2. The output from pbzip2 consists of a series of concatenated bzip2 +data streams. + +By default C will only uncompress the first bzip2 +data stream in a pbzip2 file. To uncompress the complete pbzip2 file you +must include the C option, like this. + + bunzip2 $input => \$output, MultiStream => 1 + or die "bunzip2 failed: $Bunzip2Error\n"; + =head1 HTTP & NETWORK =head2 Apache::GZip Revisited diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm index bfde720..1dd7ca7 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.052 () ; -use IO::Compress::Adapter::Deflate 2.052 ; +use IO::Compress::RawDeflate 2.055 () ; +use IO::Compress::Adapter::Deflate 2.055 ; -use IO::Compress::Base::Common 2.052 qw(:Status :Parse isaScalar createSelfTiedObject); -use IO::Compress::Gzip::Constants 2.052 ; -use IO::Compress::Zlib::Extra 2.052 ; +use IO::Compress::Base::Common 2.055 qw(:Status :Parse isaScalar createSelfTiedObject); +use IO::Compress::Gzip::Constants 2.055 ; +use IO::Compress::Zlib::Extra 2.055 ; BEGIN { @@ -25,7 +25,7 @@ BEGIN our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $GzipError); -$VERSION = '2.052'; +$VERSION = '2.055'; $GzipError = '' ; @ISA = qw(Exporter IO::Compress::RawDeflate); diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm index 7623857..598d720 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.052'; +$VERSION = '2.055'; @ISA = qw(Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm index df2efbb..de33a02 100644 --- a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm +++ b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm @@ -7,15 +7,15 @@ use warnings; use bytes; -use IO::Compress::Base 2.052 ; -use IO::Compress::Base::Common 2.052 qw(:Status createSelfTiedObject); -use IO::Compress::Adapter::Deflate 2.052 ; +use IO::Compress::Base 2.055 ; +use IO::Compress::Base::Common 2.055 qw(:Status createSelfTiedObject); +use IO::Compress::Adapter::Deflate 2.055 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError); -$VERSION = '2.052'; +$VERSION = '2.055'; $RawDeflateError = ''; @ISA = qw(Exporter IO::Compress::Base); @@ -121,8 +121,8 @@ sub getZlibParams { my $self = shift ; - use IO::Compress::Base::Common 2.052 qw(:Parse); - use Compress::Raw::Zlib 2.052 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); + use IO::Compress::Base::Common 2.055 qw(:Parse); + use Compress::Raw::Zlib 2.055 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); return ( diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip.pm b/cpan/IO-Compress/lib/IO/Compress/Zip.pm index 81a9b2d..e25b8fd 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.052 qw(:Status MAX32 isGeMax32 isaScalar createSelfTiedObject); -use IO::Compress::RawDeflate 2.052 (); -use IO::Compress::Adapter::Deflate 2.052 ; -use IO::Compress::Adapter::Identity 2.052 ; -use IO::Compress::Zlib::Extra 2.052 ; -use IO::Compress::Zip::Constants 2.052 ; +use IO::Compress::Base::Common 2.055 qw(:Status MAX32 isGeMax32 isaScalar createSelfTiedObject); +use IO::Compress::RawDeflate 2.055 (); +use IO::Compress::Adapter::Deflate 2.055 ; +use IO::Compress::Adapter::Identity 2.055 ; +use IO::Compress::Zlib::Extra 2.055 ; +use IO::Compress::Zip::Constants 2.055 ; use File::Spec(); use Config; -use Compress::Raw::Zlib 2.052 (); +use Compress::Raw::Zlib 2.055 (); BEGIN { eval { require IO::Compress::Adapter::Bzip2 ; - import IO::Compress::Adapter::Bzip2 2.052 ; + import IO::Compress::Adapter::Bzip2 2.055 ; require IO::Compress::Bzip2 ; - import IO::Compress::Bzip2 2.052 ; + import IO::Compress::Bzip2 2.055 ; } ; eval { require IO::Compress::Adapter::Lzma ; - import IO::Compress::Adapter::Lzma 2.052 ; + import IO::Compress::Adapter::Lzma 2.055 ; require IO::Compress::Lzma ; - import IO::Compress::Lzma 2.052 ; + import IO::Compress::Lzma 2.055 ; } ; } @@ -36,7 +36,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $ZipError); -$VERSION = '2.052'; +$VERSION = '2.055'; $ZipError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -667,8 +667,8 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.052 qw(:Parse); - use Compress::Raw::Zlib 2.052 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); + use IO::Compress::Base::Common 2.055 qw(:Parse); + use Compress::Raw::Zlib 2.055 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); my @Bzip2 = (); diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm index 4b73cb2..390f105 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.052'; +$VERSION = '2.055'; @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 4b7b023..693b435 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.052'; +$VERSION = '2.055'; @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 b5a1363..9887314 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.052'; +$VERSION = '2.055'; -use IO::Compress::Gzip::Constants 2.052 ; +use IO::Compress::Gzip::Constants 2.055 ; 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 a0e5ed2..35ed15f 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.052 qw(:Status); +use IO::Compress::Base::Common 2.055 qw(:Status); -use Compress::Raw::Bzip2 2.052 ; +use Compress::Raw::Bzip2 2.055 ; our ($VERSION, @ISA); -$VERSION = '2.052'; +$VERSION = '2.055'; 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 3e97560..bd33ebc 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.052 qw(:Status); +use IO::Compress::Base::Common 2.055 qw(:Status); use IO::Compress::Zip::Constants ; our ($VERSION); -$VERSION = '2.052'; +$VERSION = '2.055'; -use Compress::Raw::Zlib 2.052 (); +use Compress::Raw::Zlib 2.055 (); 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 08d4462..cfa4e98 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.052 qw(:Status); -use Compress::Raw::Zlib 2.052 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); +use IO::Compress::Base::Common 2.055 qw(:Status); +use Compress::Raw::Zlib 2.055 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); our ($VERSION); -$VERSION = '2.052'; +$VERSION = '2.055'; diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm index 9048ad7..7a971fc 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.052 qw(createSelfTiedObject); +use IO::Compress::Base::Common 2.055 qw(createSelfTiedObject); -use IO::Uncompress::Adapter::Inflate 2.052 (); +use IO::Uncompress::Adapter::Inflate 2.055 (); -use IO::Uncompress::Base 2.052 ; -use IO::Uncompress::Gunzip 2.052 ; -use IO::Uncompress::Inflate 2.052 ; -use IO::Uncompress::RawInflate 2.052 ; -use IO::Uncompress::Unzip 2.052 ; +use IO::Uncompress::Base 2.055 ; +use IO::Uncompress::Gunzip 2.055 ; +use IO::Uncompress::Inflate 2.055 ; +use IO::Uncompress::RawInflate 2.055 ; +use IO::Uncompress::Unzip 2.055 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError); -$VERSION = '2.052'; +$VERSION = '2.055'; $AnyInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -48,7 +48,7 @@ sub anyinflate sub getExtraParams { - use IO::Compress::Base::Common 2.052 qw(:Parse); + use IO::Compress::Base::Common 2.055 qw(:Parse); return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ) ; } diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm index 238be02..1d93c4f 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.052 qw(createSelfTiedObject); +use IO::Compress::Base::Common 2.055 qw(createSelfTiedObject); -use IO::Uncompress::Base 2.052 ; +use IO::Uncompress::Base 2.055 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError); -$VERSION = '2.052'; +$VERSION = '2.055'; $AnyUncompressError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -27,22 +27,22 @@ Exporter::export_ok_tags('all'); BEGIN { - eval ' use IO::Uncompress::Adapter::Inflate 2.052 ;'; - eval ' use IO::Uncompress::Adapter::Bunzip2 2.052 ;'; - eval ' use IO::Uncompress::Adapter::LZO 2.052 ;'; - eval ' use IO::Uncompress::Adapter::Lzf 2.052 ;'; - eval ' use IO::Uncompress::Adapter::UnLzma 2.052 ;'; - eval ' use IO::Uncompress::Adapter::UnXz 2.052 ;'; - - eval ' use IO::Uncompress::Bunzip2 2.052 ;'; - eval ' use IO::Uncompress::UnLzop 2.052 ;'; - eval ' use IO::Uncompress::Gunzip 2.052 ;'; - eval ' use IO::Uncompress::Inflate 2.052 ;'; - eval ' use IO::Uncompress::RawInflate 2.052 ;'; - eval ' use IO::Uncompress::Unzip 2.052 ;'; - eval ' use IO::Uncompress::UnLzf 2.052 ;'; - eval ' use IO::Uncompress::UnLzma 2.052 ;'; - eval ' use IO::Uncompress::UnXz 2.052 ;'; + eval ' use IO::Uncompress::Adapter::Inflate 2.055 ;'; + eval ' use IO::Uncompress::Adapter::Bunzip2 2.055 ;'; + eval ' use IO::Uncompress::Adapter::LZO 2.055 ;'; + eval ' use IO::Uncompress::Adapter::Lzf 2.055 ;'; + eval ' use IO::Uncompress::Adapter::UnLzma 2.055 ;'; + eval ' use IO::Uncompress::Adapter::UnXz 2.055 ;'; + + eval ' use IO::Uncompress::Bunzip2 2.055 ;'; + eval ' use IO::Uncompress::UnLzop 2.055 ;'; + eval ' use IO::Uncompress::Gunzip 2.055 ;'; + eval ' use IO::Uncompress::Inflate 2.055 ;'; + eval ' use IO::Uncompress::RawInflate 2.055 ;'; + eval ' use IO::Uncompress::Unzip 2.055 ;'; + eval ' use IO::Uncompress::UnLzf 2.055 ;'; + eval ' use IO::Uncompress::UnLzma 2.055 ;'; + eval ' use IO::Uncompress::UnXz 2.055 ;'; } sub new @@ -60,7 +60,7 @@ sub anyuncompress sub getExtraParams { - use IO::Compress::Base::Common 2.052 qw(:Parse); + use IO::Compress::Base::Common 2.055 qw(:Parse); return ( 'RawInflate' => [1, 1, Parse_boolean, 0] , 'UnLzma' => [1, 1, Parse_boolean, 0] ) ; } diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm index 5a00db9..0b66385 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.052'; +$VERSION = '2.055'; use constant G_EOF => 0 ; use constant G_ERR => -1 ; -use IO::Compress::Base::Common 2.052 ; +use IO::Compress::Base::Common 2.055 ; 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 0d41189..4797c9c 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.052 qw(:Status createSelfTiedObject); +use IO::Compress::Base::Common 2.055 qw(:Status createSelfTiedObject); -use IO::Uncompress::Base 2.052 ; -use IO::Uncompress::Adapter::Bunzip2 2.052 ; +use IO::Uncompress::Base 2.055 ; +use IO::Uncompress::Adapter::Bunzip2 2.055 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error); -$VERSION = '2.052'; +$VERSION = '2.055'; $Bunzip2Error = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -40,7 +40,7 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.052 qw(:Parse); + use IO::Compress::Base::Common 2.055 qw(:Parse); return ( 'Verbosity' => [1, 1, Parse_boolean, 0], diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm index 3cabbeb..2d190f4 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.052 ; +use IO::Uncompress::RawInflate 2.055 ; -use Compress::Raw::Zlib 2.052 () ; -use IO::Compress::Base::Common 2.052 qw(:Status createSelfTiedObject); -use IO::Compress::Gzip::Constants 2.052 ; -use IO::Compress::Zlib::Extra 2.052 ; +use Compress::Raw::Zlib 2.055 () ; +use IO::Compress::Base::Common 2.055 qw(:Status createSelfTiedObject); +use IO::Compress::Gzip::Constants 2.055 ; +use IO::Compress::Zlib::Extra 2.055 ; require Exporter ; @@ -28,7 +28,7 @@ Exporter::export_ok_tags('all'); $GunzipError = ''; -$VERSION = '2.052'; +$VERSION = '2.055'; sub new { @@ -47,7 +47,7 @@ sub gunzip sub getExtraParams { - use IO::Compress::Base::Common 2.052 qw(:Parse); + use IO::Compress::Base::Common 2.055 qw(:Parse); return ( 'ParseExtra' => [1, 1, Parse_boolean, 0] ) ; } diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm index 2a92dae..433172d 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.052 qw(:Status createSelfTiedObject); -use IO::Compress::Zlib::Constants 2.052 ; +use IO::Compress::Base::Common 2.055 qw(:Status createSelfTiedObject); +use IO::Compress::Zlib::Constants 2.055 ; -use IO::Uncompress::RawInflate 2.052 ; +use IO::Uncompress::RawInflate 2.055 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError); -$VERSION = '2.052'; +$VERSION = '2.055'; $InflateError = ''; @ISA = qw( Exporter IO::Uncompress::RawInflate ); diff --git a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm index cfc25a3..9d5e2c8 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.052 ; -use IO::Compress::Base::Common 2.052 qw(:Status createSelfTiedObject); +use Compress::Raw::Zlib 2.055 ; +use IO::Compress::Base::Common 2.055 qw(:Status createSelfTiedObject); -use IO::Uncompress::Base 2.052 ; -use IO::Uncompress::Adapter::Inflate 2.052 ; +use IO::Uncompress::Base 2.055 ; +use IO::Uncompress::Adapter::Inflate 2.055 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError); -$VERSION = '2.052'; +$VERSION = '2.055'; $RawInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm index 966a4f3..7d770ba 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.052 ; -use IO::Compress::Base::Common 2.052 qw(:Status createSelfTiedObject); -use IO::Uncompress::Adapter::Inflate 2.052 ; -use IO::Uncompress::Adapter::Identity 2.052 ; -use IO::Compress::Zlib::Extra 2.052 ; -use IO::Compress::Zip::Constants 2.052 ; +use IO::Uncompress::RawInflate 2.055 ; +use IO::Compress::Base::Common 2.055 qw(:Status createSelfTiedObject); +use IO::Uncompress::Adapter::Inflate 2.055 ; +use IO::Uncompress::Adapter::Identity 2.055 ; +use IO::Compress::Zlib::Extra 2.055 ; +use IO::Compress::Zip::Constants 2.055 ; -use Compress::Raw::Zlib 2.052 () ; +use Compress::Raw::Zlib 2.055 () ; BEGIN { @@ -31,7 +31,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup); -$VERSION = '2.052'; +$VERSION = '2.055'; $UnzipError = ''; @ISA = qw(Exporter IO::Uncompress::RawInflate); @@ -64,7 +64,7 @@ sub unzip sub getExtraParams { - use IO::Compress::Base::Common 2.052 qw(:Parse); + use IO::Compress::Base::Common 2.055 qw(:Parse); return ( @@ -1783,7 +1783,7 @@ stream at a time. or die "Cannot open $zipfile: $UnzipError"; my $status; - for ($status = 1; $stream > 0; $status = $u->nextStream()) + for ($status = 1; $status > 0; $status = $u->nextStream()) { my $name = $u->getHeaderInfo()->{Name}; diff --git a/cpan/IO-Compress/t/000prereq.t b/cpan/IO-Compress/t/000prereq.t index f70745e..46e1054 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.052'; + my $VERSION = '2.055'; my @NAMES = qw( Compress::Raw::Bzip2 Compress::Raw::Zlib -- 2.7.4