[arch-commits] Commit in libarchive/trunk (PKGBUILD gzip-eof.patch)

[Dan McGee]

    Date: Friday, January 2, 2009 @ 21:36:03
  Author: dan
Revision: 23120

upgpkg: libarchive 2.6.0-1

Added:
  libarchive/trunk/gzip-eof.patch
Modified:
  libarchive/trunk/PKGBUILD

----------------+
 PKGBUILD       |   11 +++++++----
 gzip-eof.patch |   11 +++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-03 02:14:10 UTC (rev 23119)
+++ PKGBUILD	2009-01-03 02:36:03 UTC (rev 23120)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 pkgname=libarchive
-pkgver=2.5.5
+pkgver=2.6.0
 pkgrel=1
 pkgdesc="library that can create and read several streaming archive formats"
 arch=(i686 x86_64)
@@ -10,8 +10,8 @@
 license=('BSD')
 groups=('base')
 depends=('zlib' 'bzip2' 'acl')
-source=(http://people.freebsd.org/~kientzle/libarchive/src/libarchive-$pkgver.tar.gz)
-md5sums=('ff6387de3a3830785b229d1e1f11f523')
+source=(http://people.freebsd.org/~kientzle/libarchive/src/libarchive-$pkgver.tar.gz
+        gzip-eof.patch)
 
 # pacman.static build fails unless we keep the libtool files (or unless we link
 # the missing symbols inside the libarchive .a static lib, but that is dirty)
@@ -19,7 +19,8 @@
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  patch -Np1 < ../gzip-eof.patch
+  ./configure --prefix=/usr --without-lzmadec
 
   make || return 1
   make DESTDIR=$startdir/pkg install
@@ -29,3 +30,5 @@
   install -m644 COPYING $startdir/pkg/usr/share/licenses/libarchive/
 }
 
+md5sums=('e8ceea99a86b022e192a06d2b411a29b'
+         '406012fba133b757289f3cd3e649afbc')

Added: gzip-eof.patch
===================================================================
--- gzip-eof.patch	                        (rev 0)
+++ gzip-eof.patch	2009-01-03 02:36:03 UTC (rev 23120)
@@ -0,0 +1,11 @@
+diff -Naur libarchive-2.6.0.orig/libarchive/archive_read_support_compression_gzip.c libarchive-2.6.0/libarchive/archive_read_support_compression_gzip.c
+--- libarchive-2.6.0.orig/libarchive/archive_read_support_compression_gzip.c	2008-12-28 14:08:31.000000000 -0600
++++ libarchive-2.6.0/libarchive/archive_read_support_compression_gzip.c	2009-01-02 20:32:14.000000000 -0600
+@@ -432,6 +432,7 @@
+ 				}
+ 				/* Restart header parser with the next block. */
+ 				state->header_state = state->header_done = 0;
++				state->eof = 1;
+ 				/* FALL THROUGH */
+ 			case Z_OK: /* Decompressor made some progress. */
+ 				/* If we filled our buffer, update stats and return. */