diff options
| author | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2012-06-07 22:26:46 +0100 |
|---|---|---|
| committer | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2012-06-15 22:15:04 +0100 |
| commit | a6e26d78b9f625c37709d597c34fcabd886f8352 (patch) | |
| tree | ae00a78261c0381b84503bde6c6d307d6379fa5b /cpan | |
| parent | 7c409530de94f37b83d06af836f06c43c7be07e0 (diff) | |
| download | perl-a6e26d78b9f625c37709d597c34fcabd886f8352.tar.gz | |
Updated IO-Compress to CPAN version 2.052
[DELTA]
2.052 29 April 2012
* IO::Compress::Zip
Force a ZIP64 archive when it contains >= 0xFFFF entries.
* Typos in POD
[RT# #76130: Gunzip Pod typo in OO section: $$output instead of $$input
2.049 18 February 2012
* IO::Compress::Zip
Error in t/cz-03zlib-v1.t that caused warnings with 5.15
[RT# 110736: warnings from cpan/IO-Compress/t/cz-03zlib-v1.t]
Diffstat (limited to 'cpan')
32 files changed, 195 insertions, 153 deletions
diff --git a/cpan/IO-Compress/Changes b/cpan/IO-Compress/Changes index 0862dd6b3b..3af9472839 100644 --- a/cpan/IO-Compress/Changes +++ b/cpan/IO-Compress/Changes @@ -1,11 +1,26 @@ CHANGES ------- + 2.052 29 April 2012 + + * IO::Compress::Zip + Force a ZIP64 archive when it contains >= 0xFFFF entries. + + * Typos in POD + [RT# #76130: Gunzip Pod typo in OO section: $$output instead of $$input + + 2.049 18 February 2012 + + * IO::Compress::Zip + Error in t/cz-03zlib-v1.t that caused warnings with 5.15 + [RT# 110736: warnings from cpan/IO-Compress/t/cz-03zlib-v1.t] + 2.048 29 January 2012 * Set minimum zlib version to 1.2.0 - * IO::Compress test suite fails with Compress::Raw::Zlib 2.047 and zlib < 1.2.4 + * IO::Compress test suite fails with Compress::Raw::Zlib 2.047 + and zlib < 1.2.4 [RT# 74503] 2.047 28 January 2012 diff --git a/cpan/IO-Compress/Makefile.PL b/cpan/IO-Compress/Makefile.PL index ae85bbb9f8..0e679d3ff1 100644 --- a/cpan/IO-Compress/Makefile.PL +++ b/cpan/IO-Compress/Makefile.PL @@ -3,7 +3,7 @@ use strict ; require 5.006 ; -$::VERSION = '2.048' ; +$::VERSION = '2.052' ; use private::MakeUtil; use ExtUtils::MakeMaker 5.16 ; @@ -49,6 +49,12 @@ WriteMakefile( : () ), + META_MERGE => { + no_index => { + directory => [ 't', 'private' ], + }, + }, + ((ExtUtils::MakeMaker->VERSION() gt '6.30') ? ('LICENSE' => 'perl') : ()), diff --git a/cpan/IO-Compress/README b/cpan/IO-Compress/README index ac90f58def..552645bb07 100644 --- a/cpan/IO-Compress/README +++ b/cpan/IO-Compress/README @@ -1,9 +1,9 @@ - IO-Compress + IO-Compress - Version 2.048 + Version 2.052 - 29th January 2012 + 29th April 2012 Copyright (c) 1995-2012 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -32,7 +32,7 @@ PREREQUISITES Before you can build IO-Compress you need to have the following installed on your system: - * Perl 5.004 or better. + * Perl 5.006 or better. * Compress::Raw::Zlib * Compress::Raw::Bzip2 @@ -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.048" ; + $VERSION = "2.052" ; 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 db13bb0386..b78bfb4d24 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.048 ; -use Compress::Raw::Zlib 2.048 ; -use IO::Compress::Gzip 2.048 ; -use IO::Uncompress::Gunzip 2.048 ; +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 strict ; use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.048'; +$VERSION = '2.052'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -453,7 +453,7 @@ sub inflate package Compress::Zlib ; -use IO::Compress::Gzip::Constants 2.048 ; +use IO::Compress::Gzip::Constants 2.052 ; 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 452e12ef48..9bec93e600 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.048 qw(:Status); +use IO::Compress::Base::Common 2.052 qw(:Status); -use Compress::Raw::Bzip2 2.048 ; +use Compress::Raw::Bzip2 2.052 ; our ($VERSION); -$VERSION = '2.048'; +$VERSION = '2.052'; 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 4a99c36cf7..31945872c4 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.048 qw(:Status); -use Compress::Raw::Zlib 2.048 qw( !crc32 !adler32 ) ; +use IO::Compress::Base::Common 2.052 qw(:Status); +use Compress::Raw::Zlib 2.052 qw( !crc32 !adler32 ) ; require Exporter; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, @EXPORT, %DEFLATE_CONSTANTS); -$VERSION = '2.048'; +$VERSION = '2.052'; @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 c7a0031a1d..cd06d315b6 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.048 qw(:Status); +use IO::Compress::Base::Common 2.052 qw(:Status); our ($VERSION); -$VERSION = '2.048'; +$VERSION = '2.052'; sub mkCompObject { diff --git a/cpan/IO-Compress/lib/IO/Compress/Base.pm b/cpan/IO-Compress/lib/IO/Compress/Base.pm index 2137bbb8de..3bb330e42b 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.048 ; +use IO::Compress::Base::Common 2.052 ; 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.048'; +$VERSION = '2.052'; #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 c6c38181ef..5f53bc95e0 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.048'; +$VERSION = '2.052'; @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 dd9016bf83..597950e066 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.048 ; +use IO::Compress::Base 2.052 ; -use IO::Compress::Base::Common 2.048 qw(createSelfTiedObject); -use IO::Compress::Adapter::Bzip2 2.048 ; +use IO::Compress::Base::Common 2.052 qw(createSelfTiedObject); +use IO::Compress::Adapter::Bzip2 2.052 ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error); -$VERSION = '2.048'; +$VERSION = '2.052'; $Bzip2Error = ''; @ISA = qw(Exporter IO::Compress::Base); @@ -51,7 +51,7 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.048 qw(:Parse); + use IO::Compress::Base::Common 2.052 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 daa7d7aa25..1a902fadc1 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.048 (); -use IO::Compress::Adapter::Deflate 2.048 ; +use IO::Compress::RawDeflate 2.052 (); +use IO::Compress::Adapter::Deflate 2.052 ; -use IO::Compress::Zlib::Constants 2.048 ; -use IO::Compress::Base::Common 2.048 qw(createSelfTiedObject); +use IO::Compress::Zlib::Constants 2.052 ; +use IO::Compress::Base::Common 2.052 qw(createSelfTiedObject); our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $DeflateError); -$VERSION = '2.048'; +$VERSION = '2.052'; $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 d392ff2cc9..577ab05187 100644 --- a/cpan/IO-Compress/lib/IO/Compress/FAQ.pod +++ b/cpan/IO-Compress/lib/IO/Compress/FAQ.pod @@ -180,6 +180,10 @@ In particular, if you are using Info-Zip you need to have zip version 3.x or better to update a Zip64 archive and unzip version 6.x to read a zip64 archive. +=head2 Can I write more that 64K entries is a Zip files? + +Yes. Zip64 allows this. See previous question. + =head2 Zip Resources The primary reference for zip files is the "appnote" document available at diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm index 6530c2532d..bfde720988 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.048 () ; -use IO::Compress::Adapter::Deflate 2.048 ; +use IO::Compress::RawDeflate 2.052 () ; +use IO::Compress::Adapter::Deflate 2.052 ; -use IO::Compress::Base::Common 2.048 qw(:Status :Parse isaScalar createSelfTiedObject); -use IO::Compress::Gzip::Constants 2.048 ; -use IO::Compress::Zlib::Extra 2.048 ; +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 ; BEGIN { @@ -25,7 +25,7 @@ BEGIN our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $GzipError); -$VERSION = '2.048'; +$VERSION = '2.052'; $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 c218a31445..762385754e 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.048'; +$VERSION = '2.052'; @ISA = qw(Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm index 883a4eb2f7..df2efbb97c 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.048 ; -use IO::Compress::Base::Common 2.048 qw(:Status createSelfTiedObject); -use IO::Compress::Adapter::Deflate 2.048 ; +use IO::Compress::Base 2.052 ; +use IO::Compress::Base::Common 2.052 qw(:Status createSelfTiedObject); +use IO::Compress::Adapter::Deflate 2.052 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError); -$VERSION = '2.048'; +$VERSION = '2.052'; $RawDeflateError = ''; @ISA = qw(Exporter IO::Compress::Base); @@ -121,8 +121,8 @@ sub getZlibParams { my $self = shift ; - use IO::Compress::Base::Common 2.048 qw(:Parse); - use Compress::Raw::Zlib 2.048 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); + use IO::Compress::Base::Common 2.052 qw(:Parse); + use Compress::Raw::Zlib 2.052 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 9c2780a5e0..81a9b2d78d 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.048 qw(:Status MAX32 isGeMax32 isaScalar createSelfTiedObject); -use IO::Compress::RawDeflate 2.048 (); -use IO::Compress::Adapter::Deflate 2.048 ; -use IO::Compress::Adapter::Identity 2.048 ; -use IO::Compress::Zlib::Extra 2.048 ; -use IO::Compress::Zip::Constants 2.048 ; +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 File::Spec(); use Config; -use Compress::Raw::Zlib 2.048 (); +use Compress::Raw::Zlib 2.052 (); BEGIN { eval { require IO::Compress::Adapter::Bzip2 ; - import IO::Compress::Adapter::Bzip2 2.048 ; + import IO::Compress::Adapter::Bzip2 2.052 ; require IO::Compress::Bzip2 ; - import IO::Compress::Bzip2 2.048 ; + import IO::Compress::Bzip2 2.052 ; } ; eval { require IO::Compress::Adapter::Lzma ; - import IO::Compress::Adapter::Lzma 2.048 ; + import IO::Compress::Adapter::Lzma 2.052 ; require IO::Compress::Lzma ; - import IO::Compress::Lzma 2.048 ; + import IO::Compress::Lzma 2.052 ; } ; } @@ -36,7 +36,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $ZipError); -$VERSION = '2.048'; +$VERSION = '2.052'; $ZipError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -230,9 +230,8 @@ sub mkHeader my $self = shift; my $param = shift ; - *$self->{ZipData}{LocalHdrOffset} = U64::clone(*$self->{ZipData}{Offset}); - + my $comment = ''; $comment = $param->value('Comment') || ''; @@ -499,13 +498,17 @@ sub mkTrailer sub mkFinalTrailer { my $self = shift ; - + my $comment = ''; $comment = *$self->{ZipData}{ZipComment} ; my $cd_offset = *$self->{ZipData}{Offset}->get32bit() ; # offset to start central dir my $entries = @{ *$self->{ZipData}{CentralDir} }; + + *$self->{ZipData}{AnyZip64} = 1 + if *$self->{ZipData}{Offset}->is64bit || $entries >= 0xFFFF ; + my $cd = join '', @{ *$self->{ZipData}{CentralDir} }; my $cd_len = length $cd ; @@ -664,8 +667,8 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.048 qw(:Parse); - use Compress::Raw::Zlib 2.048 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); + use IO::Compress::Base::Common 2.052 qw(:Parse); + use Compress::Raw::Zlib 2.052 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); my @Bzip2 = (); @@ -1463,7 +1466,8 @@ The default is 1. =item C<< Zip64 => 0|1 >> Create a Zip64 zip file/buffer. This option is used if you want -to store files larger than 4 Gig. +to store files larger than 4 Gig or store more than 64K files in a single +zip archive.. C<Zip64> will be automatically set, as needed, if working with the one-shot interface when the input is either a filename or a scalar reference. diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm index 8db079cb93..4b73cb2c54 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.048'; +$VERSION = '2.052'; @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 992b1b925f..4b7b023b65 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.048'; +$VERSION = '2.052'; @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 9e0be2e4b6..b5a1363299 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.048'; +$VERSION = '2.052'; -use IO::Compress::Gzip::Constants 2.048 ; +use IO::Compress::Gzip::Constants 2.052 ; 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 516c5dda4f..a0e5ed278d 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.048 qw(:Status); +use IO::Compress::Base::Common 2.052 qw(:Status); -use Compress::Raw::Bzip2 2.048 ; +use Compress::Raw::Bzip2 2.052 ; our ($VERSION, @ISA); -$VERSION = '2.048'; +$VERSION = '2.052'; 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 5d74d04212..3e97560c3a 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.048 qw(:Status); +use IO::Compress::Base::Common 2.052 qw(:Status); use IO::Compress::Zip::Constants ; our ($VERSION); -$VERSION = '2.048'; +$VERSION = '2.052'; -use Compress::Raw::Zlib 2.048 (); +use Compress::Raw::Zlib 2.052 (); 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 c0f3542a98..08d44627c6 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.048 qw(:Status); -use Compress::Raw::Zlib 2.048 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); +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); our ($VERSION); -$VERSION = '2.048'; +$VERSION = '2.052'; diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm index a6ab437159..9048ad7ea3 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.048 qw(createSelfTiedObject); +use IO::Compress::Base::Common 2.052 qw(createSelfTiedObject); -use IO::Uncompress::Adapter::Inflate 2.048 (); +use IO::Uncompress::Adapter::Inflate 2.052 (); -use IO::Uncompress::Base 2.048 ; -use IO::Uncompress::Gunzip 2.048 ; -use IO::Uncompress::Inflate 2.048 ; -use IO::Uncompress::RawInflate 2.048 ; -use IO::Uncompress::Unzip 2.048 ; +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 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError); -$VERSION = '2.048'; +$VERSION = '2.052'; $AnyInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -48,7 +48,7 @@ sub anyinflate sub getExtraParams { - use IO::Compress::Base::Common 2.048 qw(:Parse); + use IO::Compress::Base::Common 2.052 qw(:Parse); return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ) ; } @@ -507,7 +507,7 @@ The string '-' can be used as an alias for standard input. =item A scalar reference If C<$input> is a scalar reference, the compressed data will be read from -C<$$output>. +C<$$input>. =back @@ -945,7 +945,7 @@ Same as doing this =head2 Working with Net::FTP -See L<IO::Uncompress::AnyInflate::FAQ|IO::Uncompress::AnyInflate::FAQ/"Compressed files and Net::FTP"> +See L<IO::Compress::FAQ|IO::Compress::FAQ/"Compressed files and Net::FTP"> =head1 SEE ALSO diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm index d9a48e6a24..238be02743 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.048 qw(createSelfTiedObject); +use IO::Compress::Base::Common 2.052 qw(createSelfTiedObject); -use IO::Uncompress::Base 2.048 ; +use IO::Uncompress::Base 2.052 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError); -$VERSION = '2.048'; +$VERSION = '2.052'; $AnyUncompressError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -27,22 +27,22 @@ Exporter::export_ok_tags('all'); BEGIN { - eval ' use IO::Uncompress::Adapter::Inflate 2.048 ;'; - eval ' use IO::Uncompress::Adapter::Bunzip2 2.048 ;'; - eval ' use IO::Uncompress::Adapter::LZO 2.048 ;'; - eval ' use IO::Uncompress::Adapter::Lzf 2.048 ;'; - eval ' use IO::Uncompress::Adapter::UnLzma 2.048 ;'; - eval ' use IO::Uncompress::Adapter::UnXz 2.048 ;'; - - eval ' use IO::Uncompress::Bunzip2 2.048 ;'; - eval ' use IO::Uncompress::UnLzop 2.048 ;'; - eval ' use IO::Uncompress::Gunzip 2.048 ;'; - eval ' use IO::Uncompress::Inflate 2.048 ;'; - eval ' use IO::Uncompress::RawInflate 2.048 ;'; - eval ' use IO::Uncompress::Unzip 2.048 ;'; - eval ' use IO::Uncompress::UnLzf 2.048 ;'; - eval ' use IO::Uncompress::UnLzma 2.048 ;'; - eval ' use IO::Uncompress::UnXz 2.048 ;'; + 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 ;'; } sub new @@ -60,7 +60,7 @@ sub anyuncompress sub getExtraParams { - use IO::Compress::Base::Common 2.048 qw(:Parse); + use IO::Compress::Base::Common 2.052 qw(:Parse); return ( 'RawInflate' => [1, 1, Parse_boolean, 0] , 'UnLzma' => [1, 1, Parse_boolean, 0] ) ; } @@ -616,7 +616,7 @@ The string '-' can be used as an alias for standard input. =item A scalar reference If C<$input> is a scalar reference, the compressed data will be read from -C<$$output>. +C<$$input>. =back diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm index cb1e15e9ae..5a00db9c90 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.048'; +$VERSION = '2.052'; use constant G_EOF => 0 ; use constant G_ERR => -1 ; -use IO::Compress::Base::Common 2.048 ; +use IO::Compress::Base::Common 2.052 ; 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 f53513a7e4..0d41189f8b 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.048 qw(:Status createSelfTiedObject); +use IO::Compress::Base::Common 2.052 qw(:Status createSelfTiedObject); -use IO::Uncompress::Base 2.048 ; -use IO::Uncompress::Adapter::Bunzip2 2.048 ; +use IO::Uncompress::Base 2.052 ; +use IO::Uncompress::Adapter::Bunzip2 2.052 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error); -$VERSION = '2.048'; +$VERSION = '2.052'; $Bunzip2Error = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -40,7 +40,7 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.048 qw(:Parse); + use IO::Compress::Base::Common 2.052 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 bf803ae161..3cabbeb1e9 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.048 ; +use IO::Uncompress::RawInflate 2.052 ; -use Compress::Raw::Zlib 2.048 () ; -use IO::Compress::Base::Common 2.048 qw(:Status createSelfTiedObject); -use IO::Compress::Gzip::Constants 2.048 ; -use IO::Compress::Zlib::Extra 2.048 ; +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 ; require Exporter ; @@ -28,7 +28,7 @@ Exporter::export_ok_tags('all'); $GunzipError = ''; -$VERSION = '2.048'; +$VERSION = '2.052'; sub new { @@ -47,7 +47,7 @@ sub gunzip sub getExtraParams { - use IO::Compress::Base::Common 2.048 qw(:Parse); + use IO::Compress::Base::Common 2.052 qw(:Parse); return ( 'ParseExtra' => [1, 1, Parse_boolean, 0] ) ; } @@ -643,7 +643,7 @@ The string '-' can be used as an alias for standard input. =item A scalar reference If C<$input> is a scalar reference, the compressed data will be read from -C<$$output>. +C<$$input>. =back @@ -1069,7 +1069,7 @@ Same as doing this =head2 Working with Net::FTP -See L<IO::Uncompress::Gunzip::FAQ|IO::Uncompress::Gunzip::FAQ/"Compressed files and Net::FTP"> +See L<IO::Compress::FAQ|IO::Compress::FAQ/"Compressed files and Net::FTP"> =head1 SEE ALSO diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm index 7a40889fa8..2a92dae050 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.048 qw(:Status createSelfTiedObject); -use IO::Compress::Zlib::Constants 2.048 ; +use IO::Compress::Base::Common 2.052 qw(:Status createSelfTiedObject); +use IO::Compress::Zlib::Constants 2.052 ; -use IO::Uncompress::RawInflate 2.048 ; +use IO::Uncompress::RawInflate 2.052 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError); -$VERSION = '2.048'; +$VERSION = '2.052'; $InflateError = ''; @ISA = qw( Exporter IO::Uncompress::RawInflate ); @@ -564,7 +564,7 @@ The string '-' can be used as an alias for standard input. =item A scalar reference If C<$input> is a scalar reference, the compressed data will be read from -C<$$output>. +C<$$input>. =back @@ -940,7 +940,7 @@ Same as doing this =head2 Working with Net::FTP -See L<IO::Uncompress::Inflate::FAQ|IO::Uncompress::Inflate::FAQ/"Compressed files and Net::FTP"> +See L<IO::Compress::FAQ|IO::Compress::FAQ/"Compressed files and Net::FTP"> =head1 SEE ALSO diff --git a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm index 0372ec72e3..cfc25a3546 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.048 ; -use IO::Compress::Base::Common 2.048 qw(:Status createSelfTiedObject); +use Compress::Raw::Zlib 2.052 ; +use IO::Compress::Base::Common 2.052 qw(:Status createSelfTiedObject); -use IO::Uncompress::Base 2.048 ; -use IO::Uncompress::Adapter::Inflate 2.048 ; +use IO::Uncompress::Base 2.052 ; +use IO::Uncompress::Adapter::Inflate 2.052 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError); -$VERSION = '2.048'; +$VERSION = '2.052'; $RawInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -709,7 +709,7 @@ The string '-' can be used as an alias for standard input. =item A scalar reference If C<$input> is a scalar reference, the compressed data will be read from -C<$$output>. +C<$$input>. =back @@ -1068,7 +1068,7 @@ Same as doing this =head2 Working with Net::FTP -See L<IO::Uncompress::RawInflate::FAQ|IO::Uncompress::RawInflate::FAQ/"Compressed files and Net::FTP"> +See L<IO::Compress::FAQ|IO::Compress::FAQ/"Compressed files and Net::FTP"> =head1 SEE ALSO diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm index 7b2121c4e7..966a4f39c1 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.048 ; -use IO::Compress::Base::Common 2.048 qw(:Status createSelfTiedObject); -use IO::Uncompress::Adapter::Inflate 2.048 ; -use IO::Uncompress::Adapter::Identity 2.048 ; -use IO::Compress::Zlib::Extra 2.048 ; -use IO::Compress::Zip::Constants 2.048 ; +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 Compress::Raw::Zlib 2.048 () ; +use Compress::Raw::Zlib 2.052 () ; BEGIN { @@ -31,7 +31,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup); -$VERSION = '2.048'; +$VERSION = '2.052'; $UnzipError = ''; @ISA = qw(Exporter IO::Uncompress::RawInflate); @@ -64,7 +64,7 @@ sub unzip sub getExtraParams { - use IO::Compress::Base::Common 2.048 qw(:Parse); + use IO::Compress::Base::Common 2.052 qw(:Parse); return ( @@ -1403,7 +1403,7 @@ The string '-' can be used as an alias for standard input. =item A scalar reference If C<$input> is a scalar reference, the compressed data will be read from -C<$$output>. +C<$$input>. =back @@ -1769,7 +1769,7 @@ Same as doing this =head2 Working with Net::FTP -See L<IO::Uncompress::Unzip::FAQ|IO::Uncompress::Unzip::FAQ/"Compressed files and Net::FTP"> +See L<IO::Compress::FAQ|IO::Compress::FAQ/"Compressed files and Net::FTP"> =head2 Walking through a zip file diff --git a/cpan/IO-Compress/t/000prereq.t b/cpan/IO-Compress/t/000prereq.t index d861811720..f70745ef3e 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.048'; + my $VERSION = '2.052'; my @NAMES = qw( Compress::Raw::Bzip2 Compress::Raw::Zlib diff --git a/cpan/IO-Compress/t/cz-14gzopen.t b/cpan/IO-Compress/t/cz-14gzopen.t index 0918ce5482..d5f0ea0c04 100644 --- a/cpan/IO-Compress/t/cz-14gzopen.t +++ b/cpan/IO-Compress/t/cz-14gzopen.t @@ -20,7 +20,7 @@ BEGIN { $extra = 1 if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 }; - plan tests => 260 + $extra ; + plan tests => 264 + $extra ; use_ok('Compress::Zlib', 2) ; use_ok('IO::Compress::Gzip::Constants') ; @@ -651,7 +651,20 @@ foreach my $stdio ( ['-', '-'], [*STDIN, *STDOUT]) } { - title 'gzflush called twice'; + title 'gzflush called twice with Z_SYNC_FLUSH - no compression'; + + my $lex = new LexFile my $name ; + + ok my $a = gzopen($name, "w"); + + is $a->gzflush(Z_SYNC_FLUSH), Z_OK, "gzflush returns Z_OK"; + is $a->gzflush(Z_SYNC_FLUSH), Z_OK, "gzflush returns Z_OK"; +} + + + +{ + title 'gzflush called twice - after compression'; my $lex = new LexFile my $name ; |