In perl.git, the branch blead has been updated <https://perl5.git.perl.org/perl.git/commitdiff/afd070d306b88fd469a590328a4843bea86e92b6?hp=96684a73b5f81ca2a88309182dbc2dca9ab1601a>
- Log ----------------------------------------------------------------- commit afd070d306b88fd469a590328a4843bea86e92b6 Author: Chris 'BinGOs' Williams <[email protected]> Date: Mon Aug 12 19:48:50 2019 +0100 Update IO-Compress to CPAN version 2.087 [DELTA] 2.087 10 August 2019 * IO::Uncompress::Unzip nextStream not updating filehandle correctly https://github.com/pmqs/IO-Compress/issues/3 25152f04f5b1bd9341502e42a5877c72eac3f291 * Added travis & appveyor files for CI in GitHub commit 8e832d25d8718a6819315804d2572502d231e6d4 Author: Chris 'BinGOs' Williams <[email protected]> Date: Mon Aug 12 19:47:03 2019 +0100 Update Compress-Raw-Bzip2 to CPAN version 2.087 [DELTA] 2.087 10 August 2019 * No Changes commit 5fda529418dd6484f7add356323a9a6af4134754 Author: Chris 'BinGOs' Williams <[email protected]> Date: Mon Aug 12 19:45:34 2019 +0100 Update Compress-Raw-Zlib to CPAN version 2.087 [DELTA] 2.087 10 August 2019 * clang warning in ppport.h update to latest ppport.h https://github.com/pmqs/Compress-Raw-Zlib/issues/1 664a5fbacf778acdd4cfbcc571997f3df5ee43d3 ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 6 +-- cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm | 2 +- cpan/Compress-Raw-Bzip2/t/000prereq.t | 2 +- cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm | 2 +- cpan/IO-Compress/Makefile.PL | 2 +- cpan/IO-Compress/lib/Compress/Zlib.pm | 12 +++--- 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/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 | 24 ++++++------ 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 | 44 +++++++++++----------- cpan/IO-Compress/lib/IO/Uncompress/Base.pm | 7 +++- cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm | 8 ++-- cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm | 12 +++--- 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 | 16 ++++---- cpan/IO-Compress/t/000prereq.t | 2 +- cpan/IO-Compress/t/006zip.t | 44 +++++++++++++++++++++- cpan/IO-Compress/t/compress/multi.pl | 3 +- 34 files changed, 181 insertions(+), 135 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 2404e0b4fd..64c6e10b07 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -207,7 +207,7 @@ use File::Glob qw(:case); }, 'Compress::Raw::Bzip2' => { - 'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.086.tar.gz', + 'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.087.tar.gz', 'FILES' => q[cpan/Compress-Raw-Bzip2], 'EXCLUDED' => [ qr{^t/Test/}, @@ -219,7 +219,7 @@ use File::Glob qw(:case); }, 'Compress::Raw::Zlib' => { - 'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.086.tar.gz', + 'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.087.tar.gz', 'FILES' => q[cpan/Compress-Raw-Zlib], 'EXCLUDED' => [ qr{^examples/}, @@ -618,7 +618,7 @@ use File::Glob qw(:case); }, 'IO-Compress' => { - 'DISTRIBUTION' => 'PMQS/IO-Compress-2.086.tar.gz', + 'DISTRIBUTION' => 'PMQS/IO-Compress-2.087.tar.gz', 'FILES' => q[cpan/IO-Compress], 'EXCLUDED' => [ qr{^examples/}, diff --git a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm index e8528dcb11..2bbd1034df 100644 --- a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm +++ b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm @@ -11,7 +11,7 @@ use Carp ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD); -$VERSION = '2.086'; +$VERSION = '2.087'; $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 06e490a4e8..44832e2ae3 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.086'; + my $VERSION = '2.087'; my @NAMES = qw( ); diff --git a/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm b/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm index de537a6afb..713ca86cb5 100644 --- a/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm +++ b/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm @@ -10,7 +10,7 @@ use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, %EXPORT_TAGS, @EXPORT_OK, $AUTOLOAD, %DEFLATE_CONSTANTS, @DEFLATE_CONSTANTS); -$VERSION = '2.086'; +$VERSION = '2.087'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; diff --git a/cpan/IO-Compress/Makefile.PL b/cpan/IO-Compress/Makefile.PL index f716e0812c..093b17aa78 100644 --- a/cpan/IO-Compress/Makefile.PL +++ b/cpan/IO-Compress/Makefile.PL @@ -3,7 +3,7 @@ use strict ; require 5.006 ; -$::VERSION = '2.086' ; +$::VERSION = '2.087' ; use lib '.'; use private::MakeUtil; diff --git a/cpan/IO-Compress/lib/Compress/Zlib.pm b/cpan/IO-Compress/lib/Compress/Zlib.pm index 70396fe4f0..9884cea1ea 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.086 ; -use Compress::Raw::Zlib 2.086 ; -use IO::Compress::Gzip 2.086 ; -use IO::Uncompress::Gunzip 2.086 ; +use IO::Compress::Base::Common 2.087 ; +use Compress::Raw::Zlib 2.087 ; +use IO::Compress::Gzip 2.087 ; +use IO::Uncompress::Gunzip 2.087 ; use strict ; use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.086'; +$VERSION = '2.087'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -461,7 +461,7 @@ sub inflate package Compress::Zlib ; -use IO::Compress::Gzip::Constants 2.086 ; +use IO::Compress::Gzip::Constants 2.087 ; 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 efc3e32d23..78a8170790 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.086 qw(:Status); +use IO::Compress::Base::Common 2.087 qw(:Status); -use Compress::Raw::Bzip2 2.086 ; +use Compress::Raw::Bzip2 2.087 ; our ($VERSION); -$VERSION = '2.086'; +$VERSION = '2.087'; 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 d495e9850a..39d84d9cbd 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.086 qw(:Status); -use Compress::Raw::Zlib 2.086 qw( !crc32 !adler32 ) ; +use IO::Compress::Base::Common 2.087 qw(:Status); +use Compress::Raw::Zlib 2.087 qw( !crc32 !adler32 ) ; require Exporter; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, @EXPORT, %DEFLATE_CONSTANTS); -$VERSION = '2.086'; +$VERSION = '2.087'; @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 7ff2ed5982..12db1ffc9f 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.086 qw(:Status); +use IO::Compress::Base::Common 2.087 qw(:Status); our ($VERSION); -$VERSION = '2.086'; +$VERSION = '2.087'; sub mkCompObject { diff --git a/cpan/IO-Compress/lib/IO/Compress/Base.pm b/cpan/IO-Compress/lib/IO/Compress/Base.pm index 0981a1029d..7949af7d01 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.086 ; +use IO::Compress::Base::Common 2.087 ; use IO::File (); ; use Scalar::Util (); @@ -20,7 +20,7 @@ use Symbol(); our (@ISA, $VERSION); @ISA = qw(IO::File Exporter); -$VERSION = '2.086'; +$VERSION = '2.087'; #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 2dfa70e114..a78064f900 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.086'; +$VERSION = '2.087'; @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 fd5f25f49a..03fb7e6cd1 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.086 ; +use IO::Compress::Base 2.087 ; -use IO::Compress::Base::Common 2.086 qw(); -use IO::Compress::Adapter::Bzip2 2.086 ; +use IO::Compress::Base::Common 2.087 qw(); +use IO::Compress::Adapter::Bzip2 2.087 ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error); -$VERSION = '2.086'; +$VERSION = '2.087'; $Bzip2Error = ''; @ISA = qw(IO::Compress::Base Exporter); @@ -51,7 +51,7 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.086 qw(:Parse); + use IO::Compress::Base::Common 2.087 qw(:Parse); return ( 'blocksize100k' => [IO::Compress::Base::Common::Parse_unsigned, 1], diff --git a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm index 029a60ae67..f69423767f 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.086 (); -use IO::Compress::Adapter::Deflate 2.086 ; +use IO::Compress::RawDeflate 2.087 (); +use IO::Compress::Adapter::Deflate 2.087 ; -use IO::Compress::Zlib::Constants 2.086 ; -use IO::Compress::Base::Common 2.086 qw(); +use IO::Compress::Zlib::Constants 2.087 ; +use IO::Compress::Base::Common 2.087 qw(); our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $DeflateError); -$VERSION = '2.086'; +$VERSION = '2.087'; $DeflateError = ''; @ISA = qw(IO::Compress::RawDeflate Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm index bdb218cf8c..d12f7cd7bc 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.086 () ; -use IO::Compress::Adapter::Deflate 2.086 ; +use IO::Compress::RawDeflate 2.087 () ; +use IO::Compress::Adapter::Deflate 2.087 ; -use IO::Compress::Base::Common 2.086 qw(:Status ); -use IO::Compress::Gzip::Constants 2.086 ; -use IO::Compress::Zlib::Extra 2.086 ; +use IO::Compress::Base::Common 2.087 qw(:Status ); +use IO::Compress::Gzip::Constants 2.087 ; +use IO::Compress::Zlib::Extra 2.087 ; BEGIN { @@ -25,7 +25,7 @@ BEGIN our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $GzipError); -$VERSION = '2.086'; +$VERSION = '2.087'; $GzipError = '' ; @ISA = qw(IO::Compress::RawDeflate Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm index aad288ecf9..7d321441d3 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.086'; +$VERSION = '2.087'; @ISA = qw(Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm index 73d3c1cfd7..8865724b06 100644 --- a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm +++ b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm @@ -6,15 +6,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base 2.086 ; -use IO::Compress::Base::Common 2.086 qw(:Status ); -use IO::Compress::Adapter::Deflate 2.086 ; +use IO::Compress::Base 2.087 ; +use IO::Compress::Base::Common 2.087 qw(:Status ); +use IO::Compress::Adapter::Deflate 2.087 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError); -$VERSION = '2.086'; +$VERSION = '2.087'; $RawDeflateError = ''; @ISA = qw(IO::Compress::Base Exporter); @@ -116,8 +116,8 @@ sub getExtraParams return getZlibParams(); } -use IO::Compress::Base::Common 2.086 qw(:Parse); -use Compress::Raw::Zlib 2.086 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); +use IO::Compress::Base::Common 2.087 qw(:Parse); +use Compress::Raw::Zlib 2.087 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); our %PARAMS = ( #'method' => [IO::Compress::Base::Common::Parse_unsigned, Z_DEFLATED], 'level' => [IO::Compress::Base::Common::Parse_signed, Z_DEFAULT_COMPRESSION], diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip.pm b/cpan/IO-Compress/lib/IO/Compress/Zip.pm index f30f45cd4c..a5a25660a9 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.086 qw(:Status ); -use IO::Compress::RawDeflate 2.086 (); -use IO::Compress::Adapter::Deflate 2.086 ; -use IO::Compress::Adapter::Identity 2.086 ; -use IO::Compress::Zlib::Extra 2.086 ; -use IO::Compress::Zip::Constants 2.086 ; +use IO::Compress::Base::Common 2.087 qw(:Status ); +use IO::Compress::RawDeflate 2.087 (); +use IO::Compress::Adapter::Deflate 2.087 ; +use IO::Compress::Adapter::Identity 2.087 ; +use IO::Compress::Zlib::Extra 2.087 ; +use IO::Compress::Zip::Constants 2.087 ; use File::Spec(); use Config; -use Compress::Raw::Zlib 2.086 (); +use Compress::Raw::Zlib 2.087 (); BEGIN { eval { require IO::Compress::Adapter::Bzip2 ; - import IO::Compress::Adapter::Bzip2 2.086 ; + import IO::Compress::Adapter::Bzip2 2.087 ; require IO::Compress::Bzip2 ; - import IO::Compress::Bzip2 2.086 ; + import IO::Compress::Bzip2 2.087 ; } ; eval { require IO::Compress::Adapter::Lzma ; - import IO::Compress::Adapter::Lzma 2.086 ; + import IO::Compress::Adapter::Lzma 2.087 ; require IO::Compress::Lzma ; - import IO::Compress::Lzma 2.086 ; + import IO::Compress::Lzma 2.087 ; } ; } @@ -36,7 +36,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $ZipError); -$VERSION = '2.086'; +$VERSION = '2.087'; $ZipError = ''; @ISA = qw(IO::Compress::RawDeflate Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm index b087ff1d21..55aac59bec 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.086'; +$VERSION = '2.087'; @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 a7190c21f5..7cfc77ee71 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.086'; +$VERSION = '2.087'; @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 bfe0acabf4..387f61c16d 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.086'; +$VERSION = '2.087'; -use IO::Compress::Gzip::Constants 2.086 ; +use IO::Compress::Gzip::Constants 2.087 ; 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 79cd989859..30c9d28e88 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.086 qw(:Status); +use IO::Compress::Base::Common 2.087 qw(:Status); -use Compress::Raw::Bzip2 2.086 ; +use Compress::Raw::Bzip2 2.087 ; our ($VERSION, @ISA); -$VERSION = '2.086'; +$VERSION = '2.087'; 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 443cf8d696..8d7337d1bb 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.086 qw(:Status); +use IO::Compress::Base::Common 2.087 qw(:Status); use IO::Compress::Zip::Constants ; our ($VERSION); -$VERSION = '2.086'; +$VERSION = '2.087'; -use Compress::Raw::Zlib 2.086 (); +use Compress::Raw::Zlib 2.087 (); 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 afbad078f8..6828a2d399 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.086 qw(:Status); -use Compress::Raw::Zlib 2.086 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); +use IO::Compress::Base::Common 2.087 qw(:Status); +use Compress::Raw::Zlib 2.087 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); our ($VERSION); -$VERSION = '2.086'; +$VERSION = '2.087'; diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm index cb04b1e81c..a716c8147a 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.086 (); +use IO::Compress::Base::Common 2.087 (); -use IO::Uncompress::Adapter::Inflate 2.086 (); +use IO::Uncompress::Adapter::Inflate 2.087 (); -use IO::Uncompress::Base 2.086 ; -use IO::Uncompress::Gunzip 2.086 ; -use IO::Uncompress::Inflate 2.086 ; -use IO::Uncompress::RawInflate 2.086 ; -use IO::Uncompress::Unzip 2.086 ; +use IO::Uncompress::Base 2.087 ; +use IO::Uncompress::Gunzip 2.087 ; +use IO::Uncompress::Inflate 2.087 ; +use IO::Uncompress::RawInflate 2.087 ; +use IO::Uncompress::Unzip 2.087 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError); -$VERSION = '2.086'; +$VERSION = '2.087'; $AnyInflateError = ''; @ISA = qw(IO::Uncompress::Base Exporter); @@ -48,7 +48,7 @@ sub anyinflate sub getExtraParams { - use IO::Compress::Base::Common 2.086 qw(:Parse); + use IO::Compress::Base::Common 2.087 qw(:Parse); return ( 'rawinflate' => [Parse_boolean, 0] ) ; } diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm index 69e80851ef..c7b0e24c8f 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.086 (); +use IO::Compress::Base::Common 2.087 (); -use IO::Uncompress::Base 2.086 ; +use IO::Uncompress::Base 2.087 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError); -$VERSION = '2.086'; +$VERSION = '2.087'; $AnyUncompressError = ''; @ISA = qw(IO::Uncompress::Base Exporter); @@ -33,26 +33,26 @@ BEGIN # Don't trigger any __DIE__ Hooks. local $SIG{__DIE__}; - eval ' use IO::Uncompress::Adapter::Inflate 2.086 ;'; - eval ' use IO::Uncompress::Adapter::Bunzip2 2.086 ;'; - eval ' use IO::Uncompress::Adapter::LZO 2.086 ;'; - eval ' use IO::Uncompress::Adapter::Lzf 2.086 ;'; - eval ' use IO::Uncompress::Adapter::UnLzma 2.086 ;'; - eval ' use IO::Uncompress::Adapter::UnXz 2.086 ;'; + eval ' use IO::Uncompress::Adapter::Inflate 2.087 ;'; + eval ' use IO::Uncompress::Adapter::Bunzip2 2.087 ;'; + eval ' use IO::Uncompress::Adapter::LZO 2.087 ;'; + eval ' use IO::Uncompress::Adapter::Lzf 2.087 ;'; + eval ' use IO::Uncompress::Adapter::UnLzma 2.087 ;'; + eval ' use IO::Uncompress::Adapter::UnXz 2.087 ;'; eval ' use IO::Uncompress::Adapter::UnZstd 2.083 ;'; - eval ' use IO::Uncompress::Adapter::UnLzip 2.086 ;'; - - eval ' use IO::Uncompress::Bunzip2 2.086 ;'; - eval ' use IO::Uncompress::UnLzop 2.086 ;'; - eval ' use IO::Uncompress::Gunzip 2.086 ;'; - eval ' use IO::Uncompress::Inflate 2.086 ;'; - eval ' use IO::Uncompress::RawInflate 2.086 ;'; - eval ' use IO::Uncompress::Unzip 2.086 ;'; - eval ' use IO::Uncompress::UnLzf 2.086 ;'; - eval ' use IO::Uncompress::UnLzma 2.086 ;'; - eval ' use IO::Uncompress::UnXz 2.086 ;'; - eval ' use IO::Uncompress::UnZstd 2.086 ;'; - eval ' use IO::Uncompress::UnLzip 2.086 ;'; + eval ' use IO::Uncompress::Adapter::UnLzip 2.087 ;'; + + eval ' use IO::Uncompress::Bunzip2 2.087 ;'; + eval ' use IO::Uncompress::UnLzop 2.087 ;'; + eval ' use IO::Uncompress::Gunzip 2.087 ;'; + eval ' use IO::Uncompress::Inflate 2.087 ;'; + eval ' use IO::Uncompress::RawInflate 2.087 ;'; + eval ' use IO::Uncompress::Unzip 2.087 ;'; + eval ' use IO::Uncompress::UnLzf 2.087 ;'; + eval ' use IO::Uncompress::UnLzma 2.087 ;'; + eval ' use IO::Uncompress::UnXz 2.087 ;'; + eval ' use IO::Uncompress::UnZstd 2.087 ;'; + eval ' use IO::Uncompress::UnLzip 2.087 ;'; } diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm index 8fd00f84f9..6b8636ad39 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(IO::File Exporter); -$VERSION = '2.086'; +$VERSION = '2.087'; use constant G_EOF => 0 ; use constant G_ERR => -1 ; -use IO::Compress::Base::Common 2.086 ; +use IO::Compress::Base::Common 2.087 ; use IO::File ; use Symbol; @@ -1010,6 +1010,9 @@ sub nextStream $status == 1 or return $status ; + *$self->{Pending} = '' + if $self !~ /IO::Uncompress::RawInflate/ && ! *$self->{MultiStream}; + *$self->{TotalInflatedBytesRead} = 0 ; *$self->{LineNo} = $. = 0; diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm index 427b98f1aa..4077998228 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.086 qw(:Status ); +use IO::Compress::Base::Common 2.087 qw(:Status ); -use IO::Uncompress::Base 2.086 ; -use IO::Uncompress::Adapter::Bunzip2 2.086 ; +use IO::Uncompress::Base 2.087 ; +use IO::Uncompress::Adapter::Bunzip2 2.087 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error); -$VERSION = '2.086'; +$VERSION = '2.087'; $Bunzip2Error = ''; @ISA = qw(IO::Uncompress::Base Exporter); diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm index 1ca045613e..c04030583e 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.086 ; +use IO::Uncompress::RawInflate 2.087 ; -use Compress::Raw::Zlib 2.086 () ; -use IO::Compress::Base::Common 2.086 qw(:Status ); -use IO::Compress::Gzip::Constants 2.086 ; -use IO::Compress::Zlib::Extra 2.086 ; +use Compress::Raw::Zlib 2.087 () ; +use IO::Compress::Base::Common 2.087 qw(:Status ); +use IO::Compress::Gzip::Constants 2.087 ; +use IO::Compress::Zlib::Extra 2.087 ; require Exporter ; @@ -28,7 +28,7 @@ Exporter::export_ok_tags('all'); $GunzipError = ''; -$VERSION = '2.086'; +$VERSION = '2.087'; sub new { diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm index 260b7620c7..850ae37b5d 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.086 qw(:Status ); -use IO::Compress::Zlib::Constants 2.086 ; +use IO::Compress::Base::Common 2.087 qw(:Status ); +use IO::Compress::Zlib::Constants 2.087 ; -use IO::Uncompress::RawInflate 2.086 ; +use IO::Uncompress::RawInflate 2.087 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError); -$VERSION = '2.086'; +$VERSION = '2.087'; $InflateError = ''; @ISA = qw(IO::Uncompress::RawInflate Exporter); diff --git a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm index 0118a22127..5e57e56a64 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.086 ; -use IO::Compress::Base::Common 2.086 qw(:Status ); +use Compress::Raw::Zlib 2.087 ; +use IO::Compress::Base::Common 2.087 qw(:Status ); -use IO::Uncompress::Base 2.086 ; -use IO::Uncompress::Adapter::Inflate 2.086 ; +use IO::Uncompress::Base 2.087 ; +use IO::Uncompress::Adapter::Inflate 2.087 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError); -$VERSION = '2.086'; +$VERSION = '2.087'; $RawInflateError = ''; @ISA = qw(IO::Uncompress::Base Exporter); diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm index a1ec388b8e..8b83969a9f 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.086 ; -use IO::Compress::Base::Common 2.086 qw(:Status ); -use IO::Uncompress::Adapter::Inflate 2.086 ; -use IO::Uncompress::Adapter::Identity 2.086 ; -use IO::Compress::Zlib::Extra 2.086 ; -use IO::Compress::Zip::Constants 2.086 ; +use IO::Uncompress::RawInflate 2.087 ; +use IO::Compress::Base::Common 2.087 qw(:Status ); +use IO::Uncompress::Adapter::Inflate 2.087 ; +use IO::Uncompress::Adapter::Identity 2.087 ; +use IO::Compress::Zlib::Extra 2.087 ; +use IO::Compress::Zip::Constants 2.087 ; -use Compress::Raw::Zlib 2.086 () ; +use Compress::Raw::Zlib 2.087 () ; BEGIN { @@ -34,7 +34,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup); -$VERSION = '2.086'; +$VERSION = '2.087'; $UnzipError = ''; @ISA = qw(IO::Uncompress::RawInflate Exporter); diff --git a/cpan/IO-Compress/t/000prereq.t b/cpan/IO-Compress/t/000prereq.t index 08a7d78826..0c4d840287 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.086'; + my $VERSION = '2.087'; 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 33afa8e723..cfc53d79ab 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 => 101 + $extra ; + plan tests => 108 + $extra ; use_ok('IO::Compress::Zip', qw(:all)) ; use_ok('IO::Uncompress::Unzip', qw(unzip $UnzipError)) ; @@ -360,3 +360,45 @@ for my $method (ZIP_CM_DEFLATE, ZIP_CM_STORE, ZIP_CM_BZIP2) is $u->getHeaderInfo()->{Name}, "0", "Name is '0'"; } + +{ + title "nexStream regression"; + # https://github.com/pmqs/IO-Compress/issues/3 + + my $lex = new LexFile my $file1; + + my $content1 = qq["organisation_path","collection_occasion_key","episode_key"\n] ; + + my $zip = new IO::Compress::Zip $file1, + Name => "one"; + isa_ok $zip, "IO::Compress::Zip"; + + print $zip $content1; + + $zip->newStream(Name=> "two"); + + my $content2 = <<EOM; +"key","value" +"version","2" +"type","PMHC" +EOM + print $zip $content2; + + ok $zip->close(), "closed"; + + + my $u = new IO::Uncompress::Unzip $file1, Append => 1, @_ + or die "Cannot open $file1: $UnzipError"; + + isa_ok $u, "IO::Uncompress::Unzip"; + + my $name = $u->getHeaderInfo()->{Name}; + + is $u->getHeaderInfo()->{Name}, "one", "Name is 'one'"; + + ok $u->nextStream(), "nextStream OK"; + + my $line = <$u>; + + is $line, qq["key","value"\n], "got line 1 from second member"; +} \ No newline at end of file diff --git a/cpan/IO-Compress/t/compress/multi.pl b/cpan/IO-Compress/t/compress/multi.pl index 4d587fbdd4..48129a7c45 100644 --- a/cpan/IO-Compress/t/compress/multi.pl +++ b/cpan/IO-Compress/t/compress/multi.pl @@ -216,7 +216,8 @@ EOM ok $gz->eof(), " eof()"; is $gz->streamCount(), $stream, " streamCount is $stream" or diag "Stream count is " . $gz->streamCount(); - ok $un eq $buff, " expected output" ; + is $un, $buff, " expected output" + or diag "Stream count is " . $gz->streamCount(); ; #is $gz->tell(), length $buff, " tell is ok"; is $gz->nextStream(), 1, " nextStream ok"; is $gz->tell(), 0, " tell is 0"; -- Perl5 Master Repository
