From 0b068eb5bb810a1d297a8377ed2e4e0858b82c18 Mon Sep 17 00:00:00 2001 From: Chris 'BinGOs' Williams Date: Sat, 18 Feb 2012 16:24:52 +0000 Subject: Update IO-Compress to CPAN version 2.049 [DELTA] 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] --- Porting/Maintainers.pl | 2 +- cpan/IO-Compress/Changes | 9 ++++- cpan/IO-Compress/Makefile.PL | 2 +- cpan/IO-Compress/README | 8 ++--- 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 | 28 +++++++-------- cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm | 2 +- cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm | 2 +- cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm | 4 +-- .../lib/IO/Uncompress/Adapter/Bunzip2.pm | 6 ++-- .../lib/IO/Uncompress/Adapter/Identity.pm | 6 ++-- .../lib/IO/Uncompress/Adapter/Inflate.pm | 6 ++-- cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm | 18 +++++----- .../IO-Compress/lib/IO/Uncompress/AnyUncompress.pm | 40 +++++++++++----------- cpan/IO-Compress/lib/IO/Uncompress/Base.pm | 4 +-- cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm | 10 +++--- cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm | 14 ++++---- cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm | 8 ++--- cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm | 10 +++--- cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm | 18 +++++----- cpan/IO-Compress/t/000prereq.t | 2 +- cpan/IO-Compress/t/cz-03zlib-v1.t | 34 +++++++++++++----- cpan/IO-Compress/t/cz-14gzopen.t | 17 +++++++-- pod/perldelta.pod | 4 +++ 34 files changed, 188 insertions(+), 146 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index f4cc2e727a..9d54015716 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1006,7 +1006,7 @@ use File::Glob qw(:case); 'IO-Compress' => { 'MAINTAINER' => 'pmqs', - 'DISTRIBUTION' => 'PMQS/IO-Compress-2.048.tar.gz', + 'DISTRIBUTION' => 'PMQS/IO-Compress-2.049.tar.gz', 'FILES' => q[cpan/IO-Compress], 'EXCLUDED' => [qr{t/Test/}], 'UPSTREAM' => 'cpan', diff --git a/cpan/IO-Compress/Changes b/cpan/IO-Compress/Changes index 0862dd6b3b..9125b0b2ed 100644 --- a/cpan/IO-Compress/Changes +++ b/cpan/IO-Compress/Changes @@ -1,11 +1,18 @@ CHANGES ------- + 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..eeedd49259 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.049' ; use private::MakeUtil; use ExtUtils::MakeMaker 5.16 ; diff --git a/cpan/IO-Compress/README b/cpan/IO-Compress/README index ac90f58def..0777ed62be 100644 --- a/cpan/IO-Compress/README +++ b/cpan/IO-Compress/README @@ -1,9 +1,9 @@ - IO-Compress + IO-Compress - Version 2.048 + Version 2.049 - 29th January 2012 + 18th February 2012 Copyright (c) 1995-2012 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -89,7 +89,7 @@ To help me help you, I need all of the following information: If you haven't installed IO-Compress then search IO::Compress::Gzip.pm for a line like this: - $VERSION = "2.048" ; + $VERSION = "2.049" ; 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..ca7fdaa34f 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.049 ; +use Compress::Raw::Zlib 2.049 ; +use IO::Compress::Gzip 2.049 ; +use IO::Uncompress::Gunzip 2.049 ; use strict ; use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.048'; +$VERSION = '2.049'; $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.049 ; 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..7b3a258196 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.049 qw(:Status); -use Compress::Raw::Bzip2 2.048 ; +use Compress::Raw::Bzip2 2.049 ; our ($VERSION); -$VERSION = '2.048'; +$VERSION = '2.049'; 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..1c9603a087 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.049 qw(:Status); +use Compress::Raw::Zlib 2.049 qw( !crc32 !adler32 ) ; require Exporter; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, @EXPORT, %DEFLATE_CONSTANTS); -$VERSION = '2.048'; +$VERSION = '2.049'; @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..f3d2bad88b 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.049 qw(:Status); our ($VERSION); -$VERSION = '2.048'; +$VERSION = '2.049'; sub mkCompObject { diff --git a/cpan/IO-Compress/lib/IO/Compress/Base.pm b/cpan/IO-Compress/lib/IO/Compress/Base.pm index 2137bbb8de..5bee72e54c 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.049 ; 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.049'; #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..9af938fe19 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.049'; @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..e8bdc0eb2b 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.049 ; -use IO::Compress::Base::Common 2.048 qw(createSelfTiedObject); -use IO::Compress::Adapter::Bzip2 2.048 ; +use IO::Compress::Base::Common 2.049 qw(createSelfTiedObject); +use IO::Compress::Adapter::Bzip2 2.049 ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error); -$VERSION = '2.048'; +$VERSION = '2.049'; $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.049 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..fd1966b297 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.049 (); +use IO::Compress::Adapter::Deflate 2.049 ; -use IO::Compress::Zlib::Constants 2.048 ; -use IO::Compress::Base::Common 2.048 qw(createSelfTiedObject); +use IO::Compress::Zlib::Constants 2.049 ; +use IO::Compress::Base::Common 2.049 qw(createSelfTiedObject); our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $DeflateError); -$VERSION = '2.048'; +$VERSION = '2.049'; $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 6530c2532d..ca5ac48a36 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.049 () ; +use IO::Compress::Adapter::Deflate 2.049 ; -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.049 qw(:Status :Parse isaScalar createSelfTiedObject); +use IO::Compress::Gzip::Constants 2.049 ; +use IO::Compress::Zlib::Extra 2.049 ; BEGIN { @@ -25,7 +25,7 @@ BEGIN our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $GzipError); -$VERSION = '2.048'; +$VERSION = '2.049'; $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..6b10fb06a5 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.049'; @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..d42a194d4c 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.049 ; +use IO::Compress::Base::Common 2.049 qw(:Status createSelfTiedObject); +use IO::Compress::Adapter::Deflate 2.049 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError); -$VERSION = '2.048'; +$VERSION = '2.049'; $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.049 qw(:Parse); + use Compress::Raw::Zlib 2.049 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..18690c939e 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.049 qw(:Status MAX32 isGeMax32 isaScalar createSelfTiedObject); +use IO::Compress::RawDeflate 2.049 (); +use IO::Compress::Adapter::Deflate 2.049 ; +use IO::Compress::Adapter::Identity 2.049 ; +use IO::Compress::Zlib::Extra 2.049 ; +use IO::Compress::Zip::Constants 2.049 ; use File::Spec(); use Config; -use Compress::Raw::Zlib 2.048 (); +use Compress::Raw::Zlib 2.049 (); BEGIN { eval { require IO::Compress::Adapter::Bzip2 ; - import IO::Compress::Adapter::Bzip2 2.048 ; + import IO::Compress::Adapter::Bzip2 2.049 ; require IO::Compress::Bzip2 ; - import IO::Compress::Bzip2 2.048 ; + import IO::Compress::Bzip2 2.049 ; } ; eval { require IO::Compress::Adapter::Lzma ; - import IO::Compress::Adapter::Lzma 2.048 ; + import IO::Compress::Adapter::Lzma 2.049 ; require IO::Compress::Lzma ; - import IO::Compress::Lzma 2.048 ; + import IO::Compress::Lzma 2.049 ; } ; } @@ -36,7 +36,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $ZipError); -$VERSION = '2.048'; +$VERSION = '2.049'; $ZipError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -664,8 +664,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.049 qw(:Parse); + use Compress::Raw::Zlib 2.049 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 8db079cb93..1d30a490ac 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.049'; @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..dc33e839dc 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.049'; @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..d89fcfc772 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.049'; -use IO::Compress::Gzip::Constants 2.048 ; +use IO::Compress::Gzip::Constants 2.049 ; 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..a7d0a92070 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.049 qw(:Status); -use Compress::Raw::Bzip2 2.048 ; +use Compress::Raw::Bzip2 2.049 ; our ($VERSION, @ISA); -$VERSION = '2.048'; +$VERSION = '2.049'; 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..a96347cb30 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.049 qw(:Status); use IO::Compress::Zip::Constants ; our ($VERSION); -$VERSION = '2.048'; +$VERSION = '2.049'; -use Compress::Raw::Zlib 2.048 (); +use Compress::Raw::Zlib 2.049 (); 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..97bb201675 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.049 qw(:Status); +use Compress::Raw::Zlib 2.049 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); our ($VERSION); -$VERSION = '2.048'; +$VERSION = '2.049'; diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm index a6ab437159..8b94844c72 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.049 qw(createSelfTiedObject); -use IO::Uncompress::Adapter::Inflate 2.048 (); +use IO::Uncompress::Adapter::Inflate 2.049 (); -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.049 ; +use IO::Uncompress::Gunzip 2.049 ; +use IO::Uncompress::Inflate 2.049 ; +use IO::Uncompress::RawInflate 2.049 ; +use IO::Uncompress::Unzip 2.049 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError); -$VERSION = '2.048'; +$VERSION = '2.049'; $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.049 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 d9a48e6a24..8dd0ea8994 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.049 qw(createSelfTiedObject); -use IO::Uncompress::Base 2.048 ; +use IO::Uncompress::Base 2.049 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError); -$VERSION = '2.048'; +$VERSION = '2.049'; $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.049 ;'; + eval ' use IO::Uncompress::Adapter::Bunzip2 2.049 ;'; + eval ' use IO::Uncompress::Adapter::LZO 2.049 ;'; + eval ' use IO::Uncompress::Adapter::Lzf 2.049 ;'; + eval ' use IO::Uncompress::Adapter::UnLzma 2.049 ;'; + eval ' use IO::Uncompress::Adapter::UnXz 2.049 ;'; + + eval ' use IO::Uncompress::Bunzip2 2.049 ;'; + eval ' use IO::Uncompress::UnLzop 2.049 ;'; + eval ' use IO::Uncompress::Gunzip 2.049 ;'; + eval ' use IO::Uncompress::Inflate 2.049 ;'; + eval ' use IO::Uncompress::RawInflate 2.049 ;'; + eval ' use IO::Uncompress::Unzip 2.049 ;'; + eval ' use IO::Uncompress::UnLzf 2.049 ;'; + eval ' use IO::Uncompress::UnLzma 2.049 ;'; + eval ' use IO::Uncompress::UnXz 2.049 ;'; } 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.049 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 cb1e15e9ae..8145480a9b 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.049'; use constant G_EOF => 0 ; use constant G_ERR => -1 ; -use IO::Compress::Base::Common 2.048 ; +use IO::Compress::Base::Common 2.049 ; 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..d26e6c5134 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.049 qw(:Status createSelfTiedObject); -use IO::Uncompress::Base 2.048 ; -use IO::Uncompress::Adapter::Bunzip2 2.048 ; +use IO::Uncompress::Base 2.049 ; +use IO::Uncompress::Adapter::Bunzip2 2.049 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error); -$VERSION = '2.048'; +$VERSION = '2.049'; $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.049 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..7e2b111455 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.049 ; -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.049 () ; +use IO::Compress::Base::Common 2.049 qw(:Status createSelfTiedObject); +use IO::Compress::Gzip::Constants 2.049 ; +use IO::Compress::Zlib::Extra 2.049 ; require Exporter ; @@ -28,7 +28,7 @@ Exporter::export_ok_tags('all'); $GunzipError = ''; -$VERSION = '2.048'; +$VERSION = '2.049'; 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.049 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 7a40889fa8..76a6c20ff5 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.049 qw(:Status createSelfTiedObject); +use IO::Compress::Zlib::Constants 2.049 ; -use IO::Uncompress::RawInflate 2.048 ; +use IO::Uncompress::RawInflate 2.049 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError); -$VERSION = '2.048'; +$VERSION = '2.049'; $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 0372ec72e3..d00d13e20e 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.049 ; +use IO::Compress::Base::Common 2.049 qw(:Status createSelfTiedObject); -use IO::Uncompress::Base 2.048 ; -use IO::Uncompress::Adapter::Inflate 2.048 ; +use IO::Uncompress::Base 2.049 ; +use IO::Uncompress::Adapter::Inflate 2.049 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError); -$VERSION = '2.048'; +$VERSION = '2.049'; $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 7b2121c4e7..1862a80180 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.049 ; +use IO::Compress::Base::Common 2.049 qw(:Status createSelfTiedObject); +use IO::Uncompress::Adapter::Inflate 2.049 ; +use IO::Uncompress::Adapter::Identity 2.049 ; +use IO::Compress::Zlib::Extra 2.049 ; +use IO::Compress::Zip::Constants 2.049 ; -use Compress::Raw::Zlib 2.048 () ; +use Compress::Raw::Zlib 2.049 () ; BEGIN { @@ -31,7 +31,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup); -$VERSION = '2.048'; +$VERSION = '2.049'; $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.049 qw(:Parse); return ( diff --git a/cpan/IO-Compress/t/000prereq.t b/cpan/IO-Compress/t/000prereq.t index d861811720..7ae90c5ffb 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.049'; my @NAMES = qw( Compress::Raw::Bzip2 Compress::Raw::Zlib diff --git a/cpan/IO-Compress/t/cz-03zlib-v1.t b/cpan/IO-Compress/t/cz-03zlib-v1.t index 8b804cbee9..a85ed10e27 100644 --- a/cpan/IO-Compress/t/cz-03zlib-v1.t +++ b/cpan/IO-Compress/t/cz-03zlib-v1.t @@ -26,7 +26,7 @@ BEGIN $count = 453 ; } else { - $count = 464 ; + $count = 471 ; } @@ -1231,20 +1231,38 @@ sub trickle { - title "repeated calls to flush"; + title "repeated calls to flush - no compression"; + + my ($err, $x, $X, $status, $data); + + ok( ($x, $err) = deflateInit ( ), "Create deflate object" ); + isa_ok $x, "Compress::Raw::Zlib::deflateStream" ; + cmp_ok $err, '==', Z_OK, "status is Z_OK" ; + + + ($data, $status) = $x->flush(Z_SYNC_FLUSH) ; + cmp_ok $status, '==', Z_OK, "flush returned Z_OK" ; + ($data, $status) = $x->flush(Z_SYNC_FLUSH) ; + cmp_ok $status, '==', Z_OK, "second flush returned Z_OK" ; + is $data, "", "no output from second flush"; +} + +{ + title "repeated calls to flush - after compression"; my $hello = "I am a HAL 9000 computer" ; - my ($err, $x, $X, $status); + my ($err, $x, $X, $status, $data); ok( ($x, $err) = deflateInit ( ), "Create deflate object" ); isa_ok $x, "Compress::Raw::Zlib::deflateStream" ; cmp_ok $err, '==', Z_OK, "status is Z_OK" ; - $status = $x->deflate($hello, $X) ; + ($data, $status) = $x->deflate($hello) ; cmp_ok $status, '==', Z_OK, "deflate returned Z_OK" ; - cmp_ok $x->flush($X, Z_SYNC_FLUSH), '==', Z_OK, "flush returned Z_OK" ; - $X = ''; - cmp_ok $x->flush($X, Z_SYNC_FLUSH), '==', Z_OK, "second flush returned Z_OK" ; - is $X, "", "no output from second flush"; + ($data, $status) = $x->flush(Z_SYNC_FLUSH) ; + cmp_ok $status, '==', Z_OK, "flush returned Z_OK" ; + ($data, $status) = $x->flush(Z_SYNC_FLUSH) ; + cmp_ok $status, '==', Z_OK, "second flush returned Z_OK" ; + is $data, "", "no output from second flush"; } 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 ; diff --git a/pod/perldelta.pod b/pod/perldelta.pod index b4204b8d4b..7943108601 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -103,6 +103,10 @@ L has been upgraded from version 0.69 to version 0.70. L has been upgraded from version 2.045 to version 2.049. +=item * + +L has been upgraded from version 2.046 to version 2.049. + =back =head2 Removed Modules and Pragmata -- cgit v1.2.1