diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 51 |
2 files changed, 22 insertions, 43 deletions
@@ -1,21 +1,17 @@ pkgbase = bzip2-with-lbzip2-symlinks pkgdesc = bzip2 with binaries symbolically linked to their lbzip2 equivalents - pkgver = 1.0.6 + pkgver = 1.0.8 pkgrel = 1 - url = http://sources.redhat.com/bzip2 + url = https://sourceware.org/bzip2 arch = x86_64 license = custom depends = lbzip2 depends = glibc depends = sh - provides = bzip2=1.0.6 + provides = bzip2=1.0.8 conflicts = bzip2 - source = https://sources.archlinux.org/other/packages/bzip2/bzip2-1.0.6.tar.gz - source = bzip2-1.0.4-bzip2recover.patch - source = 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 - sha256sums = 0585fb92a4b409404147a3f940ed2ca03b3eaed1ec4fb68ae6ad74db668bea83 - sha256sums = e8792b2c7943486ab35893ffd9e638bbf2edbcab4f9f7b87544519bb3564af41 + source = https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz + sha256sums = ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269 pkgname = bzip2-with-lbzip2-symlinks @@ -1,38 +1,23 @@ # Maintainer: Árni Dagur <arnidg@protonmail.ch> # Adapted from original package by: Ronald van Haren <ronald.archlinux.org> pkgname=bzip2-with-lbzip2-symlinks -pkgver=1.0.6 +pkgver=1.0.8 pkgrel=1 pkgdesc="bzip2 with binaries symbolically linked to their lbzip2 equivalents" arch=('x86_64') license=('custom') -url="http://sources.redhat.com/bzip2" +url="https://sourceware.org/bzip2" depends=('lbzip2' 'glibc' 'sh') provides=("bzip2=$pkgver") conflicts=('bzip2') -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/bzip2-$pkgver.tar.gz) +sha256sums=('ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269') build() { cd "$srcdir/bzip2-$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 - - patch -Np1 < ../bzip2-1.0.4-bzip2recover.patch - # CVE-2016-3189 - patch -Np1 -i "${srcdir}/fix-heap-use-after-free-bzip2recover.patch" - - make -f Makefile-libbz2_so - make bzip2recover + make -f Makefile-libbz2_so CC="gcc $CFLAGS $LDFLAGS" + make bzip2 bzip2recover CC="gcc $CFLAGS $LDFLAGS" } check() { @@ -43,7 +28,7 @@ check() { package() { cd "$srcdir/bzip2-$pkgver" - install -dm755 $pkgdir/usr/{bin,lib,include,share/man/man1} + install -dm755 "$pkgdir"/usr/{bin,lib,include,share/man/man1} # We symlink bzip2, bunzip2, and bzcat to lbzip2 ln -sf lbzip2 $pkgdir/usr/bin/bzip2 @@ -51,20 +36,18 @@ package() { ln -sf lbzip2 $pkgdir/usr/bin/bzcat # The rest is installed as normal - install -m755 bzip2recover bzdiff bzgrep bzmore $pkgdir/usr/bin + install -m755 bzip2recover bzdiff bzgrep bzmore "$pkgdir"/usr/bin - 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 + ln -s libbz2.so.$pkgver "$pkgdir"/usr/lib/libbz2.so.1 # For compatibility with some other distros - 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/bzip2-${pkgver}/LICENSE \ - $pkgdir/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE } |