From owner-dev-commits-src-all@freebsd.org Sun Dec 27 23:07:03 2020 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5CF6E4CAA1F for ; Sun, 27 Dec 2020 23:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3xCC27KMz3sfV; Sun, 27 Dec 2020 23:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3C2B97702; Sun, 27 Dec 2020 23:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 0BRN73GE008877; Sun, 27 Dec 2020 23:07:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BRN735O008876; Sun, 27 Dec 2020 23:07:03 GMT (envelope-from git) Date: Sun, 27 Dec 2020 23:07:03 GMT Message-Id: <202012272307.0BRN735O008876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 8be2bb3d35e2 - vendor/libarchive - Update vendor/libarchive/dist to 227a4b9719a7fbeba6ba46e377ff7d953f405cd5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/libarchive X-Git-Reftype: branch X-Git-Commit: 8be2bb3d35e232080b4e39244020e650bbe31562 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for all branches of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Dec 2020 23:07:03 -0000 The branch vendor/libarchive has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=8be2bb3d35e232080b4e39244020e650bbe31562 commit 8be2bb3d35e232080b4e39244020e650bbe31562 Author: Martin Matuska AuthorDate: 2020-12-27 23:06:27 +0000 Commit: Martin Matuska CommitDate: 2020-12-27 23:06:27 +0000 Update vendor/libarchive/dist to 227a4b9719a7fbeba6ba46e377ff7d953f405cd5 Libarchive 3.5.1 --- .cirrus.yml | 2 +- CMakeLists.txt | 2 +- NEWS | 2 ++ build/ci/github_actions/ci.cmd | 4 ++-- build/version | 2 +- configure.ac | 2 +- libarchive/archive.h | 2 +- libarchive/config_freebsd.h | 1 + 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