svn commit: r348977 - in vendor/libarchive/dist: . build libarchive

[Martin Matuska]

Author: mm
Date: Tue Jun 11 23:43:29 2019
New Revision: 348977
URL: https://svnweb.freebsd.org/changeset/base/348977

Log:
  Update vendor/libarchive/dist to git 91b5c59ada211293bd3d9fd6e803ebfc07085c04
  
    - cosmetic changes only

Modified:
  vendor/libarchive/dist/CMakeLists.txt
  vendor/libarchive/dist/build/version
  vendor/libarchive/dist/configure.ac
  vendor/libarchive/dist/libarchive/archive.h
  vendor/libarchive/dist/libarchive/archive_entry.h
  vendor/libarchive/dist/libarchive/archive_write_disk_posix.c

Modified: vendor/libarchive/dist/CMakeLists.txt
==============================================================================
--- vendor/libarchive/dist/CMakeLists.txt	Tue Jun 11 23:35:49 2019	(r348976)
+++ vendor/libarchive/dist/CMakeLists.txt	Tue Jun 11 23:43:29 2019	(r348977)
@@ -18,7 +18,7 @@ endif()
 #   RelWithDebInfo : Release build with Debug Info
 #   MinSizeRel     : Release Min Size build
 IF(NOT CMAKE_BUILD_TYPE)
-  SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE)
+  SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Type" FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 # Set a value type to properly display CMAKE_BUILD_TYPE on GUI if the
 # value type is "UNINITIALIZED".

Modified: vendor/libarchive/dist/build/version
==============================================================================
--- vendor/libarchive/dist/build/version	Tue Jun 11 23:35:49 2019	(r348976)
+++ vendor/libarchive/dist/build/version	Tue Jun 11 23:43:29 2019	(r348977)
@@ -1 +1 @@
-3004000
+3004001dev

Modified: vendor/libarchive/dist/configure.ac
==============================================================================
--- vendor/libarchive/dist/configure.ac	Tue Jun 11 23:35:49 2019	(r348976)
+++ vendor/libarchive/dist/configure.ac	Tue Jun 11 23:43:29 2019	(r348977)
@@ -4,8 +4,8 @@ dnl First, define all of the version numbers up front.
 dnl In particular, this allows the version macro to be used in AC_INIT
 
 dnl These first two version numbers are updated automatically on each release.
-m4_define([LIBARCHIVE_VERSION_S],[3.4.0])
-m4_define([LIBARCHIVE_VERSION_N],[3004000])
+m4_define([LIBARCHIVE_VERSION_S],[3.4.1dev])
+m4_define([LIBARCHIVE_VERSION_N],[3004001])
 
 dnl bsdtar and bsdcpio versioning tracks libarchive
 m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())

Modified: vendor/libarchive/dist/libarchive/archive.h
==============================================================================
--- vendor/libarchive/dist/libarchive/archive.h	Tue Jun 11 23:35:49 2019	(r348976)
+++ vendor/libarchive/dist/libarchive/archive.h	Tue Jun 11 23:43:29 2019	(r348977)
@@ -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 3004000
+#define	ARCHIVE_VERSION_NUMBER 3004001
 
 #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.4.0"
+#define	ARCHIVE_VERSION_ONLY_STRING "3.4.1dev"
 #define	ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
 __LA_DECL const char *	archive_version_string(void);
 

Modified: vendor/libarchive/dist/libarchive/archive_entry.h
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_entry.h	Tue Jun 11 23:35:49 2019	(r348976)
+++ vendor/libarchive/dist/libarchive/archive_entry.h	Tue Jun 11 23:43:29 2019	(r348977)
@@ -30,7 +30,7 @@
 #define	ARCHIVE_ENTRY_H_INCLUDED
 
 /* Note: Compiler will complain if this does not match archive.h! */
-#define	ARCHIVE_VERSION_NUMBER 3004000
+#define	ARCHIVE_VERSION_NUMBER 3004001
 
 /*
  * Note: archive_entry.h is for use outside of libarchive; the

Modified: vendor/libarchive/dist/libarchive/archive_write_disk_posix.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_write_disk_posix.c	Tue Jun 11 23:35:49 2019	(r348976)
+++ vendor/libarchive/dist/libarchive/archive_write_disk_posix.c	Tue Jun 11 23:43:29 2019	(r348977)
@@ -3544,26 +3544,16 @@ set_mode(struct archive_write_disk *a, int mode)
 	}
 
 	if (S_ISLNK(a->mode)) {
+#ifdef HAVE_LCHMOD
 		/*
-		 * If this is a symlink, use fchmod() or lchmod().  If the
+		 * If this is a symlink, use lchmod().  If the
 		 * platform doesn't support lchmod(), just skip it.  A
 		 * platform that doesn't provide a way to set
 		 * permissions on symlinks probably ignores
 		 * permissions on symlinks, so a failure here has no
 		 * impact.
 		 */
-#ifdef HAVE_FCHMOD
-		if (a->fd > 0)
-			r2 = fchmod(a->fd, mode);
-		else
-#endif
-#ifdef HAVE_LCHMOD
-		r2 = lchmod(a->name, mode);
-#else
-		/* We don't have lchmod() here and a fd is not given */
-		r2 = 0;
-#endif
-		if (r2 != 0) {
+		if (lchmod(a->name, mode) != 0) {
 			switch (errno) {
 			case ENOTSUP:
 			case ENOSYS:
@@ -3582,6 +3572,7 @@ set_mode(struct archive_write_disk *a, int mode)
 				r = ARCHIVE_WARN;
 			}
 		}
+#endif
 	} else if (!S_ISDIR(a->mode)) {
 		/*
 		 * If it's not a symlink and not a dir, then use