[csw-devel] SF.net SVN: gar:[20661] csw/mgar/pkg/libarchive/trunk

[dmichelsen at users.sourceforge.net]

Revision: 20661
          http://gar.svn.sourceforge.net/gar/?rev=20661&view=rev
Author:   dmichelsen
Date:     2013-04-10 12:14:20 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
libarchive/trunk: Update to 3.1.2, some tests still fail

Modified Paths:
--------------
    csw/mgar/pkg/libarchive/trunk/Makefile
    csw/mgar/pkg/libarchive/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libarchive/trunk/files/0001-Consider-name-to-be-NULL-in-ACL-test.patch

Modified: csw/mgar/pkg/libarchive/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libarchive/trunk/Makefile	2013-04-10 12:08:21 UTC (rev 20660)
+++ csw/mgar/pkg/libarchive/trunk/Makefile	2013-04-10 12:14:20 UTC (rev 20661)
@@ -1,17 +1,22 @@
 # : Makefile 9089 2010-03-11 08:34:46Z wahwah $
 NAME = libarchive
-VERSION = 2.8.4
+VERSION = 3.1.2
 GARTYPE = v2
 
 DESCRIPTION = C library for reading and writing various archive formats
-define BLURB
-endef
 
-MASTER_SITES = $(GOOGLE_MIRROR)
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+MASTER_SITES = http://www.libarchive.org/downloads/
+DISTFILES += $(DISTNAME).tar.gz
+PATCHFILES += 0001-Consider-name-to-be-NULL-in-ACL-test.patch
 
-VENDOR_URL = http://code.google.com/p/libarchive/
+VENDOR_URL = http://www.libarchive.org
 
+BUILD_DEP_PKGS += CSWliblzma-dev
+BUILD_DEP_PKGS += CSWlibz-dev
+BUILD_DEP_PKGS += CSWlibbz2-dev
+BUILD_DEP_PKGS += CSWlibxml2-dev
+BUILD_DEP_PKGS += CSWlibssl-dev
+
 PACKAGES += CSWlibarchive2
 SPKG_DESC_CSWlibarchive2 = C library for reading and writing various archive formats, libarchive.so.2
 PKGFILES_CSWlibarchive2 = $(call pkgfiles_lib,libarchive.so.2)
@@ -38,19 +43,18 @@
 RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWlibbz2-1-0
 RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWosslrt
 
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWlibarchive2)
-BUILD_DEP_PKGS += CSWliblzma-dev
-BUILD_DEP_PKGS += CSWlibz-dev
-BUILD_DEP_PKGS += CSWlibbz2-dev
-BUILD_DEP_PKGS += CSWlibxml2devel
-BUILD_DEP_PKGS += CSWossldevel 
-
 EXTRA_INC = $(includedir)/cryptopp
 
 BUILD64_LIBS_ONLY = 1
 
+BUILD_OVERRIDE_VARS += COMMON_CFLAGS
+BUILD_OVERRIDE_VAR_COMMON_CFLAGS =
+
+TEST_OVERRIDE_VARS += COMMON_CFLAGS
+TEST_OVERRIDE_VAR_COMMON_CFLAGS =
+
 # There is currently one test failing. Skip until this is fixed:
 #   http://code.google.com/p/libarchive/issues/detail?id=171
-SKIPTEST ?= 1
+# SKIPTEST ?= 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libarchive/trunk/checksums
===================================================================
--- csw/mgar/pkg/libarchive/trunk/checksums	2013-04-10 12:08:21 UTC (rev 20660)
+++ csw/mgar/pkg/libarchive/trunk/checksums	2013-04-10 12:14:20 UTC (rev 20661)
@@ -1 +1 @@
-83b237a542f27969a8d68ac217dc3796  libarchive-2.8.4.tar.gz
+efad5a503f66329bb9d2f4308b5de98a  libarchive-3.1.2.tar.gz

Added: csw/mgar/pkg/libarchive/trunk/files/0001-Consider-name-to-be-NULL-in-ACL-test.patch
===================================================================
--- csw/mgar/pkg/libarchive/trunk/files/0001-Consider-name-to-be-NULL-in-ACL-test.patch	                        (rev 0)
+++ csw/mgar/pkg/libarchive/trunk/files/0001-Consider-name-to-be-NULL-in-ACL-test.patch	2013-04-10 12:14:20 UTC (rev 20661)
@@ -0,0 +1,33 @@
+From 33be69e8909e541a7852fa41784d012f63fa0090 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 10 Apr 2013 13:56:06 +0200
+Subject: [PATCH] Consider name to be NULL in ACL test
+
+---
+ libarchive/test/test_acl_nfs4.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/test/test_acl_nfs4.c b/libarchive/test/test_acl_nfs4.c
+index c8f5937..76ac023 100644
+--- a/libarchive/test/test_acl_nfs4.c
++++ b/libarchive/test/test_acl_nfs4.c
+@@ -233,14 +233,14 @@ compare_acls(struct archive_entry *ae, struct acl_t *acls, int n)
+ 		}
+ 		failure("Could not find match for ACL "
+ 		    "(type=%d,permset=%d,tag=%d,qual=%d,name=``%s'')",
+-		    type, permset, tag, qual, name);
++		    type, permset, tag, qual, name == NULL ? "<NULL>" : name);
+ 		assertEqualInt(1, matched);
+ 	}
+ 	assertEqualInt(ARCHIVE_EOF, r);
+ 	failure("Could not find match for ACL "
+ 	    "(type=%d,permset=%d,tag=%d,qual=%d,name=``%s'')",
+ 	    acls[marker[0]].type, acls[marker[0]].permset,
+-	    acls[marker[0]].tag, acls[marker[0]].qual, acls[marker[0]].name);
++	    acls[marker[0]].tag, acls[marker[0]].qual, acls[marker[0]].name == NULL ? "<NULL>" : acls[marker[0]].name);
+ 	assertEqualInt(0, n); /* Number of ACLs not matched should == 0 */
+ 	free(marker);
+ }
+-- 
+1.8.1.4
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.