Date: Sun, 29 Jul 2012 08:47:37 +0200 (CEST) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: glewis@FreeBSD.org Subject: ports/170252: [PATCH] archivers/libarchive: [SUMMARIZE CHANGES] Message-ID: <20120729064737.668CEEB75@neo.vx.sk> Resent-Message-ID: <201207290650.q6T6o3sH094746@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 170252 >Category: ports >Synopsis: [PATCH] archivers/libarchive: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jul 29 06:50:03 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 9.0-STABLE amd64 >Organization: >Environment: System: FreeBSD neo.vx.sk 9.0-STABLE FreeBSD 9.0-STABLE #6 r237147M: Sat Jun 16 01:05:38 CEST >Description: 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) >How-To-Repeat: >Fix: --- libarchive-3.0.4_1,1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/archivers/libarchive/Makefile,v retrieving revision 1.70 diff -u -r1.70 Makefile --- Makefile 8 Apr 2012 16:50:02 -0000 1.70 +++ Makefile 29 Jul 2012 06:46:31 -0000 @@ -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 @@ 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 instad of OpenSSL GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GNOME= gnomehack +PATCH_STRIP= -p1 CONFIGURE_ARGS+= --without-expat @@ -62,7 +67,7 @@ .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 @@ 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 Index: files/patch-libarchive-archive_read_disk_entry_from_file.c =================================================================== RCS file: files/patch-libarchive-archive_read_disk_entry_from_file.c diff -N files/patch-libarchive-archive_read_disk_entry_from_file.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-libarchive-archive_read_disk_entry_from_file.c 29 Jul 2012 06:46:31 -0000 @@ -0,0 +1,12 @@ +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; + } + --- libarchive-3.0.4_1,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120729064737.668CEEB75>