svn commit: r321303 - in stable/11: contrib/libarchive contrib/libarchive/libarchive contrib/libarchive/libarchive/test usr.bin/bsdcat usr.bin/cpio usr.bin/tar

[Martin Matuska]

Author: mm
Date: Thu Jul 20 20:15:38 2017
New Revision: 321303
URL: https://svnweb.freebsd.org/changeset/base/321303

Log:
  MFC r320927,320931,320932:
  Bump libarchive to 3.3.2
  
  Vendor changes:
    PR #901: don't depend on stdin in a testcase
  
  Relnotes:	yes

Modified:
  stable/11/contrib/libarchive/NEWS
  stable/11/contrib/libarchive/libarchive/archive.h
  stable/11/contrib/libarchive/libarchive/archive_entry.h
  stable/11/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_filename.c
  stable/11/usr.bin/bsdcat/Makefile
  stable/11/usr.bin/cpio/Makefile
  stable/11/usr.bin/tar/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/libarchive/NEWS
==============================================================================
--- stable/11/contrib/libarchive/NEWS	Thu Jul 20 18:22:49 2017	(r321302)
+++ stable/11/contrib/libarchive/NEWS	Thu Jul 20 20:15:38 2017	(r321303)
@@ -1,3 +1,5 @@
+Jul 09, 2017: libarchive 3.3.2 released
+
 Mar 16, 2017: NFSv4 ACL support for Linux (librichacl)
 
 Feb 26, 2017: libarchive 3.3.1 released

Modified: stable/11/contrib/libarchive/libarchive/archive.h
==============================================================================
--- stable/11/contrib/libarchive/libarchive/archive.h	Thu Jul 20 18:22:49 2017	(r321302)
+++ stable/11/contrib/libarchive/libarchive/archive.h	Thu Jul 20 20:15:38 2017	(r321303)
@@ -36,7 +36,7 @@
  * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
  */
 /* Note: Compiler will complain if this does not match archive_entry.h! */
-#define	ARCHIVE_VERSION_NUMBER 3003001
+#define	ARCHIVE_VERSION_NUMBER 3003002
 
 #include <sys/stat.h>
 #include <stddef.h>  /* for wchar_t */
@@ -155,7 +155,7 @@ __LA_DECL int		archive_version_number(void);
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define	ARCHIVE_VERSION_ONLY_STRING "3.3.1"
+#define	ARCHIVE_VERSION_ONLY_STRING "3.3.2"
 #define	ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
 __LA_DECL const char *	archive_version_string(void);
 

Modified: stable/11/contrib/libarchive/libarchive/archive_entry.h
==============================================================================
--- stable/11/contrib/libarchive/libarchive/archive_entry.h	Thu Jul 20 18:22:49 2017	(r321302)
+++ stable/11/contrib/libarchive/libarchive/archive_entry.h	Thu Jul 20 20:15:38 2017	(r321303)
@@ -30,7 +30,7 @@
 #define	ARCHIVE_ENTRY_H_INCLUDED
 
 /* Note: Compiler will complain if this does not match archive.h! */
-#define	ARCHIVE_VERSION_NUMBER 3003001
+#define	ARCHIVE_VERSION_NUMBER 3003002
 
 /*
  * Note: archive_entry.h is for use outside of libarchive; the

Modified: stable/11/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_filename.c
==============================================================================
--- stable/11/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_filename.c	Thu Jul 20 18:22:49 2017	(r321302)
+++ stable/11/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_filename.c	Thu Jul 20 20:15:38 2017	(r321303)
@@ -28,10 +28,12 @@ __FBSDID("$FreeBSD$");
 
 DEFINE_TEST(test_archive_read_close_twice_open_filename)
 {
+	const char *filename = "empty.file";
 	struct archive* a = archive_read_new();
 
+	assertMakeFile(filename, 0644, "");
 	assertEqualInt(ARCHIVE_OK, archive_read_support_format_empty(a));
-	assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, 0, 0));
+	assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, filename, 0));
 	assertEqualInt(0, archive_errno(a));
 	assertEqualString(NULL, archive_error_string(a));
 

Modified: stable/11/usr.bin/bsdcat/Makefile
==============================================================================
--- stable/11/usr.bin/bsdcat/Makefile	Thu Jul 20 18:22:49 2017	(r321302)
+++ stable/11/usr.bin/bsdcat/Makefile	Thu Jul 20 20:15:38 2017	(r321303)
@@ -6,7 +6,7 @@ _LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
 _LIBARCHIVECONFDIR=	${SRCTOP}/lib/libarchive
 
 PROG=	bsdcat
-BSDCAT_VERSION_STRING=	3.3.1
+BSDCAT_VERSION_STRING=	3.3.2
 
 .PATH:	${_LIBARCHIVEDIR}/cat
 SRCS=	bsdcat.c cmdline.c

Modified: stable/11/usr.bin/cpio/Makefile
==============================================================================
--- stable/11/usr.bin/cpio/Makefile	Thu Jul 20 18:22:49 2017	(r321302)
+++ stable/11/usr.bin/cpio/Makefile	Thu Jul 20 20:15:38 2017	(r321303)
@@ -6,7 +6,7 @@ _LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
 _LIBARCHIVECONFDIR=	${SRCTOP}/lib/libarchive
 
 PROG=	bsdcpio
-BSDCPIO_VERSION_STRING=	3.3.1
+BSDCPIO_VERSION_STRING=	3.3.2
 
 .PATH:	${_LIBARCHIVEDIR}/cpio
 SRCS=	cpio.c cmdline.c

Modified: stable/11/usr.bin/tar/Makefile
==============================================================================
--- stable/11/usr.bin/tar/Makefile	Thu Jul 20 18:22:49 2017	(r321302)
+++ stable/11/usr.bin/tar/Makefile	Thu Jul 20 20:15:38 2017	(r321303)
@@ -4,7 +4,7 @@
 _LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
 
 PROG=	bsdtar
-BSDTAR_VERSION_STRING=	3.3.1
+BSDTAR_VERSION_STRING=	3.3.2
 
 .PATH: ${_LIBARCHIVEDIR}/tar
 SRCS=	bsdtar.c	\