summaryrefslogtreecommitdiff
path: root/cpan
diff options
context:
space:
mode:
authorChris 'BinGOs' Williams <chris@bingosnet.co.uk>2011-11-22 19:32:55 +0000
committerChris 'BinGOs' Williams <chris@bingosnet.co.uk>2011-11-22 19:32:55 +0000
commitdc7edc5c5d81282c7d6425fbd4bbf2b51a30a481 (patch)
tree8c3026797e6a9ce936cedccdd8bd182c1945b057 /cpan
parent7e7003692ef1ef562fa6ff1177c64ec749cfe5da (diff)
downloadperl-dc7edc5c5d81282c7d6425fbd4bbf2b51a30a481.tar.gz
Update IO-Compress to CPAN version 2.043
[DELTA] 2.043 20 November 2011 * IO::Compress::Base - Fixed issue that with handling of Zip files with two (or more) entries that were STORED. Symptom is the first is uncompressed ok, but the next will terminate early if the size of the file is greater than BlockSize. Regression test added to t/006zip.t [RT# 72548]
Diffstat (limited to 'cpan')
-rw-r--r--cpan/IO-Compress/Changes10
-rw-r--r--cpan/IO-Compress/Makefile.PL2
-rw-r--r--cpan/IO-Compress/README6
-rw-r--r--cpan/IO-Compress/lib/Compress/Zlib.pm12
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm6
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm6
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm4
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/Base.pm4
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/Base/Common.pm2
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/Bzip2.pm10
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/Deflate.pm10
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/Gzip.pm12
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm2
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm12
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/Zip.pm28
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm2
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm2
-rw-r--r--cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm4
-rw-r--r--cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm6
-rw-r--r--cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm6
-rw-r--r--cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm6
-rw-r--r--cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm18
-rw-r--r--cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm40
-rw-r--r--cpan/IO-Compress/lib/IO/Uncompress/Base.pm6
-rw-r--r--cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm10
-rw-r--r--cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm14
-rw-r--r--cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm8
-rw-r--r--cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm10
-rw-r--r--cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm26
-rw-r--r--cpan/IO-Compress/t/000prereq.t2
-rw-r--r--cpan/IO-Compress/t/006zip.t32
31 files changed, 175 insertions, 143 deletions
diff --git a/cpan/IO-Compress/Changes b/cpan/IO-Compress/Changes
index 1f0e5b4dbb..9f2d070112 100644
--- a/cpan/IO-Compress/Changes
+++ b/cpan/IO-Compress/Changes
@@ -1,6 +1,16 @@
CHANGES
-------
+ 2.043 20 November 2011
+
+ * IO::Compress::Base
+ - Fixed issue that with handling of Zip files with two (or more)
+ entries that were STORED. Symptom is the first is uncompressed
+ ok, but the next will terminate early if the size of the file is
+ greater than BlockSize.
+ Regression test added to t/006zip.t
+ [RT# 72548]
+
2.042 17 November 2011
* IO::Compress::Zip
diff --git a/cpan/IO-Compress/Makefile.PL b/cpan/IO-Compress/Makefile.PL
index b8725a3df4..bfe40a54b0 100644
--- a/cpan/IO-Compress/Makefile.PL
+++ b/cpan/IO-Compress/Makefile.PL
@@ -3,7 +3,7 @@
use strict ;
require 5.004 ;
-$::VERSION = '2.042' ;
+$::VERSION = '2.043' ;
use private::MakeUtil;
use ExtUtils::MakeMaker 5.16 ;
diff --git a/cpan/IO-Compress/README b/cpan/IO-Compress/README
index 368234d7aa..b1090dc58e 100644
--- a/cpan/IO-Compress/README
+++ b/cpan/IO-Compress/README
@@ -1,9 +1,9 @@
IO-Compress
- Version 2.042
+ Version 2.043
- 17th November 2011
+ 20th November 2011
Copyright (c) 1995-2011 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.042" ;
+ $VERSION = "2.043" ;
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 212c6e0747..2fb2b6ae81 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.042 ;
-use Compress::Raw::Zlib 2.042 ;
-use IO::Compress::Gzip 2.042 ;
-use IO::Uncompress::Gunzip 2.042 ;
+use IO::Compress::Base::Common 2.043 ;
+use Compress::Raw::Zlib 2.043 ;
+use IO::Compress::Gzip 2.043 ;
+use IO::Uncompress::Gunzip 2.043 ;
use strict ;
use warnings ;
use bytes ;
our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
-$VERSION = '2.042';
+$VERSION = '2.043';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
@@ -453,7 +453,7 @@ sub inflate
package Compress::Zlib ;
-use IO::Compress::Gzip::Constants 2.042 ;
+use IO::Compress::Gzip::Constants 2.043 ;
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 c2d3e131c0..00bae00273 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
@@ -4,13 +4,13 @@ use strict;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.042 qw(:Status);
+use IO::Compress::Base::Common 2.043 qw(:Status);
#use Compress::Bzip2 ;
-use Compress::Raw::Bzip2 2.042 ;
+use Compress::Raw::Bzip2 2.043 ;
our ($VERSION);
-$VERSION = '2.042';
+$VERSION = '2.043';
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 74dead0ef4..60c7790bfe 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
@@ -4,12 +4,12 @@ use strict;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.042 qw(:Status);
+use IO::Compress::Base::Common 2.043 qw(:Status);
-use Compress::Raw::Zlib 2.042 qw(Z_OK Z_FINISH MAX_WBITS) ;
+use Compress::Raw::Zlib 2.043 qw(Z_OK Z_FINISH MAX_WBITS) ;
our ($VERSION);
-$VERSION = '2.042';
+$VERSION = '2.043';
sub mkCompObject
{
diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
index 8a97740bab..7aebede1c8 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.042 qw(:Status);
+use IO::Compress::Base::Common 2.043 qw(:Status);
our ($VERSION);
-$VERSION = '2.042';
+$VERSION = '2.043';
sub mkCompObject
{
diff --git a/cpan/IO-Compress/lib/IO/Compress/Base.pm b/cpan/IO-Compress/lib/IO/Compress/Base.pm
index 464f401956..cac7610de9 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.004 ;
use strict ;
use warnings;
-use IO::Compress::Base::Common 2.042 ;
+use IO::Compress::Base::Common 2.043 ;
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.042';
+$VERSION = '2.043';
#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 5778d4f429..4113304df5 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.042';
+$VERSION = '2.043';
@EXPORT = qw( isaFilehandle isaFilename whatIsInput whatIsOutput
isaFileGlobString cleanFileGlobString oneTarget
diff --git a/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm
index f6767875e9..5211bef06a 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.042 ;
+use IO::Compress::Base 2.043 ;
-use IO::Compress::Base::Common 2.042 qw(createSelfTiedObject);
-use IO::Compress::Adapter::Bzip2 2.042 ;
+use IO::Compress::Base::Common 2.043 qw(createSelfTiedObject);
+use IO::Compress::Adapter::Bzip2 2.043 ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error);
-$VERSION = '2.042';
+$VERSION = '2.043';
$Bzip2Error = '';
@ISA = qw(Exporter IO::Compress::Base);
@@ -51,7 +51,7 @@ sub getExtraParams
{
my $self = shift ;
- use IO::Compress::Base::Common 2.042 qw(:Parse);
+ use IO::Compress::Base::Common 2.043 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 c8b8f5e5c0..1d241d7c44 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm
@@ -6,16 +6,16 @@ use bytes;
require Exporter ;
-use IO::Compress::RawDeflate 2.042 ;
+use IO::Compress::RawDeflate 2.043 ;
-use Compress::Raw::Zlib 2.042 ;
-use IO::Compress::Zlib::Constants 2.042 ;
-use IO::Compress::Base::Common 2.042 qw(createSelfTiedObject);
+use Compress::Raw::Zlib 2.043 ;
+use IO::Compress::Zlib::Constants 2.043 ;
+use IO::Compress::Base::Common 2.043 qw(createSelfTiedObject);
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $DeflateError);
-$VERSION = '2.042';
+$VERSION = '2.043';
$DeflateError = '';
@ISA = qw(Exporter IO::Compress::RawDeflate);
diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm
index b9d3149e6b..fbc67586a1 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm
@@ -8,12 +8,12 @@ use warnings;
use bytes;
-use IO::Compress::RawDeflate 2.042 ;
+use IO::Compress::RawDeflate 2.043 ;
-use Compress::Raw::Zlib 2.042 ;
-use IO::Compress::Base::Common 2.042 qw(:Status :Parse createSelfTiedObject);
-use IO::Compress::Gzip::Constants 2.042 ;
-use IO::Compress::Zlib::Extra 2.042 ;
+use Compress::Raw::Zlib 2.043 ;
+use IO::Compress::Base::Common 2.043 qw(:Status :Parse createSelfTiedObject);
+use IO::Compress::Gzip::Constants 2.043 ;
+use IO::Compress::Zlib::Extra 2.043 ;
BEGIN
{
@@ -27,7 +27,7 @@ require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $GzipError);
-$VERSION = '2.042';
+$VERSION = '2.043';
$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 6e87905932..8c78868678 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.042';
+$VERSION = '2.043';
@ISA = qw(Exporter);
diff --git a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
index 5d3a029f9a..a316eb6b3f 100644
--- a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
@@ -7,16 +7,16 @@ use warnings;
use bytes;
-use IO::Compress::Base 2.042 ;
-use IO::Compress::Base::Common 2.042 qw(:Status createSelfTiedObject);
-use IO::Compress::Adapter::Deflate 2.042 ;
+use IO::Compress::Base 2.043 ;
+use IO::Compress::Base::Common 2.043 qw(:Status createSelfTiedObject);
+use IO::Compress::Adapter::Deflate 2.043 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError);
-$VERSION = '2.042';
+$VERSION = '2.043';
$RawDeflateError = '';
@ISA = qw(Exporter IO::Compress::Base);
@@ -142,8 +142,8 @@ sub getZlibParams
{
my $self = shift ;
- use IO::Compress::Base::Common 2.042 qw(:Parse);
- use Compress::Raw::Zlib 2.042 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
+ use IO::Compress::Base::Common 2.043 qw(:Parse);
+ use Compress::Raw::Zlib 2.043 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 dc36a5d6fc..77630d876d 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Zip.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Zip.pm
@@ -4,28 +4,28 @@ use strict ;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.042 qw(:Status createSelfTiedObject);
-use IO::Compress::RawDeflate 2.042 ;
-use IO::Compress::Adapter::Deflate 2.042 ;
-use IO::Compress::Adapter::Identity 2.042 ;
-use IO::Compress::Zlib::Extra 2.042 ;
-use IO::Compress::Zip::Constants 2.042 ;
+use IO::Compress::Base::Common 2.043 qw(:Status createSelfTiedObject);
+use IO::Compress::RawDeflate 2.043 ;
+use IO::Compress::Adapter::Deflate 2.043 ;
+use IO::Compress::Adapter::Identity 2.043 ;
+use IO::Compress::Zlib::Extra 2.043 ;
+use IO::Compress::Zip::Constants 2.043 ;
use File::Spec();
use Config;
-use Compress::Raw::Zlib 2.042 qw(crc32) ;
+use Compress::Raw::Zlib 2.043 qw(crc32) ;
BEGIN
{
eval { require IO::Compress::Adapter::Bzip2 ;
- import IO::Compress::Adapter::Bzip2 2.042 ;
+ import IO::Compress::Adapter::Bzip2 2.043 ;
require IO::Compress::Bzip2 ;
- import IO::Compress::Bzip2 2.042 ;
+ import IO::Compress::Bzip2 2.043 ;
} ;
eval { require IO::Compress::Adapter::Lzma ;
- import IO::Compress::Adapter::Lzma 2.042 ;
+ import IO::Compress::Adapter::Lzma 2.043 ;
require IO::Compress::Lzma ;
- import IO::Compress::Lzma 2.042 ;
+ import IO::Compress::Lzma 2.043 ;
} ;
}
@@ -34,7 +34,7 @@ require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $ZipError);
-$VERSION = '2.042';
+$VERSION = '2.043';
$ZipError = '';
@ISA = qw(Exporter IO::Compress::RawDeflate);
@@ -641,8 +641,8 @@ sub getExtraParams
{
my $self = shift ;
- use IO::Compress::Base::Common 2.042 qw(:Parse);
- use Compress::Raw::Zlib 2.042 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
+ use IO::Compress::Base::Common 2.043 qw(:Parse);
+ use Compress::Raw::Zlib 2.043 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 bdeb22e1f1..c9ed78307f 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.042';
+$VERSION = '2.043';
@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 be81dabc4b..55c65c3a42 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.042';
+$VERSION = '2.043';
@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 218a0d1ee9..a68953656d 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.042';
+$VERSION = '2.043';
-use IO::Compress::Gzip::Constants 2.042 ;
+use IO::Compress::Gzip::Constants 2.043 ;
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 4a00fe2648..68796b4132 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.042 qw(:Status);
+use IO::Compress::Base::Common 2.043 qw(:Status);
-use Compress::Raw::Bzip2 2.042 ;
+use Compress::Raw::Bzip2 2.043 ;
our ($VERSION, @ISA);
-$VERSION = '2.042';
+$VERSION = '2.043';
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 7d14534cd2..a730ea3907 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.042 qw(:Status);
+use IO::Compress::Base::Common 2.043 qw(:Status);
use IO::Compress::Zip::Constants ;
our ($VERSION);
-$VERSION = '2.042';
+$VERSION = '2.043';
-use Compress::Raw::Zlib 2.042 ();
+use Compress::Raw::Zlib 2.043 ();
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 bd28bf49a7..09d8c51a05 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.042 qw(:Status);
-use Compress::Raw::Zlib 2.042 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
+use IO::Compress::Base::Common 2.043 qw(:Status);
+use Compress::Raw::Zlib 2.043 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
our ($VERSION);
-$VERSION = '2.042';
+$VERSION = '2.043';
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
index 54e5733b13..0522bd77c5 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.042 qw(createSelfTiedObject);
+use IO::Compress::Base::Common 2.043 qw(createSelfTiedObject);
-use IO::Uncompress::Adapter::Inflate 2.042 ();
+use IO::Uncompress::Adapter::Inflate 2.043 ();
-use IO::Uncompress::Base 2.042 ;
-use IO::Uncompress::Gunzip 2.042 ;
-use IO::Uncompress::Inflate 2.042 ;
-use IO::Uncompress::RawInflate 2.042 ;
-use IO::Uncompress::Unzip 2.042 ;
+use IO::Uncompress::Base 2.043 ;
+use IO::Uncompress::Gunzip 2.043 ;
+use IO::Uncompress::Inflate 2.043 ;
+use IO::Uncompress::RawInflate 2.043 ;
+use IO::Uncompress::Unzip 2.043 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError);
-$VERSION = '2.042';
+$VERSION = '2.043';
$AnyInflateError = '';
@ISA = qw( Exporter IO::Uncompress::Base );
@@ -48,7 +48,7 @@ sub anyinflate
sub getExtraParams
{
- use IO::Compress::Base::Common 2.042 qw(:Parse);
+ use IO::Compress::Base::Common 2.043 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 979f892473..acb5fa814e 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.042 qw(createSelfTiedObject);
+use IO::Compress::Base::Common 2.043 qw(createSelfTiedObject);
-use IO::Uncompress::Base 2.042 ;
+use IO::Uncompress::Base 2.043 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
-$VERSION = '2.042';
+$VERSION = '2.043';
$AnyUncompressError = '';
@ISA = qw( Exporter IO::Uncompress::Base );
@@ -27,22 +27,22 @@ Exporter::export_ok_tags('all');
BEGIN
{
- eval ' use IO::Uncompress::Adapter::Inflate 2.042 ;';
- eval ' use IO::Uncompress::Adapter::Bunzip2 2.042 ;';
- eval ' use IO::Uncompress::Adapter::LZO 2.042 ;';
- eval ' use IO::Uncompress::Adapter::Lzf 2.042 ;';
- eval ' use IO::Uncompress::Adapter::UnLzma 2.042 ;';
- eval ' use IO::Uncompress::Adapter::UnXz 2.042 ;';
-
- eval ' use IO::Uncompress::Bunzip2 2.042 ;';
- eval ' use IO::Uncompress::UnLzop 2.042 ;';
- eval ' use IO::Uncompress::Gunzip 2.042 ;';
- eval ' use IO::Uncompress::Inflate 2.042 ;';
- eval ' use IO::Uncompress::RawInflate 2.042 ;';
- eval ' use IO::Uncompress::Unzip 2.042 ;';
- eval ' use IO::Uncompress::UnLzf 2.042 ;';
- eval ' use IO::Uncompress::UnLzma 2.042 ;';
- eval ' use IO::Uncompress::UnXz 2.042 ;';
+ eval ' use IO::Uncompress::Adapter::Inflate 2.043 ;';
+ eval ' use IO::Uncompress::Adapter::Bunzip2 2.043 ;';
+ eval ' use IO::Uncompress::Adapter::LZO 2.043 ;';
+ eval ' use IO::Uncompress::Adapter::Lzf 2.043 ;';
+ eval ' use IO::Uncompress::Adapter::UnLzma 2.043 ;';
+ eval ' use IO::Uncompress::Adapter::UnXz 2.043 ;';
+
+ eval ' use IO::Uncompress::Bunzip2 2.043 ;';
+ eval ' use IO::Uncompress::UnLzop 2.043 ;';
+ eval ' use IO::Uncompress::Gunzip 2.043 ;';
+ eval ' use IO::Uncompress::Inflate 2.043 ;';
+ eval ' use IO::Uncompress::RawInflate 2.043 ;';
+ eval ' use IO::Uncompress::Unzip 2.043 ;';
+ eval ' use IO::Uncompress::UnLzf 2.043 ;';
+ eval ' use IO::Uncompress::UnLzma 2.043 ;';
+ eval ' use IO::Uncompress::UnXz 2.043 ;';
}
sub new
@@ -60,7 +60,7 @@ sub anyuncompress
sub getExtraParams
{
- use IO::Compress::Base::Common 2.042 qw(:Parse);
+ use IO::Compress::Base::Common 2.043 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 7747bfeed2..988f22e379 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.042';
+$VERSION = '2.043';
use constant G_EOF => 0 ;
use constant G_ERR => -1 ;
-use IO::Compress::Base::Common 2.042 ;
+use IO::Compress::Base::Common 2.043 ;
use IO::File ;
use Symbol;
@@ -1001,6 +1001,8 @@ sub gotoNextStream
*$self->{NewStream} = 0 ;
*$self->{EndStream} = 0 ;
+ *$self->{CompressedInputLengthDone} = undef ;
+ *$self->{CompressedInputLength} = undef ;
$self->reset();
*$self->{UnCompSize}->reset();
*$self->{CompSize}->reset();
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
index 8b47ce3659..d33b3204e6 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.042 qw(:Status createSelfTiedObject);
+use IO::Compress::Base::Common 2.043 qw(:Status createSelfTiedObject);
-use IO::Uncompress::Base 2.042 ;
-use IO::Uncompress::Adapter::Bunzip2 2.042 ;
+use IO::Uncompress::Base 2.043 ;
+use IO::Uncompress::Adapter::Bunzip2 2.043 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error);
-$VERSION = '2.042';
+$VERSION = '2.043';
$Bunzip2Error = '';
@ISA = qw( Exporter IO::Uncompress::Base );
@@ -40,7 +40,7 @@ sub getExtraParams
{
my $self = shift ;
- use IO::Compress::Base::Common 2.042 qw(:Parse);
+ use IO::Compress::Base::Common 2.043 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 79542e5c39..31290645f0 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.042 ;
+use IO::Uncompress::RawInflate 2.043 ;
-use Compress::Raw::Zlib 2.042 qw( crc32 ) ;
-use IO::Compress::Base::Common 2.042 qw(:Status createSelfTiedObject);
-use IO::Compress::Gzip::Constants 2.042 ;
-use IO::Compress::Zlib::Extra 2.042 ;
+use Compress::Raw::Zlib 2.043 qw( crc32 ) ;
+use IO::Compress::Base::Common 2.043 qw(:Status createSelfTiedObject);
+use IO::Compress::Gzip::Constants 2.043 ;
+use IO::Compress::Zlib::Extra 2.043 ;
require Exporter ;
@@ -28,7 +28,7 @@ Exporter::export_ok_tags('all');
$GunzipError = '';
-$VERSION = '2.042';
+$VERSION = '2.043';
sub new
{
@@ -47,7 +47,7 @@ sub gunzip
sub getExtraParams
{
- use IO::Compress::Base::Common 2.042 qw(:Parse);
+ use IO::Compress::Base::Common 2.043 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 597cd247c8..7451fe582b 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.042 qw(:Status createSelfTiedObject);
-use IO::Compress::Zlib::Constants 2.042 ;
+use IO::Compress::Base::Common 2.043 qw(:Status createSelfTiedObject);
+use IO::Compress::Zlib::Constants 2.043 ;
-use IO::Uncompress::RawInflate 2.042 ;
+use IO::Uncompress::RawInflate 2.043 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError);
-$VERSION = '2.042';
+$VERSION = '2.043';
$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 b091a6cbba..078eeecba6 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.042 ;
-use IO::Compress::Base::Common 2.042 qw(:Status createSelfTiedObject);
+use Compress::Raw::Zlib 2.043 ;
+use IO::Compress::Base::Common 2.043 qw(:Status createSelfTiedObject);
-use IO::Uncompress::Base 2.042 ;
-use IO::Uncompress::Adapter::Inflate 2.042 ;
+use IO::Uncompress::Base 2.043 ;
+use IO::Uncompress::Adapter::Inflate 2.043 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError);
-$VERSION = '2.042';
+$VERSION = '2.043';
$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 a782b62627..acab6b928b 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.042 ;
-use IO::Compress::Base::Common 2.042 qw(:Status createSelfTiedObject);
-use IO::Uncompress::Adapter::Inflate 2.042 ;
-use IO::Uncompress::Adapter::Identity 2.042 ;
-use IO::Compress::Zlib::Extra 2.042 ;
-use IO::Compress::Zip::Constants 2.042 ;
+use IO::Uncompress::RawInflate 2.043 ;
+use IO::Compress::Base::Common 2.043 qw(:Status createSelfTiedObject);
+use IO::Uncompress::Adapter::Inflate 2.043 ;
+use IO::Uncompress::Adapter::Identity 2.043 ;
+use IO::Compress::Zlib::Extra 2.043 ;
+use IO::Compress::Zip::Constants 2.043 ;
-use Compress::Raw::Zlib 2.042 qw(crc32) ;
+use Compress::Raw::Zlib 2.043 qw(crc32) ;
BEGIN
{
@@ -31,7 +31,7 @@ require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup);
-$VERSION = '2.042';
+$VERSION = '2.043';
$UnzipError = '';
@ISA = qw(Exporter IO::Uncompress::RawInflate);
@@ -64,7 +64,7 @@ sub unzip
sub getExtraParams
{
- use IO::Compress::Base::Common 2.042 qw(:Parse);
+ use IO::Compress::Base::Common 2.043 qw(:Parse);
return (
@@ -665,12 +665,6 @@ sub _readZipHeader($)
my $LzmaPropertyData;
$self->smartReadExact(\$LzmaPropertyData, $LzmaPropertiesSize)
or return $self->saveErrorString(undef, "Truncated file");
- #my $LzmaInfo = unpack ("C", substr($LzmaPropertyData, 0, 1));
- #my $LzmaDictSize = unpack ("V", substr($LzmaPropertyData, 1, 4));
-
- # Create an LZMA_Alone header
- #$self->pushBack($LzmaPropertyData .
- # $uncompressedLength->getPacked_V64());
if (! $streamingMode) {
*$self->{ZipData}{CompressedLen}->subtract(4 + $LzmaPropertiesSize) ;
@@ -685,8 +679,6 @@ sub _readZipHeader($)
}
elsif ($compressedMethod == ZIP_CM_STORE)
{
- # TODO -- add support for reading uncompressed
-
*$self->{Type} = 'zip-stored';
my $obj =
diff --git a/cpan/IO-Compress/t/000prereq.t b/cpan/IO-Compress/t/000prereq.t
index 13417aa66c..b5ff655a87 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.042';
+ my $VERSION = '2.043';
my @NAMES = qw(
Compress::Raw::Bzip2
Compress::Raw::Zlib
diff --git a/cpan/IO-Compress/t/006zip.t b/cpan/IO-Compress/t/006zip.t
index 2dfa52cabb..b2868025f5 100644
--- a/cpan/IO-Compress/t/006zip.t
+++ b/cpan/IO-Compress/t/006zip.t
@@ -19,7 +19,7 @@ BEGIN {
$extra = 1
if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 };
- plan tests => 77 + $extra ;
+ plan tests => 85 + $extra ;
use_ok('IO::Compress::Zip', qw(:all)) ;
use_ok('IO::Uncompress::Unzip', qw(unzip $UnzipError)) ;
@@ -38,7 +38,7 @@ sub getContent
{
my $filename = shift;
- my $u = new IO::Uncompress::Unzip $filename, Append => 1
+ my $u = new IO::Uncompress::Unzip $filename, Append => 1, @_
or die "Cannot open $filename: $UnzipError";
isa_ok $u, "IO::Uncompress::Unzip";
@@ -247,6 +247,34 @@ SKIP:
is $got[2], $content[2], "Got 3nd entry";
}
+{
+ title "RT #72548";
+
+ my $lex = new LexFile my $file1;
+
+ my $blockSize = 1024 * 16;
+
+ my @content = (
+ 'hello',
+ "x" x ($blockSize + 1)
+ );
+
+ my $zip = new IO::Compress::Zip $file1,
+ Name => "one", Method => ZIP_CM_STORE, Stream => 0;
+ isa_ok $zip, "IO::Compress::Zip";
+
+ is $zip->write($content[0]), length($content[0]), "write";
+
+ $zip->newStream(Name=> "two", Method => ZIP_CM_STORE);
+ is $zip->write($content[1]), length($content[1]), "write";
+
+ ok $zip->close(), "closed";
+
+ my @got = getContent($file1, BlockSize => $blockSize);
+
+ is $got[0], $content[0], "Got 1st entry";
+ is $got[1], $content[1], "Got 2nd entry";
+}
SKIP:
for my $method (ZIP_CM_DEFLATE, ZIP_CM_STORE, ZIP_CM_BZIP2)