Front page | perl.perl5.changes |
Postings from January 2012
[perl.git] branch blead, updated. v5.15.7-107-g422d641
From:
Chris 'Bingos' Williams
Date:
January 28, 2012 17:18
Subject:
[perl.git] branch blead, updated. v5.15.7-107-g422d641
Message ID:
E1RrJPS-00076g-V3@camel.ams6.corp.booking.com
In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/422d6414d26e413a69e401207deaf53fb640b369?hp=bd1901c67e522749babb4c06e4343629529cdd17>
- Log -----------------------------------------------------------------
commit 422d6414d26e413a69e401207deaf53fb640b369
Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
Date: Sun Jan 29 00:24:18 2012 +0000
Update IO-Compress to CPAN version 2.047
[DELTA]
2.047 28 January 2012
* Set minimum Perl version to 5.6
* IO::Compress::Zip
- In one-shot zip, set the Text Flag if "-T" thinks the file is a
text file.
- In one-shot mode, wrote mod time & access time in wrong order
in the "UT" extended field.
M MANIFEST
M Porting/Maintainers.pl
M cpan/IO-Compress/Changes
M cpan/IO-Compress/Makefile.PL
M cpan/IO-Compress/README
M cpan/IO-Compress/bin/zipdetails
M cpan/IO-Compress/lib/Compress/Zlib.pm
M cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
M cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
M cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
M cpan/IO-Compress/lib/IO/Compress/Base.pm
M cpan/IO-Compress/lib/IO/Compress/Base/Common.pm
M cpan/IO-Compress/lib/IO/Compress/Bzip2.pm
M cpan/IO-Compress/lib/IO/Compress/Deflate.pm
M cpan/IO-Compress/lib/IO/Compress/FAQ.pod
M cpan/IO-Compress/lib/IO/Compress/Gzip.pm
M cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm
M cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
M cpan/IO-Compress/lib/IO/Compress/Zip.pm
M cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm
M cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm
M cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm
M cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
M cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
M cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
M cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
M cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
M cpan/IO-Compress/lib/IO/Uncompress/Base.pm
M cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
M cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm
M cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm
M cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm
M cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm
M cpan/IO-Compress/t/000prereq.t
M cpan/IO-Compress/t/006zip.t
A cpan/IO-Compress/t/111const-deflate.t
M cpan/IO-Compress/t/cz-03zlib-v1.t
M cpan/IO-Compress/t/cz-14gzopen.t
M pod/perldelta.pod
commit 589c1691425a4f9409b82065e346c2e82aeba331
Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
Date: Sun Jan 29 00:01:04 2012 +0000
Update Compress-Raw-Zlib to CPAN version 2.047
[DELTA]
2.047 28 January 2012
* Allow flush to be called multiple times without any intermediate
call to deflate and still return Z_OK.
In the code below $status was Z_BUF_ERROR before this change.
$def->flush(...);
$status = $def->flush(...);
* Added support for zlibCompileFlags
* Set minimum Perl version to 5.6
M Porting/Maintainers.pl
M cpan/Compress-Raw-Zlib/Changes
M cpan/Compress-Raw-Zlib/Makefile.PL
M cpan/Compress-Raw-Zlib/README
M cpan/Compress-Raw-Zlib/Zlib.xs
M cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm
M cpan/Compress-Raw-Zlib/t/02zlib.t
M pod/perldelta.pod
commit 76f546a2b3e45580650b74c8529f081a41f8af8b
Author: Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
Date: Sat Jan 28 23:56:05 2012 +0000
Update Compress-Raw-Bzip2 to CPAN version 2.047
[DELTA]
2.047 28 January 2012
* Set minimum Perl version to 5.6
M Porting/Maintainers.pl
M cpan/Compress-Raw-Bzip2/Changes
M cpan/Compress-Raw-Bzip2/Makefile.PL
M cpan/Compress-Raw-Bzip2/README
M cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
M cpan/Compress-Raw-Bzip2/t/000prereq.t
M pod/perldelta.pod
-----------------------------------------------------------------------
Summary of changes:
MANIFEST | 1 +
Porting/Maintainers.pl | 6 +-
cpan/Compress-Raw-Bzip2/Changes | 4 +
cpan/Compress-Raw-Bzip2/Makefile.PL | 2 +-
cpan/Compress-Raw-Bzip2/README | 8 +-
cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm | 6 +-
cpan/Compress-Raw-Bzip2/t/000prereq.t | 2 +-
cpan/Compress-Raw-Zlib/Changes | 13 +++
cpan/Compress-Raw-Zlib/Makefile.PL | 4 +-
cpan/Compress-Raw-Zlib/README | 8 +-
cpan/Compress-Raw-Zlib/Zlib.xs | 52 ++++++++++-
cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm | 65 +++++++++++--
cpan/Compress-Raw-Zlib/t/02zlib.t | 62 ++++++++++++-
cpan/IO-Compress/Changes | 10 ++
cpan/IO-Compress/Makefile.PL | 4 +-
cpan/IO-Compress/README | 8 +-
cpan/IO-Compress/bin/zipdetails | 2 +-
cpan/IO-Compress/lib/Compress/Zlib.pm | 18 ++--
cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm | 6 +-
.../IO-Compress/lib/IO/Compress/Adapter/Deflate.pm | 16 ++-
.../lib/IO/Compress/Adapter/Identity.pm | 4 +-
cpan/IO-Compress/lib/IO/Compress/Base.pm | 40 ++++++--
cpan/IO-Compress/lib/IO/Compress/Base/Common.pm | 3 +-
cpan/IO-Compress/lib/IO/Compress/Bzip2.pm | 10 +-
cpan/IO-Compress/lib/IO/Compress/Deflate.pm | 17 ++--
cpan/IO-Compress/lib/IO/Compress/FAQ.pod | 2 +-
cpan/IO-Compress/lib/IO/Compress/Gzip.pm | 25 +++---
cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm | 2 +-
cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm | 43 ++-------
cpan/IO-Compress/lib/IO/Compress/Zip.pm | 99 +++++++++++++------
cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm | 3 +-
cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm | 2 +-
cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm | 6 +-
.../lib/IO/Uncompress/Adapter/Bunzip2.pm | 6 +-
.../lib/IO/Uncompress/Adapter/Identity.pm | 6 +-
.../lib/IO/Uncompress/Adapter/Inflate.pm | 6 +-
cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm | 20 ++--
.../IO-Compress/lib/IO/Uncompress/AnyUncompress.pm | 42 ++++----
cpan/IO-Compress/lib/IO/Uncompress/Base.pm | 6 +-
cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm | 10 +-
cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm | 20 ++--
cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm | 10 +-
cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm | 12 +-
cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm | 28 +++---
cpan/IO-Compress/t/000prereq.t | 2 +-
cpan/IO-Compress/t/006zip.t | 12 ++-
cpan/IO-Compress/t/111const-deflate.t | 81 ++++++++++++++++
cpan/IO-Compress/t/cz-03zlib-v1.t | 25 +++++-
cpan/IO-Compress/t/cz-14gzopen.t | 16 +++-
pod/perldelta.pod | 12 +++
50 files changed, 614 insertions(+), 253 deletions(-)
create mode 100644 cpan/IO-Compress/t/111const-deflate.t
diff --git a/MANIFEST b/MANIFEST
index a7aab35..93524ba 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1348,6 +1348,7 @@ cpan/IO-Compress/t/110encode-deflate.t IO::Compress
cpan/IO-Compress/t/110encode-gzip.t IO::Compress
cpan/IO-Compress/t/110encode-rawdeflate.t IO::Compress
cpan/IO-Compress/t/110encode-zip.t IO::Compress
+cpan/IO-Compress/t/111const-deflate.t IO::Compress
cpan/IO-Compress/t/999pod.t IO::Compress
cpan/IO-Compress/t/compress/any.pl Compress::Zlib
cpan/IO-Compress/t/compress/anyunc.pl Compress::Zlib
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 716e098..40163a6 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -364,7 +364,7 @@ use File::Glob qw(:case);
'Compress::Raw::Bzip2' => {
'MAINTAINER' => 'pmqs',
- 'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.045.tar.gz',
+ 'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.047.tar.gz',
'FILES' => q[cpan/Compress-Raw-Bzip2],
'EXCLUDED' => [
qr{^t/Test/},
@@ -375,7 +375,7 @@ use File::Glob qw(:case);
'Compress::Raw::Zlib' => {
'MAINTAINER' => 'pmqs',
- 'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.045.tar.gz',
+ 'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.047.tar.gz',
'FILES' => q[cpan/Compress-Raw-Zlib],
'EXCLUDED' => [
@@ -1005,7 +1005,7 @@ use File::Glob qw(:case);
'IO-Compress' => {
'MAINTAINER' => 'pmqs',
- 'DISTRIBUTION' => 'PMQS/IO-Compress-2.046.tar.gz',
+ 'DISTRIBUTION' => 'PMQS/IO-Compress-2.047.tar.gz',
'FILES' => q[cpan/IO-Compress],
'EXCLUDED' => [qr{t/Test/}],
'UPSTREAM' => 'cpan',
diff --git a/cpan/Compress-Raw-Bzip2/Changes b/cpan/Compress-Raw-Bzip2/Changes
index 48a8f9a..5a19225 100644
--- a/cpan/Compress-Raw-Bzip2/Changes
+++ b/cpan/Compress-Raw-Bzip2/Changes
@@ -1,6 +1,10 @@
CHANGES
-------
+ 2.047 28 January 2012
+
+ * Set minimum Perl version to 5.6
+
2.045 3 December 2011
* Moved FAQ.pod to IO::Compress
diff --git a/cpan/Compress-Raw-Bzip2/Makefile.PL b/cpan/Compress-Raw-Bzip2/Makefile.PL
index ba65694..8bbf3bd 100644
--- a/cpan/Compress-Raw-Bzip2/Makefile.PL
+++ b/cpan/Compress-Raw-Bzip2/Makefile.PL
@@ -1,7 +1,7 @@
#! perl -w
use strict ;
-require 5.004 ;
+require 5.006 ;
use private::MakeUtil;
use ExtUtils::MakeMaker 5.16 ;
diff --git a/cpan/Compress-Raw-Bzip2/README b/cpan/Compress-Raw-Bzip2/README
index 39e0b42..4043c07 100644
--- a/cpan/Compress-Raw-Bzip2/README
+++ b/cpan/Compress-Raw-Bzip2/README
@@ -1,11 +1,11 @@
Compress-Raw-Bzip2
- Version 2.045
+ Version 2.047
- 3rd December 2011
+ 28th January 2012
- Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+ Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it
and/or modify it under the same terms as Perl itself.
@@ -164,7 +164,7 @@ To help me help you, I need all of the following information:
If you haven't installed Compress-Raw-Bzip2 then search Compress::Raw::Bzip2.pm
for a line like this:
- $VERSION = "2.045" ;
+ $VERSION = "2.047" ;
c. The version of bzip2 you have used.
If you have successfully installed Compress-Raw-Bzip2, this one-liner
diff --git a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
index 90871cb..43645d9 100644
--- a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
+++ b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
@@ -4,7 +4,7 @@ package Compress::Raw::Bzip2;
use strict ;
use warnings ;
-require 5.004 ;
+require 5.006 ;
require Exporter;
use AutoLoader;
use Carp ;
@@ -12,7 +12,7 @@ use Carp ;
use bytes ;
our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
-$VERSION = '2.045';
+$VERSION = '2.047';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
@@ -379,7 +379,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/Compress-Raw-Bzip2/t/000prereq.t b/cpan/Compress-Raw-Bzip2/t/000prereq.t
index a146ebd..37eeb55 100644
--- a/cpan/Compress-Raw-Bzip2/t/000prereq.t
+++ b/cpan/Compress-Raw-Bzip2/t/000prereq.t
@@ -19,7 +19,7 @@ BEGIN
if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 };
- my $VERSION = '2.045';
+ my $VERSION = '2.047';
my @NAMES = qw(
);
diff --git a/cpan/Compress-Raw-Zlib/Changes b/cpan/Compress-Raw-Zlib/Changes
index bc0a1a8..7070d0f 100644
--- a/cpan/Compress-Raw-Zlib/Changes
+++ b/cpan/Compress-Raw-Zlib/Changes
@@ -1,6 +1,19 @@
CHANGES
-------
+ 2.047 28 January 2012
+
+ * Allow flush to be called multiple times without any intermediate
+ call to deflate and still return Z_OK.
+ In the code below $status was Z_BUF_ERROR before this change.
+
+ $def->flush(...);
+ $status = $def->flush(...);
+
+ * Added support for zlibCompileFlags
+
+ * Set minimum Perl version to 5.6
+
2.045 3 December 2011
* Moved FAQ.pod into Zlib.pm
diff --git a/cpan/Compress-Raw-Zlib/Makefile.PL b/cpan/Compress-Raw-Zlib/Makefile.PL
index d999cb4..377bff4 100644
--- a/cpan/Compress-Raw-Zlib/Makefile.PL
+++ b/cpan/Compress-Raw-Zlib/Makefile.PL
@@ -1,7 +1,7 @@
#! perl -w
use strict ;
-require 5.004 ;
+require 5.006 ;
use private::MakeUtil;
use ExtUtils::MakeMaker 5.16 ;
@@ -66,7 +66,7 @@ WriteMakefile(
NAME => 'Compress::Raw::Zlib',
VERSION_FROM => 'lib/Compress/Raw/Zlib.pm',
INC => "-I$ZLIB_INCLUDE" ,
- DEFINE => "-DNO_VIZ $OLD_ZLIB $WALL -DGZIP_OS_CODE=$GZIP_OS_CODE $USE_PPPORT_H" ,
+ DEFINE => "-DNO_VIZ -DZ_SOLO $OLD_ZLIB $WALL -DGZIP_OS_CODE=$GZIP_OS_CODE $USE_PPPORT_H" ,
XS => { 'Zlib.xs' => 'Zlib.c'},
'depend' => { 'Makefile' => 'config.in' },
'clean' => { FILES => '*.c constants.h constants.xs' },
diff --git a/cpan/Compress-Raw-Zlib/README b/cpan/Compress-Raw-Zlib/README
index bd90ff4..93b6e00 100644
--- a/cpan/Compress-Raw-Zlib/README
+++ b/cpan/Compress-Raw-Zlib/README
@@ -1,11 +1,11 @@
Compress-Raw-Zlib
- Version 2.045
+ Version 2.047
- 3rd December 2011
+ 28th January 2012
- Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+ Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it
and/or modify it under the same terms as Perl itself.
@@ -355,7 +355,7 @@ To help me help you, I need all of the following information:
If you haven't installed Compress-Raw-Zlib then search Compress::Raw::Zlib.pm
for a line like this:
- $VERSION = "2.045" ;
+ $VERSION = "2.047" ;
c. The version of zlib you have used.
If you have successfully installed Compress-Raw-Zlib, this one-liner
diff --git a/cpan/Compress-Raw-Zlib/Zlib.xs b/cpan/Compress-Raw-Zlib/Zlib.xs
index 70713b9..ebf03ce 100644
--- a/cpan/Compress-Raw-Zlib/Zlib.xs
+++ b/cpan/Compress-Raw-Zlib/Zlib.xs
@@ -44,6 +44,7 @@
#if defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1210
# define MAGIC_APPEND
+# define AT_LEAST_ZLIB_1_2_1
#endif
#if defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1221
@@ -62,6 +63,13 @@
# define AT_LEAST_ZLIB_1_2_3
#endif
+#if defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1252
+/*
+ Use Z_SOLO to build source means need own malloc/free
+ */
+# define AT_LEAST_ZLIB_1_2_5_2
+#endif
+
#ifdef USE_PPPORT_H
# define NEED_sv_2pvbyte
# define NEED_sv_2pv_nolen
@@ -482,6 +490,20 @@ DispStream(s, message)
}
}
+#ifdef AT_LEAST_ZLIB_1_2_5_2
+voidpf my_zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+ return safemalloc(items * size);
+}
+
+
+void my_zcfree (voidpf opaque, voidpf ptr)
+{
+ return safefree(ptr);
+}
+
+#endif
+
static di_stream *
#ifdef CAN_PROTOTYPE
InitStream(void)
@@ -493,8 +515,12 @@ InitStream()
ZMALLOC(s, di_stream) ;
+#ifdef AT_LEAST_ZLIB_1_2_5_2
+ s->stream.zalloc = my_zcalloc;
+ s->stream.zfree = my_zcfree;
+#endif
+
return s ;
-
}
static void
@@ -637,10 +663,19 @@ ZLIB_VERNUM()
RETVAL = (ZLIB_VERSION[0] - '0') << 12 ;
RETVAL += (ZLIB_VERSION[2] - '0') << 8 ;
RETVAL += (ZLIB_VERSION[4] - '0') << 4 ;
+ if (strlen(ZLIB_VERSION) > 5)
+ RETVAL += (ZLIB_VERSION[6] - '0') ;
#endif
OUTPUT:
RETVAL
+
+#ifndef AT_LEAST_ZLIB_1_2_1
+#define zlibCompileFlags() 0
+#endif
+uLong
+zlibCompileFlags()
+
MODULE = Compress::Raw::Zlib PACKAGE = Compress::Raw::Zlib PREFIX = Zip_
#define Zip_adler32(buf, adler) adler32(adler, buf, (uInt)len)
@@ -756,6 +791,9 @@ _deflateInit(flags,level, method, windowBits, memLevel, strategy, bufsize, dicti
err = deflateInit2(&(s->stream), level,
method, windowBits, memLevel, strategy);
+ if (trace)
+ warn(" _deflateInit2 returned %d\n", err);
+
/* Check if a dictionary has been specified */
if (err == Z_OK && SvCUR(dictionary)) {
@@ -1008,6 +1046,7 @@ flush(s, output, f=Z_FINISH)
uInt increment = NO_INIT
uInt prefix = NO_INIT
uLong bufinc = NO_INIT
+ uLong availableout = NO_INIT
CODE:
bufinc = s->bufsize;
@@ -1057,8 +1096,8 @@ flush(s, output, f=Z_FINISH)
#endif
for (;;) {
- if (s->stream.avail_out == 0) {
- /* consumed all the available output, so extend it */
+ if (s->stream.avail_out == 0) {
+ /* consumed all the available output, so extend it */
Sv_Grow(output, SvLEN(output) + bufinc) ;
cur_length += increment ;
s->stream.next_out = (Bytef*) SvPVbyte_nolen(output) + cur_length ;
@@ -1066,8 +1105,15 @@ flush(s, output, f=Z_FINISH)
s->stream.avail_out = increment;
bufinc *= 2 ;
}
+
+ availableout = s->stream.avail_out ;
+
RETVAL = deflate(&(s->stream), f);
+ /* Ignore the second of two consecutive flushes: */
+ if (availableout == s->stream.avail_out && RETVAL == Z_BUF_ERROR)
+ RETVAL = Z_OK;
+
/* deflate has finished flushing only when it hasn't used up
* all the available space in the output buffer:
*/
diff --git a/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm b/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm
index 6907687..ab7dc5b 100644
--- a/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm
+++ b/cpan/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm
@@ -1,33 +1,66 @@
package Compress::Raw::Zlib;
-require 5.004 ;
+require 5.006 ;
require Exporter;
use AutoLoader;
use Carp ;
-#use Parse::Parameters;
-
use strict ;
use warnings ;
use bytes ;
-our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
+our ($VERSION, $XS_VERSION, @ISA, @EXPORT, %EXPORT_TAGS, @EXPORT_OK, $AUTOLOAD, %DEFLATE_CONSTANTS, @DEFLATE_CONSTANTS );
-$VERSION = '2.045';
+$VERSION = '2.047';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
@ISA = qw(Exporter);
+%EXPORT_TAGS = ( flush => [qw{
+ Z_NO_FLUSH
+ Z_PARTIAL_FLUSH
+ Z_SYNC_FLUSH
+ Z_FULL_FLUSH
+ Z_FINISH
+ Z_BLOCK
+ }],
+ level => [qw{
+ Z_NO_COMPRESSION
+ Z_BEST_SPEED
+ Z_BEST_COMPRESSION
+ Z_DEFAULT_COMPRESSION
+ }],
+ strategy => [qw{
+ Z_FILTERED
+ Z_HUFFMAN_ONLY
+ Z_RLE
+ Z_FIXED
+ Z_DEFAULT_STRATEGY
+ }],
+ status => [qw{
+ Z_OK
+ Z_STREAM_END
+ Z_NEED_DICT
+ Z_ERRNO
+ Z_STREAM_ERROR
+ Z_DATA_ERROR
+ Z_MEM_ERROR
+ Z_BUF_ERROR
+ Z_VERSION_ERROR
+ }],
+ );
+
+%DEFLATE_CONSTANTS = %EXPORT_TAGS;
+
# Items to export into callers namespace by default. Note: do not export
# names by default without a very good reason. Use EXPORT_OK instead.
# Do not simply export all your public functions/methods/constants.
+@DEFLATE_CONSTANTS =
@EXPORT = qw(
- adler32 crc32
-
ZLIB_VERSION
ZLIB_VERNUM
- DEF_WBITS
+
OS_CODE
MAX_MEM_LEVEL
@@ -68,6 +101,8 @@ $VERSION = eval $VERSION;
WANT_GZIP_OR_ZLIB
);
+push @EXPORT, qw(crc32 adler32 DEF_WBITS);
+
use constant WANT_GZIP => 16;
use constant WANT_GZIP_OR_ZLIB => 32;
@@ -605,6 +640,7 @@ Compress::Raw::Zlib - Low-Level Interface to zlib compression library
$crc = crc32_combine($adler1, $adler2, $len2)
my $version = Compress::Raw::Zlib::zlib_version();
+ my $flags = Compress::Raw::Zlib::zlibCompileFlags();
=head1 DESCRIPTION
@@ -1266,6 +1302,17 @@ These functions allow checksums to be merged.
Returns the version of the zlib library.
+=head2 my $flags = Compress::Raw::Zlib::zlibCompileFlags();
+
+Returns the flags indicating compile-time options that were used to build
+the zlib library. See the zlib documentation for a description of the flags
+returned by C<zlibCompileFlags>.
+
+Note that when the zlib sources are built along with this module the
+C<sprintf> flags (bits 24, 25 and 26) should be ignored.
+
+If you are using zlib 1.2.0 or older, C<zlibCompileFlags> will return 0.
+
=head1 The LimitOutput option.
By default C<< $i->inflate($input, $output) >> will uncompress I<all> data
@@ -1542,7 +1589,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/Compress-Raw-Zlib/t/02zlib.t b/cpan/Compress-Raw-Zlib/t/02zlib.t
index 52ad065..6ce990d 100644
--- a/cpan/Compress-Raw-Zlib/t/02zlib.t
+++ b/cpan/Compress-Raw-Zlib/t/02zlib.t
@@ -24,13 +24,13 @@ BEGIN
my $count = 0 ;
if ($] < 5.005) {
- $count = 230 ;
+ $count = 232 ;
}
elsif ($] >= 5.006) {
- $count = 300 ;
+ $count = 310 ;
}
else {
- $count = 258 ;
+ $count = 268 ;
}
plan tests => $count + $extra;
@@ -39,6 +39,8 @@ BEGIN
}
+my $Zlib_ver = Compress::Raw::Zlib::zlib_version ;
+
my $hello = <<EOM ;
hello world
this is a test
@@ -428,9 +430,13 @@ for my $consume ( 0 .. 1)
}
+SKIP:
{
title 'inflateSync';
+ skip "inflateSync needs zlib 1.2.1 or better, you have $Zlib_ver", 22
+ if ZLIB_VERNUM() < 0x1210 ;
+
# create a deflate stream with flush points
my $hello = "I am a HAL 9000 computer" x 2001 ;
@@ -728,18 +734,26 @@ if ($] >= 5.005)
}
+SKIP:
{
+ skip "InflateScan needs zlib 1.2.1 or better, you have $Zlib_ver", 1
+ if ZLIB_VERNUM() < 0x1210 ;
+
# regression - check that resetLastBlockByte can cope with a NULL
# pointer.
Compress::Raw::Zlib::InflateScan->new->resetLastBlockByte(undef);
ok 1, "resetLastBlockByte(undef) is ok" ;
}
+SKIP:
{
title "gzip mode";
# ================
+ skip "gzip mode needs zlib 1.2.1 or better, you have $Zlib_ver", 13
+ if ZLIB_VERNUM() < 0x1210 ;
+
my $hello = "I am a HAL 9000 computer" ;
my @hello = split('', $hello) ;
my ($err, $x, $X, $status);
@@ -780,6 +794,7 @@ if ($] >= 5.005)
is $GOT, $hello, "uncompressed data matches ok" ;
}
+SKIP:
{
title "gzip error mode";
@@ -788,6 +803,9 @@ if ($] >= 5.005)
# then read with WANT_GZIP_OR_ZLIB - thi swill work
# ================
+ skip "gzip mode needs zlib 1.2.1 or better, you have $Zlib_ver", 12
+ if ZLIB_VERNUM() < 0x1210 ;
+
my $hello = "I am a HAL 9000 computer" ;
my ($err, $x, $X, $status);
@@ -826,14 +844,17 @@ if ($] >= 5.005)
is $GOT, $hello, "uncompressed data matches ok" ;
}
+SKIP:
{
-
title "gzip/zlib error mode";
# Create zlib -
# read with no WANT_GZIP windowbits setting - this will fail
# then read with WANT_GZIP_OR_ZLIB - thi swill work
# ================
+ skip "gzip mode needs zlib 1.2.1 or better, you have $Zlib_ver", 12
+ if ZLIB_VERNUM() < 0x1210 ;
+
my $hello = "I am a HAL 9000 computer" ;
my ($err, $x, $X, $status);
@@ -871,6 +892,39 @@ if ($] >= 5.005)
is $GOT, $hello, "uncompressed data matches ok" ;
}
+{
+ title "zlibCompileFlags";
+
+ my $flags = Compress::Raw::Zlib::zlibCompileFlags;
+
+ if (ZLIB_VERNUM() < 0x1210)
+ {
+ is $flags, 0, "zlibCompileFlags == 0 if < 1.2.1";
+ }
+ else
+ {
+ ok $flags, "zlibCompileFlags != 0 if < 1.2.1";
+ }
+}
+
+{
+ title "repeated calls to flush";
+
+ my $hello = "I am a HAL 9000 computer" ;
+ my ($err, $x, $X, $status);
+
+ ok( ($x, $err) = new Compress::Raw::Zlib::Deflate ( ), "Create deflate object" );
+ isa_ok $x, "Compress::Raw::Zlib::deflateStream" ;
+ cmp_ok $err, '==', Z_OK, "status is Z_OK" ;
+
+ $status = $x->deflate($hello, $X) ;
+ cmp_ok $status, '==', Z_OK, "deflate returned Z_OK" ;
+
+ cmp_ok $x->flush($X, Z_SYNC_FLUSH), '==', Z_OK, "flush returned Z_OK" ;
+ cmp_ok $x->flush($X, Z_SYNC_FLUSH), '==', Z_OK, "second flush returned Z_OK" ;
+ is $X, "", "no output from second flush";
+}
+
exit if $] < 5.006 ;
title 'Looping Append test with substr output - substr the end of the string';
diff --git a/cpan/IO-Compress/Changes b/cpan/IO-Compress/Changes
index 0d00b00..cab9b13 100644
--- a/cpan/IO-Compress/Changes
+++ b/cpan/IO-Compress/Changes
@@ -1,6 +1,16 @@
CHANGES
-------
+ 2.047 28 January 2012
+
+ * Set minimum Perl version to 5.6
+
+ * IO::Compress::Zip
+ - In one-shot zip, set the Text Flag if "-T" thinks the file is a
+ text file.
+ - In one-shot mode, wrote mod time & access time in wrong order
+ in the "UT" extended field.
+
2.046 18 December 2011
* Minor update to bin/zipdetails
diff --git a/cpan/IO-Compress/Makefile.PL b/cpan/IO-Compress/Makefile.PL
index 8470625..62231a9 100644
--- a/cpan/IO-Compress/Makefile.PL
+++ b/cpan/IO-Compress/Makefile.PL
@@ -1,9 +1,9 @@
#! perl -w
use strict ;
-require 5.004 ;
+require 5.006 ;
-$::VERSION = '2.045' ;
+$::VERSION = '2.047' ;
use private::MakeUtil;
use ExtUtils::MakeMaker 5.16 ;
diff --git a/cpan/IO-Compress/README b/cpan/IO-Compress/README
index e13ea76..c692f7c 100644
--- a/cpan/IO-Compress/README
+++ b/cpan/IO-Compress/README
@@ -1,11 +1,11 @@
IO-Compress
- Version 2.046
+ Version 2.047
- 18th December 2011
+ 28th January 2012
- Copyright (c) 1995-2011 Paul Marquess. All rights reserved.
+ Copyright (c) 1995-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it
and/or modify it under the same terms as Perl itself.
@@ -89,7 +89,7 @@ To help me help you, I need all of the following information:
If you haven't installed IO-Compress then search IO::Compress::Gzip.pm
for a line like this:
- $VERSION = "2.045" ;
+ $VERSION = "2.047" ;
2. If you are having problems building IO-Compress, send me a
complete log of what happened. Start by unpacking the IO-Compress
diff --git a/cpan/IO-Compress/bin/zipdetails b/cpan/IO-Compress/bin/zipdetails
index 6e405f3..2b5cd52 100644
--- a/cpan/IO-Compress/bin/zipdetails
+++ b/cpan/IO-Compress/bin/zipdetails
@@ -2106,7 +2106,7 @@ Paul Marquess F<pmqs@cpan.org>.
=head1 COPYRIGHT
-Copyright (c) 2011 Paul Marquess. All rights reserved.
+Copyright (c) 2011-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/Compress/Zlib.pm b/cpan/IO-Compress/lib/Compress/Zlib.pm
index 16f0cfa..8d34029 100644
--- a/cpan/IO-Compress/lib/Compress/Zlib.pm
+++ b/cpan/IO-Compress/lib/Compress/Zlib.pm
@@ -1,23 +1,23 @@
package Compress::Zlib;
-require 5.004 ;
+require 5.006 ;
require Exporter;
use Carp ;
use IO::Handle ;
use Scalar::Util qw(dualvar);
-use IO::Compress::Base::Common 2.045 ;
-use Compress::Raw::Zlib 2.045 ;
-use IO::Compress::Gzip 2.045 ;
-use IO::Uncompress::Gunzip 2.045 ;
+use IO::Compress::Base::Common 2.047 ;
+use Compress::Raw::Zlib 2.047 ;
+use IO::Compress::Gzip 2.047 ;
+use IO::Uncompress::Gunzip 2.047 ;
use strict ;
use warnings ;
use bytes ;
our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
-$VERSION = '2.045';
+$VERSION = '2.047';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
@@ -453,7 +453,7 @@ sub inflate
package Compress::Zlib ;
-use IO::Compress::Gzip::Constants 2.045 ;
+use IO::Compress::Gzip::Constants 2.047 ;
sub memGzip($)
{
@@ -578,7 +578,7 @@ sub memGunzip($)
substr($$string, 0, 8) = '';
return _set_gzerr_undef(Z_DATA_ERROR())
unless $len == length($output) and
- $crc == crc32($output);
+ $crc == Compress::Raw::Zlib::crc32($output);
}
else
{
@@ -1478,7 +1478,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 1995-2011 Paul Marquess. All rights reserved.
+Copyright (c) 1995-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
index 96ec70d..86a55b6 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
@@ -4,12 +4,12 @@ use strict;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.045 qw(:Status);
+use IO::Compress::Base::Common 2.047 qw(:Status);
-use Compress::Raw::Bzip2 2.045 ;
+use Compress::Raw::Bzip2 2.047 ;
our ($VERSION);
-$VERSION = '2.045';
+$VERSION = '2.047';
sub mkCompObject
{
diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
index a0a03fa..0efc862 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
@@ -4,12 +4,18 @@ use strict;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.045 qw(:Status);
-
-use Compress::Raw::Zlib 2.045 qw(Z_OK Z_FINISH MAX_WBITS) ;
-our ($VERSION);
-
-$VERSION = '2.045';
+use IO::Compress::Base::Common 2.047 qw(:Status);
+use Compress::Raw::Zlib 2.047 qw( !crc32 !adler32 ) ;
+
+require Exporter;
+our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, @EXPORT, %DEFLATE_CONSTANTS);
+
+$VERSION = '2.047';
+@ISA = qw(Exporter);
+@EXPORT_OK = @Compress::Raw::Zlib::DEFLATE_CONSTANTS;
+%EXPORT_TAGS = %Compress::Raw::Zlib::DEFLATE_CONSTANTS;
+@EXPORT = @EXPORT_OK;
+%DEFLATE_CONSTANTS = %EXPORT_TAGS ;
sub mkCompObject
{
diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
index da04ab6..2abe738 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
@@ -4,10 +4,10 @@ use strict;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.045 qw(:Status);
+use IO::Compress::Base::Common 2.047 qw(:Status);
our ($VERSION);
-$VERSION = '2.045';
+$VERSION = '2.047';
sub mkCompObject
{
diff --git a/cpan/IO-Compress/lib/IO/Compress/Base.pm b/cpan/IO-Compress/lib/IO/Compress/Base.pm
index adcfecc..f68c937 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Base.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Base.pm
@@ -1,12 +1,12 @@
package IO::Compress::Base ;
-require 5.004 ;
+require 5.006 ;
use strict ;
use warnings;
-use IO::Compress::Base::Common 2.045 ;
+use IO::Compress::Base::Common 2.047 ;
use IO::File qw(SEEK_SET SEEK_END); ;
use Scalar::Util qw(blessed readonly);
@@ -20,7 +20,7 @@ use bytes;
our (@ISA, $VERSION);
@ISA = qw(Exporter IO::File);
-$VERSION = '2.046';
+$VERSION = '2.047';
#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.
@@ -703,16 +703,14 @@ sub beforePayload
{
}
-sub newStream
+sub _newStream
{
my $self = shift ;
-
+ my $got = shift;
+
$self->_writeTrailer()
or return 0 ;
- my $got = $self->checkParams('newStream', *$self->{Got}, @_)
- or return 0 ;
-
$self->ckParams($got)
or $self->croakError("newStream: $self->{Error}");
@@ -731,6 +729,30 @@ sub newStream
return 1 ;
}
+sub newStream
+{
+ my $self = shift ;
+
+ my $got = $self->checkParams('newStream', *$self->{Got}, @_)
+ or return 0 ;
+
+ $self->_newStream($got);
+
+# *$self->{Compress} = $self->mkComp($got)
+# or return 0;
+#
+# *$self->{Header} = $self->mkHeader($got) ;
+# $self->output(*$self->{Header} )
+# or return 0;
+#
+# *$self->{UnCompSize}->reset();
+# *$self->{CompSize}->reset();
+#
+# $self->beforePayload();
+#
+# return 1 ;
+}
+
sub reset
{
my $self = shift ;
@@ -989,7 +1011,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm b/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm
index 0f1c63a..de07898 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm
@@ -11,7 +11,7 @@ use File::GlobMapper;
require Exporter;
our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE);
@ISA = qw(Exporter);
-$VERSION = '2.045';
+$VERSION = '2.047';
@EXPORT = qw( isaFilehandle isaFilename isaScalar
whatIsInput whatIsOutput
@@ -519,6 +519,7 @@ sub ParseParameters
#package IO::Compress::Base::Parameters;
use strict;
+
use warnings;
use Carp;
diff --git a/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm
index 6c11ecb..bf38a0a 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm
@@ -5,16 +5,16 @@ use warnings;
use bytes;
require Exporter ;
-use IO::Compress::Base 2.045 ;
+use IO::Compress::Base 2.047 ;
-use IO::Compress::Base::Common 2.045 qw(createSelfTiedObject);
-use IO::Compress::Adapter::Bzip2 2.045 ;
+use IO::Compress::Base::Common 2.047 qw(createSelfTiedObject);
+use IO::Compress::Adapter::Bzip2 2.047 ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error);
-$VERSION = '2.045';
+$VERSION = '2.047';
$Bzip2Error = '';
@ISA = qw(Exporter IO::Compress::Base);
@@ -51,7 +51,7 @@ sub getExtraParams
{
my $self = shift ;
- use IO::Compress::Base::Common 2.045 qw(:Parse);
+ use IO::Compress::Base::Common 2.047 qw(:Parse);
return (
'BlockSize100K' => [0, 1, Parse_unsigned, 1],
diff --git a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm
index 1cf51b8..aeb184f 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm
@@ -1,26 +1,29 @@
package IO::Compress::Deflate ;
+require 5.006 ;
+
use strict ;
use warnings;
use bytes;
require Exporter ;
-use IO::Compress::RawDeflate 2.045 ;
+use IO::Compress::RawDeflate 2.047 ();
+use IO::Compress::Adapter::Deflate 2.047 ;
-use Compress::Raw::Zlib 2.045 ;
-use IO::Compress::Zlib::Constants 2.045 ;
-use IO::Compress::Base::Common 2.045 qw(createSelfTiedObject);
+use IO::Compress::Zlib::Constants 2.047 ;
+use IO::Compress::Base::Common 2.047 qw(createSelfTiedObject);
-our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $DeflateError);
+our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $DeflateError);
-$VERSION = '2.045';
+$VERSION = '2.047';
$DeflateError = '';
@ISA = qw(Exporter IO::Compress::RawDeflate);
@EXPORT_OK = qw( $DeflateError deflate ) ;
%EXPORT_TAGS = %IO::Compress::RawDeflate::DEFLATE_CONSTANTS ;
+
push @{ $EXPORT_TAGS{all} }, @EXPORT_OK ;
Exporter::export_ok_tags('all');
@@ -921,7 +924,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/IO/Compress/FAQ.pod b/cpan/IO-Compress/lib/IO/Compress/FAQ.pod
index 92be856..d392ff2 100644
--- a/cpan/IO-Compress/lib/IO/Compress/FAQ.pod
+++ b/cpan/IO-Compress/lib/IO/Compress/FAQ.pod
@@ -590,7 +590,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm
index 97078a5..9fecbaf 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm
@@ -1,19 +1,19 @@
-
package IO::Compress::Gzip ;
-require 5.004 ;
+require 5.006 ;
use strict ;
use warnings;
use bytes;
+require Exporter ;
-use IO::Compress::RawDeflate 2.045 ;
+use IO::Compress::RawDeflate 2.047 () ;
+use IO::Compress::Adapter::Deflate 2.047 ;
-use Compress::Raw::Zlib 2.045 ;
-use IO::Compress::Base::Common 2.045 qw(:Status :Parse isaScalar createSelfTiedObject);
-use IO::Compress::Gzip::Constants 2.045 ;
-use IO::Compress::Zlib::Extra 2.045 ;
+use IO::Compress::Base::Common 2.047 qw(:Status :Parse isaScalar createSelfTiedObject);
+use IO::Compress::Gzip::Constants 2.047 ;
+use IO::Compress::Zlib::Extra 2.047 ;
BEGIN
{
@@ -23,16 +23,15 @@ BEGIN
{ *noUTF8 = sub {} }
}
-require Exporter ;
+our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $GzipError);
-our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $GzipError);
-
-$VERSION = '2.045';
+$VERSION = '2.047';
$GzipError = '' ;
@ISA = qw(Exporter IO::Compress::RawDeflate);
@EXPORT_OK = qw( $GzipError gzip ) ;
%EXPORT_TAGS = %IO::Compress::RawDeflate::DEFLATE_CONSTANTS ;
+
push @{ $EXPORT_TAGS{all} }, @EXPORT_OK ;
Exporter::export_ok_tags('all');
@@ -258,7 +257,7 @@ sub mkHeader
}
# HEADER CRC
- $out .= pack("v", crc32($out) & 0x00FF ) if $param->value('HeaderCRC') ;
+ $out .= pack("v", Compress::Raw::Zlib::crc32($out) & 0x00FF ) if $param->value('HeaderCRC') ;
noUTF8($out);
@@ -1235,7 +1234,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm
index 7695b2a..98ea27a 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm
@@ -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.045';
+$VERSION = '2.047';
@ISA = qw(Exporter);
diff --git a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
index 487cd1b..9b86ef9 100644
--- a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
@@ -7,44 +7,23 @@ use warnings;
use bytes;
-use IO::Compress::Base 2.045 ;
-use IO::Compress::Base::Common 2.045 qw(:Status createSelfTiedObject);
-use IO::Compress::Adapter::Deflate 2.045 ;
+use IO::Compress::Base 2.047 ;
+use IO::Compress::Base::Common 2.047 qw(:Status createSelfTiedObject);
+use IO::Compress::Adapter::Deflate 2.047 ;
require Exporter ;
-
our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError);
-$VERSION = '2.045';
+$VERSION = '2.047';
$RawDeflateError = '';
@ISA = qw(Exporter IO::Compress::Base);
@EXPORT_OK = qw( $RawDeflateError rawdeflate ) ;
+push @EXPORT_OK, @IO::Compress::Adapter::Deflate::EXPORT_OK ;
+
+%EXPORT_TAGS = %IO::Compress::Adapter::Deflate::DEFLATE_CONSTANTS;
-%EXPORT_TAGS = ( flush => [qw{
- Z_NO_FLUSH
- Z_PARTIAL_FLUSH
- Z_SYNC_FLUSH
- Z_FULL_FLUSH
- Z_FINISH
- Z_BLOCK
- }],
- level => [qw{
- Z_NO_COMPRESSION
- Z_BEST_SPEED
- Z_BEST_COMPRESSION
- Z_DEFAULT_COMPRESSION
- }],
- strategy => [qw{
- Z_FILTERED
- Z_HUFFMAN_ONLY
- Z_RLE
- Z_FIXED
- Z_DEFAULT_STRATEGY
- }],
-
- );
{
my %seen;
@@ -60,7 +39,7 @@ $RawDeflateError = '';
%DEFLATE_CONSTANTS = %EXPORT_TAGS;
-push @{ $EXPORT_TAGS{all} }, @EXPORT_OK ;
+#push @{ $EXPORT_TAGS{all} }, @EXPORT_OK ;
Exporter::export_ok_tags('all');
@@ -142,8 +121,8 @@ sub getZlibParams
{
my $self = shift ;
- use IO::Compress::Base::Common 2.045 qw(:Parse);
- use Compress::Raw::Zlib 2.045 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
+ use IO::Compress::Base::Common 2.047 qw(:Parse);
+ use Compress::Raw::Zlib 2.047 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
return (
@@ -1008,7 +987,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip.pm b/cpan/IO-Compress/lib/IO/Compress/Zip.pm
index 0e4c957..f4ace79 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Zip.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Zip.pm
@@ -4,44 +4,45 @@ use strict ;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.045 qw(:Status MAX32 isGeMax32 isaScalar createSelfTiedObject);
-use IO::Compress::RawDeflate 2.045 ;
-use IO::Compress::Adapter::Deflate 2.045 ;
-use IO::Compress::Adapter::Identity 2.045 ;
-use IO::Compress::Zlib::Extra 2.045 ;
-use IO::Compress::Zip::Constants 2.045 ;
+use IO::Compress::Base::Common 2.047 qw(:Status MAX32 isGeMax32 isaScalar createSelfTiedObject);
+use IO::Compress::RawDeflate 2.047 ();
+use IO::Compress::Adapter::Deflate 2.047 ;
+use IO::Compress::Adapter::Identity 2.047 ;
+use IO::Compress::Zlib::Extra 2.047 ;
+use IO::Compress::Zip::Constants 2.047 ;
use File::Spec();
use Config;
-use Compress::Raw::Zlib 2.045 qw(crc32) ;
+use Compress::Raw::Zlib 2.047 ();
BEGIN
{
eval { require IO::Compress::Adapter::Bzip2 ;
- import IO::Compress::Adapter::Bzip2 2.045 ;
+ import IO::Compress::Adapter::Bzip2 2.047 ;
require IO::Compress::Bzip2 ;
- import IO::Compress::Bzip2 2.045 ;
+ import IO::Compress::Bzip2 2.047 ;
} ;
eval { require IO::Compress::Adapter::Lzma ;
- import IO::Compress::Adapter::Lzma 2.045 ;
+ import IO::Compress::Adapter::Lzma 2.047 ;
require IO::Compress::Lzma ;
- import IO::Compress::Lzma 2.045 ;
+ import IO::Compress::Lzma 2.047 ;
} ;
}
require Exporter ;
-our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $ZipError);
+our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $ZipError);
-$VERSION = '2.046';
+$VERSION = '2.047';
$ZipError = '';
@ISA = qw(Exporter IO::Compress::RawDeflate);
@EXPORT_OK = qw( $ZipError zip ) ;
%EXPORT_TAGS = %IO::Compress::RawDeflate::DEFLATE_CONSTANTS ;
+
push @{ $EXPORT_TAGS{all} }, @EXPORT_OK ;
$EXPORT_TAGS{zip_method} = [qw( ZIP_CM_STORE ZIP_CM_DEFLATE ZIP_CM_BZIP2 ZIP_CM_LZMA)];
@@ -64,6 +65,25 @@ sub zip
return $obj->_def(@_);
}
+sub isMethodAvailable
+{
+ my $method = shift;
+
+ # Store & Deflate are always available
+ return 1
+ if $method == ZIP_CM_STORE || $method == ZIP_CM_DEFLATE ;
+
+ return 1
+ if $method == ZIP_CM_BZIP2 and
+ defined $IO::Compress::Adapter::Bzip2::VERSION;
+
+ return 1
+ if $method == ZIP_CM_LZMA and
+ defined $IO::Compress::Adapter::Lzma::VERSION;
+
+ return 0;
+}
+
sub beforePayload
{
my $self = shift ;
@@ -77,9 +97,9 @@ sub beforePayload
*$self->{FH}->seek($sparse, IO::Handle::SEEK_CUR);
- *$self->{ZipData}{CRC32} = crc32($NULLS, *$self->{ZipData}{CRC32})
+ *$self->{ZipData}{CRC32} = Compress::Raw::Zlib::crc32($NULLS, *$self->{ZipData}{CRC32})
for 1 .. int $sparse / $inc;
- *$self->{ZipData}{CRC32} = crc32(substr($NULLS, 0, $sparse % $inc),
+ *$self->{ZipData}{CRC32} = Compress::Raw::Zlib::crc32(substr($NULLS, 0, $sparse % $inc),
*$self->{ZipData}{CRC32})
if $sparse % $inc;
}
@@ -97,7 +117,7 @@ sub mkComp
$got->value('Level'),
$got->value('Strategy')
);
- *$self->{ZipData}{CRC32} = crc32(undef);
+ *$self->{ZipData}{CRC32} = Compress::Raw::Zlib::crc32(undef);
}
elsif (*$self->{ZipData}{Method} == ZIP_CM_DEFLATE) {
($obj, $errstr, $errno) = IO::Compress::Adapter::Deflate::mkCompObject(
@@ -113,13 +133,13 @@ sub mkComp
$got->value('WorkFactor'),
$got->value('Verbosity')
);
- *$self->{ZipData}{CRC32} = crc32(undef);
+ *$self->{ZipData}{CRC32} = Compress::Raw::Zlib::crc32(undef);
}
elsif (*$self->{ZipData}{Method} == ZIP_CM_LZMA) {
($obj, $errstr, $errno) = IO::Compress::Adapter::Lzma::mkRawZipCompObject($got->value('Preset'),
$got->value('Extreme'),
);
- *$self->{ZipData}{CRC32} = crc32(undef);
+ *$self->{ZipData}{CRC32} = Compress::Raw::Zlib::crc32(undef);
}
return $self->saveErrorString(undef, $errstr, $errno)
@@ -154,7 +174,7 @@ sub filterUncompressed
*$self->{ZipData}{CRC32} = *$self->{Compress}->crc32();
}
else {
- *$self->{ZipData}{CRC32} = crc32(${$_[0]}, *$self->{ZipData}{CRC32});
+ *$self->{ZipData}{CRC32} = Compress::Raw::Zlib::crc32(${$_[0]}, *$self->{ZipData}{CRC32});
}
}
@@ -246,6 +266,7 @@ sub mkHeader
my $extFileAttr = 0 ;
# This code assumes Unix.
+ # TODO - revisit this
$extFileAttr = 0100644 << 16
if $osCode == ZIP_OS_CODE_UNIX ;
@@ -259,7 +280,7 @@ sub mkHeader
}
if (! $param->value('Minimal')) {
- if (defined $param->value('exTime'))
+ if ($param->parsed('MTime'))
{
$extra .= mkExtendedTime($param->value('MTime'),
$param->value('ATime'),
@@ -305,10 +326,10 @@ sub mkHeader
#$gpFlag |= ZIP_GP_FLAG_LANGUAGE_ENCODING
#if $param->value('UTF8') && length($filename) + length($comment);
-
my $version = $ZIP_CM_MIN_VERSIONS{$method};
$version = ZIP64_MIN_VERSION
if ZIP64_MIN_VERSION > $version && *$self->{ZipData}{Zip64};
+
my $madeBy = ($param->value('OS_Code') << 8) + $version;
my $extract = $version;
@@ -643,8 +664,8 @@ sub getExtraParams
{
my $self = shift ;
- use IO::Compress::Base::Common 2.045 qw(:Parse);
- use Compress::Raw::Zlib 2.045 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
+ use IO::Compress::Base::Common 2.047 qw(:Parse);
+ use Compress::Raw::Zlib 2.047 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY);
my @Bzip2 = ();
@@ -661,7 +682,7 @@ sub getExtraParams
# # Zip header fields
'Minimal' => [0, 1, Parse_boolean, 0],
- 'Zip64' => [0, 1, Parse_any, 0],
+ 'Zip64' => [0, 1, Parse_boolean, 0],
'Comment' => [0, 1, Parse_any, ''],
'ZipComment'=> [0, 1, Parse_any, ''],
'Name' => [0, 1, Parse_any, ''],
@@ -713,11 +734,23 @@ sub getFileInfo
return ;
}
- my ($mode, $uid, $gid, $atime, $mtime, $ctime)
- = (stat($filename))[2, 4,5, 8,9,10] ;
+ my ($mode, $uid, $gid, $size, $atime, $mtime, $ctime) ;
+ if ( $params->parsed('StoreLinks') )
+ {
+ ($mode, $uid, $gid, $size, $atime, $mtime, $ctime)
+ = (lstat($filename))[2, 4,5,7, 8,9,10] ;
+ }
+ else
+ {
+ ($mode, $uid, $gid, $size, $atime, $mtime, $ctime)
+ = (stat($filename))[2, 4,5,7, 8,9,10] ;
+ }
+
+ $params->value(TextFlag => -T $filename )
+ if ! $params->parsed('TextFlag');
$params->value(Zip64 => 1)
- if isGeMax32 -s $filename ;
+ if isGeMax32 $size ;
$params->value('Name' => $filename)
if ! $params->parsed('Name') ;
@@ -730,7 +763,7 @@ sub getFileInfo
$params->value('MTime' => $mtime) ;
$params->value('ATime' => $atime) ;
$params->value('CTime' => undef) ; # No Creation time
- $params->value("exTime", [$mtime, $atime, undef]);
+ # TODO - see if can fillout creation time on non-Unix
}
# NOTE - Unix specific code alert
@@ -807,6 +840,7 @@ sub mkUnixNExtra
sub _unixToDosTime # Archive::Zip::Member
{
my $time_t = shift;
+
# TODO - add something to cope with unix time < 1980
my ( $sec, $min, $hour, $mday, $mon, $year ) = localtime($time_t);
my $dt = 0;
@@ -960,10 +994,10 @@ See L<File::GlobMapper|File::GlobMapper> for more details.
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>, C<exUnixN> and C<exTime> options will be sourced from that file.
+the C<Name>, C<Time>, C<TextFlag>, 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>, C<exUnixN> and C<exTime> options or by setting the
+explicitly setting the C<Name>, C<Time>, C<TextFlag>, C<ExtAttr>, C<exUnixN> and C<exTime> options or by setting the
C<Minimal> parameter.
=head3 The C<$output> parameter
@@ -1449,6 +1483,9 @@ This parameter controls the setting of a bit in the zip central header. It
is used to signal that the data stored in the zip file/buffer is probably
text.
+In one-shot mode this flag will be set to true if the Perl C<-T> operator thinks
+the file contains text.
+
The default is 0.
=item C<< ExtraFieldLocal => $data >>
@@ -1907,7 +1944,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm
index 89e0a5b..41ebd78 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm
@@ -7,7 +7,7 @@ require Exporter;
our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS);
-$VERSION = '2.045';
+$VERSION = '2.047';
@ISA = qw(Exporter);
@@ -115,6 +115,7 @@ use constant ZIP64_MIN_VERSION => 45;
ZIP_CM_DEFLATE() => 20,
ZIP_CM_BZIP2() => 46,
ZIP_CM_LZMA() => 63,
+ ZIP_CM_PPMD() => 63,
);
diff --git a/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm
index 92a7e85..6284aa3 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm
@@ -9,7 +9,7 @@ require Exporter;
our ($VERSION, @ISA, @EXPORT);
-$VERSION = '2.045';
+$VERSION = '2.047';
@ISA = qw(Exporter);
diff --git a/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm b/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm
index c6f80c1..e71b1e2 100644
--- a/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm
+++ b/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm
@@ -1,6 +1,6 @@
package IO::Compress::Zlib::Extra;
-require 5.004 ;
+require 5.006 ;
use strict ;
use warnings;
@@ -8,9 +8,9 @@ use bytes;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS);
-$VERSION = '2.045';
+$VERSION = '2.047';
-use IO::Compress::Gzip::Constants 2.045 ;
+use IO::Compress::Gzip::Constants 2.047 ;
sub ExtraFieldError
{
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
index c32ad66..2a9eb99 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
@@ -4,12 +4,12 @@ use strict;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.045 qw(:Status);
+use IO::Compress::Base::Common 2.047 qw(:Status);
-use Compress::Raw::Bzip2 2.045 ;
+use Compress::Raw::Bzip2 2.047 ;
our ($VERSION, @ISA);
-$VERSION = '2.045';
+$VERSION = '2.047';
sub mkUncompObject
{
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
index 9c3824a..235cd2d 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
@@ -4,14 +4,14 @@ use warnings;
use strict;
use bytes;
-use IO::Compress::Base::Common 2.045 qw(:Status);
+use IO::Compress::Base::Common 2.047 qw(:Status);
use IO::Compress::Zip::Constants ;
our ($VERSION);
-$VERSION = '2.045';
+$VERSION = '2.047';
-use Compress::Raw::Zlib 2.045 ();
+use Compress::Raw::Zlib 2.047 ();
sub mkUncompObject
{
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
index 29e1ac3..b625e36 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
@@ -4,11 +4,11 @@ use strict;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.045 qw(:Status);
-use Compress::Raw::Zlib 2.045 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
+use IO::Compress::Base::Common 2.047 qw(:Status);
+use Compress::Raw::Zlib 2.047 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
our ($VERSION);
-$VERSION = '2.045';
+$VERSION = '2.047';
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
index 6fb2706..a9cfc88 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
@@ -6,22 +6,22 @@ use strict;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.045 qw(createSelfTiedObject);
+use IO::Compress::Base::Common 2.047 qw(createSelfTiedObject);
-use IO::Uncompress::Adapter::Inflate 2.045 ();
+use IO::Uncompress::Adapter::Inflate 2.047 ();
-use IO::Uncompress::Base 2.045 ;
-use IO::Uncompress::Gunzip 2.045 ;
-use IO::Uncompress::Inflate 2.045 ;
-use IO::Uncompress::RawInflate 2.045 ;
-use IO::Uncompress::Unzip 2.045 ;
+use IO::Uncompress::Base 2.047 ;
+use IO::Uncompress::Gunzip 2.047 ;
+use IO::Uncompress::Inflate 2.047 ;
+use IO::Uncompress::RawInflate 2.047 ;
+use IO::Uncompress::Unzip 2.047 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError);
-$VERSION = '2.045';
+$VERSION = '2.047';
$AnyInflateError = '';
@ISA = qw( Exporter IO::Uncompress::Base );
@@ -48,7 +48,7 @@ sub anyinflate
sub getExtraParams
{
- use IO::Compress::Base::Common 2.045 qw(:Parse);
+ use IO::Compress::Base::Common 2.047 qw(:Parse);
return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ) ;
}
@@ -980,7 +980,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
index 4d4d4b9..0c8e107 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
@@ -4,16 +4,16 @@ use strict;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.045 qw(createSelfTiedObject);
+use IO::Compress::Base::Common 2.047 qw(createSelfTiedObject);
-use IO::Uncompress::Base 2.045 ;
+use IO::Uncompress::Base 2.047 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
-$VERSION = '2.045';
+$VERSION = '2.047';
$AnyUncompressError = '';
@ISA = qw( Exporter IO::Uncompress::Base );
@@ -27,22 +27,22 @@ Exporter::export_ok_tags('all');
BEGIN
{
- eval ' use IO::Uncompress::Adapter::Inflate 2.045 ;';
- eval ' use IO::Uncompress::Adapter::Bunzip2 2.045 ;';
- eval ' use IO::Uncompress::Adapter::LZO 2.045 ;';
- eval ' use IO::Uncompress::Adapter::Lzf 2.045 ;';
- eval ' use IO::Uncompress::Adapter::UnLzma 2.045 ;';
- eval ' use IO::Uncompress::Adapter::UnXz 2.045 ;';
-
- eval ' use IO::Uncompress::Bunzip2 2.045 ;';
- eval ' use IO::Uncompress::UnLzop 2.045 ;';
- eval ' use IO::Uncompress::Gunzip 2.045 ;';
- eval ' use IO::Uncompress::Inflate 2.045 ;';
- eval ' use IO::Uncompress::RawInflate 2.045 ;';
- eval ' use IO::Uncompress::Unzip 2.045 ;';
- eval ' use IO::Uncompress::UnLzf 2.045 ;';
- eval ' use IO::Uncompress::UnLzma 2.045 ;';
- eval ' use IO::Uncompress::UnXz 2.045 ;';
+ eval ' use IO::Uncompress::Adapter::Inflate 2.047 ;';
+ eval ' use IO::Uncompress::Adapter::Bunzip2 2.047 ;';
+ eval ' use IO::Uncompress::Adapter::LZO 2.047 ;';
+ eval ' use IO::Uncompress::Adapter::Lzf 2.047 ;';
+ eval ' use IO::Uncompress::Adapter::UnLzma 2.047 ;';
+ eval ' use IO::Uncompress::Adapter::UnXz 2.047 ;';
+
+ eval ' use IO::Uncompress::Bunzip2 2.047 ;';
+ eval ' use IO::Uncompress::UnLzop 2.047 ;';
+ eval ' use IO::Uncompress::Gunzip 2.047 ;';
+ eval ' use IO::Uncompress::Inflate 2.047 ;';
+ eval ' use IO::Uncompress::RawInflate 2.047 ;';
+ eval ' use IO::Uncompress::Unzip 2.047 ;';
+ eval ' use IO::Uncompress::UnLzf 2.047 ;';
+ eval ' use IO::Uncompress::UnLzma 2.047 ;';
+ eval ' use IO::Uncompress::UnXz 2.047 ;';
}
sub new
@@ -60,7 +60,7 @@ sub anyuncompress
sub getExtraParams
{
- use IO::Compress::Base::Common 2.045 qw(:Parse);
+ use IO::Compress::Base::Common 2.047 qw(:Parse);
return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ,
'UnLzma' => [1, 1, Parse_boolean, 0] ) ;
}
@@ -1011,7 +1011,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm
index 973d41b..2415a61 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm
@@ -9,12 +9,12 @@ our (@ISA, $VERSION, @EXPORT_OK, %EXPORT_TAGS);
@ISA = qw(Exporter IO::File);
-$VERSION = '2.046';
+$VERSION = '2.047';
use constant G_EOF => 0 ;
use constant G_ERR => -1 ;
-use IO::Compress::Base::Common 2.045 ;
+use IO::Compress::Base::Common 2.047 ;
use IO::File ;
use Symbol;
@@ -1520,7 +1520,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
index c1e65a5..892ccfb 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
@@ -4,15 +4,15 @@ use strict ;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.045 qw(:Status createSelfTiedObject);
+use IO::Compress::Base::Common 2.047 qw(:Status createSelfTiedObject);
-use IO::Uncompress::Base 2.045 ;
-use IO::Uncompress::Adapter::Bunzip2 2.045 ;
+use IO::Uncompress::Base 2.047 ;
+use IO::Uncompress::Adapter::Bunzip2 2.047 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error);
-$VERSION = '2.045';
+$VERSION = '2.047';
$Bunzip2Error = '';
@ISA = qw( Exporter IO::Uncompress::Base );
@@ -40,7 +40,7 @@ sub getExtraParams
{
my $self = shift ;
- use IO::Compress::Base::Common 2.045 qw(:Parse);
+ use IO::Compress::Base::Common 2.047 qw(:Parse);
return (
'Verbosity' => [1, 1, Parse_boolean, 0],
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm
index 7589fe4..96fc585 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm
@@ -1,7 +1,7 @@
package IO::Uncompress::Gunzip ;
-require 5.004 ;
+require 5.006 ;
# for RFC1952
@@ -9,12 +9,12 @@ use strict ;
use warnings;
use bytes;
-use IO::Uncompress::RawInflate 2.045 ;
+use IO::Uncompress::RawInflate 2.047 ;
-use Compress::Raw::Zlib 2.045 qw( crc32 ) ;
-use IO::Compress::Base::Common 2.045 qw(:Status createSelfTiedObject);
-use IO::Compress::Gzip::Constants 2.045 ;
-use IO::Compress::Zlib::Extra 2.045 ;
+use Compress::Raw::Zlib 2.047 () ;
+use IO::Compress::Base::Common 2.047 qw(:Status createSelfTiedObject);
+use IO::Compress::Gzip::Constants 2.047 ;
+use IO::Compress::Zlib::Extra 2.047 ;
require Exporter ;
@@ -28,7 +28,7 @@ Exporter::export_ok_tags('all');
$GunzipError = '';
-$VERSION = '2.045';
+$VERSION = '2.047';
sub new
{
@@ -47,7 +47,7 @@ sub gunzip
sub getExtraParams
{
- use IO::Compress::Base::Common 2.045 qw(:Parse);
+ use IO::Compress::Base::Common 2.047 qw(:Parse);
return ( 'ParseExtra' => [1, 1, Parse_boolean, 0] ) ;
}
@@ -222,7 +222,7 @@ sub _readGzipHeader($)
or return $self->TruncatedHeader("FHCRC");
$HeaderCRC = unpack("v", $buffer) ;
- my $crc16 = crc32($keep) & 0xFF ;
+ my $crc16 = Compress::Raw::Zlib::crc32($keep) & 0xFF ;
return $self->HeaderError("CRC16 mismatch.")
if *$self->{Strict} && $crc16 != $HeaderCRC;
@@ -1104,7 +1104,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm
index ade1bda..abad7d0 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm
@@ -5,15 +5,15 @@ use strict ;
use warnings;
use bytes;
-use IO::Compress::Base::Common 2.045 qw(:Status createSelfTiedObject);
-use IO::Compress::Zlib::Constants 2.045 ;
+use IO::Compress::Base::Common 2.047 qw(:Status createSelfTiedObject);
+use IO::Compress::Zlib::Constants 2.047 ;
-use IO::Uncompress::RawInflate 2.045 ;
+use IO::Uncompress::RawInflate 2.047 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError);
-$VERSION = '2.045';
+$VERSION = '2.047';
$InflateError = '';
@ISA = qw( Exporter IO::Uncompress::RawInflate );
@@ -975,7 +975,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm
index 102ca9a..c73d48d 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm
@@ -5,16 +5,16 @@ use strict ;
use warnings;
use bytes;
-use Compress::Raw::Zlib 2.045 ;
-use IO::Compress::Base::Common 2.045 qw(:Status createSelfTiedObject);
+use Compress::Raw::Zlib 2.047 ;
+use IO::Compress::Base::Common 2.047 qw(:Status createSelfTiedObject);
-use IO::Uncompress::Base 2.045 ;
-use IO::Uncompress::Adapter::Inflate 2.045 ;
+use IO::Uncompress::Base 2.047 ;
+use IO::Uncompress::Adapter::Inflate 2.047 ;
require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError);
-$VERSION = '2.045';
+$VERSION = '2.047';
$RawInflateError = '';
@ISA = qw( Exporter IO::Uncompress::Base );
@@ -1103,7 +1103,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm
index de6eca5..6476655 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm
@@ -1,6 +1,6 @@
package IO::Uncompress::Unzip;
-require 5.004 ;
+require 5.006 ;
# for RFC1952
@@ -9,14 +9,14 @@ use warnings;
use bytes;
use IO::File;
-use IO::Uncompress::RawInflate 2.045 ;
-use IO::Compress::Base::Common 2.045 qw(:Status createSelfTiedObject);
-use IO::Uncompress::Adapter::Inflate 2.045 ;
-use IO::Uncompress::Adapter::Identity 2.045 ;
-use IO::Compress::Zlib::Extra 2.045 ;
-use IO::Compress::Zip::Constants 2.045 ;
+use IO::Uncompress::RawInflate 2.047 ;
+use IO::Compress::Base::Common 2.047 qw(:Status createSelfTiedObject);
+use IO::Uncompress::Adapter::Inflate 2.047 ;
+use IO::Uncompress::Adapter::Identity 2.047 ;
+use IO::Compress::Zlib::Extra 2.047 ;
+use IO::Compress::Zip::Constants 2.047 ;
-use Compress::Raw::Zlib 2.045 qw(crc32) ;
+use Compress::Raw::Zlib 2.047 () ;
BEGIN
{
@@ -31,7 +31,7 @@ require Exporter ;
our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup);
-$VERSION = '2.046';
+$VERSION = '2.047';
$UnzipError = '';
@ISA = qw(Exporter IO::Uncompress::RawInflate);
@@ -64,7 +64,7 @@ sub unzip
sub getExtraParams
{
- use IO::Compress::Base::Common 2.045 qw(:Parse);
+ use IO::Compress::Base::Common 2.047 qw(:Parse);
return (
@@ -73,7 +73,7 @@ sub getExtraParams
'Stream' => [1, 1, Parse_boolean, 0],
- # This means reading the central directory to get
+ # TODO - This means reading the central directory to get
# 1. the local header offsets
# 2. The compressed data length
);
@@ -629,7 +629,7 @@ sub _readZipHeader($)
*$self->{CompressedInputLength} = $compressedLength->get64bit();
}
- *$self->{ZipData}{CRC32} = crc32(undef);
+ *$self->{ZipData}{CRC32} = Compress::Raw::Zlib::crc32(undef);
*$self->{ZipData}{Method} = $compressedMethod;
if ($compressedMethod == ZIP_CM_DEFLATE)
{
@@ -745,7 +745,7 @@ sub filterUncompressed
*$self->{ZipData}{CRC32} = *$self->{Uncomp}->crc32() ;
}
else {
- *$self->{ZipData}{CRC32} = crc32(${$_[0]}, *$self->{ZipData}{CRC32}, $_[1]);
+ *$self->{ZipData}{CRC32} = Compress::Raw::Zlib::crc32(${$_[0]}, *$self->{ZipData}{CRC32}, $_[1]);
}
}
@@ -1841,7 +1841,7 @@ See the Changes file.
=head1 COPYRIGHT AND LICENSE
-Copyright (c) 2005-2011 Paul Marquess. All rights reserved.
+Copyright (c) 2005-2012 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
diff --git a/cpan/IO-Compress/t/000prereq.t b/cpan/IO-Compress/t/000prereq.t
index ad8aac2..5335953 100644
--- a/cpan/IO-Compress/t/000prereq.t
+++ b/cpan/IO-Compress/t/000prereq.t
@@ -25,7 +25,7 @@ BEGIN
if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 };
- my $VERSION = '2.045';
+ my $VERSION = '2.047';
my @NAMES = qw(
Compress::Raw::Bzip2
**** PATCH TRUNCATED AT 2000 LINES -- 211 NOT SHOWN ****
--
Perl5 Master Repository
-
[perl.git] branch blead, updated. v5.15.7-107-g422d641
by Chris 'Bingos' Williams