Apply ACL endless loop patch from upstream (already ported to FreeBSD-CURRENT) Switch to new options framework Added file(s): - files/patch-libarchive-archive_read_disk_entry_from_file.c Port maintainer (glewis@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: CVS)
Responsible Changed From-To: freebsd-ports-bugs->glewis Over to maintainer (via the GNATS Auto Assign Tool)
In article <20120729064737.668CEEB75@neo.vx.sk> you write: > --- libarchive-3.0.4_1,1.patch begins here --- > -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 instad of OpenSSL ^^^^^^ An opportunity to fix this typo? -- Christian "naddy" Weisgerber naddy@mips.inka.de
Author: glewis Date: Tue Jul 31 18:46:09 2012 New Revision: 301806 URL: http://svn.freebsd.org/changeset/ports/301806 Log: . Apply ACL endless loop patch from upstream (already ported to FreeBSD-CURRENT) . Switch to new options framework PR: 170252 Submitted by: mm@ Added: head/archivers/libarchive/files/ head/archivers/libarchive/files/patch-libarchive-archive_read_disk_entry_from_file.c (contents, props changed) Modified: head/archivers/libarchive/Makefile (contents, props changed) Modified: head/archivers/libarchive/Makefile ============================================================================== --- head/archivers/libarchive/Makefile Tue Jul 31 18:41:21 2012 (r301805) +++ head/archivers/libarchive/Makefile Tue Jul 31 18:46:09 2012 (r301806) @@ -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/do 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 Added: head/archivers/libarchive/files/patch-libarchive-archive_read_disk_entry_from_file.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/libarchive/files/patch-libarchive-archive_read_disk_entry_from_file.c Tue Jul 31 18:46:09 2012 (r301806) @@ -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; + } + _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. I fixed the typo as well.