Skip to content

Commit 4737eb0

Browse files
toddratoomic
authored andcommitted
Update IO-Compress to CPAN version 2.096
[DELTA] 2.096 31 July 2020 * Add Zip support for Zstd 508258baeeec51ba49c3c07d2dda7c19e3194985 * Add support for Zip/Unzip with XZ compression 6d240d3b3514d627a751ec82fe71f2e236301e19 3c0046e8bc65ef467b9153722609654d3ccc5bbd 2.095 19 July 2020 * Add Support for Zstandard in AnyUncompress 2.094 13 July 2020 * bin/zipdetails version 2 7acb49ff4ca67051deaffd7f988556dae0dd884b small update f5988eebc21a4d0b96e0b094e6e9bf8d3dcb1763 Better error messages for missing Zip64 records d224dcc321dd1ff120345ac3a19286ecdc79776f Add note about warning output 4caa0e5117c4c214f457d90f9a87d00772a79622 Add --version option 6c045c859d2b6bab0398833f207d7f9b803bbbab Version 2 df97743ffa1da816936e8ef504c9d561d66bb0ed Beef up some error cases 073129c4f44ebd3cc2c5381ffa824fc09b474c29 Rename a couple of unused signatures 72568c7d9edfd3e2fb6647dce6ea511e9caa186c update comment 1088199809cabb9c565ac23f065988683aacd323 Merge branch 'master' of https://github.com/pmqs/IO-Compress ad987ab95e3f3fa02fcf526736ad2da78d327460 Merge pull request #10 from fabiensanglard/master ac76d1b3d3f23077b1700778226edd68c50d81a8 fix typo 5950d7e724479f0eceffe68ae515ac117ff6a5ef Don't output "Extra Payload" if length is zero dbd3160decd9b761dbad7aaae2ec46c0173125ef Merge pull request #12 from fabiensanglard/extra 7ae4a98124c9195ca5286e3ac7d2cbe37fa2b644 Recover from bad extra subfield 3e12e62916da31c003a7273293bc32bb9a31f85f Fix typo f3a0a4717433d32743f17d40adc30e11bea60868 Fix wrong START offset 6f078dca715473276556afb0b8582bb69efa7230 Typo for Implode string "Shannon-Fano Trees" 4e25fed1a8e29518fa38f0610a5ca33ca41e9d89 some small documentation updates. 1be04bf4bd5fb023ad276ecabdbc170823bac465 Add decoder for 'Open Packaging Growth Hint' 2da58735bdbd1149863014dd08a7cea0334f52d5 update compression method 16 82a9612676ae192747b8bcbf586b09408c3b72ce Add extra fields 0x20-0x23 from APPNOTE 6.3.5 bc5e2ffbc560b236bc3be0f977ce744f2a2afbfb remove trailing whitespace 3f70119190671b00eb432e36904aa9dbb2fb8f69 minor documentation changes
1 parent 6fec3df commit 4737eb0

35 files changed

+1116
-692
lines changed

MANIFEST

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,6 +1148,7 @@ cpan/IO-Compress/t/files/encrypt-standard.zip
11481148
cpan/IO-Compress/t/files/jar.zip
11491149
cpan/IO-Compress/t/files/meta.xml
11501150
cpan/IO-Compress/t/files/test.ods
1151+
cpan/IO-Compress/t/files/testfile1.odt
11511152
cpan/IO-Compress/t/globmapper.t IO::Compress
11521153
cpan/IO-Socket-IP/lib/IO/Socket/IP.pm IO::Socket::IP
11531154
cpan/IO-Socket-IP/t/00use.t IO::Socket::IP tests

Porting/Maintainers.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ package Maintainers;
643643
},
644644

645645
'IO-Compress' => {
646-
'DISTRIBUTION' => 'PMQS/IO-Compress-2.093.tar.gz',
646+
'DISTRIBUTION' => 'PMQS/IO-Compress-2.096.tar.gz',
647647
'FILES' => q[cpan/IO-Compress],
648648
'EXCLUDED' => [
649649
qr{^examples/},

cpan/IO-Compress/Makefile.PL

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

6-
$::VERSION = '2.093' ;
6+
$::VERSION = '2.096' ;
77

88
use lib '.';
99
use private::MakeUtil;
@@ -12,10 +12,10 @@ use ExtUtils::MakeMaker 5.16 ;
1212
UpDowngrade(getPerlFiles('MANIFEST'))
1313
unless $ENV{PERL_CORE};
1414

15-
WriteMakefile(
15+
WriteMakefile(
1616
NAME => 'IO::Compress',
1717
VERSION_FROM => 'lib/IO/Compress/Base.pm',
18-
'dist' => { COMPRESS => 'gzip',
18+
'dist' => { COMPRESS => 'gzip',
1919
TARFLAGS => '-chvf',
2020
SUFFIX => 'gz',
2121
DIST_DEFAULT => 'MyTrebleCheck tardist',
@@ -25,14 +25,15 @@ WriteMakefile(
2525
$ENV{SKIP_FOR_CORE}
2626
? ()
2727
: (PREREQ_PM => { 'Compress::Raw::Bzip2' => $::VERSION,
28-
'Compress::Raw::Zlib' => $::VERSION,
28+
'Compress::Raw::Zlib' => $::VERSION,
2929
'Scalar::Util' => 0,
30-
$] >= 5.005 && $] < 5.006
31-
? ('File::BSDGlob' => 0)
30+
'Encode' => 0,
31+
$] >= 5.005 && $] < 5.006
32+
? ('File::BSDGlob' => 0)
3233
: () }
3334
)
3435
),
35-
36+
3637
(
3738
$] >= 5.005
3839
? (ABSTRACT => 'IO Interface to compressed data files/buffers',
@@ -43,24 +44,24 @@ WriteMakefile(
4344
INSTALLDIRS => ($] >= 5.009 && $] < 5.011 ? 'perl' : 'site'),
4445

4546
EXE_FILES => ['bin/zipdetails', 'bin/streamzip'],
46-
47+
4748
(
4849
$] >= 5.009 && $] <= 5.011001 && ! $ENV{PERL_CORE}
4950
? (INSTALLPRIVLIB => '$(INSTALLARCHLIB)')
5051
: ()
5152
),
5253

53-
( eval { ExtUtils::MakeMaker->VERSION(6.46) }
54+
( eval { ExtUtils::MakeMaker->VERSION(6.46) }
5455
? ( META_MERGE => {
55-
56+
5657
"meta-spec" => { version => 2 },
5758

5859
no_index => {
5960
directory => [ 't', 'private' ],
6061
},
6162

6263
resources => {
63-
64+
6465
bugtracker => {
6566
web => 'https://github.com/pmqs/IO-Compress/issues'
6667
},
@@ -71,17 +72,16 @@ WriteMakefile(
7172
type => 'git',
7273
url => 'git://github.com/pmqs/IO-Compress.git',
7374
web => 'https://github.com/pmqs/IO-Compress',
74-
},
75+
},
7576
},
76-
}
77-
)
77+
}
78+
)
7879
: ()
7980
),
8081

8182
((ExtUtils::MakeMaker->VERSION() gt '6.30') ?
82-
('LICENSE' => 'perl') : ()),
83+
('LICENSE' => 'perl') : ()),
8384

8485
) ;
8586

8687
# end of file Makefile.PL
87-

cpan/IO-Compress/bin/streamzip

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use IO::Compress::Zip qw(zip
1212
ZIP_CM_LZMA );
1313
use Getopt::Long;
1414

15-
my $VERSION = '1.0';
15+
my $VERSION = '1.001';
1616

1717
my $compression_method = ZIP_CM_DEFLATE;
1818
my $stream = 0;
@@ -63,7 +63,7 @@ sub lookupMethod
6363
if ($method == ZIP_CM_LZMA)
6464
{
6565
eval ' use IO::Compress::Adapter::Lzma';
66-
die "Method =. LZMA needs IO::Compress::Adapter::Lzma\n"
66+
die "Method 'LZMA' needs IO::Compress::Adapter::Lzma\n"
6767
if ! defined $IO::Compress::Lzma::VERSION;
6868
}
6969

@@ -72,21 +72,24 @@ sub lookupMethod
7272

7373
sub Usage
7474
{
75-
die <<EOM;
76-
streamzip [OPTIONS]
75+
print <<EOM;
76+
Usage:
77+
producer | streamzip [OPTIONS] | consumer
78+
producer | streamzip [OPTIONS] -zipfile=output.zip
7779
7880
Stream data from stdin, compress into a Zip container, and stream to stdout.
7981
8082
OPTIONS
8183
82-
-zipfile=F Write zip container to the filename F
83-
-member-name=M member name [Default '-']
84+
-zipfile=F Write zip container to the filename 'F'
85+
Outputs to stdout if zipfile not specified.
86+
-member-name=M Set member name to 'M' [Default '-']
8487
-zip64 Create a Zip64-compliant zip file [Default: No]
85-
Use Zip64 if input is greater than 4Gig.
86-
-stream Write a streamed zip file
88+
Enable Zip64 if input is greater than 4Gig.
89+
-stream Force a streamed zip file when zipfile is also enabled.
8790
Only applies when 'zipfile' option is used. [Default: No]
88-
Always enabled when writing to stdout.
89-
-method=M Compress using method "M".
91+
Stream is always enabled when writing to stdout.
92+
-method=M Compress using method 'M'.
9093
Valid methods are
9194
store Store without compression
9295
deflate Use Deflate compression [Deflault]
@@ -95,12 +98,13 @@ OPTIONS
9598
Lzma needs IO::Compress::Lzma to be installed.
9699
-version Display version number [$VERSION]
97100
98-
Copyright (c) 2019 Paul Marquess. All rights reserved.
101+
Copyright (c) 2019-2020 Paul Marquess. All rights reserved.
99102
100103
This program is free software; you can redistribute it and/or
101104
modify it under the same terms as Perl itself.
102105
103106
EOM
107+
exit;
104108
}
105109

106110

@@ -116,62 +120,64 @@ streamzip - create a zip file from stdin
116120
117121
=head1 DESCRIPTION
118122
119-
This program will read data from stdin, compress it into a zip container and,
120-
by default, write a I<streamed> zip file to stdout. No temporary files are created.
123+
This program will read data from C<stdin>, compress it into a zip container
124+
and, by default, write a I<streamed> zip file to C<stdout>. No temporary
125+
files are created.
121126
122-
The zip container written to stdout is, by necessity, written in streaming
123-
format. Most programs that read Zip files can cope with a streamed zip file,
124-
but if interoperability is important, and your workflow allows you to write the
125-
zip file directly to disk you can create a non-streamed zip file using the C<zipfile> option.
127+
The zip container written to C<stdout> is, by necessity, written in
128+
streaming format. Most programs that read Zip files can cope with a
129+
streamed zip file, but if interoperability is important, and your workflow
130+
allows you to write the zip file directly to disk you can create a
131+
non-streamed zip file using the C<zipfile> option.
126132
127133
=head2 OPTIONS
128134
129135
=over 5
130136
131137
=item -zip64
132138
133-
Create a Zip64-compliant zip container.
134-
Use this option if the input is greater than 4Gig.
139+
Create a Zip64-compliant zip container. Use this option if the input is
140+
greater than 4Gig.
135141
136142
Default is disabled.
137143
138-
=item -zipfile=F
144+
=item -zipfile=F
139145
140-
Write zip container to the filename F.
146+
Write zip container to the filename C<F>.
141147
142-
Use the C<Stream> option to enable the creation of a streamed zip file.
148+
Use the C<Stream> option to force the creation of a streamed zip file.
143149
144-
=item -member-name=M
150+
=item -member-name=M
145151
146152
This option is used to name the "file" in the zip container.
147153
148154
Default is '-'.
149155
150-
=item -stream
156+
=item -stream
151157
152-
Ignored when writing to stdout.
158+
Ignored when writing to C<stdout>.
153159
154-
If the C<zipfile> option is specified, including this option
155-
will trigger the creation of a streamed zip file.
160+
If the C<zipfile> option is specified, including this option will trigger
161+
the creation of a streamed zip file.
156162
157-
Default: Always enabled when writing to stdout, otherwise disabled.
163+
Default: Always enabled when writing to C<stdout>, otherwise disabled.
158164
159-
=item -method=M
165+
=item -method=M
160166
161-
Compress using method "M".
167+
Compress using method C<M>.
162168
163169
Valid method names are
164170
165171
* store Store without compression
166172
* deflate Use Deflate compression [Deflault]
167173
* bzip2 Use Bzip2 compression
168-
* lzma Use LZMA compression
174+
* lzma Use LZMA compression
169175
170-
Note that Lzma compress needs IO::Compress::Lzma to be installed.
176+
Note that Lzma compress needs C<IO::Compress::Lzma> to be installed.
171177
172-
Default is deflate.
178+
Default is C<deflate>.
173179
174-
=item -version
180+
=item -version
175181
176182
Display version number [$VERSION]
177183
@@ -183,12 +189,12 @@ Display help
183189
184190
=head2 When to use a Streamed Zip File
185191
186-
A Zip file created with streaming mode enabled allows you to create a zip file
187-
in situations where you cannot seek backwards/forwards in the file.
192+
A Streamed Zip File is useful in situations where you cannot seek
193+
backwards/forwards in the file.
188194
189-
A good examples is when you are
190-
serving dynamic content from a Web Server straight into a socket
191-
without needing to create a temporary zip file in the filesystsm.
195+
A good examples is when you are serving dynamic content from a Web Server
196+
straight into a socket without needing to create a temporary zip file in
197+
the filesystsm.
192198
193199
Similarly if your workfow uses a Linux pipelined commands.
194200
@@ -203,10 +209,9 @@ L<https://rt.cpan.org/Public/Dist/Display.html?Name=IO-Compress>.
203209
204210
Paul Marquess F<[email protected]>.
205211
206-
=head1 COPYRIGHT
212+
=head1 COPYRIGHT
207213
208-
Copyright (c) 2019 Paul Marquess. All rights reserved.
214+
Copyright (c) 2019-2020 Paul Marquess. All rights reserved.
209215
210216
This program is free software; you can redistribute it and/or modify it
211-
under the same terms as Perl itself.
212-
217+
under the same terms as Perl itself.

0 commit comments

Comments
 (0)