pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/archivers/bzip2
Module Name: pkgsrc
Committed By: nia
Date: Sun Jul 21 11:51:24 UTC 2019
Modified Files:
pkgsrc/archivers/bzip2: Makefile
pkgsrc/archivers/bzip2/files: CHANGES LICENSE README blocksort.c bzdiff
bzgrep bzip2.1 bzip2.c bzip2recover.c bzlib.c bzlib.h
bzlib_private.h compress.c crctable.c decompress.c huffman.c
randtable.c
Log Message:
bzip2: Update to 1.0.8. This changes the upstream to sourceware.org.
1.0.8 (13 Jul 19)
~~~~~~~~~~~~~~~~~
* Accept as many selectors as the file format allows.
This relaxes the fix for CVE-2019-12900 from 1.0.7
so that bzip2 allows decompression of bz2 files that
use (too) many selectors again.
* Fix handling of large (> 4GB) files on Windows.
* Cleanup of bzdiff and bzgrep scripts so they don't use
any bash extensions and handle multiple archives correctly.
* There is now a bz2-files testsuite at
https://sourceware.org/git/bzip2-tests.git
1.0.7 (27 Jun 19)
~~~~~~~~~~~~~~~~~
* Fix undefined behavior in the macros SET_BH, CLEAR_BH, & ISSET_BH
* bzip2: Fix return value when combining --test,-t and -q.
* bzip2recover: Fix buffer overflow for large argv[0]
* bzip2recover: Fix use after free issue with outFile (CVE-2016-3189)
* Make sure nSelectors is not out of range (CVE-2019-12900)
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/archivers/bzip2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/archivers/bzip2/files/CHANGES \
pkgsrc/archivers/bzip2/files/LICENSE pkgsrc/archivers/bzip2/files/README \
pkgsrc/archivers/bzip2/files/blocksort.c \
pkgsrc/archivers/bzip2/files/bzip2.1 pkgsrc/archivers/bzip2/files/bzip2.c \
pkgsrc/archivers/bzip2/files/bzip2recover.c \
pkgsrc/archivers/bzip2/files/bzlib.c pkgsrc/archivers/bzip2/files/bzlib.h \
pkgsrc/archivers/bzip2/files/bzlib_private.h \
pkgsrc/archivers/bzip2/files/compress.c \
pkgsrc/archivers/bzip2/files/crctable.c \
pkgsrc/archivers/bzip2/files/decompress.c \
pkgsrc/archivers/bzip2/files/huffman.c \
pkgsrc/archivers/bzip2/files/randtable.c
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/archivers/bzip2/files/bzdiff \
pkgsrc/archivers/bzip2/files/bzgrep
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/archivers/bzip2/Makefile
diff -u pkgsrc/archivers/bzip2/Makefile:1.54 pkgsrc/archivers/bzip2/Makefile:1.55
--- pkgsrc/archivers/bzip2/Makefile:1.54 Thu Oct 9 14:05:51 2014
+++ pkgsrc/archivers/bzip2/Makefile Sun Jul 21 11:51:24 2019
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.54 2014/10/09 14:05:51 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2019/07/21 11:51:24 nia Exp $
#
-DISTNAME= bzip2-1.0.6
-PKGREVISION= 1
+DISTNAME= bzip2-1.0.8
CATEGORIES= archivers
-MASTER_SITES= http://www.bzip.org/1.0.6/
+MASTER_SITES= https://sourceware.org/pub/bzip2/
+DISTFILES= # empty
MAINTAINER= joerg%NetBSD.org@localhost
-HOMEPAGE= http://www.bzip.org/
+HOMEPAGE= https://sourceware.org/bzip2/
COMMENT= Block-sorting file compressor
-
-DISTFILES= # empty
+LICENSE= zlib # ish
REPLACE_SH= bzdiff bzgrep bzmore
Index: pkgsrc/archivers/bzip2/files/CHANGES
diff -u pkgsrc/archivers/bzip2/files/CHANGES:1.3 pkgsrc/archivers/bzip2/files/CHANGES:1.4
--- pkgsrc/archivers/bzip2/files/CHANGES:1.3 Wed Sep 22 14:48:41 2010
+++ pkgsrc/archivers/bzip2/files/CHANGES Sun Jul 21 11:51:24 2019
@@ -2,8 +2,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@localhost>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward%acm.org@localhost>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -325,3 +325,32 @@ Security fix only. Fixes CERT-FI 20469
Izdebski.
* Make the documentation build on Ubuntu 10.04
+
+1.0.7 (27 Jun 19)
+~~~~~~~~~~~~~~~~~
+
+* Fix undefined behavior in the macros SET_BH, CLEAR_BH, & ISSET_BH
+
+* bzip2: Fix return value when combining --test,-t and -q.
+
+* bzip2recover: Fix buffer overflow for large argv[0]
+
+* bzip2recover: Fix use after free issue with outFile (CVE-2016-3189)
+
+* Make sure nSelectors is not out of range (CVE-2019-12900)
+
+1.0.8 (13 Jul 19)
+~~~~~~~~~~~~~~~~~
+
+* Accept as many selectors as the file format allows.
+ This relaxes the fix for CVE-2019-12900 from 1.0.7
+ so that bzip2 allows decompression of bz2 files that
+ use (too) many selectors again.
+
+* Fix handling of large (> 4GB) files on Windows.
+
+* Cleanup of bzdiff and bzgrep scripts so they don't use
+ any bash extensions and handle multiple archives correctly.
+
+* There is now a bz2-files testsuite at
+ https://sourceware.org/git/bzip2-tests.git
Index: pkgsrc/archivers/bzip2/files/LICENSE
diff -u pkgsrc/archivers/bzip2/files/LICENSE:1.3 pkgsrc/archivers/bzip2/files/LICENSE:1.4
--- pkgsrc/archivers/bzip2/files/LICENSE:1.3 Thu Sep 23 11:03:35 2010
+++ pkgsrc/archivers/bzip2/files/LICENSE Sun Jul 21 11:51:24 2019
@@ -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, O
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@localhost
-bzip2/libbzip2 version 1.0.6 of 6 September 2010
+Julian Seward, jseward%acm.org@localhost
+bzip2/libbzip2 version 1.0.8 of 13 July 2019
--------------------------------------------------------------------------
Index: pkgsrc/archivers/bzip2/files/README
diff -u pkgsrc/archivers/bzip2/files/README:1.3 pkgsrc/archivers/bzip2/files/README:1.4
--- pkgsrc/archivers/bzip2/files/README:1.3 Wed Sep 22 14:48:41 2010
+++ pkgsrc/archivers/bzip2/files/README Sun Jul 21 11:51:24 2019
@@ -6,8 +6,8 @@ This version is fully compatible with th
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@localhost>
+bzip2/libbzip2 version 1.0.8 of 13 July 2019
+Copyright (C) 1996-2019 Julian Seward <jseward%acm.org@localhost>
Please read the WARNING, DISCLAIMER and PATENTS sections in this file.
@@ -73,7 +73,7 @@ HOW TO BUILD -- Windows 95, NT, DOS, Mac
It's difficult for me to support compilation on all these platforms.
My approach is to collect binaries for these platforms, and put them
-on the master web site (http://www.bzip.org). Look there. However
+on the master web site (https://sourceware.org/bzip2/). Look there. However
(FWIW), bzip2-1.0.X is very standard ANSI C and should compile
unmodified with MS Visual C. If you have difficulties building, you
might want to read README.COMPILATION.PROBLEMS.
@@ -161,43 +161,22 @@ WHAT'S NEW IN 0.9.5 ?
* Many small improvements in file and flag handling.
* A Y2K statement.
-WHAT'S NEW IN 1.0.0 ?
+WHAT'S NEW IN 1.0.x ?
See the CHANGES file.
-WHAT'S NEW IN 1.0.2 ?
-
- See the CHANGES file.
-
-WHAT'S NEW IN 1.0.3 ?
-
- See the CHANGES file.
-
-WHAT'S NEW IN 1.0.4 ?
-
- See the CHANGES file.
-
-WHAT'S NEW IN 1.0.5 ?
-
- See the CHANGES file.
-
-WHAT'S NEW IN 1.0.6 ?
-
- See the CHANGES file.
-
-
-I hope you find bzip2 useful. Feel free to contact me at
- jseward%bzip.org@localhost
+I hope you find bzip2 useful. Feel free to contact the developers at
+ bzip2-devel%sourceware.org@localhost
if you have any suggestions or queries. Many people mailed me with
comments, suggestions and patches after the releases of bzip-0.15,
bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this
feedback. I thank you for your comments.
-bzip2's "home" is http://www.bzip.org/
+bzip2's "home" is https://sourceware.org/bzip2/
Julian Seward
-jseward%bzip.org@localhost
+jseward%acm.org@localhost
Cambridge, UK.
18 July 1996 (version 0.15)
@@ -213,3 +192,5 @@ Cambridge, UK.
20 December 2006 (bzip2, version 1.0.4)
10 December 2007 (bzip2, version 1.0.5)
6 Sept 2010 (bzip2, version 1.0.6)
+27 June 2019 (bzip2, version 1.0.7)
+13 July 2019 (bzip2, version 1.0.8)
Index: pkgsrc/archivers/bzip2/files/blocksort.c
diff -u pkgsrc/archivers/bzip2/files/blocksort.c:1.3 pkgsrc/archivers/bzip2/files/blocksort.c:1.4
--- pkgsrc/archivers/bzip2/files/blocksort.c:1.3 Thu Sep 23 11:03:35 2010
+++ pkgsrc/archivers/bzip2/files/blocksort.c Sun Jul 21 11:51:24 2019
@@ -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@localhost>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward%acm.org@localhost>
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] |= (1 << ((zz) & 31))
-#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31))
-#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1 << ((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)
Index: pkgsrc/archivers/bzip2/files/bzip2.1
diff -u pkgsrc/archivers/bzip2/files/bzip2.1:1.3 pkgsrc/archivers/bzip2/files/bzip2.1:1.4
--- pkgsrc/archivers/bzip2/files/bzip2.1:1.3 Thu Sep 23 11:03:35 2010
+++ pkgsrc/archivers/bzip2/files/bzip2.1 Sun Jul 21 11:51:24 2019
@@ -1,7 +1,7 @@
.PU
.TH bzip2 1
.SH NAME
-bzip2, bunzip2 \- a block-sorting file compressor, v1.0.6
+bzip2, bunzip2 \- a block-sorting file compressor, v1.0.8
.br
bzcat \- decompresses files to stdout
.br
@@ -405,7 +405,7 @@ I/O error messages are not as helpful as
tries hard to detect I/O errors and exit cleanly, but the details of
what the problem is sometimes seem rather misleading.
-This manual page pertains to version 1.0.6 of
+This manual page pertains to version 1.0.8 of
.I bzip2.
Compressed data created by this version is entirely forwards and
backwards compatible with the previous public releases, versions
@@ -427,9 +427,9 @@ with MaybeUInt64 set to be an unsigned 6
.SH AUTHOR
-Julian Seward, jsewardbzip.org.
+Julian Seward, jseward%acm.org@localhost.
-http://www.bzip.org
+https://sourceware.org/bzip2/
The ideas embodied in
.I bzip2
Index: pkgsrc/archivers/bzip2/files/bzip2.c
diff -u pkgsrc/archivers/bzip2/files/bzip2.c:1.3 pkgsrc/archivers/bzip2/files/bzip2.c:1.4
--- pkgsrc/archivers/bzip2/files/bzip2.c:1.3 Thu Sep 23 11:03:35 2010
+++ pkgsrc/archivers/bzip2/files/bzip2.c Sun Jul 21 11:51:24 2019
@@ -7,8 +7,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@localhost>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward%acm.org@localhost>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -128,12 +128,12 @@
#if BZ_LCCWIN32
# include <io.h>
# include <fcntl.h>
-# include <sys\stat.h>
+# include <sys/stat.h>
# define NORETURN /**/
# define PATH_SEP '\\'
-# define MY_LSTAT _stat
-# define MY_STAT _stat
+# define MY_LSTAT _stati64
+# define MY_STAT _stati64
# define MY_S_ISREG(x) ((x) & _S_IFREG)
# define MY_S_ISDIR(x) ((x) & _S_IFDIR)
@@ -554,7 +554,7 @@ static
Bool testStream ( FILE *zStream )
{
BZFILE* bzf = NULL;
- Int32 bzerr, bzerr_dummy, ret, nread, streamNo, i;
+ Int32 bzerr, bzerr_dummy, ret, streamNo, i;
UChar obuf[5000];
UChar unused[BZ_MAX_UNUSED];
Int32 nUnused;
@@ -577,7 +577,7 @@ Bool testStream ( FILE *zStream )
streamNo++;
while (bzerr == BZ_OK) {
- nread = BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
+ BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
if (bzerr == BZ_DATA_ERROR_MAGIC) goto errhandler;
}
if (bzerr != BZ_STREAM_END) goto errhandler;
@@ -748,8 +748,8 @@ void panic ( const Char* s )
fprintf ( stderr,
"\n%s: PANIC -- internal consistency error:\n"
"\t%s\n"
- "\tThis is a BUG. Please report it to me at:\n"
- "\tjseward%bzip.org@localhost\n",
+ "\tThis is a BUG. Please report it to:\n"
+ "\tbzip2-devel%sourceware.org@localhost\n",
progName, s );
showFileNames();
cleanUpAndFail( 3 );
@@ -829,7 +829,7 @@ void mySIGSEGVorSIGBUScatcher ( IntNativ
" The user's manual, Section 4.3, has more info on (1) and (2).\n"
" \n"
" If you suspect this is a bug in bzip2, or are unsure about (1)\n"
- " or (2), feel free to report it to me at: jseward%bzip.org@localhost.\n"
+ " or (2), feel free to report it to: bzip2-devel%sourceware.org@localhost.\n"
" Section 4.3 of the user's manual describes the info a useful\n"
" bug report should have. If the manual is available on your\n"
" system, please try and read it before mailing me. If you don't\n"
@@ -852,7 +852,7 @@ void mySIGSEGVorSIGBUScatcher ( IntNativ
" The user's manual, Section 4.3, has more info on (2) and (3).\n"
" \n"
" If you suspect this is a bug in bzip2, or are unsure about (2)\n"
- " or (3), feel free to report it to me at: jseward%bzip.org@localhost.\n"
+ " or (3), feel free to report it to: bzip2-devel%sourceware.org@localhost.\n"
" Section 4.3 of the user's manual describes the info a useful\n"
" bug report should have. If the manual is available on your\n"
" system, please try and read it before mailing me. If you don't\n"
@@ -1605,11 +1605,11 @@ void license ( void )
"bzip2, a block-sorting file compressor. "
"Version %s.\n"
" \n"
- " Copyright (C) 1996-2010 by Julian Seward.\n"
+ " Copyright (C) 1996-2019 by Julian Seward.\n"
" \n"
" This program is free software; you can redistribute it and/or modify\n"
" it under the terms set out in the LICENSE file, which is included\n"
- " in the bzip2-1.0.6 source distribution.\n"
+ " in the bzip2 source distribution.\n"
" \n"
" This program is distributed in the hope that it will be useful,\n"
" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -2003,12 +2003,14 @@ IntNative main ( IntNative argc, Char *a
testf ( aa->name );
}
}
- if (testFailsExist && noisy) {
- fprintf ( stderr,
- "\n"
- "You can use the `bzip2recover' program to attempt to recover\n"
- "data from undamaged sections of corrupted files.\n\n"
- );
+ if (testFailsExist) {
+ if (noisy) {
+ fprintf ( stderr,
+ "\n"
+ "You can use the `bzip2recover' program to attempt to recover\n"
+ "data from undamaged sections of corrupted files.\n\n"
+ );
+ }
setExit(2);
exit(exitValue);
}
Index: pkgsrc/archivers/bzip2/files/bzip2recover.c
diff -u pkgsrc/archivers/bzip2/files/bzip2recover.c:1.3 pkgsrc/archivers/bzip2/files/bzip2recover.c:1.4
--- pkgsrc/archivers/bzip2/files/bzip2recover.c:1.3 Thu Sep 23 11:03:35 2010
+++ pkgsrc/archivers/bzip2/files/bzip2recover.c Sun Jul 21 11:51:24 2019
@@ -7,8 +7,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@localhost>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward%acm.org@localhost>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -309,11 +309,12 @@ Int32 main ( Int32 argc, Char** argv )
UInt32 buffHi, buffLo, blockCRC;
Char* p;
- strcpy ( progName, argv[0] );
+ strncpy ( progName, argv[0], BZ_MAX_FILENAME-1);
+ progName[BZ_MAX_FILENAME-1]='\0';
inFileName[0] = outFileName[0] = 0;
fprintf ( stderr,
- "bzip2recover 1.0.6: extracts blocks from damaged .bz2 files.\n" );
+ "bzip2recover 1.0.8: extracts blocks from damaged .bz2 files.\n" );
if (argc != 2) {
fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n",
@@ -457,6 +458,7 @@ Int32 main ( Int32 argc, Char** argv )
bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
bsPutUInt32 ( bsWr, blockCRC );
bsClose ( bsWr );
+ outFile = NULL;
}
if (wrBlock >= rbCtr) break;
wrBlock++;
Index: pkgsrc/archivers/bzip2/files/bzlib.c
diff -u pkgsrc/archivers/bzip2/files/bzlib.c:1.3 pkgsrc/archivers/bzip2/files/bzlib.c:1.4
--- pkgsrc/archivers/bzip2/files/bzlib.c:1.3 Thu Sep 23 11:03:35 2010
+++ pkgsrc/archivers/bzip2/files/bzlib.c Sun Jul 21 11:51:24 2019
@@ -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@localhost>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward%acm.org@localhost>
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@localhost. If this happened\n"
+ "Please report it to: bzip2-devel%sourceware.org@localhost. 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()
);
Index: pkgsrc/archivers/bzip2/files/bzlib.h
diff -u pkgsrc/archivers/bzip2/files/bzlib.h:1.3 pkgsrc/archivers/bzip2/files/bzlib.h:1.4
--- pkgsrc/archivers/bzip2/files/bzlib.h:1.3 Thu Sep 23 11:03:35 2010
+++ pkgsrc/archivers/bzip2/files/bzlib.h Sun Jul 21 11:51:24 2019
@@ -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@localhost>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward%acm.org@localhost>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
Index: pkgsrc/archivers/bzip2/files/bzlib_private.h
diff -u pkgsrc/archivers/bzip2/files/bzlib_private.h:1.3 pkgsrc/archivers/bzip2/files/bzlib_private.h:1.4
--- pkgsrc/archivers/bzip2/files/bzlib_private.h:1.3 Thu Sep 23 11:03:35 2010
+++ pkgsrc/archivers/bzip2/files/bzlib_private.h Sun Jul 21 11:51:24 2019
@@ -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@localhost>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward%acm.org@localhost>
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;
Index: pkgsrc/archivers/bzip2/files/compress.c
diff -u pkgsrc/archivers/bzip2/files/compress.c:1.3 pkgsrc/archivers/bzip2/files/compress.c:1.4
--- pkgsrc/archivers/bzip2/files/compress.c:1.3 Thu Sep 23 11:03:35 2010
+++ pkgsrc/archivers/bzip2/files/compress.c Sun Jul 21 11:51:24 2019
@@ -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@localhost>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward%acm.org@localhost>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -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 );
Index: pkgsrc/archivers/bzip2/files/crctable.c
diff -u pkgsrc/archivers/bzip2/files/crctable.c:1.3 pkgsrc/archivers/bzip2/files/crctable.c:1.4
--- pkgsrc/archivers/bzip2/files/crctable.c:1.3 Thu Sep 23 11:03:35 2010
+++ pkgsrc/archivers/bzip2/files/crctable.c Sun Jul 21 11:51:24 2019
@@ -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@localhost>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward%acm.org@localhost>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
Index: pkgsrc/archivers/bzip2/files/decompress.c
diff -u pkgsrc/archivers/bzip2/files/decompress.c:1.3 pkgsrc/archivers/bzip2/files/decompress.c:1.4
--- pkgsrc/archivers/bzip2/files/decompress.c:1.3 Wed Sep 22 14:48:41 2010
+++ pkgsrc/archivers/bzip2/files/decompress.c Sun Jul 21 11:51:24 2019
@@ -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@localhost>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward%acm.org@localhost>
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. ---*/
{
Index: pkgsrc/archivers/bzip2/files/huffman.c
diff -u pkgsrc/archivers/bzip2/files/huffman.c:1.3 pkgsrc/archivers/bzip2/files/huffman.c:1.4
--- pkgsrc/archivers/bzip2/files/huffman.c:1.3 Thu Sep 23 11:03:35 2010
+++ pkgsrc/archivers/bzip2/files/huffman.c Sun Jul 21 11:51:24 2019
@@ -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@localhost>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward%acm.org@localhost>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
Index: pkgsrc/archivers/bzip2/files/randtable.c
diff -u pkgsrc/archivers/bzip2/files/randtable.c:1.3 pkgsrc/archivers/bzip2/files/randtable.c:1.4
--- pkgsrc/archivers/bzip2/files/randtable.c:1.3 Thu Sep 23 11:03:35 2010
+++ pkgsrc/archivers/bzip2/files/randtable.c Sun Jul 21 11:51:24 2019
@@ -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@localhost>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward%acm.org@localhost>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
Index: pkgsrc/archivers/bzip2/files/bzdiff
diff -u pkgsrc/archivers/bzip2/files/bzdiff:1.1.1.1 pkgsrc/archivers/bzip2/files/bzdiff:1.2
--- pkgsrc/archivers/bzip2/files/bzdiff:1.1.1.1 Wed Sep 22 14:32:17 2010
+++ pkgsrc/archivers/bzip2/files/bzdiff Sun Jul 21 11:51:24 2019
@@ -37,10 +37,6 @@ if test -z "$FILES"; then
echo "Usage: $prog [${comp}_options] file [file]"
exit 1
fi
-tmp=`mktemp ${TMPDIR:-/tmp}/bzdiff.XXXXXXXXXX` || {
- echo 'cannot create a temporary file' >&2
- exit 1
-}
set $FILES
if test $# -eq 1; then
FILE=`echo "$1" | sed 's/.bz2$//'`
@@ -53,10 +49,14 @@ elif test $# -eq 2; then
case "$2" in
*.bz2)
F=`echo "$2" | sed 's|.*/||;s|.bz2$||'`
- bzip2 -cdfq "$2" > $tmp
- bzip2 -cdfq "$1" | $comp $OPTIONS - $tmp
+ tmp=`mktemp "${TMPDIR:-/tmp}"/bzdiff.XXXXXXXXXX` || {
+ echo 'cannot create a temporary file' >&2
+ exit 1
+ }
+ bzip2 -cdfq "$2" > "$tmp"
+ bzip2 -cdfq "$1" | $comp $OPTIONS - "$tmp"
STAT="$?"
- /bin/rm -f $tmp;;
+ /bin/rm -f "$tmp";;
*) bzip2 -cdfq "$1" | $comp $OPTIONS - "$2"
STAT="$?";;
@@ -69,8 +69,8 @@ elif test $# -eq 2; then
STAT="$?";;
esac;;
esac
- exit "$STAT"
else
echo "Usage: $prog [${comp}_options] file [file]"
exit 1
fi
+exit "$STAT"
Index: pkgsrc/archivers/bzip2/files/bzgrep
diff -u pkgsrc/archivers/bzip2/files/bzgrep:1.1.1.1 pkgsrc/archivers/bzip2/files/bzgrep:1.2
--- pkgsrc/archivers/bzip2/files/bzgrep:1.1.1.1 Wed Sep 22 14:32:17 2010
+++ pkgsrc/archivers/bzip2/files/bzgrep Sun Jul 21 11:51:24 2019
@@ -63,12 +63,22 @@ for i do
bzip2 -cdfq "$i" | $grep $opt "$pat"
r=$?
else
- j=${i//\\/\\\\}
- j=${j//|/\\|}
- j=${j//&/\\&}
+ j=$(echo "$i" | sed 's/\\/&&/g;s/|/\\&/g;s/&/\\&/g')
j=`printf "%s" "$j" | tr '\n' ' '`
- bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
- r=$?
+ # A trick adapted from
+ # https://groups.google.com/forum/#!original/comp.unix.shell/x1345iu10eg/Nn1n-1r1uU0J
+ # that has the same effect as the following bash code:
+ # bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
+ # r=${PIPESTATUS[1]}
+ exec 3>&1
+ eval `
+ exec 4>&1 >&3 3>&-
+ {
+ bzip2 -cdfq "$i" 4>&-
+ } | {
+ $grep $opt "$pat" 4>&-; echo "r=$?;" >&4
+ } | sed "s|^|${j}:|"
+ `
fi
test "$r" -ne 0 && res="$r"
done
Home |
Main Index |
Thread Index |
Old Index