summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris 'BinGOs' Williams <chris@bingosnet.co.uk>2020-02-12 17:46:04 +0000
committerSteve Hay <steve.m.hay@googlemail.com>2020-02-12 17:46:30 +0000
commit9fe9294d6c1f24ed271a08d4720e83958fe71278 (patch)
tree71b51917cd92fcfc21451a916fd188364533d741
parent510a4b6a4e7b853c488ed6406503b4db5df212c6 (diff)
downloadperl-9fe9294d6c1f24ed271a08d4720e83958fe71278.tar.gz
Update Compress-Raw-Bzip2 to CPAN version 2.089
[Delta] 2.089 3 November 2019 * No Changes 2.088 31 October 2019 * Add Support Details 37e04fb3dc50287a3512b004282425c6eedb8af6 * upgrade to Bzip2 1.0.8 027a30848ee57731b435d2ea7af09e532bf6fbfd (cherry picked from commit 1bff26779d92ed756b7d4e5be908124dd5a0a450)
-rwxr-xr-xPorting/Maintainers.pl2
-rw-r--r--cpan/Compress-Raw-Bzip2/bzip2-src/LICENSE6
-rw-r--r--cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c12
-rw-r--r--cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.c18
-rw-r--r--cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.h4
-rw-r--r--cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h6
-rw-r--r--cpan/Compress-Raw-Bzip2/bzip2-src/compress.c10
-rw-r--r--cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c4
-rw-r--r--cpan/Compress-Raw-Bzip2/bzip2-src/decompress.c14
-rw-r--r--cpan/Compress-Raw-Bzip2/bzip2-src/huffman.c4
-rw-r--r--cpan/Compress-Raw-Bzip2/bzip2-src/randtable.c4
-rw-r--r--cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm10
-rw-r--r--cpan/Compress-Raw-Bzip2/t/000prereq.t2
13 files changed, 48 insertions, 48 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index dfc7b50441..991e57d3ce 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -207,7 +207,7 @@ use File::Glob qw(:case);
},
'Compress::Raw::Bzip2' => {
- 'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.084.tar.gz',
+ 'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.089.tar.gz',
'FILES' => q[cpan/Compress-Raw-Bzip2],
'EXCLUDED' => [
qr{^t/Test/},
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/LICENSE b/cpan/Compress-Raw-Bzip2/bzip2-src/LICENSE
index cc614178cf..81a37eab7a 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/LICENSE
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/LICENSE
@@ -2,7 +2,7 @@
--------------------------------------------------------------------------
This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2010 Julian R Seward. All
+documentation, are copyright (C) 1996-2019 Julian R Seward. All
rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Julian Seward, jseward@bzip.org
-bzip2/libbzip2 version 1.0.6 of 6 September 2010
+Julian Seward, jseward@acm.org
+bzip2/libbzip2 version 1.0.8 of 13 July 2019
--------------------------------------------------------------------------
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c b/cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c
index 605b665883..92d81fe287 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/blocksort.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.6 of 6 September 2010
- Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -202,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap,
bhtab [ 0 .. 2+(nblock/32) ] destroyed
*/
-#define SET_BH(zz) bhtab[(zz) >> 5] |= (1U << ((zz) & 31))
-#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1U << ((zz) & 31))
-#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1U << ((zz) & 31)))
+#define SET_BH(zz) bhtab[(zz) >> 5] |= ((UInt32)1 << ((zz) & 31))
+#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~((UInt32)1 << ((zz) & 31))
+#define ISSET_BH(zz) (bhtab[(zz) >> 5] & ((UInt32)1 << ((zz) & 31)))
#define WORD_BH(zz) bhtab[(zz) >> 5]
#define UNALIGNED_BH(zz) ((zz) & 0x01f)
@@ -477,7 +477,7 @@ Bool mainGtU ( UInt32 i1,
usually small, typically <= 20.
--*/
static
-const Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280,
+Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280,
9841, 29524, 88573, 265720,
797161, 2391484 };
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.c b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.c
index 68cab7e9cf..aaf1b4005b 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.6 of 6 September 2010
- Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -43,12 +43,12 @@ void BZ2_bz__AssertH__fail ( int errcode )
fprintf(stderr,
"\n\nbzip2/libbzip2: internal error number %d.\n"
"This is a bug in bzip2/libbzip2, %s.\n"
- "Please report it to me at: jseward@bzip.org. If this happened\n"
+ "Please report it to: bzip2-devel@sourceware.org. If this happened\n"
"when you were using some program which uses libbzip2 as a\n"
"component, you should also report this bug to the author(s)\n"
"of that program. Please make an effort to report this bug;\n"
"timely and accurate bug reports eventually lead to higher\n"
- "quality software. Thanks. Julian Seward, 10 December 2007.\n\n",
+ "quality software. Thanks.\n\n",
errcode,
BZ2_bzlibVersion()
);
@@ -98,29 +98,19 @@ int bz_config_ok ( void )
/*---------------------------------------------------*/
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
static
void* default_bzalloc ( void* opaque, Int32 items, Int32 size )
{
void* v = malloc ( items * size );
- (void)opaque;
return v;
}
static
void default_bzfree ( void* opaque, void* addr )
{
- (void)opaque;
if (addr != NULL) free ( addr );
}
-#ifdef __cplusplus
-}
-#endif
/*---------------------------------------------------*/
static
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.h b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.h
index 8277123da8..8966a6c580 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.h
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib.h
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.6 of 6 September 2010
- Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h
index a18585db82..2578c2dcf2 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/bzlib_private.h
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.6 of 6 September 2010
- Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -36,7 +36,7 @@
/*-- General stuff. --*/
-#define BZ_VERSION "1.0.6, 6-Sept-2010"
+#define BZ_VERSION "1.0.8, 13-Jul-2019"
typedef char Char;
typedef unsigned char Bool;
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/compress.c b/cpan/Compress-Raw-Bzip2/bzip2-src/compress.c
index 07330787ce..5dfa00231b 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/compress.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/compress.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.6 of 6 September 2010
- Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -353,7 +353,7 @@ void sendMTFValues ( EState* s )
Calculate the cost of this group as coded
by each of the coding tables.
--*/
- for (t = 0; t < BZ_N_GROUPS; t++) cost[t] = 0;
+ for (t = 0; t < nGroups; t++) cost[t] = 0;
if (nGroups == 6 && 50 == ge-gs+1) {
/*--- fast track the common case ---*/
@@ -454,7 +454,7 @@ void sendMTFValues ( EState* s )
AssertH( nGroups < 8, 3002 );
AssertH( nSelectors < 32768 &&
- nSelectors <= (2 + (900000 / BZ_G_SIZE)),
+ nSelectors <= BZ_MAX_SELECTORS,
3003 );
@@ -593,8 +593,6 @@ void sendMTFValues ( EState* s )
}
AssertH( selCtr == nSelectors, 3007 );
- (void)nBytes; /* only set, not used */
-
if (s->verbosity >= 3)
VPrintf1( "codes %d\n", s->numZ-nBytes );
}
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c b/cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c
index 9616312d7d..a9212dbf2c 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/crctable.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.6 of 6 September 2010
- Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/decompress.c b/cpan/Compress-Raw-Bzip2/bzip2-src/decompress.c
index 5441735e4f..5afd651578 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/decompress.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/decompress.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.6 of 6 September 2010
- Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -285,7 +285,7 @@ Int32 BZ2_decompress ( DState* s )
/*--- Now the selectors ---*/
GET_BITS(BZ_X_SELECTOR_1, nGroups, 3);
- if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
+ if (nGroups < 2 || nGroups > BZ_N_GROUPS) RETURN(BZ_DATA_ERROR);
GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
for (i = 0; i < nSelectors; i++) {
@@ -296,8 +296,14 @@ Int32 BZ2_decompress ( DState* s )
j++;
if (j >= nGroups) RETURN(BZ_DATA_ERROR);
}
- s->selectorMtf[i] = j;
+ /* Having more than BZ_MAX_SELECTORS doesn't make much sense
+ since they will never be used, but some implementations might
+ "round up" the number of selectors, so just ignore those. */
+ if (i < BZ_MAX_SELECTORS)
+ s->selectorMtf[i] = j;
}
+ if (nSelectors > BZ_MAX_SELECTORS)
+ nSelectors = BZ_MAX_SELECTORS;
/*--- Undo the MTF values for the selectors. ---*/
{
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/huffman.c b/cpan/Compress-Raw-Bzip2/bzip2-src/huffman.c
index 2283fdbc5a..43a1899e46 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/huffman.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/huffman.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.6 of 6 September 2010
- Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
diff --git a/cpan/Compress-Raw-Bzip2/bzip2-src/randtable.c b/cpan/Compress-Raw-Bzip2/bzip2-src/randtable.c
index 4a2fd189b0..70666a1249 100644
--- a/cpan/Compress-Raw-Bzip2/bzip2-src/randtable.c
+++ b/cpan/Compress-Raw-Bzip2/bzip2-src/randtable.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.6 of 6 September 2010
- Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
diff --git a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
index 8165115ea3..ce2ac2a398 100644
--- a/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
+++ b/cpan/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm
@@ -11,7 +11,7 @@ use Carp ;
use bytes ;
our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD);
-$VERSION = '2.084';
+$VERSION = '2.089';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
@@ -354,6 +354,12 @@ The following bzip2 constants are exported by this module
BZ_OUTBUFF_FULL
BZ_CONFIG_ERROR
+=head1 SUPPORT
+
+General feedback/questions/bug reports should be sent to
+L<https://github.com/pmqs/Compress-Raw-Bzip2/issues> (preferred) or
+L<https://rt.cpan.org/Public/Dist/Display.html?Name=Compress-Raw-Bzip2>.
+
=head1 SEE ALSO
L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzma>, L<IO::Uncompress::UnLzma>, L<IO::Compress::Xz>, L<IO::Uncompress::UnXz>, L<IO::Compress::Lzip>, L<IO::Uncompress::UnLzip>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Compress::Zstd>, L<IO::Uncompress::UnZstd>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress>
@@ -364,7 +370,7 @@ L<File::GlobMapper|File::GlobMapper>, L<Archive::Zip|Archive::Zip>,
L<Archive::Tar|Archive::Tar>,
L<IO::Zlib|IO::Zlib>
-The primary site for the bzip2 program is L<http://www.bzip.org>.
+The primary site for the bzip2 program is L<https://sourceware.org/bzip2/>.
See the module L<Compress::Bzip2|Compress::Bzip2>
diff --git a/cpan/Compress-Raw-Bzip2/t/000prereq.t b/cpan/Compress-Raw-Bzip2/t/000prereq.t
index 624a3124f7..8f66d402d0 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.084';
+ my $VERSION = '2.089';
my @NAMES = qw(
);