Skip to content

Commit

Permalink
Update IO-Compress to 2.106
Browse files Browse the repository at this point in the history
This allows change allows us to detect that zipdetails does not work
properly on a 32 bit perl and avoid t/porting/utils.t test failures
from the warnings it produces when compiled on a 32 bit perl, there
are no other functionality changes from 2.105
  • Loading branch information
demerphq committed Apr 13, 2022
1 parent fe473ed commit e1cb5e9
Show file tree
Hide file tree
Showing 29 changed files with 103 additions and 93 deletions.
2 changes: 1 addition & 1 deletion Porting/Maintainers.pl
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ package Maintainers;
},

'IO-Compress' => {
'DISTRIBUTION' => 'PMQS/IO-Compress-2.105.tar.gz',
'DISTRIBUTION' => 'PMQS/IO-Compress-2.106.tar.gz',
'MAIN_MODULE' => 'IO::Compress::Base',
'FILES' => q[cpan/IO-Compress],
'EXCLUDED' => [
Expand Down
2 changes: 1 addition & 1 deletion cpan/IO-Compress/Makefile.PL
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use strict ;
require 5.006 ;

$::VERSION = '2.105' ;
$::VERSION = '2.106' ;
$::DEP_VERSION = '2.103';

use lib '.';
Expand Down
14 changes: 12 additions & 2 deletions cpan/IO-Compress/bin/zipdetails
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@

use 5.010; # for unpack "Q<"

BEGIN {
# Check for a 32-bit Perl
if (!eval { pack "Q", 1 }) {
warn "zipdetails requires 64 bit integers, ",
"this Perl has 32 bit integers.\n";
exit(1);
}
}

BEGIN { pop @INC if $INC[-1] eq '.' }
use strict;
use warnings ;
Expand All @@ -17,6 +26,8 @@ use IO::File;
use Encode;
use Getopt::Long;

my $VERSION = "2.104" ;

use constant MAX32 => 0xFFFFFFFF ;

# Compression types
Expand Down Expand Up @@ -194,7 +205,6 @@ my %Extras = (

);

my $VERSION = "2.100" ;

my $FH;

Expand Down Expand Up @@ -2281,7 +2291,7 @@ sub nibbles
duplicates => [],
detail => [],
duplicate_count => 0,
operlap_count => 0,
overlap_count => 0,
) ;

bless \%object, $class;
Expand Down
10 changes: 5 additions & 5 deletions cpan/IO-Compress/lib/Compress/Zlib.pm
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ use Carp ;
use IO::Handle ;
use Scalar::Util qw(dualvar);

use IO::Compress::Base::Common 2.104 ;
use IO::Compress::Base::Common 2.106 ;
use Compress::Raw::Zlib 2.103 ;
use IO::Compress::Gzip 2.104 ;
use IO::Uncompress::Gunzip 2.104 ;
use IO::Compress::Gzip 2.106 ;
use IO::Uncompress::Gunzip 2.106 ;

use strict ;
use warnings ;
use bytes ;
our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);

$VERSION = '2.104';
$VERSION = '2.106';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;

Expand Down Expand Up @@ -461,7 +461,7 @@ sub inflate

package Compress::Zlib ;

use IO::Compress::Gzip::Constants 2.104 ;
use IO::Compress::Gzip::Constants 2.106 ;

sub memGzip($)
{
Expand Down
4 changes: 2 additions & 2 deletions cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ use strict;
use warnings;
use bytes;

use IO::Compress::Base::Common 2.104 qw(:Status);
use IO::Compress::Base::Common 2.106 qw(:Status);

use Compress::Raw::Bzip2 2.103 ;

our ($VERSION);
$VERSION = '2.104';
$VERSION = '2.106';

sub mkCompObject
{
Expand Down
4 changes: 2 additions & 2 deletions cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ use strict;
use warnings;
use bytes;

use IO::Compress::Base::Common 2.104 qw(:Status);
use IO::Compress::Base::Common 2.106 qw(:Status);
use Compress::Raw::Zlib 2.103 qw( !crc32 !adler32 ) ;

require Exporter;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, @EXPORT, %DEFLATE_CONSTANTS);

$VERSION = '2.104';
$VERSION = '2.106';
@ISA = qw(Exporter);
@EXPORT_OK = @Compress::Raw::Zlib::DEFLATE_CONSTANTS;
%EXPORT_TAGS = %Compress::Raw::Zlib::DEFLATE_CONSTANTS;
Expand Down
4 changes: 2 additions & 2 deletions cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ use strict;
use warnings;
use bytes;

use IO::Compress::Base::Common 2.104 qw(:Status);
use IO::Compress::Base::Common 2.106 qw(:Status);
our ($VERSION);

$VERSION = '2.104';
$VERSION = '2.106';

sub mkCompObject
{
Expand Down
4 changes: 2 additions & 2 deletions cpan/IO-Compress/lib/IO/Compress/Base.pm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require 5.006 ;
use strict ;
use warnings;

use IO::Compress::Base::Common 2.104 ;
use IO::Compress::Base::Common 2.106 ;

use IO::File (); ;
use Scalar::Util ();
Expand All @@ -20,7 +20,7 @@ use Symbol();
our (@ISA, $VERSION);
@ISA = qw(IO::File Exporter);

$VERSION = '2.105';
$VERSION = '2.106';

#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.

Expand Down
2 changes: 1 addition & 1 deletion cpan/IO-Compress/lib/IO/Compress/Base/Common.pm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use File::GlobMapper;
require Exporter;
our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE);
@ISA = qw(Exporter);
$VERSION = '2.104';
$VERSION = '2.106';

@EXPORT = qw( isaFilehandle isaFilename isaScalar
whatIsInput whatIsOutput
Expand Down
10 changes: 5 additions & 5 deletions cpan/IO-Compress/lib/IO/Compress/Bzip2.pm
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ use warnings;
use bytes;
require Exporter ;

use IO::Compress::Base 2.104 ;
use IO::Compress::Base 2.106 ;

use IO::Compress::Base::Common 2.104 qw();
use IO::Compress::Adapter::Bzip2 2.104 ;
use IO::Compress::Base::Common 2.106 qw();
use IO::Compress::Adapter::Bzip2 2.106 ;



our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error);

$VERSION = '2.104';
$VERSION = '2.106';
$Bzip2Error = '';

@ISA = qw(IO::Compress::Base Exporter);
Expand Down Expand Up @@ -51,7 +51,7 @@ sub getExtraParams
{
my $self = shift ;

use IO::Compress::Base::Common 2.104 qw(:Parse);
use IO::Compress::Base::Common 2.106 qw(:Parse);

return (
'blocksize100k' => [IO::Compress::Base::Common::Parse_unsigned, 1],
Expand Down
10 changes: 5 additions & 5 deletions cpan/IO-Compress/lib/IO/Compress/Deflate.pm
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ use bytes;

require Exporter ;

use IO::Compress::RawDeflate 2.104 ();
use IO::Compress::Adapter::Deflate 2.104 ;
use IO::Compress::RawDeflate 2.106 ();
use IO::Compress::Adapter::Deflate 2.106 ;

use IO::Compress::Zlib::Constants 2.104 ;
use IO::Compress::Base::Common 2.104 qw();
use IO::Compress::Zlib::Constants 2.106 ;
use IO::Compress::Base::Common 2.106 qw();


our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $DeflateError);

$VERSION = '2.104';
$VERSION = '2.106';
$DeflateError = '';

@ISA = qw(IO::Compress::RawDeflate Exporter);
Expand Down
12 changes: 6 additions & 6 deletions cpan/IO-Compress/lib/IO/Compress/Gzip.pm
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ use bytes;

require Exporter ;

use IO::Compress::RawDeflate 2.104 () ;
use IO::Compress::Adapter::Deflate 2.104 ;
use IO::Compress::RawDeflate 2.106 () ;
use IO::Compress::Adapter::Deflate 2.106 ;

use IO::Compress::Base::Common 2.104 qw(:Status );
use IO::Compress::Gzip::Constants 2.104 ;
use IO::Compress::Zlib::Extra 2.104 ;
use IO::Compress::Base::Common 2.106 qw(:Status );
use IO::Compress::Gzip::Constants 2.106 ;
use IO::Compress::Zlib::Extra 2.106 ;

BEGIN
{
Expand All @@ -25,7 +25,7 @@ BEGIN

our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $GzipError);

$VERSION = '2.104';
$VERSION = '2.106';
$GzipError = '' ;

@ISA = qw(IO::Compress::RawDeflate Exporter);
Expand Down
2 changes: 1 addition & 1 deletion cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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.104';
$VERSION = '2.106';

@ISA = qw(Exporter);

Expand Down
8 changes: 4 additions & 4 deletions cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ use strict ;
use warnings;
use bytes;

use IO::Compress::Base 2.104 ;
use IO::Compress::Base::Common 2.104 qw(:Status :Parse);
use IO::Compress::Adapter::Deflate 2.104 ;
use IO::Compress::Base 2.106 ;
use IO::Compress::Base::Common 2.106 qw(:Status :Parse);
use IO::Compress::Adapter::Deflate 2.106 ;
use Compress::Raw::Zlib 2.103 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);

require Exporter ;

our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError);

$VERSION = '2.104';
$VERSION = '2.106';
$RawDeflateError = '';

@ISA = qw(IO::Compress::Base Exporter);
Expand Down
14 changes: 7 additions & 7 deletions cpan/IO-Compress/lib/IO/Compress/Zip.pm
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ use strict ;
use warnings;
use bytes;

use IO::Compress::Base::Common 2.104 qw(:Status );
use IO::Compress::RawDeflate 2.104 ();
use IO::Compress::Adapter::Deflate 2.104 ;
use IO::Compress::Adapter::Identity 2.104 ;
use IO::Compress::Zlib::Extra 2.104 ;
use IO::Compress::Zip::Constants 2.104 ;
use IO::Compress::Base::Common 2.106 qw(:Status );
use IO::Compress::RawDeflate 2.106 ();
use IO::Compress::Adapter::Deflate 2.106 ;
use IO::Compress::Adapter::Identity 2.106 ;
use IO::Compress::Zlib::Extra 2.106 ;
use IO::Compress::Zip::Constants 2.106 ;

use File::Spec();
use Config;
Expand Down Expand Up @@ -47,7 +47,7 @@ require Exporter ;

our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $ZipError);

$VERSION = '2.104';
$VERSION = '2.106';
$ZipError = '';

@ISA = qw(IO::Compress::RawDeflate Exporter);
Expand Down
2 changes: 1 addition & 1 deletion cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require Exporter;

our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS);

$VERSION = '2.104';
$VERSION = '2.106';

@ISA = qw(Exporter);

Expand Down
2 changes: 1 addition & 1 deletion cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require Exporter;

our ($VERSION, @ISA, @EXPORT);

$VERSION = '2.104';
$VERSION = '2.106';

@ISA = qw(Exporter);

Expand Down
4 changes: 2 additions & 2 deletions cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ use bytes;

our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS);

$VERSION = '2.104';
$VERSION = '2.106';

use IO::Compress::Gzip::Constants 2.104 ;
use IO::Compress::Gzip::Constants 2.106 ;

sub ExtraFieldError
{
Expand Down
4 changes: 2 additions & 2 deletions cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ use strict;
use warnings;
use bytes;

use IO::Compress::Base::Common 2.104 qw(:Status);
use IO::Compress::Base::Common 2.106 qw(:Status);

use Compress::Raw::Bzip2 2.103 ;

our ($VERSION, @ISA);
$VERSION = '2.104';
$VERSION = '2.106';

sub mkUncompObject
{
Expand Down
4 changes: 2 additions & 2 deletions cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ use warnings;
use strict;
use bytes;

use IO::Compress::Base::Common 2.104 qw(:Status);
use IO::Compress::Base::Common 2.106 qw(:Status);
use IO::Compress::Zip::Constants ;

our ($VERSION);

$VERSION = '2.104';
$VERSION = '2.106';

use Compress::Raw::Zlib 2.103 ();

Expand Down
4 changes: 2 additions & 2 deletions cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ use strict;
use warnings;
use bytes;

use IO::Compress::Base::Common 2.104 qw(:Status);
use IO::Compress::Base::Common 2.106 qw(:Status);
use Compress::Raw::Zlib 2.103 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);

our ($VERSION);
$VERSION = '2.104';
$VERSION = '2.106';



Expand Down
Loading

0 comments on commit e1cb5e9

Please sign in to comment.