Skip to content

Commit 9f58603

Browse files
bingosbingos
committed
Update IO-Compress to CPAN version 2.086
 [DELTA] 2.086 31 March 2019 * IO::Compress::Zip & IO::Uncompress::Unzip Added support for Language Encoding Flag via the EFS option. Starting point was pull request pmqs/IO-Compress#1 * zipdetails - some support for MVS (Z390) zip files * IO::Uncompress::Base Issue with trailing data after zip archive #128626 for IO-Compress: mainframe zip archive * t/cz-14gzopen.t cperl error found in http://www.cpantesters.org/cpan/report/448cafc4-3108-11e9-9b6b-d3d33d7b1231 Perl has this: "Not enough arguments for Compress::Zlib::gzopen" cperl uses this: "Not enough arguments for subroutine entry Compress::Zlib::gzopen" * Handlers being called when optional modules are not installed #128538: $SIG{__DIE__} * #128194: Beef up diag when system returns error * Moved source to github https://github.com/pmqs/IO-Compress * Add META_MERGE to Makefile.PL * Added meta-json.t & meta-yaml.t
1 parent c8aa92e commit 9f58603

36 files changed

+578
-151
lines changed

‎MANIFEST

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,6 +1099,7 @@ cpan/IO-Compress/t/107multi-deflate.t IO::Compress
10991099
cpan/IO-Compress/t/107multi-gzip.t IO::Compress
11001100
cpan/IO-Compress/t/107multi-rawdeflate.t IO::Compress
11011101
cpan/IO-Compress/t/107multi-zip.t IO::Compress
1102+
cpan/IO-Compress/t/107multi-zip-only.t
11021103
cpan/IO-Compress/t/108anyunc-bzip2.t IO::Compress
11031104
cpan/IO-Compress/t/108anyunc-deflate.t IO::Compress
11041105
cpan/IO-Compress/t/108anyunc-gzip.t IO::Compress
@@ -1115,6 +1116,7 @@ cpan/IO-Compress/t/110encode-gzip.t IO::Compress
11151116
cpan/IO-Compress/t/110encode-rawdeflate.t IO::Compress
11161117
cpan/IO-Compress/t/110encode-zip.t IO::Compress
11171118
cpan/IO-Compress/t/111const-deflate.t IO::Compress
1119+
cpan/IO-Compress/t/112utf8-zip.t
11181120
cpan/IO-Compress/t/999pod.t IO::Compress
11191121
cpan/IO-Compress/t/compress/any.pl Compress::Zlib
11201122
cpan/IO-Compress/t/compress/anyunc.pl Compress::Zlib
@@ -1135,6 +1137,7 @@ cpan/IO-Compress/t/cz-03zlib-v1.t IO::Compress
11351137
cpan/IO-Compress/t/cz-06gzsetp.t IO::Compress
11361138
cpan/IO-Compress/t/cz-08encoding.t IO::Compress
11371139
cpan/IO-Compress/t/cz-14gzopen.t IO::Compress
1140+
cpan/IO-Compress/t/files/bad-efs.zip
11381141
cpan/IO-Compress/t/files/meta.xml
11391142
cpan/IO-Compress/t/files/test.ods
11401143
cpan/IO-Compress/t/globmapper.t IO::Compress

‎Porting/Maintainers.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,11 +616,12 @@ package Maintainers;
616616
},
617617

618618
'IO-Compress' => {
619-
'DISTRIBUTION' => 'PMQS/IO-Compress-2.084.tar.gz',
619+
'DISTRIBUTION' => 'PMQS/IO-Compress-2.086.tar.gz',
620620
'FILES' => q[cpan/IO-Compress],
621621
'EXCLUDED' => [
622622
qr{^examples/},
623623
qr{^t/Test/},
624+
qr{^t/999meta-},
624625
't/010examples-bzip2.t',
625626
't/010examples-zlib.t',
626627
't/cz-05examples.t',

‎cpan/IO-Compress/Makefile.PL

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use strict ;
44
require 5.006 ;
55

6-
$::VERSION = '2.084' ;
6+
$::VERSION = '2.086' ;
77

88
use lib '.';
99
use private::MakeUtil;
@@ -50,11 +50,33 @@ WriteMakefile(
5050
: ()
5151
),
5252

53-
META_MERGE => {
54-
no_index => {
55-
directory => [ 't', 'private' ],
56-
},
57-
},
53+
( eval { ExtUtils::MakeMaker->VERSION(6.46) }
54+
? ( META_MERGE => {
55+
56+
"meta-spec" => { version => 2 },
57+
58+
no_index => {
59+
directory => [ 't', 'private' ],
60+
},
61+
62+
resources => {
63+
64+
bugtracker => {
65+
web => 'https://github.com/pmqs/IO-Compress/issues'
66+
},
67+
68+
homepage => 'https://github.com/pmqs/IO-Compress',
69+
70+
repository => {
71+
type => 'git',
72+
url => 'git://github.com/pmqs/IO-Compress.git',
73+
web => 'https://github.com/pmqs/IO-Compress',
74+
},
75+
},
76+
}
77+
)
78+
: ()
79+
),
5880

5981
((ExtUtils::MakeMaker->VERSION() gt '6.30') ?
6082
('LICENSE' => 'perl') : ()),

‎cpan/IO-Compress/bin/zipdetails

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ my %Extras = (
139139

140140
# The Header ID mappings defined by Info-ZIP and third parties are:
141141

142-
0x0065, ['IBM S/390 attributes - uncompressed', undef],
142+
0x0065, ['IBM S/390 attributes - uncompressed', \&decodeMVS],
143143
0x0066, ['IBM S/390 attributes - compressed', undef],
144144
0x07c8, ['Info-ZIP Macintosh (old, J. Lee)', undef],
145145
0x2605, ['ZipIt Macintosh (first version)', undef],
@@ -180,7 +180,7 @@ my %Extras = (
180180

181181
);
182182

183-
my $VERSION = "1.09" ;
183+
my $VERSION = "1.10" ;
184184

185185
my $FH;
186186

@@ -1463,6 +1463,24 @@ sub decode_NT_security
14631463
}
14641464
}
14651465

1466+
sub decodeMVS
1467+
{
1468+
my $len = shift;
1469+
my $context = shift;
1470+
1471+
# data in Big-Endian
1472+
myRead(my $data, $len);
1473+
my $ID = unpack("N", $data);
1474+
1475+
if ($ID == 0xE9F3F9F0)
1476+
{
1477+
out($data, " ID", "'Z390'");
1478+
substr($data, 0, 4) = '';
1479+
}
1480+
1481+
out($data, " Extra Payload", hexDump($data));
1482+
}
1483+
14661484
sub printAes
14671485
{
14681486
my $context = shift ;
@@ -2062,7 +2080,7 @@ OPTIONS
20622080
-h display help
20632081
-v Verbose - output more stuff
20642082
2065-
Copyright (c) 2011-2018 Paul Marquess. All rights reserved.
2083+
Copyright (c) 2011-2019 Paul Marquess. All rights reserved.
20662084
20672085
This program is free software; you can redistribute it and/or
20682086
modify it under the same terms as Perl itself.
@@ -2182,7 +2200,7 @@ Paul Marquess F<pmqs@cpan.org>.
21822200
21832201
=head1 COPYRIGHT
21842202
2185-
Copyright (c) 2011-2018 Paul Marquess. All rights reserved.
2203+
Copyright (c) 2011-2019 Paul Marquess. All rights reserved.
21862204
21872205
This program is free software; you can redistribute it and/or modify it
21882206
under the same terms as Perl itself.

‎cpan/IO-Compress/lib/Compress/Zlib.pm

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ use Carp ;
77
use IO::Handle ;
88
use Scalar::Util qw(dualvar);
99

10-
use IO::Compress::Base::Common 2.084 ;
11-
use Compress::Raw::Zlib 2.084 ;
12-
use IO::Compress::Gzip 2.084 ;
13-
use IO::Uncompress::Gunzip 2.084 ;
10+
use IO::Compress::Base::Common 2.086 ;
11+
use Compress::Raw::Zlib 2.086 ;
12+
use IO::Compress::Gzip 2.086 ;
13+
use IO::Uncompress::Gunzip 2.086 ;
1414

1515
use strict ;
1616
use warnings ;
1717
use bytes ;
1818
our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
1919

20-
$VERSION = '2.084';
20+
$VERSION = '2.086';
2121
$XS_VERSION = $VERSION;
2222
$VERSION = eval $VERSION;
2323

@@ -224,7 +224,7 @@ sub Compress::Zlib::gzFile::gzseek
224224

225225
my $gz = $self->[0] ;
226226
my $status ;
227-
eval { $status = $gz->seek($offset, $whence) ; };
227+
eval { local $SIG{__DIE__}; $status = $gz->seek($offset, $whence) ; };
228228
if ($@)
229229
{
230230
my $error = $@;
@@ -461,7 +461,7 @@ sub inflate
461461

462462
package Compress::Zlib ;
463463

464-
use IO::Compress::Gzip::Constants 2.084 ;
464+
use IO::Compress::Gzip::Constants 2.086 ;
465465

466466
sub memGzip($)
467467
{

‎cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ use strict;
44
use warnings;
55
use bytes;
66

7-
use IO::Compress::Base::Common 2.084 qw(:Status);
7+
use IO::Compress::Base::Common 2.086 qw(:Status);
88

9-
use Compress::Raw::Bzip2 2.084 ;
9+
use Compress::Raw::Bzip2 2.086 ;
1010

1111
our ($VERSION);
12-
$VERSION = '2.084';
12+
$VERSION = '2.086';
1313

1414
sub mkCompObject
1515
{

‎cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ use strict;
44
use warnings;
55
use bytes;
66

7-
use IO::Compress::Base::Common 2.084 qw(:Status);
8-
use Compress::Raw::Zlib 2.084 qw( !crc32 !adler32 ) ;
7+
use IO::Compress::Base::Common 2.086 qw(:Status);
8+
use Compress::Raw::Zlib 2.086 qw( !crc32 !adler32 ) ;
99

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

13-
$VERSION = '2.084';
13+
$VERSION = '2.086';
1414
@ISA = qw(Exporter);
1515
@EXPORT_OK = @Compress::Raw::Zlib::DEFLATE_CONSTANTS;
1616
%EXPORT_TAGS = %Compress::Raw::Zlib::DEFLATE_CONSTANTS;

‎cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ use strict;
44
use warnings;
55
use bytes;
66

7-
use IO::Compress::Base::Common 2.084 qw(:Status);
7+
use IO::Compress::Base::Common 2.086 qw(:Status);
88
our ($VERSION);
99

10-
$VERSION = '2.084';
10+
$VERSION = '2.086';
1111

1212
sub mkCompObject
1313
{

‎cpan/IO-Compress/lib/IO/Compress/Base.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require 5.006 ;
66
use strict ;
77
use warnings;
88

9-
use IO::Compress::Base::Common 2.084 ;
9+
use IO::Compress::Base::Common 2.086 ;
1010

1111
use IO::File (); ;
1212
use Scalar::Util ();
@@ -20,7 +20,7 @@ use Symbol();
2020
our (@ISA, $VERSION);
2121
@ISA = qw(IO::File Exporter);
2222

23-
$VERSION = '2.084';
23+
$VERSION = '2.086';
2424

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

‎cpan/IO-Compress/lib/IO/Compress/Base/Common.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use File::GlobMapper;
1111
require Exporter;
1212
our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE);
1313
@ISA = qw(Exporter);
14-
$VERSION = '2.084';
14+
$VERSION = '2.086';
1515

1616
@EXPORT = qw( isaFilehandle isaFilename isaScalar
1717
whatIsInput whatIsOutput

‎cpan/IO-Compress/lib/IO/Compress/Bzip2.pm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ use warnings;
55
use bytes;
66
require Exporter ;
77

8-
use IO::Compress::Base 2.084 ;
8+
use IO::Compress::Base 2.086 ;
99

10-
use IO::Compress::Base::Common 2.084 qw();
11-
use IO::Compress::Adapter::Bzip2 2.084 ;
10+
use IO::Compress::Base::Common 2.086 qw();
11+
use IO::Compress::Adapter::Bzip2 2.086 ;
1212

1313

1414

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

17-
$VERSION = '2.084';
17+
$VERSION = '2.086';
1818
$Bzip2Error = '';
1919

2020
@ISA = qw(IO::Compress::Base Exporter);
@@ -51,7 +51,7 @@ sub getExtraParams
5151
{
5252
my $self = shift ;
5353

54-
use IO::Compress::Base::Common 2.084 qw(:Parse);
54+
use IO::Compress::Base::Common 2.086 qw(:Parse);
5555

5656
return (
5757
'blocksize100k' => [IO::Compress::Base::Common::Parse_unsigned, 1],

‎cpan/IO-Compress/lib/IO/Compress/Deflate.pm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ use bytes;
88

99
require Exporter ;
1010

11-
use IO::Compress::RawDeflate 2.084 ();
12-
use IO::Compress::Adapter::Deflate 2.084 ;
11+
use IO::Compress::RawDeflate 2.086 ();
12+
use IO::Compress::Adapter::Deflate 2.086 ;
1313

14-
use IO::Compress::Zlib::Constants 2.084 ;
15-
use IO::Compress::Base::Common 2.084 qw();
14+
use IO::Compress::Zlib::Constants 2.086 ;
15+
use IO::Compress::Base::Common 2.086 qw();
1616

1717

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

20-
$VERSION = '2.084';
20+
$VERSION = '2.086';
2121
$DeflateError = '';
2222

2323
@ISA = qw(IO::Compress::RawDeflate Exporter);

‎cpan/IO-Compress/lib/IO/Compress/Gzip.pm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ use bytes;
88

99
require Exporter ;
1010

11-
use IO::Compress::RawDeflate 2.084 () ;
12-
use IO::Compress::Adapter::Deflate 2.084 ;
11+
use IO::Compress::RawDeflate 2.086 () ;
12+
use IO::Compress::Adapter::Deflate 2.086 ;
1313

14-
use IO::Compress::Base::Common 2.084 qw(:Status );
15-
use IO::Compress::Gzip::Constants 2.084 ;
16-
use IO::Compress::Zlib::Extra 2.084 ;
14+
use IO::Compress::Base::Common 2.086 qw(:Status );
15+
use IO::Compress::Gzip::Constants 2.086 ;
16+
use IO::Compress::Zlib::Extra 2.086 ;
1717

1818
BEGIN
1919
{
@@ -25,7 +25,7 @@ BEGIN
2525

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

28-
$VERSION = '2.084';
28+
$VERSION = '2.086';
2929
$GzipError = '' ;
3030

3131
@ISA = qw(IO::Compress::RawDeflate Exporter);

‎cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require Exporter;
99
our ($VERSION, @ISA, @EXPORT, %GZIP_OS_Names);
1010
our ($GZIP_FNAME_INVALID_CHAR_RE, $GZIP_FCOMMENT_INVALID_CHAR_RE);
1111

12-
$VERSION = '2.084';
12+
$VERSION = '2.086';
1313

1414
@ISA = qw(Exporter);
1515

‎cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ use strict ;
66
use warnings;
77
use bytes;
88

9-
use IO::Compress::Base 2.084 ;
10-
use IO::Compress::Base::Common 2.084 qw(:Status );
11-
use IO::Compress::Adapter::Deflate 2.084 ;
9+
use IO::Compress::Base 2.086 ;
10+
use IO::Compress::Base::Common 2.086 qw(:Status );
11+
use IO::Compress::Adapter::Deflate 2.086 ;
1212

1313
require Exporter ;
1414

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

17-
$VERSION = '2.084';
17+
$VERSION = '2.086';
1818
$RawDeflateError = '';
1919

2020
@ISA = qw(IO::Compress::Base Exporter);
@@ -116,8 +116,8 @@ sub getExtraParams
116116
return getZlibParams();
117117
}
118118

119-
use IO::Compress::Base::Common 2.084 qw(:Parse);
120-
use Compress::Raw::Zlib 2.084 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
119+
use IO::Compress::Base::Common 2.086 qw(:Parse);
120+
use Compress::Raw::Zlib 2.086 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
121121
our %PARAMS = (
122122
#'method' => [IO::Compress::Base::Common::Parse_unsigned, Z_DEFLATED],
123123
'level' => [IO::Compress::Base::Common::Parse_signed, Z_DEFAULT_COMPRESSION],

0 commit comments

Comments
 (0)