In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/513b1ee2ffc66290ce706625c54422114d634f98?hp=2cc12391b30fddb6f67ee8dca6140a805774bc15>
- Log ----------------------------------------------------------------- commit 513b1ee2ffc66290ce706625c54422114d634f98 Author: Steve Hay <[email protected]> Date: Wed Aug 8 14:15:41 2012 +0100 Upgrade IO-Compress to 2.055 M Porting/Maintainers.pl M cpan/IO-Compress/Changes M cpan/IO-Compress/Makefile.PL M cpan/IO-Compress/README M cpan/IO-Compress/lib/Compress/Zlib.pm M cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm M cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm M cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm M cpan/IO-Compress/lib/IO/Compress/Base.pm M cpan/IO-Compress/lib/IO/Compress/Base/Common.pm M cpan/IO-Compress/lib/IO/Compress/Bzip2.pm M cpan/IO-Compress/lib/IO/Compress/Deflate.pm M cpan/IO-Compress/lib/IO/Compress/FAQ.pod M cpan/IO-Compress/lib/IO/Compress/Gzip.pm M cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm M cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm M cpan/IO-Compress/lib/IO/Compress/Zip.pm M cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm M cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm M cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm M cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm M cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm M cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm M cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm M cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm M cpan/IO-Compress/lib/IO/Uncompress/Base.pm M cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm M cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm M cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm M cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm M cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm M cpan/IO-Compress/t/000prereq.t commit 16e4c876349cf3bfb1b135fa39cc3b5e39627ac8 Author: Steve Hay <[email protected]> Date: Wed Aug 8 14:09:53 2012 +0100 Upgrade Compress-Raw-Bzip2 and Compress-Raw-Zlib to 2.055 M Porting/Maintainers.pl M cpan/Compress-Raw-Bzip2/README M cpan/Compress-Raw-Bzip2/t/000prereq.t M cpan/Compress-Raw-Zlib/README commit 9d90bd60fec830834e56dfd4cc1aaf499c322831 Author: Paul <paul@paul-desktop.(none)> Date: Sat Aug 4 16:53:10 2012 +0100 MAgic for Zlib & Bzip2 M cpan/Compress-Raw-Bzip2/Bzip2.xs M cpan/Compress-Raw-Bzip2/Changes M cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm M cpan/Compress-Raw-Zlib/Changes M cpan/Compress-Raw-Zlib/Zlib.xs M cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 6 +- cpan/Compress-Raw-Bzip2/Bzip2.xs | 68 +++++++++------ cpan/Compress-Raw-Bzip2/Changes | 5 + cpan/Compress-Raw-Bzip2/README | 6 +- cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm | 2 +- cpan/Compress-Raw-Bzip2/t/000prereq.t | 2 +- cpan/Compress-Raw-Zlib/Changes | 5 + cpan/Compress-Raw-Zlib/README | 20 ++-- cpan/Compress-Raw-Zlib/Zlib.xs | 52 ++++++----- cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm | 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 +- 41 files changed, 364 insertions(+), 235 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index b40341a..841e5bd 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -365,7 +365,7 @@ use File::Glob qw(:case); 'Compress::Raw::Bzip2' => { 'MAINTAINER' => 'pmqs', - 'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.052.tar.gz', + 'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.055.tar.gz', 'FILES' => q[cpan/Compress-Raw-Bzip2], 'EXCLUDED' => [ qr{^t/Test/}, @@ -376,7 +376,7 @@ use File::Glob qw(:case); 'Compress::Raw::Zlib' => { 'MAINTAINER' => 'pmqs', - 'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.054.tar.gz', + 'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.055.tar.gz', 'FILES' => q[cpan/Compress-Raw-Zlib], 'EXCLUDED' => [ @@ -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/Compress-Raw-Bzip2/Bzip2.xs b/cpan/Compress-Raw-Bzip2/Bzip2.xs index 128063c..f2ccc79 100644 --- a/cpan/Compress-Raw-Bzip2/Bzip2.xs +++ b/cpan/Compress-Raw-Bzip2/Bzip2.xs @@ -323,11 +323,13 @@ char * string ; if (SvREADONLY(sv) && PL_curcop != &PL_compiling) croak("%s: buffer parameter is read-only", string); - SvUPGRADE(sv, SVt_PV) ; + SvUPGRADE(sv, SVt_PV); + if (wipe) - sv_setpv(sv, "") ; + sv_setpv(sv, "") ; else (void)SvPVbyte_force(sv, na) ; + return sv ; } @@ -493,9 +495,9 @@ bzdeflate (s, buf, output) #ifdef UTF8_AVAILABLE if (DO_UTF8(buf) && !sv_utf8_downgrade(buf, 1)) croak("Wide character in " COMPRESS_CLASS "::bzdeflate input parameter"); -#endif - s->stream.next_in = SvPV_nomg_nolen(buf); - s->stream.avail_in = SvCUR(buf); +#endif + s->stream.next_in = (char*)SvPVbyte_nolen(buf) ; + s->stream.avail_in = SvCUR(buf) ; /* and retrieve the output buffer */ output = deRef_l(output, "deflate") ; @@ -503,19 +505,22 @@ bzdeflate (s, buf, output) if (DO_UTF8(output) && !sv_utf8_downgrade(output, 1)) croak("Wide character in " COMPRESS_CLASS "::bzdeflate output parameter"); #endif - if((s->flags & FLAG_APPEND_OUTPUT) != FLAG_APPEND_OUTPUT) + + if((s->flags & FLAG_APPEND_OUTPUT) != FLAG_APPEND_OUTPUT) { SvCUR_set(output, 0); + /* sv_setpvn(output, "", 0); */ + } cur_length = SvCUR(output) ; - s->stream.next_out = SvPVX(output) + cur_length; + s->stream.next_out = (char*) SvPVX(output) + cur_length; increment = SvLEN(output) - cur_length; s->stream.avail_out = increment; while (s->stream.avail_in != 0) { if (s->stream.avail_out == 0) { /* out of space in the output buffer so make it bigger */ - Sv_Grow(output, SvLEN(output) + bufinc) ; + s->stream.next_out = Sv_Grow(output, SvLEN(output) + bufinc) ; cur_length += increment ; - s->stream.next_out = SvPVX(output) + cur_length ; + s->stream.next_out += cur_length ; increment = bufinc ; s->stream.avail_out = increment; bufinc *= 2 ; @@ -565,19 +570,21 @@ bzclose(s, output) if (DO_UTF8(output) && !sv_utf8_downgrade(output, 1)) croak("Wide character in " COMPRESS_CLASS "::bzclose input parameter"); #endif - if(! s->flags & FLAG_APPEND_OUTPUT) + if(! s->flags & FLAG_APPEND_OUTPUT) { SvCUR_set(output, 0); + /* sv_setpvn(output, "", 0); */ + } cur_length = SvCUR(output) ; - s->stream.next_out = SvPVX(output) + cur_length; + s->stream.next_out = (char*) SvPVX(output) + cur_length; increment = SvLEN(output) - cur_length; s->stream.avail_out = increment; for (;;) { if (s->stream.avail_out == 0) { /* consumed all the available output, so extend it */ - Sv_Grow(output, SvLEN(output) + bufinc) ; + s->stream.next_out = Sv_Grow(output, SvLEN(output) + bufinc) ; cur_length += increment ; - s->stream.next_out = SvPVX(output) + cur_length ; + s->stream.next_out += cur_length ; increment = bufinc ; s->stream.avail_out = increment; bufinc *= 2 ; @@ -624,19 +631,21 @@ bzflush(s, output) if (DO_UTF8(output) && !sv_utf8_downgrade(output, 1)) croak("Wide character in " COMPRESS_CLASS "::bzflush input parameter"); #endif - if(! s->flags & FLAG_APPEND_OUTPUT) + if(! s->flags & FLAG_APPEND_OUTPUT) { SvCUR_set(output, 0); + /* sv_setpvn(output, "", 0); */ + } cur_length = SvCUR(output) ; - s->stream.next_out = SvPVX(output) + cur_length; + s->stream.next_out = (char*) SvPVX(output) + cur_length; increment = SvLEN(output) - cur_length; s->stream.avail_out = increment; for (;;) { if (s->stream.avail_out == 0) { /* consumed all the available output, so extend it */ - Sv_Grow(output, SvLEN(output) + bufinc) ; + s->stream.next_out = Sv_Grow(output, SvLEN(output) + bufinc) ; cur_length += increment ; - s->stream.next_out = SvPVX(output) + cur_length ; + s->stream.next_out += cur_length ; increment = bufinc ; s->stream.avail_out = increment; bufinc *= 2 ; @@ -733,8 +742,8 @@ bzinflate (s, buf, output) #endif /* initialise the input buffer */ - s->stream.next_in = SvPV_nomg_nolen(buf); - s->stream.avail_in = stmp = SvCUR(buf); + s->stream.next_in = (char*)SvPVbyte_force(buf, stmp) ; + s->stream.avail_in = SvCUR(buf); /* and retrieve the output buffer */ output = deRef_l(output, "bzinflate") ; @@ -764,7 +773,7 @@ bzinflate (s, buf, output) */ if (SvLEN(output) > cur_length + 1) { - s->stream.next_out = SvPVX(output) + cur_length; + s->stream.next_out = (char*) SvPVX(output) + cur_length; increment = SvLEN(output) - cur_length - 1; s->stream.avail_out = increment; } @@ -778,9 +787,9 @@ bzinflate (s, buf, output) if (s->stream.avail_out == 0) { /* out of space in the output buffer so make it bigger */ - Sv_Grow(output, SvLEN(output) + bufinc + 1) ; + s->stream.next_out = Sv_Grow(output, SvLEN(output) + bufinc + 1) ; cur_length += increment ; - s->stream.next_out = SvPVX(output) + cur_length ; + s->stream.next_out += cur_length ; increment = bufinc ; s->stream.avail_out = increment; bufinc *= 2 ; @@ -789,7 +798,10 @@ bzinflate (s, buf, output) /* DispStream(s, "pre"); */ RETVAL = BZ2_bzDecompress (&(s->stream)); - /* DispStream(s, "apres"); */ + /* + printf("Status %d\n", RETVAL); + DispStream(s, "apres"); + */ if (RETVAL != BZ_OK || s->flags & FLAG_LIMIT_OUTPUT) break ; @@ -813,12 +825,12 @@ bzinflate (s, buf, output) SvPOK_only(output); SvCUR_set(output, prefix_length + s->bytesInflated) ; - *SvEND(output) = '\0' ; + *SvEND(output) = '\0'; #ifdef UTF8_AVAILABLE if (out_utf8) - sv_utf8_upgrade(output) ; + sv_utf8_upgrade(output); #endif - SvSETMAGIC(output) ; + SvSETMAGIC(output); /* fix the input buffer */ if (s->flags & FLAG_CONSUME_INPUT) { @@ -826,8 +838,8 @@ bzinflate (s, buf, output) SvCUR_set(buf, in) ; if (in) Move(s->stream.next_in, SvPVX(buf), in, char) ; - *SvEND(buf) = '\0' ; - SvSETMAGIC(buf) ; + *SvEND(buf) = '\0'; + SvSETMAGIC(buf); } } OUTPUT: diff --git a/cpan/Compress-Raw-Bzip2/Changes b/cpan/Compress-Raw-Bzip2/Changes index 7dd052b..0ee8d27 100644 --- a/cpan/Compress-Raw-Bzip2/Changes +++ b/cpan/Compress-Raw-Bzip2/Changes @@ -1,6 +1,11 @@ CHANGES ------- + 2.055 4 August 2012 + + * Fix misuse of magic in API + [#78080] + 2.052 29 April 2012 * No Changes diff --git a/cpan/Compress-Raw-Bzip2/README b/cpan/Compress-Raw-Bzip2/README index f39f6be..4e57b1a 100644 --- a/cpan/Compress-Raw-Bzip2/README +++ b/cpan/Compress-Raw-Bzip2/README @@ -1,9 +1,9 @@ Compress-Raw-Bzip2 - Version 2.052 + Version 2.055 - 29th April 2012 + 5th August 2012 Copyright (c) 2005-2012 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -164,7 +164,7 @@ To help me help you, I need all of the following information: If you haven't installed Compress-Raw-Bzip2 then search Compress::Raw::Bzip2.pm for a line like this: - $VERSION = "2.052" ; + $VERSION = "2.055" ; c. The version of bzip2 you have used. If you have successfully installed Compress-Raw-Bzip2, this one-liner diff --git a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm index 589f390..9263d65 100644 --- a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm +++ b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm @@ -12,7 +12,7 @@ use Carp ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD); -$VERSION = '2.05201'; +$VERSION = '2.055'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; diff --git a/cpan/Compress-Raw-Bzip2/t/000prereq.t b/cpan/Compress-Raw-Bzip2/t/000prereq.t index 13a447a..0f95b00 100644 --- a/cpan/Compress-Raw-Bzip2/t/000prereq.t +++ b/cpan/Compress-Raw-Bzip2/t/000prereq.t @@ -19,7 +19,7 @@ BEGIN if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 }; - my $VERSION = '2.052'; + my $VERSION = '2.055'; my @NAMES = qw( ); diff --git a/cpan/Compress-Raw-Zlib/Changes b/cpan/Compress-Raw-Zlib/Changes index 71e4879..a2501d8 100644 --- a/cpan/Compress-Raw-Zlib/Changes +++ b/cpan/Compress-Raw-Zlib/Changes @@ -1,6 +1,11 @@ CHANGES ------- + 2.055 4 August 2012 + + * Fix misuse of magic in API + [#78079] + 2.054 8 May 2012 * Build issue on Win32 diff --git a/cpan/Compress-Raw-Zlib/README b/cpan/Compress-Raw-Zlib/README index 5e491ac..6dcec52 100644 --- a/cpan/Compress-Raw-Zlib/README +++ b/cpan/Compress-Raw-Zlib/README @@ -1,9 +1,9 @@ - Compress-Raw-Zlib + Compress-Raw-Zlib - Version 2.054 + Version 2.055 - 8th May 2012 + 5th August 2012 Copyright (c) 2005-2012 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -11,7 +11,7 @@ The directory zlib-src contains a subset of the source files copied directly from zlib version 1.2.7. - These files are Copyright(C) 1995-2010 + These files are Copyright(C) 1995-2012 Jean-loup Gailly and Mark Adler. Full source for the zlib library is available at http://www.zlib.org @@ -99,16 +99,16 @@ before building this module. For option 2, fetch a copy of the zlib source distribution from http://www.zlib.org and unpack it into the Compress-Raw-Zlib source - directory. Assuming you have fetched zlib 1.2.6, - it will create a directory called zlib-1.2.6. + directory. Assuming you have fetched zlib 1.2.7, + it will create a directory called zlib-1.2.7. Now set the variables in the file config.in as follows (if the version - you have fetched isn't 1.2.6, change the INCLUDE and LIB + you have fetched isn't 1.2.7, change the INCLUDE and LIB variables appropriately): BUILD_ZLIB = True - INCLUDE = ./zlib-1.2.6 - LIB = ./zlib-1.2.6 + INCLUDE = ./zlib-1.2.7 + LIB = ./zlib-1.2.7 OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT @@ -355,7 +355,7 @@ To help me help you, I need all of the following information: If you haven't installed Compress-Raw-Zlib then search Compress::Raw::Zlib.pm for a line like this: - $VERSION = "2.052" ; + $VERSION = "2.055" ; c. The version of zlib you have used. If you have successfully installed Compress-Raw-Zlib, this one-liner diff --git a/cpan/Compress-Raw-Zlib/Zlib.xs b/cpan/Compress-Raw-Zlib/Zlib.xs index e57a38a..5b0378d 100644 --- a/cpan/Compress-Raw-Zlib/Zlib.xs +++ b/cpan/Compress-Raw-Zlib/Zlib.xs @@ -617,11 +617,13 @@ char * string ; if (SvREADONLY(sv) && PL_curcop != &PL_compiling) croak("%s: buffer parameter is read-only", string); - SvUPGRADE(sv, SVt_PV) ; + SvUPGRADE(sv, SVt_PV); + if (wipe) - sv_setpv(sv, "") ; + sv_setpv(sv, "") ; else (void)SvPVbyte_force(sv, na) ; + return sv ; } @@ -793,7 +795,6 @@ _deflateInit(flags,level, method, windowBits, memLevel, strategy, bufsize, dicti warn(" _deflateInit2 returned %d\n", err); /* Check if a dictionary has been specified */ - SvGETMAGIC(dictionary); if (err == Z_OK && SvPOK(dictionary) && SvCUR(dictionary)) { #ifdef UTF8_AVAILABLE @@ -923,11 +924,11 @@ deflate (s, buf, output) Compress::Raw::Zlib::deflateStream s SV * buf SV * output - PREINIT: - uInt cur_length; - uInt increment; - uInt prefix; - uLong bufinc; + uInt cur_length = NO_INIT + uInt increment = NO_INIT + uInt prefix = NO_INIT + int RETVAL = 0; + uLong bufinc = NO_INIT CODE: bufinc = s->bufsize; @@ -939,7 +940,7 @@ deflate (s, buf, output) if (DO_UTF8(buf) && !sv_utf8_downgrade(buf, 1)) croak("Wide character in Compress::Raw::Zlib::Deflate::deflate input parameter"); #endif - s->stream.next_in = (Bytef*)SvPV_nomg_nolen(buf) ; + s->stream.next_in = (Bytef*)SvPVbyte_nolen(buf) ; s->stream.avail_in = SvCUR(buf) ; if (s->flags & FLAG_CRC32) @@ -996,9 +997,9 @@ deflate (s, buf, output) if (s->stream.avail_out == 0) { /* out of space in the output buffer so make it bigger */ - Sv_Grow(output, SvLEN(output) + bufinc) ; + s->stream.next_out = Sv_Grow(output, SvLEN(output) + bufinc) ; cur_length += increment ; - s->stream.next_out = (Bytef*) SvPVX(output) + cur_length ; + s->stream.next_out += cur_length ; increment = bufinc ; s->stream.avail_out = increment; bufinc *= 2 ; @@ -1097,9 +1098,9 @@ flush(s, output, f=Z_FINISH) for (;;) { if (s->stream.avail_out == 0) { /* consumed all the available output, so extend it */ - Sv_Grow(output, SvLEN(output) + bufinc) ; + s->stream.next_out = Sv_Grow(output, SvLEN(output) + bufinc) ; cur_length += increment ; - s->stream.next_out = (Bytef*) SvPVX(output) + cur_length ; + s->stream.next_out += cur_length ; increment = bufinc ; s->stream.avail_out = increment; bufinc *= 2 ; @@ -1319,11 +1320,12 @@ inflate (s, buf, output, eof=FALSE) SV * buf SV * output bool eof - PREINIT: uInt cur_length = 0; uInt prefix_length = 0; int increment = 0; - uLong bufinc; + STRLEN stmp = NO_INIT + uLong bufinc = NO_INIT + PREINIT: #ifdef UTF8_AVAILABLE bool out_utf8 = FALSE; #endif @@ -1340,7 +1342,7 @@ inflate (s, buf, output, eof=FALSE) #endif /* initialise the input buffer */ - s->stream.next_in = (Bytef*)SvPV_nomg_nolen(buf) ; + s->stream.next_in = (Bytef*)SvPVbyte_force(buf, stmp) ; s->stream.avail_in = SvCUR(buf) ; /* and retrieve the output buffer */ @@ -1386,9 +1388,9 @@ inflate (s, buf, output, eof=FALSE) while (RETVAL == Z_OK) { if (s->stream.avail_out == 0) { /* out of space in the output buffer so make it bigger */ - Sv_Grow(output, SvLEN(output) + bufinc +1) ; + s->stream.next_out = Sv_Grow(output, SvLEN(output) + bufinc +1) ; cur_length += increment ; - s->stream.next_out = (Bytef*) SvPVX(output) + cur_length ; + s->stream.next_out += cur_length ; increment = bufinc ; s->stream.avail_out = increment; bufinc *= 2 ; @@ -1437,9 +1439,9 @@ Perl_sv_dump(output); */ s->stream.avail_in = 1; if (s->stream.avail_out == 0) { /* out of space in the output buffer so make it bigger */ - Sv_Grow(output, SvLEN(output) + bufinc) ; + s->stream.next_out = Sv_Grow(output, SvLEN(output) + bufinc) ; cur_length += increment ; - s->stream.next_out = (Bytef*) SvPVX(output) + cur_length ; + s->stream.next_out += cur_length ; increment = bufinc ; s->stream.avail_out = increment; bufinc *= 2 ; @@ -1520,6 +1522,7 @@ DualType inflateSync (s, buf) Compress::Raw::Zlib::inflateStream s SV * buf + STRLEN stmp = NO_INIT CODE: /* If the buffer is a reference, dereference it */ @@ -1530,7 +1533,7 @@ inflateSync (s, buf) #endif /* initialise the input buffer */ - s->stream.next_in = (Bytef*)SvPV_nomg_nolen(buf) ; + s->stream.next_in = (Bytef*)SvPVbyte_force(buf, stmp) ; s->stream.avail_in = SvCUR(buf) ; /* inflateSync doesn't create any output */ @@ -1691,6 +1694,7 @@ scan(s, buf, out=NULL, eof=FALSE) bool eof bool eof_mode = FALSE; int start_len = NO_INIT + STRLEN stmp = NO_INIT CODE: /* If the input buffer is a reference, dereference it */ #ifndef MAGIC_APPEND @@ -1703,7 +1707,7 @@ scan(s, buf, out=NULL, eof=FALSE) croak("Wide character in Compress::Raw::Zlib::InflateScan::scan input parameter"); #endif /* initialise the input buffer */ - s->stream.next_in = (Bytef*)SvPV_nomg_nolen(buf) ; + s->stream.next_in = (Bytef*)SvPVbyte_force(buf, stmp) ; s->stream.avail_in = SvCUR(buf) ; start_len = s->stream.avail_in ; s->bytesInflated = 0 ; @@ -1789,8 +1793,8 @@ scan(s, buf, out=NULL, eof=FALSE) SvCUR_set(buf, in) ; if (in) Move(s->stream.next_in, SvPVX(buf), in, char) ; - *SvEND(buf) = '\0'; - SvSETMAGIC(buf); + *SvEND(buf) = '\0'; + SvSETMAGIC(buf); } } #endif diff --git a/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm b/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm index 557e843..1ed22c5 100644 --- a/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm +++ b/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm @@ -11,7 +11,7 @@ use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, %EXPORT_TAGS, @EXPORT_OK, $AUTOLOAD, %DEFLATE_CONSTANTS, @DEFLATE_CONSTANTS ); -$VERSION = '2.05401'; +$VERSION = '2.055'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; 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<http://www.faqs.org/rfcs/rfc1952.html> The primary site for gzip is F<http://www.gzip.org>. +=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<IO::Uncompress::Gunzip> will I<not> 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<IO::Uncompress::Gunzip> to uncompress all the gzip data streams, +include the C<MultiStream> 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<http://www.gzip.org>. The primary site for the I<zlib> compression library is F<http://www.zlib.org>. +=head1 Bzip2 + +=head2 Bzip2 Resources + +The primary site for bzip2 is F<http://www.bzip.org>. + +=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<IO::Uncompress::Bunzip2> will I<not> 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<IO::Uncompress::Bunzip2> to uncompress all the bzip2 data streams, +include the C<MultiStream> option, as shown below + + $ perl -MIO::Uncompress::Bunzip2=:all -e 'bunzip2 "x.bz2" => \*STDOUT, MultiStream => 1' + abc + def + +=head2 Interoperating with Pbzip2 + +Pbzip2 (L<http://compression.ca/pbzip2/>) is a parallel implementation of +bzip2. The output from pbzip2 consists of a series of concatenated bzip2 +data streams. + +By default C<IO::Uncompress::Bzip2> will only uncompress the first bzip2 +data stream in a pbzip2 file. To uncompress the complete pbzip2 file you +must include the C<MultiStream> 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 -- Perl5 Master Repository
