From 71bdc9bb7c3116cae092019c32ad5429eae7cf8e Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Tue, 31 Jul 2012 18:46:09 +0000
Subject: . Apply ACL endless loop patch from upstream (already ported to
 FreeBSD-CURRENT) . Switch to new options framework

PR:		170252
Submitted by:	mm@
---
 archivers/libarchive/Makefile                              | 13 +++++++++----
 .../patch-libarchive-archive_read_disk_entry_from_file.c   | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 archivers/libarchive/files/patch-libarchive-archive_read_disk_entry_from_file.c

(limited to 'archivers/libarchive')

diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index 8f6e5169b4d7..bd62745dddfe 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	libarchive
 PORTVERSION=	3.0.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://cloud.github.com/downloads/${PORTNAME}/${PORTNAME}/
@@ -13,12 +14,16 @@ MASTER_SITES=	http://cloud.github.com/downloads/${PORTNAME}/${PORTNAME}/
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Library to create and read several streaming archive formats
 
-OPTIONS=	LIBXML2 "Support writing xar via libxml2" On \
-		NETTLE "Use nettle instad of OpenSSL" Off
+OPTIONS_DEFINE=	LIBXML2 NETTLE
+OPTIONS_DEFAULT=	LIBXML2
+
+LIBXML2_DESC=	Support writing xar via libxml2
+NETTLE_DESC=	Use Nettle instead of OpenSSL
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack
+PATCH_STRIP=	-p1
 
 CONFIGURE_ARGS+=	--without-expat
 
@@ -62,7 +67,7 @@ LDFLAGS+=	"-L${LOCALBASE}/lib"
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_LIBXML2)
+.if ${PORT_OPTIONS:MLIBXML2}
 USE_GNOME+=	libxml2
 CONFIGURE_ARGS+=	--with-xml2
 .else
@@ -71,7 +76,7 @@ LDFLAGS+=	-lbsdxml
 CONFIGURE_ARGS+=	--without-xml2
 .endif
 
-.if defined(WITH_NETTLE)
+.if ${PORT_OPTIONS:MNETTLE}
 LIB_DEPENDS+=	nettle.4:${PORTSDIR}/security/nettle
 CONFIGURE_ARGS+=	--without-openssl --with-nettle
 .else
diff --git a/archivers/libarchive/files/patch-libarchive-archive_read_disk_entry_from_file.c b/archivers/libarchive/files/patch-libarchive-archive_read_disk_entry_from_file.c
new file mode 100644
index 000000000000..451508365675
--- /dev/null
+++ b/archivers/libarchive/files/patch-libarchive-archive_read_disk_entry_from_file.c
@@ -0,0 +1,14 @@
+$FreeBSD$
+
+diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
+index 7987fa5..25b1edc 100644
+--- a/libarchive/archive_read_disk_entry_from_file.c
++++ b/libarchive/archive_read_disk_entry_from_file.c
+@@ -584,6 +584,7 @@ translate_acl(struct archive_read_disk *a,
+ 			break;
+ 		default:
+ 			/* Skip types that libarchive can't support. */
++			s = acl_get_entry(acl, ACL_NEXT_ENTRY, &acl_entry);
+ 			continue;
+ 		}
+ 
-- 
cgit v1.2.3