Date: Saturday, June 29, 2019 @ 09:36:51 Author: arojas Revision: 357043
Update to 1.0.7 Added: bzip2/trunk/bzip2-ldflags.patch Modified: bzip2/trunk/PKGBUILD Deleted: bzip2/trunk/bzip2-1.0.4-bzip2recover.patch --------------------------------+ PKGBUILD | 70 ++++++++++++++++++--------------------- bzip2-1.0.4-bzip2recover.patch | 12 ------ bzip2-ldflags.patch | 11 ++++++ 3 files changed, 44 insertions(+), 49 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-06-29 08:49:29 UTC (rev 357042) +++ PKGBUILD 2019-06-29 09:36:51 UTC (rev 357043) @@ -2,34 +2,33 @@ # Contributor: Judd <[email protected]> pkgname=bzip2 -pkgver=1.0.6 -pkgrel=8 +pkgver=1.0.7 +pkgrel=1 pkgdesc="A high-quality data compression program" arch=('x86_64') license=('custom') -url="http://sources.redhat.com/bzip2"; +url="https://sourceware.org/bzip2/"; groups=('base') depends=('glibc' 'sh') -source=(https://sources.archlinux.org/other/packages/bzip2/bzip2-$pkgver.tar.gz - bzip2-1.0.4-bzip2recover.patch - fix-heap-use-after-free-bzip2recover.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch) -sha256sums=('a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd' - '0585fb92a4b409404147a3f940ed2ca03b3eaed1ec4fb68ae6ad74db668bea83' - 'e8792b2c7943486ab35893ffd9e638bbf2edbcab4f9f7b87544519bb3564af41') +source=(https://sourceware.org/pub/bzip2/$pkgname-$pkgver.tar.gz{,.sig} + bzip2-ldflags.patch) +sha256sums=('e768a87c5b1a79511499beb41500bcc4caf203726fff46a6f5f9ad27fe08ab2b' + 'SKIP' + 'fd7b402b94d42a642bd13430bf489077017de3dbbef9fb4656ccb6fb3c751504') +validpgpkeys=('EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A') # Mark Wielaard <[email protected]> -build() { - cd "$srcdir/$pkgname-$pkgver" +prepare() { + cd $pkgname-$pkgver - # add large-file support - sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i ./Makefile-libbz2_so - # use our optimization - sed -i "s|-O2|${CFLAGS}|g" Makefile - sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so + sed -e "s|-O2|${CFLAGS}|g" -i Makefile* + # use our LDFLAGS + sed -e "s|LDFLAGS=|LDFLAGS=${LDFLAGS}|g" -i Makefile* + patch -p1 -i ../bzip2-ldflags.patch +} - patch -Np1 < ../bzip2-1.0.4-bzip2recover.patch - # CVE-2016-3189 - patch -Np1 -i "${srcdir}/fix-heap-use-after-free-bzip2recover.patch" +build() { + cd $pkgname-$pkgver make -f Makefile-libbz2_so make bzip2 bzip2recover @@ -36,32 +35,29 @@ } check() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make test } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver - install -dm755 $pkgdir/usr/{bin,lib,include,share/man/man1} + install -dm755 "$pkgdir"/usr/{bin,lib,include,share/man/man1} - install -m755 bzip2-shared $pkgdir/usr/bin/bzip2 - install -m755 bzip2recover bzdiff bzgrep bzmore $pkgdir/usr/bin - ln -sf bzip2 $pkgdir/usr/bin/bunzip2 - ln -sf bzip2 $pkgdir/usr/bin/bzcat + install -m755 bzip2-shared "$pkgdir"/usr/bin/bzip2 + install -m755 bzip2recover bzdiff bzgrep bzmore "$pkgdir"/usr/bin + ln -sf bzip2 "$pkgdir"/usr/bin/bunzip2 + ln -sf bzip2 "$pkgdir"/usr/bin/bzcat - install -m755 libbz2.so.1.0.6 $pkgdir/usr/lib - ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so - ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1 - ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1.0 + cp -a libbz2.so* "$pkgdir"/usr/lib + ln -s libbz2.so.$pkgver "$pkgdir"/usr/lib/libbz2.so - install -m644 bzlib.h $pkgdir/usr/include/ + install -m644 bzlib.h "$pkgdir"/usr/include/ - install -m644 bzip2.1 $pkgdir/usr/share/man/man1/ - ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bunzip2.1 - ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzcat.1 - ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzip2recover.1 + install -m644 bzip2.1 "$pkgdir"/usr/share/man/man1/ + ln -sf bzip2.1 "$pkgdir"/usr/share/man/man1/bunzip2.1 + ln -sf bzip2.1 "$pkgdir"/usr/share/man/man1/bzcat.1 + ln -sf bzip2.1 "$pkgdir"/usr/share/man/man1/bzip2recover.1 - install -Dm644 $srcdir/${pkgname}-${pkgver}/LICENSE \ - $pkgdir/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE } Deleted: bzip2-1.0.4-bzip2recover.patch =================================================================== --- bzip2-1.0.4-bzip2recover.patch 2019-06-29 08:49:29 UTC (rev 357042) +++ bzip2-1.0.4-bzip2recover.patch 2019-06-29 09:36:51 UTC (rev 357043) @@ -1,12 +0,0 @@ ---- bzip2-1.0.4/bzip2recover.c.pom 2007-01-03 03:00:55.000000000 +0100 -+++ bzip2-1.0.4/bzip2recover.c 2007-02-05 11:55:17.000000000 +0100 -@@ -309,7 +309,8 @@ - UInt32 buffHi, buffLo, blockCRC; - Char* p; - -- strcpy ( progName, argv[0] ); -+ strncpy ( progName, argv[0], BZ_MAX_FILENAME-1); -+ progName[BZ_MAX_FILENAME-1]='\0'; - inFileName[0] = outFileName[0] = 0; - - fprintf ( stderr, Added: bzip2-ldflags.patch =================================================================== --- bzip2-ldflags.patch (rev 0) +++ bzip2-ldflags.patch 2019-06-29 09:36:51 UTC (rev 357043) @@ -0,0 +1,11 @@ +--- bzip2-1.0.7/Makefile-libbz2_so.orig 2019-06-29 09:08:21.186324313 +0000 ++++ bzip2-1.0.7/Makefile-libbz2_so 2019-06-29 09:09:37.397240774 +0000 +@@ -35,7 +35,7 @@ + bzlib.o + + all: $(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.0 -o libbz2.so.1.0.7 $(OBJS) $(LDFLAGS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.7 libbz2.so.1.0
