pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers/bzip2 bzip2: Update to 1.0.8. This changes t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d72d0f50a29d
branches:  trunk
changeset: 336724:d72d0f50a29d
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Jul 21 11:51:24 2019 +0000

description:
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)

diffstat:

 archivers/bzip2/Makefile              |  13 +++++------
 archivers/bzip2/files/CHANGES         |  33 +++++++++++++++++++++++++++-
 archivers/bzip2/files/LICENSE         |   6 ++--
 archivers/bzip2/files/README          |  39 ++++++++-------------------------
 archivers/bzip2/files/blocksort.c     |  10 ++++----
 archivers/bzip2/files/bzdiff          |  16 +++++++-------
 archivers/bzip2/files/bzgrep          |  20 +++++++++++++----
 archivers/bzip2/files/bzip2.1         |   8 +++---
 archivers/bzip2/files/bzip2.c         |  40 ++++++++++++++++++----------------
 archivers/bzip2/files/bzip2recover.c  |  10 +++++---
 archivers/bzip2/files/bzlib.c         |   8 +++---
 archivers/bzip2/files/bzlib.h         |   4 +-
 archivers/bzip2/files/bzlib_private.h |   6 ++--
 archivers/bzip2/files/compress.c      |   6 ++--
 archivers/bzip2/files/crctable.c      |   4 +-
 archivers/bzip2/files/decompress.c    |  14 ++++++++---
 archivers/bzip2/files/huffman.c       |   4 +-
 archivers/bzip2/files/randtable.c     |   4 +-
 18 files changed, 137 insertions(+), 108 deletions(-)

diffs (truncated from 625 to 300 lines):

diff -r f3d4a32742da -r d72d0f50a29d archivers/bzip2/Makefile
--- a/archivers/bzip2/Makefile  Sun Jul 21 11:25:52 2019 +0000
+++ b/archivers/bzip2/Makefile  Sun Jul 21 11:51:24 2019 +0000
@@ -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
 
diff -r f3d4a32742da -r d72d0f50a29d archivers/bzip2/files/CHANGES
--- a/archivers/bzip2/files/CHANGES     Sun Jul 21 11:25:52 2019 +0000
+++ b/archivers/bzip2/files/CHANGES     Sun Jul 21 11:51:24 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 f3d4a32742da -r d72d0f50a29d archivers/bzip2/files/LICENSE
--- a/archivers/bzip2/files/LICENSE     Sun Jul 21 11:25:52 2019 +0000
+++ b/archivers/bzip2/files/LICENSE     Sun Jul 21 11:51:24 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 f3d4a32742da -r d72d0f50a29d archivers/bzip2/files/README
--- a/archivers/bzip2/files/README      Sun Jul 21 11:25:52 2019 +0000
+++ b/archivers/bzip2/files/README      Sun Jul 21 11:51:24 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 f3d4a32742da -r d72d0f50a29d archivers/bzip2/files/blocksort.c
--- a/archivers/bzip2/files/blocksort.c Sun Jul 21 11:25:52 2019 +0000
+++ b/archivers/bzip2/files/blocksort.c Sun Jul 21 11:51:24 2019 +0000
@@ -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 @@
       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 f3d4a32742da -r d72d0f50a29d archivers/bzip2/files/bzdiff
--- a/archivers/bzip2/files/bzdiff      Sun Jul 21 11:25:52 2019 +0000
+++ b/archivers/bzip2/files/bzdiff      Sun Jul 21 11:51:24 2019 +0000
@@ -37,10 +37,6 @@
        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 @@
                 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 @@
                         STAT="$?";;
                 esac;;
        esac
-        exit "$STAT"
 else
        echo "Usage: $prog [${comp}_options] file [file]"
        exit 1
 fi
+exit "$STAT"
diff -r f3d4a32742da -r d72d0f50a29d archivers/bzip2/files/bzgrep
--- a/archivers/bzip2/files/bzgrep      Sun Jul 21 11:25:52 2019 +0000
+++ b/archivers/bzip2/files/bzgrep      Sun Jul 21 11:51:24 2019 +0000
@@ -63,12 +63,22 @@
     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
diff -r f3d4a32742da -r d72d0f50a29d archivers/bzip2/files/bzip2.1
--- a/archivers/bzip2/files/bzip2.1     Sun Jul 21 11:25:52 2019 +0000
+++ b/archivers/bzip2/files/bzip2.1     Sun Jul 21 11:51:24 2019 +0000
@@ -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 @@
 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 @@
 
 
 .SH AUTHOR
-Julian Seward, jsewardbzip.org.
+Julian Seward, jseward%acm.org@localhost.



Home | Main Index | Thread Index | Old Index