[arch-commits] Commit in bzip2/repos (4 files)

[Dan McGee]

    Date: Sunday, September 25, 2011 @ 13:23:15
  Author: dan
Revision: 138503

db-move: moved bzip2 from [testing] to [core] (i686)

Added:
  bzip2/repos/core-i686/PKGBUILD
    (from rev 138502, bzip2/repos/testing-i686/PKGBUILD)
  bzip2/repos/core-i686/bzip2-1.0.4-bzip2recover.patch
    (from rev 138502, bzip2/repos/testing-i686/bzip2-1.0.4-bzip2recover.patch)
Deleted:
  bzip2/repos/core-i686/PKGBUILD
  bzip2/repos/testing-i686/

--------------------------------+
 PKGBUILD                       |  126 +++++++++++++++++++++------------------
 bzip2-1.0.4-bzip2recover.patch |   12 +++
 2 files changed, 81 insertions(+), 57 deletions(-)

Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2011-09-25 14:55:46 UTC (rev 138502)
+++ core-i686/PKGBUILD	2011-09-25 17:23:15 UTC (rev 138503)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Judd <jvinet at zeroflux.org> 
-
-pkgname=bzip2
-pkgver=1.0.6
-pkgrel=1
-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')
-
-build() {
-  cd $srcdir/$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
-
-  make -f Makefile-libbz2_so
-  make bzip2recover libbz2.a
-
-  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
-
-  install -dm755 $pkgdir/usr/bin
-  install -m755 bzdiff bzgrep bzmore $pkgdir/usr/bin
-
-  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 -Dm644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
-  ln -sf ../../lib/libbz2.so ${pkgdir}/usr/lib/libbz2.so
-
-  install -Dm644 bzlib.h $pkgdir/usr/include/bzlib.h
-
-  install -Dm644 bzip2.1 $pkgdir/usr/share/man/man1/bzip2.1
-  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
-}
-

Copied: bzip2/repos/core-i686/PKGBUILD (from rev 138502, bzip2/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD	                        (rev 0)
+++ core-i686/PKGBUILD	2011-09-25 17:23:15 UTC (rev 138503)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer:
+# Contributor: Judd <jvinet at zeroflux.org> 
+
+pkgname=bzip2
+pkgver=1.0.6
+pkgrel=2
+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
+        bzip2-1.0.4-bzip2recover.patch)
+md5sums=('00b516f4704d4a7cb50a1d97e6e8e15b'
+         '8a8bca02bdeaf2fd8913aeb549577e7e')
+
+build() {
+  cd "$srcdir/$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
+
+  patch -Np1 < ../bzip2-1.0.4-bzip2recover.patch
+
+  make -f Makefile-libbz2_so
+  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
+
+  install -dm755 $pkgdir/usr/bin
+  install -m755 bzdiff bzgrep bzmore $pkgdir/usr/bin
+
+  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 -Dm644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
+  ln -sf ../../lib/libbz2.so ${pkgdir}/usr/lib/libbz2.so
+
+  install -Dm644 bzlib.h $pkgdir/usr/include/bzlib.h
+
+  install -Dm644 bzip2.1 $pkgdir/usr/share/man/man1/bzip2.1
+  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
+}

Copied: bzip2/repos/core-i686/bzip2-1.0.4-bzip2recover.patch (from rev 138502, bzip2/repos/testing-i686/bzip2-1.0.4-bzip2recover.patch)
===================================================================
--- core-i686/bzip2-1.0.4-bzip2recover.patch	                        (rev 0)
+++ core-i686/bzip2-1.0.4-bzip2recover.patch	2011-09-25 17:23:15 UTC (rev 138503)
@@ -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,