[arch-commits] Commit in libarchive/trunk (PKGBUILD issue-185.patch)

[Dan McGee]

    Date: Tuesday, September 20, 2011 @ 17:36:27
  Author: dan
Revision: 138362

fix FS#26044 (issue 185 upstream); add check() function

Added:
  libarchive/trunk/issue-185.patch
Modified:
  libarchive/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   26 +++++++++++++++++---------
 issue-185.patch |   14 ++++++++++++++
 2 files changed, 31 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-20 18:07:14 UTC (rev 138361)
+++ PKGBUILD	2011-09-20 21:36:27 UTC (rev 138362)
@@ -1,30 +1,38 @@
 # $Id$
 # Maintainer: Dan McGee <dan at archlinux.org>
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
 pkgname=libarchive
 pkgver=2.8.5
-pkgrel=1
+pkgrel=2
 pkgdesc="library that can create and read several streaming archive formats"
 arch=('i686' 'x86_64')
 url="http://libarchive.googlecode.com/"
 license=('BSD')
 depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz")
-md5sums=('9caf51dcf6213e9c9f5a1c27448b9c90')
-sha256sums=('13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d')
+source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz"
+        issue-185.patch)
+md5sums=('9caf51dcf6213e9c9f5a1c27448b9c90'
+         '3f6019fa86d15644f84cf059711141ce')
+sha256sums=('13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d'
+            'c5f583e5ad0bd95542051fad374430cbc2704d03798a7918043813b95268eb05')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np0 < ../issue-185.patch
   ./configure --prefix=/usr --without-xml2
   make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make check
+}
+
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/libarchive/COPYING
+  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
 }

Added: issue-185.patch
===================================================================
--- issue-185.patch	                        (rev 0)
+++ issue-185.patch	2011-09-20 21:36:27 UTC (rev 138362)
@@ -0,0 +1,14 @@
+Index: libarchive/archive_read_extract.c
+===================================================================
+--- libarchive/archive_read_extract.c	(revision 3722)
++++ libarchive/archive_read_extract.c	(revision 3723)
+@@ -108,7 +108,7 @@
+ 	if (r != ARCHIVE_OK)
+ 		/* If _write_header failed, copy the error. */
+  		archive_copy_error(&a->archive, ad);
+-	else if (archive_entry_size(entry) > 0)
++	else if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) > 0)
+ 		/* Otherwise, pour data into the entry. */
+ 		r = copy_data(_a, ad);
+ 	r2 = archive_write_finish_entry(ad);
+