mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

. Apply ACL endless loop patch from upstream (already ported to FreeBSD-CURRENT)

Browse Source 
. Switch to new options framework

PR:		170252
Submitted by:	mm@
This commit is contained in:
Greg Lewis 2012-07-31 18:46:09 +00:00
parent 0c9a3c5e53
commit 71bdc9bb7c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=301806
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
archivers/libarchive/Makefile
View File

@ -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

14
archivers/libarchive/files/patch-libarchive-archive_read_disk_entry_from_file.c Normal file
View File

@ -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;
}