开源软件构建与测试

_service:tar_scm:libarchive.spec Changed

@@ -1,15 +1,13 @@
 %bcond_without check
 
 Name: libarchive
-Version: 3.6.2
-Release: 2
+Version: 3.7.1
+Release: 1
 Summary: Multi-format archive and compression library
 License: BSD
 URL: https://www.libarchive.org/
 Source0: https://libarchive.org/downloads/%{name}-%{version}.tar.gz
 
-Patch6000: backport-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch
-
 BuildRequires: gcc bison sharutils zlib-devel bzip2-devel xz-devel
 BuildRequires: lzo-devel e2fsprogs-devel libacl-devel libattr-devel
 BuildRequires: openssl-devel libxml2-devel lz4-devel automake libzstd-devel
@@ -40,7 +38,6 @@
 The bsdtar package contains standalone bsdtar utility split off regular
 libarchive packages.
 
- 
 %package -n bsdcpio
 Summary: Copy files to and from archives
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -49,7 +46,6 @@
 The bsdcpio package contains standalone bsdcpio utility split off regular
 libarchive packages.
 
- 
 %package -n bsdcat
 Summary: Expand files to standard output
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -59,6 +55,14 @@
 input when used in a pipe. In both cases decompressed data it written to
 standard output.
 
+%package -n bsdunzip
+Summary: Extract files from a ZIP archive
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description -n bsdunzip
+The bsdunzip package contains standalone bsdunzip utility split off regular
+libarchive packages. It is designed to provide an interface compatible with Info-ZIP's
+
 %prep
 %autosetup -n %{name}-%{version} -p1
 
@@ -186,7 +190,18 @@
 %doc NEWS README.md
 %{_bindir}/bsdcat
 
+%files -n bsdunzip
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc NEWS README.md
+%{_bindir}/bsdunzip
+%{_mandir}/*/bsdunzip*
+
 %changelog
+* Thu Aug 3 2023 dillon chen<dillon.chen@gmail.com> - 3.7.1-1
+- Upgrade to 3.7.1
+- Add new bsdunzip subpackage
+
 * Thu Jun 15 2023 renhongxun<renhongxun@h-partners.com> - 3.6.2-2
 - Only add iconv to the .pc file if needed

_service:tar_scm:backport-Only-add-iconv-to-the-.pc-file-if-needed-1825.patch Deleted

@@ -1,42 +0,0 @@
-From 1f35c466aaa9444335a1b854b0b7223b0d2346c2 Mon Sep 17 00:00:00 2001
-From: Peter Pentchev <roam@ringlet.net>
-Date: Thu, 29 Dec 2022 00:04:40 +0200
-Subject: PATCH Only add "iconv" to the .pc file if needed (#1825)
-
-Hi,
-
-Thanks for writing and maintaining libarchive!
-
-What do you think about this trivial change that does not add "iconv" to
-the pkg-config file's list of required packages unless it is actually
-needed? On at least Debian GNU/Linux systems, the iconv(3) function is
-part of the system C library and there is no Debian package that
-installs an iconv.pc file, so I had to make this change to the Debian
-package of libarchive.
-
-Thanks again, and keep up the great work!
-
-G'luck,
-Peter
----
- configure.ac | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 99bff20d..e2715cfd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -378,7 +378,9 @@ if test "x$with_iconv" != "xno"; then
- AC_CHECK_HEADERS(localcharset.h)
- am_save_LIBS="$LIBS"
- LIBS="${LIBS} ${LIBICONV}"
-- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv"
-+ if test -n "$LIBICONV"; then
-+ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv"
-+ fi
- AC_CHECK_FUNCS(locale_charset)
- LIBS="${am_save_LIBS}"
- if test "x$ac_cv_func_locale_charset" != "xyes"; then
--- 
-2.33.0
-

_service:tar_scm:libarchive-3.6.2.tar.gz/CMakeLists.txt -> _service:tar_scm:libarchive-3.7.1.tar.gz/CMakeLists.txt Changed

@@ -199,6 +199,8 @@
 # Enable CTest/CDash support
 include(CTest)
 
+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+
 OPTION(ENABLE_MBEDTLS "Enable use of mbed TLS" OFF)
 OPTION(ENABLE_NETTLE "Enable use of Nettle" OFF)
 OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
@@ -223,6 +225,13 @@
 OPTION(ENABLE_CPIO_SHARED "Enable dynamic build of cpio" FALSE)
 OPTION(ENABLE_CAT "Enable cat building" ON)
 OPTION(ENABLE_CAT_SHARED "Enable dynamic build of cat" FALSE)
+IF(WIN32 AND NOT CYGWIN)
+	SET(ENABLE_UNZIP FALSE)
+	SET(ENABLE_UNZIP_SHARED FALSE)
+ELSE()
+	OPTION(ENABLE_UNZIP "Enable unzip building" ON)
+	OPTION(ENABLE_UNZIP_SHARED "Enable dynamic build of unzip" FALSE)
+ENDIF()
 OPTION(ENABLE_XATTR "Enable extended attribute support" ON)
 OPTION(ENABLE_ACL "Enable ACL support" ON)
 OPTION(ENABLE_ICONV "Enable iconv support" ON)
@@ -299,6 +308,7 @@
 
 IF(MINGW)
 ADD_DEFINITIONS(-D__USE_MINGW_ANSI_STDIO)
+ ADD_DEFINITIONS(-D__MINGW_USE_VC2005_COMPAT)
 ENDIF()
 
 #
@@ -369,7 +379,11 @@
 IF("${TRY_TYPE}" MATCHES "COMPILES")
 CHECK_C_SOURCE_COMPILES("${SAMPLE_SOURCE}" ${VAR})
 ELSEIF("${TRY_TYPE}" MATCHES "RUNS")
- CHECK_C_SOURCE_RUNS("${SAMPLE_SOURCE}" ${VAR})
+ IF(CMAKE_CROSSCOMPILING)
+ MESSAGE(WARNING "Cannot test run \"${VAR}\" when cross-compiling")
+ ELSE(CMAKE_CROSSCOMPILING)
+ CHECK_C_SOURCE_RUNS("${SAMPLE_SOURCE}" ${VAR})
+ ENDIF(CMAKE_CROSSCOMPILING)
 ELSE("${TRY_TYPE}" MATCHES "COMPILES")
 MESSAGE(FATAL_ERROR "UNKNOWN KEYWORD \"${TRY_TYPE}\" FOR TRY_TYPE")
 ENDIF("${TRY_TYPE}" MATCHES "COMPILES")
@@ -507,12 +521,16 @@
 COMPILES
 "#include <lzma.h>\nint main() {return (int)lzma_version_number(); }"
 "WITHOUT_LZMA_API_STATIC;LZMA_API_STATIC")
+ CHECK_C_SOURCE_COMPILES(
+ "#include <lzma.h>\n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){lzma_stream_encoder_mt(0, 0); return 0;}"
+ HAVE_LZMA_STREAM_ENCODER_MT)
 IF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC)
 ADD_DEFINITIONS(-DLZMA_API_STATIC)
 ENDIF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC)
 CMAKE_POP_CHECK_STATE()
 ELSE(LIBLZMA_FOUND)
 # LZMA not found and will not be used.
+ SET(HAVE_LZMA_STREAM_ENCODER_MT 0)
 ENDIF(LIBLZMA_FOUND)
 MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIR)
 MARK_AS_ADVANCED(CLEAR LIBLZMA_LIBRARY)
@@ -566,6 +584,7 @@
 SET(HAVE_BLAKE2_H 1)
 SET(ARCHIVE_BLAKE2 FALSE)
 LIST(APPEND ADDITIONAL_LIBS ${LIBB2_LIBRARY})
+ INCLUDE_DIRECTORIES(${LIBB2_INCLUDE_DIR})
 CMAKE_PUSH_CHECK_STATE()
 SET(CMAKE_REQUIRED_LIBRARIES ${LIBB2_LIBRARY})
 SET(CMAKE_REQUIRED_INCLUDES ${LIBB2_INCLUDE_DIR})
@@ -675,6 +694,7 @@
 int main(void) { return EXT2_IOC_GETFLAGS; }" HAVE_WORKING_EXT2_IOC_GETFLAGS)
 
 LA_CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H)
+LA_CHECK_INCLUDE_FILE("fnmatch.h" HAVE_FNMATCH_H)
 LA_CHECK_INCLUDE_FILE("grp.h" HAVE_GRP_H)
 LA_CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
 LA_CHECK_INCLUDE_FILE("io.h" HAVE_IO_H)
@@ -714,6 +734,7 @@
 LA_CHECK_INCLUDE_FILE("sys/mount.h" HAVE_SYS_MOUNT_H)
 LA_CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H)
 LA_CHECK_INCLUDE_FILE("sys/poll.h" HAVE_SYS_POLL_H)
+LA_CHECK_INCLUDE_FILE("sys/queue.h" HAVE_SYS_QUEUE_H)
 LA_CHECK_INCLUDE_FILE("sys/richacl.h" HAVE_SYS_RICHACL_H)
 LA_CHECK_INCLUDE_FILE("sys/select.h" HAVE_SYS_SELECT_H)
 LA_CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
@@ -733,9 +754,9 @@
 LA_CHECK_INCLUDE_FILE("wctype.h" HAVE_WCTYPE_H)
 LA_CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H)
 IF(ENABLE_CNG)
- LA_CHECK_INCLUDE_FILE("Bcrypt.h" HAVE_BCRYPT_H)
+ LA_CHECK_INCLUDE_FILE("bcrypt.h" HAVE_BCRYPT_H)
 IF(HAVE_BCRYPT_H)
- LIST(APPEND ADDITIONAL_LIBS "Bcrypt")
+ LIST(APPEND ADDITIONAL_LIBS "bcrypt")
 ENDIF(HAVE_BCRYPT_H)
 ELSE(ENABLE_CNG)
 UNSET(HAVE_BCRYPT_H CACHE)
@@ -812,6 +833,10 @@
 SET(HAVE_LIBCRYPTO 1)
 INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
 LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
+ SET(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
+ SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
+ LA_CHECK_INCLUDE_FILE("openssl/evp.h" HAVE_OPENSSL_EVP_H)
+ CHECK_FUNCTION_EXISTS(PKCS5_PBKDF2_HMAC_SHA1 HAVE_PKCS5_PBKDF2_HMAC_SHA1)
 ENDIF(OPENSSL_FOUND)
 ELSE()
 SET(OPENSSL_FOUND FALSE) # Override cached value
@@ -1348,6 +1373,7 @@
 CHECK_FUNCTION_EXISTS_GLIBC(fchown HAVE_FCHOWN)
 CHECK_FUNCTION_EXISTS_GLIBC(fcntl HAVE_FCNTL)
 CHECK_FUNCTION_EXISTS_GLIBC(fdopendir HAVE_FDOPENDIR)
+CHECK_FUNCTION_EXISTS_GLIBC(fnmatch HAVE_FNMATCH)
 CHECK_FUNCTION_EXISTS_GLIBC(fork HAVE_FORK)
 CHECK_FUNCTION_EXISTS_GLIBC(fstat HAVE_FSTAT)
 CHECK_FUNCTION_EXISTS_GLIBC(fstatat HAVE_FSTATAT)
@@ -1360,6 +1386,7 @@
 CHECK_FUNCTION_EXISTS_GLIBC(geteuid HAVE_GETEUID)
 CHECK_FUNCTION_EXISTS_GLIBC(getgrgid_r HAVE_GETGRGID_R)
 CHECK_FUNCTION_EXISTS_GLIBC(getgrnam_r HAVE_GETGRNAM_R)
+CHECK_FUNCTION_EXISTS_GLIBC(getline HAVE_GETLINE)
 CHECK_FUNCTION_EXISTS_GLIBC(getpwnam_r HAVE_GETPWNAM_R)
 CHECK_FUNCTION_EXISTS_GLIBC(getpwuid_r HAVE_GETPWUID_R)
 CHECK_FUNCTION_EXISTS_GLIBC(getpid HAVE_GETPID)
@@ -1412,12 +1439,12 @@
 CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
 CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
 CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
-CHECK_FUNCTION_EXISTS_GLIBC(_ctime64_s HAVE__CTIME64_S)
 CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64)
 CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE)
-CHECK_FUNCTION_EXISTS_GLIBC(_gmtime64_s HAVE__GMTIME64_S)
-CHECK_FUNCTION_EXISTS_GLIBC(_localtime64_s HAVE__LOCALTIME64_S)
-CHECK_FUNCTION_EXISTS_GLIBC(_mkgmtime64 HAVE__MKGMTIME64)
+CHECK_SYMBOL_EXISTS(ctime_s "time.h" HAVE_CTIME_S)
+CHECK_SYMBOL_EXISTS(gmtime_s "time.h" HAVE_GMTIME_S)
+CHECK_SYMBOL_EXISTS(localtime_s "time.h" HAVE_LOCALTIME_S)
+CHECK_SYMBOL_EXISTS(_mkgmtime "time.h" HAVE__MKGMTIME)
 
 SET(CMAKE_REQUIRED_LIBRARIES "")
 CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
@@ -1460,6 +1487,9 @@
 "#include <fcntl.h>\n#include <unistd.h>\nint main() {char buf10; return readlinkat(AT_FDCWD, \"\", buf, 0);}"
 HAVE_READLINKAT)
 
+# Check for getopt uses optreset to reset
+CHECK_SYMBOL_EXISTS(optreset "getopt.h" HAVE_GETOPT_OPTRESET)
+
 
 # To verify major(), we need to both include the header
 # of interest and verify that the result can be linked.
@@ -1472,14 +1502,6 @@
 "#include <sys/sysmacros.h>\nint main() { return major(256); }"
 MAJOR_IN_SYSMACROS)
 
-IF(ENABLE_LZMA)
-CHECK_C_SOURCE_COMPILES(
- "#include <lzma.h>\n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){lzma_stream_encoder_mt(0, 0); return 0;}"
- HAVE_LZMA_STREAM_ENCODER_MT)
-ELSE()
- SET(HAVE_LZMA_STREAM_ENCODER_MT 0)
-ENDIF(ENABLE_LZMA)
-
 IF(HAVE_STRERROR_R)
 SET(HAVE_DECL_STRERROR_R 1)
 ENDIF(HAVE_STRERROR_R)
@@ -1559,7 +1581,7 @@
 #
 #
 CHECK_STRUCT_HAS_MEMBER("struct tm" tm_sec
- "sys/types.h;sys/time.h;time.h" TIME_WITH_SYS_TIME)
+ "sys/types.h;sys/time.h;time.h" HAVE_SYS_TIME_H)
 
 #
 # Check for integer types
@@ -2092,3 +2114,4 @@
 add_subdirectory(cat)
 add_subdirectory(tar)
 add_subdirectory(cpio)
+add_subdirectory(unzip)

_service:tar_scm:libarchive-3.6.2.tar.gz/Makefile.am -> _service:tar_scm:libarchive-3.7.1.tar.gz/Makefile.am Changed

@@ -8,17 +8,17 @@
 #
 lib_LTLIBRARIES=	libarchive.la
 noinst_LTLIBRARIES=	libarchive_fe.la
-bin_PROGRAMS=	$(bsdtar_programs) $(bsdcpio_programs) $(bsdcat_programs)
-man_MANS= $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS) $(bsdcat_man_MANS)
-BUILT_SOURCES= libarchive/test/list.h tar/test/list.h cpio/test/list.h cat/test/list.h
+bin_PROGRAMS=	$(bsdtar_programs) $(bsdcpio_programs) $(bsdcat_programs) $(bsdunzip_programs)
+man_MANS= $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS) $(bsdcat_man_MANS) $(bsdunzip_man_MANS)
+BUILT_SOURCES= libarchive/test/list.h tar/test/list.h cpio/test/list.h cat/test/list.h unzip/test/list.h
 
 #
 # What to test: We always test libarchive, test bsdtar and bsdcpio only
 # if we built them.
 #
-check_PROGRAMS= libarchive_test $(bsdtar_test_programs) $(bsdcpio_test_programs) $(bsdcat_test_programs)
-TESTS= libarchive_test $(bsdtar_test_programs) $(bsdcpio_test_programs) $(bsdcat_test_programs)
-TESTS_ENVIRONMENT= $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT) $(bsdcat_TESTS_ENVIRONMENT)
+check_PROGRAMS= libarchive_test $(bsdtar_test_programs) $(bsdcpio_test_programs) $(bsdcat_test_programs) $(bsdunzip_test_programs)
+TESTS= libarchive_test $(bsdtar_test_programs) $(bsdcpio_test_programs) $(bsdcat_test_programs) $(bsdunzip_test_programs)
+TESTS_ENVIRONMENT= $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT) $(bsdcat_TESTS_ENVIRONMENT) $(bsdunzip_TESTS_ENVIRONMENT)
 # Always build and test both bsdtar and bsdcpio as part of 'distcheck'
 DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio
 # The next line is commented out by default in shipping libarchive releases.
@@ -49,7 +49,9 @@
 	$(bsdcpio_EXTRA_DIST) \
 	$(bsdcpio_test_EXTRA_DIST) \
 	$(bsdcat_EXTRA_DIST) \
-	$(bsdcat_test_EXTRA_DIST)
+	$(bsdcat_test_EXTRA_DIST) \
+	$(bsdunzip_EXTRA_DIST) \
+	$(bsdunzip_test_EXTRA_DIST)
 
 # a) Clean out some unneeded files and directories
 # b) Collect all documentation and format it for distribution.
@@ -69,7 +71,8 @@
 	libarchive/test/list.h \
 	tar/test/list.h \
 	cpio/test/list.h \
-	cat/test/list.h
+	cat/test/list.h \
+	unzip/test/list.h
 
 distclean-local:
 	-rm -rf .ref
@@ -82,7 +85,9 @@
 	- -f cpio/Makefile  && cd cpio && make clean
 	- -f cpio/test/Makefile  && cd cpio/test && make clean
 	- -f cat/Makefile  && cd cat && make clean
-	- -f cpio/test/Makefile  && cd cat/test && make clean
+	- -f cat/test/Makefile  && cd cat/test && make clean
+	- -f unzip/Makefile  && cd unzip && make clean
+	- -f unzip/test/Makefile  && cd unzip/test && make clean
 
 #
 # Libarchive headers, source, etc.
@@ -763,6 +768,7 @@
 	libarchive/test/test_read_format_7zip_copy.7z.uu \
 	libarchive/test/test_read_format_7zip_copy_2.7z.uu \
 	libarchive/test/test_read_format_7zip_deflate.7z.uu \
+	libarchive/test/test_read_format_7zip_deflate_arm64.7z.uu \
 	libarchive/test/test_read_format_7zip_delta_lzma1.7z.uu \
 	libarchive/test/test_read_format_7zip_delta4_lzma1.7z.uu \
 	libarchive/test/test_read_format_7zip_delta_lzma2.7z.uu \
@@ -776,11 +782,18 @@
 	libarchive/test/test_read_format_7zip_lzma1_2.7z.uu \
 	libarchive/test/test_read_format_7zip_lzma1_lzma2.7z.uu \
 	libarchive/test/test_read_format_7zip_lzma2.7z.uu \
+	libarchive/test/test_read_format_7zip_lzma2_arm64.7z.uu \
+	libarchive/test/test_read_format_7zip_lzma2_arm.7z.uu \
 	libarchive/test/test_read_format_7zip_malformed.7z.uu \
 	libarchive/test/test_read_format_7zip_malformed2.7z.uu \
 	libarchive/test/test_read_format_7zip_packinfo_digests.7z.uu \
 	libarchive/test/test_read_format_7zip_ppmd.7z.uu \
+	libarchive/test/test_read_format_7zip_solid_zstd.7z.uu \
 	libarchive/test/test_read_format_7zip_symbolic_name.7z.uu \
+	libarchive/test/test_read_format_7zip_zstd_arm.7z.uu \
+	libarchive/test/test_read_format_7zip_zstd_bcj.7z.uu \
+	libarchive/test/test_read_format_7zip_zstd_nobcj.7z.uu \
+	libarchive/test/test_read_format_7zip_zstd.7z.uu \
 	libarchive/test/test_read_format_ar.ar.uu \
 	libarchive/test/test_read_format_cab_1.cab.uu \
 	libarchive/test/test_read_format_cab_2.cab.uu \
@@ -1404,6 +1417,7 @@
 bsdcat_test_LDADD=libarchive_fe.la
 
 cat/test/list.h: Makefile
+	$(MKDIR_P) cat/test
 	cat $(top_srcdir)/cat/test/test_*.c | grep '^DEFINE_TEST' > cat/test/list.h
 
 if BUILD_BSDCAT
@@ -1428,3 +1442,102 @@
 	cat/test/test_expand.plain.uu \
 	cat/test/test_expand.xz.uu \
 	cat/test/CMakeLists.txt
+
+#
+#
+# bsdunzip source, docs, etc.
+#
+#
+
+bsdunzip_SOURCES= \
+		unzip/bsdunzip.c \
+		unzip/bsdunzip_platform.h \
+		unzip/la_getline.c \
+		unzip/la_queue.h
+
+if INC_WINDOWS_FILES
+bsdunzip_SOURCES+=
+endif
+
+bsdunzip_DEPENDENCIES = libarchive.la libarchive_fe.la
+
+
+if STATIC_BSDUNZIP
+bsdunzip_ldstatic= -static
+bsdunzip_ccstatic= -DLIBARCHIVE_STATIC
+else
+bsdunzip_ldstatic=
+bsdunzip_ccstatic=
+endif
+
+bsdunzip_LDADD= libarchive_fe.la libarchive.la $(LTLIBICONV)
+bsdunzip_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdunzip_ccstatic) $(PLATFORMCPPFLAGS)
+bsdunzip_LDFLAGS= $(bsdunzip_ldstatic) $(GC_SECTIONS)
+
+bsdunzip_EXTRA_DIST= \
+	unzip/bsdunzip.1 \
+	unzip/CMakeLists.txt
+
+
+if BUILD_BSDUNZIP
+# Manpages to install
+bsdunzip_man_MANS= unzip/bsdunzip.1
+bsdunzip_programs= bsdunzip
+else
+bsdunzip_man_MANS=
+bsdunzip_programs=
+endif
+
+#
+# bsdcat_test
+#
+
+bsdunzip_test_SOURCES= \
+	$(test_utils_SOURCES) \
+	unzip/test/test.h \
+	unzip/test/test_0.c \
+	unzip/test/test_basic.c \
+	unzip/test/test_glob.c \
+	unzip/test/test_not_exist.c \
+	unzip/test/test_singlefile.c \
+	unzip/test/test_C.c \
+	unzip/test/test_p.c \
+	unzip/test/test_d.c \
+	unzip/test/test_j.c \
+	unzip/test/test_L.c \
+	unzip/test/test_n.c \
+	unzip/test/test_o.c \
+	unzip/test/test_q.c \
+	unzip/test/test_t.c \
+	unzip/test/test_t_bad.c \
+	unzip/test/test_x.c \
+	unzip/test/test_Z1.c \
+	unzip/test/test_P_encryption.c
+
+bsdunzip_test_CPPFLAGS= \
+	-I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe \
+	-I$(top_srcdir)/test_utils \
+	-I$(top_srcdir)/unzip -I$(top_srcdir)/unzip/test \
+	-I$(top_builddir)/unzip/test \
+	$(PLATFORMCPPFLAGS)
+bsdunzip_test_LDADD=libarchive_fe.la
+
+unzip/test/list.h: Makefile
+	$(MKDIR_P) unzip/test
+	cat $(top_srcdir)/unzip/test/test_*.c | grep '^DEFINE_TEST' > unzip/test/list.h
+
+if BUILD_BSDUNZIP
+bsdunzip_test_programs= bsdunzip_test
+bsdunzip_TESTS_ENVIRONMENT= BSDUNZIP=`cd $(top_builddir);/bin/pwd`/bsdunzip$(EXEEXT) BSDUNZIP_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/unzip/test
+else
+bsdunzip_test_programs=
+bsdunzip_TESTS_ENVIRONMENT=
+endif
+
+bsdunzip_test_EXTRA_DIST= \
+	unzip/test/list.h \
+	unzip/test/test_basic.zip.uu \
+	unzip/test/test_encrypted.zip.uu \
+	unzip/test/test_singlefile.zip.uu \
+	unzip/test/test_t_bad.zip.uu \
+	unzip/test/CMakeLists.txt

_service:tar_scm:libarchive-3.6.2.tar.gz/Makefile.in -> _service:tar_scm:libarchive-3.7.1.tar.gz/Makefile.in Changed

@@ -91,11 +91,12 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
-check_PROGRAMS = libarchive_test$(EXEEXT) $(am__EXEEXT_4) \
-	$(am__EXEEXT_5) $(am__EXEEXT_6)
-TESTS = libarchive_test$(EXEEXT) $(am__EXEEXT_4) $(am__EXEEXT_5) \
-	$(am__EXEEXT_6)
+bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+	$(am__EXEEXT_4)
+check_PROGRAMS = libarchive_test$(EXEEXT) $(am__EXEEXT_5) \
+	$(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8)
+TESTS = libarchive_test$(EXEEXT) $(am__EXEEXT_5) $(am__EXEEXT_6) \
+	$(am__EXEEXT_7) $(am__EXEEXT_8)
 @INC_WINDOWS_FILES_TRUE@am__append_1 = \
 @INC_WINDOWS_FILES_TRUE@	libarchive/archive_entry_copy_bhfi.c \
 @INC_WINDOWS_FILES_TRUE@	libarchive/archive_read_disk_windows.c \
@@ -123,6 +124,7 @@
 @INC_WINDOWS_FILES_TRUE@		cpio/cpio_windows.c
 
 @INC_WINDOWS_FILES_TRUE@am__append_9 = 
+@INC_WINDOWS_FILES_TRUE@am__append_10 = 
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
@@ -151,13 +153,15 @@
 @BUILD_BSDTAR_TRUE@am__EXEEXT_1 = bsdtar$(EXEEXT)
 @BUILD_BSDCPIO_TRUE@am__EXEEXT_2 = bsdcpio$(EXEEXT)
 @BUILD_BSDCAT_TRUE@am__EXEEXT_3 = bsdcat$(EXEEXT)
+@BUILD_BSDUNZIP_TRUE@am__EXEEXT_4 = bsdunzip$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" \
 	"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" \
 	"$(DESTDIR)$(includedir)"
-@BUILD_BSDTAR_TRUE@am__EXEEXT_4 = bsdtar_test$(EXEEXT)
-@BUILD_BSDCPIO_TRUE@am__EXEEXT_5 = bsdcpio_test$(EXEEXT)
-@BUILD_BSDCAT_TRUE@am__EXEEXT_6 = bsdcat_test$(EXEEXT)
+@BUILD_BSDTAR_TRUE@am__EXEEXT_5 = bsdtar_test$(EXEEXT)
+@BUILD_BSDCPIO_TRUE@am__EXEEXT_6 = bsdcpio_test$(EXEEXT)
+@BUILD_BSDCAT_TRUE@am__EXEEXT_7 = bsdcat_test$(EXEEXT)
+@BUILD_BSDUNZIP_TRUE@am__EXEEXT_8 = bsdunzip_test$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -656,6 +660,35 @@
 	tar/test/bsdtar_test-test_windows.$(OBJEXT)
 bsdtar_test_OBJECTS = $(am_bsdtar_test_OBJECTS)
 bsdtar_test_LDADD = $(LDADD)
+am_bsdunzip_OBJECTS = unzip/bsdunzip-bsdunzip.$(OBJEXT) \
+	unzip/bsdunzip-la_getline.$(OBJEXT) $(am__objects_7)
+bsdunzip_OBJECTS = $(am_bsdunzip_OBJECTS)
+bsdunzip_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(bsdunzip_LDFLAGS) $(LDFLAGS) -o $@
+am__objects_13 = test_utils/bsdunzip_test-test_utils.$(OBJEXT) \
+	test_utils/bsdunzip_test-test_main.$(OBJEXT)
+am_bsdunzip_test_OBJECTS = $(am__objects_13) \
+	unzip/test/bsdunzip_test-test_0.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_basic.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_glob.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_not_exist.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_singlefile.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_C.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_p.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_d.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_j.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_L.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_n.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_o.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_q.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_t.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_t_bad.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_x.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_Z1.$(OBJEXT) \
+	unzip/test/bsdunzip_test-test_P_encryption.$(OBJEXT)
+bsdunzip_test_OBJECTS = $(am_bsdunzip_test_OBJECTS)
+bsdunzip_test_DEPENDENCIES = libarchive_fe.la
 am__libarchive_test_SOURCES_DIST = libarchive/archive_acl.c \
 	libarchive/archive_acl_private.h \
 	libarchive/archive_check_magic.c libarchive/archive_cmdline.c \
@@ -1085,18 +1118,18 @@
 	libarchive/test/test_write_read_format_zip.c \
 	libarchive/test/test_xattr_platform.c \
 	libarchive/test/test_zip_filename_encoding.c
-@INC_WINDOWS_FILES_TRUE@am__objects_13 = libarchive/test-archive_entry_copy_bhfi.$(OBJEXT) \
+@INC_WINDOWS_FILES_TRUE@am__objects_14 = libarchive/test-archive_entry_copy_bhfi.$(OBJEXT) \
 @INC_WINDOWS_FILES_TRUE@	libarchive/test-archive_read_disk_windows.$(OBJEXT) \
 @INC_WINDOWS_FILES_TRUE@	libarchive/test-archive_windows.$(OBJEXT) \
 @INC_WINDOWS_FILES_TRUE@	libarchive/test-archive_write_disk_windows.$(OBJEXT) \
 @INC_WINDOWS_FILES_TRUE@	libarchive/test-filter_fork_windows.$(OBJEXT)
-@INC_BLAKE2_TRUE@am__objects_14 = libarchive/test-archive_blake2s_ref.$(OBJEXT) \
+@INC_BLAKE2_TRUE@am__objects_15 = libarchive/test-archive_blake2s_ref.$(OBJEXT) \
 @INC_BLAKE2_TRUE@	libarchive/test-archive_blake2sp_ref.$(OBJEXT)
-@INC_LINUX_ACL_TRUE@am__objects_15 = libarchive/test-archive_disk_acl_linux.$(OBJEXT)
-@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_TRUE@am__objects_16 = libarchive/test-archive_disk_acl_sunos.$(OBJEXT)
-@INC_DARWIN_ACL_TRUE@@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_FALSE@am__objects_17 = libarchive/test-archive_disk_acl_darwin.$(OBJEXT)
-@INC_DARWIN_ACL_FALSE@@INC_FREEBSD_ACL_TRUE@@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_FALSE@am__objects_18 = libarchive/test-archive_disk_acl_freebsd.$(OBJEXT)
-am__objects_19 = libarchive/test-archive_acl.$(OBJEXT) \
+@INC_LINUX_ACL_TRUE@am__objects_16 = libarchive/test-archive_disk_acl_linux.$(OBJEXT)
+@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_TRUE@am__objects_17 = libarchive/test-archive_disk_acl_sunos.$(OBJEXT)
+@INC_DARWIN_ACL_TRUE@@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_FALSE@am__objects_18 = libarchive/test-archive_disk_acl_darwin.$(OBJEXT)
+@INC_DARWIN_ACL_FALSE@@INC_FREEBSD_ACL_TRUE@@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_FALSE@am__objects_19 = libarchive/test-archive_disk_acl_freebsd.$(OBJEXT)
+am__objects_20 = libarchive/test-archive_acl.$(OBJEXT) \
 	libarchive/test-archive_check_magic.$(OBJEXT) \
 	libarchive/test-archive_cmdline.$(OBJEXT) \
 	libarchive/test-archive_cryptor.$(OBJEXT) \
@@ -1215,12 +1248,12 @@
 	libarchive/test-archive_write_set_options.$(OBJEXT) \
 	libarchive/test-archive_write_set_passphrase.$(OBJEXT) \
 	libarchive/test-filter_fork_posix.$(OBJEXT) \
-	libarchive/test-xxhash.$(OBJEXT) $(am__objects_13) \
-	$(am__objects_14) $(am__objects_15) $(am__objects_16) \
-	$(am__objects_17) $(am__objects_18)
-am__objects_20 = test_utils/libarchive_test-test_utils.$(OBJEXT) \
+	libarchive/test-xxhash.$(OBJEXT) $(am__objects_14) \
+	$(am__objects_15) $(am__objects_16) $(am__objects_17) \
+	$(am__objects_18) $(am__objects_19)
+am__objects_21 = test_utils/libarchive_test-test_utils.$(OBJEXT) \
 	test_utils/libarchive_test-test_main.$(OBJEXT)
-am_libarchive_test_OBJECTS = $(am__objects_19) $(am__objects_20) \
+am_libarchive_test_OBJECTS = $(am__objects_20) $(am__objects_21) \
 	libarchive/test/test-read_open_memory.$(OBJEXT) \
 	libarchive/test/test-test_acl_nfs4.$(OBJEXT) \
 	libarchive/test/test-test_acl_pax.$(OBJEXT) \
@@ -2213,8 +2246,30 @@
 	test_utils/$(DEPDIR)/bsdcpio_test-test_utils.Po \
 	test_utils/$(DEPDIR)/bsdtar_test-test_main.Po \
 	test_utils/$(DEPDIR)/bsdtar_test-test_utils.Po \
+	test_utils/$(DEPDIR)/bsdunzip_test-test_main.Po \
+	test_utils/$(DEPDIR)/bsdunzip_test-test_utils.Po \
 	test_utils/$(DEPDIR)/libarchive_test-test_main.Po \
-	test_utils/$(DEPDIR)/libarchive_test-test_utils.Po
+	test_utils/$(DEPDIR)/libarchive_test-test_utils.Po \
+	unzip/$(DEPDIR)/bsdunzip-bsdunzip.Po \
+	unzip/$(DEPDIR)/bsdunzip-la_getline.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_0.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_C.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_L.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_P_encryption.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_Z1.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_basic.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_d.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_glob.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_j.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_n.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_not_exist.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_o.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_p.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_q.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_singlefile.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_t.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_t_bad.Po \
+	unzip/test/$(DEPDIR)/bsdunzip_test-test_x.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -2237,12 +2292,14 @@
 SOURCES = $(libarchive_la_SOURCES) $(libarchive_fe_la_SOURCES) \
 	$(bsdcat_SOURCES) $(bsdcat_test_SOURCES) $(bsdcpio_SOURCES) \
 	$(bsdcpio_test_SOURCES) $(bsdtar_SOURCES) \
-	$(bsdtar_test_SOURCES) $(libarchive_test_SOURCES)
+	$(bsdtar_test_SOURCES) $(bsdunzip_SOURCES) \
+	$(bsdunzip_test_SOURCES) $(libarchive_test_SOURCES)
 DIST_SOURCES = $(am__libarchive_la_SOURCES_DIST) \
 	$(libarchive_fe_la_SOURCES) $(bsdcat_SOURCES) \
 	$(bsdcat_test_SOURCES) $(am__bsdcpio_SOURCES_DIST) \
 	$(bsdcpio_test_SOURCES) $(am__bsdtar_SOURCES_DIST) \
-	$(bsdtar_test_SOURCES) $(am__libarchive_test_SOURCES_DIST)
+	$(bsdtar_test_SOURCES) $(bsdunzip_SOURCES) \
+	$(bsdunzip_test_SOURCES) $(am__libarchive_test_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -2631,9 +2688,9 @@
 #
 lib_LTLIBRARIES = libarchive.la
 noinst_LTLIBRARIES = libarchive_fe.la
-man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS) $(bsdcat_man_MANS)
-BUILT_SOURCES = libarchive/test/list.h tar/test/list.h cpio/test/list.h cat/test/list.h
-TESTS_ENVIRONMENT = $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT) $(bsdcat_TESTS_ENVIRONMENT)
+man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS) $(bsdcat_man_MANS) $(bsdunzip_man_MANS)
+BUILT_SOURCES = libarchive/test/list.h tar/test/list.h cpio/test/list.h cat/test/list.h unzip/test/list.h
+TESTS_ENVIRONMENT = $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT) $(bsdcat_TESTS_ENVIRONMENT) $(bsdunzip_TESTS_ENVIRONMENT)
 # Always build and test both bsdtar and bsdcpio as part of 'distcheck'
 DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio
 # The next line is commented out by default in shipping libarchive releases.
@@ -2663,7 +2720,9 @@
 	$(bsdcpio_EXTRA_DIST) \
 	$(bsdcpio_test_EXTRA_DIST) \
 	$(bsdcat_EXTRA_DIST) \
-	$(bsdcat_test_EXTRA_DIST)
+	$(bsdcat_test_EXTRA_DIST) \
+	$(bsdunzip_EXTRA_DIST) \
+	$(bsdunzip_test_EXTRA_DIST)
 
 
 #
@@ -2673,7 +2732,8 @@
 	libarchive/test/list.h \

_service:tar_scm:libarchive-3.6.2.tar.gz/NEWS -> _service:tar_scm:libarchive-3.7.1.tar.gz/NEWS Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/README.md -> _service:tar_scm:libarchive-3.7.1.tar.gz/README.md Changed

@@ -7,7 +7,7 @@
 
 ## Questions?  Issues?
 
-* http://www.libarchive.org is the home for ongoing
+* https://www.libarchive.org is the home for ongoing
   libarchive development, including documentation,
   and links to the libarchive mailing lists.
 * To report an issue, use the issue tracker at
@@ -23,6 +23,7 @@
 * **tar**: the 'bsdtar' program is a full-featured 'tar' implementation built on libarchive
 * **cpio**: the 'bsdcpio' program is a different interface to essentially the same functionality
 * **cat**: the 'bsdcat' program is a simple replacement tool for zcat, bzcat, xzcat, and such
+* **unzip**: the 'bsdunzip' program is a simple replacement tool for Info-ZIP's unzip
 * **examples**: Some small example programs that you may find useful.
 * **examples/minitar**: a compact sample demonstrating use of libarchive.
 * **contrib**:  Various items sent to me by third parties; please contact the authors with any questions.
@@ -87,7 +88,7 @@
   * ZIPX archives (with support for bzip2, ppmd8, lzma and xz compressed entries)
   * GNU and BSD 'ar' archives
   * 'mtree' format
-  * 7-Zip archives
+  * 7-Zip archives (including archives that use zstandard compression)
   * Microsoft CAB format
   * LHA and LZH archives
   * RAR and RAR 5.0 archives (with some limitations due to RAR's proprietary status)
@@ -192,6 +193,17 @@
   functions.  On those platforms, libarchive will use the non-thread-safe
   functions.  Patches to improve this are of great interest to us.
 
+* The function `archive_write_disk_header()` is _not_ thread safe on
+  POSIX machines and could lead to security issue resulting in world
+  writeable directories.  Thus it must be mutexed by the calling code.
+  This is due to calling `umask(oldumask = umask(0))`, which sets the
+  umask for the whole process to 0 for a short time frame.
+  In case other thread calls the same function in parallel, it might
+  get interrupted by it and cause the executable to use umask=0 for the
+  remaining execution.
+  This will then lead to implicitely created directories to have 777
+  permissions without sticky bit.
+
 * In particular, libarchive's modules to read or write a directory
   tree do use `chdir()` to optimize the directory traversals.  This
   can cause problems for programs that expect to do disk access from

_service:tar_scm:libarchive-3.6.2.tar.gz/build/cmake/FindMbedTLS.cmake -> _service:tar_scm:libarchive-3.7.1.tar.gz/build/cmake/FindMbedTLS.cmake Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/build/cmake/config.h.in -> _service:tar_scm:libarchive-3.7.1.tar.gz/build/cmake/config.h.in Changed

@@ -164,7 +164,7 @@
 #define HAVE_UINT8_T
 #endif
 
-#if !defined(HAVE_UINT16_T)
+#if !defined(HAVE_UINT8_T)
 #error No 8-bit unsigned integer type was found.
 #endif
 
@@ -207,6 +207,9 @@
 /* MD5 via ARCHIVE_CRYPTO_MD5_LIBSYSTEM supported. */
 #cmakedefine ARCHIVE_CRYPTO_MD5_LIBSYSTEM 1
 
+/* MD5 via ARCHIVE_CRYPTO_MD5_MBEDTLS supported. */
+#cmakedefine ARCHIVE_CRYPTO_MD5_MBEDTLS 1
+
 /* MD5 via ARCHIVE_CRYPTO_MD5_NETTLE supported. */
 #cmakedefine ARCHIVE_CRYPTO_MD5_NETTLE 1
 
@@ -222,6 +225,9 @@
 /* RMD160 via ARCHIVE_CRYPTO_RMD160_NETTLE supported. */
 #cmakedefine ARCHIVE_CRYPTO_RMD160_NETTLE 1
 
+/* RMD160 via ARCHIVE_CRYPTO_RMD160_MBEDTLS supported. */
+#cmakedefine ARCHIVE_CRYPTO_RMD160_MBEDTLS 1
+
 /* RMD160 via ARCHIVE_CRYPTO_RMD160_OPENSSL supported. */
 #cmakedefine ARCHIVE_CRYPTO_RMD160_OPENSSL 1
 
@@ -231,6 +237,9 @@
 /* SHA1 via ARCHIVE_CRYPTO_SHA1_LIBSYSTEM supported. */
 #cmakedefine ARCHIVE_CRYPTO_SHA1_LIBSYSTEM 1
 
+/* SHA1 via ARCHIVE_CRYPTO_SHA1_MBEDTLS supported. */
+#cmakedefine ARCHIVE_CRYPTO_SHA1_MBEDTLS 1
+
 /* SHA1 via ARCHIVE_CRYPTO_SHA1_NETTLE supported. */
 #cmakedefine ARCHIVE_CRYPTO_SHA1_NETTLE 1
 
@@ -252,6 +261,9 @@
 /* SHA256 via ARCHIVE_CRYPTO_SHA256_LIBSYSTEM supported. */
 #cmakedefine ARCHIVE_CRYPTO_SHA256_LIBSYSTEM 1
 
+/* SHA256 via ARCHIVE_CRYPTO_SHA256_MBEDTLS supported. */
+#cmakedefine ARCHIVE_CRYPTO_SHA256_MBEDTLS 1
+
 /* SHA256 via ARCHIVE_CRYPTO_SHA256_NETTLE supported. */
 #cmakedefine ARCHIVE_CRYPTO_SHA256_NETTLE 1
 
@@ -273,6 +285,9 @@
 /* SHA384 via ARCHIVE_CRYPTO_SHA384_LIBSYSTEM supported. */
 #cmakedefine ARCHIVE_CRYPTO_SHA384_LIBSYSTEM 1
 
+/* SHA384 via ARCHIVE_CRYPTO_SHA384_MBEDTLS supported. */
+#cmakedefine ARCHIVE_CRYPTO_SHA384_MBEDTLS 1
+
 /* SHA384 via ARCHIVE_CRYPTO_SHA384_NETTLE supported. */
 #cmakedefine ARCHIVE_CRYPTO_SHA384_NETTLE 1
 
@@ -294,6 +309,9 @@
 /* SHA512 via ARCHIVE_CRYPTO_SHA512_LIBSYSTEM supported. */
 #cmakedefine ARCHIVE_CRYPTO_SHA512_LIBSYSTEM 1
 
+/* SHA512 via ARCHIVE_CRYPTO_SHA512_MBEDTLS supported. */
+#cmakedefine ARCHIVE_CRYPTO_SHA512_MBEDTLS 1
+
 /* SHA512 via ARCHIVE_CRYPTO_SHA512_NETTLE supported. */
 #cmakedefine ARCHIVE_CRYPTO_SHA512_NETTLE 1
 
@@ -366,7 +384,7 @@
 /* Define to 1 if you have the <attr/xattr.h> header file. */
 #cmakedefine HAVE_ATTR_XATTR_H 1
 
-/* Define to 1 if you have the <Bcrypt.h> header file. */
+/* Define to 1 if you have the <bcrypt.h> header file. */
 #cmakedefine HAVE_BCRYPT_H 1
 
 /* Define to 1 if you have the <bsdxml.h> header file. */
@@ -570,6 +588,12 @@
 /* Define to 1 if you have the `flistxattr' function. */
 #cmakedefine HAVE_FLISTXATTR 1
 
+/* Define to 1 if you have the `fnmatch' function. */
+#cmakedefine HAVE_FNMATCH 1
+
+/* Define to 1 if you have the <fnmatch.h> header file. */
+#cmakedefine HAVE_FNMATCH_H 1
+
 /* Define to 1 if you have the `fork' function. */
 #cmakedefine HAVE_FORK 1
 
@@ -618,6 +642,12 @@
 /* Define to 1 if you have the `getgrnam_r' function. */
 #cmakedefine HAVE_GETGRNAM_R 1
 
+/* Define to 1 if you have the `getline' function. */
+#cmakedefine HAVE_GETLINE 1
+
+/* Define to 1 if platform uses `optreset` to reset `getopt` */
+#cmakedefine HAVE_GETOPT_OPTRESET 1
+
 /* Define to 1 if you have the `getpid' function. */
 #cmakedefine HAVE_GETPID 1
 
@@ -827,6 +857,15 @@
 /* Define to 1 if you have the <lzo/lzoconf.h> header file. */
 #cmakedefine HAVE_LZO_LZOCONF_H 1
 
+/* Define to 1 if you have the <mbedtls/aes.h> header file. */
+#cmakedefine HAVE_MBEDTLS_AES_H 1
+
+/* Define to 1 if you have the <mbedtls/md.h> header file. */
+#cmakedefine HAVE_MBEDTLS_MD_H 1
+
+/* Define to 1 if you have the <mbedtls/pkcs5.h> header file. */
+#cmakedefine HAVE_MBEDTLS_PKCS5_H 1
+
 /* Define to 1 if you have the `mbrtowc' function. */
 #cmakedefine HAVE_MBRTOWC 1
 
@@ -878,6 +917,9 @@
 /* Define to 1 if you have the `openat' function. */
 #cmakedefine HAVE_OPENAT 1
 
+/* Define to 1 if you have the <openssl/evp.h> header file. */
+#cmakedefine HAVE_OPENSSL_EVP_H 1
+
 /* Define to 1 if you have the <paths.h> header file. */
 #cmakedefine HAVE_PATHS_H 1
 
@@ -1073,6 +1115,9 @@
 /* Define to 1 if you have the <sys/poll.h> header file. */
 #cmakedefine HAVE_SYS_POLL_H 1
 
+/* Define to 1 if you have the <sys/queue.h> header file. */
+#cmakedefine HAVE_SYS_QUEUE_H 1
+
 /* Define to 1 if you have the <sys/richacl.h> header file. */
 #cmakedefine HAVE_SYS_RICHACL_H 1
 
@@ -1212,8 +1257,8 @@
 /* Define to 1 if you have the <zstd.h> header file. */
 #cmakedefine HAVE_ZSTD_H 1
 
-/* Define to 1 if you have the `_ctime64_s' function. */
-#cmakedefine HAVE__CTIME64_S 1
+/* Define to 1 if you have the `ctime_s' function. */
+#cmakedefine HAVE_CTIME_S 1
 
 /* Define to 1 if you have the `_fseeki64' function. */
 #cmakedefine HAVE__FSEEKI64 1
@@ -1221,14 +1266,14 @@
 /* Define to 1 if you have the `_get_timezone' function. */
 #cmakedefine HAVE__GET_TIMEZONE 1
 
-/* Define to 1 if you have the `_gmtime64_s' function. */
-#cmakedefine HAVE__GMTIME64_S 1
+/* Define to 1 if you have the `gmtime_s' function. */
+#cmakedefine HAVE_GMTIME_S 1
 
-/* Define to 1 if you have the `_localtime64_s' function. */
-#cmakedefine HAVE__LOCALTIME64_S 1
+/* Define to 1 if you have the `localtime_s' function. */
+#cmakedefine HAVE_LOCALTIME_S 1
 
-/* Define to 1 if you have the `_mkgmtime64' function. */
-#cmakedefine HAVE__MKGMTIME64 1
+/* Define to 1 if you have the `_mkgmtime' function. */
+#cmakedefine HAVE__MKGMTIME 1
 
 /* Define as const if the declaration of iconv() needs const. */
 #define ICONV_CONST @ICONV_CONST@

_service:tar_scm:libarchive-3.6.2.tar.gz/build/version -> _service:tar_scm:libarchive-3.7.1.tar.gz/build/version Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/cat/test/list.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/cat/test/list.h Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/config.h.in -> _service:tar_scm:libarchive-3.7.1.tar.gz/config.h.in Changed

@@ -315,6 +315,9 @@
 /* Define to 1 if you have the `chroot' function. */
 #undef HAVE_CHROOT
 
+/* cmtime_s function */
+#undef HAVE_CMTIME_S
+
 /* Define to 1 if you have the <copyfile.h> header file. */
 #undef HAVE_COPYFILE_H
 
@@ -514,6 +517,12 @@
 /* Define to 1 if you have the `flistxattr' function. */
 #undef HAVE_FLISTXATTR
 
+/* Define to 1 if you have the `fnmatch' function. */
+#undef HAVE_FNMATCH
+
+/* Define to 1 if you have the <fnmatch.h> header file. */
+#undef HAVE_FNMATCH_H
+
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
@@ -562,6 +571,12 @@
 /* Define to 1 if you have the `getgrnam_r' function. */
 #undef HAVE_GETGRNAM_R
 
+/* Define to 1 if you have the `getline' function. */
+#undef HAVE_GETLINE
+
+/* Platform uses optreset to reset getopt */
+#undef HAVE_GETOPT_OPTRESET
+
 /* Define to 1 if you have the `getpid' function. */
 #undef HAVE_GETPID
 
@@ -580,6 +595,9 @@
 /* Define to 1 if you have the `gmtime_r' function. */
 #undef HAVE_GMTIME_R
 
+/* gmtime_s function */
+#undef HAVE_GMTIME_S
+
 /* Define to 1 if you have the <grp.h> header file. */
 #undef HAVE_GRP_H
 
@@ -728,6 +746,9 @@
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
+/* localtime_s function */
+#undef HAVE_LOCALTIME_S
+
 /* Define to 1 if the system has the type `long long int'. */
 #undef HAVE_LONG_LONG_INT
 
@@ -753,6 +774,9 @@
 /* Define to 1 if you have the <lz4.h> header file. */
 #undef HAVE_LZ4_H
 
+/* Define to 1 if you have the `LZMA_FILTER_ARM64' macro. */
+#undef HAVE_LZMA_FILTER_ARM64
+
 /* Define to 1 if you have the <lzma.h> header file. */
 #undef HAVE_LZMA_H
 
@@ -1089,6 +1113,9 @@
 /* Define to 1 if you have the <sys/poll.h> header file. */
 #undef HAVE_SYS_POLL_H
 
+/* Define to 1 if you have the <sys/queue.h> header file. */
+#undef HAVE_SYS_QUEUE_H
+
 /* Define to 1 if you have the <sys/richacl.h> header file. */
 #undef HAVE_SYS_RICHACL_H
 
@@ -1227,23 +1254,14 @@
 /* Define to 1 if you have the <zstd.h> header file. */
 #undef HAVE_ZSTD_H
 
-/* Define to 1 if you have the `_ctime64_s' function. */
-#undef HAVE__CTIME64_S
-
 /* Define to 1 if you have the `_fseeki64' function. */
 #undef HAVE__FSEEKI64
 
 /* Define to 1 if you have the `_get_timezone' function. */
 #undef HAVE__GET_TIMEZONE
 
-/* Define to 1 if you have the `_gmtime64_s' function. */
-#undef HAVE__GMTIME64_S
-
-/* Define to 1 if you have the `_localtime64_s' function. */
-#undef HAVE__LOCALTIME64_S
-
-/* Define to 1 if you have the `_mkgmtime64' function. */
-#undef HAVE__MKGMTIME64
+/* _mkgmtime function */
+#undef HAVE__MKGMTIME
 
 /* Define as const if the declaration of iconv() needs const. */
 #undef ICONV_CONST
@@ -1313,10 +1331,6 @@
 /* Define to 1 if strerror_r returns char *. */
 #undef STRERROR_R_CHAR_P
 
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. This
- macro is obsolete. */
-#undef TIME_WITH_SYS_TIME
-
 /* Enable extensions on AIX 3, Interix. */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE

_service:tar_scm:libarchive-3.6.2.tar.gz/configure -> _service:tar_scm:libarchive-3.7.1.tar.gz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for libarchive 3.6.2.
+# Generated by GNU Autoconf 2.71 for libarchive 3.7.1.
 #
 # Report bugs to <libarchive-discuss@googlegroups.com>.
 #
@@ -621,8 +621,8 @@
 # Identity of this package.
 PACKAGE_NAME='libarchive'
 PACKAGE_TARNAME='libarchive'
-PACKAGE_VERSION='3.6.2'
-PACKAGE_STRING='libarchive 3.6.2'
+PACKAGE_VERSION='3.7.1'
+PACKAGE_STRING='libarchive 3.7.1'
 PACKAGE_BUGREPORT='libarchive-discuss@googlegroups.com'
 PACKAGE_URL=''
 
@@ -683,6 +683,10 @@
 LIBICONV
 INC_BLAKE2_FALSE
 INC_BLAKE2_TRUE
+STATIC_BSDUNZIP_FALSE
+STATIC_BSDUNZIP_TRUE
+BUILD_BSDUNZIP_FALSE
+BUILD_BSDUNZIP_TRUE
 STATIC_BSDCPIO_FALSE
 STATIC_BSDCPIO_TRUE
 BUILD_BSDCPIO_FALSE
@@ -844,6 +848,7 @@
 enable_bsdtar
 enable_bsdcat
 enable_bsdcpio
+enable_bsdunzip
 with_zlib
 with_bz2lib
 with_libb2
@@ -1428,7 +1433,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures libarchive 3.6.2 to adapt to many kinds of systems.
+\`configure' configures libarchive 3.7.1 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1499,7 +1504,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of libarchive 3.6.2:";;
+ short | recursive ) echo "Configuration of libarchive 3.7.1:";;
 esac
 cat <<\_ACEOF
 
@@ -1533,6 +1538,12 @@
 	 --enable-bsdcpio=static static build of bsdcpio
 	 --enable-bsdcpio=shared dynamic build of bsdcpio
 --disable-bsdcpio disable build of bsdcpio
+ --enable-bsdunzip enable build of bsdunzip (default)
+	 --enable-bsdunzip=static
+ force static build of bsdunzip
+	 --enable-bsdunzip=shared
+ force dynamic build of bsdunzip
+	 --disable-bsdunzip disable build of bsdunzip
 --disable-rpath do not hardcode runtime library paths
 --enable-posix-regex-lib
 choose what library to use for POSIX regular
@@ -1667,7 +1678,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-libarchive configure 3.6.2
+libarchive configure 3.7.1
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2461,7 +2472,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libarchive $as_me 3.6.2, which was
+It was created by libarchive $as_me 3.7.1, which was
 generated by GNU Autoconf 2.71. Invocation command line was
 
 $ $0$ac_configure_args_raw
@@ -3741,7 +3752,7 @@
 
 # Define the identity of the package.
 PACKAGE='libarchive'
- VERSION='3.6.2'
+ VERSION='3.7.1'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -3914,7 +3925,7 @@
 
 # Libtool interface version bumps on any API change, so increments
 # whenever libarchive minor version does.
-ARCHIVE_MINOR=$(( (3006002 / 1000) % 1000 ))
+ARCHIVE_MINOR=$(( (3007001 / 1000) % 1000 ))
 # Libarchive 2.7 == libtool interface 9 = 2 + 7
 # Libarchive 2.8 == libtool interface 10 = 2 + 8
 # Libarchive 2.9 == libtool interface 11 = 2 + 8
@@ -3922,7 +3933,7 @@
 # Libarchive 3.1 == libtool interface 13
 ARCHIVE_INTERFACE=`echo $((13 + ${ARCHIVE_MINOR}))`
 # Libarchive revision is bumped on any source change === libtool revision
-ARCHIVE_REVISION=$(( 3006002 % 1000 ))
+ARCHIVE_REVISION=$(( 3007001 % 1000 ))
 # Libarchive minor is bumped on any interface addition === libtool age
 ARCHIVE_LIBTOOL_VERSION=$ARCHIVE_INTERFACE:$ARCHIVE_REVISION:$ARCHIVE_MINOR
 
@@ -3931,29 +3942,29 @@
 printf "%s\n" "#define __LIBARCHIVE_CONFIG_H_INCLUDED 1" >>confdefs.h
 
 
-printf "%s\n" "#define LIBARCHIVE_VERSION_STRING \"3.6.2\"" >>confdefs.h
+printf "%s\n" "#define LIBARCHIVE_VERSION_STRING \"3.7.1\"" >>confdefs.h
 
 
-printf "%s\n" "#define LIBARCHIVE_VERSION_NUMBER \"3006002\"" >>confdefs.h
+printf "%s\n" "#define LIBARCHIVE_VERSION_NUMBER \"3007001\"" >>confdefs.h
 
 
-printf "%s\n" "#define BSDCPIO_VERSION_STRING \"3.6.2\"" >>confdefs.h
+printf "%s\n" "#define BSDCPIO_VERSION_STRING \"3.7.1\"" >>confdefs.h
 
 
-printf "%s\n" "#define BSDTAR_VERSION_STRING \"3.6.2\"" >>confdefs.h
+printf "%s\n" "#define BSDTAR_VERSION_STRING \"3.7.1\"" >>confdefs.h
 
 
-printf "%s\n" "#define BSDCAT_VERSION_STRING \"3.6.2\"" >>confdefs.h
+printf "%s\n" "#define BSDCAT_VERSION_STRING \"3.7.1\"" >>confdefs.h
 
 
 # The shell variables here must be the same as the AC_SUBST() variables
 # below, but the shell variable names apparently cannot be the same as
 # the m4 macro names above. Why? Ask autoconf.
-BSDCPIO_VERSION_STRING=3.6.2
-BSDTAR_VERSION_STRING=3.6.2
-BSDCAT_VERSION_STRING=3.6.2
-LIBARCHIVE_VERSION_STRING=3.6.2
-LIBARCHIVE_VERSION_NUMBER=3006002
+BSDCPIO_VERSION_STRING=3.7.1
+BSDTAR_VERSION_STRING=3.7.1
+BSDCAT_VERSION_STRING=3.7.1
+LIBARCHIVE_VERSION_STRING=3.7.1
+LIBARCHIVE_VERSION_NUMBER=3007001
 
 # Substitute the above version numbers into the various files below.
 # Yes, I believe this is the fourth time we define what are essentially
@@ -4074,7 +4085,7 @@
 
 PLATFORMCPPFLAGS=
 case "$host_os" in
- *mingw* ) PLATFORMCPPFLAGS=-D__USE_MINGW_ANSI_STDIO ;;
+ *mingw* ) PLATFORMCPPFLAGS=-D__USE_MINGW_ANSI_STDIO -D__MINGW_USE_VC2005_COMPAT ;;
 esac
 
 
@@ -5329,7 +5340,6 @@
 
 
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -14260,6 +14270,80 @@
 ;;
 esac
 
+#
+# Options for building bsdunzip.
+#
+# Default is to build bsdunzip, but allow people to override that.
+# Bsdunzip has not yet been ported for Windows
+#
+case "$host_os" in
+ *mingw* | *msys*)
+	enable_bsdunzip=no
+	;;
+ *)
+	# Check whether --enable-bsdunzip was given.
+if test ${enable_bsdunzip+y}
+then :
+ enableval=$enable_bsdunzip;
+else $as_nop
+ enable_bsdunzip=yes
+fi
+
+	;;
+esac
+
+case "$enable_bsdunzip" in
+yes)
+	if test "$enable_static" = "no"; then

_service:tar_scm:libarchive-3.6.2.tar.gz/configure.ac -> _service:tar_scm:libarchive-3.7.1.tar.gz/configure.ac Changed

@@ -4,15 +4,15 @@
 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.6.2)
-m4_define(LIBARCHIVE_VERSION_N,3006002)
+m4_define(LIBARCHIVE_VERSION_S,3.7.1)
+m4_define(LIBARCHIVE_VERSION_N,3007001)
 
 dnl bsdtar and bsdcpio versioning tracks libarchive
 m4_define(BSDTAR_VERSION_S,LIBARCHIVE_VERSION_S())
 m4_define(BSDCPIO_VERSION_S,LIBARCHIVE_VERSION_S())
 m4_define(BSDCAT_VERSION_S,LIBARCHIVE_VERSION_S())
 
-AC_PREREQ(2.69)
+AC_PREREQ(2.71)
 
 #
 # Now starts the "real" configure script.
@@ -99,13 +99,12 @@
 dnl Defines that are required for specific platforms (e.g. -D_POSIX_SOURCE, etc)
 PLATFORMCPPFLAGS=
 case "$host_os" in
- *mingw* ) PLATFORMCPPFLAGS=-D__USE_MINGW_ANSI_STDIO ;;
+ *mingw* ) PLATFORMCPPFLAGS=-D__USE_MINGW_ANSI_STDIO -D__MINGW_USE_VC2005_COMPAT ;;
 esac
 AC_SUBST(PLATFORMCPPFLAGS)
 
 # Checks for programs.
 AC_PROG_CC
-AC_PROG_CC_C99
 AM_PROG_CC_C_O
 AC_PROG_CPP
 AC_USE_SYSTEM_EXTENSIONS
@@ -268,12 +267,64 @@
 ;;
 esac
 
+#
+# Options for building bsdunzip.
+#
+# Default is to build bsdunzip, but allow people to override that.
+# Bsdunzip has not yet been ported for Windows
+#
+case "$host_os" in
+ *mingw* | *msys*)
+	enable_bsdunzip=no
+	;;
+ *)
+	AC_ARG_ENABLE(bsdunzip,
+	 AS_HELP_STRING(--enable-bsdunzip, enable build of bsdunzip (default))
+	 AS_HELP_STRING(--enable-bsdunzip=static, force static build of bsdunzip)
+	 AS_HELP_STRING(--enable-bsdunzip=shared, force dynamic build of bsdunzip)
+	 AS_HELP_STRING(--disable-bsdunzip, disable build of bsdunzip),
+	 , enable_bsdunzip=yes)
+	;;
+esac
+
+case "$enable_bsdunzip" in
+yes)
+	if test "$enable_static" = "no"; then
+		static_bsdunzip=no
+	else
+		static_bsdunzip=yes
+	fi
+	build_bsdunzip=yes
+	;;
+dynamic|shared)
+	if test "$enable_shared" = "no"; then
+		AC_MSG_FAILURE(Shared linking of bsdunzip requires shared libarchive)
+	fi
+	build_bsdunzip=yes
+	static_bsdunzip=no
+	;;
+static)
+	build_bsdunzip=yes
+	static_bsdunzip=yes
+	;;
+no)
+	build_bsdunzip=no
+	static_bsdunzip=no
+	;;
+*)
+	AC_MSG_FAILURE(Unsupported value for --enable-bsdunzip)
+	;;
+esac
+
+AM_CONDITIONAL(BUILD_BSDUNZIP, test "$build_bsdunzip" = yes )
+AM_CONDITIONAL(STATIC_BSDUNZIP, test "$static_bsdunzip" = yes )
+
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(acl/libacl.h attr/xattr.h)
 AC_CHECK_HEADERS(copyfile.h ctype.h)
-AC_CHECK_HEADERS(errno.h ext2fs/ext2_fs.h fcntl.h grp.h)
+AC_CHECK_HEADERS(errno.h ext2fs/ext2_fs.h fcntl.h fnmatch.h grp.h)
 
 AC_CACHE_CHECK(whether EXT2_IOC_GETFLAGS is usable,
 ac_cv_have_decl_EXT2_IOC_GETFLAGS,
@@ -306,7 +357,7 @@
 AC_CHECK_HEADERS(readpassphrase.h signal.h spawn.h)
 AC_CHECK_HEADERS(stdarg.h stdint.h stdlib.h string.h)
 AC_CHECK_HEADERS(sys/acl.h sys/cdefs.h sys/ea.h sys/extattr.h)
-AC_CHECK_HEADERS(sys/ioctl.h sys/mkdev.h sys/mount.h)
+AC_CHECK_HEADERS(sys/ioctl.h sys/mkdev.h sys/mount.h sys/queue.h)
 AC_CHECK_HEADERS(sys/param.h sys/poll.h sys/richacl.h)
 AC_CHECK_HEADERS(sys/select.h sys/statfs.h sys/statvfs.h sys/sysmacros.h)
 AC_CHECK_HEADERS(sys/time.h sys/utime.h sys/utsname.h sys/vfs.h sys/xattr.h)
@@ -378,7 +429,9 @@
 AC_CHECK_HEADERS(localcharset.h)
 am_save_LIBS="$LIBS"
 LIBS="${LIBS} ${LIBICONV}"
- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv"
+ if test -n "$LIBICONV"; then
+ LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv"
+ fi
 AC_CHECK_FUNCS(locale_charset)
 LIBS="${am_save_LIBS}"
 if test "x$ac_cv_func_locale_charset" != "xyes"; then
@@ -429,6 +482,19 @@
 if test "x$ac_cv_lzma_has_mt" != xno; then
 	 AC_DEFINE(HAVE_LZMA_STREAM_ENCODER_MT, 1, Define to 1 if you have the `lzma_stream_encoder_mt' function.)
 fi
+
+ AC_CACHE_CHECK(
+ whether we have ARM64 filter support in lzma,
+ ac_cv_lzma_has_arm64,
+ AC_LINK_IFELSE(
+ AC_LANG_PROGRAM(#include <lzma.h>
+ #ifndef LZMA_FILTER_ARM64
+ #error unsupported
+ #endif),
+ ac_cv_lzma_has_arm64=yes, ac_cv_lzma_has_arm64=no))
+ if test "x$ac_cv_lzma_has_arm64" != xno; then
+	 AC_DEFINE(HAVE_LZMA_FILTER_ARM64, 1, Define to 1 if you have the `LZMA_FILTER_ARM64' macro.)
+ fi
 fi
 
 AC_ARG_WITH(lzo2,
@@ -655,7 +721,7 @@
 AX_COMPILE_CHECK_SIZEOF(int)
 AX_COMPILE_CHECK_SIZEOF(long)
 
-AC_HEADER_TIME
+AC_CHECK_HEADERS_ONCE(sys/time.h)
 
 # Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
@@ -673,10 +739,10 @@
 # workarounds, we use 'void *' for 'struct SECURITY_ATTRIBUTES *'
 AC_CHECK_STDCALL_FUNC(CreateHardLinkA,const char *, const char *, void *)
 AC_CHECK_FUNCS(arc4random_buf chflags chown chroot ctime_r)
-AC_CHECK_FUNCS(fchdir fchflags fchmod fchown fcntl fdopendir fork)
+AC_CHECK_FUNCS(fchdir fchflags fchmod fchown fcntl fdopendir fnmatch fork)
 AC_CHECK_FUNCS(fstat fstatat fstatfs fstatvfs ftruncate)
 AC_CHECK_FUNCS(futimens futimes futimesat)
-AC_CHECK_FUNCS(geteuid getpid getgrgid_r getgrnam_r)
+AC_CHECK_FUNCS(geteuid getline getpid getgrgid_r getgrnam_r)
 AC_CHECK_FUNCS(getpwnam_r getpwuid_r getvfsbyname gmtime_r)
 AC_CHECK_FUNCS(lchflags lchmod lchown link linkat localtime_r lstat lutimes)
 AC_CHECK_FUNCS(mbrtowc memmove memset)
@@ -687,8 +753,24 @@
 AC_CHECK_FUNCS(strchr strdup strerror strncpy_s strnlen strrchr symlink)
 AC_CHECK_FUNCS(timegm tzset unlinkat unsetenv utime utimensat utimes vfork)
 AC_CHECK_FUNCS(wcrtomb wcscmp wcscpy wcslen wctomb wmemcmp wmemcpy wmemmove)
-AC_CHECK_FUNCS(_ctime64_s _fseeki64)
-AC_CHECK_FUNCS(_get_timezone _gmtime64_s _localtime64_s _mkgmtime64)
+AC_CHECK_FUNCS(_fseeki64 _get_timezone)
+AC_CHECK_DECL(cmtime_s,
+		AC_DEFINE(HAVE_CMTIME_S, 1, cmtime_s function),
+		,
+		#include <time.h>)
+AC_CHECK_DECL(gmtime_s,
+		AC_DEFINE(HAVE_GMTIME_S, 1, gmtime_s function),
+		,
+		#include <time.h>)
+AC_CHECK_TYPE(localtime_s,
+		AC_DEFINE(HAVE_LOCALTIME_S, 1, localtime_s function),
+		,
+		#include <time.h>)
+AC_CHECK_DECL(_mkgmtime,
+		AC_DEFINE(HAVE__MKGMTIME, 1, _mkgmtime function),
+		,
+		#include <time.h>)
+
 # detects cygwin-1.7, as opposed to older versions
 AC_CHECK_FUNCS(cygwin_conv_path)
 
@@ -750,6 +832,11 @@
 #endif
 )
 
+AC_CHECK_DECL(optreset,
+		AC_DEFINE(HAVE_GETOPT_OPTRESET, 1, Platform uses optreset to reset getopt),
+		,
+		#include <getopt.h>)
+
 # Check for Extended Attributes support
 AC_ARG_ENABLE(xattr,

_service:tar_scm:libarchive-3.6.2.tar.gz/contrib/android/config/android.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/contrib/android/config/android.h Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/contrib/android/config/linux_host.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/contrib/android/config/linux_host.h Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/contrib/android/config/windows_host.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/contrib/android/config/windows_host.h Changed

@@ -160,7 +160,7 @@
 /* Define to 1 if you have the <attr/xattr.h> header file. */
 /* #undef HAVE_ATTR_XATTR_H */
 
-/* Define to 1 if you have the <Bcrypt.h> header file. */
+/* Define to 1 if you have the <bcrypt.h> header file. */
 #define HAVE_BCRYPT_H
 
 /* Define to 1 if you have the <bzlib.h> header file. */
@@ -905,8 +905,8 @@
 /* Define to 1 if you have the <zlib.h> header file. */
 /* #undef HAVE_ZLIB_H */
 
-/* Define to 1 if you have the `_ctime64_s' function. */
-#define HAVE__CTIME64_S 1
+/* Define to 1 if you have the `ctime_s' function. */
+#define HAVE_CTIME_S 1
 
 /* Define to 1 if you have the `_fseeki64' function. */
 #define HAVE__FSEEKI64 1
@@ -914,11 +914,11 @@
 /* Define to 1 if you have the `_get_timezone' function. */
 /* #undef HAVE__GET_TIMEZONE */
 
-/* Define to 1 if you have the `_localtime64_s' function. */
-#define HAVE__LOCALTIME64_S 1
+/* Define to 1 if you have the `localtime_s' function. */
+#define HAVE_LOCALTIME_S 1
 
-/* Define to 1 if you have the `_mkgmtime64' function. */
-/* #define HAVE__MKGMTIME64 1 */
+/* Define to 1 if you have the `_mkgmtime' function. */
+/* #define HAVE__MKGMTIME 1 */
 
 /* Define as const if the declaration of iconv() needs const. */
 /* #undef ICONV_CONST */
@@ -952,7 +952,7 @@
 /* #undef STRERROR_R_CHAR_P */
 
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
+#define HAVE_SYS_TIME_H 1

_service:tar_scm:libarchive-3.6.2.tar.gz/contrib/archivetest.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/contrib/archivetest.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/contrib/untar.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/contrib/untar.c Changed

@@ -37,8 +37,16 @@
 #include <sys/stat.h> /* For mkdir() */
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
-#include <windows.h>
-#endif
+#define NUM_FORMAT "zu"
+#include <direct.h>
+#elif defined(__linux__) || defined(linux) || defined(__linux)
+#define NUM_FORMAT "d"
+#else
+#define NUM_FORMAT "lu"
+#endif /* defined(_WIN32) && !defined(__CYGWIN__) */
+
+#define TO_STRING(x) #x
+#define STR(x) TO_STRING(x)
 
 /* Parse an octal number, ignoring leading and trailing nonsense. */
 static int
@@ -145,18 +153,19 @@
 static void
 untar(FILE *a, const char *path)
 {
-	char buff512;
+ enum { BUF_SIZE=512 };
+	char buffBUF_SIZE;
 	FILE *f = NULL;
 	size_t bytes_read;
-	int filesize;
+	off_t filesize;
 
 	printf("Extracting from %s\n", path);
 	for (;;) {
-		bytes_read = fread(buff, 1, 512, a);
-		if (bytes_read < 512) {
+		bytes_read = fread(buff, 1, BUF_SIZE, a);
+		if (bytes_read < BUF_SIZE) {
 			fprintf(stderr,
-			 "Short read on %s: expected 512, got %d\n",
-			 path, (int)bytes_read);
+					"Short read on %s: expected " STR(BUF_SIZE) ", got %"NUM_FORMAT"\n",
+					path, bytes_read);
 			return;
 		}
 		if (is_end_of_archive(buff)) {
@@ -169,51 +178,51 @@
 		}
 		filesize = parseoct(buff + 124, 12);
 		switch (buff156) {
-		case '1':
-			printf(" Ignoring hardlink %s\n", buff);
-			break;
-		case '2':
-			printf(" Ignoring symlink %s\n", buff);
-			break;
-		case '3':
-			printf(" Ignoring character device %s\n", buff);
+			case '1':
+				printf(" Ignoring hardlink %s\n", buff);
+				break;
+			case '2':
+				printf(" Ignoring symlink %s\n", buff);
+				break;
+			case '3':
+				printf(" Ignoring character device %s\n", buff);
+				break;
+			case '4':
+				printf(" Ignoring block device %s\n", buff);
+				break;
+			case '5':
+				printf(" Extracting dir %s\n", buff);
+				create_dir(buff, parseoct(buff + 100, 8));
+				filesize = 0;
+				break;
+			case '6':
+				printf(" Ignoring FIFO %s\n", buff);
+				break;
+			default:
+				printf(" Extracting file %s\n", buff);
+				f = create_file(buff, parseoct(buff + 100, 8));
 				break;
-		case '4':
-			printf(" Ignoring block device %s\n", buff);
-			break;
-		case '5':
-			printf(" Extracting dir %s\n", buff);
-			create_dir(buff, parseoct(buff + 100, 8));
-			filesize = 0;
-			break;
-		case '6':
-			printf(" Ignoring FIFO %s\n", buff);
-			break;
-		default:
-			printf(" Extracting file %s\n", buff);
-			f = create_file(buff, parseoct(buff + 100, 8));
-			break;
 		}
 		while (filesize > 0) {
-			bytes_read = fread(buff, 1, 512, a);
-			if (bytes_read < 512) {
+			bytes_read = fread(buff, 1, BUF_SIZE, a);
+			if (bytes_read < BUF_SIZE) {
 				fprintf(stderr,
-				 "Short read on %s: Expected 512, got %d\n",
-				 path, (int)bytes_read);
+						"Short read on %s: Expected " STR(BUF_SIZE) ", got %"NUM_FORMAT"\n",
+						path, bytes_read);
 				return;
 			}
-			if (filesize < 512)
+			if (filesize < BUF_SIZE)
 				bytes_read = filesize;
 			if (f != NULL) {
 				if (fwrite(buff, 1, bytes_read, f)
-				 != bytes_read)
+					!= bytes_read)
 				{
 					fprintf(stderr, "Failed write\n");
 					fclose(f);
 					f = NULL;
 				}
 			}
-			filesize -= bytes_read;
+			filesize -= (off_t)bytes_read;
 		}
 		if (f != NULL) {
 			fclose(f);

_service:tar_scm:libarchive-3.6.2.tar.gz/cpio/cpio.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/cpio/cpio.c Changed

@@ -442,6 +442,8 @@
 	archive_match_free(cpio->matching);
 	free_cache(cpio->gname_cache);
 	free_cache(cpio->uname_cache);
+	archive_read_close(cpio->archive_read_disk);
+	archive_read_free(cpio->archive_read_disk);
 	free(cpio->destdir);
 	passphrase_free(cpio->ppbuff);
 	return (cpio->return_value);
@@ -1144,20 +1146,16 @@
 {
 	char			 size32;
 	char			 date32;
-	char			 uids16, gids16;
+	char			 uids22, gids22;
 	const char 		*uname, *gname;
 	FILE			*out = stdout;
 	const char		*fmt;
 	time_t			 mtime;
 	static time_t		 now;
 	struct tm		*ltime;
-#if defined(HAVE_LOCALTIME_R) || defined(HAVE__LOCALTIME64_S)
+#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
 	struct tm		tmbuf;
 #endif
-#if defined(HAVE__LOCALTIME64_S)
-	errno_t			terr;
-	__time64_t		tmptime;
-#endif
 
 	if (!now)
 		time(&now);
@@ -1205,19 +1203,17 @@
 	else
 		fmt = cpio->day_first ? "%e %b %H:%M" : "%b %e %H:%M";
 #endif
-#if defined(HAVE_LOCALTIME_R)
+#if defined(HAVE_LOCALTIME_S)
+	ltime = localtime_s(&tmbuf, &mtime) ? NULL : &tmbuf;
+#elif defined(HAVE_LOCALTIME_R)
 	ltime = localtime_r(&mtime, &tmbuf);
-#elif defined(HAVE__LOCALTIME64_S)
-	tmptime = mtime;
-	terr = _localtime64_s(&tmbuf, &tmptime);
-	if (terr)
-		ltime = NULL;
-	else
-		ltime = &tmbuf;
 #else
 	ltime = localtime(&mtime);
 #endif
-	strftime(date, sizeof(date), fmt, ltime);
+	if (ltime != NULL)
+		strftime(date, sizeof(date), fmt, ltime);
+	else
+		strcpy(date, "invalid mtime");
 
 	fprintf(out, "%s%3d %-8s %-8s %8s %12s %s",
 	    archive_entry_strmode(entry),

_service:tar_scm:libarchive-3.6.2.tar.gz/cpio/cpio_windows.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/cpio/cpio_windows.c Changed

@@ -156,7 +156,11 @@
 {
 	wchar_t *wpath;
 	HANDLE handle;
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+	CREATEFILE2_EXTENDED_PARAMETERS createExParams;
+#endif
 
+#if !defined(WINAPI_FAMILY_PARTITION) || WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
 	handle = CreateFileA(path, dwDesiredAccess, dwShareMode,
 	    lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes,
 	    hTemplateFile);
@@ -164,12 +168,25 @@
 		return (handle);
 	if (GetLastError() != ERROR_PATH_NOT_FOUND)
 		return (handle);
+#endif
 	wpath = permissive_name(path);
 	if (wpath == NULL)
-		return (handle);
+		return INVALID_HANDLE_VALUE;
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+	ZeroMemory(&createExParams, sizeof(createExParams));
+	createExParams.dwSize = sizeof(createExParams);
+	createExParams.dwFileAttributes = dwFlagsAndAttributes & 0xFFFF;
+	createExParams.dwFileFlags = dwFlagsAndAttributes & 0xFFF00000;
+	createExParams.dwSecurityQosFlags = dwFlagsAndAttributes & 0x000F0000;
+	createExParams.lpSecurityAttributes = lpSecurityAttributes;
+	createExParams.hTemplateFile = hTemplateFile;
+	handle = CreateFile2(wpath, dwDesiredAccess, dwShareMode,
+	    dwCreationDisposition, &createExParams);
+#else
 	handle = CreateFileW(wpath, dwDesiredAccess, dwShareMode,
 	    lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes,
 	    hTemplateFile);
+#endif
 	free(wpath);
 	return (handle);
 }

_service:tar_scm:libarchive-3.6.2.tar.gz/cpio/test/list.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/cpio/test/list.h Changed

@@ -1,35 +1,34 @@
 DEFINE_TEST(test_0)
 DEFINE_TEST(test_basic)
 DEFINE_TEST(test_cmdline)
-DEFINE_TEST(test_extract_cpio_Z)
 DEFINE_TEST(test_extract_cpio_bz2)
 DEFINE_TEST(test_extract_cpio_grz)
 DEFINE_TEST(test_extract_cpio_gz)
 DEFINE_TEST(test_extract_cpio_lrz)
-DEFINE_TEST(test_extract_cpio_lz)
 DEFINE_TEST(test_extract_cpio_lz4)
+DEFINE_TEST(test_extract_cpio_lz)
 DEFINE_TEST(test_extract_cpio_lzma)
 DEFINE_TEST(test_extract_cpio_lzo)
 DEFINE_TEST(test_extract_cpio_xz)
+DEFINE_TEST(test_extract_cpio_Z)
 DEFINE_TEST(test_extract_cpio_zstd)
 DEFINE_TEST(test_format_newc)
 DEFINE_TEST(test_gcpio_compat)
 DEFINE_TEST(test_missing_file)
 DEFINE_TEST(test_option_0)
-DEFINE_TEST(test_option_B_upper)
-DEFINE_TEST(test_option_C_upper)
-DEFINE_TEST(test_option_J_upper)
-DEFINE_TEST(test_option_L_upper)
-DEFINE_TEST(test_option_Z_upper)
 DEFINE_TEST(test_option_a)
 DEFINE_TEST(test_option_b64encode)
+DEFINE_TEST(test_option_B_upper)
 DEFINE_TEST(test_option_c)
+DEFINE_TEST(test_option_C_upper)
 DEFINE_TEST(test_option_d)
 DEFINE_TEST(test_option_f)
 DEFINE_TEST(test_option_grzip)
 DEFINE_TEST(test_option_help)
+DEFINE_TEST(test_option_J_upper)
 DEFINE_TEST(test_option_l)
 DEFINE_TEST(test_option_lrzip)
+DEFINE_TEST(test_option_L_upper)
 DEFINE_TEST(test_option_lz4)
 DEFINE_TEST(test_option_lzma)
 DEFINE_TEST(test_option_lzop)
@@ -43,6 +42,7 @@
 DEFINE_TEST(test_option_y)
 DEFINE_TEST(test_option_z)
 DEFINE_TEST(test_option_zstd)
+DEFINE_TEST(test_option_Z_upper)
 DEFINE_TEST(test_owner_parse)
 DEFINE_TEST(test_passthrough_dotdot)
 DEFINE_TEST(test_passthrough_reverse)

_service:tar_scm:libarchive-3.6.2.tar.gz/cpio/test/test_option_J_upper.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/cpio/test/test_option_J_upper.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/cpio/test/test_option_c.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/cpio/test/test_option_c.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/cpio/test/test_option_t.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/cpio/test/test_option_t.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/Makefile -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/Makefile Changed

@@ -107,15 +107,15 @@
 cpio.5.html: ../../libarchive/cpio.5
 	groff -mdoc -T html ../../libarchive/cpio.5 > cpio.5.html
 
-libarchive-formats.5.html: ../../libarchive/libarchive-formats.5
-	groff -mdoc -T html ../../libarchive/libarchive-formats.5 > libarchive-formats.5.html
-
 libarchive.3.html: ../../libarchive/libarchive.3
 	groff -mdoc -T html ../../libarchive/libarchive.3 > libarchive.3.html
 
 libarchive_changes.3.html: ../../libarchive/libarchive_changes.3
 	groff -mdoc -T html ../../libarchive/libarchive_changes.3 > libarchive_changes.3.html
 
+libarchive-formats.5.html: ../../libarchive/libarchive-formats.5
+	groff -mdoc -T html ../../libarchive/libarchive-formats.5 > libarchive-formats.5.html
+
 libarchive_internals.3.html: ../../libarchive/libarchive_internals.3
 	groff -mdoc -T html ../../libarchive/libarchive_internals.3 > libarchive_internals.3.html
 
@@ -130,4 +130,4 @@
 
 bsdcpio.1.html: ../../cpio/bsdcpio.1
 	groff -mdoc -T html ../../cpio/bsdcpio.1 > bsdcpio.1.html
-all: archive_entry.3.html archive_entry_acl.3.html archive_entry_linkify.3.html archive_entry_misc.3.html archive_entry_paths.3.html archive_entry_perms.3.html archive_entry_stat.3.html archive_entry_time.3.html archive_read.3.html archive_read_add_passphrase.3.html archive_read_data.3.html archive_read_disk.3.html archive_read_extract.3.html archive_read_filter.3.html archive_read_format.3.html archive_read_free.3.html archive_read_header.3.html archive_read_new.3.html archive_read_open.3.html archive_read_set_options.3.html archive_util.3.html archive_write.3.html archive_write_blocksize.3.html archive_write_data.3.html archive_write_disk.3.html archive_write_filter.3.html archive_write_finish_entry.3.html archive_write_format.3.html archive_write_free.3.html archive_write_header.3.html archive_write_new.3.html archive_write_open.3.html archive_write_set_options.3.html archive_write_set_passphrase.3.html cpio.5.html libarchive-formats.5.html libarchive.3.html libarchive_changes.3.html libarchive_internals.3.html mtree.5.html tar.5.html bsdtar.1.html bsdcpio.1.html
+all: archive_entry.3.html archive_entry_acl.3.html archive_entry_linkify.3.html archive_entry_misc.3.html archive_entry_paths.3.html archive_entry_perms.3.html archive_entry_stat.3.html archive_entry_time.3.html archive_read.3.html archive_read_add_passphrase.3.html archive_read_data.3.html archive_read_disk.3.html archive_read_extract.3.html archive_read_filter.3.html archive_read_format.3.html archive_read_free.3.html archive_read_header.3.html archive_read_new.3.html archive_read_open.3.html archive_read_set_options.3.html archive_util.3.html archive_write.3.html archive_write_blocksize.3.html archive_write_data.3.html archive_write_disk.3.html archive_write_filter.3.html archive_write_finish_entry.3.html archive_write_format.3.html archive_write_free.3.html archive_write_header.3.html archive_write_new.3.html archive_write_open.3.html archive_write_set_options.3.html archive_write_set_passphrase.3.html cpio.5.html libarchive.3.html libarchive_changes.3.html libarchive-formats.5.html libarchive_internals.3.html mtree.5.html tar.5.html bsdtar.1.html bsdcpio.1.html

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_entry.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_entry.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_entry_acl.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_entry_acl.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_entry_linkify.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_entry_linkify.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_entry_misc.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_entry_misc.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_entry_paths.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_entry_paths.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_entry_perms.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_entry_perms.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_entry_stat.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_entry_stat.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_entry_time.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_entry_time.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_read.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_read.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_read_add_passphrase.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_read_add_passphrase.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_read_data.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_read_data.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_read_disk.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_read_disk.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_read_extract.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_read_extract.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_read_filter.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_read_filter.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_read_format.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_read_format.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_read_free.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_read_free.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_read_header.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_read_header.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_read_new.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_read_new.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_read_open.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_read_open.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_read_set_options.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_read_set_options.3.html Changed

@@ -1,5 +1,5 @@
 
-
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -248,6 +248,33 @@
 contents of the first concatenated archive would be
 read.
 
+Format zip 
+compat-2x
+
+Libarchive 2.x incorrectly
+encoded Unicode filenames on some platforms. This option
+mimics the libarchive 2.x filename handling so that such
+archives can be read correctly.
+
+hdrcharset
+
+The value is used as a
+character set name that will be used when translating file
+names.
+
+ignorecrc32
+
+Skip the CRC32 check. Mostly
+used for testing.
+
+mac-ext
+
+Support Mac OS metadata
+extension that records data in special files beginning with
+a period and underscore. Defaults to enabled on Mac OS,
+disabled on other platforms. Use !mac-ext to
+disable.
+
 ERRORS
 
 Detailed error codes and textual

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_util.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_util.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_write.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_write.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_write_blocksize.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_write_blocksize.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_write_data.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_write_data.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_write_disk.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_write_disk.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_write_filter.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_write_filter.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_write_finish_entry.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_write_finish_entry.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_write_format.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_write_format.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_write_free.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_write_free.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_write_header.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_write_header.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_write_new.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_write_new.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_write_open.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_write_open.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_write_set_options.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_write_set_options.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/archive_write_set_passphrase.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/archive_write_set_passphrase.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/bsdcpio.1.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/bsdcpio.1.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/bsdtar.1.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/bsdtar.1.html Changed

@@ -1,5 +1,5 @@
 
-
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -749,6 +749,23 @@
 zstd(1) use as many threads as there are CPU cores on the
 system.
 
+zstd:frame-per-file
+
+Start a new compression frame
+at the beginning of each file in the archive.
+
+zstd:min-frame-size=N
+
+In combination with
+zstd:frame-per-file, do not start a new compression
+frame unless the current frame is at least N
+bytes.
+
+zstd:max-frame-size=N
+
+Start a new compression frame
+as soon as the current frame exceeds N bytes.
+
 lzop:compression-level
 
 A decimal integer from 1 to 9
@@ -1404,7 +1421,7 @@
 hardlink information.)
 
 BSD
-January&nbsp;31, 2020 BSD
+December&nbsp;1, 2022 BSD
 <hr>
 </body>
 </html>

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/cpio.5.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/cpio.5.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/libarchive-formats.5.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/libarchive-formats.5.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/libarchive.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/libarchive.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/libarchive_changes.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/libarchive_changes.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/libarchive_internals.3.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/libarchive_internals.3.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/mtree.5.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/mtree.5.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/html/tar.5.html -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/html/tar.5.html Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/man/Makefile -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/man/Makefile Changed

@@ -107,15 +107,15 @@
 cpio.5: ../mdoc2man.awk ../../libarchive/cpio.5
 	awk -f ../mdoc2man.awk < ../../libarchive/cpio.5 > cpio.5
 
-libarchive-formats.5: ../mdoc2man.awk ../../libarchive/libarchive-formats.5
-	awk -f ../mdoc2man.awk < ../../libarchive/libarchive-formats.5 > libarchive-formats.5
-
 libarchive.3: ../mdoc2man.awk ../../libarchive/libarchive.3
 	awk -f ../mdoc2man.awk < ../../libarchive/libarchive.3 > libarchive.3
 
 libarchive_changes.3: ../mdoc2man.awk ../../libarchive/libarchive_changes.3
 	awk -f ../mdoc2man.awk < ../../libarchive/libarchive_changes.3 > libarchive_changes.3
 
+libarchive-formats.5: ../mdoc2man.awk ../../libarchive/libarchive-formats.5
+	awk -f ../mdoc2man.awk < ../../libarchive/libarchive-formats.5 > libarchive-formats.5
+
 libarchive_internals.3: ../mdoc2man.awk ../../libarchive/libarchive_internals.3
 	awk -f ../mdoc2man.awk < ../../libarchive/libarchive_internals.3 > libarchive_internals.3
 
@@ -130,4 +130,4 @@
 
 bsdcpio.1: ../mdoc2man.awk ../../cpio/bsdcpio.1
 	awk -f ../mdoc2man.awk < ../../cpio/bsdcpio.1 > bsdcpio.1
-all: archive_entry.3 archive_entry_acl.3 archive_entry_linkify.3 archive_entry_misc.3 archive_entry_paths.3 archive_entry_perms.3 archive_entry_stat.3 archive_entry_time.3 archive_read.3 archive_read_add_passphrase.3 archive_read_data.3 archive_read_disk.3 archive_read_extract.3 archive_read_filter.3 archive_read_format.3 archive_read_free.3 archive_read_header.3 archive_read_new.3 archive_read_open.3 archive_read_set_options.3 archive_util.3 archive_write.3 archive_write_blocksize.3 archive_write_data.3 archive_write_disk.3 archive_write_filter.3 archive_write_finish_entry.3 archive_write_format.3 archive_write_free.3 archive_write_header.3 archive_write_new.3 archive_write_open.3 archive_write_set_options.3 archive_write_set_passphrase.3 cpio.5 libarchive-formats.5 libarchive.3 libarchive_changes.3 libarchive_internals.3 mtree.5 tar.5 bsdtar.1 bsdcpio.1
+all: archive_entry.3 archive_entry_acl.3 archive_entry_linkify.3 archive_entry_misc.3 archive_entry_paths.3 archive_entry_perms.3 archive_entry_stat.3 archive_entry_time.3 archive_read.3 archive_read_add_passphrase.3 archive_read_data.3 archive_read_disk.3 archive_read_extract.3 archive_read_filter.3 archive_read_format.3 archive_read_free.3 archive_read_header.3 archive_read_new.3 archive_read_open.3 archive_read_set_options.3 archive_util.3 archive_write.3 archive_write_blocksize.3 archive_write_data.3 archive_write_disk.3 archive_write_filter.3 archive_write_finish_entry.3 archive_write_format.3 archive_write_free.3 archive_write_header.3 archive_write_new.3 archive_write_open.3 archive_write_set_options.3 archive_write_set_passphrase.3 cpio.5 libarchive.3 libarchive_changes.3 libarchive-formats.5 libarchive_internals.3 mtree.5 tar.5 bsdtar.1 bsdcpio.1

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/man/archive_read_set_options.3 -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/man/archive_read_set_options.3 Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/man/bsdtar.1 -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/man/bsdtar.1 Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/Makefile -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/Makefile Changed

@@ -107,15 +107,15 @@
 cpio.5.pdf: ../../libarchive/cpio.5
 	groff -mdoc -T ps ../../libarchive/cpio.5 | ps2pdf - - > cpio.5.pdf
 
-libarchive-formats.5.pdf: ../../libarchive/libarchive-formats.5
-	groff -mdoc -T ps ../../libarchive/libarchive-formats.5 | ps2pdf - - > libarchive-formats.5.pdf
-
 libarchive.3.pdf: ../../libarchive/libarchive.3
 	groff -mdoc -T ps ../../libarchive/libarchive.3 | ps2pdf - - > libarchive.3.pdf
 
 libarchive_changes.3.pdf: ../../libarchive/libarchive_changes.3
 	groff -mdoc -T ps ../../libarchive/libarchive_changes.3 | ps2pdf - - > libarchive_changes.3.pdf
 
+libarchive-formats.5.pdf: ../../libarchive/libarchive-formats.5
+	groff -mdoc -T ps ../../libarchive/libarchive-formats.5 | ps2pdf - - > libarchive-formats.5.pdf
+
 libarchive_internals.3.pdf: ../../libarchive/libarchive_internals.3
 	groff -mdoc -T ps ../../libarchive/libarchive_internals.3 | ps2pdf - - > libarchive_internals.3.pdf
 
@@ -130,4 +130,4 @@
 
 bsdcpio.1.pdf: ../../cpio/bsdcpio.1
 	groff -mdoc -T ps ../../cpio/bsdcpio.1 | ps2pdf - - > bsdcpio.1.pdf
-all: archive_entry.3.pdf archive_entry_acl.3.pdf archive_entry_linkify.3.pdf archive_entry_misc.3.pdf archive_entry_paths.3.pdf archive_entry_perms.3.pdf archive_entry_stat.3.pdf archive_entry_time.3.pdf archive_read.3.pdf archive_read_add_passphrase.3.pdf archive_read_data.3.pdf archive_read_disk.3.pdf archive_read_extract.3.pdf archive_read_filter.3.pdf archive_read_format.3.pdf archive_read_free.3.pdf archive_read_header.3.pdf archive_read_new.3.pdf archive_read_open.3.pdf archive_read_set_options.3.pdf archive_util.3.pdf archive_write.3.pdf archive_write_blocksize.3.pdf archive_write_data.3.pdf archive_write_disk.3.pdf archive_write_filter.3.pdf archive_write_finish_entry.3.pdf archive_write_format.3.pdf archive_write_free.3.pdf archive_write_header.3.pdf archive_write_new.3.pdf archive_write_open.3.pdf archive_write_set_options.3.pdf archive_write_set_passphrase.3.pdf cpio.5.pdf libarchive-formats.5.pdf libarchive.3.pdf libarchive_changes.3.pdf libarchive_internals.3.pdf mtree.5.pdf tar.5.pdf bsdtar.1.pdf bsdcpio.1.pdf
+all: archive_entry.3.pdf archive_entry_acl.3.pdf archive_entry_linkify.3.pdf archive_entry_misc.3.pdf archive_entry_paths.3.pdf archive_entry_perms.3.pdf archive_entry_stat.3.pdf archive_entry_time.3.pdf archive_read.3.pdf archive_read_add_passphrase.3.pdf archive_read_data.3.pdf archive_read_disk.3.pdf archive_read_extract.3.pdf archive_read_filter.3.pdf archive_read_format.3.pdf archive_read_free.3.pdf archive_read_header.3.pdf archive_read_new.3.pdf archive_read_open.3.pdf archive_read_set_options.3.pdf archive_util.3.pdf archive_write.3.pdf archive_write_blocksize.3.pdf archive_write_data.3.pdf archive_write_disk.3.pdf archive_write_filter.3.pdf archive_write_finish_entry.3.pdf archive_write_format.3.pdf archive_write_free.3.pdf archive_write_header.3.pdf archive_write_new.3.pdf archive_write_open.3.pdf archive_write_set_options.3.pdf archive_write_set_passphrase.3.pdf cpio.5.pdf libarchive.3.pdf libarchive_changes.3.pdf libarchive-formats.5.pdf libarchive_internals.3.pdf mtree.5.pdf tar.5.pdf bsdtar.1.pdf bsdcpio.1.pdf

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_entry.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_entry.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_entry_acl.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_entry_acl.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_entry_linkify.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_entry_linkify.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_entry_misc.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_entry_misc.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_entry_paths.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_entry_paths.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_entry_perms.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_entry_perms.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_entry_stat.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_entry_stat.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_entry_time.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_entry_time.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_read.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_read.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_read_add_passphrase.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_read_add_passphrase.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_read_data.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_read_data.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_read_disk.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_read_disk.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_read_extract.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_read_extract.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_read_filter.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_read_filter.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_read_format.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_read_format.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_read_free.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_read_free.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_read_header.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_read_header.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_read_new.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_read_new.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_read_open.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_read_open.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_read_set_options.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_read_set_options.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_util.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_util.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_write.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_write.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_write_blocksize.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_write_blocksize.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_write_data.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_write_data.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_write_disk.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_write_disk.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_write_filter.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_write_filter.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_write_finish_entry.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_write_finish_entry.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_write_format.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_write_format.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_write_free.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_write_free.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_write_header.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_write_header.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_write_new.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_write_new.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_write_open.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_write_open.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_write_set_options.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_write_set_options.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/archive_write_set_passphrase.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/archive_write_set_passphrase.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/bsdcpio.1.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/bsdcpio.1.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/bsdtar.1.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/bsdtar.1.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/cpio.5.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/cpio.5.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/libarchive-formats.5.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/libarchive-formats.5.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/libarchive.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/libarchive.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/libarchive_changes.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/libarchive_changes.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/libarchive_internals.3.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/libarchive_internals.3.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/mtree.5.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/mtree.5.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/pdf/tar.5.pdf -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/pdf/tar.5.pdf Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/text/Makefile -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/text/Makefile Changed

@@ -107,15 +107,15 @@
 cpio.5.txt: ../../libarchive/cpio.5
 	nroff -mdoc ../../libarchive/cpio.5 | col -b > cpio.5.txt
 
-libarchive-formats.5.txt: ../../libarchive/libarchive-formats.5
-	nroff -mdoc ../../libarchive/libarchive-formats.5 | col -b > libarchive-formats.5.txt
-
 libarchive.3.txt: ../../libarchive/libarchive.3
 	nroff -mdoc ../../libarchive/libarchive.3 | col -b > libarchive.3.txt
 
 libarchive_changes.3.txt: ../../libarchive/libarchive_changes.3
 	nroff -mdoc ../../libarchive/libarchive_changes.3 | col -b > libarchive_changes.3.txt
 
+libarchive-formats.5.txt: ../../libarchive/libarchive-formats.5
+	nroff -mdoc ../../libarchive/libarchive-formats.5 | col -b > libarchive-formats.5.txt
+
 libarchive_internals.3.txt: ../../libarchive/libarchive_internals.3
 	nroff -mdoc ../../libarchive/libarchive_internals.3 | col -b > libarchive_internals.3.txt
 
@@ -130,4 +130,4 @@
 
 bsdcpio.1.txt: ../../cpio/bsdcpio.1
 	nroff -mdoc ../../cpio/bsdcpio.1 | col -b > bsdcpio.1.txt
-all: archive_entry.3.txt archive_entry_acl.3.txt archive_entry_linkify.3.txt archive_entry_misc.3.txt archive_entry_paths.3.txt archive_entry_perms.3.txt archive_entry_stat.3.txt archive_entry_time.3.txt archive_read.3.txt archive_read_add_passphrase.3.txt archive_read_data.3.txt archive_read_disk.3.txt archive_read_extract.3.txt archive_read_filter.3.txt archive_read_format.3.txt archive_read_free.3.txt archive_read_header.3.txt archive_read_new.3.txt archive_read_open.3.txt archive_read_set_options.3.txt archive_util.3.txt archive_write.3.txt archive_write_blocksize.3.txt archive_write_data.3.txt archive_write_disk.3.txt archive_write_filter.3.txt archive_write_finish_entry.3.txt archive_write_format.3.txt archive_write_free.3.txt archive_write_header.3.txt archive_write_new.3.txt archive_write_open.3.txt archive_write_set_options.3.txt archive_write_set_passphrase.3.txt cpio.5.txt libarchive-formats.5.txt libarchive.3.txt libarchive_changes.3.txt libarchive_internals.3.txt mtree.5.txt tar.5.txt bsdtar.1.txt bsdcpio.1.txt
+all: archive_entry.3.txt archive_entry_acl.3.txt archive_entry_linkify.3.txt archive_entry_misc.3.txt archive_entry_paths.3.txt archive_entry_perms.3.txt archive_entry_stat.3.txt archive_entry_time.3.txt archive_read.3.txt archive_read_add_passphrase.3.txt archive_read_data.3.txt archive_read_disk.3.txt archive_read_extract.3.txt archive_read_filter.3.txt archive_read_format.3.txt archive_read_free.3.txt archive_read_header.3.txt archive_read_new.3.txt archive_read_open.3.txt archive_read_set_options.3.txt archive_util.3.txt archive_write.3.txt archive_write_blocksize.3.txt archive_write_data.3.txt archive_write_disk.3.txt archive_write_filter.3.txt archive_write_finish_entry.3.txt archive_write_format.3.txt archive_write_free.3.txt archive_write_header.3.txt archive_write_new.3.txt archive_write_open.3.txt archive_write_set_options.3.txt archive_write_set_passphrase.3.txt cpio.5.txt libarchive.3.txt libarchive_changes.3.txt libarchive-formats.5.txt libarchive_internals.3.txt mtree.5.txt tar.5.txt bsdtar.1.txt bsdcpio.1.txt

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/text/archive_read_set_options.3.txt -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/text/archive_read_set_options.3.txt Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/text/bsdtar.1.txt -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/text/bsdtar.1.txt Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/wiki/Makefile -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/wiki/Makefile Changed

@@ -107,15 +107,15 @@
 ManPageCpio5.wiki: ../mdoc2wiki.awk ../../libarchive/cpio.5
 	awk -f ../mdoc2wiki.awk < ../../libarchive/cpio.5 > ManPageCpio5.wiki
 
-ManPageLibarchiveFormats5.wiki: ../mdoc2wiki.awk ../../libarchive/libarchive-formats.5
-	awk -f ../mdoc2wiki.awk < ../../libarchive/libarchive-formats.5 > ManPageLibarchiveFormats5.wiki
-
 ManPageLibarchive3.wiki: ../mdoc2wiki.awk ../../libarchive/libarchive.3
 	awk -f ../mdoc2wiki.awk < ../../libarchive/libarchive.3 > ManPageLibarchive3.wiki
 
 ManPageLibarchiveChanges3.wiki: ../mdoc2wiki.awk ../../libarchive/libarchive_changes.3
 	awk -f ../mdoc2wiki.awk < ../../libarchive/libarchive_changes.3 > ManPageLibarchiveChanges3.wiki
 
+ManPageLibarchiveFormats5.wiki: ../mdoc2wiki.awk ../../libarchive/libarchive-formats.5
+	awk -f ../mdoc2wiki.awk < ../../libarchive/libarchive-formats.5 > ManPageLibarchiveFormats5.wiki
+
 ManPageLibarchiveInternals3.wiki: ../mdoc2wiki.awk ../../libarchive/libarchive_internals.3
 	awk -f ../mdoc2wiki.awk < ../../libarchive/libarchive_internals.3 > ManPageLibarchiveInternals3.wiki
 
@@ -130,4 +130,4 @@
 
 ManPageBsdcpio1.wiki: ../mdoc2wiki.awk ../../cpio/bsdcpio.1
 	awk -f ../mdoc2wiki.awk < ../../cpio/bsdcpio.1 > ManPageBsdcpio1.wiki
-all: ManPageArchiveEntry3.wiki ManPageArchiveEntryAcl3.wiki ManPageArchiveEntryLinkify3.wiki ManPageArchiveEntryMisc3.wiki ManPageArchiveEntryPaths3.wiki ManPageArchiveEntryPerms3.wiki ManPageArchiveEntryStat3.wiki ManPageArchiveEntryTime3.wiki ManPageArchiveRead3.wiki ManPageArchiveReadAddPassphrase3.wiki ManPageArchiveReadData3.wiki ManPageArchiveReadDisk3.wiki ManPageArchiveReadExtract3.wiki ManPageArchiveReadFilter3.wiki ManPageArchiveReadFormat3.wiki ManPageArchiveReadFree3.wiki ManPageArchiveReadHeader3.wiki ManPageArchiveReadNew3.wiki ManPageArchiveReadOpen3.wiki ManPageArchiveReadSetOptions3.wiki ManPageArchiveUtil3.wiki ManPageArchiveWrite3.wiki ManPageArchiveWriteBlocksize3.wiki ManPageArchiveWriteData3.wiki ManPageArchiveWriteDisk3.wiki ManPageArchiveWriteFilter3.wiki ManPageArchiveWriteFinishEntry3.wiki ManPageArchiveWriteFormat3.wiki ManPageArchiveWriteFree3.wiki ManPageArchiveWriteHeader3.wiki ManPageArchiveWriteNew3.wiki ManPageArchiveWriteOpen3.wiki ManPageArchiveWriteSetOptions3.wiki ManPageArchiveWriteSetPassphrase3.wiki ManPageCpio5.wiki ManPageLibarchiveFormats5.wiki ManPageLibarchive3.wiki ManPageLibarchiveChanges3.wiki ManPageLibarchiveInternals3.wiki ManPageMtree5.wiki ManPageTar5.wiki ManPageBsdtar1.wiki ManPageBsdcpio1.wiki
+all: ManPageArchiveEntry3.wiki ManPageArchiveEntryAcl3.wiki ManPageArchiveEntryLinkify3.wiki ManPageArchiveEntryMisc3.wiki ManPageArchiveEntryPaths3.wiki ManPageArchiveEntryPerms3.wiki ManPageArchiveEntryStat3.wiki ManPageArchiveEntryTime3.wiki ManPageArchiveRead3.wiki ManPageArchiveReadAddPassphrase3.wiki ManPageArchiveReadData3.wiki ManPageArchiveReadDisk3.wiki ManPageArchiveReadExtract3.wiki ManPageArchiveReadFilter3.wiki ManPageArchiveReadFormat3.wiki ManPageArchiveReadFree3.wiki ManPageArchiveReadHeader3.wiki ManPageArchiveReadNew3.wiki ManPageArchiveReadOpen3.wiki ManPageArchiveReadSetOptions3.wiki ManPageArchiveUtil3.wiki ManPageArchiveWrite3.wiki ManPageArchiveWriteBlocksize3.wiki ManPageArchiveWriteData3.wiki ManPageArchiveWriteDisk3.wiki ManPageArchiveWriteFilter3.wiki ManPageArchiveWriteFinishEntry3.wiki ManPageArchiveWriteFormat3.wiki ManPageArchiveWriteFree3.wiki ManPageArchiveWriteHeader3.wiki ManPageArchiveWriteNew3.wiki ManPageArchiveWriteOpen3.wiki ManPageArchiveWriteSetOptions3.wiki ManPageArchiveWriteSetPassphrase3.wiki ManPageCpio5.wiki ManPageLibarchive3.wiki ManPageLibarchiveChanges3.wiki ManPageLibarchiveFormats5.wiki ManPageLibarchiveInternals3.wiki ManPageMtree5.wiki ManPageTar5.wiki ManPageBsdtar1.wiki ManPageBsdcpio1.wiki

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/wiki/ManPageArchiveReadSetOptions3.wiki -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/wiki/ManPageArchiveReadSetOptions3.wiki Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/doc/wiki/ManPageBsdtar1.wiki -> _service:tar_scm:libarchive-3.7.1.tar.gz/doc/wiki/ManPageBsdtar1.wiki Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/CMakeLists.txt -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/CMakeLists.txt Changed

@@ -243,10 +243,12 @@
 ENDIF()
 
 # Libarchive is a shared library
-ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
-TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
-TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
-SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
+IF(BUILD_SHARED_LIBS)
+  ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
+  TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
+  TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
+  SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
+ENDIF(BUILD_SHARED_LIBS)
 
 # archive_static is a static library
 ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
@@ -254,13 +256,19 @@
 SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
   LIBARCHIVE_STATIC)
 # On Posix systems, libarchive.so and libarchive.a can co-exist.
-IF(NOT WIN32 OR CYGWIN)
+IF(NOT WIN32 OR CYGWIN OR NOT BUILD_SHARED_LIBS)
   SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
-ENDIF(NOT WIN32 OR CYGWIN)
+ENDIF(NOT WIN32 OR CYGWIN OR NOT BUILD_SHARED_LIBS)
 
 IF(ENABLE_INSTALL)
   # How to install the libraries
-  INSTALL(TARGETS archive archive_static
+  IF(BUILD_SHARED_LIBS)
+    INSTALL(TARGETS archive
+            RUNTIME DESTINATION bin
+            LIBRARY DESTINATION lib
+            ARCHIVE DESTINATION lib)
+  ENDIF(BUILD_SHARED_LIBS)
+  INSTALL(TARGETS archive_static
           RUNTIME DESTINATION bin
           LIBRARY DESTINATION lib
           ARCHIVE DESTINATION lib)

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive.h Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_digest.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_digest.c Changed

@@ -36,6 +36,11 @@
 #error Cannot use both OpenSSL and libmd.
 #endif
 
+/* Common in other bcrypt implementations, but missing from VS2008. */
+#ifndef BCRYPT_SUCCESS
+#define BCRYPT_SUCCESS(r) ((NTSTATUS)(r) == STATUS_SUCCESS)
+#endif
+
 /*
  * Message digest functions for Windows platform.
  */
@@ -48,6 +53,26 @@
 /*
  * Initialize a Message digest.
  */
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+static int
+win_crypto_init(Digest_CTX *ctx, const WCHAR *algo)
+{
+	NTSTATUS status;
+	ctx->valid = 0;
+
+	status = BCryptOpenAlgorithmProvider(&ctx->hAlg, algo, NULL, 0);
+	if (!BCRYPT_SUCCESS(status))
+		return (ARCHIVE_FAILED);
+	status = BCryptCreateHash(ctx->hAlg, &ctx->hHash, NULL, 0, NULL, 0, 0);
+	if (!BCRYPT_SUCCESS(status)) {
+		BCryptCloseAlgorithmProvider(ctx->hAlg, 0);
+		return (ARCHIVE_FAILED);
+	}
+
+	ctx->valid = 1;
+	return (ARCHIVE_OK);
+}
+#else
 static int
 win_crypto_init(Digest_CTX *ctx, DWORD prov, ALG_ID algId)
 {
@@ -70,6 +95,7 @@
 	ctx->valid = 1;
 	return (ARCHIVE_OK);
 }
+#endif
 
 /*
  * Update a Message digest.
@@ -81,23 +107,37 @@
 	if (!ctx->valid)
 		return (ARCHIVE_FAILED);
 
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+	BCryptHashData(ctx->hHash,
+		      (PUCHAR)(uintptr_t)buf,
+		      len, 0);
+#else
 	CryptHashData(ctx->hash,
 		      (unsigned char *)(uintptr_t)buf,
 		      (DWORD)len, 0);
+#endif
 	return (ARCHIVE_OK);
 }
 
 static int
 win_crypto_Final(unsigned char *buf, size_t bufsize, Digest_CTX *ctx)
 {
+#if !(defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA)
 	DWORD siglen = (DWORD)bufsize;
+#endif
 
 	if (!ctx->valid)
 		return (ARCHIVE_FAILED);
 
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+	BCryptFinishHash(ctx->hHash, buf, (ULONG)bufsize, 0);
+	BCryptDestroyHash(ctx->hHash);
+	BCryptCloseAlgorithmProvider(ctx->hAlg, 0);
+#else
 	CryptGetHashParam(ctx->hash, HP_HASHVAL, buf, &siglen, 0);
 	CryptDestroyHash(ctx->hash);
 	CryptReleaseContext(ctx->cryptProv, 0);
+#endif
 	ctx->valid = 0;
 	return (ARCHIVE_OK);
 }
@@ -276,7 +316,11 @@
 static int
 __archive_md5init(archive_md5_ctx *ctx)
 {
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+  return (win_crypto_init(ctx, BCRYPT_MD5_ALGORITHM));
+#else
   return (win_crypto_init(ctx, PROV_RSA_FULL, CALG_MD5));
+#endif
 }
 
 static int
@@ -659,7 +703,11 @@
 static int
 __archive_sha1init(archive_sha1_ctx *ctx)
 {
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+  return (win_crypto_init(ctx, BCRYPT_SHA1_ALGORITHM));
+#else
   return (win_crypto_init(ctx, PROV_RSA_FULL, CALG_SHA1));
+#endif
 }
 
 static int
@@ -919,7 +967,11 @@
 static int
 __archive_sha256init(archive_sha256_ctx *ctx)
 {
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+  return (win_crypto_init(ctx, BCRYPT_SHA256_ALGORITHM));
+#else
   return (win_crypto_init(ctx, PROV_RSA_AES, CALG_SHA_256));
+#endif
 }
 
 static int
@@ -1155,7 +1207,11 @@
 static int
 __archive_sha384init(archive_sha384_ctx *ctx)
 {
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+  return (win_crypto_init(ctx, BCRYPT_SHA384_ALGORITHM));
+#else
   return (win_crypto_init(ctx, PROV_RSA_AES, CALG_SHA_384));
+#endif
 }
 
 static int
@@ -1415,7 +1471,11 @@
 static int
 __archive_sha512init(archive_sha512_ctx *ctx)
 {
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+  return (win_crypto_init(ctx, BCRYPT_SHA512_ALGORITHM));
+#else
   return (win_crypto_init(ctx, PROV_RSA_AES, CALG_SHA_512));
+#endif
 }
 
 static int

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_digest_private.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_digest_private.h Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_entry.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_entry.h Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_getdate.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_getdate.c Changed

@@ -698,13 +698,9 @@
 	time_t		Julian;
 	int		i;
 	struct tm	*ltime;
-#if defined(HAVE_LOCALTIME_R) || defined(HAVE__LOCALTIME64_S)
+#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
 	struct tm	tmbuf;
 #endif
-#if defined(HAVE__LOCALTIME64_S)
-	errno_t		terr;
-	__time64_t	tmptime;
-#endif
 
 	if (Year < 69)
 		Year += 2000;
@@ -731,15 +727,10 @@
 	Julian *= DAY;
 	Julian += Timezone;
 	Julian += Hours * HOUR + Minutes * MINUTE + Seconds;
-#if defined(HAVE_LOCALTIME_R)
+#if defined(HAVE_LOCALTIME_S)
+	ltime = localtime_s(&tmbuf, &Julian) ? NULL : &tmbuf;
+#elif defined(HAVE_LOCALTIME_R)
 	ltime = localtime_r(&Julian, &tmbuf);
-#elif defined(HAVE__LOCALTIME64_S)
-	tmptime = Julian;
-	terr = _localtime64_s(&tmbuf, &tmptime);
-	if (terr)
-		ltime = NULL;
-	else
-		ltime = &tmbuf;
 #else
 	ltime = localtime(&Julian);
 #endif
@@ -755,36 +746,21 @@
 	time_t		StartDay;
 	time_t		FutureDay;
 	struct tm	*ltime;
-#if defined(HAVE_LOCALTIME_R) || defined(HAVE__LOCALTIME64_S)
+#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
 	struct tm	tmbuf;
 #endif
-#if defined(HAVE__LOCALTIME64_S)
-	errno_t		terr;
-	__time64_t	tmptime;
-#endif
-
-#if defined(HAVE_LOCALTIME_R)
+#if defined(HAVE_LOCALTIME_S)
+	ltime = localtime_s(&tmbuf, &Start) ? NULL : &tmbuf;
+#elif defined(HAVE_LOCALTIME_R)
 	ltime = localtime_r(&Start, &tmbuf);
-#elif defined(HAVE__LOCALTIME64_S)
-	tmptime = Start;
-	terr = _localtime64_s(&tmbuf, &tmptime);
-	if (terr)
-		ltime = NULL;
-	else
-		ltime = &tmbuf;
 #else
 	ltime = localtime(&Start);
 #endif
 	StartDay = (ltime->tm_hour + 1) % 24;
-#if defined(HAVE_LOCALTIME_R)
+#if defined(HAVE_LOCALTIME_S)
+	ltime = localtime_s(&tmbuf, &Future) ? NULL : &tmbuf;
+#elif defined(HAVE_LOCALTIME_R)
 	ltime = localtime_r(&Future, &tmbuf);
-#elif defined(HAVE__LOCALTIME64_S)
-	tmptime = Future;
-	terr = _localtime64_s(&tmbuf, &tmptime);
-	if (terr)
-		ltime = NULL;
-	else
-		ltime = &tmbuf;
 #else
 	ltime = localtime(&Future);
 #endif
@@ -799,24 +775,15 @@
 {
 	struct tm	*tm;
 	time_t	t, now;
-#if defined(HAVE_GMTIME_R) || defined(HAVE__GMTIME64_S)
+#if defined(HAVE_GMTIME_R) || defined(HAVE_GMTIME_S)
 	struct tm	tmbuf;
 #endif
-#if defined(HAVE__GMTIME64_S)
-	errno_t		terr;
-	__time64_t	tmptime;
-#endif
 
 	t = Start - zone;
-#if defined(HAVE_GMTIME_R)
+#if defined(HAVE_GMTIME_S)
+	tm = gmtime_s(&tmbuf, &t) ? NULL : &tmbuf;
+#elif defined(HAVE_GMTIME_R)
 	tm = gmtime_r(&t, &tmbuf);
-#elif defined(HAVE__GMTIME64_S)
-	tmptime = t;
-	terr = _gmtime64_s(&tmbuf, &tmptime);
-	if (terr)
-		tm = NULL;
-	else
-		tm = &tmbuf;
 #else
 	tm = gmtime(&t);
 #endif
@@ -835,25 +802,16 @@
 	struct tm	*tm;
 	time_t	Month;
 	time_t	Year;
-#if defined(HAVE_LOCALTIME_R) || defined(HAVE__LOCALTIME64_S)
+#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
 	struct tm	tmbuf;
 #endif
-#if defined(HAVE__LOCALTIME64_S)
-	errno_t		terr;
-	__time64_t	tmptime;
-#endif
 
 	if (RelMonth == 0)
 		return 0;
-#if defined(HAVE_LOCALTIME_R)
+#if defined(HAVE_LOCALTIME_S)
+	tm = localtime_s(&tmbuf, &Start) ? NULL : &tmbuf;
+#elif defined(HAVE_LOCALTIME_R)
 	tm = localtime_r(&Start, &tmbuf);
-#elif defined(HAVE__LOCALTIME64_S)
-	tmptime = Start;
-	terr = _localtime64_s(&tmbuf, &tmptime);
-	if (terr)
-		tm = NULL;
-	else
-		tm = &tmbuf;
 #else
 	tm = localtime(&Start);
 #endif
@@ -993,10 +951,6 @@
 	time_t		Start;
 	time_t		tod;
 	long		tzone;
-#if defined(HAVE__LOCALTIME64_S) || defined(HAVE__GMTIME64_S)
-	errno_t		terr;
-	__time64_t	tmptime;
-#endif
 
 	/* Clear out the parsed token array. */
 	memset(tokens, 0, sizeof(tokens));
@@ -1005,36 +959,26 @@
 	gds = &_gds;
 
 	/* Look up the current time. */
-#if defined(HAVE_LOCALTIME_R)
+#if defined(HAVE_LOCALTIME_S)
+	tm = localtime_s(&local, &now) ? NULL : &local;
+#elif defined(HAVE_LOCALTIME_R)
 	tm = localtime_r(&now, &local);
-#elif defined(HAVE__LOCALTIME64_S)
-	tmptime = now;
-	terr = _localtime64_s(&local, &tmptime);
-	if (terr)
-		tm = NULL;
-	else
-		tm = &local;
 #else
 	memset(&local, 0, sizeof(local));
 	tm = localtime(&now);
 #endif
 	if (tm == NULL)
 		return -1;
-#if !defined(HAVE_LOCALTIME_R) && !defined(HAVE__LOCALTIME64_S)
+#if !defined(HAVE_LOCALTIME_R) && !defined(HAVE_LOCALTIME_S)
 	local = *tm;
 #endif
 
 	/* Look up UTC if we can and use that to determine the current
 	 * timezone offset. */
-#if defined(HAVE_GMTIME_R)
+#if defined(HAVE_GMTIME_S)
+	gmt_ptr = gmtime_s(&gmt, &now) ? NULL : &gmt;
+#elif defined(HAVE_GMTIME_R)
 	gmt_ptr = gmtime_r(&now, &gmt);
-#elif defined(HAVE__GMTIME64_S)
-	tmptime = now;
-	terr = _gmtime64_s(&gmt, &tmptime);
-	if (terr)
-		gmt_ptr = NULL;
-	else
-		gmt_ptr = &gmt;
 #else
 	memset(&gmt, 0, sizeof(gmt));
 	gmt_ptr = gmtime(&now);
@@ -1076,15 +1020,10 @@
 	 * time components instead of the local timezone. */
 	if (gds->HaveZone && gmt_ptr != NULL) {
 		now -= gds->Timezone;
-#if defined(HAVE_GMTIME_R)
+#if defined(HAVE_GMTIME_S)
+		gmt_ptr = gmtime_s(&gmt, &now) ? NULL : &gmt;
+#elif defined(HAVE_GMTIME_R)

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_hmac.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_hmac.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_hmac_private.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_hmac_private.h Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_openssl_evp_private.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_openssl_evp_private.h Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_random.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_random.c Changed

@@ -51,16 +51,27 @@
 #include <pthread.h>
 #endif
 
-static void arc4random_buf(void *, size_t);
+static void la_arc4random_buf(void *, size_t);
 
 #endif /* HAVE_ARC4RANDOM_BUF */
 
 #include "archive.h"
 #include "archive_random_private.h"
 
-#if defined(HAVE_WINCRYPT_H) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+/* don't use bcrypt when XP needs to be supported */
+#include <bcrypt.h>
+
+/* Common in other bcrypt implementations, but missing from VS2008. */
+#ifndef BCRYPT_SUCCESS
+#define BCRYPT_SUCCESS(r) ((NTSTATUS)(r) == STATUS_SUCCESS)
+#endif
+
+#elif defined(HAVE_WINCRYPT_H)
 #include <wincrypt.h>
 #endif
+#endif
 
 #ifndef O_CLOEXEC
 #define O_CLOEXEC	0
@@ -75,6 +86,20 @@
 archive_random(void *buf, size_t nbytes)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
+# if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+	NTSTATUS status;
+	BCRYPT_ALG_HANDLE hAlg;
+
+	status = BCryptOpenAlgorithmProvider(&hAlg, BCRYPT_RNG_ALGORITHM, NULL, 0);
+	if (!BCRYPT_SUCCESS(status))
+		return ARCHIVE_FAILED;
+	status = BCryptGenRandom(hAlg, buf, nbytes, 0);
+	BCryptCloseAlgorithmProvider(hAlg, 0);
+	if (!BCRYPT_SUCCESS(status))
+		return ARCHIVE_FAILED;
+
+	return ARCHIVE_OK;
+# else
 	HCRYPTPROV hProv;
 	BOOL success;
 
@@ -92,6 +117,10 @@
 	}
 	/* TODO: Does this case really happen? */
 	return ARCHIVE_FAILED;
+# endif
+#elif !defined(HAVE_ARC4RANDOM_BUF) && (!defined(_WIN32) || defined(__CYGWIN__))
+	la_arc4random_buf(buf, nbytes);
+	return ARCHIVE_OK;
 #else
 	arc4random_buf(buf, nbytes);
 	return ARCHIVE_OK;
@@ -256,7 +285,7 @@
 }
 
 static void
-arc4random_buf(void *_buf, size_t n)
+la_arc4random_buf(void *_buf, size_t n)
 {
 	uint8_t *buf = (uint8_t *)_buf;
 	_ARC4_LOCK();

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_data_into_fd.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_data_into_fd.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_disk_posix.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_disk_posix.c Changed

@@ -1670,6 +1670,11 @@
 	else
 		t->current_filesystem->name_max = nm;
 #endif
+	if (t->current_filesystem->name_max == 0) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Cannot determine name_max");
+		return (ARCHIVE_FAILED);
+	}
 #endif /* USE_READDIR_R */
 	return (ARCHIVE_OK);
 }
@@ -1860,8 +1865,17 @@
 
 #if defined(USE_READDIR_R)
 	/* Set maximum filename length. */
+#if defined(HAVE_STATVFS)
+	t->current_filesystem->name_max = svfs.f_namemax;
+#else
 	t->current_filesystem->name_max = sfs.f_namelen;
 #endif
+	if (t->current_filesystem->name_max == 0) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Cannot determine name_max");
+		return (ARCHIVE_FAILED);
+	}
+#endif
 	return (ARCHIVE_OK);
 }
 
@@ -1942,6 +1956,11 @@
 #if defined(USE_READDIR_R)
 	/* Set maximum filename length. */
 	t->current_filesystem->name_max = svfs.f_namemax;
+	if (t->current_filesystem->name_max == 0) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Cannot determine name_max");
+		return (ARCHIVE_FAILED);
+	}
 #endif
 	return (ARCHIVE_OK);
 }
@@ -1996,6 +2015,11 @@
 	else
 		t->current_filesystem->name_max = nm;
 #  endif /* _PC_NAME_MAX */
+	if (t->current_filesystem->name_max == 0) {
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+		    "Cannot determine name_max");
+		return (ARCHIVE_FAILED);
+	}
 #endif /* USE_READDIR_R */
 	return (ARCHIVE_OK);
 }
@@ -2543,7 +2567,11 @@
 #else
 		if (tree_enter_working_dir(t) != 0)
 			return NULL;
+#ifdef HAVE_LSTAT
 		if (lstat(tree_current_access_path(t), &t->lst) != 0)
+#else
+		if (la_stat(tree_current_access_path(t), &t->lst) != 0)
+#endif
 #endif
 			return NULL;
 		t->flags |= hasLstat;

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_disk_windows.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_disk_windows.c Changed

@@ -418,9 +418,19 @@
 	    FILE_FLAG_OPEN_REPARSE_POINT;
 	int ret;
 
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+	CREATEFILE2_EXTENDED_PARAMETERS createExParams;
+	ZeroMemory(&createExParams, sizeof(createExParams));
+	createExParams.dwSize = sizeof(createExParams);
+	createExParams.dwFileFlags = flag;
+	h = CreateFile2(path, 0,
+	    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+	    OPEN_EXISTING, &createExParams);
+#else
 	h = CreateFileW(path, 0,
 	    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
 	    OPEN_EXISTING, flag, NULL);
+#endif
 	if (h == INVALID_HANDLE_VALUE) {
 		la_dosmaperr(GetLastError());
 		return (-1);
@@ -1067,16 +1077,29 @@
 	if (archive_entry_filetype(entry) == AE_IFREG &&
 	    archive_entry_size(entry) > 0) {
 		DWORD flags = FILE_FLAG_BACKUP_SEMANTICS;
+#if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+		CREATEFILE2_EXTENDED_PARAMETERS createExParams;
+#endif
 		if (t->async_io)
 			flags |= FILE_FLAG_OVERLAPPED;
 		if (t->direct_io)
 			flags |= FILE_FLAG_NO_BUFFERING;
 		else
 			flags |= FILE_FLAG_SEQUENTIAL_SCAN;
+#if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+		ZeroMemory(&createExParams, sizeof(createExParams));
+		createExParams.dwSize = sizeof(createExParams);
+		createExParams.dwFileFlags = flags;
+		t->entry_fh = CreateFile2(tree_current_access_path(t),
+		    GENERIC_READ,
+		    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+		    OPEN_EXISTING, &createExParams);
+#else
 		t->entry_fh = CreateFileW(tree_current_access_path(t),
 		    GENERIC_READ,
 		    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
 		    NULL, OPEN_EXISTING, flags, NULL);
+#endif
 		if (t->entry_fh == INVALID_HANDLE_VALUE) {
 			la_dosmaperr(GetLastError());
 			archive_set_error(&a->archive, errno,
@@ -1547,6 +1570,9 @@
 {
 	HANDLE handle;
 	int r = 0;
+#if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+	CREATEFILE2_EXTENDED_PARAMETERS createExParams;
+#endif
 
 	if (h == INVALID_HANDLE_VALUE && AE_IFLNK == rt->filetype)
 		return (0);
@@ -1560,8 +1586,16 @@
 	if ((t->flags & needsRestoreTimes) == 0)
 		return (r);
 
+#if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+	ZeroMemory(&createExParams, sizeof(createExParams));
+	createExParams.dwSize = sizeof(createExParams);
+	createExParams.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS;
+	handle = CreateFile2(rt->full_path, FILE_WRITE_ATTRIBUTES,
+		    0, OPEN_EXISTING, &createExParams);
+#else
 	handle = CreateFileW(rt->full_path, FILE_WRITE_ATTRIBUTES,
 		    0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+#endif
 	if (handle == INVALID_HANDLE_VALUE) {
 		errno = EINVAL;
 		return (-1);
@@ -2046,12 +2080,24 @@
 	HANDLE h;
 	int r;
 	DWORD flag = FILE_FLAG_BACKUP_SEMANTICS;
-	
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+	CREATEFILE2_EXTENDED_PARAMETERS createExParams;
+#endif
+
 	if (sim_lstat && tree_current_is_physical_link(t))
 		flag |= FILE_FLAG_OPEN_REPARSE_POINT;
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+	ZeroMemory(&createExParams, sizeof(createExParams));
+	createExParams.dwSize = sizeof(createExParams);
+	createExParams.dwFileFlags = flag;
+	h = CreateFile2(tree_current_access_path(t), 0,
+	    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+	    OPEN_EXISTING, &createExParams);
+#else
 	h = CreateFileW(tree_current_access_path(t), 0,
 	    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
 	    OPEN_EXISTING, flag, NULL);
+#endif
 	if (h == INVALID_HANDLE_VALUE) {
 		la_dosmaperr(GetLastError());
 		t->tree_errno = errno;
@@ -2257,7 +2303,10 @@
 		} else {
 			WIN32_FIND_DATAW findData;
 			DWORD flag, desiredAccess;
-	
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+			CREATEFILE2_EXTENDED_PARAMETERS createExParams;
+#endif
+
 			h = FindFirstFileW(path, &findData);
 			if (h == INVALID_HANDLE_VALUE) {
 				la_dosmaperr(GetLastError());
@@ -2279,9 +2328,18 @@
 			} else
 				desiredAccess = GENERIC_READ;
 
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+			ZeroMemory(&createExParams, sizeof(createExParams));
+			createExParams.dwSize = sizeof(createExParams);
+			createExParams.dwFileFlags = flag;
+			h = CreateFile2(path, desiredAccess,
+			    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+			    OPEN_EXISTING, &createExParams);
+#else
 			h = CreateFileW(path, desiredAccess,
 			    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
 			    OPEN_EXISTING, flag, NULL);
+#endif
 			if (h == INVALID_HANDLE_VALUE) {
 				la_dosmaperr(GetLastError());
 				archive_set_error(&a->archive, errno,
@@ -2342,9 +2400,19 @@
 		if (fd >= 0) {
 			h = (HANDLE)_get_osfhandle(fd);
 		} else {
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+			CREATEFILE2_EXTENDED_PARAMETERS createExParams;
+			ZeroMemory(&createExParams, sizeof(createExParams));
+			createExParams.dwSize = sizeof(createExParams);
+			createExParams.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS;
+			h = CreateFile2(path, GENERIC_READ,
+			    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+			    OPEN_EXISTING, &createExParams);
+#else
 			h = CreateFileW(path, GENERIC_READ,
 			    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
 			    OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+#endif
 			if (h == INVALID_HANDLE_VALUE) {
 				la_dosmaperr(GetLastError());
 				archive_set_error(&a->archive, errno,

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_open_file.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_open_file.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_set_options.3 -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_set_options.3 Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_filter_bzip2.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_filter_bzip2.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_filter_lz4.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_filter_lz4.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_filter_zstd.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_filter_zstd.c Changed

@@ -115,9 +115,9 @@
 	unsigned prefix;
 
 	/* Zstd frame magic values */
-	const unsigned zstd_magic = 0xFD2FB528U;
-	const unsigned zstd_magic_skippable_start = 0x184D2A50U;
-	const unsigned zstd_magic_skippable_mask = 0xFFFFFFF0;
+	unsigned zstd_magic = 0xFD2FB528U;
+	unsigned zstd_magic_skippable_start = 0x184D2A50U;
+	unsigned zstd_magic_skippable_mask = 0xFFFFFFF0;
 
 	(void) self; /* UNUSED */
 
@@ -170,7 +170,7 @@
 zstd_bidder_init(struct archive_read_filter *self)
 {
 	struct private_data *state;
-	const size_t out_block_size = ZSTD_DStreamOutSize();
+	size_t out_block_size = ZSTD_DStreamOutSize();
 	void *out_block;
 	ZSTD_DStream *dstream;
 
@@ -211,6 +211,7 @@
 	ssize_t avail_in;
 	ZSTD_outBuffer out;
 	ZSTD_inBuffer in;
+	size_t ret;
 
 	state = (struct private_data *)self->data;
 
@@ -219,7 +220,7 @@
 	/* Try to fill the output buffer. */
 	while (out.pos < out.size && !state->eof) {
 		if (!state->in_frame) {
-			const size_t ret = ZSTD_initDStream(state->dstream);
+			ret = ZSTD_initDStream(state->dstream);
 			if (ZSTD_isError(ret)) {
 				archive_set_error(&self->archive->archive,
 				 ARCHIVE_ERRNO_MISC,
@@ -249,8 +250,7 @@
 		in.pos = 0;
 
 		{
-			const size_t ret =
-			 ZSTD_decompressStream(state->dstream, &out, &in);
+			ret = ZSTD_decompressStream(state->dstream, &out, &in);
 
 			if (ZSTD_isError(ret)) {
 				archive_set_error(&self->archive->archive,

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_format_7zip.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_format_7zip.c Changed

@@ -41,6 +41,9 @@
 #ifdef HAVE_ZLIB_H
 #include <zlib.h>
 #endif
+#ifdef HAVE_ZSTD_H
+#include <zstd.h>
+#endif
 
 #include "archive.h"
 #include "archive_entry.h"
@@ -80,8 +83,11 @@
 #define _7Z_IA64	0x03030401
 #define _7Z_ARM		0x03030501
 #define _7Z_ARMTHUMB	0x03030701
+#define _7Z_ARM64	0xa
 #define _7Z_SPARC	0x03030805
 
+#define _7Z_ZSTD	0x4F71101 /* Copied from https://github.com/mcmilk/7-Zip-zstd.git */
+
 /*
 * 7-Zip header property IDs.
 */
@@ -278,6 +284,11 @@
 	z_stream		 stream;
 	int			 stream_valid;
 #endif
+	/* Decoding Zstandard data. */
+#if HAVE_ZSTD_H
+	ZSTD_DStream		 *zstd_dstream;
+	int		 zstdstream_valid;
+#endif
 	/* Decoding PPMd data. */
 	int			 ppmd7_stat;
 	CPpmd7			 ppmd7_context;
@@ -397,6 +408,9 @@
 		 int);
 static void	x86_Init(struct _7zip *);
 static size_t	x86_Convert(struct _7zip *, uint8_t *, size_t);
+static void	arm_Init(struct _7zip *);
+static size_t	arm_Convert(struct _7zip *, uint8_t *, size_t);
+static size_t	arm64_Convert(struct _7zip *, uint8_t *, size_t);
 static ssize_t		Bcj2_Decode(struct _7zip *, uint8_t *, size_t);
 
 
@@ -1027,10 +1041,13 @@
 	case _7Z_COPY:
 	case _7Z_BZ2:
 	case _7Z_DEFLATE:
+	case _7Z_ZSTD:
 	case _7Z_PPMD:
 		if (coder2 != NULL) {
 			if (coder2->codec != _7Z_X86 &&
-			 coder2->codec != _7Z_X86_BCJ2) {
+			 coder2->codec != _7Z_X86_BCJ2 &&
+			 coder2->codec != _7Z_ARM &&
+			 coder2->codec != _7Z_ARM64) {
 				archive_set_error(&a->archive,
 				 ARCHIVE_ERRNO_MISC,
 				 "Unsupported filter %lx for %lx",
@@ -1041,6 +1058,8 @@
 			zip->bcj_state = 0;
 			if (coder2->codec == _7Z_X86)
 				x86_Init(zip);
+			else if (coder2->codec == _7Z_ARM)
+				arm_Init(zip);
 		}
 		break;
 	default:
@@ -1137,6 +1156,12 @@
 				filtersfi.id = LZMA_FILTER_ARMTHUMB;
 				fi++;
 				break;
+#ifdef LZMA_FILTER_ARM64
+			case _7Z_ARM64:
+				filtersfi.id = LZMA_FILTER_ARM64;
+				fi++;
+				break;
+#endif
 			case _7Z_SPARC:
 				filtersfi.id = LZMA_FILTER_SPARC;
 				fi++;
@@ -1222,6 +1247,22 @@
 		 "BZ2 codec is unsupported");
 		return (ARCHIVE_FAILED);
 #endif
+	case _7Z_ZSTD:
+	{
+#if defined(HAVE_ZSTD_H)
+		if (zip->zstdstream_valid) {
+			ZSTD_freeDStream(zip->zstd_dstream);
+			zip->zstdstream_valid = 0;
+		}
+		zip->zstd_dstream = ZSTD_createDStream();
+		zip->zstdstream_valid = 1;
+		break;
+#else
+		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+			"ZSTD codec is unsupported");
+		return (ARCHIVE_FAILED);
+#endif
+	}
 	case _7Z_DEFLATE:
 #ifdef HAVE_ZLIB_H
 		if (zip->stream_valid)
@@ -1436,9 +1477,9 @@
 #if defined(HAVE_BZLIB_H) && defined(BZ_CONFIG_ERROR)
 	case _7Z_BZ2:
 		zip->bzstream.next_in = (char *)(uintptr_t)t_next_in;
-		zip->bzstream.avail_in = t_avail_in;
+		zip->bzstream.avail_in = (uint32_t)t_avail_in;
 		zip->bzstream.next_out = (char *)(uintptr_t)t_next_out;
-		zip->bzstream.avail_out = t_avail_out;
+		zip->bzstream.avail_out = (uint32_t)t_avail_out;
 		r = BZ2_bzDecompress(&(zip->bzstream));
 		switch (r) {
 		case BZ_STREAM_END: /* Found end of stream. */
@@ -1488,6 +1529,22 @@
 		t_avail_out = zip->stream.avail_out;
 		break;
 #endif
+#ifdef HAVE_ZSTD_H
+	case _7Z_ZSTD:
+	{
+		ZSTD_inBuffer input = { t_next_in, t_avail_in, 0 }; // src, size, pos
+		ZSTD_outBuffer output = { t_next_out, t_avail_out, 0 }; // dst, size, pos
+
+		size_t const zret = ZSTD_decompressStream(zip->zstd_dstream, &output, &input);
+		if (ZSTD_isError(zret)) {
+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Zstd decompression failed: %s", ZSTD_getErrorName(zret));
+			return ARCHIVE_FAILED;
+		}
+		t_avail_in -= input.pos;
+		t_avail_out -= output.pos;
+		break;
+	}
+#endif
 	case _7Z_PPMD:
 	{
 		uint64_t flush_bytes;
@@ -1572,16 +1629,23 @@
 	/*
 	 * Decord BCJ.
 	 */
-	if (zip->codec != _7Z_LZMA2 && zip->codec2 == _7Z_X86) {
-		size_t l = x86_Convert(zip, buff, *outbytes);
-		zip->odd_bcj_size = *outbytes - l;
-		if (zip->odd_bcj_size > 0 && zip->odd_bcj_size <= 4 &&
-		 o_avail_in && ret != ARCHIVE_EOF) {
-			memcpy(zip->odd_bcj, ((unsigned char *)buff) + l,
-			 zip->odd_bcj_size);
-			*outbytes = l;
-		} else
-			zip->odd_bcj_size = 0;
+	if (zip->codec != _7Z_LZMA2) {
+		if (zip->codec2 == _7Z_X86) {
+			size_t l = x86_Convert(zip, buff, *outbytes);
+
+			zip->odd_bcj_size = *outbytes - l;
+			if (zip->odd_bcj_size > 0 && zip->odd_bcj_size <= 4 &&
+		 	o_avail_in && ret != ARCHIVE_EOF) {
+				memcpy(zip->odd_bcj, ((unsigned char *)buff) + l,
+			 	zip->odd_bcj_size);
+				*outbytes = l;
+			} else
+				zip->odd_bcj_size = 0;
+		} else if (zip->codec2 == _7Z_ARM) {
+			*outbytes = arm_Convert(zip, buff, *outbytes);
+		} else if (zip->codec2 == _7Z_ARM64) {
+			*outbytes = arm64_Convert(zip, buff, *outbytes);
+		}
 	}
 
 	/*
@@ -3727,6 +3791,116 @@
 	return (bufferPos);
 }
 
+static void
+arm_Init(struct _7zip *zip)
+{
+	zip->bcj_ip = 8;
+}
+
+static size_t
+arm_Convert(struct _7zip *zip, uint8_t *buf, size_t size)
+{
+	// This function was adapted from
+	// static size_t bcj_arm(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+	// in https://git.tukaani.org/xz-embedded.git
+
+	/*
+	 * Branch/Call/Jump (BCJ) filter decoders
+	 *
+	 * Authors: Lasse Collin <lasse.collin@tukaani.org>
+	 * Igor Pavlov <https://7-zip.org/>
+	 *
+	 * This file has been put into the public domain.
+	 * You can do whatever you want with this file.
+	 */
+

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_format_cab.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_format_cab.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_format_cpio.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_format_cpio.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_format_iso9660.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_format_iso9660.c Changed

@@ -1901,7 +1901,7 @@
 	 * NUMBER of RRIP "PX" extension.
 	 * Note: Old mkisofs did not record that FILE SERIAL NUMBER
 	 * in ISO images.
-	 * Note2: xorriso set 0 to the location of a symlink file. 
+	 * Note2: xorriso set 0 to the location of a symlink file.
 	 */
 	if (file->size == 0 && location >= 0) {
 		/* If file->size is zero, its location points wrong place,
@@ -1955,7 +1955,7 @@
 			 * made by makefs is not zero and its location is
 			 * the same as those of next regular file. That is
 			 * the same as hard like file and it causes unexpected
-			 * error. 
+			 * error.
 			 */
 			if (file->size > 0 &&
 			    (file->mode & AE_IFMT) == AE_IFLNK) {
@@ -2747,7 +2747,7 @@
 			 * If directory entries all which are descendant of
 			 * rr_moved are still remaining, expose their.
 			 */
-			if (iso9660->re_files.first != NULL && 
+			if (iso9660->re_files.first != NULL &&
 			    iso9660->rr_moved != NULL &&
 			    iso9660->rr_moved->rr_moved_has_re_only)
 				/* Expose "rr_moved" entry. */
@@ -3180,11 +3180,11 @@
 static time_t
 time_from_tm(struct tm *t)
 {
-#if HAVE_TIMEGM
+#if HAVE__MKGMTIME
+        return _mkgmtime(t);
+#elif HAVE_TIMEGM
         /* Use platform timegm() if available. */
         return (timegm(t));
-#elif HAVE__MKGMTIME64
-        return (_mkgmtime64(t));
 #else
         /* Else use direct calculation using POSIX assumptions. */
         /* First, fix up tm_yday based on the year/month/day. */

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_format_lha.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_format_lha.c Changed

@@ -1818,13 +1818,16 @@
 		/* This if statement expects compiler optimization will
 		 * remove the statement which will not be executed. */
 #undef bswap16
+#ifndef __has_builtin
+#define __has_builtin(x) 0
+#endif
 #if defined(_MSC_VER) && _MSC_VER >= 1400 /* Visual Studio */
 # define bswap16(x) _byteswap_ushort(x)
 #elif defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4)
 /* GCC 4.8 and later has __builtin_bswap16() */
 # define bswap16(x) __builtin_bswap16(x)
-#elif defined(__clang__)
-/* All clang versions have __builtin_bswap16() */
+#elif defined(__clang__) && __has_builtin(__builtin_bswap16)
+/* Newer clang versions have __builtin_bswap16() */
 # define bswap16(x) __builtin_bswap16(x)
 #else
 # define bswap16(x) ((((x) >> 8) & 0xff) | ((x) << 8))
@@ -2009,10 +2012,10 @@
 				 ((uint64_t)strm->next_in0) << 48 |
 				 ((uint64_t)strm->next_in1) << 40 |
 				 ((uint64_t)strm->next_in2) << 32 |
-				 ((uint32_t)strm->next_in3) << 24 |
-				 ((uint32_t)strm->next_in4) << 16 |
-				 ((uint32_t)strm->next_in5) << 8 |
-				 (uint32_t)strm->next_in6;
+				 ((uint64_t)strm->next_in3) << 24 |
+				 ((uint64_t)strm->next_in4) << 16 |
+				 ((uint64_t)strm->next_in5) << 8 |
+				 (uint64_t)strm->next_in6;
 				strm->next_in += 7;
 				strm->avail_in -= 7;
 				br->cache_avail += 7 * 8;
@@ -2022,10 +2025,10 @@
 		 		 (br->cache_buffer << 48) |
 				 ((uint64_t)strm->next_in0) << 40 |
 				 ((uint64_t)strm->next_in1) << 32 |
-				 ((uint32_t)strm->next_in2) << 24 |
-				 ((uint32_t)strm->next_in3) << 16 |
-				 ((uint32_t)strm->next_in4) << 8 |
-				 (uint32_t)strm->next_in5;
+				 ((uint64_t)strm->next_in2) << 24 |
+				 ((uint64_t)strm->next_in3) << 16 |
+				 ((uint64_t)strm->next_in4) << 8 |
+				 (uint64_t)strm->next_in5;
 				strm->next_in += 6;
 				strm->avail_in -= 6;
 				br->cache_avail += 6 * 8;

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_format_mtree.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_format_mtree.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_format_rar.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_format_rar.c Changed

@@ -1062,7 +1062,7 @@
 		 return (ARCHIVE_FATAL);
 	 }
 	 p = h;
-	 crc32_val = crc32(crc32_val, (const unsigned char *)p, to_read);
+	 crc32_val = crc32(crc32_val, (const unsigned char *)p, (unsigned int)to_read);
 	 __archive_read_consume(a, to_read);
 	 skip -= to_read;
 }
@@ -1830,13 +1830,9 @@
 struct tm *tm;
 time_t t;
 long nsec;
-#if defined(HAVE_LOCALTIME_R) || defined(HAVE__LOCALTIME64_S)
+#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
 struct tm tmbuf;
 #endif
-#if defined(HAVE__LOCALTIME64_S)
- errno_t terr;
- __time64_t tmptime;
-#endif
 
 if (p + 2 > endp)
 return (-1);
@@ -1868,15 +1864,10 @@
 rem = (((unsigned)(unsigned char)*p) << 16) | (rem >> 8);
 p++;
 }
-#if defined(HAVE_LOCALTIME_R)
+#if defined(HAVE_LOCALTIME_S)
+ tm = localtime_s(&tmbuf, &t) ? NULL : &tmbuf;
+#elif defined(HAVE_LOCALTIME_R)
 tm = localtime_r(&t, &tmbuf);
-#elif defined(HAVE__LOCALTIME64_S)
- tmptime = t;
- terr = _localtime64_s(&tmbuf, &tmptime);
- if (terr)
- tm = NULL;
- else
- tm = &tmbuf;
 #else
 tm = localtime(&t);
 #endif
@@ -3446,7 +3437,7 @@
 prog = calloc(1, sizeof(*prog));
 if (!prog)
 return NULL;
- prog->fingerprint = crc32(0, bytes, length) | ((uint64_t)length << 32);
+ prog->fingerprint = crc32(0, bytes, (unsigned int)length) | ((uint64_t)length << 32);
 
 if (membr_bits(&br, 1))
 {

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_format_rar5.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_format_rar5.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_format_warc.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_format_warc.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_format_xar.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_format_xar.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_read_support_format_zip.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_read_support_format_zip.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_string.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_string.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_util.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_util.c Changed

@@ -42,9 +42,20 @@
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#if defined(HAVE_WINCRYPT_H) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+/* don't use bcrypt when XP needs to be supported */
+#include <bcrypt.h>
+
+/* Common in other bcrypt implementations, but missing from VS2008. */
+#ifndef BCRYPT_SUCCESS
+#define BCRYPT_SUCCESS(r) ((NTSTATUS)(r) == STATUS_SUCCESS)
+#endif
+
+#elif defined(HAVE_WINCRYPT_H)
 #include <wincrypt.h>
 #endif
+#endif
 #ifdef HAVE_ZLIB_H
 #include <zlib.h>
 #endif
@@ -233,14 +244,16 @@
 		L'm', L'n', L'o', L'p', L'q', L'r', L's', L't',
 		L'u', L'v', L'w', L'x', L'y', L'z'
 	};
-	HCRYPTPROV hProv;
 	struct archive_wstring temp_name;
 	wchar_t *ws;
 	DWORD attr;
 	wchar_t *xp, *ep;
 	int fd;
-
-	hProv = (HCRYPTPROV)NULL;
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+	BCRYPT_ALG_HANDLE hAlg = NULL;
+#else
+	HCRYPTPROV hProv = (HCRYPTPROV)NULL;
+#endif
 	fd = -1;
 	ws = NULL;
 
@@ -314,23 +327,42 @@
 			abort();
 	}
 
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+	if (!BCRYPT_SUCCESS(BCryptOpenAlgorithmProvider(&hAlg, BCRYPT_RNG_ALGORITHM,
+		NULL, 0))) {
+		la_dosmaperr(GetLastError());
+		goto exit_tmpfile;
+	}
+#else
 	if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL,
 		CRYPT_VERIFYCONTEXT)) {
 		la_dosmaperr(GetLastError());
 		goto exit_tmpfile;
 	}
+#endif
 
 	for (;;) {
 		wchar_t *p;
 		HANDLE h;
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+		CREATEFILE2_EXTENDED_PARAMETERS createExParams;
+#endif
 
 		/* Generate a random file name through CryptGenRandom(). */
 		p = xp;
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+		if (!BCRYPT_SUCCESS(BCryptGenRandom(hAlg, (PUCHAR)p,
+		 (DWORD)(ep - p)*sizeof(wchar_t), 0))) {
+			la_dosmaperr(GetLastError());
+			goto exit_tmpfile;
+		}
+#else
 		if (!CryptGenRandom(hProv, (DWORD)(ep - p)*sizeof(wchar_t),
 		 (BYTE*)p)) {
 			la_dosmaperr(GetLastError());
 			goto exit_tmpfile;
 		}
+#endif
 		for (; p < ep; p++)
 			*p = num((DWORD)*p) % (sizeof(num)/sizeof(num0));
 
@@ -347,6 +379,17 @@
 			/* mkstemp */
 			attr = FILE_ATTRIBUTE_NORMAL;
 		}
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+		ZeroMemory(&createExParams, sizeof(createExParams));
+		createExParams.dwSize = sizeof(createExParams);
+		createExParams.dwFileAttributes = attr & 0xFFFF;
+		createExParams.dwFileFlags = attr & 0xFFF00000;
+		h = CreateFile2(ws,
+		 GENERIC_READ | GENERIC_WRITE | DELETE,
+		 0,/* Not share */
+			CREATE_NEW,
+			&createExParams);
+#else
 		h = CreateFileW(ws,
 		 GENERIC_READ | GENERIC_WRITE | DELETE,
 		 0,/* Not share */
@@ -354,6 +397,7 @@
 		 CREATE_NEW,/* Create a new file only */
 		 attr,
 		 NULL);
+#endif
 		if (h == INVALID_HANDLE_VALUE) {
 			/* The same file already exists. retry with
 			 * a new filename. */
@@ -372,8 +416,13 @@
 			break;/* success! */
 	}
 exit_tmpfile:
+#if defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA
+	if (hAlg != NULL)
+		BCryptCloseAlgorithmProvider(hAlg, 0);
+#else
 	if (hProv != (HCRYPTPROV)NULL)
 		CryptReleaseContext(hProv, 0);
+#endif
 	free(ws);
 	if (template == temp_name.s)
 		archive_wstring_free(&temp_name);

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_windows.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_windows.c Changed

@@ -234,7 +234,11 @@
 {
 	wchar_t *wpath;
 	HANDLE handle;
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+	CREATEFILE2_EXTENDED_PARAMETERS createExParams;
+#endif
 
+#if !defined(WINAPI_FAMILY_PARTITION) || WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
 	handle = CreateFileA(path, dwDesiredAccess, dwShareMode,
 	    lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes,
 	    hTemplateFile);
@@ -242,12 +246,25 @@
 		return (handle);
 	if (GetLastError() != ERROR_PATH_NOT_FOUND)
 		return (handle);
+#endif
 	wpath = __la_win_permissive_name(path);
 	if (wpath == NULL)
-		return (handle);
+		return INVALID_HANDLE_VALUE;
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+	ZeroMemory(&createExParams, sizeof(createExParams));
+	createExParams.dwSize = sizeof(createExParams);
+	createExParams.dwFileAttributes = dwFlagsAndAttributes & 0xFFFF;
+	createExParams.dwFileFlags = dwFlagsAndAttributes & 0xFFF00000;
+	createExParams.dwSecurityQosFlags = dwFlagsAndAttributes & 0x000F00000;
+	createExParams.lpSecurityAttributes = lpSecurityAttributes;
+	createExParams.hTemplateFile = hTemplateFile;
+	handle = CreateFile2(wpath, dwDesiredAccess, dwShareMode,
+	    dwCreationDisposition, &createExParams);
+#else /* !WINAPI_PARTITION_DESKTOP */
 	handle = CreateFileW(wpath, dwDesiredAccess, dwShareMode,
 	    lpSecurityAttributes, dwCreationDisposition, dwFlagsAndAttributes,
 	    hTemplateFile);
+#endif /* !WINAPI_PARTITION_DESKTOP */
 	free(wpath);
 	return (handle);
 }
@@ -305,7 +322,10 @@
 		 * "Permission denied" error.
 		 */
 		attr = GetFileAttributesA(path);
-		if (attr == (DWORD)-1 && GetLastError() == ERROR_PATH_NOT_FOUND) {
+#if !defined(WINAPI_FAMILY_PARTITION) || WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+		if (attr == (DWORD)-1 && GetLastError() == ERROR_PATH_NOT_FOUND)
+#endif
+		{
 			ws = __la_win_permissive_name(path);
 			if (ws == NULL) {
 				errno = EINVAL;
@@ -320,7 +340,7 @@
 		}
 		if (attr & FILE_ATTRIBUTE_DIRECTORY) {
 			HANDLE handle;
-
+#if !defined(WINAPI_FAMILY_PARTITION) || WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
 			if (ws != NULL)
 				handle = CreateFileW(ws, 0, 0, NULL,
 				    OPEN_EXISTING,
@@ -333,6 +353,15 @@
 				    FILE_FLAG_BACKUP_SEMANTICS |
 				    FILE_ATTRIBUTE_READONLY,
 					NULL);
+#else /* !WINAPI_PARTITION_DESKTOP */
+			CREATEFILE2_EXTENDED_PARAMETERS createExParams;
+			ZeroMemory(&createExParams, sizeof(createExParams));
+			createExParams.dwSize = sizeof(createExParams);
+			createExParams.dwFileAttributes = FILE_ATTRIBUTE_READONLY;
+			createExParams.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS;
+			handle = CreateFile2(ws, 0, 0,
+				OPEN_EXISTING, &createExParams);
+#endif /* !WINAPI_PARTITION_DESKTOP */
 			free(ws);
 			if (handle == INVALID_HANDLE_VALUE) {
 				la_dosmaperr(GetLastError());

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write.c Changed

@@ -310,6 +310,25 @@
 	return (__archive_write_filter(a->filter_first, buff, length));
 }
 
+static int
+__archive_write_filters_flush(struct archive_write *a)
+{
+	struct archive_write_filter *f;
+	int ret, ret1;
+
+	ret = ARCHIVE_OK;
+	for (f = a->filter_first; f != NULL; f = f->next_filter) {
+		if (f->flush != NULL && f->bytes_written > 0) {
+			ret1 = (f->flush)(f);
+			if (ret1 < ret)
+				ret = ret1;
+			if (ret1 < ARCHIVE_WARN)
+				f->state = ARCHIVE_WRITE_FILTER_STATE_FATAL;
+		}
+	}
+	return (ret);
+}
+
 int
 __archive_write_nulls(struct archive_write *a, size_t length)
 {
@@ -740,6 +759,18 @@
 		return (ARCHIVE_FAILED);
 	}
 
+	/* Flush filters at boundary. */
+	r2 = __archive_write_filters_flush(a);
+	if (r2 == ARCHIVE_FAILED) {
+		return (ARCHIVE_FAILED);
+	}
+	if (r2 == ARCHIVE_FATAL) {
+		a->archive.state = ARCHIVE_STATE_FATAL;
+		return (ARCHIVE_FATAL);
+	}
+	if (r2 < ret)
+		ret = r2;
+
 	/* Format and write header. */
 	r2 = ((a->format_write_header)(a, entry));
 	if (r2 == ARCHIVE_FAILED) {

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write_add_filter_bzip2.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write_add_filter_bzip2.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write_add_filter_compress.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write_add_filter_compress.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write_add_filter_lz4.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write_add_filter_lz4.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write_add_filter_zstd.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write_add_filter_zstd.c Changed

@@ -31,6 +31,9 @@
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
@@ -50,10 +53,21 @@
 
 struct private_data {
 	int		 compression_level;
-	int threads;
+	int		 threads;
 #if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
+	enum {
+		running,
+		finishing,
+		resetting,
+	} state;
+	int		 frame_per_file;
+	size_t		 min_frame_size;
+	size_t		 max_frame_size;
+	size_t		 cur_frame;
+	size_t		 cur_frame_in;
+	size_t		 cur_frame_out;
+	size_t		 total_in;
 	ZSTD_CStream	*cstream;
-	int64_t		 total_in;
 	ZSTD_outBuffer	 out;
 #else
 	struct archive_write_program_data *pdata;
@@ -75,6 +89,7 @@
 static int archive_compressor_zstd_open(struct archive_write_filter *);
 static int archive_compressor_zstd_write(struct archive_write_filter *,
 		 const void *, size_t);
+static int archive_compressor_zstd_flush(struct archive_write_filter *);
 static int archive_compressor_zstd_close(struct archive_write_filter *);
 static int archive_compressor_zstd_free(struct archive_write_filter *);
 #if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
@@ -103,6 +118,7 @@
 	f->data = data;
 	f->open = &archive_compressor_zstd_open;
 	f->options = &archive_compressor_zstd_options;
+	f->flush = &archive_compressor_zstd_flush;
 	f->close = &archive_compressor_zstd_close;
 	f->free = &archive_compressor_zstd_free;
 	f->code = ARCHIVE_FILTER_ZSTD;
@@ -110,6 +126,11 @@
 	data->compression_level = CLEVEL_DEFAULT;
 	data->threads = 0;
 #if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
+	data->frame_per_file = 0;
+	data->min_frame_size = 0;
+	data->max_frame_size = SIZE_MAX;
+	data->cur_frame_in = 0;
+	data->cur_frame_out = 0;
 	data->cstream = ZSTD_createCStream();
 	if (data->cstream == NULL) {
 		free(data);
@@ -147,29 +168,18 @@
 	return (ARCHIVE_OK);
 }
 
-static int string_is_numeric (const char* value)
+static int string_to_number(const char *string, intmax_t *numberp)
 {
- size_t len = strlen(value);
- size_t i;
-
- if (len == 0) {
- return (ARCHIVE_WARN);
- }
- else if (len == 1 && !(value0 >= '0' && value0 <= '9')) {
- return (ARCHIVE_WARN);
- }
- else if (!(value0 >= '0' && value0 <= '9') &&
- value0 != '-' && value0 != '+') {
- return (ARCHIVE_WARN);
- }
-
- for (i = 1; i < len; i++) {
- if (!(valuei >= '0' && valuei <= '9')) {
- return (ARCHIVE_WARN);
- }
- }
-
- return (ARCHIVE_OK);
+	char *end;
+
+	if (string == NULL || *string == '\0')
+		return (ARCHIVE_WARN);
+	*numberp = strtoimax(string, &end, 10);
+	if (end == string || *end != '\0' || errno == EOVERFLOW) {
+		*numberp = 0;
+		return (ARCHIVE_WARN);
+	}
+	return (ARCHIVE_OK);
 }
 
 /*
@@ -182,13 +192,13 @@
 	struct private_data *data = (struct private_data *)f->data;
 
 	if (strcmp(key, "compression-level") == 0) {
-		int level = atoi(value);
+		intmax_t level;
+		if (string_to_number(value, &level) != ARCHIVE_OK) {
+			return (ARCHIVE_WARN);
+		}
 		/* If we don't have the library, hard-code the max level */
 		int minimum = CLEVEL_MIN;
 		int maximum = CLEVEL_MAX;
-		if (string_is_numeric(value) != ARCHIVE_OK) {
-			return (ARCHIVE_WARN);
-		}
 #if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
 		maximum = ZSTD_maxCLevel();
 #if ZSTD_VERSION_NUMBER >= MINVER_MINCLEVEL
@@ -204,22 +214,43 @@
 		if (level < minimum || level > maximum) {
 			return (ARCHIVE_WARN);
 		}
-		data->compression_level = level;
+		data->compression_level = (int)level;
 		return (ARCHIVE_OK);
 	} else if (strcmp(key, "threads") == 0) {
-		int threads = atoi(value);
-		if (string_is_numeric(value) != ARCHIVE_OK) {
+		intmax_t threads;
+		if (string_to_number(value, &threads) != ARCHIVE_OK) {
 			return (ARCHIVE_WARN);
 		}
-
-		int minimum = 0;
-
-		if (threads < minimum) {
+		if (threads < 0) {
 			return (ARCHIVE_WARN);
 		}
-
-		data->threads = threads;
+		data->threads = (int)threads;
+		return (ARCHIVE_OK);
+#if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
+	} else if (strcmp(key, "frame-per-file") == 0) {
+		data->frame_per_file = 1;
+		return (ARCHIVE_OK);
+	} else if (strcmp(key, "min-frame-size") == 0) {
+		intmax_t min_frame_size;
+		if (string_to_number(value, &min_frame_size) != ARCHIVE_OK) {
+			return (ARCHIVE_WARN);
+		}
+		if (min_frame_size < 0) {
+			return (ARCHIVE_WARN);
+		}
+		data->min_frame_size = min_frame_size;
+		return (ARCHIVE_OK);
+	} else if (strcmp(key, "max-frame-size") == 0) {
+		intmax_t max_frame_size;
+		if (string_to_number(value, &max_frame_size) != ARCHIVE_OK) {
+			return (ARCHIVE_WARN);
+		}
+		if (max_frame_size < 1024) {
+			return (ARCHIVE_WARN);
+		}
+		data->max_frame_size = max_frame_size;
 		return (ARCHIVE_OK);
+#endif
 	}
 
 	/* Note: The "warn" return is just to inform the options
@@ -281,15 +312,22 @@
 size_t length)
 {
 	struct private_data *data = (struct private_data *)f->data;
-	int ret;
 
-	/* Update statistics */
-	data->total_in += length;
+	return (drive_compressor(f, data, 0, buff, length));
+}
 
-	if ((ret = drive_compressor(f, data, 0, buff, length)) != ARCHIVE_OK)
-		return (ret);
+/*
+ * Flush the compressed stream.
+ */
+static int
+archive_compressor_zstd_flush(struct archive_write_filter *f)
+{
+	struct private_data *data = (struct private_data *)f->data;
 
-	return (ARCHIVE_OK);
+	if (data->frame_per_file && data->state == running &&
+	 data->cur_frame_out > data->min_frame_size)
+		data->state = finishing;
+	return (drive_compressor(f, data, 1, NULL, 0));

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write_disk_posix.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write_disk_posix.c Changed

@@ -397,6 +397,7 @@
 static struct fixup_entry *sort_dir_list(struct fixup_entry *p);
 static ssize_t	write_data_block(struct archive_write_disk *,
 		 const char *, size_t);
+static void close_file_descriptor(struct archive_write_disk *);
 
 static int	_archive_write_disk_close(struct archive *);
 static int	_archive_write_disk_free(struct archive *);
@@ -514,7 +515,12 @@
 	 * XXX At this point, symlinks should not be hit, otherwise
 	 * XXX a race occurred. Do we want to check explicitly for that?
 	 */
-	if (lstat(a->name, &a->st) == 0) {
+#ifdef HAVE_LSTAT
+	if (lstat(a->name, &a->st) == 0)
+#else
+	if (la_stat(a->name, &a->st) == 0)
+#endif
+	{
 		a->pst = &a->st;
 		return (ARCHIVE_OK);
 	}
@@ -1605,12 +1611,12 @@
 			 "Seek failed");
 			return (ARCHIVE_FATAL);
 		} else if (a->offset > a->fd_offset) {
-			int64_t skip = a->offset - a->fd_offset;
+			uint64_t skip = a->offset - a->fd_offset;
 			char nullblock1024;
 
 			memset(nullblock, 0, sizeof(nullblock));
 			while (skip > 0) {
-				if (skip > (int64_t)sizeof(nullblock))
+				if (skip > sizeof(nullblock))
 					bytes_written = hfs_write_decmpfs_block(
 					 a, nullblock, sizeof(nullblock));
 				else
@@ -1725,8 +1731,10 @@
 			else
 				r = hfs_write_data_block(
 				 a, null_d, a->file_remaining_bytes);
-			if (r < 0)
+			if (r < 0) {
+				close_file_descriptor(a);
 				return ((int)r);
+			}
 		}
 #endif
 	} else {
@@ -1735,6 +1743,7 @@
 		 a->filesize == 0) {
 			archive_set_error(&a->archive, errno,
 			 "File size could not be restored");
+			close_file_descriptor(a);
 			return (ARCHIVE_FAILED);
 		}
 #endif
@@ -1744,8 +1753,10 @@
 		 * to see what happened.
 		 */
 		a->pst = NULL;
-		if ((ret = lazy_stat(a)) != ARCHIVE_OK)
-			return (ret);
+ if ((ret = lazy_stat(a)) != ARCHIVE_OK) {
+ close_file_descriptor(a);
+ return (ret);
+ }
 		/* We can use lseek()/write() to extend the file if
 		 * ftruncate didn't work or isn't available. */
 		if (a->st.st_size < a->filesize) {
@@ -1753,11 +1764,13 @@
 			if (lseek(a->fd, a->filesize - 1, SEEK_SET) < 0) {
 				archive_set_error(&a->archive, errno,
 				 "Seek failed");
+				close_file_descriptor(a);
 				return (ARCHIVE_FATAL);
 			}
 			if (write(a->fd, &nul, 1) < 0) {
 				archive_set_error(&a->archive, errno,
 				 "Write to restore size failed");
+				close_file_descriptor(a);
 				return (ARCHIVE_FATAL);
 			}
 			a->pst = NULL;
@@ -2154,7 +2167,11 @@
 		 * then don't follow it.
 		 */
 		if (r != 0 || !S_ISDIR(a->mode))
+#ifdef HAVE_LSTAT
 			r = lstat(a->name, &a->st);
+#else
+			r = la_stat(a->name, &a->st);
+#endif
 		if (r != 0) {
 			archive_set_error(&a->archive, errno,
 			 "Can't stat existing object");
@@ -2550,7 +2567,12 @@
 					goto skip_fixup_entry;
 				} else
 #endif
-				if (lstat(p->name, &st) != 0 ||
+				if (
+#ifdef HAVE_LSTAT
+					lstat(p->name, &st) != 0 ||
+#else
+					la_stat(p->name, &st) != 0 ||
+#endif
 				 la_verify_filetype(st.st_mode,
 				 p->filetype) == 0) {
 					goto skip_fixup_entry;
@@ -2565,7 +2587,12 @@
 				goto skip_fixup_entry;
 			} else
 #endif
-			if (lstat(p->name, &st) != 0 ||
+			if (
+#ifdef HAVE_LSTAT
+				lstat(p->name, &st) != 0 ||
+#else
+				la_stat(p->name, &st) != 0 ||
+#endif
 			 la_verify_filetype(st.st_mode,
 			 p->filetype) == 0) {
 				goto skip_fixup_entry;
@@ -2785,8 +2812,8 @@
 !(defined(HAVE_OPENAT) && defined(HAVE_FSTATAT) && defined(HAVE_UNLINKAT))
 	/* Platform doesn't have lstat, so we can't look for symlinks. */
 	(void)path; /* UNUSED */
-	(void)error_number; /* UNUSED */
-	(void)error_string; /* UNUSED */
+	(void)a_eno; /* UNUSED */
+	(void)a_estr; /* UNUSED */
 	(void)flags; /* UNUSED */
 	(void)checking_linkname; /* UNUSED */
 	return (ARCHIVE_OK);
@@ -2859,8 +2886,10 @@
 		/* Check that we haven't hit a symlink. */
 #if defined(HAVE_OPENAT) && defined(HAVE_FSTATAT) && defined(HAVE_UNLINKAT)
 		r = fstatat(chdir_fd, head, &st, AT_SYMLINK_NOFOLLOW);
-#else
+#elif defined(HAVE_LSTAT)
 		r = lstat(head, &st);
+#else
+		r = la_stat(head, &st);
 #endif
 		if (r != 0) {
 			tail0 = c;
@@ -3558,7 +3587,9 @@
 	(void)fd; /* UNUSED */
 	(void)mode; /* UNUSED */
 	(void)name; /* UNUSED */
+	(void)atime; /* UNUSED */
 	(void)atime_nsec; /* UNUSED */
+	(void)mtime; /* UNUSED */
 	(void)mtime_nsec; /* UNUSED */
 	return (ARCHIVE_WARN);
 #endif
@@ -4391,7 +4422,12 @@
 	 */
 	archive_strncpy(&datafork, pathname, p - pathname);
 	archive_strcat(&datafork, p + 2);
-	if (lstat(datafork.s, &st) == -1 ||
+	if (
+#ifdef HAVE_LSTAT
+		lstat(datafork.s, &st) == -1 ||
+#else
+		la_stat(datafork.s, &st) == -1 ||
+#endif
 	 (st.st_mode & AE_IFMT) != AE_IFREG)
 		goto skip_appledouble;
 
@@ -4707,5 +4743,17 @@
 }
 #endif
 
+/*
+ * Close the file descriptor if one is open.
+ */
+static void close_file_descriptor(struct archive_write_disk* a)
+{
+	if (a->fd >= 0) {
+		close(a->fd);
+		a->fd = -1;
+	}
+}
+
+
 #endif /* !_WIN32 || __CYGWIN__ */

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write_disk_windows.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write_disk_windows.c Changed

@@ -254,9 +254,9 @@
 * which is high-16-bits of nFileIndexHigh. */
 #define bhfi_ino(bhfi)	\
 	((((int64_t)((bhfi)->nFileIndexHigh & 0x0000FFFFUL)) << 32) \
- + (bhfi)->nFileIndexLow)
+ | (bhfi)->nFileIndexLow)
 #define bhfi_size(bhfi)	\
- ((((int64_t)(bhfi)->nFileSizeHigh) << 32) + (bhfi)->nFileSizeLow)
+ ((((int64_t)(bhfi)->nFileSizeHigh) << 32) | (bhfi)->nFileSizeLow)
 
 static int
 file_information(struct archive_write_disk *a, wchar_t *path,
@@ -266,6 +266,9 @@
 	int r;
 	DWORD flag = FILE_FLAG_BACKUP_SEMANTICS;
 	WIN32_FIND_DATAW	findData;
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+	CREATEFILE2_EXTENDED_PARAMETERS createExParams;
+#endif
 
 	if (sim_lstat || mode != NULL) {
 		h = FindFirstFileW(path, &findData);
@@ -290,14 +293,27 @@
 		(findData.dwReserved0 == IO_REPARSE_TAG_SYMLINK)))
 		flag |= FILE_FLAG_OPEN_REPARSE_POINT;
 
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+	ZeroMemory(&createExParams, sizeof(createExParams));
+	createExParams.dwSize = sizeof(createExParams);
+	createExParams.dwFileFlags = flag;
+	h = CreateFile2(a->name, 0, 0,
+		OPEN_EXISTING, &createExParams);
+#else
 	h = CreateFileW(a->name, 0, 0, NULL,
 	 OPEN_EXISTING, flag, NULL);
+#endif
 	if (h == INVALID_HANDLE_VALUE &&
 	 GetLastError() == ERROR_INVALID_NAME) {
 		wchar_t *full;
 		full = __la_win_permissive_name_w(path);
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+		h = CreateFile2(full, 0, 0,
+			OPEN_EXISTING, &createExParams);
+#else
 		h = CreateFileW(full, 0, 0, NULL,
 		 OPEN_EXISTING, flag, NULL);
+#endif
 		free(full);
 	}
 	if (h == INVALID_HANDLE_VALUE) {
@@ -559,6 +575,7 @@
 	return (fd);
 }
 
+#if _WIN32_WINNT < _WIN32_WINNT_VISTA
 static void *
 la_GetFunctionKernel32(const char *name)
 {
@@ -574,18 +591,24 @@
 	}
 	return (void *)GetProcAddress(lib, name);
 }
+#endif
 
 static int
 la_CreateHardLinkW(wchar_t *linkname, wchar_t *target)
 {
-	static BOOLEAN (WINAPI *f)(LPWSTR, LPWSTR, LPSECURITY_ATTRIBUTES);
-	static int set;
+	static BOOL (WINAPI *f)(LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES);
 	BOOL ret;
 
+#if _WIN32_WINNT < _WIN32_WINNT_XP
+	static int set;
+/* CreateHardLinkW is available since XP and always loaded */
 	if (!set) {
 		set = 1;
 		f = la_GetFunctionKernel32("CreateHardLinkW");
 	}
+#else
+	f = CreateHardLinkW;
+#endif
 	if (!f) {
 		errno = ENOTSUP;
 		return (0);
@@ -624,7 +647,6 @@
 la_CreateSymbolicLinkW(const wchar_t *linkname, const wchar_t *target,
 int linktype) {
 	static BOOLEAN (WINAPI *f)(LPCWSTR, LPCWSTR, DWORD);
-	static int set;
 	wchar_t *ttarget, *p;
 	size_t len;
 	DWORD attrs = 0;
@@ -632,10 +654,20 @@
 	DWORD newflags = 0;
 	BOOL ret = 0;
 
+#if _WIN32_WINNT < _WIN32_WINNT_VISTA
+/* CreateSymbolicLinkW is available since Vista and always loaded */
+	static int set;
 	if (!set) {
 		set = 1;
 		f = la_GetFunctionKernel32("CreateSymbolicLinkW");
 	}
+#else
+# if !defined(WINAPI_FAMILY_PARTITION) || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+	f = CreateSymbolicLinkW;
+# else
+	f = NULL;
+# endif
+#endif
 	if (!f)
 		return (0);
 
@@ -1185,6 +1217,8 @@
 		if (la_ftruncate(a->fh, a->filesize) == -1) {
 			archive_set_error(&a->archive, errno,
 			 "File size could not be restored");
+			CloseHandle(a->fh);
+			a->fh = INVALID_HANDLE_VALUE;
 			return (ARCHIVE_FAILED);
 		}
 	}
@@ -1656,6 +1690,9 @@
 	mode_t final_mode, mode;
 	int r;
 	DWORD attrs = 0;
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+		CREATEFILE2_EXTENDED_PARAMETERS createExParams;
+#endif
 
 	/* We identify hard/symlinks according to the link names. */
 	/* Since link(2) and symlink(2) don't handle modes, we're done here. */
@@ -1719,8 +1756,16 @@
 			a->todo = 0;
 			a->deferred = 0;
 		} else if (r == 0 && a->filesize > 0) {
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+			ZeroMemory(&createExParams, sizeof(createExParams));
+			createExParams.dwSize = sizeof(createExParams);
+			createExParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
+			a->fh = CreateFile2(namefull, GENERIC_WRITE, 0,
+			 TRUNCATE_EXISTING, &createExParams);
+#else
 			a->fh = CreateFileW(namefull, GENERIC_WRITE, 0, NULL,
 			 TRUNCATE_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+#endif
 			if (a->fh == INVALID_HANDLE_VALUE) {
 				la_dosmaperr(GetLastError());
 				r = errno;
@@ -1783,14 +1828,27 @@
 		a->tmpname = NULL;
 		fullname = a->name;
 		/* O_WRONLY | O_CREAT | O_EXCL */
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+		ZeroMemory(&createExParams, sizeof(createExParams));
+		createExParams.dwSize = sizeof(createExParams);
+		createExParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
+		a->fh = CreateFile2(fullname, GENERIC_WRITE, 0,
+		 CREATE_NEW, &createExParams);
+#else
 		a->fh = CreateFileW(fullname, GENERIC_WRITE, 0, NULL,
 		 CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
+#endif
 		if (a->fh == INVALID_HANDLE_VALUE &&
 		 GetLastError() == ERROR_INVALID_NAME &&
 		 fullname == a->name) {
 			fullname = __la_win_permissive_name_w(a->name);
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+			a->fh = CreateFile2(fullname, GENERIC_WRITE, 0,
+			 CREATE_NEW, &createExParams);
+#else
 			a->fh = CreateFileW(fullname, GENERIC_WRITE, 0, NULL,
 			 CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
+#endif
 		}
 		if (a->fh == INVALID_HANDLE_VALUE) {
 			if (GetLastError() == ERROR_ACCESS_DENIED) {
@@ -2551,14 +2609,25 @@
 		hw = NULL;
 	} else {
 		wchar_t *ws;
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+		CREATEFILE2_EXTENDED_PARAMETERS createExParams;
+#endif
 
 		if (S_ISLNK(mode))
 			return (ARCHIVE_OK);
 		ws = __la_win_permissive_name_w(name);
 		if (ws == NULL)
 			goto settimes_failed;
+# if _WIN32_WINNT >= 0x0602 /* _WIN32_WINNT_WIN8 */
+		ZeroMemory(&createExParams, sizeof(createExParams));
+		createExParams.dwSize = sizeof(createExParams);
+		createExParams.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS;
+		hw = CreateFile2(ws, FILE_WRITE_ATTRIBUTES, 0,
+		 OPEN_EXISTING, &createExParams);
+#else
 		hw = CreateFileW(ws, FILE_WRITE_ATTRIBUTES,
 		 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write_private.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write_private.h Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write_set_format_7zip.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write_set_format_7zip.c Changed

@@ -165,7 +165,7 @@
 	mode_t			 mode;
 	uint32_t		 crc32;
 
-	signed int		 dir:1;
+	unsigned		 dir:1;
 };
 
 struct _7zip {
@@ -1809,11 +1809,11 @@
 	 * of ugly hackery to convert a const * pointer to
 	 * a non-const pointer. */
 	strm->next_in = (char *)(uintptr_t)(const void *)lastrm->next_in;
-	strm->avail_in = lastrm->avail_in;
+	strm->avail_in = (uint32_t)lastrm->avail_in;
 	strm->total_in_lo32 = (uint32_t)(lastrm->total_in & 0xffffffff);
 	strm->total_in_hi32 = (uint32_t)(lastrm->total_in >> 32);
 	strm->next_out = (char *)lastrm->next_out;
-	strm->avail_out = lastrm->avail_out;
+	strm->avail_out = (uint32_t)lastrm->avail_out;
 	strm->total_out_lo32 = (uint32_t)(lastrm->total_out & 0xffffffff);
 	strm->total_out_hi32 = (uint32_t)(lastrm->total_out >> 32);
 	if (BZ2_bzCompressInit(strm, level, 0, 30) != BZ_OK) {
@@ -1842,11 +1842,11 @@
 	 * of ugly hackery to convert a const * pointer to
 	 * a non-const pointer. */
 	strm->next_in = (char *)(uintptr_t)(const void *)lastrm->next_in;
-	strm->avail_in = lastrm->avail_in;
+	strm->avail_in = (uint32_t)lastrm->avail_in;
 	strm->total_in_lo32 = (uint32_t)(lastrm->total_in & 0xffffffff);
 	strm->total_in_hi32 = (uint32_t)(lastrm->total_in >> 32);
 	strm->next_out = (char *)lastrm->next_out;
-	strm->avail_out = lastrm->avail_out;
+	strm->avail_out = (uint32_t)lastrm->avail_out;
 	strm->total_out_lo32 = (uint32_t)(lastrm->total_out & 0xffffffff);
 	strm->total_out_hi32 = (uint32_t)(lastrm->total_out >> 32);
 	r = BZ2_bzCompress(strm,

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write_set_format_iso9660.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write_set_format_iso9660.c Changed

@@ -289,12 +289,12 @@
 		struct extr_rec	*current;
 	}			 extr_rec_list;
 
-	signed int		 virtual:1;
+	unsigned int		 virtual:1;
 	/* If set to one, this file type is a directory.
 	 * A convenience flag to be used as
 	 * "archive_entry_filetype(isoent->file->entry) == AE_IFDIR".
 	 */
-	signed int		 dir:1;
+	unsigned int		 dir:1;
 };
 
 struct hardlink {
@@ -652,7 +652,7 @@
 #define VOLUME_IDENTIFIER_SIZE		32
 
 	/*
-	 * Usage  : !zisofs DEFAULT 
+	 * Usage  : !zisofs DEFAULT
 	 *        :    Disable to generate RRIP 'ZF' extension.
 	 *        : zisofs
 	 *        :    Make files zisofs file and generate RRIP 'ZF'
@@ -689,7 +689,7 @@
 	uint64_t		 bytes_remaining;
 	int			 need_multi_extent;
 
-	/* Temporary string buffer for Joliet extension. */ 
+	/* Temporary string buffer for Joliet extension. */
 	struct archive_string	 utf16be;
 	struct archive_string	 mbs;
 
@@ -755,9 +755,9 @@
 
 	/* Used for making zisofs. */
 	struct {
-		signed int	 detect_magic:1;
-		signed int	 making:1;
-		signed int	 allzero:1;
+		unsigned int	 detect_magic:1;
+		unsigned int	 making:1;
+		unsigned int	 allzero:1;
 		unsigned char	 magic_buffer64;
 		int		 magic_cnt;
 
@@ -2521,12 +2521,11 @@
 static void
 get_tmfromtime(struct tm *tm, time_t *t)
 {
-#if HAVE_LOCALTIME_R
+#if HAVE_LOCALTIME_S
+	localtime_s(tm, t);
+#elif HAVE_LOCALTIME_R
 	tzset();
 	localtime_r(t, tm);
-#elif HAVE__LOCALTIME64_S
-	__time64_t tmp_t = (__time64_t) *t; //time_t may be shorter than 64 bits
-	_localtime64_s(tm, &tmp_t);
 #else
 	memcpy(tm, localtime(t), sizeof(*tm));
 #endif
@@ -4074,11 +4073,8 @@
 	}
 	memset(info.s, 0, info_size);
 	opt = 0;
-#if defined(HAVE__CTIME64_S)
-	{
-		__time64_t iso9660_birth_time_tmp = (__time64_t) iso9660->birth_time; //time_t may be shorter than 64 bits
-		_ctime64_s(buf, sizeof(buf), &(iso9660_birth_time_tmp));
-	}
+#if defined(HAVE_CTIME_S)
+	ctime_s(buf, sizeof(buf), &(iso9660->birth_time));
 #elif defined(HAVE_CTIME_R)
 	ctime_r(&(iso9660->birth_time), buf);
 #else
@@ -7802,8 +7798,8 @@
 	uint64_t	 pz_uncompressed_size;
 	size_t		 uncompressed_buffer_size;
 
-	signed int	 initialized:1;
-	signed int	 header_passed:1;
+	unsigned int	 initialized:1;
+	unsigned int	 header_passed:1;
 
 	uint32_t	 pz_offset;
 	unsigned char	*block_pointers;

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write_set_format_pax.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write_set_format_pax.c Changed

@@ -100,6 +100,7 @@
 static void		 sparse_list_clear(struct pax *);
 static int		 sparse_list_add(struct pax *, int64_t, int64_t);
 static char		*url_encode(const char *in);
+static time_t		 get_ustar_max_mtime(void);
 
 /*
 * Set output format to 'restricted pax' format.
@@ -595,6 +596,8 @@
 	need_extension = 0;
 	pax = (struct pax *)a->format_data;
 
+	const time_t ustar_max_mtime = get_ustar_max_mtime();
+
 	/* Sanity check. */
 	if (archive_entry_pathname(entry_original) == NULL) {
 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
@@ -1116,16 +1119,13 @@
 	}
 
 	/*
-	 * Technically, the mtime field in the ustar header can
-	 * support 33 bits, but many platforms use signed 32-bit time
-	 * values. The cutoff of 0x7fffffff here is a compromise.
 	 * Yes, this check is duplicated just below; this helps to
 	 * avoid writing an mtime attribute just to handle a
 	 * high-resolution timestamp in "restricted pax" mode.
 	 */
 	if (!need_extension &&
 	 ((archive_entry_mtime(entry_main) < 0)
-		|| (archive_entry_mtime(entry_main) >= 0x7fffffff)))
+		|| (archive_entry_mtime(entry_main) >= ustar_max_mtime)))
 		need_extension = 1;
 
 	/* I use a star-compatible file flag attribute. */
@@ -1190,7 +1190,7 @@
 	if (a->archive.archive_format != ARCHIVE_FORMAT_TAR_PAX_RESTRICTED ||
 	 need_extension) {
 		if (archive_entry_mtime(entry_main) < 0 ||
-		 archive_entry_mtime(entry_main) >= 0x7fffffff ||
+		 archive_entry_mtime(entry_main) >= ustar_max_mtime ||
 		 archive_entry_mtime_nsec(entry_main) != 0)
 			add_pax_attr_time(&(pax->pax_header), "mtime",
 			 archive_entry_mtime(entry_main),
@@ -1428,7 +1428,7 @@
 		/* Copy mtime, but clip to ustar limits. */
 		s = archive_entry_mtime(entry_main);
 		if (s < 0) { s = 0; }
-		if (s >= 0x7fffffff) { s = 0x7fffffff; }
+		if (s > ustar_max_mtime) { s = ustar_max_mtime; }
 		archive_entry_set_mtime(pax_attr_entry, s, 0);
 
 		/* Standard ustar doesn't support atime. */
@@ -2046,3 +2046,18 @@
 	return (_sparse_list_add_block(pax, offset, length, 0));
 }
 
+static time_t
+get_ustar_max_mtime(void)
+{
+	/*
+	 * Technically, the mtime field in the ustar header can
+	 * support 33 bits. We are using all of them to keep
+	 * tar/test/test_option_C_mtree.c simple and passing after 2038.
+	 * For platforms that use signed 32-bit time values we
+	 * use the 32-bit maximum.
+	 */
+	if (sizeof(time_t) > sizeof(int32_t))
+		return (time_t)0x1ffffffff;
+	else
+		return (time_t)0x7fffffff;
+}

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write_set_format_warc.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write_set_format_warc.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write_set_format_xar.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write_set_format_xar.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/archive_write_set_format_zip.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/archive_write_set_format_zip.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/config_freebsd.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/config_freebsd.h Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/filter_fork_windows.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/filter_fork_windows.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/test/list.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/list.h Changed

@@ -194,10 +194,18 @@
 DEFINE_TEST(test_read_format_7zip_from_fd)
 DEFINE_TEST(test_read_format_7zip_copy)
 DEFINE_TEST(test_read_format_7zip_deflate)
+DEFINE_TEST(test_read_format_7zip_zstd)
+DEFINE_TEST(test_read_format_7zip_zstd_solid)
+DEFINE_TEST(test_read_format_7zip_zstd_bcj)
+DEFINE_TEST(test_read_format_7zip_zstd_nobcj)
 DEFINE_TEST(test_read_format_7zip_empty)
 DEFINE_TEST(test_read_format_7zip_lzma1)
 DEFINE_TEST(test_read_format_7zip_lzma2)
+DEFINE_TEST(test_read_format_7zip_zstd_arm)
+DEFINE_TEST(test_read_format_7zip_lzma2_arm)
 DEFINE_TEST(test_read_format_7zip_ppmd)
+DEFINE_TEST(test_read_format_7zip_lzma2_arm64)
+DEFINE_TEST(test_read_format_7zip_deflate_arm64)
 DEFINE_TEST(test_read_format_7zip_encryption_data)
 DEFINE_TEST(test_read_format_7zip_encryption_header)
 DEFINE_TEST(test_read_format_7zip_encryption_partially)
@@ -207,15 +215,15 @@
 DEFINE_TEST(test_read_format_cab)
 DEFINE_TEST(test_read_format_cab_filename)
 DEFINE_TEST(test_read_format_cpio_afio)
-DEFINE_TEST(test_read_format_cpio_bin)
-DEFINE_TEST(test_read_format_cpio_bin_Z)
 DEFINE_TEST(test_read_format_cpio_bin_be)
 DEFINE_TEST(test_read_format_cpio_bin_bz2)
+DEFINE_TEST(test_read_format_cpio_bin)
 DEFINE_TEST(test_read_format_cpio_bin_gz)
 DEFINE_TEST(test_read_format_cpio_bin_le)
 DEFINE_TEST(test_read_format_cpio_bin_lzip)
 DEFINE_TEST(test_read_format_cpio_bin_lzma)
 DEFINE_TEST(test_read_format_cpio_bin_xz)
+DEFINE_TEST(test_read_format_cpio_bin_Z)
 DEFINE_TEST(test_read_format_cpio_filename_eucJP_UTF8)
 DEFINE_TEST(test_read_format_cpio_filename_UTF8_eucJP)
 DEFINE_TEST(test_read_format_cpio_filename_UTF8_UTF8_jp)
@@ -234,9 +242,9 @@
 DEFINE_TEST(test_read_format_cpio_filename_UTF8_CP1251)
 DEFINE_TEST(test_read_format_cpio_odc)
 DEFINE_TEST(test_read_format_cpio_svr4_bzip2_rpm)
+DEFINE_TEST(test_read_format_cpio_svr4c_Z)
 DEFINE_TEST(test_read_format_cpio_svr4_gzip)
 DEFINE_TEST(test_read_format_cpio_svr4_gzip_rpm)
-DEFINE_TEST(test_read_format_cpio_svr4c_Z)
 DEFINE_TEST(test_read_format_empty)
 DEFINE_TEST(test_read_format_gtar_filename_eucJP_UTF8)
 DEFINE_TEST(test_read_format_gtar_filename_CP866_KOI8R)
@@ -251,20 +259,20 @@
 DEFINE_TEST(test_read_format_gtar_lzma)
 DEFINE_TEST(test_read_format_gtar_sparse)
 DEFINE_TEST(test_read_format_gtar_sparse_skip_entry)
-DEFINE_TEST(test_read_format_iso_Z)
-DEFINE_TEST(test_read_format_iso_multi_extent)
-DEFINE_TEST(test_read_format_iso_xorriso)
 DEFINE_TEST(test_read_format_isojoliet_bz2)
 DEFINE_TEST(test_read_format_isojoliet_long)
 DEFINE_TEST(test_read_format_isojoliet_rr)
 DEFINE_TEST(test_read_format_isojoliet_versioned)
+DEFINE_TEST(test_read_format_iso_multi_extent)
 DEFINE_TEST(test_read_format_isorr_bz2)
 DEFINE_TEST(test_read_format_isorr_ce)
 DEFINE_TEST(test_read_format_isorr_new_bz2)
 DEFINE_TEST(test_read_format_isorr_rr_moved)
+DEFINE_TEST(test_read_format_iso_xorriso)
+DEFINE_TEST(test_read_format_iso_Z)
 DEFINE_TEST(test_read_format_isozisofs_bz2)
-DEFINE_TEST(test_read_format_lha)
 DEFINE_TEST(test_read_format_lha_bugfix_0)
+DEFINE_TEST(test_read_format_lha)
 DEFINE_TEST(test_read_format_lha_filename)
 DEFINE_TEST(test_read_format_lha_filename_UTF16)
 DEFINE_TEST(test_read_format_mtree)
@@ -278,28 +286,6 @@
 DEFINE_TEST(test_read_format_mtree_tab)
 DEFINE_TEST(test_read_format_mtree_crash747)
 DEFINE_TEST(test_read_format_pax_bz2)
-DEFINE_TEST(test_read_format_rar_set_format)
-DEFINE_TEST(test_read_format_rar_basic)
-DEFINE_TEST(test_read_format_rar_subblock)
-DEFINE_TEST(test_read_format_rar_noeof)
-DEFINE_TEST(test_read_format_rar_unicode_UTF8)
-DEFINE_TEST(test_read_format_rar_unicode_CP932)
-DEFINE_TEST(test_read_format_rar_compress_normal)
-DEFINE_TEST(test_read_format_rar_multi_lzss_blocks)
-DEFINE_TEST(test_read_format_rar_compress_best)
-DEFINE_TEST(test_read_format_rar_ppmd_lzss_conversion)
-DEFINE_TEST(test_read_format_rar_binary)
-DEFINE_TEST(test_read_format_rar_windows)
-DEFINE_TEST(test_read_format_rar_multivolume)
-DEFINE_TEST(test_read_format_rar_multivolume_skip)
-DEFINE_TEST(test_read_format_rar_sfx)
-DEFINE_TEST(test_read_format_rar_multivolume_stored_file)
-DEFINE_TEST(test_read_format_rar_multivolume_stored_file_skip)
-DEFINE_TEST(test_read_format_rar_multivolume_seek_data)
-DEFINE_TEST(test_read_format_rar_multivolume_seek_multiple_files)
-DEFINE_TEST(test_read_format_rar_multivolume_uncompressed_files)
-DEFINE_TEST(test_read_format_rar_ppmd_use_after_free)
-DEFINE_TEST(test_read_format_rar_ppmd_use_after_free2)
 DEFINE_TEST(test_read_format_rar5_set_format)
 DEFINE_TEST(test_read_format_rar5_stored)
 DEFINE_TEST(test_read_format_rar5_compressed)
@@ -348,6 +334,28 @@
 DEFINE_TEST(test_read_format_rar5_decode_number_out_of_bounds_read)
 DEFINE_TEST(test_read_format_rar5_bad_window_size_in_multiarchive_file)
 DEFINE_TEST(test_read_format_rar5_read_data_block_uninitialized_offset)
+DEFINE_TEST(test_read_format_rar_set_format)
+DEFINE_TEST(test_read_format_rar_basic)
+DEFINE_TEST(test_read_format_rar_subblock)
+DEFINE_TEST(test_read_format_rar_noeof)
+DEFINE_TEST(test_read_format_rar_unicode_UTF8)
+DEFINE_TEST(test_read_format_rar_unicode_CP932)
+DEFINE_TEST(test_read_format_rar_compress_normal)
+DEFINE_TEST(test_read_format_rar_multi_lzss_blocks)
+DEFINE_TEST(test_read_format_rar_compress_best)
+DEFINE_TEST(test_read_format_rar_ppmd_lzss_conversion)
+DEFINE_TEST(test_read_format_rar_binary)
+DEFINE_TEST(test_read_format_rar_windows)
+DEFINE_TEST(test_read_format_rar_multivolume)
+DEFINE_TEST(test_read_format_rar_multivolume_skip)
+DEFINE_TEST(test_read_format_rar_sfx)
+DEFINE_TEST(test_read_format_rar_multivolume_stored_file)
+DEFINE_TEST(test_read_format_rar_multivolume_stored_file_skip)
+DEFINE_TEST(test_read_format_rar_multivolume_seek_data)
+DEFINE_TEST(test_read_format_rar_multivolume_seek_multiple_files)
+DEFINE_TEST(test_read_format_rar_multivolume_uncompressed_files)
+DEFINE_TEST(test_read_format_rar_ppmd_use_after_free)
+DEFINE_TEST(test_read_format_rar_ppmd_use_after_free2)
 DEFINE_TEST(test_read_format_rar_encryption_data)
 DEFINE_TEST(test_read_format_rar_encryption_header)
 DEFINE_TEST(test_read_format_rar_encryption_partially)
@@ -369,6 +377,7 @@
 DEFINE_TEST(test_read_format_ustar_filename)
 DEFINE_TEST(test_read_format_warc)
 DEFINE_TEST(test_read_format_xar)
+DEFINE_TEST(test_read_format_zip_utf8_paths)
 DEFINE_TEST(test_read_format_zip)
 DEFINE_TEST(test_read_format_zip_ppmd_one_file)
 DEFINE_TEST(test_read_format_zip_ppmd_one_file_blockread)
@@ -396,7 +405,6 @@
 DEFINE_TEST(test_read_format_zip_lzma_stream_end_blockread)
 DEFINE_TEST(test_read_format_zip_7z_lzma)
 DEFINE_TEST(test_read_format_zip_7z_deflate)
-DEFINE_TEST(test_read_format_zip_utf8_paths)
 DEFINE_TEST(test_read_format_zip_comment_stored)
 DEFINE_TEST(test_read_format_zip_encryption_data)
 DEFINE_TEST(test_read_format_zip_encryption_header)
@@ -476,8 +484,8 @@
 DEFINE_TEST(test_ustar_filename_encoding_CP932_UTF8)
 DEFINE_TEST(test_ustar_filenames)
 DEFINE_TEST(test_warn_missing_hardlink_target)
-DEFINE_TEST(test_write_disk)
 DEFINE_TEST(test_write_disk_appledouble)
+DEFINE_TEST(test_write_disk)
 DEFINE_TEST(test_write_disk_failures)
 DEFINE_TEST(test_write_disk_fixup)
 DEFINE_TEST(test_write_disk_hardlink)
@@ -486,11 +494,11 @@
 DEFINE_TEST(test_write_disk_mac_metadata)
 DEFINE_TEST(test_write_disk_no_hfs_compression)
 DEFINE_TEST(test_write_disk_perms)
-DEFINE_TEST(test_write_disk_secure)
 DEFINE_TEST(test_write_disk_secure744)
 DEFINE_TEST(test_write_disk_secure745)
 DEFINE_TEST(test_write_disk_secure746a)
 DEFINE_TEST(test_write_disk_secure746b)
+DEFINE_TEST(test_write_disk_secure)
 DEFINE_TEST(test_write_disk_sparse)
 DEFINE_TEST(test_write_disk_symlink)
 DEFINE_TEST(test_write_disk_times)
@@ -537,22 +545,22 @@
 DEFINE_TEST(test_write_format_gnutar)
 DEFINE_TEST(test_write_format_gnutar_filenames)
 DEFINE_TEST(test_write_format_gnutar_linknames)
-DEFINE_TEST(test_write_format_iso9660)
 DEFINE_TEST(test_write_format_iso9660_boot)
+DEFINE_TEST(test_write_format_iso9660)
 DEFINE_TEST(test_write_format_iso9660_empty)
 DEFINE_TEST(test_write_format_iso9660_filename)
 DEFINE_TEST(test_write_format_iso9660_zisofs)
+DEFINE_TEST(test_write_format_mtree_absolute_path)
 DEFINE_TEST(test_write_format_mtree)
 DEFINE_TEST(test_write_format_mtree_no_leading_dotslash)
-DEFINE_TEST(test_write_format_mtree_absolute_path)
 DEFINE_TEST(test_write_format_mtree_classic)
 DEFINE_TEST(test_write_format_mtree_classic_indent)
 DEFINE_TEST(test_write_format_mtree_fflags)
 DEFINE_TEST(test_write_format_mtree_no_separator)
 DEFINE_TEST(test_write_format_mtree_quoted_filename)
 DEFINE_TEST(test_write_format_pax)
-DEFINE_TEST(test_write_format_raw)
 DEFINE_TEST(test_write_format_raw_b64)
+DEFINE_TEST(test_write_format_raw)
 DEFINE_TEST(test_write_format_shar_empty)
 DEFINE_TEST(test_write_format_tar)
 DEFINE_TEST(test_write_format_tar_empty)

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/test/test_fuzz.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_fuzz.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/test/test_read_disk_directory_traversals.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_read_disk_directory_traversals.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/test/test_read_format_7zip.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_read_format_7zip.c Changed

@@ -30,6 +30,9 @@
 #define	open		_open
 #endif
 
+#define __LIBARCHIVE_BUILD
+#include <archive_crc32.h>
+
 /*
 * Extract a non-encoded file.
 * The header of the 7z archive files is not encoded.
@@ -284,6 +287,141 @@
 }
 
 /*
+ * Extract multi files.
+ * Like test_extract_all_files, but with zstandard compression.
+ */
+static void
+test_extract_all_files_zstd(const char *refname)
+{
+	struct archive_entry *ae;
+	struct archive *a;
+	char buff128;
+
+	extract_reference_file(refname);
+	assert((a = archive_read_new()) != NULL);
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+	assertEqualIntA(a, ARCHIVE_OK,
+	 archive_read_open_filename(a, refname, 10240));
+
+	/* Verify directory dir1. Note that this comes before the dir1/file1 entry in recent versions of 7-Zip. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualInt((AE_IFDIR | 0755), archive_entry_mode(ae));
+	assertEqualString("dir1/", archive_entry_pathname(ae));
+	assertEqualInt(2764801, archive_entry_mtime(ae));
+	assertEqualInt(archive_entry_is_encrypted(ae), 0);
+	assertEqualIntA(a, archive_read_has_encrypted_entries(a), 0);
+
+	/* Verify regular file1. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualInt((AE_IFREG | 0644), archive_entry_mode(ae));
+	assertEqualString("dir1/file1", archive_entry_pathname(ae));
+	assertEqualInt(86401, archive_entry_mtime(ae));
+	assertEqualInt(13, archive_entry_size(ae));
+	assertEqualInt(archive_entry_is_encrypted(ae), 0);
+	assertEqualIntA(a, archive_read_has_encrypted_entries(a), 0);
+	assertEqualInt(13, archive_read_data(a, buff, sizeof(buff)));
+	assertEqualMem(buff, "aaaaaaaaaaaa\n", 13);
+
+	/* Verify regular file2. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualInt((AE_IFREG | 0644), archive_entry_mode(ae));
+	assertEqualString("file2", archive_entry_pathname(ae));
+	assertEqualInt(86401, archive_entry_mtime(ae));
+	assertEqualInt(26, archive_entry_size(ae));
+	assertEqualInt(archive_entry_is_encrypted(ae), 0);
+	assertEqualIntA(a, archive_read_has_encrypted_entries(a), 0);
+	assertEqualInt(26, archive_read_data(a, buff, sizeof(buff)));
+	assertEqualMem(buff, "aaaaaaaaaaaa\nbbbbbbbbbbbb\n", 26);
+
+	/* Verify regular file3. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualInt((AE_IFREG | 0644), archive_entry_mode(ae));
+	assertEqualString("file3", archive_entry_pathname(ae));
+	assertEqualInt(86401, archive_entry_mtime(ae));
+	assertEqualInt(39, archive_entry_size(ae));
+	assertEqualInt(archive_entry_is_encrypted(ae), 0);
+	assertEqualIntA(a, archive_read_has_encrypted_entries(a), 0);
+	assertEqualInt(39, archive_read_data(a, buff, sizeof(buff)));
+	assertEqualMem(buff, "aaaaaaaaaaaa\nbbbbbbbbbbbb\ncccccccccccc\n", 39);
+
+	/* Verify regular file4. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualInt((AE_IFREG | 0644), archive_entry_mode(ae));
+	assertEqualString("file4", archive_entry_pathname(ae));
+	assertEqualInt(86401, archive_entry_mtime(ae));
+	assertEqualInt(52, archive_entry_size(ae));
+	assertEqualInt(archive_entry_is_encrypted(ae), 0);
+	assertEqualIntA(a, archive_read_has_encrypted_entries(a), 0);
+	assertEqualInt(52, archive_read_data(a, buff, sizeof(buff)));
+	assertEqualMem(buff,
+	 "aaaaaaaaaaaa\nbbbbbbbbbbbb\ncccccccccccc\ndddddddddddd\n", 52);
+
+	assertEqualInt(5, archive_file_count(a));
+
+	/* End of archive. */
+	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+
+	/* Verify archive format. */
+	assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
+	assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
+
+	/* Close the archive. */
+	assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}
+
+/*
+ * Extract file from an archives using ZSTD compression with and without BCJ.
+ */
+static void
+test_extract_file_zstd_bcj_nobjc(const char *refname)
+{
+	struct archive_entry *ae;
+	struct archive *a;
+	char buff4096;
+	uint32_t computed_crc = 0;
+	uint32_t expected_crc = 0xbd66eebc;
+
+	extract_reference_file(refname);
+	assert((a = archive_read_new()) != NULL);
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+	assertEqualIntA(a, ARCHIVE_OK,
+	 archive_read_open_filename(a, refname, 10240));
+
+	/* Verify regular file: hw. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualInt((AE_IFREG | 0775), archive_entry_mode(ae));
+	assertEqualString("hw", archive_entry_pathname(ae));
+	assertEqualInt(1685913368, archive_entry_mtime(ae));
+	assertEqualInt(15952, archive_entry_size(ae));
+	assertEqualInt(archive_entry_is_encrypted(ae), 0);
+	assertEqualIntA(a, archive_read_has_encrypted_entries(a), 0);
+
+	for (;;) {
+		la_ssize_t bytes_read = archive_read_data(a, buff, sizeof(buff));
+		assert(bytes_read >= 0);
+		if (bytes_read == 0) break;
+		computed_crc = crc32(computed_crc, buff, bytes_read);
+	}
+	assertEqualInt(computed_crc, expected_crc);
+
+	assertEqualInt(1, archive_file_count(a));
+
+	/* End of archive. */
+	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+
+	/* Verify archive format. */
+	assertEqualIntA(a, ARCHIVE_FILTER_NONE, archive_filter_code(a, 0));
+	assertEqualIntA(a, ARCHIVE_FORMAT_7ZIP, archive_format(a));
+
+	/* Close the archive. */
+	assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}
+
+/*
 * Extract last file.
 * The header of the 7z archive files is encoded with LZMA.
 */
@@ -782,6 +920,74 @@
 	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
 }
 
+DEFINE_TEST(test_read_format_7zip_zstd)
+{
+	struct archive *a;
+
+	assert((a = archive_read_new()) != NULL);
+
+	/* Extracting with libzstd */
+	if (ARCHIVE_OK != archive_read_support_filter_zstd(a)) {
+		skipping(
+		 "7zip:zstd decoding is not supported on this platform");
+	} else {
+		test_extract_all_files_zstd("test_read_format_7zip_zstd.7z");
+	}
+
+	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}
+
+DEFINE_TEST(test_read_format_7zip_zstd_solid)
+{
+	struct archive *a;
+
+	assert((a = archive_read_new()) != NULL);
+
+	/* Extracting with libzstd */
+	if (ARCHIVE_OK != archive_read_support_filter_zstd(a)) {
+		skipping(
+		 "7zip:zstd decoding is not supported on this platform");
+	} else {
+		test_extract_all_files_zstd("test_read_format_7zip_solid_zstd.7z");
+	}
+
+	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}
+
+DEFINE_TEST(test_read_format_7zip_zstd_bcj)
+{
+	struct archive *a;
+
+	assert((a = archive_read_new()) != NULL);
+
+	/* Extracting with libzstd */
+	if (ARCHIVE_OK != archive_read_support_filter_zstd(a)) {
+		skipping(
+		 "7zip:zstd decoding is not supported on this platform");

_service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_read_format_7zip_deflate_arm64.7z.uu Added

@@ -0,0 +1,64 @@
+begin 664 libarchive/test/test_read_format_7zip_deflate_arm64.7z
+M-WJ\KR<<``2V^52G)0H```````!:`````````.HY+B_LU5^(3%$<P/%SYPY+
+M_N1?*/F5R'Y3_'&'^&0FBT9BU@ZFQHF1#65X4C:9"`(HI`'#PHO_N5!
+M>2.2T-J0XF&*!R-C_.Z=<^_<NSLKWK^?MS?GM\OW//W'ONS*&5:U<%#$,Y
+M3'5;6;UPTH_K/,=_:RLDYNO^LIQM!JEK&%!=USW^,/PQS.=73=_(`<ND>9
+MV1\-3^RE>M;>QXU.A7.TUWJB)`<&KZ8T<&O#7!73=1:O.CH8O%NQ0C<YE
+M@HUVO-UCRN4/P9UW/`QVVS?E.#C7B8J5CEJ-4M=;_;M!.FZRKO>7^)'
+MUEN-U><P/95LFIYJGII*MNQMFQJ/9;OFCMG6FMZVLS*FH;I9QQ=OUEG#AY
+MPO$S5KOMVZ^,;!A0-:?S;L">HU&)4QIZH<^Z^V_Z?J?JI.UJY8?;32E
+MG^V0&G.LDQ:JD1\IK:%&/MG#^(DS&_TD&_K/H^`'NSK2H6DN^/=::C6>R
+ML=WQ9(MDMK?%8SN2+?%4<G"Q9O2F:RR!EG/8JZ*KET361Z;-6WF//??V7-4
+M;$WCNEAS(I/8F6S-)C*-ZY:GTBV)QGA3*B$3MR=;M&7B%6&UAQ8$9!/8MK-
+MK#POR4SU*\S^=.K3L_3^=N2=^JBBC_?C.#>O_K#7#6EZNC$+9GV^L<Z
+M@,^Z_T>$/R\N?J<//^Y//GKSW??KAR??UY*_J?"!H?<JJFTZ^R_QWG'R7
+M^1X\G6>_!-/OH\G/RYDOB@=N'^M9*K\>4.=*AUX>/6!&7M9D%Q!;M/@9'B
+MH"-+\J'`N)?66*?9YU*N4N5<W;_M?0?>?KOI-_IZ7=*/"TVO\D_8:EMQC
+M5.96&D?377O1DN=HY7^4^RK@X9JWY$BZ:<"TH*.L\*LW.?X\6P(=/I3+
+M(V3=AIE`YV0'X^\(;%>XE*EOCR0Q_Q>:NJ_1HMQJ2F8QG4EU;JNHZO5^II
+MPZ#SY?U/WRL_M>RDPE?*?41GY%BTUV;<"MK=S#>_8_-9/%8?*'-LBX05A
+M0\VSUUB(%G-28U\C&"F9.V7I854;M.VB%KPK5^X6#KPZ*IW_6_D\SAS=HQ3
+M=_+O-8V5O&YMNE5DEMM:;Z#)WG9^ANRN12J5#^*95+,R1IF+YNOOJG._
+MR^4-$K*;)8XNEPN6\96R2V2PA\::U_R0^KR'QOY-*M@VUAC5?YR=&REM
+MA<PQQSJYK&ZLE9LB+2>Y&9?B+"^IO-$+>.6M?2FZU73LP=#YXP8R<#*Q_
+M_;Y0*?.6M-W&>.\<Z.E6>O(+E)GKK5X.5```````````````````````
+M````````````````````````````````````````````````````````````
+M``````````````````````````````#PIQUK"7$B"*(ULY_$__\O$M2#"@F;
+M2^"&_^"/S0*(MI,,K.;T62R3"::50\>!/6@B'A8!$'0@X('3^)1;QX4/`I>
+M5-23@H(?5#36))79Z4EE=P_B:=2>>G75=7=-36F0D1(D2($"%"A`@1(D2(
+M$"%"C`I(U`'L4+=./%XXH<==9Y`_3-D/X?Z5W7/>=1/TH\EWB0QN<'QK_^
+MJ19KXRK4T$'ZG;8Z=S;FI_&QU+*/(YX-O$,D-'66%5J;%*_0KQ=/_V$;.(
+M>SID_6RO.Y'Q&,"\R\`V>Y7M;X_A:0_U-+\:K>>!V?J+^.QG0OQW^+YYW
+MC(YOXG4=#ND(L(C2E=BV:=.ZV)(#F;+EE&/)Y?'NKNE7=W)E?%DN:9U+T4U
+MT95(QAHCL25&I=^PS8)A.5I^:>QP02LYAAVST7OEVK5KXWW+>U<G,VNZ5ZY=
+M91R!4:`-%%BC<KH*:4'OPJKM\,@JW?`0U;OQ#KG`A>?TZ/PEY6'P-G67TL
+MUC&GCX.'K#X>GK/Z!.CIY/2)>`YP^B2XPNJ3X3:K3X%7K#5.U=D?1H,LOIT
+MN,GJ,_#^Y_29^*DR^BR8S.JS(0BE=F^KH($.A>8.AGO^OCT&.DS`4%Y;HXS
+M!;Y$&)W)\QQ^/5Y\QQ^?YE=^G3)7JX33V>N>YR?UXOSI$6<"X$X*T98_Y7`
+M^C=@4QD1?HC-I\SZ?P90IKL(;">8@47STH_CA,'9YP;1C!L7?RUU'ILO
+M8E-(Y^HA&F7B,'79-CZG`2#$3/Z0A?AGHZ*Y7P_Y"P/X9-H5T&7R<EZX
+MZL'^BT@F//D.D_KRK-^V+.MPF*F_UF+$,!LVXZ.K,N;$5<E,_M.H+X1F
+MG"'V0%JZ;/;(I3=M>I-MWIUO$.>_JS#JOM=C7+=2GJ,WWQ?T6^7GLVOO.
+MG_;&X86J:K/.2:^\U:0_JZ%_<<6>?Y!<1IUNX3T/2OH/U8E<_#8M7-
+M,_/_<7_6=I*)(BS600@M8PI'ZX/%%4#91#FKY?/BI*$=%V6JUFH(96<<FO
+M(@NZ81MIOL13@%D<T7+:.$<?2BZ,L7,UI>Z$1+@FMC`&+A?Z\X1AZHHNW
+M$+VF90K-MK4!@;^!`'HM;6"(?1RH3"`+KZ>0$M',LV=Q-4(L75?:M<6L67W
+M9B%`;#ZT.5KQR:4M^T^(+9LI'MF_>!V+9SS\;43K%GZ;6(BG=JX<PMZ
+MB+R9R8J2HF.*&BFU;-MYXZ-FT1W8OD*$#O2N\30?M.-KF36N9O(&.F5*)
+M_-PPV8KFD;+FZ<,+T9R-0A#UQP-:CLE)\/2:RN0#T"=OH*1<L73B\514ZS
+M=)Q)RQ1M1PJY8P:ZJ8ERB5#A_ZR4Y*&,3X(FL6W3'"WAP)N@)5VQ^NUJV
+M`1*E@8*C99`=N\ZYQC?30I^2%A%QTCT6>5$IFSF;BIDY3:N"/NUE5M+*>5
+M<I#0!RR,5V.,4A\Y8=@ELVA)'8%CMI'77$/ZUIWW"E-_'2,"GZZZ<2Q8BVY
+M"2-'I9+3:$>>G@U4_=H?,?`6L',XJQ%C%6/@7F"!%:L^V,<_@7F85-\I8:
+MU6,:EZ&`C$78(C_M"KSXJ;_.3)6!?PKJLRQ$?PW8_N&SVP-_T%5YOFD=WC/
+M03)VTS.MZCWWROR)$YL;3_V<0'25>YVB9KXZ0OZ/8JKUKVN7>7I@_6J`
+MCV/X_/?VRYSEV_"K/_4Y33AO_9=ID?^>=GG^._#=ZS_$R5WS^,QC_R2N
+M3N^A\RS1C^%QO^+9ZC^T'&9)!Q+>#?TRGS>@4D(",ZP'_,Q&9IX^P_IN!
+M^^*Q&/9OT7W@GXWX(O'Z$^1\$_%%9+7>GZO/B9B:Y/?2R'SM$`/\4V
+M:<B??L<CC+_A7=O>N'B.G^5:C^/3^Y#E3_GWOK8@;3/\_.E?U\F%9IG
+M^/Q(*W-6Y=*K'#VJ,KX3%H7>)#\-=9?9A6:42&+GNC0>\44<_^.\=8NXV&T
+MK,'74UKXOQE;M_P)P_O_!0$$!@`!"8HE``<+`0`"`P0!"`$*`0`,P>`2
+MP>`2``@*`935EX```4!&0(``!$3`&@`=P`M`&$`<@!M`#8`-````!D`%`H!
+3`#)5M-E?MD!%08!`""`_8$`````
+`
+end

_service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_read_format_7zip_lzma2_arm.7z.uu Added

@@ -0,0 +1,50 @@
+begin 664 test_read_format_7zip_lzma2_arm.7z
+M-WJ\KR<<``3J_$W1N`<```````!B`````````.JU,0K@'GL'L%T`/Y%%A&@
+MWMZF$<*4U"093^%DJ=J._J..`X9!2RX<PW^KV'J:BRKQ@`9?>NX6*J`\W5
+MV'E1<9A1&J5D`#J!0KIET\(=96D87RO?!\YQ>LH!0''871$*/B-@-70EJ0
+M`;\!OE9CF-^@!DI0LA7Z5P`#.!8`&65OAKG.CZ"F_H1?0DF"U1TA(*8<K$Y
+M"`*`&0@9W/J=9Q65I#T7A=LV)A'W8Q6T`8.HQ,<*'Y=%CCL4UL$N;V&GM
+MI7RJ;"A19(O_OR+.K#3$*$G*^<SN`@%$X^!18W$Y+"$FIZ9)G"S=N3P=MY
+M@23KT_,1!2PF)J^TCK3^5BSV3W)6C:UM*;1D!?PAH?98?NIW3O*ML<LU?8(
+ME0(M;`*!0>JEQ>/>U8FBB^E)QG>MQ_<EC_YO:6#IW1:YGQZ'#(?%-S&E3`
+M>LLWD%-YVI_%$>)09X;WO&$MP(</^*QI;<0E?AA^"+H/%V:Z`$HE('A,*@
+M,>#E"AI4U,3VSH@/S*#&EGP37GQ_#W*+P:2"&0(O=$S'+O'75NH+-'ZI&2
+M9W^I\?.Y`$T4YPCETIN9KTL\>"^-*+(,!RK2%12BUU!TRF!5:8B?<3K'
+M1/*E5"22231Q(@S6P/`GO*EAHOGEC)B5=%X;>B*\-D*4#KGX(2,,P4)Q\PQ<
+M?L=SG>R/AC>SH1S1_FUK7"#5\0&QR9`;@`YS*UH9Q@P^S977+E@_P<I6:%
+MV\9WL&_6E6J$T"1^-_8C1\,X@29SIR(EJ\O:44&+X/%<$?10J8IR(&%AF.
+M;`+F2G45L/XC-@7U;H=RHM974^T46;FT:G6,,,P"10P=GVT5+BV1)_YV=B
+M<\B/L"<*&$L@!/P<Q$WJ_V,L(LC941!U;DB()_;Y7DS-#'M(`!%3000`RRJ
+MSE1^5+W-KSJGZ#GT3O>`0KHZO?1>:74.RMGBSF\_BQFC89B)!U68-_72
+MY'BDKM\E;<Q49A+\Z/CYP1;`KR7+GW_08*13H%=,X1;R;/2^#=BVX4X8I'F
+M'T?*;I,B-"91D!&8&\#R_<GHH'7\J@OD=H?SM_W=?N*@SS-$3.!,MFC%0HQ
+M7->&4Z%FR?TOR2'H7X@Y6`M+Q@!*&M9W!0F#^@UO(8TKU#-8<-I\2$7
+M#?WC\89&95YI\\`DXII"-P@0IQJ:L4:O*=@V!W58(_#7%9L4BR8-<$P`4S#
+MJX#Y/>DIDB#/<S%?1)1#LCP@U968H3'-IR#YC8FQ-3C)Z?):2-`3K03?OEY/
+M3.<T(#E'C4&*,%M6LSQO7A`>.0DY67H@K60XS/*(46/U*%P?G\R_U#/(0%OF
+M6B#:U+X9)8*I`.^U(`PKV^7%B=?Z%GP^8CQV8V#'_1?L2KB>;6>!N.8LI>3_
+M%)-N+<;/(+J(QI_U+9C&*VDR9)8X/!5R+N8W6N84NN@'S<JQRE@GK>9P>KC
+MNXGR&MK!GN<HK%VC/V9OW_0(^T#&6OF+@T>V=Y(MV+YS=QEYQ-,':9VRQ^N
+M<?,"^Q>PC!ALZ:"J8\:9T.Y28?K^B>@@5(:IM>EFH%-#Z>BRBL(L)_J#F
+MT7U4C62SWU-_0&#JECK.K2F9Z/5_U\6"K2$'8K*N!+?`(T`:3BN$=LA)7?
+MS`:MK/59JR@1*#FE_'X+C68S<AFM@Y/G0;^@IM-;&D`?X#.F=B/S'>P*%RH
+MGV(2K8@W&^<"%O>`1-6ODEC`^X__^'#-E9'<`F-W+^-/#*=00^ER5/Z%<;
+M<5>252LEY6L`C9Q:-4^3!XGDCGO,-XD<B+!HVLXE7<&/+BVK#G.=ZEK#8:G
+M=;<?5UYQ576&(GV8"PV&-*Y3:*A.<H1X+J)J@)=KQBT&XAA<1A=JT61F=
+M-B&4P%7U1"6=5:\'WY8QN#Z,N.G(&2L:%K%<)ZY@*^CN!Z#Y<6+G>LT
+M.;'"/12=:`C.Z+3G1-&=R-!O#5,V.W'"C9:N4?==ODY8#*:V;QL.N$ZR'R30
+M>U5QC/A0M`TOK9EX6PZ03U<?.D&.%6Z($\PB;7M\A6V$P"YRO+\N`?8J;X
+MJ8\E=5>*3E;4527?8OP\+9NXTSDP.-ML`U\:36)XJXOZ,_M4ZD"D0T.7
+M3C*M=YOXBE!`I5-VO'3:YUR-42G):6"01XCG5%OH17JJJQM8A<<,3RS8CI-
+MT7FK7"\1P9GO?#3O07):>\L_RHRH?3Z#W42TX43Z=2HC/8M!<N0+!")FIB%
+MV?`J$WI4FYZW":A^MEWJ;@B_>H),JTZ-@/"U#%4-Q#G9EP-$Y^=$>X70D
+MCP*^+R.X5U;%+0P8JWW)`P#'VE%=I>G;TGBX!_**`)D9.JV9DAAYM`"#
+M0"E%F5%X?_%@,>,Y*W"%H.!H6KV`7H>4&=7BX&?6K$"V@"*\#2BVIL.FH9
+M_YP"D5UNL$1$U$GLQROKS__F*#'PH`%ZC5^,0\)'D&S:;?)8`W<F_<-'U5&
+M#<10!!3-G8TP#$/A-+X9)OJ@3KY$/#%F9C-OK6DXQG<.AE*)N?>EYT,8"?
+M1-Z'S1^IEL/*WJ-LQ\;?%QQ8/*JUY93:52Y,XHJNY<;Q.GRQ`&ZY5)H9'2<
+MVT<0P98-*4HW2:\I<\W>0HW2EB9D8LYS:````$$!@`!"8>X``<+`0`"(2$!
+M`@0#`P4!`0`,GGR>?``("@'AQ%XU```%`1D!`!$;`&@`=P`M`&<`;@!U`&4`
+D80!B`&D`:`!F````&0`4"@$```-.&5"<V0$5!@$`((#M@0``
+`
+end

_service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_read_format_7zip_lzma2_arm64.7z.uu Added

@@ -0,0 +1,54 @@
+begin 664 libarchive/test/test_read_format_7zip_lzma2_arm64.7z
+M-WJ\KR<<``0W'TW><P@```````!:`````````&'_J;A$M\(:UT`/Y%%A&@
+MB:;:BN&&(J+"URDYX#ZEJ=1:RLP;*R_8L2:_5F_1<^DV<8-2,=3&X?U.=W
+M*%Q!?DN>B^),$C`%""HM.8#>=`<R:?!<.$B$K6X!RY4*=X/2*.1;F86;KQ4
+MW?4E#8Q06ZC4C+\8JXT3(^1NKD"QCKT^=KB=;)Q=SIF6<^4QB+`Z)=$I>#!
+MHGG`);CBW,\(2H/P+,60V#BSUD@SPX?+7UE`-G%X8-3UI(38JH=H'>(C4
+M.BHYW!+WO_VP/@H5V?EN8ESQEC<5V/WV($3WNDOW%0OV?,5D(VX$W,9FX6
+M$@+,!DJ9MCLG?+981+>4RH&\+O6N:ZJ\UUAP1\;YX=FQG04%"*WE/:)&N
+M7/;*`CB"$1/1LN;6/@^--#D_P_@^=I7&LU`$C*&O)XY16O/YBAT\L2Q!M6
+MZ,^,_"DV_%G"4;`8E`Y>_4'B-G'SBG0\P#T504(#V)73,/E2#B3I7=S".'
+MT?4SU05SC_GJUAE*!NK%8\&=\',!%JIL5J>;6'OD_5JVE7>4<QH4'CLU
+M68W>\(DJBL8$^!T?<88&GF&D!J76?C\!TV:R8*BQ,2%*"NX6^-J!7;)H
+M,VL2_VSHEIU&_VR#)=O81/7B?&1://2C9_O-3*X(-,H(QI$N8$/CSMR0_PU
+MF+&-\:YPQ-V_/\D'K<+P1?:NF3DC@(W0X+$X,HG8*-0_+3@`07IT`9`RZO>
+M=4MI;EB=PHN\-U*#KN5B^JX'^8EFYG-3'H?CITKDVRN+'.(ABHXGW.51@<$J
+MTXZ-:0Y$8M))->TGEHM">WLYXA/P.=F-)"H)_M7B5FK,I=7R&:5F=A^H:\
+M<C&)=DJR6.-:6D+UO*R*E5(I1@<`XBX#_)(:\AWE018L%55"44+!<UF8XH"
+M2PE#->"U3HG2Y>^C\3P&?0,F/>+S1<<,$W5!DW#+5:DT!&H>R*HYAL;3=`9
+MG-6=ZO*O/-T<0GY;.-GK`F4@EZ(HL.JR%:.V(7VY:.`?"47U/P;N",R)G"
+M%MX4UG$88O@.`;_;(1W&"==@<5,SMBD.R7>ITI@G5OR14O5NB?*E!"2KU6:
+MH+P#/KA.)R4DLK9W^<7&2RL#EF40DU1*VS`"A%7D5^"M`OB.0W5*_<#5K7*
+MR'D05`R:?G3Q$`L;B5>KD\B"A%!FAV9FBA2=I^AWD%J7`WFL7T,T%?%VI^;
+M0`QABMO4"3N3&-",I^)1E`Z61GN*(E7I&+P'2/Z$W,Q4^P3@1\Z01D"VYZ!
+MZ*!@@/<"ZSHHN2'Z66_/Q1';U/W@:5/JY).$#*$JYEYOXW:DD&\7,"\NUZ
+M*R7JO?D$*$NX)#AFK5F&$ZS<ON8N\<8ZI>`,HKM4&XRP,+WL+W:X2X<LR1IP
+M\LUM.MA;?@6K(>98<OK=M=W'##O?9?+'HNT<L089:PE`(@A&JS#-N(RY8P
+MKZP-G:6Y`4UQ,J?7NH%+%K76C'_YN`??Y;ST/-;EE&8U$"PQHF8.T5B2$R
+M5.5<9Z4N".'9.@D;MD-`#=B0-M_ZA^6O86*0`E=6GYLN3\8N#(:R<C=</+
+M3&:'%QFF:O6K+D4SW.LUMRV_HRMS44P:^B0;9H#PEG+GZ*_SN&M,TE1OI9)U
+MXU(CEY;4^S-SL,HMTV4C5/0K0EH5>SA`L."U<Z?33_&H4WW2S)Q2Z=(Y^'A
+M5$+O_=WBN=!3^07QD02;IL3F"\;31TYAC?19=V0<G<-).;,0L/+4';2.AC
+M=S*,I40D-9QB=2R4D0DYM*`K3_L$,ZD;ZHOFY5Q7(//%(\Z_Z*LY^R)"Y;
+MFFXA8_UNAWRT-?#T#7J,V`(`CO11TS(FF;,M(-/EO'M$JI_'=(M9;V3XH4<
+M>XPSOZY<".O^LP->K,4?Z-"*L#ZP#"4,UW54G>W0KX/!21G-DW010NZ54"
+MT?"+_BDNGN7B2'-)K$-,Q;L3<*/`/+A_EM-CG,CZT>TOP.1(>#99CO&/97=
+MB##0N?U\)&U'1(0C<X.`=LAM&_A*8SB_ADF,WP?*URFV`;TZZ<Z+:\!Z
+M)?@S#7OGKQ%,FO\C.>FGJ2>AXP_3RLI*,:V)B$I-<88"C66?>!/I0-YKR,
+M,(`W)51UA>T26X/6.,4;@!NGC*;0VLT(3KS2Z>(RX'MC'$C+I1BBR!)!)C1*
+M!AZ7_:5Q_RI!L!3"6M0;8&NO0V2HYVA,"18X1IW+/I9?$B,06BS=Z#B<$J,U
+M-GI\,NTS)(%MEW#FI%Q,1ZU30VDFO38M=_@*<2-HT`H>8VF^;V6!0,8*T'5/
+MS(?V9HD%DO;K^EOY8MB'_7J6P=+7MGT:AAH>E977IC9\\<$?0X0CKH-,^Y5$
+MPG(L?(8VYY=8"QMC)#MW)JL9?(`E$Q-65D_!\FG\ANOX"3KECRR&I/I,-_L
+MY&!L^F*E(.H&^C3CL?KK2\S60UD3WE,,NZ1Y^*&S@5U6J#BIL,-/Q?VP9<
+M,5*R?(?<6J69T=K\E=)Y6T0$(RM!_S!38A6'S"CCI=F<`'?6/*5KS2L7ON'B
+M:!)QKWUW%-N6`)K7@<="%O@E$=W9+<WQ,5V8_P\\3RL5R0Z'"4CCM9>1;A,
+M+'*KT@O#)$%J/;W$T,J!'NA?2G7F<Q?P3A-U5<G`SRO,BZO\1RAX06C#4"C
+M^HL.TL"TRML`Y"K\@_@6#_-&WYX5L`/;WN+%=^=&DL="4<UHF*!/4.A?5W
+M77R*6A0X>7GK88KT1(K\Q52<<(!S6;SKP4H#K%(SYK0`B,Y-/&7\3CZ/'(
+M0@61%II0K.Q,&R`2$K'#I8'B(J0'\20($ONEJ2AXW;-'V3AP;9ME^L7JBW46
+M!+9%;M7.G(>CLF;A8*'@X"+832%9%WXO^K*>?/(*..3\@`!!`8``0F(<P`'
+M"P$``B$A`0D!"@$`#,'@$L'@$@`("@&4U9?>```%`1D"```1$P!H`'<`+0!A
+C`'(`;0`V`#0````9`!0*`0`R5;397?9`14&`0`@@/V!````
+`
+end

_service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_read_format_7zip_solid_zstd.7z.uu Added

_service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_read_format_7zip_zstd.7z.uu Added

_service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_read_format_7zip_zstd_arm.7z.uu Added

@@ -0,0 +1,61 @@
+begin 644 test_read_format_7zip_zstd_arm.7z
+M-WJ\KR<<``0IIN38A`D```````!R``````````1RSP4HM2_`$@!``!0*DT8
+M!````&\)```HM2_8'P=+4L`REV0%$E@''(._5GFW&YEVY?G/)^,\9+2"B
+M(\1H-(@DHJ*L)A?\C,G6FR3?/D.:6QDP<&`QFLOCXM`%J_(<>7+QU&E6E:N
+M9=5-A,@4*0%(`38!`-3GD<=6PPVGV</-O5)9%/+G)7MT/SVF2%"?YY9?YU
+MQOSKV/5+O_IT#_2EO=G'^=-?^YMW5Z!^I;:@BQ:G/U%1=T.&V5/O?8'$
+M1_>GC_)87GYQ_BZ,9+G<6(:EL+AFM/OESN+<?BJN+OQ,!I;>)245575._@
+M^RPCV7?'7IB-7R_..I.<?_RR2YGMM,\B7QASI_N3>8;"%/NJ_\?\/_!_P<:
+M^G3XSS-DOP`414SD%5U,'70<P:9LB=\F,5F\?(8L*B"#5:97+^5R9HG.9OS"
+MQ!96@'QA!=NI<^M__^U_7E!?>-F?MS1VK_/VO^C&^I_1SA*^_=)^^5T\.;Z
+M_W0/7Z?^E_7Q03P`7I>3\IRK_U^TYO^=_E7>+WWZ>^_CU12)<EV_^4?G
+MR'7O5_"I3K>LN?\MU#>?H_X-28WKB?Y#2_H5D#04WF9R/8>-46ZIY4H
+M_E-HI8CI(5G.6PHP"KW.$%T24@`CT?H"YM4.#W#_7_$LP0H8J@_5G9\>QI
+M=PPFO9L77'W,=3WH<A+Y(B62E*$&2G_PJ-_(0+A_PLGG.V81D:R`=M*5Z/!
+MU6XCX&IET$AFM3.2M$&+%6\)F%-88<=J)PG3OY#Y+^R_JOT#S?9Q,8X9"8UD
+M%7A&IQ6/@M*_T,._<,>_D`?:4S&I@D;2#5JL<FIIE`GCF)',Z*R@8Z5#0??_
+M2__"LC-U_=P*ZB,Q6_D:`Q1MAA,Z;/'$/CLP03\_P3_0AQN8^!J-RQP7<
+M!PJJV2-RUCCA\Y'\&X+V;;3#U^<(+Z_)L6SI/9W`&=.V!DZ<IY,X:A@7
+M5W:8&%3^/UQN.7_:C64XR9>=/U?I!=OW1=F+M/KEY>S4+:QQ<3#6#>,P
+MS":???N<_*T7VSG+Y+E_%NEE<%?4YB^.=!@="D_R`W:7)EGJC+VO<>:,/(
+M\K_V5!^"/W92(#84!'B?5"@#>*'Y&'/_Q;Q1/_;`_<+/84PFVWO2M)4
+M2L^_FUK-<=1DVMEU-2?3DI7H!^/\D=^=X'_6Q0?$0Q)M_T)1>VH1,7_
+M:W`1HJNG<KWO=Y334X+4S.>_IVY`DR(,_?O^G7K_06:5\H)=H)`=>"@'Z4
+M/Q^33T_=2CA&;)S@F?<`77FZ')IJEE:`V4.V`!0HUVT@RG1%MK`':0"J3LH
+M;^^*.CNZ+Q*?<OM?).NR_4_`--3:<%1*:U:6U:,&SVN(G,L#2$("5%E<NE
+M2M0Q,\_\'_H>D\+1^+8/_W\ID\V-J^^W(_,#XTKIH4:O2Q$CO2S"#\-CA
+M&,ZPD*+'A="2":C_L9T"_Q\,^!YD:/"1%93KNHT#)91V>Q/YSKVS/7:72SFY
+M/DTCU^_RU_K)=\G&8JW27=_9ODYWQ=HJKB_/Z_K=Z?9U_0XS87=>?^:Q_-*S
+M"V+N2S$Z%FO75*LDE@556Q?8@N_3>3:C+6M\OQ^LS9?&KG#N/I+M2S%Z
+M_9?"XGK^WITD\=OVVFN5=7&K)++=,MY&O/=K9U:1H)Q:>NHHI<G&L*P_&H
+MQ:^*45I75/REJK"*61R,_#DW9DWQ*:SBUI'S3ZYARO&+^?\Q9;+9LO=)3M
+MO=C<8Y>+L?/,\I=I;=WNPLREG'QGD^7T+/>6PRQ2AK\"@C2H$C.5*65$1$1$
+M)$F2-`9""D@*96%02N8^$J#D.`MT#".12:(@2<HJU-B:`WL`""01MII1KW
+M.:P7R=+&`+BTZ1F7\S?C@SBIQGZAQ/@?MO<?.^4Z.6E&^E"NC6XH>)#
+M4:BMMH#O(,3N\SNY98ID=!W0;%:X'+'JB96?7)D)*C(/`75J#"!K*H?_US
+MA4W\/A*S-7_2IAM/+/`B("R9CK@UI^F_L_F\S3TLEF4;-9K"D.FI-BN
+MV;3B7IH,H:X*!VQF'5DKMS(QWD"?M;I7HLYJC5@4O84-JXI4\ANPCC,Z6V!
+MH1<1&1VBD<;N__';,59N\AQ^&#"-.ERL<TH!+^^O:-90UN(2?41R,7YG
+MC=D)1;Z7Q%M-0-KZ?NVGSM/-)/9WE9=:\@3"'BI0G5?07Z*O=+2,O@T055
+M`'KHF?3P7&^LM$=DZ'I%RJ9,2",X=RL)#A?XC#7TWG0*WTBO_91+R"@77
+M5JX1_+=H.<UDB7IWVT+H8+N1^8>W77^#-%@(V?&%>E1@EGMLCHLB@IEGBO
+MR^7F7VZ4^<_*:H3M2!41<$&Q+=RB)TZU2K(ZASM'+S$FS<U`,,R=?`BY2`5
+M#*1PHK!T/N@X9_BI-U$V`IL%#F'N=A\HG/UR9PGA@4+>C)$0QJJE7#\<..?\
+M5<-K!(&!>!\SDU,3G@>GQG!HY@,:VA83.3UV:8,/#IFAAR>4SNQD@#X(ZP
+MSB1KCH5,N!*?N?=.*K&"L:.#>WPGFRQ?G!MXSQ%MC#G3I!&A'&2-D>2,A/-E
+MECT8^7<1UPS%/*;,`34&^-#OCIS.QE_GW3XH<S`Y<E>G\@9&@Y?L((/T`
+M)T;C<`:OL9XFC,(CGNQ:L7!)HW!FUD*LUE../1_FDQ56O"(#?<^P\D9Y8S
+M\B>"887TP=S,B&&5FXH0#40E'^VT-J)ZZC$8F8IXY#3.BBD/Y!W$_ZW_PF!
+MO@GGFKZK7B;%/:O*>@EBKE4E'Z,8L,CF729$*JA:H"9A4<-W536#+GLD*,
+MA1`PA/73?\?687^X/J)UG5TW%7:20ZKXICMVDJ)')G',2BOU+XJ+MC.)<
+M.2`Z'M=W?='`QE.OF=_/FV="Y,IN:M1/U6>W;\;-N"M*+K<S"VM!.5`7
+M8H9W)EDHMD#C..3VI`)!.?FH80X:%M%"!>&L1B*%65/ZC8$_36I;+/=_@$
+M3FB?WK+IOVATX0C;5Y*=>\S4F1(V)J!O?<A_6Y4"P(JCG3$BG<;7:X.L8-
+M.5R.-,-0NA&D)4Y:3E;M@@=Y>?36$$TKF(S2@FLJ\FLP*@EGBB:2%'/9-Z8
+M8Q,_6=Z>;B0PSV4-O0H-CLX!^O0EGI6A1BSB-+@-^M__W@_H7<<>.R8P"(#
+M;W9GXI=Q",^;'>9$=#CA-$DQL\_IE\_^00T'^Z\9A<H(3D5@4!!`8``0F)
+MA``'"P$``B0$Q$!!0$%`P``!`,#!0$!``R>?)Y\``@*`>'$7C4```4!&0H`
+M````````````$1L`:`!W`"T`9P!N`'4`90!A`&(`:0!H`&8````9`!0*`0``
+166S@9)S9`14&`0`@@.V!````
+`
+end

_service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_read_format_7zip_zstd_bcj.7z.uu Added

@@ -0,0 +1,56 @@
+begin 664 test_read_format_7zip_zstd_bcj.7z
+M-WJ\KR<<``0N5BP@P@@```````!B`````````(*-K$HM2_`$@!``!0*DT8
+M!````*T(```HM2_8%`'44`ZE%D$DIPW'$.RP,C5>);DM31:I?D,QMZ#'
+MXOKCOFX)J*\$44=%&TV"+)8#QPV28QFR0!V-3JH9UII:164M``!FT!`!L
+MXELXL8O4Q,!'@$2`5/J6F?&6/6'!>ZPF&:U6C8%?F9DH.#=>\Y71GN:,M
+M^ZA,>'Z0J2/,U:!!Y(?S^B3?P==^?YK&,Q.+\7;C(4KFQ#"L4<UNIU\L
+M=W9;_D1%Y$$H4B=H$@2DE$IZ8'OIOBA=GXO>*LEI'SCU\6R?O,=IH;BR_,
+M^=,F?4+_I'MWL=@)3B4LFJ`%84^*+!@ERRM(EKDF0@0*\*,A13MJ_;,
+M*JBF":I,JT3`(:"1UI!6,GAH1;N$0&++Q;5RDTUW:S#K<G2G>B?&TWFK
+MTO%\G%M-\G(:E8U$$&Q(;$WDZ;I?H%#_\%^!#:><:V>W_<Z_@?UX`MH
+MA4"P?^$_:O4:WO9UYB<ABX"31,=K>LQ-_Y?Q`(@"A`L^!SUHDBP&X#+X<)
+MS4GK>LP.H+9:E#78`VV'FC.!1K?U2*3:2NB93/.==UT^O\>==W,\/?
+M==V44-=-'0;;@?WP+*-()<@P!'GHCHU%G3KK6_QP>N.7:3':M;%ATH6"X
+M5K.NM0IE?OG9C8W8_ZH67)-_%.SL'Q6>_:M>@EZKKIMUJ5R"7&M5A.0'M;4
+M9V?&P.&\UIV>1F5MLE<;FI+U2(R2M=FUI@DE%2V)P>4ZMO6SVU+C=&8,(,YK
+MY>EH%F;<4AE<K@_C9Z=>F?GO3?%`"27)S_F;T@5U>S"M7+I6DE0Z2*&^9T(
+MJG_I9W?UWQ,25(-=_:/IEZ/P9_??RQ%4__=P%-5CYQ*N-=P)*8F#4Q-_J:5U
+M'?(JJ";.7XGXA`058FD):LB'3TA23)R_445Q&_\<LY?B40F6^XBV?GJE7./
+M7:YDYYGEKTMW>"64C9^%I)EM.SW%L.LT49QN)R:^3(SM^H7ETE.UGXV.Q
+MG;%EO.7U5^?C5.OJ*+Z*C1$-(A?J%;#=`G\MY'Q2V%>VHZ_YM'O9).+?@
+M&B#>O9PXX#A62$P9N#(I\W?">*#9\:C*Y`E1!GR=28((^C4"J>WK;__
+M:S)_$_HE*_R&?+\TV>-DL>I!>D%)J<F7!I?3K-.T7:\Y%>`P3US430XU<+-S
+M),83X)<`RFY;.%N87*>=0>!SX'OZ_PMXW8W.*B=`J28#S1D*U77O4Y3UMK+_
+MO\$$BLC/9N@+Y/YWVHO3MW+GVQ&Q`R,C:,)F_R=SFIU!UC7+1_G_FTY:
+M8Y)D#"R,A(5%88*A3Y0-$W3'+='>?"2_FWPSMRM12UGXO>_YX^R,O;,`86%
+MR76-YO\_I%?Q!O0\0A\!KO'+A(I&6GZ:+ZQA?)QLIV;H'5WUY5M7O6FY7
+MW^C2,I:J?H>S6-B=U9Y++_T)Z8.U))Q\I6_2/-'H>(24CM.3";*H+.;
+M)<9:C+&4MTNQ^IGS6Z/W^/<:?6+;$<J:?5?Z8F*IHN<?QN_%N73O+X;3O-
+M.1#;F#URF6XYVEG.NZ7,B'3DE(5)QJ.,7$Q"&"4*C2@C%")2(21)(DQ1RR
+M"R"09#G(&+EY$D!S+-A5AA&"G!$1$1DI*"HJ*%3:#M)%Q65GGN/P$%8VV5B2
+MNFSWV5TIA<46D6>L+^>0INN&\C!Q)+"<SH9C<?:``);9<186MJP)B*VK4:
+M<%,XO+^L0FV@^)9)8+0SPK`8^)+1'?^U#DQOUSWD`NSPKPO6=TYI:*BDT
+M()-&:!P3=L1H1J,'B6H"\'D5T"'7H=*%&BAAN!S@'8HS*8<T"D8=K-Y-B
+M>(-?'D)(%2ZL3O\"#?E1$+0VXIS="D"#8T@4)AH;OS0QK*@.S(L,50<_CA
+MSLQF9'9?XSB;;-U94YD.FO*997K@$8#<$+3;FE`!=:DQF+2IM`^P_V)X+H8
+M>CA6D83\V2'4'&8019V9GJ;4N^GH!DY/G+;OB1_1;1C*PB'S(P%1P=2
+MVZWP^0AVC4J*P$8O6>4N-N<4YQ@52=LB99,=Q-92\YTM6_:!O(CLS*.3.4#
+M"=G'<EW8WT4PE,R`*.$U^=K#".R@`QA*1)G-)@U:>`&WN&'Q@PN!^%WP*@
+M>Q#R';%'W>W,J`@NVM/IYT(1Z9WOL0DR.YFB5_M%B-Q;^"AA"&\S5O?^2G
+M5:<U6.,RP%;%Y"R;NE!;^QBLHNWDHTPY!X'$RQ3:HQ#!%;Y"&8XYZ)DEAN
+MOEQW1C&Y+8?>0NG64G+ZWR@D&V)Q@^LXPO*B9G9F,9'#!BQ>,6;6FU$N?3
+M`.Q/U+S_$GPHT*;\)<@Y@CF:$OL@/;(&MBC.2FU)1H%"W*G?%/.,%R
+M%H<>8MCK*V1.J%.C=7'N/;E*:U^2SX@)@'SYZ\;36III>#+-E0=MARSYX'R
+M\WH,G%TT4TXJ7V:1?#Q/HER'4TFC.'Y%Y0D*MH2(6\B5YU*21O#?4OS=K,#>
+MM?@F6*^:37;#*>NV\;VYS9R567I^EN(RXY3MF\:?IS1%VRW7Z:^VI<W^EW
+M+C1I4NN.\7L'K_%;28(A;"6.*=#.\.NM%)`@9'*7@+F3AK)9_8.LC%A)"A
+M'*)/SZS!C8<S>'LY=_ZBTR<)4IT7IYY1OK&'@.&E"VR@9%YH&S'Q,#9CF
+MG8&_K//(.AY#/&&R\L5Y9G9*M">BYP#J+4'9&3=D:QBW=45`IG&!W"1D^=K7
+M3-\)$&`N%0_$JV$!\!TG-`=:",BG5.9A)"?V=NSXPVO21_O-QG<+$FCO"K<
+M+7,ER$BPT:CS!0`Z0BV^S#)QZ3PK0-/_L#+OU^QUO<'=-9BN6Y:-5!LY:B;N
+MZREX8;-G,XTOK;@Y$4Z)9!"MHPI^1M7KK1KL45B0C''SO8H,4XUG<1RU\
+MG/6=<8^3'MPL\V\;ITR,#$MU@ES7%`00&``$)B,(`!PL!``(D!/<1`04!
+M!0,```0#`P$#`0`,OE"^4``("@&\F:```%`1D*`````````````!$'`&@`
+@=P```!D$`````!0*`0``'';'*9?9`14&`0`@@/V!````
+`
+end

_service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_read_format_7zip_zstd_nobcj.7z.uu Added

@@ -0,0 +1,56 @@
+begin 664 test_read_format_7zip_zstd_nobcj.7z
+M-WJ\KR<<``0`N.\QQ0@```````!2`````````#TEXKPHM2_`$@!``!0*DT8
+M!````+`(```HM2_8%`-44`*E)P$DIPW'$.R^E<Z*8D%G.UILPF5,4RT_G_
+M</>\_^S,>DG"("L:I:;)%D,!ZX;).8S1>H@$I8=UII:164M``!FT!`!L
+MLB.<6?N3%!4!'@$2`4JZ6"FQIDPV'_>%=P7BWI8M4HT)&YD9)#@VO>T')(
+M6DXDLR#Z0.9.,$=CQA`?#OR3?`=?^_-\VY;GI%8>_\;%UNJ5YYCX1,5_?(:
+MQGKIUU/5,3112,U@GKA"U4(CHU_>?%'#<RO#5;K>,>\,M\C-Z9;7VUB$
+MXV_YLFL7_#_NHV0'(*.^4G(L:@#4EO&CP8+:T<F298S)$H,!&$F+$<W+5
+MGED%U31AG>NUZ$?T.HBVDK*<$SDQKRB7Q&.>2PKE>9<?M;AD4J3U3/Y6=3
+MMU\ZHM\NIW-LK*:50T$<(QH,NHJGJZP*7_X'P$MIWMT9K9?SK^"!/O@"
+M_NB#O#_X'J1K>N=98W(:M@B-TWPM'<Q-OY?Q((@"A`L_"`%ZH50+=A
+MI\.4ZJBB$1#=+#7H7@^8,0VR#ISIUOE2*,XCO8\Q^G^GWIM._\^CV:&
+M_P?KO2FAV8.!MN!\V-ZUE(ES''\'LF<C/6>=H;6Q(OUF!6+-I!?+9H57
+M^J6+/?-BJWKO6EZ`=&0CSO\U"XY)U%ZWH/VO78!?;`X_\UJW`+O8J@C)
+M!W)IZ2AGPL#AOE@>GC:%97*R-C1)6*0P2=BF%YLVI&2T)`*7+!D7D$Y+Q^%,
+M&#_<%O#T5B@<4LE<,G^"R#=>E7FGS?5\P2X9)WXF+XA55232Q>Q8LE,<6+
+M",9W0JC_$I#NZI\71*B'7?7>MW@Y!H%T_SP<0OV?=\.HDZ$!3DE*')R:DLM
+ML>QP5T$U?U"XE,25(BE):CA'CXE23'M_<95Z\AA&=YOQ*)3+K1;;TU2MI
+M+K;V=)TN^'>ZK\C;.0L_&WDNVNZ9F.VZ+<XRU9>XD7R_<;VZ2O*:T\;'
+M:OF&B^W>/Z\^3ANG/H?*221';<;0#A$LY6J0/G'W/REN:NQ3V_D_=0+=VK`
+MSE_IY#/.3QQONRJ$"`S8.35YO,`Z?$,CY5\5_@SV#Z/T^DP$S#/OT:`=4&
+MK<___N8OPWYDA5\1#V?FN1RLECU0+T@%#;UTN!TFEU-._L:5`$.$\5%W>12
+M`S<\2&,`7X)P.S&A;.)S3W-#(*?`^_#_U_`YSD6.4$"&LQ4IWA4/CE/4V
+ML_^WL4,3V*R.SK-!^KV=Z4Y:._,H2QOS/:CK*P-DZG_S'H&0J$9;$\E/^_
+M:BU)4C.`5961:*BQ-)@L$>:JJJ*X_;ICIW2?XT=FKNQJ.5,_/DPZL/,K$5S
+M06)B<^G_O^#"@9&O`4=CG<'+Y12)GX_IU75S?""-;6>G2O'XKC_3Z_I\
+MZ^7K&ZQEK7YW%6&_T^O269BFWQ,T1RIK6>FN?ZS;(Q%1*<F%B=P83A:5
+MG'ZS9CIK3<I8Z\MG>?TL^N4R?*1YO7ZQY4AEO?X+GZCJNKCWN_*WWWKY)9A
+ME>;`&5V^.>:W>WO/V6M^Z@WOHI)1$M:F&4TQ,'':"4:CB>C%")2(21)(D
+MQ1RR"R@01$'(&+EY$D!C+-E5AA&"G!$1$1DI*"HJ*%3:#M)%"5G$G\<Y$4%Q
+M64R2EN_3WVWTII>"8%:>G^>!M\V$XK!3)(B?F)-CZ=K`("^=H&,T+K/R8B
+M'>&V!;.RZK*AXHW/(1&>W$L(TS6UB*(17-)#`^=N<-Y!+LP+,;VWOM.:V
+MG"H>@K<%',>.&QD-=+)!XH+%'R\&".3\%"A*"Q49ZEZ/-`S&!3<L:E#@&
+MA%BW.,7W(7@3D./J)N.CU_NNC!D.LDMIAB9%OI,)=,R+KH$/::@'Y".+K4/-
+MPX\'-IN1$_^:U*/SA,)7LPX2OTM=(!J2UI0@W=TO;)K?W&TB(--7\FB`$B
+M/3++09C?7H+'0_"B9J`3NBFF*?K=)/Y!WTGB_/.61>$CTBVC3RZNOP";Z'2
+MH2O_5Y`ZL)EB)470T:OT<M?/"<8&A@JN:9`2T@YA:U_ST9;WZ<.\=.SLUP;
+ML8&*_`<R7?A?15#RY@&4<!_XM,,(/*`#*!KU7TG<TL`ZI(!;?C0_\(IP/PFC
+M!<#J03`8B^LVZE1$;HKZ>>2R/20R(Y,@NY,>;K5;&0GE`P\E#.%WG4O
+M&5+K/5T3')<)O"I,1MVZ"^(&Q5B">>RVD\W$PP\;7(AE#%.%E-HDY"IIT
+MR<O-V7.57,P-O3L,9\JA,UNZ%.66!(=^O.-+T>+8L$1_("Y?)9Q7F&M
+MK64ED6D`V29*P=.*;'(U%I_))$V/)_?,$=;YBZAX0W2M@PFKU%9S3_T.T:#<
+MW/V$HY:ZT^6Q"C":"ARLJ?J@S!>.02=/K6Z%TS_J/3*YY=UH8DNK;;"^H=ZX
+M?#9L*(R;X<0VT7;:2U;!;IBO(DRB<X/9CD"OJ3U#0)4380JXDEUJQ+?^6
+MQ9E9?:N1#;!:O6*S!L066>.\UAYLS,UO/S@RN?PVG?_*AAX1GE0+O-\:J
+M7,:5^ASH4F3NG>,TSNX9AQPQ>"V$LT4"&0<RS`D"!CDHM@?6T'K,GKA2
+MY<)&R'8.49C.U.`&G#,$H)XD&G#PQ2G85TGYUQNR,`\*"5<`/_S/,L?XD)
+M9XJM2X7?#Q?'+\4C_E,6(W,Q\BV@OO(69_>W=&EFLO#1^W/A*04USP-0!9
+MOO8Q\"!,VAXT'A8CF`N?FP)O*.V0A/YEIF(B0G^KN-F5KPD;:JTX$J21
+MW@+<%;CB-NJY,<;P!8#&A:9S.V+U9\ADL)_&*EW<Y@TX1U%2S7:L_"MRW9
+MRNK#WA2O/$HMMGEX90/<HA4YI%XXGOT7\\6#K&XC%K/Q-/QT<4.*><O
+ML2P=S_X<N'7,5CS>O.NY4@\-FS$OP8EX>6=`00&``$)B,4`!PL!``$D!/<1
+M`04!!0,```R^4``("@&\F:```%`1D#````$0<`:`!W````&00`````%`H!
+3```<=L<IED!%08!`""`_8$`````
+`
+end

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/test/test_read_format_rar5.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_read_format_rar5.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/test/test_read_format_zip.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_read_format_zip.c Changed

@@ -746,6 +746,7 @@
 	if (ARCHIVE_OK != archive_read_support_filter_zstd(a)) {
 		skipping("zstd is not fully supported on this platform");
 		archive_read_close(a);
+		archive_read_free(a);
 		return;
 	}
 	extract_reference_file(refname);
@@ -771,6 +772,7 @@
 	if (ARCHIVE_OK != archive_read_support_filter_zstd(a)) {
 		skipping("zstd is not fully supported on this platform");
 		archive_read_close(a);
+		archive_read_free(a);
 		return;
 	}
 	extract_reference_file(refname);
@@ -796,6 +798,7 @@
 	if (ARCHIVE_OK != archive_read_support_filter_zstd(a)) {
 		skipping("zstd is not fully supported on this platform");
 		archive_read_close(a);
+		archive_read_free(a);
 		return;
 	}
 	extract_reference_file(refname);
@@ -833,6 +836,7 @@
 	if (ARCHIVE_OK != archive_read_support_filter_zstd(a)) {
 		skipping("zstd is not fully supported on this platform");
 		archive_read_close(a);
+		archive_read_free(a);
 		return;
 	}
 	extract_reference_file(refname);
@@ -1017,6 +1021,7 @@
 	if(ARCHIVE_OK != archive_read_support_filter_lzma(a)) {
 		skipping("lzma reading is not fully supported on this platform");
 		archive_read_close(a);
+		archive_read_free(a);
 		return;
 	}

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/test/test_short_writes.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_short_writes.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/test/test_write_filter_zstd.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_write_filter_zstd.c Changed

@@ -133,6 +133,33 @@
 	 archive_write_set_filter_option(a, NULL, "threads", "-1")); /* negative */
 	assertEqualIntA(a, ARCHIVE_OK,
 	 archive_write_set_filter_option(a, NULL, "threads", "4"));
+#if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
+	/* frame-per-file: boolean */
+	assertEqualIntA(a, ARCHIVE_OK,
+	 archive_write_set_filter_option(a, NULL, "frame-per-file", ""));
+	/* min-frame-size: >= 0 */
+	assertEqualIntA(a, ARCHIVE_FAILED,
+	 archive_write_set_filter_option(a, NULL, "min-frame-size", ""));
+	assertEqualIntA(a, ARCHIVE_FAILED,
+	 archive_write_set_filter_option(a, NULL, "min-frame-size", "-1"));
+	assertEqualIntA(a, ARCHIVE_OK,
+	 archive_write_set_filter_option(a, NULL, "min-frame-size", "0"));
+	assertEqualIntA(a, ARCHIVE_OK,
+	 archive_write_set_filter_option(a, NULL, "min-frame-size", "1048576"));
+	/* max-frame-size: >= 1024 */
+	assertEqualIntA(a, ARCHIVE_FAILED,
+	 archive_write_set_filter_option(a, NULL, "max-frame-size", ""));
+	assertEqualIntA(a, ARCHIVE_FAILED,
+	 archive_write_set_filter_option(a, NULL, "max-frame-size", "-1"));
+	assertEqualIntA(a, ARCHIVE_FAILED,
+	 archive_write_set_filter_option(a, NULL, "max-frame-size", "0"));
+	assertEqualIntA(a, ARCHIVE_FAILED,
+	 archive_write_set_filter_option(a, NULL, "max-frame-size", "1023"));
+	assertEqualIntA(a, ARCHIVE_OK,
+	 archive_write_set_filter_option(a, NULL, "max-frame-size", "1024"));
+	assertEqualIntA(a, ARCHIVE_OK,
+	 archive_write_set_filter_option(a, NULL, "max-frame-size", "1048576"));
+#endif
 	assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2));
 	for (i = 0; i < 100; i++) {
 		snprintf(path, sizeof(path), "file%03d", i);

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/test/test_write_format_zip_compression_store.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_write_format_zip_compression_store.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/test/test_write_format_zip_file.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_write_format_zip_file.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/test/test_write_format_zip_file_zip64.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/test/test_write_format_zip_file_zip64.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive/xxhash.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive/xxhash.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/libarchive_fe/passphrase.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/libarchive_fe/passphrase.c Changed

@@ -171,8 +171,10 @@
 	int input, output, save_errno, i, need_restart;
 	char ch, *p, *end;
 	struct termios term, oterm;
+#ifdef HAVE_SIGACTION
 	struct sigaction sa, savealrm, saveint, savehup, savequit, saveterm;
 	struct sigaction savetstp, savettin, savettou, savepipe;
+#endif
 
 	/* I suppose we could alloc on demand in this case (XXX). */
 	if (bufsiz == 0) {
@@ -221,6 +223,7 @@
 		oterm.c_lflag |= ECHO;
 	}
 
+#ifdef HAVE_SIGACTION
 	/*
 	 * Catch signals that would otherwise cause the user to end
 	 * up with echo turned off in the shell.  Don't worry about
@@ -239,6 +242,7 @@
 	(void)sigaction(SIGTSTP, &sa, &savetstp);
 	(void)sigaction(SIGTTIN, &sa, &savettin);
 	(void)sigaction(SIGTTOU, &sa, &savettou);
+#endif
 
 	if (!(flags & RPP_STDIN)) {
 		int r = write(output, prompt, strlen(prompt));
@@ -276,6 +280,7 @@
 			continue;
 		signoSIGTTOU = sigttou;
 	}
+#ifdef HAVE_SIGACTION
 	(void)sigaction(SIGALRM, &savealrm, NULL);
 	(void)sigaction(SIGHUP, &savehup, NULL);
 	(void)sigaction(SIGINT, &saveint, NULL);
@@ -285,6 +290,7 @@
 	(void)sigaction(SIGTSTP, &savetstp, NULL);
 	(void)sigaction(SIGTTIN, &savettin, NULL);
 	(void)sigaction(SIGTTOU, &savettou, NULL);
+#endif
 	if (input != STDIN_FILENO)
 		(void)close(input);

_service:tar_scm:libarchive-3.6.2.tar.gz/tar/bsdtar.1 -> _service:tar_scm:libarchive-3.7.1.tar.gz/tar/bsdtar.1 Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/tar/test/list.h -> _service:tar_scm:libarchive-3.7.1.tar.gz/tar/test/list.h Changed

@@ -2,38 +2,33 @@
 DEFINE_TEST(test_basic)
 DEFINE_TEST(test_copy)
 DEFINE_TEST(test_empty_mtree)
-DEFINE_TEST(test_extract_tar_Z)
 DEFINE_TEST(test_extract_tar_bz2)
 DEFINE_TEST(test_extract_tar_grz)
 DEFINE_TEST(test_extract_tar_gz)
 DEFINE_TEST(test_extract_tar_lrz)
-DEFINE_TEST(test_extract_tar_lz)
 DEFINE_TEST(test_extract_tar_lz4)
+DEFINE_TEST(test_extract_tar_lz)
 DEFINE_TEST(test_extract_tar_lzma)
 DEFINE_TEST(test_extract_tar_lzo)
 DEFINE_TEST(test_extract_tar_xz)
+DEFINE_TEST(test_extract_tar_Z)
 DEFINE_TEST(test_extract_tar_zstd)
 DEFINE_TEST(test_format_newc)
 DEFINE_TEST(test_help)
 DEFINE_TEST(test_leading_slash)
 DEFINE_TEST(test_missing_file)
-DEFINE_TEST(test_option_C_mtree)
-DEFINE_TEST(test_option_C_upper)
-DEFINE_TEST(test_option_H_upper)
-DEFINE_TEST(test_option_L_upper)
-DEFINE_TEST(test_option_O_upper)
-DEFINE_TEST(test_option_T_upper)
-DEFINE_TEST(test_option_U_upper)
-DEFINE_TEST(test_option_X_upper)
 DEFINE_TEST(test_option_a)
 DEFINE_TEST(test_option_acls)
-DEFINE_TEST(test_option_b)
 DEFINE_TEST(test_option_b64encode)
+DEFINE_TEST(test_option_b)
+DEFINE_TEST(test_option_C_mtree)
+DEFINE_TEST(test_option_C_upper)
 DEFINE_TEST(test_option_exclude)
 DEFINE_TEST(test_option_exclude_vcs)
 DEFINE_TEST(test_option_fflags)
 DEFINE_TEST(test_option_gid_gname)
 DEFINE_TEST(test_option_grzip)
+DEFINE_TEST(test_option_H_upper)
 DEFINE_TEST(test_option_ignore_zeros_mode_t)
 DEFINE_TEST(test_option_ignore_zeros_mode_x)
 DEFINE_TEST(test_option_ignore_zeros_mode_c)
@@ -43,6 +38,7 @@
 DEFINE_TEST(test_option_k)
 DEFINE_TEST(test_option_keep_newer_files)
 DEFINE_TEST(test_option_lrzip)
+DEFINE_TEST(test_option_L_upper)
 DEFINE_TEST(test_option_lz4)
 DEFINE_TEST(test_option_lzma)
 DEFINE_TEST(test_option_lzop)
@@ -50,14 +46,18 @@
 DEFINE_TEST(test_option_newer_than)
 DEFINE_TEST(test_option_nodump)
 DEFINE_TEST(test_option_older_than)
+DEFINE_TEST(test_option_O_upper)
 DEFINE_TEST(test_option_passphrase)
 DEFINE_TEST(test_option_q)
 DEFINE_TEST(test_option_r)
-DEFINE_TEST(test_option_s)
 DEFINE_TEST(test_option_safe_writes)
+DEFINE_TEST(test_option_s)
+DEFINE_TEST(test_option_T_upper)
 DEFINE_TEST(test_option_uid_uname)
 DEFINE_TEST(test_option_uuencode)
+DEFINE_TEST(test_option_U_upper)
 DEFINE_TEST(test_option_xattrs)
+DEFINE_TEST(test_option_X_upper)
 DEFINE_TEST(test_option_xz)
 DEFINE_TEST(test_option_z)
 DEFINE_TEST(test_option_zstd)

_service:tar_scm:libarchive-3.6.2.tar.gz/tar/test/test_option_lzma.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/tar/test/test_option_lzma.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/tar/util.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/tar/util.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/tar/write.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/tar/write.c Changed

_service:tar_scm:libarchive-3.6.2.tar.gz/test_utils/test_main.c -> _service:tar_scm:libarchive-3.7.1.tar.gz/test_utils/test_main.c Changed

@@ -327,7 +327,7 @@
 	int r;
 
 	memset(bhfi, 0, sizeof(*bhfi));
-	h = CreateFile(path, FILE_READ_ATTRIBUTES, 0, NULL,
+	h = CreateFileA(path, FILE_READ_ATTRIBUTES, 0, NULL,
 		OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
 	if (h == INVALID_HANDLE_VALUE)
 		return (0);
@@ -1432,7 +1432,7 @@
 	/* Note: FILE_FLAG_BACKUP_SEMANTICS applies to open
 	 * a directory file. If not, CreateFile() will fail when
 	 * the pathname is a directory. */
-	h = CreateFile(pathname, FILE_READ_ATTRIBUTES, 0, NULL,
+	h = CreateFileA(pathname, FILE_READ_ATTRIBUTES, 0, NULL,
 	    OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
 	if (h == INVALID_HANDLE_VALUE) {
 		failure_start(file, line, "Can't access %s\n", pathname);
@@ -2345,7 +2345,7 @@
 		q += 3;
 		s -= 3;
 	}
-	
+
 	/* Skip a single trailing a,b,c, or d. */
 	if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd')
 		++q;
@@ -2391,7 +2391,7 @@
 
 	/* Version message should start with name of program, then space. */
 	assert(s > prog_len + 1);
-	
+
 	failure("Version must start with '%s': ``%s''", base, p);
 	if (!assertEqualMem(q, base, prog_len)) {
 		free(p);
@@ -2729,7 +2729,7 @@
 /* Get extended attribute value from a path */
 void *
 getXattr(const char *path, const char *name, size_t *sizep)
-{ 
+{
 	void *value = NULL;
 #if ARCHIVE_XATTR_SUPPORT
 	ssize_t size;
@@ -3863,18 +3863,14 @@
 	int test_setsizeof(tests) / sizeof(tests0);
 	int i = 0, j = 0, tests_run = 0, tests_failed = 0, option;
 	int testprogdir_len;
-#ifdef PROGRAM	
+#ifdef PROGRAM
 	int tmp2_len;
 #endif
 	time_t now;
 	struct tm *tmptr;
-#if defined(HAVE_LOCALTIME_R) || defined(HAVE__LOCALTIME64_S)
+#if defined(HAVE_LOCALTIME_R) || defined(HAVE_LOCALTIME_S)
 	struct tm tmbuf;
 #endif
-#if defined(HAVE__LOCALTIME64_S)
-	errno_t	terr;
-	__time64_t tmptime;
-#endif
 	char *refdir_alloc = NULL;
 	const char *progname;
 	char **saved_argv;
@@ -4109,15 +4105,10 @@
 	 */
 	now = time(NULL);
 	for (i = 0; ; i++) {
-#if defined(HAVE_LOCALTIME_R)
+#if defined(HAVE_LOCALTIME_S)
+		tmptr = localtime_s(&tmbuf, &now) ? NULL : &tmbuf;
+#elif defined(HAVE_LOCALTIME_R)
 		tmptr = localtime_r(&now, &tmbuf);
-#elif defined(HAVE__LOCALTIME64_S)
-		tmptime = now;
-		terr = _localtime64_s(&tmbuf, &tmptime);
-		if (terr)
-			tmptr = NULL;
-		else
-			tmptr = &tmbuf;
 #else
 		tmptr = localtime(&now);
 #endif

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip Added

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/CMakeLists.txt Added

@@ -0,0 +1,39 @@
+############################################
+#
+# How to build bsdunzip
+#
+############################################
+IF(ENABLE_UNZIP)
+
+  SET(bsdunzip_SOURCES
+    bsdunzip.c
+    bsdunzip_platform.h
+    la_getline.c
+    la_queue.h
+    ../libarchive_fe/err.c
+    ../libarchive_fe/err.h
+    ../libarchive_fe/lafe_platform.h
+    ../libarchive_fe/passphrase.c
+    ../libarchive_fe/passphrase.h
+  )
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libarchive_fe)
+
+  # bsdunzip documentation
+  SET(bsdunzip_MANS bsdunzip.1)
+
+  # How to build bsdunzip
+  ADD_EXECUTABLE(bsdunzip ${bsdunzip_SOURCES})
+  IF(ENABLE_UNZIP_SHARED)
+    TARGET_LINK_LIBRARIES(bsdunzip archive ${ADDITIONAL_LIBS})
+  ELSE(ENABLE_UNZIP_SHARED)
+    TARGET_LINK_LIBRARIES(bsdunzip archive_static ${ADDITIONAL_LIBS})
+    SET_TARGET_PROPERTIES(bsdunzip PROPERTIES COMPILE_DEFINITIONS
+                                 LIBARCHIVE_STATIC)
+  ENDIF(ENABLE_UNZIP_SHARED)
+
+  # Installation rules
+  INSTALL(TARGETS bsdunzip RUNTIME DESTINATION bin)
+  INSTALL_MAN(${bsdunzip_MANS})
+ENDIF(ENABLE_UNZIP)
+
+add_subdirectory(test)

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/bsdunzip.1 Added

@@ -0,0 +1,220 @@
+.\"-
+.\" Copyright (c) 2007-2008 Dag-Erling Smørgrav
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd June 27, 2023
+.Dt BSDUNZIP 1
+.Os
+.Sh NAME
+.Nm bsdunzip
+.Nd extract files from a ZIP archive
+.Sh SYNOPSIS
+.Nm
+.Op Fl aCcfjLlnopqtuvy
+.Op { Fl O | Fl I No } Ar encoding
+.Op Fl d Ar dir
+.Op Fl x Ar pattern
+.Op Fl P Ar password
+.Ar zipfile
+.Op Ar member ...
+.Sh DESCRIPTION
+.\" ...
+The following options are available:
+.Bl -tag -width Fl
+.It Fl a
+When extracting a text file, convert DOS-style line endings to
+Unix-style line endings.
+.It Fl C
+Match file names case-insensitively.
+.It Fl c
+Extract to stdout/screen.
+When extracting files from the zipfile, they are written to stdout.
+This is similar to
+.Fl p ,
+but does not suppress normal output.
+.It Fl d Ar dir
+Extract files into the specified directory rather than the current
+directory.
+.It Fl f
+Update existing.
+Extract only files from the zipfile if a file with the same name
+already exists on disk and is older than the former.
+Otherwise, the file is silently skipped.
+.It Fl I Ar encoding
+.It Fl O Ar encoding
+Convert filenames from the specified encoding.
+.It Fl j
+Ignore directories stored in the zipfile; instead, extract all files
+directly into the extraction directory.
+.It Fl L
+Convert the names of the extracted files and directories to lowercase.
+.It Fl l
+List, rather than extract, the contents of the zipfile.
+.It Fl n
+No overwrite.
+When extracting a file from the zipfile, if a file with the same name
+already exists on disk, the file is silently skipped.
+.It Fl o
+Overwrite.
+When extracting a file from the zipfile, if a file with the same name
+already exists on disk, the existing file is replaced with the file
+from the zipfile.
+.It Fl p
+Extract to stdout.
+When extracting files from the zipfile, they are written to stdout.
+The normal output is suppressed as if
+.Fl q
+was specified.
+.It Fl P Ar password
+Extract encrypted files using a password.
+Putting a password on the command line using this option can be
+insecure.
+.It Fl q
+Quiet: print less information while extracting.
+.It Fl t
+Test: do not extract anything, but verify the checksum of every file
+in the archive.
+.It Fl u
+Update.
+When extracting a file from the zipfile, if a file with the same name
+already exists on disk, the existing file is replaced with the file
+from the zipfile if and only if the latter is newer than the former.
+Otherwise, the file is silently skipped.
+.It Fl v
+List verbosely, rather than extract, the contents of the zipfile.
+This differs from
+.Fl l
+by using the long listing.
+Note that most of the data is currently fake and does not reflect the
+content of the archive.
+.It Fl x Ar pattern
+Exclude files matching the pattern
+.Ar pattern .
+.It Fl y
+Print four digit years in listings instead of two.
+.It Fl Z Ar mode
+Emulate
+.Xr zipinfo 1L
+mode.
+Enabling
+.Xr zipinfo 1L
+mode changes the way in which additional arguments are parsed.
+Currently only
+.Xr zipinfo 1L
+mode 1 is supported, which lists the file names one per line.
+.It Ar member ...
+Optional list of members to extract from the zipfile.
+Can include patterns, e.g.,
+.Ar 'memberdir/*'
+will extract all files and dirs below memberdir.
+.El
+.Pp
+Note that only one of
+.Fl n ,
+.Fl o ,
+and
+.Fl u
+may be specified.
+If specified filename is
+.Qq - ,
+then data is read from
+.Va stdin .
+.Sh ENVIRONMENT
+If the
+.Ev UNZIP_DEBUG
+environment variable is defined, the
+.Fl q
+command-line option has no effect, and additional debugging
+information will be printed to
+.Va stderr .
+.Sh COMPATIBILITY
+The
+.Nm
+utility aims to be sufficiently compatible with other implementations
+to serve as a drop-in replacement in the context of the
+.Xr ports 7
+system.
+No attempt has been made to replicate functionality which is not
+required for that purpose.
+.Pp
+For compatibility reasons, command-line options will be recognized if
+they are listed not only before but also after the name of the
+zipfile.
+.Pp
+Normally, the
+.Fl a
+option should only affect files which are marked as text files in the
+zipfile's central directory.
+Since the
+.Xr archive 3
+library does not provide access to that information, it is not available
+to the
+.Nm
+utility.
+Instead, the
+.Nm
+utility will assume that a file is a text file if no non-ASCII
+characters are present within the first block of data decompressed for
+that file.
+If non-ASCII characters appear in subsequent blocks of data, a warning
+will be issued.
+.Pp
+The
+.Nm
+utility is only able to process ZIP archives handled by
+.Xr libarchive 3 .
+Depending on the installed version of
+.Xr libarchive 3 ,
+this may or may not include self-extracting or ZIPX archives.
+.Sh SEE ALSO
+.Xr libarchive 3
+.Sh HISTORY
+The
+.Nm
+utility appeared in
+.Fx 8.0 .
+.Sh AUTHORS

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/bsdunzip.c Added

@@ -0,0 +1,1234 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2009, 2010 Joerg Sonnenberger <joerg@NetBSD.org>
+ * Copyright (c) 2007-2008 Dag-Erling Smørgrav
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer
+ * in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ * This file would be much shorter if we didn't care about command-line
+ * compatibility with Info-ZIP's UnZip, which requires us to duplicate
+ * parts of libarchive in order to gain more detailed control of its
+ * behaviour for the purpose of implementing the -n, -o, -L and -a
+ * options.
+ */
+
+#include "bsdunzip_platform.h"
+
+#ifdef HAVE_SYS_QUEUE_H
+#include <sys/queue.h>
+#else
+#include "la_queue.h"
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_FNMATCH_H
+#include <fnmatch.h>
+#endif
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if ((!defined(HAVE_UTIMENSAT) && defined(HAVE_LUTIMES)) || \
+ (!defined(HAVE_FUTIMENS) && defined(HAVE_FUTIMES)))
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#endif
+
+#include <archive.h>
+#include <archive_entry.h>
+#include "passphrase.h"
+#include "err.h"
+
+/* command-line options */
+static int		 a_opt;		/* convert EOL */
+static int		 C_opt;		/* match case-insensitively */
+static int		 c_opt;		/* extract to stdout */
+static const char	*d_arg;		/* directory */
+static int		 f_opt;		/* update existing files only */
+static char		*O_arg;		/* encoding */
+static int		 j_opt;		/* junk directories */
+static int		 L_opt;		/* lowercase names */
+static int		 n_opt;		/* never overwrite */
+static int		 o_opt;		/* always overwrite */
+static int		 p_opt;		/* extract to stdout, quiet */
+static char		*P_arg;		/* passphrase */
+static int		 q_opt;		/* quiet */
+static int		 t_opt;		/* test */
+static int		 u_opt;		/* update */
+static int		 v_opt;		/* verbose/list */
+static const char	*y_str = "";	/* 4 digit year */
+static int		 Z1_opt;	/* zipinfo mode list files only */
+
+/* debug flag */
+static int		 unzip_debug;
+
+/* zipinfo mode */
+static int		 zipinfo_mode;
+
+/* running on tty? */
+static int		 tty;
+
+/* convenience macro */
+/* XXX should differentiate between ARCHIVE_{WARN,FAIL,RETRY} */
+#define ac(call)						\
+	do {							\
+		int acret = (call);				\
+		if (acret != ARCHIVE_OK)			\
+			errorx("%s", archive_error_string(a));	\
+	} while (0)
+
+/*
+ * Indicates that last info() did not end with EOL. This helps error() et
+ * al. avoid printing an error message on the same line as an incomplete
+ * informational message.
+ */
+static int noeol;
+
+/* for an interactive passphrase input */
+static char *passphrase_buf;
+
+/* fatal error message + errno */
+static void
+error(const char *fmt, ...)
+{
+	va_list ap;
+
+	if (noeol)
+		fprintf(stdout, "\n");
+	fflush(stdout);
+	fprintf(stderr, "unzip: ");
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	fprintf(stderr, ": %s\n", strerror(errno));
+	exit(EXIT_FAILURE);
+}
+
+/* fatal error message, no errno */
+static void
+errorx(const char *fmt, ...)
+{
+	va_list ap;
+
+	if (noeol)
+		fprintf(stdout, "\n");
+	fflush(stdout);
+	fprintf(stderr, "unzip: ");
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+	exit(EXIT_FAILURE);
+}
+
+/* non-fatal error message + errno */
+static void
+warning(const char *fmt, ...)
+{
+	va_list ap;
+
+	if (noeol)
+		fprintf(stdout, "\n");
+	fflush(stdout);
+	fprintf(stderr, "unzip: ");
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	fprintf(stderr, ": %s\n", strerror(errno));
+}
+
+/* non-fatal error message, no errno */
+static void
+warningx(const char *fmt, ...)
+{
+	va_list ap;
+
+	if (noeol)
+		fprintf(stdout, "\n");
+	fflush(stdout);
+	fprintf(stderr, "unzip: ");
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
+	fprintf(stderr, "\n");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/bsdunzip_platform.h Added

@@ -0,0 +1,75 @@
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD: src/usr.bin/tar/bsdtar_platform.h,v 1.26 2008/12/06 07:37:14 kientzle Exp $
+ */
+
+/*
+ * This header is the first thing included in any of the bsdtar
+ * source files. As far as possible, platform-specific issues should
+ * be dealt with here and not within individual source files.
+ */
+
+#ifndef BSDUNZIP_PLATFORM_H_INCLUDED
+#define	BSDUNZIP_PLATFORM_H_INCLUDED
+
+#if defined(PLATFORM_CONFIG_H)
+/* Use hand-built config.h in environments that need it. */
+#include PLATFORM_CONFIG_H
+#else
+/* Not having a config.h of some sort is a serious problem. */
+#include "config.h"
+#endif
+
+/* Get a real definition for __FBSDID if we can */
+#if HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
+
+/* If not, define it so as to avoid dangling semicolons. */
+#ifndef __FBSDID
+#define	__FBSDID(a) struct _undefined_hack
+#endif
+
+#ifdef HAVE_LIBARCHIVE
+/* If we're using the platform libarchive, include system headers. */
+#include <archive.h>
+#include <archive_entry.h>
+#else
+/* Otherwise, include user headers. */
+#include "archive.h"
+#include "archive_entry.h"
+#endif
+
+/* How to mark functions that don't return. */
+/* This facilitates use of some newer static code analysis tools. */
+#undef __LA_DEAD
+#if defined(__GNUC__) && (__GNUC__ > 2 || \
+			 (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
+#define	__LA_DEAD	__attribute__((__noreturn__))
+#else
+#define	__LA_DEAD
+#endif
+
+#endif /* !BSDUNZIP_PLATFORM_H_INCLUDED */

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/la_getline.c Added

@@ -0,0 +1,99 @@
+/*	$NetBSD: getline.c,v 1.2 2014/09/16 17:23:50 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "bsdunzip_platform.h"
+#ifndef HAVE_GETLINE
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+static ssize_t
+la_getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
+{
+	char *ptr, *eptr;
+
+
+	if (*buf == NULL || *bufsiz == 0) {
+		*bufsiz = BUFSIZ;
+		if ((*buf = malloc(*bufsiz)) == NULL)
+			return -1;
+	}
+
+	for (ptr = *buf, eptr = *buf + *bufsiz;;) {
+		int c = fgetc(fp);
+		if (c == -1) {
+			if (feof(fp)) {
+				ssize_t diff = (ssize_t)(ptr - *buf);
+				if (diff != 0) {
+					*ptr = '\0';
+					return diff;
+				}
+			}
+			return -1;
+		}
+		*ptr++ = c;
+		if (c == delimiter) {
+			*ptr = '\0';
+			return ptr - *buf;
+		}
+		if (ptr + 2 >= eptr) {
+			char *nbuf;
+			size_t nbufsiz = *bufsiz * 2;
+			ssize_t d = ptr - *buf;
+			if ((nbuf = realloc(*buf, nbufsiz)) == NULL)
+				return -1;
+			*buf = nbuf;
+			*bufsiz = nbufsiz;
+			eptr = nbuf + nbufsiz;
+			ptr = nbuf + d;
+		}
+	}
+}
+
+ssize_t
+getline(char **buf, size_t *bufsiz, FILE *fp)
+{
+	return la_getdelim(buf, bufsiz, '\n', fp);
+}
+#endif

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/la_queue.h Added

@@ -0,0 +1,840 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ */
+
+#ifndef _SYS_QUEUE_H_
+#define	_SYS_QUEUE_H_
+
+/*
+ * This file defines four types of data structures: singly-linked lists,
+ * singly-linked tail queues, lists and tail queues.
+ *
+ * A singly-linked list is headed by a single forward pointer. The elements
+ * are singly linked for minimum space and pointer manipulation overhead at
+ * the expense of O(n) removal for arbitrary elements. New elements can be
+ * added to the list after an existing element or at the head of the list.
+ * Elements being removed from the head of the list should use the explicit
+ * macro for this purpose for optimum efficiency. A singly-linked list may
+ * only be traversed in the forward direction.  Singly-linked lists are ideal
+ * for applications with large datasets and few or no removals or for
+ * implementing a LIFO queue.
+ *
+ * A singly-linked tail queue is headed by a pair of pointers, one to the
+ * head of the list and the other to the tail of the list. The elements are
+ * singly linked for minimum space and pointer manipulation overhead at the
+ * expense of O(n) removal for arbitrary elements. New elements can be added
+ * to the list after an existing element, at the head of the list, or at the
+ * end of the list. Elements being removed from the head of the tail queue
+ * should use the explicit macro for this purpose for optimum efficiency.
+ * A singly-linked tail queue may only be traversed in the forward direction.
+ * Singly-linked tail queues are ideal for applications with large datasets
+ * and few or no removals or for implementing a FIFO queue.
+ *
+ * A list is headed by a single forward pointer (or an array of forward
+ * pointers for a hash table header). The elements are doubly linked
+ * so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before
+ * or after an existing element or at the head of the list. A list
+ * may be traversed in either direction.
+ *
+ * A tail queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or
+ * after an existing element, at the head of the list, or at the end of
+ * the list. A tail queue may be traversed in either direction.
+ *
+ * For details on the use of these macros, see the queue(3) manual page.
+ *
+ * Below is a summary of implemented functions where:
+ *  +  means the macro is available
+ *  -  means the macro is not available
+ *  s  means the macro is available but is slow (runs in O(n) time)
+ *
+ *				SLIST	LIST	STAILQ	TAILQ
+ * _HEAD			+	+	+	+
+ * _CLASS_HEAD			+	+	+	+
+ * _HEAD_INITIALIZER		+	+	+	+
+ * _ENTRY			+	+	+	+
+ * _CLASS_ENTRY			+	+	+	+
+ * _INIT			+	+	+	+
+ * _EMPTY			+	+	+	+
+ * _FIRST			+	+	+	+
+ * _NEXT			+	+	+	+
+ * _PREV			-	+	-	+
+ * _LAST			-	-	+	+
+ * _LAST_FAST			-	-	-	+
+ * _FOREACH			+	+	+	+
+ * _FOREACH_FROM		+	+	+	+
+ * _FOREACH_SAFE		+	+	+	+
+ * _FOREACH_FROM_SAFE		+	+	+	+
+ * _FOREACH_REVERSE		-	-	-	+
+ * _FOREACH_REVERSE_FROM	-	-	-	+
+ * _FOREACH_REVERSE_SAFE	-	-	-	+
+ * _FOREACH_REVERSE_FROM_SAFE	-	-	-	+
+ * _INSERT_HEAD			+	+	+	+
+ * _INSERT_BEFORE		-	+	-	+
+ * _INSERT_AFTER		+	+	+	+
+ * _INSERT_TAIL			-	-	+	+
+ * _CONCAT			s	s	+	+
+ * _REMOVE_AFTER		+	-	+	-
+ * _REMOVE_HEAD			+	-	+	-
+ * _REMOVE			s	+	s	+
+ * _SWAP			+	+	+	+
+ */
+#ifdef QUEUE_MACRO_DEBUG
+#warn Use QUEUE_MACRO_DEBUG_TRACE and/or QUEUE_MACRO_DEBUG_TRASH
+#define	QUEUE_MACRO_DEBUG_TRACE
+#define	QUEUE_MACRO_DEBUG_TRASH
+#endif
+
+#ifdef QUEUE_MACRO_DEBUG_TRACE
+/* Store the last 2 places the queue element or head was altered */
+struct qm_trace {
+	unsigned long	 lastline;
+	unsigned long	 prevline;
+	const char	*lastfile;
+	const char	*prevfile;
+};
+
+#define	TRACEBUF	struct qm_trace trace;
+#define	TRACEBUF_INITIALIZER	{ __LINE__, 0, __FILE__, NULL } ,
+
+#define	QMD_TRACE_HEAD(head) do {					\
+	(head)->trace.prevline = (head)->trace.lastline;		\
+	(head)->trace.prevfile = (head)->trace.lastfile;		\
+	(head)->trace.lastline = __LINE__;				\
+	(head)->trace.lastfile = __FILE__;				\
+} while (0)
+
+#define	QMD_TRACE_ELEM(elem) do {					\
+	(elem)->trace.prevline = (elem)->trace.lastline;		\
+	(elem)->trace.prevfile = (elem)->trace.lastfile;		\
+	(elem)->trace.lastline = __LINE__;				\
+	(elem)->trace.lastfile = __FILE__;				\
+} while (0)
+
+#else	/* !QUEUE_MACRO_DEBUG_TRACE */
+#define	QMD_TRACE_ELEM(elem)
+#define	QMD_TRACE_HEAD(head)
+#define	TRACEBUF
+#define	TRACEBUF_INITIALIZER
+#endif	/* QUEUE_MACRO_DEBUG_TRACE */
+
+#ifdef QUEUE_MACRO_DEBUG_TRASH
+#define	QMD_SAVELINK(name, link)	void **name = (void *)&(link)
+#define	TRASHIT(x)		do {(x) = (void *)-1;} while (0)
+#define	QMD_IS_TRASHED(x)	((x) == (void *)(intptr_t)-1)
+#else	/* !QUEUE_MACRO_DEBUG_TRASH */
+#define	QMD_SAVELINK(name, link)
+#define	TRASHIT(x)
+#define	QMD_IS_TRASHED(x)	0
+#endif	/* QUEUE_MACRO_DEBUG_TRASH */
+
+#ifdef __cplusplus
+/*
+ * In C++ there can be structure lists and class lists:
+ */
+#define	QUEUE_TYPEOF(type) type
+#else
+#define	QUEUE_TYPEOF(type) struct type
+#endif
+
+/*
+ * Singly-linked List declarations.
+ */
+#define	SLIST_HEAD(name, type)						\
+struct name {								\
+	struct type *slh_first;	/* first element */			\
+}
+
+#define	SLIST_CLASS_HEAD(name, type)					\
+struct name {								\
+	class type *slh_first;	/* first element */			\
+}
+
+#define	SLIST_HEAD_INITIALIZER(head)					\
+	{ NULL }
+
+#define	SLIST_ENTRY(type)						\
+struct {								\
+	struct type *sle_next;	/* next element */			\
+}
+
+#define	SLIST_CLASS_ENTRY(type)						\
+struct {								\
+	class type *sle_next;		/* next element */		\
+}
+
+/*
+ * Singly-linked List functions.
+ */
+#if (defined(_KERNEL) && defined(INVARIANTS))
+#define	QMD_SLIST_CHECK_PREVPTR(prevp, elm) do {			\
+	if (*(prevp) != (elm))						\
+		panic("Bad prevptr *(%p) == %p != %p",			\
+		    (prevp), *(prevp), (elm));				\
+} while (0)
+#else
+#define	QMD_SLIST_CHECK_PREVPTR(prevp, elm)
+#endif
+
+#define SLIST_CONCAT(head1, head2, type, field) do {			\
+	QUEUE_TYPEOF(type) *curelm = SLIST_FIRST(head1);		\
+	if (curelm == NULL) {						\
+		if ((SLIST_FIRST(head1) = SLIST_FIRST(head2)) != NULL)	\
+			SLIST_INIT(head2);				\
+	} else if (SLIST_FIRST(head2) != NULL) {			\
+		while (SLIST_NEXT(curelm, field) != NULL)		\
+			curelm = SLIST_NEXT(curelm, field);		\
+		SLIST_NEXT(curelm, field) = SLIST_FIRST(head2);		\
+		SLIST_INIT(head2);					\
+	}								\
+} while (0)
+
+#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
+
+#define	SLIST_FIRST(head)	((head)->slh_first)

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test Added

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/CMakeLists.txt Added

@@ -0,0 +1,80 @@
+############################################
+#
+# How to build bsdunzip_test
+#
+############################################
+IF(ENABLE_UNZIP AND ENABLE_TEST)
+ SET(bsdunzip_test_SOURCES
+ ../../libarchive_fe/err.c
+ ../../test_utils/test_utils.c
+ ../../test_utils/test_main.c
+ test.h
+ test_0.c
+ test_basic.c
+ test_glob.c
+ test_singlefile.c
+ test_C.c
+ test_p.c
+ test_d.c
+ test_j.c
+ test_L.c
+ test_n.c
+ test_o.c
+ test_q.c
+ test_t.c
+ test_t_bad.c
+ test_x.c
+ test_Z1.c
+ test_P_encryption.c
+ )
+
+ #
+ # Register target
+ #
+ ADD_EXECUTABLE(bsdunzip_test ${bsdunzip_test_SOURCES})
+ IF(ENABLE_ACL)
+ SET(TEST_ACL_LIBS "")
+ IF(HAVE_LIBACL)
+ LIST(APPEND TEST_ACL_LIBS ${ACL_LIBRARY})
+ ENDIF(HAVE_LIBACL)
+ IF(HAVE_LIBRICHACL)
+ LIST(APPEND TEST_ACL_LIBS ${RICHACL_LIBRARY})
+ ENDIF(HAVE_LIBRICHACL)
+ TARGET_LINK_LIBRARIES(bsdunzip_test ${TEST_ACL_LIBS})
+ ENDIF(ENABLE_ACL)
+ SET_PROPERTY(TARGET bsdunzip_test PROPERTY COMPILE_DEFINITIONS LIST_H)
+
+ #
+ # Generate list.h by grepping DEFINE_TEST() lines out of the C sources.
+ #
+ GENERATE_LIST_H(${CMAKE_CURRENT_BINARY_DIR}/list.h
+ ${CMAKE_CURRENT_LIST_FILE} ${bsdunzip_test_SOURCES})
+ SET_PROPERTY(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES
+ ${CMAKE_CURRENT_BINARY_DIR})
+
+ # list.h has a line DEFINE_TEST(testname) for every
+ # test. We can use that to define the tests for cmake by
+ # defining a DEFINE_TEST macro and reading list.h in.
+ MACRO (DEFINE_TEST _testname)
+ ADD_TEST(
+ NAME bsdunzip_${_testname}
+ COMMAND bsdunzip_test -vv
+ -p $<TARGET_FILE:bsdunzip>
+ -r ${CMAKE_CURRENT_SOURCE_DIR}
+ ${_testname})
+ ENDMACRO (DEFINE_TEST _testname)
+
+ INCLUDE(${CMAKE_CURRENT_BINARY_DIR}/list.h)
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/test_utils)
+ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/unzip/test)
+
+ # Experimental new test handling
+ ADD_CUSTOM_TARGET(run_bsdunzip_test
+	COMMAND	bsdunzip_test -p $<TARGET_FILE:bsdunzip>
+			 -r ${CMAKE_CURRENT_SOURCE_DIR}
+			 -vv)
+ ADD_DEPENDENCIES(run_bsdunzip_test bsdunzip)
+ ADD_DEPENDENCIES(run_all_tests run_bsdunzip_test)
+ENDIF(ENABLE_UNZIP AND ENABLE_TEST)
+

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/list.h Added

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test.h Added

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2003-2017 Tim Kientzle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/* Every test program should #include "test.h" as the first thing. */
+
+#define KNOWNREF	"test_basic.zip.uu"
+#define ENVBASE "BSDUNZIP" /* Prefix for environment variables. */
+#define	PROGRAM "bsdunzip" /* Name of program being tested. */
+#define PROGRAM_ALIAS "unzip" /* Generic alias for program */
+#undef	LIBRARY		  /* Not testing a library. */
+#undef	EXTRA_DUMP	  /* How to dump extra data */
+#undef	EXTRA_ERRNO	  /* How to dump errno */
+/* How to generate extra version info. */
+#define	EXTRA_VERSION     (systemf("%s -v", testprog) ? "" : "")
+
+#include "test_common.h"

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_0.c Added

@@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/*
+ * This first test does basic sanity checks on the environment.  For
+ * most of these, we just exit on failure.
+ */
+#if !defined(_WIN32) || defined(__CYGWIN__)
+#define DEV_NULL "/dev/null"
+#else
+#define DEV_NULL "NUL"
+#endif
+
+DEFINE_TEST(test_0)
+{
+	struct stat st;
+
+	failure("File %s does not exist?!", testprog);
+	if (!assertEqualInt(0, stat(testprogfile, &st))) {
+		fprintf(stderr,
+		    "\nFile %s does not exist; aborting test.\n\n",
+		    testprog);
+		exit(1);
+	}
+
+	failure("%s is not executable?!", testprog);
+	if (!assert((st.st_mode & 0111) != 0)) {
+		fprintf(stderr,
+		    "\nFile %s not executable; aborting test.\n\n",
+		    testprog);
+		exit(1);
+	}
+
+	/* TODO: Ensure that our reference files are available. */
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_C.c Added

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test C arg - match case-insensitive */
+DEFINE_TEST(test_C)
+{
+	const char *reffile = "test_basic.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s -C %s test_basic/caps >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertNonEmptyFile("test.out");
+	assertEmptyFile("test.err");
+
+	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_L.c Added

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test L arg - make names lowercase */
+DEFINE_TEST(test_L)
+{
+	const char *reffile = "test_basic.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s -L %s >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertNonEmptyFile("test.out");
+	assertEmptyFile("test.err");
+
+	assertTextFileContents("contents a\n", "test_basic/a");
+	assertTextFileContents("contents b\n", "test_basic/b");
+	assertTextFileContents("contents c\n", "test_basic/c");
+	assertTextFileContents("contents CAPS\n", "test_basic/caps");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_P_encryption.c Added

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test P arg - password protected */
+DEFINE_TEST(test_P)
+{
+	const char *reffile = "test_encrypted.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s -P password %s >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertNonEmptyFile("test.out");
+	assertEmptyFile("test.err");
+
+	assertTextFileContents("plaintext\n", "encrypted/file.txt");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_Z1.c Added

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test -Z1 arg - List filenames */
+DEFINE_TEST(test_Z1)
+{
+	const char *reffile = "test_basic.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s -Z1 %s >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertNonEmptyFile("test.out");
+	assertTextFileContents("test_basic/\ntest_basic/a\ntest_basic/b\ntest_basic/c\ntest_basic/CAPS\n", "test.out");
+	assertEmptyFile("test.err");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_basic.c Added

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* This test just does a basic zip decompression */
+DEFINE_TEST(test_basic)
+{
+	const char *reffile = "test_basic.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s %s >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertNonEmptyFile("test.out");
+	assertEmptyFile("test.err");
+
+	assertTextFileContents("contents a\n", "test_basic/a");
+	assertTextFileContents("contents b\n", "test_basic/b");
+	assertTextFileContents("contents c\n", "test_basic/c");
+	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_basic.zip.uu Added

@@ -0,0 +1,25 @@
+begin 644 test_basic.zip
+M4$L#!!0``````,J0MU8````````````````+`"``=&5S=%B87-I8R55`T`
+M!PX;63U.6UDW#AM9'5X"P`!!.@#```$Z`,``%!+`P04``@`"``)C;=6````
+M```````+````#``@`'1E<W1?8F%S:6,O8554#0`'PS)M9/HY;603.&UD=7@+
+M``$$Z`,```3H`P``2\/*TG-*RE62.0"`%!+!PAY:C`$#0````L```!02P,$
+M%``(``@`#HVW5@``````````"P````P`(`!T97-T7V)A<VEC+V)55`T`!\TR
+M;63Z.6UD.SAM9'5X"P`!!.@#```$Z`,``$O.SRM)S2LI5DCB`@!02P<(NCD=
+M+PT````+````4$L#!!0`"``(`%*-MU8```````````L````,`"``=&5S=%B
+M87-I8RC550-``=,,VUDTSAM9,\X;61U>`L``03H`P``!.@#``!+SL\K2<TK
+M*59(Y@(`4$L'"/L(!C8-````"P```%!+`P04``@`"`#*D+=6```````````.
+M````#P`@`'1E<W1?8F%S:6,O0T%04U54#0`'W#AM9/HY;63<.&UD=7@+``$$
+MZ`,```3H`P``2\/*TG-*RE6<'8,".8"`%!+!P@I4T'W$`````X```!02P$"
+M%`,4``````#*D+=6````````````````"P`@````````````4$`````=&5S
+M=%B87-I8R55`T`!PX;63U.6UDW#AM9'5X"P`!!.@#```$Z`,``%!+`0(4
+M`Q0`"``(``F-MU9Y:C`$#0````L````,`"````````````"D@4D```!T97-T
+M7V)A<VEC+V%55`T`!\,R;63Z.6UD$SAM9'5X"P`!!.@#```$Z`,``%!+`0(4
+M`Q0`"``(``Z-MU:Z.1TO#0````L````,`"````````````"D@;````!T97-T
+M7V)A<VEC+V)55`T`!\TR;63Z.6UD.SAM9'5X"P`!!.@#```$Z`,``%!+`0(4
+M`Q0`"``(`%*-MU;"`8V#0````L````,`"````````````"D@1<!``!T97-T
+M7V)A<VEC+V-55`T`!TPS;633.&UDSSAM9'5X"P`!!.@#```$Z`,``%!+`0(4
+M`Q0`"``(`,J0MU8I4T'W$`````X````/`"````````````"D@7X!``!T97-T
+M7V)A<VEC+T-!4%-55`T`!PX;63Z.6UDW#AM9'5X"P`!!.@#```$Z`,``%!+
+4!08`````!0`%`,0!``#K`0``````
+`
+end

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_d.c Added

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test d arg - extract to target dir */
+DEFINE_TEST(test_d)
+{
+	const char *reffile = "test_basic.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s -d foobar %s >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertNonEmptyFile("test.out");
+	assertEmptyFile("test.err");
+
+	assertTextFileContents("contents a\n", "foobar/test_basic/a");
+	assertTextFileContents("contents b\n", "foobar/test_basic/b");
+	assertTextFileContents("contents c\n", "foobar/test_basic/c");
+	assertTextFileContents("contents CAPS\n", "foobar/test_basic/CAPS");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_encrypted.zip.uu Added

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_glob.c Added

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test that the glob works */
+DEFINE_TEST(test_glob)
+{
+	const char *reffile = "test_basic.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s %s test_*/ab >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertNonEmptyFile("test.out");
+	assertEmptyFile("test.err");
+
+	assertTextFileContents("contents a\n", "test_basic/a");
+	assertTextFileContents("contents b\n", "test_basic/b");
+	assertFileNotExists("test_basic/c");
+	assertFileNotExists("test_basic/CAPS");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_j.c Added

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test j arg - don't make directories */
+DEFINE_TEST(test_j)
+{
+	const char *reffile = "test_basic.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s -j %s >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertNonEmptyFile("test.out");
+	assertEmptyFile("test.err");
+
+	assertTextFileContents("contents a\n", "a");
+	assertTextFileContents("contents b\n", "b");
+	assertTextFileContents("contents c\n", "c");
+	assertTextFileContents("contents CAPS\n", "CAPS");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_n.c Added

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test n arg - don't overrite existing files */
+DEFINE_TEST(test_n)
+{
+	const char *reffile = "test_basic.zip";
+	int r;
+
+	assertMakeDir("test_basic", 0755);
+	assertMakeFile("test_basic/a", 0644, "orig a\n");
+	assertMakeFile("test_basic/b", 0644, "orig b\n");
+
+	extract_reference_file(reffile);
+	r = systemf("%s -n %s >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertNonEmptyFile("test.out");
+	assertEmptyFile("test.err");
+
+	assertTextFileContents("orig a\n", "test_basic/a");
+	assertTextFileContents("orig b\n", "test_basic/b");
+	assertTextFileContents("contents c\n", "test_basic/c");
+	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_not_exist.c Added

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test non existant file */
+DEFINE_TEST(test_not_exist)
+{
+	int r;
+	r = systemf("%s nonexist.zip >test.out 2>test.err", testprog);
+	assert(r != 0);
+	assertEmptyFile("test.out");
+	assertNonEmptyFile("test.err");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_o.c Added

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test o arg - overrite existing files */
+DEFINE_TEST(test_o)
+{
+	const char *reffile = "test_basic.zip";
+	int r;
+
+	assertMakeDir("test_basic", 0755);
+	assertMakeFile("test_basic/a", 0644, "orig a\n");
+	assertMakeFile("test_basic/b", 0644, "orig b\n");
+
+	extract_reference_file(reffile);
+	r = systemf("%s -o %s >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertEmptyFile("test.err");
+
+	assertTextFileContents("contents a\n", "test_basic/a");
+	assertTextFileContents("contents b\n", "test_basic/b");
+	assertTextFileContents("contents c\n", "test_basic/c");
+	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_p.c Added

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test p arg - Print to stdout */
+DEFINE_TEST(test_p)
+{
+	const char *reffile = "test_basic.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s -p %s >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertTextFileContents("contents a\ncontents b\ncontents c\ncontents CAPS\n", "test.out");
+	assertEmptyFile("test.err");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_q.c Added

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test q arg - Quiet */
+DEFINE_TEST(test_q)
+{
+	const char *reffile = "test_basic.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s -q %s >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertEmptyFile("test.out");
+	assertEmptyFile("test.err");
+
+	assertTextFileContents("contents a\n", "test_basic/a");
+	assertTextFileContents("contents b\n", "test_basic/b");
+	assertTextFileContents("contents c\n", "test_basic/c");
+	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_singlefile.c Added

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Ensure single-file zips work */
+DEFINE_TEST(test_singlefile)
+{
+	const char *reffile = "test_singlefile.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s %s >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertNonEmptyFile("test.out");
+	assertEmptyFile("test.err");
+
+	assertTextFileContents("hello\n", "file.txt");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_singlefile.zip.uu Added

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_t.c Added

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test t arg - Test zip contents */
+DEFINE_TEST(test_t)
+{
+	const char *reffile = "test_basic.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s -t %s >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertNonEmptyFile("test.out");
+	assertEmptyFile("test.err");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_t_bad.c Added

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test t arg - Test zip contents, but fail! */
+DEFINE_TEST(test_t_bad)
+{
+	const char *reffile = "test_t_bad.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s -t %s >test.out 2>test.err", testprog, reffile);
+	assert(r != 0);
+	assertNonEmptyFile("test.out");
+	assertNonEmptyFile("test.err");
+}

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_t_bad.zip.uu Added

@@ -0,0 +1,25 @@
+begin 644 test_t_bad.zip
+M4$L#!!0``````,J0MU8````````````````+`"``=&5S=%B87-I8R55`T`
+M!PX;63U.6UDW#AM9'5X"P`!!.@#```$Z`,``%!+`P04``@`"``)C;=6````
+M```````+````#``@`'1E<W1?8F%S:6,O85546``'PS)M9/HY;603.&UD=7@+
+M``$$Z`,```3H`P``2\/*TG-*RE62.0"`%!+!PAY:C`$#0````L```!02P,$
+M%&$(``@`#HVW5@``````````"P````P`(`!T97-T7V)A<VEC+V)55`T`!\TR
+M;63Z.6UD.SAM9'5X"P`!!.@#```$Z`,``$O.SRM)S2LI5DCB`@!02P<(NCD=
+M+PT````+````4$L#!!0`"``(`%*-MU8```````````L````,`"``=&5S=%B
+M87-I8RC550-``=,,VUDTSAM9,\X;61U>`L``03H`P``!.@#``!+SL\K2<TK
+M*59(Y@(`4$L'"/L(!C8-````"P```%!+`P04``@`"`#*D+=6```````````.
+M````#P`@`'1E<W1?8F%S:6,O0T%04U54#0`'W#AM9/HY;63<.&UD=7@+``$$
+MZ`,```3H`P``2\/*TG-*RE6<'8,".8"`%!+!P@I4T'W$`````X```!02P$"
+M%`,4``````#*D+=6````````````````"P`@````````````4(`````=&5S
+M=%B87-I8R55`T`!PX;63U.6UDW#AM9'5X"P`!!.@#```$Z`,``%!+`0(4
+M`Q0`"``(``F-MU9Y:C`$#0````L````,`"````````````"D@4D```!T97-T
+M7V)A<VEC+V%55`T`!\,R;63Z.6UD$SAM9'5X"P`!!.@#```$Z`,``%!+`0(4
+M`Q0`"``(``Z-MU:Z.1TO#0````L````,`"````````````"D@;````!T97-T
+M7V)A<VEC+V)55`T`!\TR;63Z.6UD.SAM9'5X"P`!!.@#```$Z`,``%!+`0(4
+M`Q0`"``(`%*-MU;"`8V#0````L````,`"````````````"D@1<!``!T97-T
+M7V)A<VEC+V-55`T`!TPS;633.&UDSSAM9'5X"P`!!.@#```$Z`,``%!+`0(4
+M`Q0`"``(`,J0MU8I4T'W$`````X````/`"````````````"D@7X!``!T97-T
+M7V)A<VEC+T-!4%-55`T`!PX;63Z.6UDW#AM9'5X"P`!!.@#```$Z`,``%!+
+5!08`````!0`%`,0!``#K`0`````*
+`
+end

_service:tar_scm:libarchive-3.7.1.tar.gz/unzip/test/test_x.c Added

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2023 Adrian Vovk
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+
+/* Test x arg - Exclude paths */
+DEFINE_TEST(test_x)
+{
+	const char *reffile = "test_basic.zip";
+	int r;
+
+	extract_reference_file(reffile);
+	r = systemf("%s %s -x test_basic/c >test.out 2>test.err", testprog, reffile);
+	assertEqualInt(0, r);
+	assertNonEmptyFile("test.out");
+	assertEmptyFile("test.err");
+
+	assertTextFileContents("contents a\n", "test_basic/a");
+	assertTextFileContents("contents b\n", "test_basic/b");
+	assertFileNotExists("test_basic/c");
+	assertTextFileContents("contents CAPS\n", "test_basic/CAPS");
+}

Changes of Revision 10