Update archivers/bzip2 to 1.0.8.  The original author is involved
again.

>From CHANGES:
* 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.
* Cleanup of bzdiff and bzgrep scripts so they don't use
  any bash extensions and handle multiple archives correctly.

There's also a HOMEPAGE again.

I have not touched the additional CFLAGS we have been cargo-culting
forward since forever.

Builds and passes make test on amd64 and arm64.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/archivers/bzip2/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- Makefile    28 Jun 2019 23:48:51 -0000      1.76
+++ Makefile    21 Aug 2019 20:35:06 -0000
@@ -2,11 +2,11 @@
 
 COMMENT=       block-sorting file compressor, unencumbered
 
-DISTNAME=      bzip2-1.0.7
+DISTNAME=      bzip2-1.0.8
 
 CATEGORIES=    archivers
 
-HOMEPAGE=      https://gitlab.com/federicomenaquintero/bzip2
+HOMEPAGE=      https://sourceware.org/bzip2/
 
 SHARED_LIBS=   bz2     10.4
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/archivers/bzip2/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo    28 Jun 2019 23:48:51 -0000      1.9
+++ distinfo    21 Aug 2019 20:35:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (bzip2-1.0.7.tar.gz) = 52iofFsaeVEUmb60FQC8xMryA3Jv/0am9fmtJ/4Iqys=
-SIZE (bzip2-1.0.7.tar.gz) = 809680
+SHA256 (bzip2-1.0.8.tar.gz) = q1oDF27hBtPw+pDjgdpHjdrkBZGBU8yiSOaCzQxKImk=
+SIZE (bzip2-1.0.8.tar.gz) = 810029
Index: patches/patch-bzgrep
===================================================================
RCS file: patches/patch-bzgrep
diff -N patches/patch-bzgrep
--- patches/patch-bzgrep        24 May 2014 20:51:55 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-bzgrep,v 1.1 2014/05/24 20:51:55 naddy Exp $
---- bzgrep.orig        Wed Jan  3 03:00:55 2007
-+++ bzgrep     Fri May 23 23:23:11 2014
-@@ -63,10 +63,12 @@ for i do
-     bzip2 -cdfq "$i" | $grep $opt "$pat"
-     r=$?
-   else
--    j=${i//\\/\\\\}
--    j=${j//|/\\|}
--    j=${j//&/\\&}
--    j=`printf "%s" "$j" | tr '\n' ' '`
-+    j=$(printf '%s\n' "$i" |
-+        sed '
-+          $!N
-+          $s/[&\|]/\\&/g
-+          $s/\n/ /g
-+        ')
-     bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
-     r=$?
-   fi
-- 
Christian "naddy" Weisgerber                          [email protected]

Reply via email to