diff options
author | gregor herrmann <gregoa@debian.org> | 2024-04-28 12:01:32 +0200 |
---|---|---|
committer | gregor herrmann <gregoa@debian.org> | 2024-04-28 12:01:32 +0200 |
commit | 371e1be9deea118ab676522914797b3fc6cf3793 (patch) | |
tree | 497e0632f9eb8519f275b7673cb624fbc63c6d38 | |
parent | a76aa41ed3fdcd0990988e338f8539c40595d02e (diff) | |
parent | d56a5fe2ea34aef4d60cc0b5670441b8901a3ab3 (diff) |
Update upstream source from tag 'upstream/2.212'
Update to upstream version '2.212'
with Debian dir 5792deec012a9228d3366ea9298c0ecb4c3a70b6
33 files changed, 303 insertions, 183 deletions
@@ -1,12 +1,16 @@ CHANGES ------- + 2.212 27 April 2024 + + * no functional changes + 2.211 6 April 2024 * version 2.211 Sat Apr 6 14:14:55 2024 +0100 1276339652e8df49a29facd9ee1ae41d9c7dc994 - + 2.208 31 March 2024 * Update zipdetails to version 4.002 @@ -34,8 +34,8 @@ }, "runtime" : { "requires" : { - "Compress::Raw::Bzip2" : "2.211", - "Compress::Raw::Zlib" : "2.211", + "Compress::Raw::Bzip2" : "2.212", + "Compress::Raw::Zlib" : "2.212", "Encode" : "0", "Scalar::Util" : "0", "Time::Local" : "0" @@ -54,6 +54,6 @@ "web" : "https://github.com/pmqs/IO-Compress" } }, - "version" : "2.211", + "version" : "2.212", "x_serialization_backend" : "JSON::PP version 4.02" } @@ -20,8 +20,8 @@ no_index: - t - private requires: - Compress::Raw::Bzip2: '2.211' - Compress::Raw::Zlib: '2.211' + Compress::Raw::Bzip2: '2.212' + Compress::Raw::Zlib: '2.212' Encode: '0' Scalar::Util: '0' Time::Local: '0' @@ -29,5 +29,5 @@ resources: bugtracker: https://github.com/pmqs/IO-Compress/issues homepage: https://github.com/pmqs/IO-Compress repository: git://github.com/pmqs/IO-Compress.git -version: '2.211' +version: '2.212' x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff --git a/Makefile.PL b/Makefile.PL index 9e74375..f80f9e1 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -3,8 +3,8 @@ use strict ; require 5.006 ; -$::VERSION = '2.211' ; -$::DEP_VERSION = '2.211'; +$::VERSION = '2.212' ; +$::DEP_VERSION = '2.212'; use lib '.'; use private::MakeUtil; @@ -1,10 +1,9 @@ - IO-Compress - Version 2.211 + Version 2.212 - 6 April 2024 + 27 April 2024 Copyright (c) 1995-2024 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -112,7 +111,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.211" ; + $VERSION = "2.212" ; 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/bin/zipdetails b/bin/zipdetails index f961253..7dd1f55 100755 --- a/bin/zipdetails +++ b/bin/zipdetails @@ -29,7 +29,7 @@ use Encode; use Getopt::Long; use List::Util qw(min max); -my $VERSION = '4.002' ; +my $VERSION = '4.004' ; sub fatal_tryWalk; sub fatal_truncated ; @@ -1424,7 +1424,7 @@ exit $exit_status_code ; sub dislayMessages { - # Compare Central & LOcal for discrepencies + # Compare Central & Local for discrepencies if ($CentralDirectory->isMiniZipEncrypted) { @@ -2063,10 +2063,6 @@ sub LocalHeader $localEntry->filename($raw_filename) ; $filename = outputFilename($raw_filename, $LanguageEncodingFlag); $localEntry->outputFilename($filename); - - # APPNOTE 6.3.10, sec 4.3.8 - warning $FH->tell - $filenameLength, "Directory '$filename' must not have a payload" - if ! $streaming && $filename =~ m#/$# && $uncompressedSize ; } $localEntry->localHeaderOffset($locHeaderOffset) ; @@ -2094,6 +2090,10 @@ sub LocalHeader walkExtra($extraLength, $localEntry); } + # APPNOTE 6.3.10, sec 4.3.8 + warning $FH->tell - $filenameLength, "Directory '$filename' must not have a payload" + if ! $streaming && $filename =~ m#/$# && $localEntry->uncompressedSize ; + my @msg ; # if ($cdZip64 && ! $ZIP64) # { @@ -2384,6 +2384,94 @@ sub redactFilename return $filename; } +sub validateDirectory +{ + # Check that Directries are stored correctly + # + # 1. Filename MUST end with a "/" + # see APPNOTE 6.3.10, sec 4.3.8 + # 2. Uncompressed size == 0 + # see APPNOTE 6.3.10, sec 4.3.8 + # 3. warn if compressed size > 0 and Uncompressed size == 0 + # 4. check for presence of DOS directory attrib in External Attributes + # 5. Check for Unix extrnal attribute S_IFDIR + + my $offset = shift ; + my $filename = shift ; + my $extractVersion = shift; + my $versionMadeBy = shift; + my $compressedSize = shift; + my $uncompressedSize = shift; + my $externalAttributes = shift; + + my $dosAttributes = $externalAttributes & 0xFFFF; + my $otherAttributes = ($externalAttributes >> 16 ) & 0xFFFF; + + my $probablyDirectory = 0; + my $filenameOK = 0; + my $attributesSet = 0; + my $dosAttributeSet = 0; + my $unixAttributeSet = 0; + + if ($filename =~ m#/$#) + { + # filename claims it is a directory. + $probablyDirectory = 1; + $filenameOK = 1; + } + + if ($dosAttributes & 0x0010) # ATTR_DIRECTORY + { + $probablyDirectory = 1; + $attributesSet = 1 ; + $dosAttributeSet = 1 ; + } + + if ($versionMadeBy == 3 && $otherAttributes & 0x4000) # Unix & S_IFDIR + { + $probablyDirectory = 1; + $attributesSet = 1; + $unixAttributeSet = 1; + } + + return + unless $probablyDirectory ; + + error $offset + CentralDirectoryEntry::Offset_Filename(), + "Directory '$filename' must end in a '/'", + "'External Attributes' flag this as a directory" + if ! $filenameOK && $uncompressedSize == 0; + + info $offset + CentralDirectoryEntry::Offset_ExternalAttributes(), + "DOS Directory flag not set in 'External Attributes' for Directory '$filename'" + if $filenameOK && ! $dosAttributeSet; + + info $offset + CentralDirectoryEntry::Offset_ExternalAttributes(), + "Unix Directory flag not set in 'External Attributes' for Directory '$filename'" + if $filenameOK && $versionMadeBy == 3 && ! $unixAttributeSet; + + if ($uncompressedSize != 0) + { + # APPNOTE 6.3.10, sec 4.3.8 + error $offset + CentralDirectoryEntry::Offset_UncompressedSize(), + "Directory '$filename' must not have a payload" + } + elsif ($compressedSize != 0) + { + + info $offset + CentralDirectoryEntry::Offset_CompressedSize(), + "Directory '$filename' has compressed payload that uncompresses to nothing" + } + + if ($extractVersion < 20) + { + # APPNOTE 6.3.10, sec 4.4.3.2 + my $got = decodeZipVer($extractVersion); + warning $offset + CentralDirectoryEntry::Offset_VersionNeededToExtract(), + "'Extract Zip Spec' is '$got'. Need value >= '2.0' for Directory '$filename'" + } +} + sub validateFilename { my $filename = shift ; @@ -2624,30 +2712,28 @@ sub CentralHeader # See https://learn.microsoft.com/en-us/windows/win32/fileio/file-attribute-constants # and https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-smb/65e0c225-5925-44b0-8104-6b91339c709f - out1 "[Bit 0]", "Read-Only" - if $dos_attrib & 0x0001 ; - out1 "[Bit 1]", "Hidden" - if $dos_attrib & 0x0002 ; - out1 "[Bit 2]", "System" - if $dos_attrib & 0x0004 ; - out1 "[Bit 3]", "Label" - if $dos_attrib & 0x0008 ; - out1 "[Bit 4]", "Directory" - if $dos_attrib & 0x0010 ; - out1 "[Bit 5]", "Archive" - if $dos_attrib & 0x0020 ; - out1 "[Bit 6]", "Device" - if $dos_attrib & 0x0040 ; - out1 "[Bit 7]", "Normal" # Exe? - if $dos_attrib & 0x0080 ; - out1 "[Bit 8]", "Offline" - if $dos_attrib & 0x0100 ; - out1 "[Bit 9]", "Not Indexed" - if $dos_attrib & 0x0200 ; - out1 "[Bit 10]", "Encrypted" - if $dos_attrib & 0x0400 ; - out1 "[Bits 11-15]", Value_v($dos_attrib & 0xf800) . " 'Unknown DOS attrib'" - if $dos_attrib & 0xf800 ; + out1 "[Bit 0]", "Read-Only" if $dos_attrib & 0x0001 ; + out1 "[Bit 1]", "Hidden" if $dos_attrib & 0x0002 ; + out1 "[Bit 2]", "System" if $dos_attrib & 0x0004 ; + out1 "[Bit 3]", "Label" if $dos_attrib & 0x0008 ; + out1 "[Bit 4]", "Directory" if $dos_attrib & 0x0010 ; + out1 "[Bit 5]", "Archive" if $dos_attrib & 0x0020 ; + out1 "[Bit 6]", "Device" if $dos_attrib & 0x0040 ; + out1 "[Bit 7]", "Normal" if $dos_attrib & 0x0080 ; + out1 "[Bit 8]", "Temporary" if $dos_attrib & 0x0100 ; + out1 "[Bit 9]", "Sparse" if $dos_attrib & 0x0200 ; + out1 "[Bit 10]", "Reparse Point" if $dos_attrib & 0x0400 ; + out1 "[Bit 11]", "Compressed" if $dos_attrib & 0x0800 ; + + out1 "[Bit 12]", "Offline" if $dos_attrib & 0x1000 ; + out1 "[Bit 13]", "Not Indexed" if $dos_attrib & 0x2000 ; + + # Zip files created on Mac seem to set this bit. Not clear why. + out1 "[Bit 14]", "Possible Mac Flag" if $dos_attrib & 0x4000 ; + + # p7Zip & 7z set this bit to flag that the high 16-bits are Unix attributes + out1 "[Bit 15]", "Possible p7zip/7z Unix Flag" if $dos_attrib & 0x8000 ; + } my $native_attrib = ($ext_file_attrib >> 16 ) & 0xFFFF; @@ -2724,7 +2810,7 @@ sub CentralHeader if ($locHeaderOffset != MAX32) { my $commonMessage = "'Local Header Offset' field in '" . Signatures::name($signature) . "' is invalid"; - $locHeaderOffset = checkOffsetValue($locHeaderOffset, $startRecordOffset, 0, $commonMessage, $startRecordOffset + 42, ZIP_LOCAL_HDR_SIG) ; + $locHeaderOffset = checkOffsetValue($locHeaderOffset, $startRecordOffset, 0, $commonMessage, $startRecordOffset + CentralDirectoryEntry::Offset_RelativeOffsetToLocal(), ZIP_LOCAL_HDR_SIG) ; } my $filename = ''; @@ -2736,10 +2822,6 @@ sub CentralHeader $cdEntry->filename($raw_filename) ; $filename = outputFilename($raw_filename, $LanguageEncodingFlag); $cdEntry->outputFilename($filename); - - # APPNOTE 6.3.10, sec 4.3.8 - warning $FH->tell - $filenameLength, "Directory '$filename' must not have a payload" - if $filename =~ m#/$# && $uncompressedSize ; } $cdEntry->centralHeaderOffset($cdEntryOffset) ; @@ -2769,6 +2851,9 @@ sub CentralHeader # $cdEntry->endCentralHeaderOffset($FH->tell() - 1); + # Can only validate for directory after zip64 data is read + validateDirectory($cdEntryOffset, $filename, $extractVer, $made_by, + $cdEntry->compressedSize, $cdEntry->uncompressedSize, $ext_file_attrib); if ($comment_length) { @@ -5655,7 +5740,9 @@ sub scanCentralDirectory # 3. value at offset is not a CD record signature my $commonMessage = "'Local Header Offset' field in '" . Signatures::name(ZIP_CENTRAL_HDR_SIG) . "' is invalid"; - checkOffsetValue($locHeaderOffset, $startHeader, 0, $commonMessage, $startHeader + 42, ZIP_LOCAL_HDR_SIG, 1) ; + checkOffsetValue($locHeaderOffset, $startHeader, 0, $commonMessage, + $startHeader + CentralDirectoryEntry::Offset_RelativeOffsetToLocal(), + ZIP_LOCAL_HDR_SIG, 1) ; } $fh->read(my $filename, $filename_length) ; @@ -6323,6 +6410,24 @@ sub nibbles use parent -norequire , 'LocalCentralEntryBase' ; + use constant Offset_VersionMadeBy => 4; + use constant Offset_VersionNeededToExtract => 6; + use constant Offset_GeneralPurposeFlags => 8; + use constant Offset_CompressionMethod => 10; + use constant Offset_ModificationTime => 12; + use constant Offset_ModificationDate => 14; + use constant Offset_CRC32 => 16; + use constant Offset_CompressedSize => 20; + use constant Offset_UncompressedSize => 24; + use constant Offset_FilenameLength => 28; + use constant Offset_ExtraFieldLength => 30; + use constant Offset_FileCommentLength => 32; + use constant Offset_DiskNumber => 34; + use constant Offset_InternalAttributes => 36; + use constant Offset_ExternalAttributes => 38; + use constant Offset_RelativeOffsetToLocal => 42; + use constant Offset_Filename => 46; + sub new { my $class = shift ; @@ -6551,6 +6656,18 @@ sub nibbles use parent -norequire , 'LocalCentralEntryBase' ; + use constant Offset_VersionNeededToExtract => 4; + use constant Offset_GeneralPurposeFlags => 6; + use constant Offset_CompressionMethod => 8; + use constant Offset_ModificationTime => 10; + use constant Offset_ModificationDate => 12; + use constant Offset_CRC32 => 14; + use constant Offset_CompressedSize => 18; + use constant Offset_UncompressedSize => 22; + use constant Offset_FilenameLength => 26; + use constant Offset_ExtraFieldLength => 27; + use constant Offset_Filename => 30; + sub new { my $class = shift ; @@ -6647,7 +6764,7 @@ sub nibbles my $existingEntry = $self->{byName}{$filename} ; - my $endSurfaceArea = $payloadOffset + ($localEntry->compressedSize //0) ; + my $endSurfaceArea = $payloadOffset + ($localEntry->compressedSize // 0) ; if ($existingEntry) { diff --git a/lib/Compress/Zlib.pm b/lib/Compress/Zlib.pm index 230fa3b..5b3fba6 100644 --- a/lib/Compress/Zlib.pm +++ b/lib/Compress/Zlib.pm @@ -7,17 +7,17 @@ use Carp ; use IO::Handle ; use Scalar::Util qw(dualvar); -use IO::Compress::Base::Common 2.211 ; -use Compress::Raw::Zlib 2.211 ; -use IO::Compress::Gzip 2.211 ; -use IO::Uncompress::Gunzip 2.211 ; +use IO::Compress::Base::Common 2.212 ; +use Compress::Raw::Zlib 2.212 ; +use IO::Compress::Gzip 2.212 ; +use IO::Uncompress::Gunzip 2.212 ; use strict ; use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.211'; +$VERSION = '2.212'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -461,7 +461,7 @@ sub inflate package Compress::Zlib ; -use IO::Compress::Gzip::Constants 2.211 ; +use IO::Compress::Gzip::Constants 2.212 ; sub memGzip($) { diff --git a/lib/IO/Compress/Adapter/Bzip2.pm b/lib/IO/Compress/Adapter/Bzip2.pm index 1dbd7c6..66eabd3 100644 --- a/lib/IO/Compress/Adapter/Bzip2.pm +++ b/lib/IO/Compress/Adapter/Bzip2.pm @@ -4,12 +4,12 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.211 qw(:Status); +use IO::Compress::Base::Common 2.212 qw(:Status); -use Compress::Raw::Bzip2 2.211 ; +use Compress::Raw::Bzip2 2.212 ; our ($VERSION); -$VERSION = '2.211'; +$VERSION = '2.212'; sub mkCompObject { diff --git a/lib/IO/Compress/Adapter/Deflate.pm b/lib/IO/Compress/Adapter/Deflate.pm index 301769b..2dd429b 100644 --- a/lib/IO/Compress/Adapter/Deflate.pm +++ b/lib/IO/Compress/Adapter/Deflate.pm @@ -4,13 +4,13 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.211 qw(:Status); -use Compress::Raw::Zlib 2.211 qw( !crc32 !adler32 ) ; +use IO::Compress::Base::Common 2.212 qw(:Status); +use Compress::Raw::Zlib 2.212 qw( !crc32 !adler32 ) ; require Exporter; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, @EXPORT, %DEFLATE_CONSTANTS); -$VERSION = '2.211'; +$VERSION = '2.212'; @ISA = qw(Exporter); @EXPORT_OK = @Compress::Raw::Zlib::DEFLATE_CONSTANTS; %EXPORT_TAGS = %Compress::Raw::Zlib::DEFLATE_CONSTANTS; diff --git a/lib/IO/Compress/Adapter/Identity.pm b/lib/IO/Compress/Adapter/Identity.pm index 8326fac..542eaf4 100644 --- a/lib/IO/Compress/Adapter/Identity.pm +++ b/lib/IO/Compress/Adapter/Identity.pm @@ -4,10 +4,10 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.211 qw(:Status); +use IO::Compress::Base::Common 2.212 qw(:Status); our ($VERSION); -$VERSION = '2.211'; +$VERSION = '2.212'; sub mkCompObject { diff --git a/lib/IO/Compress/Base.pm b/lib/IO/Compress/Base.pm index 6dfed5d..6d6368b 100644 --- a/lib/IO/Compress/Base.pm +++ b/lib/IO/Compress/Base.pm @@ -6,7 +6,7 @@ require 5.006 ; use strict ; use warnings; -use IO::Compress::Base::Common 2.211 ; +use IO::Compress::Base::Common 2.212 ; use IO::File (); ; use Scalar::Util (); @@ -20,7 +20,7 @@ use Symbol(); our (@ISA, $VERSION); @ISA = qw(IO::File Exporter); -$VERSION = '2.211'; +$VERSION = '2.212'; #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/lib/IO/Compress/Base/Common.pm b/lib/IO/Compress/Base/Common.pm index 6cefbcb..fd90faf 100644 --- a/lib/IO/Compress/Base/Common.pm +++ b/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.211'; +$VERSION = '2.212'; @EXPORT = qw( isaFilehandle isaFilename isaScalar whatIsInput whatIsOutput diff --git a/lib/IO/Compress/Bzip2.pm b/lib/IO/Compress/Bzip2.pm index ab9337d..a622873 100644 --- a/lib/IO/Compress/Bzip2.pm +++ b/lib/IO/Compress/Bzip2.pm @@ -5,16 +5,16 @@ use warnings; use bytes; require Exporter ; -use IO::Compress::Base 2.211 ; +use IO::Compress::Base 2.212 ; -use IO::Compress::Base::Common 2.211 qw(); -use IO::Compress::Adapter::Bzip2 2.211 ; +use IO::Compress::Base::Common 2.212 qw(); +use IO::Compress::Adapter::Bzip2 2.212 ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error); -$VERSION = '2.211'; +$VERSION = '2.212'; $Bzip2Error = ''; @ISA = qw(IO::Compress::Base Exporter); @@ -51,7 +51,7 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.211 qw(:Parse); + use IO::Compress::Base::Common 2.212 qw(:Parse); return ( 'blocksize100k' => [IO::Compress::Base::Common::Parse_unsigned, 1], diff --git a/lib/IO/Compress/Deflate.pm b/lib/IO/Compress/Deflate.pm index 68c3b27..1072419 100644 --- a/lib/IO/Compress/Deflate.pm +++ b/lib/IO/Compress/Deflate.pm @@ -8,16 +8,16 @@ use bytes; require Exporter ; -use IO::Compress::RawDeflate 2.211 (); -use IO::Compress::Adapter::Deflate 2.211 ; +use IO::Compress::RawDeflate 2.212 (); +use IO::Compress::Adapter::Deflate 2.212 ; -use IO::Compress::Zlib::Constants 2.211 ; -use IO::Compress::Base::Common 2.211 qw(); +use IO::Compress::Zlib::Constants 2.212 ; +use IO::Compress::Base::Common 2.212 qw(); our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $DeflateError); -$VERSION = '2.211'; +$VERSION = '2.212'; $DeflateError = ''; @ISA = qw(IO::Compress::RawDeflate Exporter); diff --git a/lib/IO/Compress/Gzip.pm b/lib/IO/Compress/Gzip.pm index 8a4a694..376a5a2 100644 --- a/lib/IO/Compress/Gzip.pm +++ b/lib/IO/Compress/Gzip.pm @@ -8,12 +8,12 @@ use bytes; require Exporter ; -use IO::Compress::RawDeflate 2.211 () ; -use IO::Compress::Adapter::Deflate 2.211 ; +use IO::Compress::RawDeflate 2.212 () ; +use IO::Compress::Adapter::Deflate 2.212 ; -use IO::Compress::Base::Common 2.211 qw(:Status ); -use IO::Compress::Gzip::Constants 2.211 ; -use IO::Compress::Zlib::Extra 2.211 ; +use IO::Compress::Base::Common 2.212 qw(:Status ); +use IO::Compress::Gzip::Constants 2.212 ; +use IO::Compress::Zlib::Extra 2.212 ; BEGIN { @@ -25,7 +25,7 @@ BEGIN our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $GzipError); -$VERSION = '2.211'; +$VERSION = '2.212'; $GzipError = '' ; @ISA = qw(IO::Compress::RawDeflate Exporter); diff --git a/lib/IO/Compress/Gzip/Constants.pm b/lib/IO/Compress/Gzip/Constants.pm index aee1e10..2fb074c 100644 --- a/lib/IO/Compress/Gzip/Constants.pm +++ b/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.211'; +$VERSION = '2.212'; @ISA = qw(Exporter); diff --git a/lib/IO/Compress/RawDeflate.pm b/lib/IO/Compress/RawDeflate.pm index 87258a9..7a6c142 100644 --- a/lib/IO/Compress/RawDeflate.pm +++ b/lib/IO/Compress/RawDeflate.pm @@ -6,16 +6,16 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base 2.211 ; -use IO::Compress::Base::Common 2.211 qw(:Status :Parse); -use IO::Compress::Adapter::Deflate 2.211 ; -use Compress::Raw::Zlib 2.211 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); +use IO::Compress::Base 2.212 ; +use IO::Compress::Base::Common 2.212 qw(:Status :Parse); +use IO::Compress::Adapter::Deflate 2.212 ; +use Compress::Raw::Zlib 2.212 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError); -$VERSION = '2.211'; +$VERSION = '2.212'; $RawDeflateError = ''; @ISA = qw(IO::Compress::Base Exporter); diff --git a/lib/IO/Compress/Zip.pm b/lib/IO/Compress/Zip.pm index c4cb92c..01dfd9b 100644 --- a/lib/IO/Compress/Zip.pm +++ b/lib/IO/Compress/Zip.pm @@ -4,41 +4,41 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.211 qw(:Status ); -use IO::Compress::RawDeflate 2.211 (); -use IO::Compress::Adapter::Deflate 2.211 ; -use IO::Compress::Adapter::Identity 2.211 ; -use IO::Compress::Zlib::Extra 2.211 ; -use IO::Compress::Zip::Constants 2.211 ; +use IO::Compress::Base::Common 2.212 qw(:Status ); +use IO::Compress::RawDeflate 2.212 (); +use IO::Compress::Adapter::Deflate 2.212 ; +use IO::Compress::Adapter::Identity 2.212 ; +use IO::Compress::Zlib::Extra 2.212 ; +use IO::Compress::Zip::Constants 2.212 ; use File::Spec(); use Config; -use Compress::Raw::Zlib 2.211 (); +use Compress::Raw::Zlib 2.212 (); BEGIN { eval { require IO::Compress::Adapter::Bzip2 ; - IO::Compress::Adapter::Bzip2->VERSION( 2.211 ); + IO::Compress::Adapter::Bzip2->VERSION( 2.212 ); require IO::Compress::Bzip2 ; - IO::Compress::Bzip2->VERSION( 2.211 ); + IO::Compress::Bzip2->VERSION( 2.212 ); } ; eval { require IO::Compress::Adapter::Lzma ; - IO::Compress::Adapter::Lzma->VERSION( 2.211 ); + IO::Compress::Adapter::Lzma->VERSION( 2.212 ); require IO::Compress::Lzma ; - IO::Compress::Lzma->VERSION( 2.211 ); + IO::Compress::Lzma->VERSION( 2.212 ); } ; eval { require IO::Compress::Adapter::Xz ; - IO::Compress::Adapter::Xz->VERSION( 2.211 ); + IO::Compress::Adapter::Xz->VERSION( 2.212 ); require IO::Compress::Xz ; - IO::Compress::Xz->VERSION( 2.211 ); + IO::Compress::Xz->VERSION( 2.212 ); } ; eval { require IO::Compress::Adapter::Zstd ; - IO::Compress::Adapter::Zstd->VERSION( 2.211 ); + IO::Compress::Adapter::Zstd->VERSION( 2.212 ); require IO::Compress::Zstd ; - IO::Compress::Zstd->VERSION( 2.211 ); + IO::Compress::Zstd->VERSION( 2.212 ); } ; } @@ -47,7 +47,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $ZipError); -$VERSION = '2.211'; +$VERSION = '2.212'; $ZipError = ''; @ISA = qw(IO::Compress::RawDeflate Exporter); diff --git a/lib/IO/Compress/Zip/Constants.pm b/lib/IO/Compress/Zip/Constants.pm index 5f7b0cf..c327989 100644 --- a/lib/IO/Compress/Zip/Constants.pm +++ b/lib/IO/Compress/Zip/Constants.pm @@ -7,7 +7,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS); -$VERSION = '2.211'; +$VERSION = '2.212'; @ISA = qw(Exporter); diff --git a/lib/IO/Compress/Zlib/Constants.pm b/lib/IO/Compress/Zlib/Constants.pm index 0e26738..085d0ca 100644 --- a/lib/IO/Compress/Zlib/Constants.pm +++ b/lib/IO/Compress/Zlib/Constants.pm @@ -9,7 +9,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT); -$VERSION = '2.211'; +$VERSION = '2.212'; @ISA = qw(Exporter); diff --git a/lib/IO/Compress/Zlib/Extra.pm b/lib/IO/Compress/Zlib/Extra.pm index 7c558ae..e402561 100644 --- a/lib/IO/Compress/Zlib/Extra.pm +++ b/lib/IO/Compress/Zlib/Extra.pm @@ -8,9 +8,9 @@ use bytes; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.211'; +$VERSION = '2.212'; -use IO::Compress::Gzip::Constants 2.211 ; +use IO::Compress::Gzip::Constants 2.212 ; sub ExtraFieldError { diff --git a/lib/IO/Uncompress/Adapter/Bunzip2.pm b/lib/IO/Uncompress/Adapter/Bunzip2.pm index 4f54fad..3ebc89e 100644 --- a/lib/IO/Uncompress/Adapter/Bunzip2.pm +++ b/lib/IO/Uncompress/Adapter/Bunzip2.pm @@ -4,12 +4,12 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.211 qw(:Status); +use IO::Compress::Base::Common 2.212 qw(:Status); -use Compress::Raw::Bzip2 2.211 ; +use Compress::Raw::Bzip2 2.212 ; our ($VERSION, @ISA); -$VERSION = '2.211'; +$VERSION = '2.212'; sub mkUncompObject { diff --git a/lib/IO/Uncompress/Adapter/Identity.pm b/lib/IO/Uncompress/Adapter/Identity.pm index 09fb32e..6a8a93b 100755 --- a/lib/IO/Uncompress/Adapter/Identity.pm +++ b/lib/IO/Uncompress/Adapter/Identity.pm @@ -4,14 +4,14 @@ use warnings; use strict; use bytes; -use IO::Compress::Base::Common 2.211 qw(:Status); +use IO::Compress::Base::Common 2.212 qw(:Status); use IO::Compress::Zip::Constants ; our ($VERSION); -$VERSION = '2.211'; +$VERSION = '2.212'; -use Compress::Raw::Zlib 2.211 (); +use Compress::Raw::Zlib 2.212 (); sub mkUncompObject { diff --git a/lib/IO/Uncompress/Adapter/Inflate.pm b/lib/IO/Uncompress/Adapter/Inflate.pm index ece9b5f..8330e87 100644 --- a/lib/IO/Uncompress/Adapter/Inflate.pm +++ b/lib/IO/Uncompress/Adapter/Inflate.pm @@ -4,11 +4,11 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.211 qw(:Status); -use Compress::Raw::Zlib 2.211 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); +use IO::Compress::Base::Common 2.212 qw(:Status); +use Compress::Raw::Zlib 2.212 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); our ($VERSION); -$VERSION = '2.211'; +$VERSION = '2.212'; diff --git a/lib/IO/Uncompress/AnyInflate.pm b/lib/IO/Uncompress/AnyInflate.pm index 18a35eb..3f28773 100644 --- a/lib/IO/Uncompress/AnyInflate.pm +++ b/lib/IO/Uncompress/AnyInflate.pm @@ -6,22 +6,22 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.211 qw(:Parse); +use IO::Compress::Base::Common 2.212 qw(:Parse); -use IO::Uncompress::Adapter::Inflate 2.211 (); +use IO::Uncompress::Adapter::Inflate 2.212 (); -use IO::Uncompress::Base 2.211 ; -use IO::Uncompress::Gunzip 2.211 ; -use IO::Uncompress::Inflate 2.211 ; -use IO::Uncompress::RawInflate 2.211 ; -use IO::Uncompress::Unzip 2.211 ; +use IO::Uncompress::Base 2.212 ; +use IO::Uncompress::Gunzip 2.212 ; +use IO::Uncompress::Inflate 2.212 ; +use IO::Uncompress::RawInflate 2.212 ; +use IO::Uncompress::Unzip 2.212 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError); -$VERSION = '2.211'; +$VERSION = '2.212'; $AnyInflateError = ''; @ISA = qw(IO::Uncompress::Base Exporter); diff --git a/lib/IO/Uncompress/AnyUncompress.pm b/lib/IO/Uncompress/AnyUncompress.pm index 53e11d9..7f2ea73 100644 --- a/lib/IO/Uncompress/AnyUncompress.pm +++ b/lib/IO/Uncompress/AnyUncompress.pm @@ -4,16 +4,16 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.211 (); +use IO::Compress::Base::Common 2.212 (); -use IO::Uncompress::Base 2.211 ; +use IO::Uncompress::Base 2.212 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError); -$VERSION = '2.211'; +$VERSION = '2.212'; $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.211 ;'; - eval ' use IO::Uncompress::Adapter::Bunzip2 2.211 ;'; - eval ' use IO::Uncompress::Adapter::LZO 2.211 ;'; - eval ' use IO::Uncompress::Adapter::Lzf 2.211 ;'; - eval ' use IO::Uncompress::Adapter::UnLzma 2.211 ;'; - eval ' use IO::Uncompress::Adapter::UnXz 2.211 ;'; - eval ' use IO::Uncompress::Adapter::UnZstd 2.211 ;'; - eval ' use IO::Uncompress::Adapter::UnLzip 2.211 ;'; - - eval ' use IO::Uncompress::Bunzip2 2.211 ;'; - eval ' use IO::Uncompress::UnLzop 2.211 ;'; - eval ' use IO::Uncompress::Gunzip 2.211 ;'; - eval ' use IO::Uncompress::Inflate 2.211 ;'; - eval ' use IO::Uncompress::RawInflate 2.211 ;'; - eval ' use IO::Uncompress::Unzip 2.211 ;'; - eval ' use IO::Uncompress::UnLzf 2.211 ;'; - eval ' use IO::Uncompress::UnLzma 2.211 ;'; - eval ' use IO::Uncompress::UnXz 2.211 ;'; - eval ' use IO::Uncompress::UnZstd 2.211 ;'; - eval ' use IO::Uncompress::UnLzip 2.211 ;'; + eval ' use IO::Uncompress::Adapter::Inflate 2.212 ;'; + eval ' use IO::Uncompress::Adapter::Bunzip2 2.212 ;'; + eval ' use IO::Uncompress::Adapter::LZO 2.212 ;'; + eval ' use IO::Uncompress::Adapter::Lzf 2.212 ;'; + eval ' use IO::Uncompress::Adapter::UnLzma 2.212 ;'; + eval ' use IO::Uncompress::Adapter::UnXz 2.212 ;'; + eval ' use IO::Uncompress::Adapter::UnZstd 2.212 ;'; + eval ' use IO::Uncompress::Adapter::UnLzip 2.212 ;'; + + eval ' use IO::Uncompress::Bunzip2 2.212 ;'; + eval ' use IO::Uncompress::UnLzop 2.212 ;'; + eval ' use IO::Uncompress::Gunzip 2.212 ;'; + eval ' use IO::Uncompress::Inflate 2.212 ;'; + eval ' use IO::Uncompress::RawInflate 2.212 ;'; + eval ' use IO::Uncompress::Unzip 2.212 ;'; + eval ' use IO::Uncompress::UnLzf 2.212 ;'; + eval ' use IO::Uncompress::UnLzma 2.212 ;'; + eval ' use IO::Uncompress::UnXz 2.212 ;'; + eval ' use IO::Uncompress::UnZstd 2.212 ;'; + eval ' use IO::Uncompress::UnLzip 2.212 ;'; } diff --git a/lib/IO/Uncompress/Base.pm b/lib/IO/Uncompress/Base.pm index 087caf2..6c03609 100644 --- a/lib/IO/Uncompress/Base.pm +++ b/lib/IO/Uncompress/Base.pm @@ -9,12 +9,12 @@ our (@ISA, $VERSION, @EXPORT_OK, %EXPORT_TAGS); @ISA = qw(IO::File Exporter); -$VERSION = '2.211'; +$VERSION = '2.212'; use constant G_EOF => 0 ; use constant G_ERR => -1 ; -use IO::Compress::Base::Common 2.211 ; +use IO::Compress::Base::Common 2.212 ; use IO::File ; use Symbol; diff --git a/lib/IO/Uncompress/Bunzip2.pm b/lib/IO/Uncompress/Bunzip2.pm index da2fb1c..020c0a9 100644 --- a/lib/IO/Uncompress/Bunzip2.pm +++ b/lib/IO/Uncompress/Bunzip2.pm @@ -4,15 +4,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.211 qw(:Status ); +use IO::Compress::Base::Common 2.212 qw(:Status ); -use IO::Uncompress::Base 2.211 ; -use IO::Uncompress::Adapter::Bunzip2 2.211 ; +use IO::Uncompress::Base 2.212 ; +use IO::Uncompress::Adapter::Bunzip2 2.212 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error); -$VERSION = '2.211'; +$VERSION = '2.212'; $Bunzip2Error = ''; @ISA = qw(IO::Uncompress::Base Exporter); diff --git a/lib/IO/Uncompress/Gunzip.pm b/lib/IO/Uncompress/Gunzip.pm index 2f314b9..2018585 100644 --- a/lib/IO/Uncompress/Gunzip.pm +++ b/lib/IO/Uncompress/Gunzip.pm @@ -9,12 +9,12 @@ use strict ; use warnings; use bytes; -use IO::Uncompress::RawInflate 2.211 ; +use IO::Uncompress::RawInflate 2.212 ; -use Compress::Raw::Zlib 2.211 () ; -use IO::Compress::Base::Common 2.211 qw(:Status ); -use IO::Compress::Gzip::Constants 2.211 ; -use IO::Compress::Zlib::Extra 2.211 ; +use Compress::Raw::Zlib 2.212 () ; +use IO::Compress::Base::Common 2.212 qw(:Status ); +use IO::Compress::Gzip::Constants 2.212 ; +use IO::Compress::Zlib::Extra 2.212 ; require Exporter ; @@ -28,7 +28,7 @@ Exporter::export_ok_tags('all'); $GunzipError = ''; -$VERSION = '2.211'; +$VERSION = '2.212'; sub new { diff --git a/lib/IO/Uncompress/Inflate.pm b/lib/IO/Uncompress/Inflate.pm index f14f414..d242bdd 100644 --- a/lib/IO/Uncompress/Inflate.pm +++ b/lib/IO/Uncompress/Inflate.pm @@ -5,15 +5,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.211 qw(:Status ); -use IO::Compress::Zlib::Constants 2.211 ; +use IO::Compress::Base::Common 2.212 qw(:Status ); +use IO::Compress::Zlib::Constants 2.212 ; -use IO::Uncompress::RawInflate 2.211 ; +use IO::Uncompress::RawInflate 2.212 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError); -$VERSION = '2.211'; +$VERSION = '2.212'; $InflateError = ''; @ISA = qw(IO::Uncompress::RawInflate Exporter); diff --git a/lib/IO/Uncompress/RawInflate.pm b/lib/IO/Uncompress/RawInflate.pm index ae46841..84777ae 100755 --- a/lib/IO/Uncompress/RawInflate.pm +++ b/lib/IO/Uncompress/RawInflate.pm @@ -5,16 +5,16 @@ use strict ; use warnings; use bytes; -use Compress::Raw::Zlib 2.211 ; -use IO::Compress::Base::Common 2.211 qw(:Status ); +use Compress::Raw::Zlib 2.212 ; +use IO::Compress::Base::Common 2.212 qw(:Status ); -use IO::Uncompress::Base 2.211 ; -use IO::Uncompress::Adapter::Inflate 2.211 ; +use IO::Uncompress::Base 2.212 ; +use IO::Uncompress::Adapter::Inflate 2.212 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError); -$VERSION = '2.211'; +$VERSION = '2.212'; $RawInflateError = ''; @ISA = qw(IO::Uncompress::Base Exporter); diff --git a/lib/IO/Uncompress/Unzip.pm b/lib/IO/Uncompress/Unzip.pm index be6e666..6dad364 100644 --- a/lib/IO/Uncompress/Unzip.pm +++ b/lib/IO/Uncompress/Unzip.pm @@ -9,14 +9,14 @@ use warnings; use bytes; use IO::File; -use IO::Uncompress::RawInflate 2.211 ; -use IO::Compress::Base::Common 2.211 qw(:Status ); -use IO::Uncompress::Adapter::Inflate 2.211 ; -use IO::Uncompress::Adapter::Identity 2.211 ; -use IO::Compress::Zlib::Extra 2.211 ; -use IO::Compress::Zip::Constants 2.211 ; +use IO::Uncompress::RawInflate 2.212 ; +use IO::Compress::Base::Common 2.212 qw(:Status ); +use IO::Uncompress::Adapter::Inflate 2.212 ; +use IO::Uncompress::Adapter::Identity 2.212 ; +use IO::Compress::Zlib::Extra 2.212 ; +use IO::Compress::Zip::Constants 2.212 ; -use Compress::Raw::Zlib 2.211 () ; +use Compress::Raw::Zlib 2.212 () ; BEGIN { @@ -24,13 +24,13 @@ BEGIN local $SIG{__DIE__}; eval{ require IO::Uncompress::Adapter::Bunzip2 ; - IO::Uncompress::Adapter::Bunzip2->VERSION(2.211) } ; + IO::Uncompress::Adapter::Bunzip2->VERSION(2.212) } ; eval{ require IO::Uncompress::Adapter::UnLzma ; - IO::Uncompress::Adapter::UnLzma->VERSION(2.211) } ; + IO::Uncompress::Adapter::UnLzma->VERSION(2.212) } ; eval{ require IO::Uncompress::Adapter::UnXz ; - IO::Uncompress::Adapter::UnXz->VERSION(2.211) } ; + IO::Uncompress::Adapter::UnXz->VERSION(2.212) } ; eval{ require IO::Uncompress::Adapter::UnZstd ; - IO::Uncompress::Adapter::UnZstd->VERSION(2.211) } ; + IO::Uncompress::Adapter::UnZstd->VERSION(2.212) } ; } @@ -38,7 +38,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup); -$VERSION = '2.211'; +$VERSION = '2.212'; $UnzipError = ''; @ISA = qw(IO::Uncompress::RawInflate Exporter); diff --git a/t/000prereq.t b/t/000prereq.t index 768e199..cb8fa88 100644 --- a/t/000prereq.t +++ b/t/000prereq.t @@ -25,7 +25,7 @@ BEGIN if eval { require Test::NoWarnings ; Test::NoWarnings->import; 1 }; - my $VERSION = '2.211'; + my $VERSION = '2.212'; my @NAMES = qw( Compress::Raw::Bzip2 Compress::Raw::Zlib |