Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/bzip2/dist Import bzip2 1.0.8
details: https://anonhg.NetBSD.org/src/rev/6924c72ad52b
branches: trunk
changeset: 457797:6924c72ad52b
user: maya <maya%NetBSD.org@localhost>
date: Sun Jul 21 11:35:13 2019 +0000
description:
Import bzip2 1.0.8
diffstat:
external/bsd/bzip2/dist/CHANGES | 33 +-
external/bsd/bzip2/dist/LICENSE | 6 +-
external/bsd/bzip2/dist/Makefile | 6 +-
external/bsd/bzip2/dist/Makefile-libbz2_so | 14 +-
external/bsd/bzip2/dist/README | 39 +-
external/bsd/bzip2/dist/README.COMPILATION.PROBLEMS | 6 +-
external/bsd/bzip2/dist/README.XML.STUFF | 4 +-
external/bsd/bzip2/dist/blocksort.c | 12 +-
external/bsd/bzip2/dist/bz-html.xsl | 11 +-
external/bsd/bzip2/dist/bzdiff | 16 +-
external/bsd/bzip2/dist/bzgrep | 20 +-
external/bsd/bzip2/dist/bzip.css | 4 +-
external/bsd/bzip2/dist/bzlib.h | 6 +-
external/bsd/bzip2/dist/compress.c | 8 +-
external/bsd/bzip2/dist/crctable.c | 6 +-
external/bsd/bzip2/dist/entities.xml | 11 +-
external/bsd/bzip2/dist/format.pl | 4 +-
external/bsd/bzip2/dist/huffman.c | 6 +-
external/bsd/bzip2/dist/manual.html | 361 ++++++++++---------
external/bsd/bzip2/dist/manual.xml | 14 +-
external/bsd/bzip2/dist/mk251.c | 6 +-
external/bsd/bzip2/dist/randtable.c | 6 +-
external/bsd/bzip2/dist/spewG.c | 6 +-
external/bsd/bzip2/dist/unzcrash.c | 6 +-
external/bsd/bzip2/dist/words2 | 2 +-
external/bsd/bzip2/dist/xmlproc.sh | 4 +-
26 files changed, 321 insertions(+), 296 deletions(-)
diffs (truncated from 1581 to 300 lines):
diff -r a08042e7ea21 -r 6924c72ad52b external/bsd/bzip2/dist/CHANGES
--- a/external/bsd/bzip2/dist/CHANGES Sun Jul 21 11:14:18 2019 +0000
+++ b/external/bsd/bzip2/dist/CHANGES Sun Jul 21 11:35:13 2019 +0000
@@ -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 @@
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
diff -r a08042e7ea21 -r 6924c72ad52b external/bsd/bzip2/dist/LICENSE
--- a/external/bsd/bzip2/dist/LICENSE Sun Jul 21 11:14:18 2019 +0000
+++ b/external/bsd/bzip2/dist/LICENSE Sun Jul 21 11:35:13 2019 +0000
@@ -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 @@
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
--------------------------------------------------------------------------
diff -r a08042e7ea21 -r 6924c72ad52b external/bsd/bzip2/dist/Makefile
--- a/external/bsd/bzip2/dist/Makefile Sun Jul 21 11:14:18 2019 +0000
+++ b/external/bsd/bzip2/dist/Makefile Sun Jul 21 11:35:13 2019 +0000
@@ -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.
@@ -137,7 +137,7 @@
distclean: clean
rm -f manual.ps manual.html manual.pdf
-DISTNAME=bzip2-1.0.6
+DISTNAME=bzip2-1.0.8
dist: check manual
rm -f $(DISTNAME)
ln -s -f . $(DISTNAME)
diff -r a08042e7ea21 -r 6924c72ad52b external/bsd/bzip2/dist/Makefile-libbz2_so
--- a/external/bsd/bzip2/dist/Makefile-libbz2_so Sun Jul 21 11:14:18 2019 +0000
+++ b/external/bsd/bzip2/dist/Makefile-libbz2_so Sun Jul 21 11:35:13 2019 +0000
@@ -1,6 +1,6 @@
# This Makefile builds a shared version of the library,
-# libbz2.so.1.0.6, with soname libbz2.so.1.0,
+# libbz2.so.1.0.8, with soname libbz2.so.1.0,
# at least on x86-Linux (RedHat 7.2),
# with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98).
# Please see the README file for some important info
@@ -10,8 +10,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.
@@ -35,13 +35,13 @@
bzlib.o
all: $(OBJS)
- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
rm -f libbz2.so.1.0
- ln -s libbz2.so.1.0.6 libbz2.so.1.0
+ ln -s libbz2.so.1.0.8 libbz2.so.1.0
clean:
- rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
+ rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared
blocksort.o: blocksort.c
$(CC) $(CFLAGS) -c blocksort.c
diff -r a08042e7ea21 -r 6924c72ad52b external/bsd/bzip2/dist/README
--- a/external/bsd/bzip2/dist/README Sun Jul 21 11:14:18 2019 +0000
+++ b/external/bsd/bzip2/dist/README Sun Jul 21 11:35:13 2019 +0000
@@ -6,8 +6,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 this file.
@@ -73,7 +73,7 @@
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 @@
* Many small improvements in file and flag handling.
* A Y2K statement.
-WHAT'S NEW IN 1.0.0 ?
-
- See the CHANGES file.
-
-WHAT'S NEW IN 1.0.2 ?
-
- See the CHANGES file.
-
-WHAT'S NEW IN 1.0.3 ?
+WHAT'S NEW IN 1.0.x ?
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 @@
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)
diff -r a08042e7ea21 -r 6924c72ad52b external/bsd/bzip2/dist/README.COMPILATION.PROBLEMS
--- a/external/bsd/bzip2/dist/README.COMPILATION.PROBLEMS Sun Jul 21 11:14:18 2019 +0000
+++ b/external/bsd/bzip2/dist/README.COMPILATION.PROBLEMS Sun Jul 21 11:35:13 2019 +0000
@@ -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.
@@ -12,7 +12,7 @@
in the file LICENSE.
------------------------------------------------------------------
-bzip2-1.0.6 should compile without problems on the vast majority of
+bzip2 should compile without problems on the vast majority of
platforms. Using the supplied Makefile, I've built and tested it
myself for x86-linux and amd64-linux. With makefile.msc, Visual C++
6.0 and nmake, you can build a native Win32 version too. Large file
diff -r a08042e7ea21 -r 6924c72ad52b external/bsd/bzip2/dist/README.XML.STUFF
--- a/external/bsd/bzip2/dist/README.XML.STUFF Sun Jul 21 11:14:18 2019 +0000
+++ b/external/bsd/bzip2/dist/README.XML.STUFF Sun Jul 21 11:35:13 2019 +0000
@@ -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.
diff -r a08042e7ea21 -r 6924c72ad52b external/bsd/bzip2/dist/blocksort.c
--- a/external/bsd/bzip2/dist/blocksort.c Sun Jul 21 11:14:18 2019 +0000
+++ b/external/bsd/bzip2/dist/blocksort.c Sun Jul 21 11:35:13 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: blocksort.c,v 1.1.1.2 2012/05/07 00:41:45 wiz Exp $ */
+/* $NetBSD: blocksort.c,v 1.1.1.3 2019/07/21 11:35:29 maya Exp $ */
/*-------------------------------------------------------------*/
@@ -10,8 +10,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.
@@ -204,9 +204,9 @@
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)
diff -r a08042e7ea21 -r 6924c72ad52b external/bsd/bzip2/dist/bz-html.xsl
--- a/external/bsd/bzip2/dist/bz-html.xsl Sun Jul 21 11:14:18 2019 +0000
+++ b/external/bsd/bzip2/dist/bz-html.xsl Sun Jul 21 11:35:13 2019 +0000
@@ -7,11 +7,14 @@
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
<xsl:import href="bz-common.xsl"/>
-<!-- use 8859-1 encoding -->
-<xsl:output method="html" encoding="ISO-8859-1" indent="yes"/>
+<!-- use UTF-8 encoding -->
+<xsl:output method="html" encoding="UTF-8" indent="yes"/>
-<!-- we include the css directly when generating one large file -->
-<xsl:template name="user.head.content">
+<!-- we include the css as link and directly when generating one large file -->
+<xsl:template name="user.head.content">
+ <xsl:text disable-output-escaping="yes">
+<![CDATA[<]]>link rel="stylesheet" type="text/css" href="bzip.css" />
+ </xsl:text>
<style type="text/css" media="screen">
Home |
Main Index |
Thread Index |
Old Index