Revert "Upgrade IO-Compress to 2.049"

This reverts commit 1d4b9cf3270c936605a07ecd7414f808755d3184.

This depends on the module that was reverted by Ricardo at the same time.

32 files changed, 145 insertions, 183 deletions

diff --git a/cpan/IO-Compress/Changes b/cpan/IO-Compress/Changes
index 9125b0b2ed..0862dd6b3b 100644
--- a/cpan/IO-Compress/Changes
+++ b/cpan/IO-Compress/Changes
@@ -1,18 +1,11 @@
 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 eeedd49259..ae85bbb9f8 100644
--- a/cpan/IO-Compress/Makefile.PL
+++ b/cpan/IO-Compress/Makefile.PL
@@ -3,7 +3,7 @@
 use strict ;
 require 5.006 ;
 
-$::VERSION = '2.049' ;
+$::VERSION = '2.048' ;
 
 use private::MakeUtil;
 use ExtUtils::MakeMaker 5.16 ;
diff --git a/cpan/IO-Compress/README b/cpan/IO-Compress/README
index 0777ed62be..ac90f58def 100644
--- a/cpan/IO-Compress/README
+++ b/cpan/IO-Compress/README
@@ -1,9 +1,9 @@
 
-                            IO-Compress
+                             IO-Compress
 
-                         Version 2.049
+                             Version 2.048
 
-                            18th February 2012
+                             29th January 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.049" ;
+          $VERSION = "2.048" ;
 
  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 ca7fdaa34f..db13bb0386 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.049 ;
-use Compress::Raw::Zlib 2.049 ;
-use IO::Compress::Gzip 2.049 ;
-use IO::Uncompress::Gunzip 2.049 ;
+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 strict ;
 use warnings ;
 use bytes ;
 our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 $XS_VERSION = $VERSION; 
 $VERSION = eval $VERSION;
 
@@ -453,7 +453,7 @@ sub inflate
 
 package Compress::Zlib ;
 
-use IO::Compress::Gzip::Constants 2.049 ;
+use IO::Compress::Gzip::Constants 2.048 ;
 
 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 7b3a258196..452e12ef48 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.049 qw(:Status);
+use IO::Compress::Base::Common  2.048 qw(:Status);
 
-use Compress::Raw::Bzip2  2.049 ;
+use Compress::Raw::Bzip2  2.048 ;
 
 our ($VERSION);
-$VERSION = '2.049';
+$VERSION = '2.048';
 
 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 1c9603a087..4a99c36cf7 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.049 qw(:Status);
-use Compress::Raw::Zlib  2.049 qw( !crc32 !adler32 ) ;
+use IO::Compress::Base::Common 2.048 qw(:Status);
+use Compress::Raw::Zlib  2.048 qw( !crc32 !adler32 ) ;
                                   
 require Exporter;                                     
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, @EXPORT, %DEFLATE_CONSTANTS);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 @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 f3d2bad88b..c7a0031a1d 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.049 qw(:Status);
+use IO::Compress::Base::Common  2.048 qw(:Status);
 our ($VERSION);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 
 sub mkCompObject
 {
diff --git a/cpan/IO-Compress/lib/IO/Compress/Base.pm b/cpan/IO-Compress/lib/IO/Compress/Base.pm
index 5bee72e54c..2137bbb8de 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.049 ;
+use IO::Compress::Base::Common 2.048 ;
 
 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.049';
+$VERSION = '2.048';
 
 #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 9af938fe19..c6c38181ef 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.049';
+$VERSION = '2.048';
 
 @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 e8bdc0eb2b..dd9016bf83 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.049 ;
+use IO::Compress::Base 2.048 ;
 
-use IO::Compress::Base::Common  2.049 qw(createSelfTiedObject);
-use IO::Compress::Adapter::Bzip2 2.049 ;
+use IO::Compress::Base::Common  2.048 qw(createSelfTiedObject);
+use IO::Compress::Adapter::Bzip2 2.048 ;
 
 
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 $Bzip2Error = '';
 
 @ISA    = qw(Exporter IO::Compress::Base);
@@ -51,7 +51,7 @@ sub getExtraParams
 {
     my $self = shift ;
 
-    use IO::Compress::Base::Common  2.049 qw(:Parse);
+    use IO::Compress::Base::Common  2.048 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 fd1966b297..daa7d7aa25 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.049 ();
-use IO::Compress::Adapter::Deflate 2.049 ;
+use IO::Compress::RawDeflate 2.048 ();
+use IO::Compress::Adapter::Deflate 2.048 ;
 
-use IO::Compress::Zlib::Constants 2.049 ;
-use IO::Compress::Base::Common  2.049 qw(createSelfTiedObject);
+use IO::Compress::Zlib::Constants 2.048 ;
+use IO::Compress::Base::Common  2.048 qw(createSelfTiedObject);
 
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $DeflateError);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 $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 ca5ac48a36..6530c2532d 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.049 () ; 
-use IO::Compress::Adapter::Deflate 2.049 ;
+use IO::Compress::RawDeflate 2.048 () ; 
+use IO::Compress::Adapter::Deflate 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 ;
+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 ;
 
 BEGIN
 {
@@ -25,7 +25,7 @@ BEGIN
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $GzipError);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 $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 6b10fb06a5..c218a31445 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.049';
+$VERSION = '2.048';
 
 @ISA = qw(Exporter);
 
diff --git a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
index d42a194d4c..883a4eb2f7 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.049 ;
-use IO::Compress::Base::Common  2.049 qw(:Status createSelfTiedObject);
-use IO::Compress::Adapter::Deflate 2.049 ;
+use IO::Compress::Base 2.048 ;
+use IO::Compress::Base::Common  2.048 qw(:Status createSelfTiedObject);
+use IO::Compress::Adapter::Deflate 2.048 ;
 
 require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 $RawDeflateError = '';
 
 @ISA = qw(Exporter IO::Compress::Base);
@@ -121,8 +121,8 @@ sub getZlibParams
 {
     my $self = shift ;
 
-    use IO::Compress::Base::Common  2.049 qw(:Parse);
-    use Compress::Raw::Zlib  2.049 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
+    use IO::Compress::Base::Common  2.048 qw(:Parse);
+    use Compress::Raw::Zlib  2.048 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 18690c939e..9c2780a5e0 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.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 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 File::Spec();
 use Config;
 
-use Compress::Raw::Zlib  2.049 (); 
+use Compress::Raw::Zlib  2.048 (); 
 
 BEGIN
 {
     eval { require IO::Compress::Adapter::Bzip2 ; 
-           import  IO::Compress::Adapter::Bzip2 2.049 ; 
+           import  IO::Compress::Adapter::Bzip2 2.048 ; 
            require IO::Compress::Bzip2 ; 
-           import  IO::Compress::Bzip2 2.049 ; 
+           import  IO::Compress::Bzip2 2.048 ; 
          } ;
          
     eval { require IO::Compress::Adapter::Lzma ; 
-           import  IO::Compress::Adapter::Lzma 2.049 ; 
+           import  IO::Compress::Adapter::Lzma 2.048 ; 
            require IO::Compress::Lzma ; 
-           import  IO::Compress::Lzma 2.049 ; 
+           import  IO::Compress::Lzma 2.048 ; 
          } ;
 }
 
@@ -36,7 +36,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $ZipError);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 $ZipError = '';
 
 @ISA = qw(Exporter IO::Compress::RawDeflate);
@@ -664,8 +664,8 @@ sub getExtraParams
 {
     my $self = shift ;
 
-    use IO::Compress::Base::Common  2.049 qw(:Parse);
-    use Compress::Raw::Zlib  2.049 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
+    use IO::Compress::Base::Common  2.048 qw(:Parse);
+    use Compress::Raw::Zlib  2.048 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 1d30a490ac..8db079cb93 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.049';
+$VERSION = '2.048';
 
 @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 dc33e839dc..992b1b925f 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.049';
+$VERSION = '2.048';
 
 @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 d89fcfc772..9e0be2e4b6 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.049';
+$VERSION = '2.048';
 
-use IO::Compress::Gzip::Constants 2.049 ;
+use IO::Compress::Gzip::Constants 2.048 ;
 
 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 a7d0a92070..516c5dda4f 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.049 qw(:Status);
+use IO::Compress::Base::Common 2.048 qw(:Status);
 
-use Compress::Raw::Bzip2 2.049 ;
+use Compress::Raw::Bzip2 2.048 ;
 
 our ($VERSION, @ISA);
-$VERSION = '2.049';
+$VERSION = '2.048';
 
 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 a96347cb30..5d74d04212 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.049 qw(:Status);
+use IO::Compress::Base::Common  2.048 qw(:Status);
 use IO::Compress::Zip::Constants ;
 
 our ($VERSION);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 
-use Compress::Raw::Zlib  2.049 ();
+use Compress::Raw::Zlib  2.048 ();
 
 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 97bb201675..c0f3542a98 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.049 qw(:Status);
-use Compress::Raw::Zlib  2.049 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
+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);
 
 our ($VERSION);
-$VERSION = '2.049';
+$VERSION = '2.048';
 
 
 
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
index 8b94844c72..a6ab437159 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.049 qw(createSelfTiedObject);
+use IO::Compress::Base::Common  2.048 qw(createSelfTiedObject);
 
-use IO::Uncompress::Adapter::Inflate  2.049 ();
+use IO::Uncompress::Adapter::Inflate  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 ;
+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 ;
 
 require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 $AnyInflateError = '';
 
 @ISA = qw( Exporter IO::Uncompress::Base );
@@ -48,7 +48,7 @@ sub anyinflate
 
 sub getExtraParams
 {
-    use IO::Compress::Base::Common  2.049 qw(:Parse);
+    use IO::Compress::Base::Common  2.048 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 8dd0ea8994..d9a48e6a24 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.049 qw(createSelfTiedObject);
+use IO::Compress::Base::Common 2.048 qw(createSelfTiedObject);
 
-use IO::Uncompress::Base 2.049 ;
+use IO::Uncompress::Base 2.048 ;
 
 
 require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 $AnyUncompressError = '';
 
 @ISA = qw( Exporter IO::Uncompress::Base );
@@ -27,22 +27,22 @@ Exporter::export_ok_tags('all');
 
 BEGIN
 {
-   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 ;';
+   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 ;';
 }
 
 sub new
@@ -60,7 +60,7 @@ sub anyuncompress
 
 sub getExtraParams
 {
-    use IO::Compress::Base::Common 2.049 qw(:Parse);
+    use IO::Compress::Base::Common 2.048 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 8145480a9b..cb1e15e9ae 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.049';
+$VERSION = '2.048';
 
 use constant G_EOF => 0 ;
 use constant G_ERR => -1 ;
 
-use IO::Compress::Base::Common 2.049 ;
+use IO::Compress::Base::Common 2.048 ;
 
 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 d26e6c5134..f53513a7e4 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.049 qw(:Status createSelfTiedObject);
+use IO::Compress::Base::Common 2.048 qw(:Status createSelfTiedObject);
 
-use IO::Uncompress::Base 2.049 ;
-use IO::Uncompress::Adapter::Bunzip2 2.049 ;
+use IO::Uncompress::Base 2.048 ;
+use IO::Uncompress::Adapter::Bunzip2 2.048 ;
 
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 $Bunzip2Error = '';
 
 @ISA    = qw( Exporter IO::Uncompress::Base );
@@ -40,7 +40,7 @@ sub getExtraParams
 {
     my $self = shift ;
 
-    use IO::Compress::Base::Common 2.049 qw(:Parse);
+    use IO::Compress::Base::Common 2.048 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 7e2b111455..bf803ae161 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.049 ;
+use IO::Uncompress::RawInflate 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 ;
+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 ;
 
 require Exporter ;
 
@@ -28,7 +28,7 @@ Exporter::export_ok_tags('all');
 
 $GunzipError = '';
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 
 sub new
 {
@@ -47,7 +47,7 @@ sub gunzip
 
 sub getExtraParams
 {
-    use IO::Compress::Base::Common  2.049 qw(:Parse);
+    use IO::Compress::Base::Common  2.048 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 76a6c20ff5..7a40889fa8 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.049 qw(:Status createSelfTiedObject);
-use IO::Compress::Zlib::Constants 2.049 ;
+use IO::Compress::Base::Common  2.048 qw(:Status createSelfTiedObject);
+use IO::Compress::Zlib::Constants 2.048 ;
 
-use IO::Uncompress::RawInflate  2.049 ;
+use IO::Uncompress::RawInflate  2.048 ;
 
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 $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 d00d13e20e..0372ec72e3 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.049 ;
-use IO::Compress::Base::Common  2.049 qw(:Status createSelfTiedObject);
+use Compress::Raw::Zlib  2.048 ;
+use IO::Compress::Base::Common  2.048 qw(:Status createSelfTiedObject);
 
-use IO::Uncompress::Base  2.049 ;
-use IO::Uncompress::Adapter::Inflate  2.049 ;
+use IO::Uncompress::Base  2.048 ;
+use IO::Uncompress::Adapter::Inflate  2.048 ;
 
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 $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 1862a80180..7b2121c4e7 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.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 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 Compress::Raw::Zlib  2.049 () ;
+use Compress::Raw::Zlib  2.048 () ;
 
 BEGIN
 {
@@ -31,7 +31,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup);
 
-$VERSION = '2.049';
+$VERSION = '2.048';
 $UnzipError = '';
 
 @ISA    = qw(Exporter IO::Uncompress::RawInflate);
@@ -64,7 +64,7 @@ sub unzip
 
 sub getExtraParams
 {
-    use IO::Compress::Base::Common  2.049 qw(:Parse);
+    use IO::Compress::Base::Common  2.048 qw(:Parse);
 
     
     return (
diff --git a/cpan/IO-Compress/t/000prereq.t b/cpan/IO-Compress/t/000prereq.t
index 7ae90c5ffb..d861811720 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.049';
+    my $VERSION = '2.048';
     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 a85ed10e27..8b804cbee9 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 = 471 ;
+        $count = 464 ;
     }
 
 
@@ -1231,38 +1231,20 @@ sub trickle
 
 
 {
-    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";
+    title "repeated calls to flush";
 
     my $hello = "I am a HAL 9000 computer" ;
-    my ($err, $x, $X, $status, $data); 
+    my ($err, $x, $X, $status); 
  
     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->deflate($hello) ;
+    $status = $x->deflate($hello, $X) ;
     cmp_ok $status, '==', Z_OK, "deflate returned 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";
+    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";
 }
diff --git a/cpan/IO-Compress/t/cz-14gzopen.t b/cpan/IO-Compress/t/cz-14gzopen.t
index d5f0ea0c04..0918ce5482 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 => 264 + $extra ;
+    plan tests => 260 + $extra ;
 
     use_ok('Compress::Zlib', 2) ;
     use_ok('IO::Compress::Gzip::Constants') ;
@@ -651,20 +651,7 @@ foreach my $stdio ( ['-', '-'], [*STDIN, *STDOUT])
 }
 
 {
-    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';
+    title 'gzflush called twice';
 
     my $lex = new LexFile my $name ;