Mercurial > vanilla
changeset 1228:2ec94b9ae47c
compression/bzip2: upgrade to 1.0.8
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sat, 30 Oct 2021 09:51:29 +0200 |
parents | 8d69cb370f29 |
children | 1abfd089a15a |
files | compression/bzip2/bzip2.sh compression/bzip2/bzip2.sha1 compression/bzip2/patch-CVE-2016-3189.patch compression/bzip2/patch-fhs.patch |
diffstat | 4 files changed, 51 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/compression/bzip2/bzip2.sh Sat Oct 30 09:34:57 2021 +0200 +++ b/compression/bzip2/bzip2.sh Sat Oct 30 09:51:29 2021 +0200 @@ -16,11 +16,11 @@ # PKGNAME=bzip2 -PKGVERSION=1.0.6 +PKGVERSION=1.0.8 PKGREVISION=1 PKGLICENSE="BSD" PKGSUMMARY="data compression program and library" -PKGDOWNLOAD="https://downloads.sourceforge.net/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" +PKGDOWNLOAD="https://sourceware.org/pub/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" : ${CC:=clang} : ${CFLAGS:=-O2} @@ -32,10 +32,9 @@ build() { rm -rf $PKGNAME-$PKGVERSION - tar xvf $PKGNAME-$PKGVERSION.tar.gz + tar -xvf $PKGNAME-$PKGVERSION.tar.gz cd $PKGNAME-$PKGVERSION - patch -p1 < ../patch-CVE-2016-3189.patch patch -p0 < ../patch-fhs.patch sed -i -e 's/$(PREFIX)/$(DESTDIR)$(PREFIX)/g' Makefile make CC="$CC" CFLAGS="$CFLAGS" all
--- a/compression/bzip2/bzip2.sha1 Sat Oct 30 09:34:57 2021 +0200 +++ b/compression/bzip2/bzip2.sha1 Sat Oct 30 09:51:29 2021 +0200 @@ -1,1 +1,1 @@ -3f89f861209ce81a6bab1fd1998c0ef311712002 bzip2-1.0.6.tar.gz +bf7badf7e248e0ecf465d33c2f5aeec774209227 bzip2-1.0.8.tar.gz
--- a/compression/bzip2/patch-CVE-2016-3189.patch Sat Oct 30 09:34:57 2021 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff --git a/bzip2recover.c b/bzip2recover.c -index f9de049..d159c92 100644 ---- a/bzip2recover.c -+++ b/bzip2recover.c -@@ -457,6 +457,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++;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/compression/bzip2/patch-fhs.patch Sat Oct 30 09:51:29 2021 +0200 @@ -0,0 +1,47 @@ +--- Makefile.orig 2019-08-20 12:39:56.784492094 +0200 ++++ Makefile 2019-08-20 12:40:37.440493343 +0200 +@@ -72,8 +72,8 @@ + install: bzip2 bzip2recover + if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi + if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi +- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi +- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi ++ if ( test ! -d $(PREFIX)/share/man ) ; then mkdir -p $(PREFIX)/share/man ; fi ++ if ( test ! -d $(PREFIX)/share/man/man1 ) ; then mkdir -p $(PREFIX)/share/man/man1 ; fi + if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi + cp -f bzip2 $(PREFIX)/bin/bzip2 + cp -f bzip2 $(PREFIX)/bin/bunzip2 +@@ -83,8 +83,8 @@ + chmod a+x $(PREFIX)/bin/bunzip2 + chmod a+x $(PREFIX)/bin/bzcat + chmod a+x $(PREFIX)/bin/bzip2recover +- cp -f bzip2.1 $(PREFIX)/man/man1 +- chmod a+r $(PREFIX)/man/man1/bzip2.1 ++ cp -f bzip2.1 $(PREFIX)/share/man/man1 ++ chmod a+r $(PREFIX)/share/man/man1/bzip2.1 + cp -f bzlib.h $(PREFIX)/include + chmod a+r $(PREFIX)/include/bzlib.h + cp -f libbz2.a $(PREFIX)/lib +@@ -99,14 +99,14 @@ + cp -f bzdiff $(PREFIX)/bin/bzdiff + ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp + chmod a+x $(PREFIX)/bin/bzdiff +- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 +- chmod a+r $(PREFIX)/man/man1/bzgrep.1 +- chmod a+r $(PREFIX)/man/man1/bzmore.1 +- chmod a+r $(PREFIX)/man/man1/bzdiff.1 +- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1 +- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1 +- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1 +- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 ++ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/share/man/man1 ++ chmod a+r $(PREFIX)/share/man/man1/bzgrep.1 ++ chmod a+r $(PREFIX)/share/man/man1/bzmore.1 ++ chmod a+r $(PREFIX)/share/man/man1/bzdiff.1 ++ echo ".so man1/bzgrep.1" > $(PREFIX)/share/man/man1/bzegrep.1 ++ echo ".so man1/bzgrep.1" > $(PREFIX)/share/man/man1/bzfgrep.1 ++ echo ".so man1/bzmore.1" > $(PREFIX)/share/man/man1/bzless.1 ++ echo ".so man1/bzdiff.1" > $(PREFIX)/share/man/man1/bzcmp.1 + + clean: + rm -f *.o libbz2.a bzip2 bzip2recover \