From owner-svn-ports-head@FreeBSD.ORG Tue Jul 31 18:46:10 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1ABA0106564A; Tue, 31 Jul 2012 18:46:10 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DFB358FC18; Tue, 31 Jul 2012 18:46:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6VIk9K2059250; Tue, 31 Jul 2012 18:46:09 GMT (envelope-from glewis@svn.freebsd.org) Received: (from glewis@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6VIk9ib059247; Tue, 31 Jul 2012 18:46:09 GMT (envelope-from glewis@svn.freebsd.org) Message-Id: <201207311846.q6VIk9ib059247@svn.freebsd.org> From: Greg Lewis Date: Tue, 31 Jul 2012 18:46:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301806 - in head/archivers/libarchive: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jul 2012 18:46:10 -0000 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 -.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; + } +