From mm@neo.vx.sk  Sun Jul 29 06:47:43 2012
Return-Path: <mm@neo.vx.sk>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EB87E106566B;
	Sun, 29 Jul 2012 06:47:43 +0000 (UTC)
	(envelope-from mm@neo.vx.sk)
Received: from neo.vx.sk (neo.vx.sk [176.9.47.205])
	by mx1.freebsd.org (Postfix) with ESMTP id AF02D8FC0C;
	Sun, 29 Jul 2012 06:47:43 +0000 (UTC)
Received: by neo.vx.sk (Postfix, from userid 1001)
	id 668CEEB75; Sun, 29 Jul 2012 08:47:37 +0200 (CEST)
Message-Id: <20120729064737.668CEEB75@neo.vx.sk>
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: [PATCH] archivers/libarchive: apply vendor patch
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         170252
>Category:       ports
>Synopsis:       [PATCH] archivers/libarchive: apply vendor patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    glewis
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 29 06:50:03 UTC 2012
>Closed-Date:    Tue Jul 31 18:47:00 UTC 2012
>Last-Modified:  Tue Jul 31 18:50:07 UTC 2012
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->glewis 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jul 29 06:50:40 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170252 

From: Christian Weisgerber <naddy@mips.inka.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/170252: [PATCH] archivers/libarchive: [SUMMARIZE CHANGES]
Date: Sun, 29 Jul 2012 14:15:42 +0200 (CEST)

 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
State-Changed-From-To: open->closed 
State-Changed-By: glewis 
State-Changed-When: Tue Jul 31 18:46:59 UTC 2012 
State-Changed-Why:  
Committed.  I fixed the typo as well. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170252 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170252: commit references a PR
Date: Tue, 31 Jul 2012 18:46:33 +0000 (UTC)

 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"
 
>Unformatted:
