'IO-Compress' =>
{
'MAINTAINER' => 'pmqs',
- 'DISTRIBUTION' => 'PMQS/IO-Compress-2.040.tar.gz',
+ 'DISTRIBUTION' => 'PMQS/IO-Compress-2.042.tar.gz',
'FILES' => q[cpan/IO-Compress],
'EXCLUDED' => [ qr{t/Test/} ],
'UPSTREAM' => 'cpan',
CHANGES
-------
+ 2.042 17 November 2011
+
+ * IO::Compress::Zip
+ - Added exUnixN option to allow creation of the "ux" extra field.
+ This allows 32-bit UID/GID to be stored.
+ - In one-shot mode use exUnixN rather than exUnix2 for the UID/GID.
+
+ * IO::Compress::Zlib::Extra::parseExtraField
+ - Fixed bad test for length of ID field
+ [RT# 72329 & #72505]
+
2.040 28 October 2011
* t/105oneshot-zip-only.t
use strict ;
require 5.004 ;
-$::VERSION = '2.040' ;
+$::VERSION = '2.042' ;
use private::MakeUtil;
use ExtUtils::MakeMaker 5.16 ;
IO-Compress
- Version 2.040
+ Version 2.042
- 28th october 2011
+ 17th November 2011
Copyright (c) 1995-2011 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it
If you haven't installed IO-Compress then search IO::Compress::Gzip.pm
for a line like this:
- $VERSION = "2.040" ;
+ $VERSION = "2.042" ;
2. If you are having problems building IO-Compress, send me a
complete log of what happened. Start by unpacking the IO-Compress
use IO::Handle ;
use Scalar::Util qw(dualvar);
-use IO::Compress::Base::Common 2.040 ;
-use Compress::Raw::Zlib 2.040 ;
-use IO::Compress::Gzip 2.040 ;
-use IO::Uncompress::Gunzip 2.040 ;
+use IO::Compress::Base::Common 2.042 ;
+use Compress::Raw::Zlib 2.042 ;
+use IO::Compress::Gzip 2.042 ;
+use IO::Uncompress::Gunzip 2.042 ;
use strict ;
use warnings ;
use bytes ;
our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
-$VERSION = '2.040';
+$VERSION = '2.042';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
package Compress::Zlib ;
-use IO::Compress::Gzip::Constants 2.040 ;
+use IO::Compress::Gzip::Constants 2.042 ;
sub memGzip($)
{
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.040 qw(:Status);
+use IO::Compress::Base::Common 2.042 qw(:Status);
#use Compress::Bzip2 ;
-use Compress::Raw::Bzip2 2.040 ;
+use Compress::Raw::Bzip2 2.042 ;
our ($VERSION);
-$VERSION = '2.040';
+$VERSION = '2.042';
sub mkCompObject
{
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.040 qw(:Status);
+use IO::Compress::Base::Common 2.042 qw(:Status);
-use Compress::Raw::Zlib 2.040 qw(Z_OK Z_FINISH MAX_WBITS) ;
+use Compress::Raw::Zlib 2.042 qw(Z_OK Z_FINISH MAX_WBITS) ;
our ($VERSION);
-$VERSION = '2.040';
+$VERSION = '2.042';
sub mkCompObject
{
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.040 qw(:Status);
+use IO::Compress::Base::Common 2.042 qw(:Status);
our ($VERSION);
-$VERSION = '2.040';
+$VERSION = '2.042';
sub mkCompObject
{
use strict ;
use warnings;
-use IO::Compress::Base::Common 2.040 ;
+use IO::Compress::Base::Common 2.042 ;
use IO::File qw(SEEK_SET SEEK_END); ;
use Scalar::Util qw(blessed readonly);
our (@ISA, $VERSION);
@ISA = qw(Exporter IO::File);
-$VERSION = '2.040';
+$VERSION = '2.042';
#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.
require Exporter;
our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE);
@ISA = qw(Exporter);
-$VERSION = '2.040';
+$VERSION = '2.042';
@EXPORT = qw( isaFilehandle isaFilename whatIsInput whatIsOutput
isaFileGlobString cleanFileGlobString oneTarget
use bytes;
require Exporter ;
-use IO::Compress::Base 2.040 ;
+use IO::Compress::Base 2.042 ;
-use IO::Compress::Base::Common 2.040 qw(createSelfTiedObject);
-use IO::Compress::Adapter::Bzip2 2.040 ;
+use IO::Compress::Base::Common 2.042 qw(createSelfTiedObject);
+use IO::Compress::Adapter::Bzip2 2.042 ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error);
-$VERSION = '2.040';
+$VERSION = '2.042';
$Bzip2Error = '';
@ISA = qw(Exporter IO::Compress::Base);
{
my $self = shift ;
- use IO::Compress::Base::Common 2.040 qw(:Parse);
+ use IO::Compress::Base::Common 2.042 qw(:Parse);
return (
'BlockSize100K' => [0, 1, Parse_unsigned, 1],
require Exporter ;
-use IO::Compress::RawDeflate 2.040 ;
+use IO::Compress::RawDeflate 2.042 ;
-use Compress::Raw::Zlib 2.040 ;
-use IO::Compress::Zlib::Constants 2.040 ;
-use IO::Compress::Base::Common 2.040 qw(createSelfTiedObject);
+use Compress::Raw::Zlib 2.042 ;
+use IO::Compress::Zlib::Constants 2.042 ;
+use IO::Compress::Base::Common 2.042 qw(createSelfTiedObject);
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $DeflateError);
-$VERSION = '2.040';
+$VERSION = '2.042';
$DeflateError = '';
@ISA = qw(Exporter IO::Compress::RawDeflate);
use bytes;
-use IO::Compress::RawDeflate 2.040 ;
+use IO::Compress::RawDeflate 2.042 ;
-use Compress::Raw::Zlib 2.040 ;
-use IO::Compress::Base::Common 2.040 qw(:Status :Parse createSelfTiedObject);
-use IO::Compress::Gzip::Constants 2.040 ;
-use IO::Compress::Zlib::Extra 2.040 ;
+use Compress::Raw::Zlib 2.042 ;
+use IO::Compress::Base::Common 2.042 qw(:Status :Parse createSelfTiedObject);
+use IO::Compress::Gzip::Constants 2.042 ;
+use IO::Compress::Zlib::Extra 2.042 ;
BEGIN
{
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $GzipError);
-$VERSION = '2.040';
+$VERSION = '2.042';
$GzipError = '' ;
@ISA = qw(Exporter IO::Compress::RawDeflate);
our ($VERSION, @ISA, @EXPORT, %GZIP_OS_Names);
our ($GZIP_FNAME_INVALID_CHAR_RE, $GZIP_FCOMMENT_INVALID_CHAR_RE);
-$VERSION = '2.040';
+$VERSION = '2.042';
@ISA = qw(Exporter);
use bytes;
-use IO::Compress::Base 2.040 ;
-use IO::Compress::Base::Common 2.040 qw(:Status createSelfTiedObject);
-use IO::Compress::Adapter::Deflate 2.040 ;
+use IO::Compress::Base 2.042 ;
+use IO::Compress::Base::Common 2.042 qw(:Status createSelfTiedObject);
+use IO::Compress::Adapter::Deflate 2.042 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError);
-$VERSION = '2.040';
+$VERSION = '2.042';
$RawDeflateError = '';
@ISA = qw(Exporter IO::Compress::Base);
{
my $self = shift ;
- use IO::Compress::Base::Common 2.040 qw(:Parse);
- use Compress::Raw::Zlib 2.040 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
+ use IO::Compress::Base::Common 2.042 qw(:Parse);
+ use Compress::Raw::Zlib 2.042 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
return (
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.040 qw(:Status createSelfTiedObject);
-use IO::Compress::RawDeflate 2.040 ;
-use IO::Compress::Adapter::Deflate 2.040 ;
-use IO::Compress::Adapter::Identity 2.040 ;
-use IO::Compress::Zlib::Extra 2.040 ;
-use IO::Compress::Zip::Constants 2.040 ;
+use IO::Compress::Base::Common 2.042 qw(:Status createSelfTiedObject);
+use IO::Compress::RawDeflate 2.042 ;
+use IO::Compress::Adapter::Deflate 2.042 ;
+use IO::Compress::Adapter::Identity 2.042 ;
+use IO::Compress::Zlib::Extra 2.042 ;
+use IO::Compress::Zip::Constants 2.042 ;
use File::Spec();
+use Config;
-use Compress::Raw::Zlib 2.040 qw(crc32) ;
+use Compress::Raw::Zlib 2.042 qw(crc32) ;
BEGIN
{
eval { require IO::Compress::Adapter::Bzip2 ;
- import IO::Compress::Adapter::Bzip2 2.040 ;
+ import IO::Compress::Adapter::Bzip2 2.042 ;
require IO::Compress::Bzip2 ;
- import IO::Compress::Bzip2 2.040 ;
+ import IO::Compress::Bzip2 2.042 ;
} ;
eval { require IO::Compress::Adapter::Lzma ;
- import IO::Compress::Adapter::Lzma 2.036 ;
+ import IO::Compress::Adapter::Lzma 2.042 ;
require IO::Compress::Lzma ;
- import IO::Compress::Lzma 2.040 ;
+ import IO::Compress::Lzma 2.042 ;
} ;
}
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $ZipError);
-$VERSION = '2.040';
+$VERSION = '2.042';
$ZipError = '';
@ISA = qw(Exporter IO::Compress::RawDeflate);
$ctlExtra .= mkExtendedTime($param->value('MTime'));
}
- if ( $param->value('UID') && $osCode == ZIP_OS_CODE_UNIX)
+ if ( $osCode == ZIP_OS_CODE_UNIX )
{
- $extra .= mkUnix2Extra( $param->value('UID'), $param->value('GID'));
- $ctlExtra .= mkUnix2Extra();
+ if ( $param->value('want_exUnixN') )
+ {
+ my $ux3 = mkUnixNExtra( @{ $param->value('want_exUnixN') });
+ $extra .= $ux3;
+ $ctlExtra .= $ux3;
+ }
+
+ if ( $param->value('exUnix2') )
+ {
+ $extra .= mkUnix2Extra( @{ $param->value('exUnix2') });
+ $ctlExtra .= mkUnix2Extra();
+ }
}
$extFileAttr = $param->value('ExtAttr')
$got->value("CTime", $timeRef->[2]);
}
- # Unix2 Extended Attribute
- if ($got->parsed('exUnix2') ) {
- my $timeRef = $got->value('exUnix2');
- if ( defined $timeRef) {
- return $self->saveErrorString(undef, "exUnix2 not a 2-element array ref")
- if ref $timeRef ne 'ARRAY' || @$timeRef != 2;
+ # Unix2/3 Extended Attribute
+ for my $name (qw(exUnix2 exUnixN))
+ {
+ if ($got->parsed($name) ) {
+ my $idRef = $got->value($name);
+ if ( defined $idRef) {
+ return $self->saveErrorString(undef, "$name not a 2-element array ref")
+ if ref $idRef ne 'ARRAY' || @$idRef != 2;
+ }
+
+ $got->value("UID", $idRef->[0]);
+ $got->value("GID", $idRef->[1]);
+ $got->value("want_$name", $idRef);
}
-
- $got->value("UID", $timeRef->[0]);
- $got->value("GID", $timeRef->[1]);
}
*$self->{ZipData}{AnyZip64} = 1
{
my $self = shift ;
- use IO::Compress::Base::Common 2.040 qw(:Parse);
- use Compress::Raw::Zlib 2.040 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
+ use IO::Compress::Base::Common 2.042 qw(:Parse);
+ use Compress::Raw::Zlib 2.042 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
my @Bzip2 = ();
'Time' => [0, 1, Parse_any, undef],
'exTime' => [0, 1, Parse_any, undef],
'exUnix2' => [0, 1, Parse_any, undef],
+ 'exUnixN' => [0, 1, Parse_any, undef],
'ExtAttr' => [0, 1, Parse_any,
$Compress::Raw::Zlib::gzip_os_code == 3
? 0100644 << 16
$params->value('ExtAttr' => $attr);
}
+ $params->value('want_exUnixN', [$uid, $gid]);
$params->value('UID' => $uid) ;
$params->value('GID' => $gid) ;
$ids);
}
+sub mkUnixNExtra
+{
+ my $uid = shift;
+ my $gid = shift;
+
+ # Assumes UID/GID are 32-bit
+ my $ids ;
+ $ids .= pack "C", 1; # version
+ $ids .= pack "C", $Config{uidsize};
+ $ids .= pack "V", $uid;
+ $ids .= pack "C", $Config{gidsize};
+ $ids .= pack "V", $gid;
+
+ return IO::Compress::Zlib::Extra::mkSubField(ZIP_EXTRA_ID_INFO_ZIP_UNIXN,
+ $ids);
+}
+
# from Archive::Zip
sub _unixToDosTime # Archive::Zip::Member
If the C<$input> parameter is any other type, C<undef> will be returned.
In addition, if C<$input> is a simple filename, the default values for
-the C<Name>, C<Time>, C<ExtAttr> and C<exTime> options will be sourced from that file.
+the C<Name>, C<Time>, C<ExtAttr>, C<exUnixN> and C<exTime> options will be sourced from that file.
If you do not want to use these defaults they can be overridden by
-explicitly setting the C<Name>, C<Time>, C<ExtAttr> and C<exTime> options or by setting the
+explicitly setting the C<Name>, C<Time>, C<ExtAttr>, C<exUnixN> and C<exTime> options or by setting the
C<Minimal> parameter.
=head3 The C<$output> parameter
=item C<< exUnix2 => [$uid, $gid] >>
This option expects an array reference with exactly two elements: C<$uid>
-and C<$gid>. These values correspond to the numeric user ID and group ID
-of the owner of the files respectively.
+and C<$gid>. These values correspond to the numeric User ID (UID) and Group ID
+(GID) of the owner of the files respectively.
When the C<exUnix2> option is present it will trigger the creation of a
-Unix2 extra field (ID is "Ux") in the local zip. This will be populated
-with C<$uid> and C<$gid>. In addition an empty Unix2 extra field will also
-be created in the central zip header
+Unix2 extra field (ID is "Ux") in the local zip header. This will be populated
+with C<$uid> and C<$gid>. An empty Unix2 extra field will also
+be created in the central zip header.
+
+Note - The UID & GID are stored as 16-bit
+integers in the "Ux" field. Use C<< exUnixN >> if your UID or GID are
+32-bit.
If the C<Minimal> option is set to true, this option will be ignored.
By default no Unix2 extra field is created.
+=item C<< exUnixN => [$uid, $gid] >>
+
+This option expects an array reference with exactly two elements: C<$uid>
+and C<$gid>. These values correspond to the numeric User ID (UID) and Group ID
+(GID) of the owner of the files respectively.
+
+When the C<exUnixN> option is present it will trigger the creation of a
+UnixN extra field (ID is "ux") in bothe the local and central zip headers.
+This will be populated with C<$uid> and C<$gid>.
+The UID & GID are stored as 32-bit integers.
+
+If the C<Minimal> option is set to true, this option will be ignored.
+
+By default no UnixN extra field is created.
+
=item C<< Comment => $comment >>
Stores the contents of C<$comment> in the Central File Header of
ExtraField => $rawdata
+In this case C<IO::Compress::Zip> will check that C<$rawdata> consists of
+zero or more conformant sub-fields.
+
The Extended Time field (ID "UT"), set using the C<exTime> option, and the
Unix2 extra field (ID "Ux), set using the C<exUnix2> option, are examples
of extra fields.
If specified, this option will disable the creation of all extra fields
in the zip local and central headers. So the C<exTime>, C<exUnix2>,
-C<ExtraFieldLocal> and C<ExtraFieldCentral> options will be ignored.
+C<exUnixN>, C<ExtraFieldLocal> and C<ExtraFieldCentral> options will
+be ignored.
This parameter defaults to 0.
our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS);
-$VERSION = '2.040';
+$VERSION = '2.042';
@ISA = qw(Exporter);
ZIP_EXTRA_ID_ZIP64
ZIP_EXTRA_ID_EXT_TIMESTAMP
ZIP_EXTRA_ID_INFO_ZIP_UNIX2
- ZIP_EXTRA_ID_INFO_ZIP_UNIXn
+ ZIP_EXTRA_ID_INFO_ZIP_UNIXN
ZIP_EXTRA_ID_INFO_ZIP_Upath
ZIP_EXTRA_ID_INFO_ZIP_Ucom
ZIP_EXTRA_ID_JAVA_EXE
use constant ZIP_EXTRA_ID_ZIP64 => pack "v", 1;
use constant ZIP_EXTRA_ID_EXT_TIMESTAMP => "UT";
use constant ZIP_EXTRA_ID_INFO_ZIP_UNIX2 => "Ux";
-use constant ZIP_EXTRA_ID_INFO_ZIP_UNIXn => "ux";
+use constant ZIP_EXTRA_ID_INFO_ZIP_UNIXN => "ux";
use constant ZIP_EXTRA_ID_INFO_ZIP_Upath => "up";
use constant ZIP_EXTRA_ID_INFO_ZIP_Ucom => "uc";
use constant ZIP_EXTRA_ID_JAVA_EXE => pack "v", 0xCAFE;
our ($VERSION, @ISA, @EXPORT);
-$VERSION = '2.040';
+$VERSION = '2.042';
@ISA = qw(Exporter);
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS);
-$VERSION = '2.040';
+$VERSION = '2.042';
-use IO::Compress::Gzip::Constants 2.040 ;
+use IO::Compress::Gzip::Constants 2.042 ;
sub ExtraFieldError
{
return parseRawExtra($dataRef, undef, 1, $gzipMode);
}
- #my $data = $$dataRef;
my $data = $dataRef;
my $out = '' ;
return ExtraFieldError("Not even number of elements")
unless @$data % 2 == 0;
- for (my $ix = 0; $ix <= length(@$data) -1 ; $ix += 2) {
+ for (my $ix = 0; $ix <= @$data -1 ; $ix += 2) {
my $bad = validateExtraFieldPair([$data->[$ix],
$data->[$ix+1]],
$strict, $gzipMode) ;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.040 qw(:Status);
+use IO::Compress::Base::Common 2.042 qw(:Status);
-use Compress::Raw::Bzip2 2.040 ;
+use Compress::Raw::Bzip2 2.042 ;
our ($VERSION, @ISA);
-$VERSION = '2.040';
+$VERSION = '2.042';
sub mkUncompObject
{
use strict;
use bytes;
-use IO::Compress::Base::Common 2.040 qw(:Status);
+use IO::Compress::Base::Common 2.042 qw(:Status);
use IO::Compress::Zip::Constants ;
our ($VERSION);
-$VERSION = '2.040';
+$VERSION = '2.042';
-use Compress::Raw::Zlib 2.040 ();
+use Compress::Raw::Zlib 2.042 ();
sub mkUncompObject
{
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.040 qw(:Status);
-use Compress::Raw::Zlib 2.040 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
+use IO::Compress::Base::Common 2.042 qw(:Status);
+use Compress::Raw::Zlib 2.042 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
our ($VERSION);
-$VERSION = '2.040';
+$VERSION = '2.042';
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.040 qw(createSelfTiedObject);
+use IO::Compress::Base::Common 2.042 qw(createSelfTiedObject);
-use IO::Uncompress::Adapter::Inflate 2.040 ();
+use IO::Uncompress::Adapter::Inflate 2.042 ();
-use IO::Uncompress::Base 2.040 ;
-use IO::Uncompress::Gunzip 2.040 ;
-use IO::Uncompress::Inflate 2.040 ;
-use IO::Uncompress::RawInflate 2.040 ;
-use IO::Uncompress::Unzip 2.040 ;
+use IO::Uncompress::Base 2.042 ;
+use IO::Uncompress::Gunzip 2.042 ;
+use IO::Uncompress::Inflate 2.042 ;
+use IO::Uncompress::RawInflate 2.042 ;
+use IO::Uncompress::Unzip 2.042 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError);
-$VERSION = '2.040';
+$VERSION = '2.042';
$AnyInflateError = '';
@ISA = qw( Exporter IO::Uncompress::Base );
sub getExtraParams
{
- use IO::Compress::Base::Common 2.040 qw(:Parse);
+ use IO::Compress::Base::Common 2.042 qw(:Parse);
return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ) ;
}
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.040 qw(createSelfTiedObject);
+use IO::Compress::Base::Common 2.042 qw(createSelfTiedObject);
-use IO::Uncompress::Base 2.040 ;
+use IO::Uncompress::Base 2.042 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
-$VERSION = '2.040';
+$VERSION = '2.042';
$AnyUncompressError = '';
@ISA = qw( Exporter IO::Uncompress::Base );
BEGIN
{
- eval ' use IO::Uncompress::Adapter::Inflate 2.040 ;';
- eval ' use IO::Uncompress::Adapter::Bunzip2 2.040 ;';
- eval ' use IO::Uncompress::Adapter::LZO 2.040 ;';
- eval ' use IO::Uncompress::Adapter::Lzf 2.040 ;';
- eval ' use IO::Uncompress::Adapter::UnLzma 2.020 ;';
- eval ' use IO::Uncompress::Adapter::UnXz 2.020 ;';
-
- eval ' use IO::Uncompress::Bunzip2 2.040 ;';
- eval ' use IO::Uncompress::UnLzop 2.040 ;';
- eval ' use IO::Uncompress::Gunzip 2.040 ;';
- eval ' use IO::Uncompress::Inflate 2.040 ;';
- eval ' use IO::Uncompress::RawInflate 2.040 ;';
- eval ' use IO::Uncompress::Unzip 2.040 ;';
- eval ' use IO::Uncompress::UnLzf 2.040 ;';
- eval ' use IO::Uncompress::UnLzma 2.040 ;';
- eval ' use IO::Uncompress::UnXz 2.040 ;';
+ eval ' use IO::Uncompress::Adapter::Inflate 2.042 ;';
+ eval ' use IO::Uncompress::Adapter::Bunzip2 2.042 ;';
+ eval ' use IO::Uncompress::Adapter::LZO 2.042 ;';
+ eval ' use IO::Uncompress::Adapter::Lzf 2.042 ;';
+ eval ' use IO::Uncompress::Adapter::UnLzma 2.042 ;';
+ eval ' use IO::Uncompress::Adapter::UnXz 2.042 ;';
+
+ eval ' use IO::Uncompress::Bunzip2 2.042 ;';
+ eval ' use IO::Uncompress::UnLzop 2.042 ;';
+ eval ' use IO::Uncompress::Gunzip 2.042 ;';
+ eval ' use IO::Uncompress::Inflate 2.042 ;';
+ eval ' use IO::Uncompress::RawInflate 2.042 ;';
+ eval ' use IO::Uncompress::Unzip 2.042 ;';
+ eval ' use IO::Uncompress::UnLzf 2.042 ;';
+ eval ' use IO::Uncompress::UnLzma 2.042 ;';
+ eval ' use IO::Uncompress::UnXz 2.042 ;';
}
sub new
sub getExtraParams
{
- use IO::Compress::Base::Common 2.040 qw(:Parse);
+ use IO::Compress::Base::Common 2.042 qw(:Parse);
return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ,
'UnLzma' => [1, 1, Parse_boolean, 0] ) ;
}
@ISA = qw(Exporter IO::File);
-$VERSION = '2.040';
+$VERSION = '2.042';
use constant G_EOF => 0 ;
use constant G_ERR => -1 ;
-use IO::Compress::Base::Common 2.040 ;
+use IO::Compress::Base::Common 2.042 ;
use IO::File ;
use Symbol;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.040 qw(:Status createSelfTiedObject);
+use IO::Compress::Base::Common 2.042 qw(:Status createSelfTiedObject);
-use IO::Uncompress::Base 2.040 ;
-use IO::Uncompress::Adapter::Bunzip2 2.040 ;
+use IO::Uncompress::Base 2.042 ;
+use IO::Uncompress::Adapter::Bunzip2 2.042 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error);
-$VERSION = '2.040';
+$VERSION = '2.042';
$Bunzip2Error = '';
@ISA = qw( Exporter IO::Uncompress::Base );
{
my $self = shift ;
- use IO::Compress::Base::Common 2.040 qw(:Parse);
+ use IO::Compress::Base::Common 2.042 qw(:Parse);
return (
'Verbosity' => [1, 1, Parse_boolean, 0],
use warnings;
use bytes;
-use IO::Uncompress::RawInflate 2.040 ;
+use IO::Uncompress::RawInflate 2.042 ;
-use Compress::Raw::Zlib 2.040 qw( crc32 ) ;
-use IO::Compress::Base::Common 2.040 qw(:Status createSelfTiedObject);
-use IO::Compress::Gzip::Constants 2.040 ;
-use IO::Compress::Zlib::Extra 2.040 ;
+use Compress::Raw::Zlib 2.042 qw( crc32 ) ;
+use IO::Compress::Base::Common 2.042 qw(:Status createSelfTiedObject);
+use IO::Compress::Gzip::Constants 2.042 ;
+use IO::Compress::Zlib::Extra 2.042 ;
require Exporter ;
$GunzipError = '';
-$VERSION = '2.040';
+$VERSION = '2.042';
sub new
{
sub getExtraParams
{
- use IO::Compress::Base::Common 2.040 qw(:Parse);
+ use IO::Compress::Base::Common 2.042 qw(:Parse);
return ( 'ParseExtra' => [1, 1, Parse_boolean, 0] ) ;
}
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.040 qw(:Status createSelfTiedObject);
-use IO::Compress::Zlib::Constants 2.040 ;
+use IO::Compress::Base::Common 2.042 qw(:Status createSelfTiedObject);
+use IO::Compress::Zlib::Constants 2.042 ;
-use IO::Uncompress::RawInflate 2.040 ;
+use IO::Uncompress::RawInflate 2.042 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError);
-$VERSION = '2.040';
+$VERSION = '2.042';
$InflateError = '';
@ISA = qw( Exporter IO::Uncompress::RawInflate );
use warnings;
use bytes;
-use Compress::Raw::Zlib 2.040 ;
-use IO::Compress::Base::Common 2.040 qw(:Status createSelfTiedObject);
+use Compress::Raw::Zlib 2.042 ;
+use IO::Compress::Base::Common 2.042 qw(:Status createSelfTiedObject);
-use IO::Uncompress::Base 2.040 ;
-use IO::Uncompress::Adapter::Inflate 2.040 ;
+use IO::Uncompress::Base 2.042 ;
+use IO::Uncompress::Adapter::Inflate 2.042 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError);
-$VERSION = '2.040';
+$VERSION = '2.042';
$RawInflateError = '';
@ISA = qw( Exporter IO::Uncompress::Base );
use bytes;
use IO::File;
-use IO::Uncompress::RawInflate 2.040 ;
-use IO::Compress::Base::Common 2.040 qw(:Status createSelfTiedObject);
-use IO::Uncompress::Adapter::Inflate 2.040 ;
-use IO::Uncompress::Adapter::Identity 2.040 ;
-use IO::Compress::Zlib::Extra 2.040 ;
-use IO::Compress::Zip::Constants 2.040 ;
+use IO::Uncompress::RawInflate 2.042 ;
+use IO::Compress::Base::Common 2.042 qw(:Status createSelfTiedObject);
+use IO::Uncompress::Adapter::Inflate 2.042 ;
+use IO::Uncompress::Adapter::Identity 2.042 ;
+use IO::Compress::Zlib::Extra 2.042 ;
+use IO::Compress::Zip::Constants 2.042 ;
-use Compress::Raw::Zlib 2.040 qw(crc32) ;
+use Compress::Raw::Zlib 2.042 qw(crc32) ;
BEGIN
{
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup);
-$VERSION = '2.040';
+$VERSION = '2.042';
$UnzipError = '';
@ISA = qw(Exporter IO::Uncompress::RawInflate);
sub getExtraParams
{
- use IO::Compress::Base::Common 2.040 qw(:Parse);
+ use IO::Compress::Base::Common 2.042 qw(:Parse);
return (
if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 };
- my $VERSION = '2.040';
+ my $VERSION = '2.042';
my @NAMES = qw(
Compress::Raw::Bzip2
Compress::Raw::Zlib
if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 };
- plan tests => 915 + $extra ;
+ plan tests => 918 + $extra ;
use_ok('Compress::Raw::Zlib') ;
use_ok('IO::Compress::Gzip::Constants') ;
}
}
+
+ {
+ # RT #72329
+ my $error = 'Error with ExtraField Parameter: ' .
+ 'SubField ID not two chars long' ;
+ my $buffer ;
+ my $x ;
+ eval { $x = new IO::Compress::Gzip \$buffer,
+ -ExtraField => [ at => 'mouse', bad => 'dog'] ;
+ };
+ like $@, mkErr("$error");
+ like $GzipError, "/$error/";
+ ok ! $x ;
+ }
}
}
# Handle spaces in path to gzip
- $GZIP = "\"$GZIP\"" if $GZIP =~ /\s/;
+ $GZIP = "\"$GZIP\"" if defined $GZIP && $GZIP =~ /\s/;
plan(skip_all => "Cannot find $name")
if ! $GZIP ;
=item *
-L<Compress::Zlib> has been upgraded from version 2.037 to version 2.040.
+L<Compress::Zlib> has been upgraded from version 2.037 to version 2.042.
=item *
projects / platform / upstream / perl.git / commitdiff