moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

bzip2: update to 1.0.7.

Browse source 
Closes: #12741 [via git-merge-pr]
This commit is contained in:
Piotr Wójcik 2019-06-29 17:52:41 +02:00 • committed by Jürgen Buchmüller
parent 9c998159ed
commit dfaf2fc34d
3 changed files with 13 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
srcpkgs/bzip2/patches/CVE-2016-3189.patch
View file

@ -1,12 +0,0 @@
Patch from: https://bugzilla.redhat.com/show_bug.cgi?id=1319648
--- ./bzip2recover.c.old 2016-03-22 08:49:38.855620000 +0100
+++ ./bzip2recover.c 2016-03-30 10:22:27.341430099 +0200
@@ -458,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++;

12
srcpkgs/bzip2/patches/soname.patch
View file

@ -16,15 +16,15 @@
bzlib.o bzlib.o
all: $(OBJS) all: $(OBJS)
- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 $(OBJS)
$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
rm -f libbz2.so.1.0 rm -f libbz2.so.1.0
ln -s libbz2.so.1.0.6 libbz2.so.1.0 ln -s libbz2.so.1.0.7 libbz2.so.1.0
+ ln -s libbz2.so.1.0.6 libbz2.so.1 + ln -s libbz2.so.1.0.7 libbz2.so.1
clean: 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.7 libbz2.so.1.0 bzip2-shared
--- Makefile.orig 2013-02-05 14:41:08.980543085 +0100 --- Makefile.orig 2013-02-05 14:41:08.980543085 +0100
+++ Makefile 2013-02-05 14:41:34.306940942 +0100 +++ Makefile 2013-02-05 14:41:34.306940942 +0100
@@ -15,13 +15,13 @@ @@ -15,13 +15,13 @@

15
srcpkgs/bzip2/template
View file

@ -1,16 +1,15 @@
# Template file for 'bzip2' # Template file for 'bzip2'
pkgname=bzip2 pkgname=bzip2
version=1.0.6 version=1.0.7
revision=14 revision=1
bootstrap=yes bootstrap=yes
short_desc="The bzip2 compression library" short_desc="Freely available, patent free, high-quality data compressor"
maintainer="Juan RP <xtraeme@voidlinux.org>" maintainer="Juan RP <xtraeme@voidlinux.org>"
license="bzip2-1.0.6" license="bzip2-1.0.6"
homepage="http://sources.redhat.com/bzip2" homepage="https://sourceware.org/bzip2/"
# Currently not available changelog="https://sourceware.org/bzip2/CHANGES"
# distfiles="http://sources.redhat.com/pub/bzip2/v${version/./}/${pkgname}-${version}.tar.gz" distfiles="https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz"
distfiles="https://fossies.org/linux/misc/bzip2-${version}.tar.gz" checksum=e768a87c5b1a79511499beb41500bcc4caf203726fff46a6f5f9ad27fe08ab2b
checksum=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
do_build() { do_build() {
make ${makejobs} CFLAGS="$CFLAGS -fPIC $LDFLAGS" LDFLAGS="$LDFLAGS" -f Makefile-libbz2_so make ${makejobs} CFLAGS="$CFLAGS -fPIC $LDFLAGS" LDFLAGS="$LDFLAGS" -f Makefile-libbz2_so