diff options
author | Martin Matuska <mm@FreeBSD.org> | 2019-06-11 23:43:29 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2019-06-11 23:43:29 +0000 |
commit | 67e87fe612adae8fa61bc9f81274099c292fa8d9 (patch) | |
tree | 0e0101645ca3db139ba80d4fba50630270f0d07b | |
parent | e3586989c2bb0a5fe79b03eaa5ab50eec20eaf26 (diff) | |
download | src-67e87fe612adae8fa61bc9f81274099c292fa8d9.tar.gz src-67e87fe612adae8fa61bc9f81274099c292fa8d9.zip |
Update vendor/libarchive/dist to git 91b5c59ada211293bd3d9fd6e803ebfc07085c04
- cosmetic changes only
Notes
Notes:
svn path=/vendor/libarchive/dist/; revision=348977
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | build/version | 2 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | libarchive/archive.h | 4 | ||||
-rw-r--r-- | libarchive/archive_entry.h | 2 | ||||
-rw-r--r-- | libarchive/archive_write_disk_posix.c | 17 |
6 files changed, 11 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fd93d048027..061ad630ca5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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". diff --git a/build/version b/build/version index 784078cf9c92..955f37be2a76 100644 --- a/build/version +++ b/build/version @@ -1 +1 @@ -3004000 +3004001dev diff --git a/configure.ac b/configure.ac index c517b17c1975..d77143e3fbc4 100644 --- a/configure.ac +++ b/configure.ac @@ -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()) diff --git a/libarchive/archive.h b/libarchive/archive.h index 9ad9260b41ad..7b196e7bb9ea 100644 --- a/libarchive/archive.h +++ b/libarchive/archive.h @@ -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); diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h index 71cc63653b92..a1989ffa80f8 100644 --- a/libarchive/archive_entry.h +++ b/libarchive/archive_entry.h @@ -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 diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c index b1a0bb3843a2..283f3e787678 100644 --- a/libarchive/archive_write_disk_posix.c +++ b/libarchive/archive_write_disk_posix.c @@ -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 |