From 5333ef72c7d3e172ea2b639e695c0637baea9ac8 Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Tue, 15 Mar 2011 07:44:16 +0000
Subject: [PATCH] libarchive: update to 2.8.4

---
 libarchive/.footprint |  8 +++++---
 libarchive/.md5sum    |  2 +-
 libarchive/Pkgfile    | 18 ++++++++++++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/libarchive/.footprint b/libarchive/.footprint
index a9ff23c..64446c1 100644
--- a/libarchive/.footprint
+++ b/libarchive/.footprint
@@ -8,9 +8,11 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libarchive.a
 -rwxr-xr-x	root/root	usr/lib/libarchive.la
-lrwxrwxrwx	root/root	usr/lib/libarchive.so -> libarchive.so.2.7.1
-lrwxrwxrwx	root/root	usr/lib/libarchive.so.2 -> libarchive.so.2.7.1
--rwxr-xr-x	root/root	usr/lib/libarchive.so.2.7.1
+lrwxrwxrwx	root/root	usr/lib/libarchive.so -> libarchive.so.2.8.4
+lrwxrwxrwx	root/root	usr/lib/libarchive.so.2 -> libarchive.so.2.8.4
+-rwxr-xr-x	root/root	usr/lib/libarchive.so.2.8.4
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/libarchive.pc
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/bsdcpio.1.gz
diff --git a/libarchive/.md5sum b/libarchive/.md5sum
index 1b58140..7dabc48 100644
--- a/libarchive/.md5sum
+++ b/libarchive/.md5sum
@@ -1 +1 @@
-f43382413b4457d0e192771b100a66e7  libarchive-2.7.1.tar.gz
+83b237a542f27969a8d68ac217dc3796  libarchive-2.8.4.tar.gz
diff --git a/libarchive/Pkgfile b/libarchive/Pkgfile
index aa8c1df..cda1912 100644
--- a/libarchive/Pkgfile
+++ b/libarchive/Pkgfile
@@ -2,20 +2,30 @@
 # URL: http://people.freebsd.org/~kientzle/libarchive/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
-# Depends on: bzip2 zlib
+# Depends on: bzip2 xz zlib acl
 
 name=libarchive
-version=2.7.1
-release=1
+version=2.8.4
+release=2
 source=(http://$name.googlecode.com/files/$name-$version.tar.gz)
 
 build() {
   cd libarchive-$version
+  # We're passing --without-lzmadec, because we want to use xz for
+  # LZMA support, not the obsolete lzmadec library.
+  #
+  # We're passing --without-xml2 and --without-expat to avoid linking
+  # to libraries which are only available in opt. XML support is only
+  # needed for the xar format which we can live without.
+
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
               --mandir=/usr/man \
-              --disable-xattr
+              --without-lzmadec \
+              --without-xml2 \
+              --without-expat \
+              --without-openssl
   make
   make DESTDIR=$PKG install
 }
-- 
2.26.2