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

[Dan McGee]

    Date: Sunday, January 18, 2009 @ 15:59:48
  Author: dan
Revision: 24591

upgpkg: libarchive 2.6.1-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-18 20:32:05 UTC (rev 24590)
+++ PKGBUILD	2009-01-18 20:59:48 UTC (rev 24591)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 pkgname=libarchive
-pkgver=2.6.0
+pkgver=2.6.1
 pkgrel=1
 pkgdesc="library that can create and read several streaming archive formats"
 arch=(i686 x86_64)
@@ -10,8 +10,7 @@
 license=('BSD')
 groups=('base')
 depends=('zlib' 'bzip2' 'acl')
-source=(http://people.freebsd.org/~kientzle/libarchive/src/libarchive-$pkgver.tar.gz
-        gzip-eof.patch)
+source=(http://libarchive.googlecode.com/files/libarchive-$pkgver.tar.gz)
 
 # 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 +18,6 @@
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 < ../gzip-eof.patch
   ./configure --prefix=/usr --without-lzmadec
 
   make || return 1
@@ -30,5 +28,5 @@
   install -m644 COPYING $startdir/pkg/usr/share/licenses/libarchive/
 }
 
-md5sums=('e8ceea99a86b022e192a06d2b411a29b'
-         '406012fba133b757289f3cd3e649afbc')
+md5sums=('9d9f83947ee9d5732289ed48d00e3743')
+sha256sums=('4d0ad4e5c33aa9725c7d92a42ae605815781372db949cd9906945e6c0d85c179')

Deleted: gzip-eof.patch
===================================================================
--- gzip-eof.patch	2009-01-18 20:32:05 UTC (rev 24590)
+++ gzip-eof.patch	2009-01-18 20:59:48 UTC (rev 24591)
@@ -1,11 +0,0 @@
-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. */