r20199 - in /branches/upstream/libio-compress-zlib-perl/current: ./ lib/IO/Compress/ lib/IO/Compress/Adapter/ lib/IO/Compress/Gzip/ lib/IO/Compress/Zip/ lib/IO/Compress/Zlib/ lib/IO/Uncompress/ lib/IO/Uncompress/Adapter/ t/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Mon May 19 19:30:47 UTC 2008
Author: gregoa
Date: Mon May 19 19:30:46 2008
New Revision: 20199
URL: http://svn.debian.org/wsvn/?sc=1&rev=20199
Log:
[svn-upgrade] Integrating new upstream version, libio-compress-zlib-perl (2.011)
Added:
branches/upstream/libio-compress-zlib-perl/current/t/006zip.t
Modified:
branches/upstream/libio-compress-zlib-perl/current/Changes
branches/upstream/libio-compress-zlib-perl/current/MANIFEST
branches/upstream/libio-compress-zlib-perl/current/META.yml
branches/upstream/libio-compress-zlib-perl/current/Makefile.PL
branches/upstream/libio-compress-zlib-perl/current/README
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Adapter/Deflate.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Adapter/Identity.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Deflate.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Gzip.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Gzip/Constants.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/RawDeflate.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zip.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zip/Constants.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zlib/Constants.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zlib/Extra.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Adapter/Identity.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Adapter/Inflate.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/AnyInflate.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Gunzip.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Inflate.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/RawInflate.pm
branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Unzip.pm
branches/upstream/libio-compress-zlib-perl/current/t/000prereq.t
Modified: branches/upstream/libio-compress-zlib-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/Changes?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/Changes (original)
+++ branches/upstream/libio-compress-zlib-perl/current/Changes Mon May 19 19:30:46 2008
@@ -1,5 +1,15 @@
CHANGES
-------
+
+ 2.011 17 May 2008
+
+ * IO::Uncompress::Unzip
+ - Print an error message if the zip file contains a
+ member compressed with bzip2 and IO::Uncompress::Bunzip2 is
+ not available.
+ - Could not cope with mixed compression zip files. For example a
+ zip file that contains both STORED and DEFLATED content.
+ [RT #35573]
2.010 5 May 2008
Modified: branches/upstream/libio-compress-zlib-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/MANIFEST?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/MANIFEST (original)
+++ branches/upstream/libio-compress-zlib-perl/current/MANIFEST Mon May 19 19:30:46 2008
@@ -34,6 +34,7 @@
t/002any-zip.t
t/004gziphdr.t
t/005defhdr.t
+t/006zip.t
t/010examples.t
t/020isize.t
t/050interop-gzip.t
Modified: branches/upstream/libio-compress-zlib-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/META.yml?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/META.yml (original)
+++ branches/upstream/libio-compress-zlib-perl/current/META.yml Mon May 19 19:30:46 2008
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: IO-Compress-Zlib
-version: 2.010
+version: 2.011
abstract: Perl interface to zlib
license: perl
author:
@@ -8,9 +8,9 @@
generated_by: ExtUtils::MakeMaker version 6.44
distribution_type: module
requires:
- Compress::Raw::Zlib: 2.010
- IO::Compress::Base: 2.010
- IO::Uncompress::Base: 2.010
+ Compress::Raw::Zlib: 2.011
+ IO::Compress::Base: 2.011
+ IO::Uncompress::Base: 2.011
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.3.html
version: 1.3
Modified: branches/upstream/libio-compress-zlib-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/Makefile.PL?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/Makefile.PL (original)
+++ branches/upstream/libio-compress-zlib-perl/current/Makefile.PL Mon May 19 19:30:46 2008
@@ -3,7 +3,7 @@
use strict ;
require 5.004 ;
-$::VERSION = '2.010' ;
+$::VERSION = '2.011' ;
use private::MakeUtil;
use ExtUtils::MakeMaker 5.16 ;
Modified: branches/upstream/libio-compress-zlib-perl/current/README
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/README?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/README (original)
+++ branches/upstream/libio-compress-zlib-perl/current/README Mon May 19 19:30:46 2008
@@ -1,9 +1,9 @@
IO-Compress-Zlib
- Version 2.010
+ Version 2.011
- 5th May 2008
+ 17th May 2008
Copyright (c) 2005-2008 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it
@@ -93,7 +93,7 @@
If you haven't installed IO-Compress-Zlib then search IO::Compress::Gzip.pm
for a line like this:
- $VERSION = "2.010" ;
+ $VERSION = "2.011" ;
2. If you are having problems building IO-Compress-Zlib, send me a
complete log of what happened. Start by unpacking the IO-Compress-Zlib
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Adapter/Deflate.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Adapter/Deflate.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Adapter/Deflate.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Adapter/Deflate.pm Mon May 19 19:30:46 2008
@@ -4,12 +4,12 @@
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.010 qw(:Status);
+use IO::Compress::Base::Common 2.011 qw(:Status);
-use Compress::Raw::Zlib 2.010 qw(Z_OK Z_FINISH MAX_WBITS) ;
+use Compress::Raw::Zlib 2.011 qw(Z_OK Z_FINISH MAX_WBITS) ;
our ($VERSION);
-$VERSION = '2.010';
+$VERSION = '2.011';
sub mkCompObject
{
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Adapter/Identity.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Adapter/Identity.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Adapter/Identity.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Adapter/Identity.pm Mon May 19 19:30:46 2008
@@ -4,10 +4,10 @@
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.010 qw(:Status);
+use IO::Compress::Base::Common 2.011 qw(:Status);
our ($VERSION);
-$VERSION = '2.010';
+$VERSION = '2.011';
sub mkCompObject
{
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Deflate.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Deflate.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Deflate.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Deflate.pm Mon May 19 19:30:46 2008
@@ -6,16 +6,16 @@
require Exporter ;
-use IO::Compress::RawDeflate 2.010 ;
-
-use Compress::Raw::Zlib 2.010 ;
-use IO::Compress::Zlib::Constants 2.010 ;
-use IO::Compress::Base::Common 2.010 qw(createSelfTiedObject);
+use IO::Compress::RawDeflate 2.011 ;
+
+use Compress::Raw::Zlib 2.011 ;
+use IO::Compress::Zlib::Constants 2.011 ;
+use IO::Compress::Base::Common 2.011 qw(createSelfTiedObject);
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $DeflateError);
-$VERSION = '2.010';
+$VERSION = '2.011';
$DeflateError = '';
@ISA = qw(Exporter IO::Compress::RawDeflate);
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Gzip.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Gzip.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Gzip.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Gzip.pm Mon May 19 19:30:46 2008
@@ -8,12 +8,12 @@
use bytes;
-use IO::Compress::RawDeflate 2.010 ;
-
-use Compress::Raw::Zlib 2.010 ;
-use IO::Compress::Base::Common 2.010 qw(:Status :Parse createSelfTiedObject);
-use IO::Compress::Gzip::Constants 2.010 ;
-use IO::Compress::Zlib::Extra 2.010 ;
+use IO::Compress::RawDeflate 2.011 ;
+
+use Compress::Raw::Zlib 2.011 ;
+use IO::Compress::Base::Common 2.011 qw(:Status :Parse createSelfTiedObject);
+use IO::Compress::Gzip::Constants 2.011 ;
+use IO::Compress::Zlib::Extra 2.011 ;
BEGIN
{
@@ -27,7 +27,7 @@
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $GzipError);
-$VERSION = '2.010';
+$VERSION = '2.011';
$GzipError = '' ;
@ISA = qw(Exporter IO::Compress::RawDeflate);
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Gzip/Constants.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Gzip/Constants.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Gzip/Constants.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Gzip/Constants.pm Mon May 19 19:30:46 2008
@@ -9,7 +9,7 @@
our ($VERSION, @ISA, @EXPORT, %GZIP_OS_Names);
our ($GZIP_FNAME_INVALID_CHAR_RE, $GZIP_FCOMMENT_INVALID_CHAR_RE);
-$VERSION = '2.010';
+$VERSION = '2.011';
@ISA = qw(Exporter);
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/RawDeflate.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/RawDeflate.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/RawDeflate.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/RawDeflate.pm Mon May 19 19:30:46 2008
@@ -7,16 +7,16 @@
use bytes;
-use IO::Compress::Base 2.010 ;
-use IO::Compress::Base::Common 2.010 qw(:Status createSelfTiedObject);
-use IO::Compress::Adapter::Deflate 2.010 ;
+use IO::Compress::Base 2.011 ;
+use IO::Compress::Base::Common 2.011 qw(:Status createSelfTiedObject);
+use IO::Compress::Adapter::Deflate 2.011 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError);
-$VERSION = '2.010';
+$VERSION = '2.011';
$RawDeflateError = '';
@ISA = qw(Exporter IO::Compress::Base);
@@ -92,7 +92,6 @@
sub mkComp
{
my $self = shift ;
- my $class = shift ;
my $got = shift ;
my ($obj, $errstr, $errno) = IO::Compress::Adapter::Deflate::mkCompObject(
@@ -143,8 +142,8 @@
{
my $self = shift ;
- use IO::Compress::Base::Common 2.010 qw(:Parse);
- use Compress::Raw::Zlib 2.010 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
+ use IO::Compress::Base::Common 2.011 qw(:Parse);
+ use Compress::Raw::Zlib 2.011 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
return (
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zip.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zip.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zip.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zip.pm Mon May 19 19:30:46 2008
@@ -4,21 +4,21 @@
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.010 qw(:Status createSelfTiedObject);
-use IO::Compress::RawDeflate 2.010 ;
-use IO::Compress::Adapter::Deflate 2.010 ;
-use IO::Compress::Adapter::Identity 2.010 ;
-use IO::Compress::Zlib::Extra 2.010 ;
-use IO::Compress::Zip::Constants 2.010 ;
-
-
-use Compress::Raw::Zlib 2.010 qw(crc32) ;
+use IO::Compress::Base::Common 2.011 qw(:Status createSelfTiedObject);
+use IO::Compress::RawDeflate 2.011 ;
+use IO::Compress::Adapter::Deflate 2.011 ;
+use IO::Compress::Adapter::Identity 2.011 ;
+use IO::Compress::Zlib::Extra 2.011 ;
+use IO::Compress::Zip::Constants 2.011 ;
+
+
+use Compress::Raw::Zlib 2.011 qw(crc32) ;
BEGIN
{
eval { require IO::Compress::Adapter::Bzip2 ;
- import IO::Compress::Adapter::Bzip2 2.010 ;
+ import IO::Compress::Adapter::Bzip2 2.011 ;
require IO::Compress::Bzip2 ;
- import IO::Compress::Bzip2 2.010 ;
+ import IO::Compress::Bzip2 2.011 ;
} ;
}
@@ -27,7 +27,7 @@
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $ZipError);
-$VERSION = '2.010';
+$VERSION = '2.011';
$ZipError = '';
@ISA = qw(Exporter IO::Compress::RawDeflate);
@@ -57,7 +57,6 @@
sub mkComp
{
my $self = shift ;
- my $class = shift ;
my $got = shift ;
my ($obj, $errstr, $errno) ;
@@ -453,8 +452,8 @@
{
my $self = shift ;
- use IO::Compress::Base::Common 2.010 qw(:Parse);
- use Compress::Raw::Zlib 2.010 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
+ use IO::Compress::Base::Common 2.011 qw(:Parse);
+ use Compress::Raw::Zlib 2.011 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
my @Bzip2 = ();
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zip/Constants.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zip/Constants.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zip/Constants.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zip/Constants.pm Mon May 19 19:30:46 2008
@@ -7,7 +7,7 @@
our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS);
-$VERSION = '2.010';
+$VERSION = '2.011';
@ISA = qw(Exporter);
@@ -33,6 +33,7 @@
ZIP_GP_FLAG_PATCHED_MASK
ZIP_GP_FLAG_STRONG_ENCRYPTED_MASK
ZIP_GP_FLAG_LZMA_EOS_PRESENT
+ ZIP_GP_FLAG_LANGUAGE_ENCODING
ZIP_EXTRA_ID_ZIP64
ZIP_EXTRA_ID_EXT_TIMESTAMP
@@ -83,6 +84,7 @@
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_JAVA_EXE => pack "v", 0xCAFE;
use constant ZIP64_MIN_VERSION => 45;
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zlib/Constants.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zlib/Constants.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zlib/Constants.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zlib/Constants.pm Mon May 19 19:30:46 2008
@@ -9,7 +9,7 @@
our ($VERSION, @ISA, @EXPORT);
-$VERSION = '2.010';
+$VERSION = '2.011';
@ISA = qw(Exporter);
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zlib/Extra.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zlib/Extra.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zlib/Extra.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Compress/Zlib/Extra.pm Mon May 19 19:30:46 2008
@@ -8,9 +8,9 @@
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS);
-$VERSION = '2.010';
+$VERSION = '2.011';
-use IO::Compress::Gzip::Constants 2.010 ;
+use IO::Compress::Gzip::Constants 2.011 ;
sub ExtraFieldError
{
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Adapter/Identity.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Adapter/Identity.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Adapter/Identity.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Adapter/Identity.pm Mon May 19 19:30:46 2008
@@ -4,13 +4,13 @@
use strict;
use bytes;
-use IO::Compress::Base::Common 2.010 qw(:Status);
+use IO::Compress::Base::Common 2.011 qw(:Status);
our ($VERSION);
-$VERSION = '2.010';
+$VERSION = '2.011';
-use Compress::Raw::Zlib 2.010 ();
+use Compress::Raw::Zlib 2.011 ();
sub mkUncompObject
{
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Adapter/Inflate.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Adapter/Inflate.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Adapter/Inflate.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Adapter/Inflate.pm Mon May 19 19:30:46 2008
@@ -4,11 +4,11 @@
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.010 qw(:Status);
-use Compress::Raw::Zlib 2.010 qw(Z_OK Z_DATA_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
+use IO::Compress::Base::Common 2.011 qw(:Status);
+use Compress::Raw::Zlib 2.011 qw(Z_OK Z_DATA_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
our ($VERSION);
-$VERSION = '2.010';
+$VERSION = '2.011';
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/AnyInflate.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/AnyInflate.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/AnyInflate.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/AnyInflate.pm Mon May 19 19:30:46 2008
@@ -6,22 +6,22 @@
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.010 qw(createSelfTiedObject);
-
-use IO::Uncompress::Adapter::Inflate 2.010 ();
-
-
-use IO::Uncompress::Base 2.010 ;
-use IO::Uncompress::Gunzip 2.010 ;
-use IO::Uncompress::Inflate 2.010 ;
-use IO::Uncompress::RawInflate 2.010 ;
-use IO::Uncompress::Unzip 2.010 ;
+use IO::Compress::Base::Common 2.011 qw(createSelfTiedObject);
+
+use IO::Uncompress::Adapter::Inflate 2.011 ();
+
+
+use IO::Uncompress::Base 2.011 ;
+use IO::Uncompress::Gunzip 2.011 ;
+use IO::Uncompress::Inflate 2.011 ;
+use IO::Uncompress::RawInflate 2.011 ;
+use IO::Uncompress::Unzip 2.011 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError);
-$VERSION = '2.010';
+$VERSION = '2.011';
$AnyInflateError = '';
@ISA = qw( Exporter IO::Uncompress::Base );
@@ -48,7 +48,7 @@
sub getExtraParams
{
- use IO::Compress::Base::Common 2.010 qw(:Parse);
+ use IO::Compress::Base::Common 2.011 qw(:Parse);
return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ) ;
}
@@ -67,7 +67,6 @@
sub mkUncomp
{
my $self = shift ;
- my $class = shift ;
my $got = shift ;
my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::Inflate::mkUncompObject();
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Gunzip.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Gunzip.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Gunzip.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Gunzip.pm Mon May 19 19:30:46 2008
@@ -9,12 +9,12 @@
use warnings;
use bytes;
-use IO::Uncompress::RawInflate 2.010 ;
-
-use Compress::Raw::Zlib 2.010 qw( crc32 ) ;
-use IO::Compress::Base::Common 2.010 qw(:Status createSelfTiedObject);
-use IO::Compress::Gzip::Constants 2.010 ;
-use IO::Compress::Zlib::Extra 2.010 ;
+use IO::Uncompress::RawInflate 2.011 ;
+
+use Compress::Raw::Zlib 2.011 qw( crc32 ) ;
+use IO::Compress::Base::Common 2.011 qw(:Status createSelfTiedObject);
+use IO::Compress::Gzip::Constants 2.011 ;
+use IO::Compress::Zlib::Extra 2.011 ;
require Exporter ;
@@ -28,7 +28,7 @@
$GunzipError = '';
-$VERSION = '2.010';
+$VERSION = '2.011';
sub new
{
@@ -47,7 +47,7 @@
sub getExtraParams
{
- use IO::Compress::Base::Common 2.010 qw(:Parse);
+ use IO::Compress::Base::Common 2.011 qw(:Parse);
return ( 'ParseExtra' => [1, 1, Parse_boolean, 0] ) ;
}
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Inflate.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Inflate.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Inflate.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Inflate.pm Mon May 19 19:30:46 2008
@@ -5,15 +5,15 @@
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.010 qw(:Status createSelfTiedObject);
-use IO::Compress::Zlib::Constants 2.010 ;
-
-use IO::Uncompress::RawInflate 2.010 ;
+use IO::Compress::Base::Common 2.011 qw(:Status createSelfTiedObject);
+use IO::Compress::Zlib::Constants 2.011 ;
+
+use IO::Uncompress::RawInflate 2.011 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError);
-$VERSION = '2.010';
+$VERSION = '2.011';
$InflateError = '';
@ISA = qw( Exporter IO::Uncompress::RawInflate );
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/RawInflate.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/RawInflate.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/RawInflate.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/RawInflate.pm Mon May 19 19:30:46 2008
@@ -5,11 +5,11 @@
use warnings;
use bytes;
-use Compress::Raw::Zlib 2.010 ;
-use IO::Compress::Base::Common 2.010 qw(:Status createSelfTiedObject);
-
-use IO::Uncompress::Base 2.010 ;
-use IO::Uncompress::Adapter::Inflate 2.010 ;
+use Compress::Raw::Zlib 2.011 ;
+use IO::Compress::Base::Common 2.011 qw(:Status createSelfTiedObject);
+
+use IO::Uncompress::Base 2.011 ;
+use IO::Uncompress::Adapter::Inflate 2.011 ;
@@ -17,7 +17,7 @@
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError);
-$VERSION = '2.010';
+$VERSION = '2.011';
$RawInflateError = '';
@ISA = qw( Exporter IO::Uncompress::Base );
@@ -58,7 +58,6 @@
sub mkUncomp
{
my $self = shift ;
- my $class = shift ;
my $got = shift ;
my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::Inflate::mkUncompObject(
Modified: branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Unzip.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Unzip.pm?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Unzip.pm (original)
+++ branches/upstream/libio-compress-zlib-perl/current/lib/IO/Uncompress/Unzip.pm Mon May 19 19:30:46 2008
@@ -8,13 +8,14 @@
use warnings;
use bytes;
-use IO::Uncompress::RawInflate 2.010 ;
-use IO::Compress::Base::Common 2.010 qw(:Status createSelfTiedObject);
-use IO::Uncompress::Adapter::Identity 2.010 ;
-use IO::Compress::Zlib::Extra 2.010 ;
-use IO::Compress::Zip::Constants 2.010 ;
-
-use Compress::Raw::Zlib 2.010 qw(crc32) ;
+use IO::Uncompress::RawInflate 2.011 ;
+use IO::Compress::Base::Common 2.011 qw(:Status createSelfTiedObject);
+use IO::Uncompress::Adapter::Inflate 2.011 ;
+use IO::Uncompress::Adapter::Identity 2.011 ;
+use IO::Compress::Zlib::Extra 2.011 ;
+use IO::Compress::Zip::Constants 2.011 ;
+
+use Compress::Raw::Zlib 2.011 qw(crc32) ;
BEGIN
{
@@ -27,7 +28,7 @@
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup);
-$VERSION = '2.010';
+$VERSION = '2.011';
$UnzipError = '';
@ISA = qw(Exporter IO::Uncompress::RawInflate);
@@ -60,7 +61,7 @@
sub getExtraParams
{
- use IO::Compress::Base::Common 2.010 qw(:Parse);
+ use IO::Compress::Base::Common 2.011 qw(:Parse);
return (
@@ -84,6 +85,20 @@
return 1;
}
+sub mkUncomp
+{
+ my $self = shift ;
+ my $got = shift ;
+
+ my $magic = $self->ckMagic()
+ or return 0;
+
+ *$self->{Info} = $self->readHeader($magic)
+ or return undef ;
+
+ return 1;
+
+}
sub ckMagic
{
@@ -585,19 +600,22 @@
if ($compressedMethod == ZIP_CM_DEFLATE)
{
*$self->{Type} = 'zip-deflate';
+ my $obj = IO::Uncompress::Adapter::Inflate::mkUncompObject(1,0,0);
+
+ *$self->{Uncomp} = $obj;
+ *$self->{ZipData}{CRC32} = crc32(undef);
}
elsif ($compressedMethod == ZIP_CM_BZIP2)
{
- #if (! defined $IO::Uncompress::Adapter::Bunzip2::VERSION)
+ return $self->HeaderError("Unsupported Compression format $compressedMethod")
+ if ! defined $IO::Uncompress::Adapter::Bunzip2::VERSION ;
*$self->{Type} = 'zip-bzip2';
- my $obj = IO::Uncompress::Adapter::Bunzip2::mkUncompObject(
- );
+ my $obj = IO::Uncompress::Adapter::Bunzip2::mkUncompObject();
*$self->{Uncomp} = $obj;
*$self->{ZipData}{CRC32} = crc32(undef);
-
}
elsif ($compressedMethod == ZIP_CM_STORE)
{
@@ -605,12 +623,9 @@
*$self->{Type} = 'zip-stored';
- my $obj = IO::Uncompress::Adapter::Identity::mkUncompObject(# $got->value('CRC32'),
- # $got->value('ADLER32'),
- );
+ my $obj = IO::Uncompress::Adapter::Identity::mkUncompObject();
*$self->{Uncomp} = $obj;
-
}
else
{
@@ -1402,9 +1417,11 @@
my $zipfile = "somefile.zip";
my $u = new IO::Uncompress::Unzip $zipfile
- or die "Cannot open $filefile: $UnzipError";
-
- for (my $status = 1; ! $u->eof(); $status = $u->nextStream())
+ or die "Cannot open $zipfile: $UnzipError";
+
+ my $status;
+ for ($status = 1; ! $u->eof(); $status = $u->nextStream())
+ {
my $name = $u->getHeaderInfo()->{Name};
warn "Processing member $name\n" ;
Modified: branches/upstream/libio-compress-zlib-perl/current/t/000prereq.t
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/t/000prereq.t?rev=20199&op=diff
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/t/000prereq.t (original)
+++ branches/upstream/libio-compress-zlib-perl/current/t/000prereq.t Mon May 19 19:30:46 2008
@@ -19,7 +19,7 @@
if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 };
- my $VERSION = '2.010';
+ my $VERSION = '2.011';
my @NAMES = qw(
Compress::Raw::Zlib
IO::Compress::Base
Added: branches/upstream/libio-compress-zlib-perl/current/t/006zip.t
URL: http://svn.debian.org/wsvn/branches/upstream/libio-compress-zlib-perl/current/t/006zip.t?rev=20199&op=file
==============================================================================
--- branches/upstream/libio-compress-zlib-perl/current/t/006zip.t (added)
+++ branches/upstream/libio-compress-zlib-perl/current/t/006zip.t Mon May 19 19:30:46 2008
@@ -1,0 +1,251 @@
+BEGIN {
+ if ($ENV{PERL_CORE}) {
+ chdir 't' if -d 't';
+ @INC = ("../lib", "lib/compress");
+ }
+}
+
+use lib qw(t t/compress);
+use strict;
+use warnings;
+use bytes;
+
+use Test::More ;
+use CompTestUtils;
+
+BEGIN {
+ # use Test::NoWarnings, if available
+ my $extra = 0 ;
+ $extra = 1
+ if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 };
+
+ plan tests => 62 + $extra ;
+
+ use_ok('IO::Compress::Zip', qw(:all)) ;
+ use_ok('IO::Uncompress::Unzip', qw(unzip $UnzipError)) ;
+
+ eval {
+ require IO::Compress::Bzip2 ;
+ import IO::Compress::Bzip2 2.010 ;
+ require IO::Uncompress::Bunzip2 ;
+ import IO::Uncompress::Bunzip2 2.010 ;
+ } ;
+
+}
+
+
+sub getContent
+{
+ my $filename = shift;
+
+ my $u = new IO::Uncompress::Unzip $filename, Append => 1
+ or die "Cannot open $filename: $UnzipError";
+
+ isa_ok $u, "IO::Uncompress::Unzip";
+
+ my @content;
+ my $status ;
+
+ for ($status = 1; ! $u->eof(); $status = $u->nextStream())
+ {
+
+ my $name = $u->getHeaderInfo()->{Name};
+ #warn "Processing member $name\n" ;
+
+ my $buff = '';
+ 1 while ($status = $u->read($buff)) > 0;
+
+ push @content, $buff;
+ last unless $status == 0;
+ }
+
+ die "Error processing $filename: $status $!\n"
+ if $status < 0 ;
+
+ return @content;
+}
+
+
+{
+ title "Create a simple zip - All Deflate";
+
+ my $lex = new LexFile my $file1;
+
+ my @content = (
+ 'hello',
+ '',
+ 'goodbye ',
+ );
+
+ my $zip = new IO::Compress::Zip $file1,
+ Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
+ isa_ok $zip, "IO::Compress::Zip";
+
+ is $zip->write($content[0]), length($content[0]), "write";
+ $zip->newStream(Name=> "two", Method => ZIP_CM_DEFLATE);
+ is $zip->write($content[1]), length($content[1]), "write";
+ $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
+ is $zip->write($content[2]), length($content[2]), "write";
+ ok $zip->close(), "closed";
+
+ my @got = getContent($file1);
+
+ is $got[0], $content[0], "Got 1st entry";
+ is $got[1], $content[1], "Got 2nd entry";
+ is $got[2], $content[2], "Got 3nd entry";
+}
+
+SKIP:
+{
+ title "Create a simple zip - All Bzip2";
+
+ skip "IO::Compress::Bzip2 not available", 9
+ unless defined $IO::Compress::Bzip2::VERSION;
+
+ my $lex = new LexFile my $file1;
+
+ my @content = (
+ 'hello',
+ '',
+ 'goodbye ',
+ );
+
+ my $zip = new IO::Compress::Zip $file1,
+ Name => "one", Method => ZIP_CM_BZIP2, Stream => 0;
+ isa_ok $zip, "IO::Compress::Zip";
+
+ is $zip->write($content[0]), length($content[0]), "write";
+ $zip->newStream(Name=> "two", Method => ZIP_CM_BZIP2);
+ is $zip->write($content[1]), length($content[1]), "write";
+ $zip->newStream(Name=> "three", Method => ZIP_CM_BZIP2);
+ is $zip->write($content[2]), length($content[2]), "write";
+ ok $zip->close(), "closed";
+
+ my @got = getContent($file1);
+
+ is $got[0], $content[0], "Got 1st entry";
+ is $got[1], $content[1], "Got 2nd entry";
+ is $got[2], $content[2], "Got 3nd entry";
+}
+
+SKIP:
+{
+ title "Create a simple zip - Deflate + Bzip2";
+
+ skip "IO::Compress::Bzip2 not available", 9
+ unless $IO::Compress::Bzip2::VERSION;
+
+ my $lex = new LexFile my $file1;
+
+ my @content = (
+ 'hello',
+ 'and',
+ 'goodbye ',
+ );
+
+ my $zip = new IO::Compress::Zip $file1,
+ Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
+ isa_ok $zip, "IO::Compress::Zip";
+
+ is $zip->write($content[0]), length($content[0]), "write";
+ $zip->newStream(Name=> "two", Method => ZIP_CM_BZIP2);
+ is $zip->write($content[1]), length($content[1]), "write";
+ $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
+ is $zip->write($content[2]), length($content[2]), "write";
+ ok $zip->close(), "closed";
+
+ my @got = getContent($file1);
+
+ is $got[0], $content[0], "Got 1st entry";
+ is $got[1], $content[1], "Got 2nd entry";
+ is $got[2], $content[2], "Got 3nd entry";
+}
+
+{
+ title "Create a simple zip - All STORE";
+
+ my $lex = new LexFile my $file1;
+
+ my @content = (
+ 'hello',
+ '',
+ 'goodbye ',
+ );
+
+ my $zip = new IO::Compress::Zip $file1,
+ Name => "one", Method => ZIP_CM_STORE, Stream => 0;
+ isa_ok $zip, "IO::Compress::Zip";
+
+ is $zip->write($content[0]), length($content[0]), "write";
+ $zip->newStream(Name=> "two", Method => ZIP_CM_STORE);
+ is $zip->write($content[1]), length($content[1]), "write";
+ $zip->newStream(Name=> "three", Method => ZIP_CM_STORE);
+ is $zip->write($content[2]), length($content[2]), "write";
+ ok $zip->close(), "closed";
+
+ my @got = getContent($file1);
+
+ is $got[0], $content[0], "Got 1st entry";
+ is $got[1], $content[1], "Got 2nd entry";
+ is $got[2], $content[2], "Got 3nd entry";
+}
+
+{
+ title "Create a simple zip - Deflate + STORE";
+
+ #my $lex = new LexFile my $file1;
+ my $file1 = "tryout.zip";
+
+ my @content = qw(
+ hello
+ and
+ goodbye
+ );
+
+ my $zip = new IO::Compress::Zip $file1,
+ Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
+ isa_ok $zip, "IO::Compress::Zip";
+
+ is $zip->write($content[0]), length($content[0]), "write";
+ $zip->newStream(Name=> "two", Method => ZIP_CM_STORE);
+ is $zip->write($content[1]), length($content[1]), "write";
+ $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
+ is $zip->write($content[2]), length($content[2]), "write";
+ ok $zip->close(), "closed";
+
+ my @got = getContent($file1);
+
+ is $got[0], $content[0], "Got 1st entry";
+ is $got[1], $content[1], "Got 2nd entry";
+ is $got[2], $content[2], "Got 3nd entry";
+}
+
+{
+ title "Create a simple zip - Deflate + zero length STORE";
+
+ my $lex = new LexFile my $file1;
+
+ my @content = (
+ 'hello ',
+ '',
+ 'goodbye ',
+ );
+
+ my $zip = new IO::Compress::Zip $file1,
+ Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0;
+ isa_ok $zip, "IO::Compress::Zip";
+
+ is $zip->write($content[0]), length($content[0]), "write";
+ $zip->newStream(Name=> "two", Method => ZIP_CM_STORE);
+ is $zip->write($content[1]), length($content[1]), "write";
+ $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE);
+ is $zip->write($content[2]), length($content[2]), "write";
+ ok $zip->close(), "closed";
+
+ my @got = getContent($file1);
+
+ is $got[0], $content[0], "Got 1st entry";
+ ok $got[1] eq $content[1], "Got 2nd entry";
+ is $got[2], $content[2], "Got 3nd entry";
+}
+
More information about the Pkg-perl-cvs-commits
mailing list