ports/177290: [PATCH] archivers/libarchive: update to 3.1.2,1

[Martin Matuska]

>Number:         177290
>Category:       ports
>Synopsis:       [PATCH] archivers/libarchive: update to 3.1.2,1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 23 01:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 9.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD neo.vx.sk 9.1-STABLE FreeBSD 9.1-STABLE #11 r248622M: Fri Mar 22 22:55:13 CET
>Description:
- Update to 3.1.2,1
- Add support for lzo2 and enable by default
- Change headers to new style

Port maintainer (glewis at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_7 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- libarchive-3.1.2,1.patch begins here ---
diff -ruN /usr/ports/archivers/libarchive/Makefile ./Makefile
--- /usr/ports/archivers/libarchive/Makefile	2012-11-17 06:54:21.000000000 +0100
+++ ./Makefile	2013-03-23 02:27:20.845511455 +0100
@@ -1,23 +1,20 @@
-# New ports collection makefile for:	libarchive
-# Date created:		23 March 2004
-# Whom:			Greg Lewis <glewis at FreeBSD.org>
-#
-# $FreeBSD: ports/archivers/libarchive/Makefile,v 1.72 2012/11/17 05:54:21 svnexp Exp $
+# Created by: Greg Lewis <glewis at FreeBSD.org>
+# $FreeBSD: head/archivers/libarchive/Makefile 301806 2012-07-31 18:46:09Z glewis $
 
 PORTNAME=	libarchive
-PORTVERSION=	3.0.4
-PORTREVISION=	1
+PORTVERSION=	3.1.2
 PORTEPOCH=	1
 CATEGORIES=	archivers
-MASTER_SITES=	http://cloud.github.com/downloads/${PORTNAME}/${PORTNAME}/
+MASTER_SITES=	http://libarchive.org/downloads/
 
 MAINTAINER=	glewis at FreeBSD.org
 COMMENT=	Library to create and read several streaming archive formats
 
-OPTIONS_DEFINE=	LIBXML2 NETTLE
-OPTIONS_DEFAULT=	LIBXML2
+OPTIONS_DEFINE=	LIBXML2 NETTLE LZO
+OPTIONS_DEFAULT=	LIBXML2 LZO
 
 LIBXML2_DESC=	Support writing xar via libxml2
+LZO_DESC=	Support lzo compression via liblzo2
 NETTLE_DESC=	Use Nettle instead of OpenSSL
 
 GNU_CONFIGURE=	yes
@@ -34,7 +31,7 @@
 		lib/libarchive.a \
 		lib/libarchive.la \
 		lib/libarchive.so \
-		lib/libarchive.so.12 \
+		lib/libarchive.so.14 \
 		libdata/pkgconfig/libarchive.pc
 
 MANCOMPRESSED=	no
@@ -48,13 +45,31 @@
 		archive_entry_stat.3 \
 		archive_entry_time.3 \
 		archive_read.3 \
+		archive_read_data.3 \
 		archive_read_disk.3 \
+		archive_read_extract.3 \
+		archive_read_filter.3 \
+		archive_read_format.3 \
+		archive_read_free.3 \
+		archive_read_header.3 \
+		archive_read_new.3 \
+		archive_read_open.3 \
 		archive_read_set_options.3 \
 		archive_util.3 \
 		archive_write.3 \
+		archive_write_blocksize.3 \
+		archive_write_data.3 \
 		archive_write_disk.3 \
+		archive_write_filter.3 \
+		archive_write_finish_entry.3 \
+		archive_write_format.3 \
+		archive_write_free.3 \
+		archive_write_header.3 \
+		archive_write_new.3 \
+		archive_write_open.3 \
 		archive_write_set_options.3 \
 		libarchive.3 \
+		libarchive_changes.3 \
 		libarchive_internals.3
 MAN5=		cpio.5 \
 		libarchive-formats.5 \
@@ -76,8 +91,15 @@
 CONFIGURE_ARGS+=	--without-xml2
 .endif
 
+.if ${PORT_OPTIONS:MLZO}
+LIB_DEPENDS=	lzo2:${PORTSDIR}/archivers/lzo2
+CONFIGURE_ARGS+=	--with-lzo2
+.else
+CONFIGURE_ARGS+=	--without-lzo2
+.endif
+
 .if ${PORT_OPTIONS:MNETTLE}
-LIB_DEPENDS+=	nettle.4:${PORTSDIR}/security/nettle
+LIB_DEPENDS+=	nettle:${PORTSDIR}/security/nettle
 CONFIGURE_ARGS+=	--without-openssl --with-nettle
 .else
 USE_OPENSSL=	yes
@@ -87,7 +109,7 @@
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+=	lzma.5:${PORTSDIR}/archivers/xz
+LIB_DEPENDS+=	lzma:${PORTSDIR}/archivers/xz
 .endif
 
 check:
diff -ruN /usr/ports/archivers/libarchive/distinfo ./distinfo
--- /usr/ports/archivers/libarchive/distinfo	2012-04-08 18:50:02.000000000 +0200
+++ ./distinfo	2013-03-23 02:22:32.465114107 +0100
@@ -1,2 +1,2 @@
-SHA256 (libarchive-3.0.4.tar.gz) = 76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac
-SIZE (libarchive-3.0.4.tar.gz) = 3632806
+SHA256 (libarchive-3.1.2.tar.gz) = eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e
+SIZE (libarchive-3.1.2.tar.gz) = 4527540
diff -ruN /usr/ports/archivers/libarchive/files/patch-libarchive-archive_read_disk_entry_from_file.c ./files/patch-libarchive-archive_read_disk_entry_from_file.c
--- /usr/ports/archivers/libarchive/files/patch-libarchive-archive_read_disk_entry_from_file.c	2012-11-17 06:54:21.000000000 +0100
+++ ./files/patch-libarchive-archive_read_disk_entry_from_file.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-$FreeBSD: ports/archivers/libarchive/files/patch-libarchive-archive_read_disk_entry_from_file.c,v 1.2 2012/11/17 05:54:21 svnexp Exp $
-
-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.1.2,1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: