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

Allan McRae allan at archlinux.org
Sun Apr 29 04:16:05 EDT 2012


    Date: Sunday, April 29, 2012 @ 04:16:05
  Author: allan
Revision: 157765

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  bzip2/repos/testing-i686/
  bzip2/repos/testing-i686/PKGBUILD
    (from rev 157764, bzip2/trunk/PKGBUILD)
  bzip2/repos/testing-i686/bzip2-1.0.4-bzip2recover.patch
    (from rev 157764, bzip2/trunk/bzip2-1.0.4-bzip2recover.patch)
  bzip2/repos/testing-x86_64/
  bzip2/repos/testing-x86_64/PKGBUILD
    (from rev 157764, bzip2/trunk/PKGBUILD)
  bzip2/repos/testing-x86_64/bzip2-1.0.4-bzip2recover.patch
    (from rev 157764, bzip2/trunk/bzip2-1.0.4-bzip2recover.patch)

-----------------------------------------------+
 testing-i686/PKGBUILD                         |   65 ++++++++++++++++++++++++
 testing-i686/bzip2-1.0.4-bzip2recover.patch   |   12 ++++
 testing-x86_64/PKGBUILD                       |   65 ++++++++++++++++++++++++
 testing-x86_64/bzip2-1.0.4-bzip2recover.patch |   12 ++++
 4 files changed, 154 insertions(+)

Copied: bzip2/repos/testing-i686/PKGBUILD (from rev 157764, bzip2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-04-29 08:16:05 UTC (rev 157765)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Judd <jvinet at zeroflux.org> 
+
+pkgname=bzip2
+pkgver=1.0.6
+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
+        bzip2-1.0.4-bzip2recover.patch)
+sha1sums=('3f89f861209ce81a6bab1fd1998c0ef311712002'
+          '85ce76fdb67f52f152bba368c1de81132dcdbdb5')
+
+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/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 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 -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 -Dm644 $srcdir/${pkgname}-${pkgver}/LICENSE \
+                 $pkgdir/usr/share/licenses/${pkgname}/LICENSE
+}

Copied: bzip2/repos/testing-i686/bzip2-1.0.4-bzip2recover.patch (from rev 157764, bzip2/trunk/bzip2-1.0.4-bzip2recover.patch)
===================================================================
--- testing-i686/bzip2-1.0.4-bzip2recover.patch	                        (rev 0)
+++ testing-i686/bzip2-1.0.4-bzip2recover.patch	2012-04-29 08:16:05 UTC (rev 157765)
@@ -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, 

Copied: bzip2/repos/testing-x86_64/PKGBUILD (from rev 157764, bzip2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2012-04-29 08:16:05 UTC (rev 157765)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Judd <jvinet at zeroflux.org> 
+
+pkgname=bzip2
+pkgver=1.0.6
+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
+        bzip2-1.0.4-bzip2recover.patch)
+sha1sums=('3f89f861209ce81a6bab1fd1998c0ef311712002'
+          '85ce76fdb67f52f152bba368c1de81132dcdbdb5')
+
+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/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 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 -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 -Dm644 $srcdir/${pkgname}-${pkgver}/LICENSE \
+                 $pkgdir/usr/share/licenses/${pkgname}/LICENSE
+}

Copied: bzip2/repos/testing-x86_64/bzip2-1.0.4-bzip2recover.patch (from rev 157764, bzip2/trunk/bzip2-1.0.4-bzip2recover.patch)
===================================================================
--- testing-x86_64/bzip2-1.0.4-bzip2recover.patch	                        (rev 0)
+++ testing-x86_64/bzip2-1.0.4-bzip2recover.patch	2012-04-29 08:16:05 UTC (rev 157765)
@@ -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, 



More information about the arch-commits mailing list