bzip2 1.0.6

2 files changed, 42 insertions, 24 deletions

diff --git a/abs/core/bzip2/PKGBUILD b/abs/core/bzip2/PKGBUILD
index cabf1af..3e4ea23 100644
--- a/abs/core/bzip2/PKGBUILD
+++ b/abs/core/bzip2/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 91051 2010-09-21 12:28:55Z ibiru $
-# Maintainer:
+# $Id: PKGBUILD 158054 2012-05-02 01:12:57Z allan $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd <jvinet@zeroflux.org> 
 
 pkgname=bzip2
 pkgver=1.0.6
-pkgrel=1
+pkgrel=4
 pkgdesc="A high-quality data compression program"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://sources.redhat.com/bzip2"
 groups=('base')
 depends=('glibc')
-source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz)
-md5sums=('00b516f4704d4a7cb50a1d97e6e8e15b')
+source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz
+        bzip2-1.0.4-bzip2recover.patch)
+sha1sums=('3f89f861209ce81a6bab1fd1998c0ef311712002'
+          '85ce76fdb67f52f152bba368c1de81132dcdbdb5')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
   # add large-file support
   sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i ./Makefile-libbz2_so
@@ -24,31 +26,36 @@ build() {
   sed -i "s|-O2|${CFLAGS}|g" Makefile
   sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so
 
+  patch -Np1 < ../bzip2-1.0.4-bzip2recover.patch
+
   make -f Makefile-libbz2_so
-  make bzip2recover libbz2.a
+  make bzip2 bzip2recover libbz2.a
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make test
 }
+
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -dm755 $pkgdir/bin
-  install -m755 bzip2-shared $pkgdir/bin/bzip2
-  install -m755 bzip2recover $pkgdir/bin
-  ln -sf bzip2 $pkgdir/bin/bunzip2
-  ln -sf bzip2 $pkgdir/bin/bzcat
+  cd "$srcdir/$pkgname-$pkgver"
 
-  install -dm755 $pkgdir/usr/bin
-  install -m755 bzdiff bzgrep bzmore $pkgdir/usr/bin
+  install -dm755 $pkgdir/usr/{bin,lib,include,share/man/man1}
 
-  install -Dm755 libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0.6
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0
+  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 -Dm644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
-  ln -sf ../../lib/libbz2.so ${pkgdir}/usr/lib/libbz2.so
+  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
+  install -m644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
 
-  install -Dm644 bzlib.h $pkgdir/usr/include/bzlib.h
+  install -m644 bzlib.h $pkgdir/usr/include/
 
-  install -Dm644 bzip2.1 $pkgdir/usr/share/man/man1/bzip2.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
@@ -56,4 +63,3 @@ package() {
   install -Dm644 $srcdir/${pkgname}-${pkgver}/LICENSE \
                  $pkgdir/usr/share/licenses/${pkgname}/LICENSE
 }
-
diff --git a/abs/core/bzip2/bzip2-1.0.4-bzip2recover.patch b/abs/core/bzip2/bzip2-1.0.4-bzip2recover.patch
new file mode 100644
index 0000000..e2bfe1c
--- /dev/null
+++ b/abs/core/bzip2/bzip2-1.0.4-bzip2recover.patch
@@ -0,0 +1,12 @@
+--- 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,