aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2020-12-27 23:06:27 +0000
committerMartin Matuska <mm@FreeBSD.org>2020-12-27 23:06:27 +0000
commit8be2bb3d35e232080b4e39244020e650bbe31562 (patch)
tree2023d66b4ec628d3a46f73d64d005d3a3ae746df
parentbcd2ffcdc2bdf4551e249ea3f75de6bbb5bfef02 (diff)
downloadsrc-vendor/libarchive.tar.gz
src-vendor/libarchive.zip
Update vendor/libarchive/dist to 227a4b9719a7fbeba6ba46e377ff7d953f405cd5vendor/libarchive/3.5.1vendor/libarchive
Libarchive 3.5.1
-rw-r--r--.cirrus.yml2
-rw-r--r--CMakeLists.txt2
-rw-r--r--NEWS2
-rwxr-xr-xbuild/ci/github_actions/ci.cmd4
-rw-r--r--build/version2
-rw-r--r--configure.ac2
-rw-r--r--libarchive/archive.h2
-rw-r--r--libarchive/config_freebsd.h1
8 files changed, 10 insertions, 7 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 472338e2ac80..e8235e426e62 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -10,7 +10,7 @@ FreeBSD_task:
BS: cmake
matrix:
freebsd_instance:
- image_family: freebsd-12-1
+ image_family: freebsd-12-2
freebsd_instance:
image_family: freebsd-11-4
prepare_script:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d8fc3c46dc0..58b4c8d9862a 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 "Debug" CACHE STRING "Build Type" FORCE)
+ SET(CMAKE_BUILD_TYPE "Release" 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/NEWS b/NEWS
index 598cf75166b1..47cebdd4b9b7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Dec 26, 2020: libarchive 3.5.1 released
+
Dec 01, 2020: libarchive 3.5.0 released
Oct 14, 2020: Support for system extended attributes
diff --git a/build/ci/github_actions/ci.cmd b/build/ci/github_actions/ci.cmd
index 84818b5054aa..23e2a949ea1a 100755
--- a/build/ci/github_actions/ci.cmd
+++ b/build/ci/github_actions/ci.cmd
@@ -1,7 +1,7 @@
@ECHO OFF
SET ZLIB_VERSION=1.2.11
SET BZIP2_VERSION=b7a672291188a6469f71dd13ad14f2f9a7344fc8
-SET XZ_VERSION=2327a461e1afce862c22269b80d3517801103c1b
+SET XZ_VERSION=5.2.5
IF NOT "%BE%"=="mingw-gcc" (
IF NOT "%BE%"=="msvc" (
ECHO Environment variable BE must be mingw-gcc or msvc
@@ -37,7 +37,7 @@ IF "%1"=="deplibs" (
)
IF NOT EXIST xz-%XZ_VERSION%.zip (
echo Downloading https://github.com/libarchive/xz/archive/%XZ_VERSION%.zip
- curl -L -o xz-%XZ_VERSION%.zip https://github.com/libarchive/xz/archive/%XZ_VERSION%.zip || EXIT /b 1
+ curl -L -o xz-%XZ_VERSION%.zip https://github.com/libarchive/xz/archive/v%XZ_VERSION%.zip || EXIT /b 1
)
IF NOT EXIST xz-%XZ_VERSION% (
echo Unpacking xz-%XZ_VERSION%.zip
diff --git a/build/version b/build/version
index ea39081c3023..205791c6d996 100644
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-3005001dev
+3005001
diff --git a/configure.ac b/configure.ac
index cb823bd473a2..84eb9a9faa86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ 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.5.1dev])
+m4_define([LIBARCHIVE_VERSION_S],[3.5.1])
m4_define([LIBARCHIVE_VERSION_N],[3005001])
dnl bsdtar and bsdcpio versioning tracks libarchive
diff --git a/libarchive/archive.h b/libarchive/archive.h
index 48abb3bc994e..52f4d782953b 100644
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -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.5.1dev"
+#define ARCHIVE_VERSION_ONLY_STRING "3.5.1"
#define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
__LA_DECL const char * archive_version_string(void);
diff --git a/libarchive/config_freebsd.h b/libarchive/config_freebsd.h
index a05121c7836b..a484618b4885 100644
--- a/libarchive/config_freebsd.h
+++ b/libarchive/config_freebsd.h
@@ -184,6 +184,7 @@
#define HAVE_STRFTIME 1
#define HAVE_STRINGS_H 1
#define HAVE_STRING_H 1
+#define HAVE_STRNLEN 1
#define HAVE_STRRCHR 1
#define HAVE_STRUCT_STATFS_F_NAMEMAX 1
#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1