[PATCH] IO-Compress 2.022

Message-ID: <4ACFB129.9070900@btinternet.com>

26 files changed, 49 insertions, 48 deletions

diff --git a/cpan/IO-Compress/lib/Compress/Zlib.pm b/cpan/IO-Compress/lib/Compress/Zlib.pm
index 0a611039b8..604227c3a1 100644
--- a/cpan/IO-Compress/lib/Compress/Zlib.pm
+++ b/cpan/IO-Compress/lib/Compress/Zlib.pm
@@ -18,7 +18,7 @@ use warnings ;
 use bytes ;
 our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $XS_VERSION = $VERSION; 
 $VERSION = eval $VERSION;
 
diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
index a56331d2cb..103a0452b6 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
@@ -10,7 +10,7 @@ use IO::Compress::Base::Common  2.021 qw(:Status);
 use Compress::Raw::Bzip2  2.021 ;
 
 our ($VERSION);
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 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 525868093c..ac8f0364f9 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
@@ -9,7 +9,7 @@ use IO::Compress::Base::Common  2.021 qw(:Status);
 use Compress::Raw::Zlib  2.021 qw(Z_OK Z_FINISH MAX_WBITS) ;
 our ($VERSION);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 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 c980e6c343..e83542fca7 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
@@ -7,7 +7,7 @@ use bytes;
 use IO::Compress::Base::Common  2.021 qw(:Status);
 our ($VERSION);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 sub mkCompObject
 {
diff --git a/cpan/IO-Compress/lib/IO/Compress/Base.pm b/cpan/IO-Compress/lib/IO/Compress/Base.pm
index 7b558eafeb..bdd8d79513 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Base.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Base.pm
@@ -20,7 +20,7 @@ use bytes;
 our (@ISA, $VERSION);
 @ISA    = qw(Exporter IO::File);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 #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 7981585d49..26af4f87b0 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.021';
+$VERSION = '2.022';
 
 @EXPORT = qw( isaFilehandle isaFilename whatIsInput whatIsOutput 
               isaFileGlobString cleanFileGlobString oneTarget
@@ -589,7 +589,7 @@ sub IO::Compress::Base::Parameters::parse
         $key = lc $key;
 
         if ($firstTime || ! $sticky) {
-            $x = [ $x ]
+            $x = []
                 if $type & Parse_multiple;
 
             $got->{$key} = [0, $type, $value, $x, $first_only, $sticky] ;
diff --git a/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm
index e5f86b2f36..28725c64a8 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm
@@ -14,7 +14,7 @@ use IO::Compress::Adapter::Bzip2 2.021 ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $Bzip2Error = '';
 
 @ISA    = qw(Exporter IO::Compress::Base);
diff --git a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm
index 7ee0a53997..2e1a19fe07 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm
@@ -15,7 +15,7 @@ use IO::Compress::Base::Common  2.021 qw(createSelfTiedObject);
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $DeflateError);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $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 5ddfad20b9..f2e60f6557 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm
@@ -27,7 +27,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $GzipError);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $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 826183680e..095668e4fb 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.021';
+$VERSION = '2.022';
 
 @ISA = qw(Exporter);
 
diff --git a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
index ad642dbfa5..02a8cda27a 100644
--- a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
@@ -16,7 +16,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $RawDeflateError = '';
 
 @ISA = qw(Exporter IO::Compress::Base);
diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip.pm b/cpan/IO-Compress/lib/IO/Compress/Zip.pm
index 563b10d9bf..d6e6167b95 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Zip.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Zip.pm
@@ -32,7 +32,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $ZipError);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $ZipError = '';
 
 @ISA = qw(Exporter IO::Compress::RawDeflate);
diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm
index d16eb238ef..a554d49df6 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.021';
+$VERSION = '2.022';
 
 @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 d65fedc580..6b935ffc11 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.021';
+$VERSION = '2.022';
 
 @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 72b4ddd370..0c88017a63 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm
@@ -8,7 +8,7 @@ use bytes;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 use IO::Compress::Gzip::Constants 2.021 ;
 
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
index b2053aff10..796aadb416 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
@@ -9,7 +9,7 @@ use IO::Compress::Base::Common 2.021 qw(:Status);
 use Compress::Raw::Bzip2 2.021 ;
 
 our ($VERSION, @ISA);
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 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 0df174320a..834eb5d230 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
@@ -8,7 +8,7 @@ use IO::Compress::Base::Common  2.021 qw(:Status);
 
 our ($VERSION);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 use Compress::Raw::Zlib  2.021 ();
 
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
index d03148c0b4..5c67c1b6a8 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
@@ -8,7 +8,7 @@ use IO::Compress::Base::Common  2.021 qw(:Status);
 use Compress::Raw::Zlib  2.021 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
 
 our ($VERSION);
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 
 
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
index e8ffc5c15b..900feda477 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
@@ -21,7 +21,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $AnyInflateError = '';
 
 @ISA = qw( Exporter IO::Uncompress::Base );
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
index cc1ba24b47..c4406e55d5 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
@@ -13,7 +13,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $AnyUncompressError = '';
 
 @ISA = qw( Exporter IO::Uncompress::Base );
@@ -31,8 +31,8 @@ BEGIN
    eval ' use IO::Uncompress::Adapter::Bunzip2 2.021 ;';
    eval ' use IO::Uncompress::Adapter::LZO 2.021 ;';
    eval ' use IO::Uncompress::Adapter::Lzf 2.021 ;';
-   eval ' use IO::Uncompress::Adapter::UnLzma 2.020 ;';
-   eval ' use IO::Uncompress::Adapter::UnXz 2.020 ;';
+   #eval ' use IO::Uncompress::Adapter::UnLzma 2.020 ;';
+   #eval ' use IO::Uncompress::Adapter::UnXz 2.020 ;';
 
    eval ' use IO::Uncompress::Bunzip2 2.021 ;';
    eval ' use IO::Uncompress::UnLzop 2.021 ;';
@@ -41,8 +41,8 @@ BEGIN
    eval ' use IO::Uncompress::RawInflate 2.021 ;';
    eval ' use IO::Uncompress::Unzip 2.021 ;';
    eval ' use IO::Uncompress::UnLzf 2.021 ;';
-   eval ' use IO::Uncompress::UnLzma 2.018 ;';
-   eval ' use IO::Uncompress::UnXz 2.018 ;';
+   #eval ' use IO::Uncompress::UnLzma 2.018 ;';
+   #eval ' use IO::Uncompress::UnXz 2.018 ;';
 }
 
 sub new
@@ -61,7 +61,8 @@ sub anyuncompress
 sub getExtraParams
 {
     use IO::Compress::Base::Common 2.021 qw(:Parse);
-    return ( 'RawInflate' => [1, 1, Parse_boolean,  0] ) ;
+    return ( 'RawInflate' => [1, 1, Parse_boolean,  0] ,
+             'UnLzma'     => [1, 1, Parse_boolean,  0] ) ;
 }
 
 sub ckParams
@@ -107,7 +108,7 @@ sub mkUncomp
         }
      }
 
-#    if (defined $IO::Uncompress::UnLzma::VERSION )
+#    if (defined $IO::Uncompress::UnLzma::VERSION && $got->value('UnLzma'))
 #    {
 #        my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::UnLzma::mkUncompObject();
 #
@@ -125,21 +126,21 @@ sub mkUncomp
 #            return 1;
 #        }
 #     }
-
-     if (defined $IO::Uncompress::UnXz::VERSION and
-         $magic = $self->ckMagic('UnXz')) {
-        *$self->{Info} = $self->readHeader($magic)
-            or return undef ;
-
-        my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::UnXz::mkUncompObject();
-
-        return $self->saveErrorString(undef, $errstr, $errno)
-            if ! defined $obj;
-
-        *$self->{Uncomp} = $obj;
-
-         return 1;
-     }
+#
+#     if (defined $IO::Uncompress::UnXz::VERSION and
+#         $magic = $self->ckMagic('UnXz')) {
+#        *$self->{Info} = $self->readHeader($magic)
+#            or return undef ;
+#
+#        my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::UnXz::mkUncompObject();
+#
+#        return $self->saveErrorString(undef, $errstr, $errno)
+#            if ! defined $obj;
+#
+#        *$self->{Uncomp} = $obj;
+#
+#         return 1;
+#     }
 
      if (defined $IO::Uncompress::Bunzip2::VERSION and
          $magic = $self->ckMagic('Bunzip2')) {
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm
index 8459ce0e05..eccff87b2c 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm
@@ -9,7 +9,7 @@ our (@ISA, $VERSION, @EXPORT_OK, %EXPORT_TAGS);
 @ISA    = qw(Exporter IO::File);
 
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 use constant G_EOF => 0 ;
 use constant G_ERR => -1 ;
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
index ce483ea738..22cf65d450 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
@@ -12,7 +12,7 @@ use IO::Uncompress::Adapter::Bunzip2 2.021 ;
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $Bunzip2Error = '';
 
 @ISA    = qw( Exporter IO::Uncompress::Base );
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm
index 8922865d43..41b6d3d4f6 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm
@@ -28,7 +28,7 @@ Exporter::export_ok_tags('all');
 
 $GunzipError = '';
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 sub new
 {
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm
index 20aecc7864..1a22263626 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm
@@ -13,7 +13,7 @@ use IO::Uncompress::RawInflate  2.021 ;
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $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 5727192e7c..3a45fcdde8 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm
@@ -14,7 +14,7 @@ use IO::Uncompress::Adapter::Inflate  2.021 ;
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $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 7d08c84edc..c9f638ad2e 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm
@@ -30,7 +30,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $UnzipError = '';
 
 @ISA    = qw(Exporter IO::Uncompress::RawInflate);