--- a/components/libarchive/Makefile	Tue May 02 08:26:02 2017 -0700
+++ b/components/libarchive/Makefile	Tue May 02 16:33:46 2017 -0700
@@ -26,16 +26,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		libarchive
-COMPONENT_VERSION=	3.2.1
+COMPONENT_VERSION=	3.3.1
 COMPONENT_PROJECT_URL=	http://www.libarchive.org/
 COMPONENT_ARCHIVE_HASH=	\
-	sha256:72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2
+    sha256:29ca5bd1624ca5a007aa57e16080262ab4379dbf8797f5c52f7ea74a3b0424e7
 COMPONENT_ARCHIVE_URL=	\
     $(COMPONENT_PROJECT_URL)downloads/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/libarchive
 COMPONENT_ANITYA_ID=	1558
 
-TPNO=			29683
+TPNO=			35147
 
 TEST_TARGET= install $(TEST_32_and_64)
 SYSTEM_TEST_TARGET= build $(SYSTEM_TEST_32_and_64)

--- a/components/libarchive/patches/fix-tests.patch	Tue May 02 08:26:02 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-Version related tests fail because we have:
-
-#define ZLIB_VERSION "1.2.8-T4mods"
-
-in /usr/include/zlib.h instead of the normal:
-
-#define ZLIB_VERSION "1.2.8"
-
-This patch has been submitted upstream. See:
-https://github.com/libarchive/libarchive/issues/720
-
---- libarchive-3.2.0/tar/test/test_version.c.orig	2016-06-17 15:01:20.182487097 -0700
-+++ libarchive-3.2.0/tar/test/test_version.c	2016-06-17 16:09:37.869258356 -0700
[email protected]@ -88,7 +88,7 @@
- 	if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd')
- 		++q;
- 	/* Skip arbitrary third-party version numbers. */
--	while (s > 0 && (*q == ' ' || *q == '/' || *q == '.' || isalnum(*q))) {
-+	while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || isalnum(*q))) {
- 		++q;
- 		--s;
- 	}
---- libarchive-3.2.0/cpio/test/test_option_version.c.orig	2016-06-17 16:33:58.917721419 -0700
-+++ libarchive-3.2.0/cpio/test/test_option_version.c	2016-06-17 16:34:20.005855444 -0700
[email protected]@ -75,7 +75,7 @@
- 	if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd')
- 		++q;
- 	/* Skip arbitrary third-party version numbers. */
--	while (s > 0 && (*q == ' ' || *q == '/' || *q == '.' || isalnum(*q))) {
-+	while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || isalnum(*q))) {
- 		++q;
- 		--s;
- 	}
---- libarchive-3.2.0/cat/test/test_version.c.orig	2016-06-17 16:36:09.148321710 -0700
-+++ libarchive-3.2.0/cat/test/test_version.c	2016-06-17 16:36:25.036590222 -0700
[email protected]@ -83,7 +83,7 @@
- 	if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd')
- 		++q;
- 	/* Skip arbitrary third-party version numbers. */
--	while (s > 0 && (*q == ' ' || *q == '/' || *q == '.' || isalnum(*q))) {
-+	while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || isalnum(*q))) {
- 		++q;
- 		--s;
- 	}

--- a/components/libarchive/test/results-all.master	Tue May 02 08:26:02 2017 -0700
+++ b/components/libarchive/test/results-all.master	Tue May 02 16:33:46 2017 -0700
@@ -1,16 +1,15 @@
 PASS: libarchive_test
-FAIL: bsdtar_test
+PASS: bsdtar_test
 PASS: bsdcpio_test
 PASS: bsdcat_test
 ============================================================================
 ============================================================================
 # TOTAL: 4
-# PASS:  3
+# PASS:  4
 # SKIP:  0
 # XFAIL: 0
-# FAIL:  1
-# FAIL:  1
+# FAIL:  0
+# FAIL:  0
 # XPASS: 0
 # ERROR: 0
 ============================================================================
-============================================================================