pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/archivers/libarchive
Module Name: pkgsrc
Committed By: adam
Date: Tue Apr 30 06:05:20 UTC 2024
Modified Files:
pkgsrc/archivers/libarchive: Makefile.common
pkgsrc/archivers/libarchive/files: CMakeLists.txt Makefile.am
Makefile.in NEWS README.md config.h.in configure configure.ac
pkgsrc/archivers/libarchive/files/build: version
pkgsrc/archivers/libarchive/files/build/cmake: config.h.in
pkgsrc/archivers/libarchive/files/contrib: libarchive.1aix53.spec
pkgsrc/archivers/libarchive/files/cpio: cmdline.c
pkgsrc/archivers/libarchive/files/doc/html: 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 bsdcpio.1.html bsdtar.1.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
pkgsrc/archivers/libarchive/files/doc/man: archive_entry_acl.3
archive_read_disk.3 bsdtar.1 libarchive_internals.3
pkgsrc/archivers/libarchive/files/doc/pdf: 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 bsdcpio.1.pdf bsdtar.1.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
pkgsrc/archivers/libarchive/files/doc/text: archive_entry_acl.3.txt
archive_read_disk.3.txt bsdtar.1.txt libarchive_internals.3.txt
pkgsrc/archivers/libarchive/files/doc/wiki:
ManPageArchiveEntryAcl3.wiki ManPageArchiveReadDisk3.wiki
ManPageBsdtar1.wiki ManPageLibarchiveInternals3.wiki
pkgsrc/archivers/libarchive/files/libarchive: archive.h archive_entry.h
archive_entry_acl.3 archive_read_disk.3
archive_read_support_format_7zip.c
archive_read_support_format_all.c archive_read_support_format_ar.c
archive_read_support_format_lha.c
archive_read_support_format_mtree.c
archive_read_support_format_rar.c
archive_read_support_format_warc.c
archive_read_support_format_xar.c archive_read_support_format_zip.c
archive_util.c archive_write_add_filter_zstd.c
archive_write_disk_posix.c archive_write_private.h
archive_write_set_format_gnutar.c libarchive_internals.3
pkgsrc/archivers/libarchive/files/libarchive/test: CMakeLists.txt
list.h test_compat_lzip.c test_write_disk_appledouble.c
pkgsrc/archivers/libarchive/files/libarchive_fe: passphrase.c
pkgsrc/archivers/libarchive/files/tar: bsdtar.1 bsdtar.c cmdline.c
Log Message:
libarchive: updated to 3.7.4
Libarchive 3.7.4 is a bugfix and security release
Security fixes:
rar: Fix OOB in rar e8 filter (CVE-2024-26256)
zip: Fix out of boundary access
Important bugfixes:
7zip: Limit amount of properties
bsdtar: Fix error handling around strtol() usages
passphrase: Improve newline handling on Windows
passphrase: Never allow empty passwords
rar: Fix "File CRC Error" when extracting specific rar4 archives
xar: Avoid infinite link loop
zip: Update AppleDouble support for directories
zstd: Implement core detection
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/archivers/libarchive/Makefile.common
cvs rdiff -u -r1.11 -r1.12 pkgsrc/archivers/libarchive/files/CMakeLists.txt
cvs rdiff -u -r1.14 -r1.15 pkgsrc/archivers/libarchive/files/Makefile.am
cvs rdiff -u -r1.16 -r1.17 pkgsrc/archivers/libarchive/files/Makefile.in
cvs rdiff -u -r1.15 -r1.16 pkgsrc/archivers/libarchive/files/NEWS
cvs rdiff -u -r1.5 -r1.6 pkgsrc/archivers/libarchive/files/README.md
cvs rdiff -u -r1.17 -r1.18 pkgsrc/archivers/libarchive/files/config.h.in
cvs rdiff -u -r1.24 -r1.25 pkgsrc/archivers/libarchive/files/configure
cvs rdiff -u -r1.23 -r1.24 pkgsrc/archivers/libarchive/files/configure.ac
cvs rdiff -u -r1.10 -r1.11 pkgsrc/archivers/libarchive/files/build/version
cvs rdiff -u -r1.11 -r1.12 \
pkgsrc/archivers/libarchive/files/build/cmake/config.h.in
cvs rdiff -u -r1.13 -r1.14 \
pkgsrc/archivers/libarchive/files/contrib/libarchive.1aix53.spec
cvs rdiff -u -r1.9 -r1.10 pkgsrc/archivers/libarchive/files/cpio/cmdline.c
cvs rdiff -u -r1.10 -r1.11 \
pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html \
pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html \
pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html \
pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html \
pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html \
pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html \
pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html \
pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html \
pkgsrc/archivers/libarchive/files/doc/html/tar.5.html
cvs rdiff -u -r1.9 -r1.10 \
pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html \
pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html \
pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/archivers/libarchive/files/doc/man/archive_entry_acl.3
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/archivers/libarchive/files/doc/man/archive_read_disk.3
cvs rdiff -u -r1.13 -r1.14 pkgsrc/archivers/libarchive/files/doc/man/bsdtar.1
cvs rdiff -u -r1.7 -r1.8 \
pkgsrc/archivers/libarchive/files/doc/man/libarchive_internals.3
cvs rdiff -u -r1.10 -r1.11 \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_read.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_disk.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_util.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_write.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_disk.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/bsdcpio.1.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/bsdtar.1.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/cpio.5.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/libarchive-formats.5.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/libarchive.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/libarchive_internals.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/mtree.5.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/tar.5.pdf
cvs rdiff -u -r1.9 -r1.10 \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_acl.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_linkify.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_paths.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_perms.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_stat.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_time.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_data.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_extract.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_filter.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_format.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_free.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_header.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_new.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_open.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_set_options.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_blocksize.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_data.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_filter.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_finish_entry.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_format.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_free.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_header.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_new.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_open.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_set_options.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/libarchive_changes.3.pdf
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_misc.3.pdf
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_add_passphrase.3.pdf \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_set_passphrase.3.pdf
cvs rdiff -u -r1.7 -r1.8 \
pkgsrc/archivers/libarchive/files/doc/text/archive_entry_acl.3.txt
cvs rdiff -u -r1.8 -r1.9 \
pkgsrc/archivers/libarchive/files/doc/text/archive_read_disk.3.txt \
pkgsrc/archivers/libarchive/files/doc/text/libarchive_internals.3.txt
cvs rdiff -u -r1.10 -r1.11 \
pkgsrc/archivers/libarchive/files/doc/text/bsdtar.1.txt
cvs rdiff -u -r1.7 -r1.8 \
pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryAcl3.wiki
cvs rdiff -u -r1.8 -r1.9 \
pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveReadDisk3.wiki \
pkgsrc/archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki
cvs rdiff -u -r1.10 -r1.11 \
pkgsrc/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki
cvs rdiff -u -r1.16 -r1.17 \
pkgsrc/archivers/libarchive/files/libarchive/archive.h
cvs rdiff -u -r1.12 -r1.13 \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_util.c
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry_acl.3
cvs rdiff -u -r1.7 -r1.8 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_all.c
cvs rdiff -u -r1.8 -r1.9 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_ar.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_lha.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_warc.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_private.h \
pkgsrc/archivers/libarchive/files/libarchive/libarchive_internals.3
cvs rdiff -u -r1.14 -r1.15 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c
cvs rdiff -u -r1.9 -r1.10 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_xar.c
cvs rdiff -u -r1.13 -r1.14 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_zip.c
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c
cvs rdiff -u -r1.10 -r1.11 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c
cvs rdiff -u -r1.10 -r1.11 \
pkgsrc/archivers/libarchive/files/libarchive/test/CMakeLists.txt
cvs rdiff -u -r1.12 -r1.13 \
pkgsrc/archivers/libarchive/files/libarchive/test/list.h
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzip.c
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.c
cvs rdiff -u -r1.7 -r1.8 \
pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c
cvs rdiff -u -r1.13 -r1.14 pkgsrc/archivers/libarchive/files/tar/bsdtar.1
cvs rdiff -u -r1.12 -r1.13 pkgsrc/archivers/libarchive/files/tar/bsdtar.c
cvs rdiff -u -r1.9 -r1.10 pkgsrc/archivers/libarchive/files/tar/cmdline.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/archivers/libarchive/Makefile.common
diff -u pkgsrc/archivers/libarchive/Makefile.common:1.16 pkgsrc/archivers/libarchive/Makefile.common:1.17
--- pkgsrc/archivers/libarchive/Makefile.common:1.16 Fri Apr 12 15:39:46 2024
+++ pkgsrc/archivers/libarchive/Makefile.common Tue Apr 30 06:05:16 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.16 2024/04/12 15:39:46 adam Exp $
+# $NetBSD: Makefile.common,v 1.17 2024/04/30 06:05:16 adam Exp $
# used by archivers/bsdtar/Makefile
# used by archivers/libarchive/Makefile
-DISTNAME= libarchive-3.7.3
+DISTNAME= libarchive-3.7.4
CATEGORIES= archivers
MASTER_SITES= https://www.libarchive.org/downloads/
DISTFILES= # empty
Index: pkgsrc/archivers/libarchive/files/CMakeLists.txt
diff -u pkgsrc/archivers/libarchive/files/CMakeLists.txt:1.11 pkgsrc/archivers/libarchive/files/CMakeLists.txt:1.12
--- pkgsrc/archivers/libarchive/files/CMakeLists.txt:1.11 Fri Apr 12 15:39:46 2024
+++ pkgsrc/archivers/libarchive/files/CMakeLists.txt Tue Apr 30 06:05:16 2024
@@ -34,13 +34,15 @@ IF("${cached_type}" STREQUAL "UNINITIALI
SET(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "Build Type" FORCE)
ENDIF("${cached_type}" STREQUAL "UNINITIALIZED")
# Check the Build Type.
-IF(NOT "${CMAKE_BUILD_TYPE}"
- MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel|None)\$")
+# Convert the CMAKE_BUILD_TYPE to uppercase to perform a case-insensitive comparison.
+string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_UPPER)
+IF(NOT "${CMAKE_BUILD_TYPE_UPPER}"
+ MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL|NONE)\$")
MESSAGE(FATAL_ERROR
"Unknown keyword for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\n"
- "Acceptable keywords: Debug,Release,RelWithDebInfo,MinSizeRel,None")
-ENDIF(NOT "${CMAKE_BUILD_TYPE}"
- MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel|None)\$")
+ "Acceptable keywords: Debug, Release, RelWithDebInfo, MinSizeRel, None")
+ENDIF(NOT "${CMAKE_BUILD_TYPE_UPPER}"
+ MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL|NONE)\$")
# On MacOS, prefer MacPorts libraries to system libraries.
# I haven't come up with a compelling argument for this to be conditional.
@@ -1495,6 +1497,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(strncpy_s HA
CHECK_FUNCTION_EXISTS_GLIBC(strnlen HAVE_STRNLEN)
CHECK_FUNCTION_EXISTS_GLIBC(strrchr HAVE_STRRCHR)
CHECK_FUNCTION_EXISTS_GLIBC(symlink HAVE_SYMLINK)
+CHECK_FUNCTION_EXISTS_GLIBC(sysconf HAVE_SYSCONF)
CHECK_FUNCTION_EXISTS_GLIBC(timegm HAVE_TIMEGM)
CHECK_FUNCTION_EXISTS_GLIBC(tzset HAVE_TZSET)
CHECK_FUNCTION_EXISTS_GLIBC(unlinkat HAVE_UNLINKAT)
Index: pkgsrc/archivers/libarchive/files/Makefile.am
diff -u pkgsrc/archivers/libarchive/files/Makefile.am:1.14 pkgsrc/archivers/libarchive/files/Makefile.am:1.15
--- pkgsrc/archivers/libarchive/files/Makefile.am:1.14 Fri Apr 12 15:39:46 2024
+++ pkgsrc/archivers/libarchive/files/Makefile.am Tue Apr 30 06:05:16 2024
@@ -528,6 +528,7 @@ libarchive_test_SOURCES= \
libarchive/test/test_read_format_ustar_filename.c \
libarchive/test/test_read_format_warc.c \
libarchive/test/test_read_format_xar.c \
+ libarchive/test/test_read_format_xar_doublelink.c \
libarchive/test/test_read_format_zip.c \
libarchive/test/test_read_format_zip_7075_utf8_paths.c \
libarchive/test/test_read_format_zip_comment_stored.c \
@@ -932,6 +933,7 @@ libarchive_test_EXTRA_DIST=\
libarchive/test/test_read_format_ustar_filename_eucjp.tar.Z.uu \
libarchive/test/test_read_format_ustar_filename_koi8r.tar.Z.uu \
libarchive/test/test_read_format_warc.warc.uu \
+ libarchive/test/test_read_format_xar_doublelink.xar.uu \
libarchive/test/test_read_format_zip.zip.uu \
libarchive/test/test_read_format_zip_7075_utf8_paths.zip.uu \
libarchive/test/test_read_format_zip_7z_deflate.zip.uu \
Index: pkgsrc/archivers/libarchive/files/Makefile.in
diff -u pkgsrc/archivers/libarchive/files/Makefile.in:1.16 pkgsrc/archivers/libarchive/files/Makefile.in:1.17
--- pkgsrc/archivers/libarchive/files/Makefile.in:1.16 Fri Apr 12 15:39:46 2024
+++ pkgsrc/archivers/libarchive/files/Makefile.in Tue Apr 30 06:05:16 2024
@@ -1008,6 +1008,7 @@ am__libarchive_test_SOURCES_DIST = libar
libarchive/test/test_read_format_ustar_filename.c \
libarchive/test/test_read_format_warc.c \
libarchive/test/test_read_format_xar.c \
+ libarchive/test/test_read_format_xar_doublelink.c \
libarchive/test/test_read_format_zip.c \
libarchive/test/test_read_format_zip_7075_utf8_paths.c \
libarchive/test/test_read_format_zip_comment_stored.c \
@@ -1427,6 +1428,7 @@ am_libarchive_test_OBJECTS = $(am__objec
libarchive/test/test-test_read_format_ustar_filename.$(OBJEXT) \
libarchive/test/test-test_read_format_warc.$(OBJEXT) \
libarchive/test/test-test_read_format_xar.$(OBJEXT) \
+ libarchive/test/test-test_read_format_xar_doublelink.$(OBJEXT) \
libarchive/test/test-test_read_format_zip.$(OBJEXT) \
libarchive/test/test-test_read_format_zip_7075_utf8_paths.$(OBJEXT) \
libarchive/test/test-test_read_format_zip_comment_stored.$(OBJEXT) \
@@ -2061,6 +2063,7 @@ am__depfiles_remade = cat/$(DEPDIR)/bsdc
libarchive/test/$(DEPDIR)/test-test_read_format_ustar_filename.Po \
libarchive/test/$(DEPDIR)/test-test_read_format_warc.Po \
libarchive/test/$(DEPDIR)/test-test_read_format_xar.Po \
+ libarchive/test/$(DEPDIR)/test-test_read_format_xar_doublelink.Po \
libarchive/test/$(DEPDIR)/test-test_read_format_zip.Po \
libarchive/test/$(DEPDIR)/test-test_read_format_zip_7075_utf8_paths.Po \
libarchive/test/$(DEPDIR)/test-test_read_format_zip_comment_stored.Po \
@@ -3147,6 +3150,7 @@ libarchive_test_SOURCES = \
libarchive/test/test_read_format_ustar_filename.c \
libarchive/test/test_read_format_warc.c \
libarchive/test/test_read_format_xar.c \
+ libarchive/test/test_read_format_xar_doublelink.c \
libarchive/test/test_read_format_zip.c \
libarchive/test/test_read_format_zip_7075_utf8_paths.c \
libarchive/test/test_read_format_zip_comment_stored.c \
@@ -3542,6 +3546,7 @@ libarchive_test_EXTRA_DIST = \
libarchive/test/test_read_format_ustar_filename_eucjp.tar.Z.uu \
libarchive/test/test_read_format_ustar_filename_koi8r.tar.Z.uu \
libarchive/test/test_read_format_warc.warc.uu \
+ libarchive/test/test_read_format_xar_doublelink.xar.uu \
libarchive/test/test_read_format_zip.zip.uu \
libarchive/test/test_read_format_zip_7075_utf8_paths.zip.uu \
libarchive/test/test_read_format_zip_7z_deflate.zip.uu \
@@ -5902,6 +5907,9 @@ libarchive/test/test-test_read_format_wa
libarchive/test/test-test_read_format_xar.$(OBJEXT): \
libarchive/test/$(am__dirstamp) \
libarchive/test/$(DEPDIR)/$(am__dirstamp)
+libarchive/test/test-test_read_format_xar_doublelink.$(OBJEXT): \
+ libarchive/test/$(am__dirstamp) \
+ libarchive/test/$(DEPDIR)/$(am__dirstamp)
libarchive/test/test-test_read_format_zip.$(OBJEXT): \
libarchive/test/$(am__dirstamp) \
libarchive/test/$(DEPDIR)/$(am__dirstamp)
@@ -6782,6 +6790,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_read_format_ustar_filename.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_read_format_warc.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_read_format_xar.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_read_format_xar_doublelink.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_read_format_zip.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_read_format_zip_7075_utf8_paths.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_read_format_zip_comment_stored.Po@am__quote@ # am--include-marker
@@ -13744,6 +13753,20 @@ libarchive/test/test-test_read_format_xa
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
libarchive/test/test-test_read_format_xar.obj `if test -f 'libarchive/test/test_read_format_xar.c'; then $(CYGPATH_W) 'libarchive/test/test_read_format_xar.c'; else $(CYGPATH_W)
'$(srcdir)/libarchive/test/test_read_format_xar.c'; fi`
+libarchive/test/test-test_read_format_xar_doublelink.o: libarchive/test/test_read_format_xar_doublelink.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libarchive/test/test-test_read_format_xar_doublelink.o -MD -MP -MF libarchive/test/$(DEPDIR)/test-test_read_format_xar_doublelink.Tpo -c -o libarchive/test/test-test_read_format_xar_doublelink.o
`test -f 'libarchive/test/test_read_format_xar_doublelink.c' || echo '$(srcdir)/'`libarchive/test/test_read_format_xar_doublelink.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_read_format_xar_doublelink.Tpo libarchive/test/$(DEPDIR)/test-test_read_format_xar_doublelink.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libarchive/test/test_read_format_xar_doublelink.c' object='libarchive/test/test-test_read_format_xar_doublelink.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
libarchive/test/test-test_read_format_xar_doublelink.o `test -f 'libarchive/test/test_read_format_xar_doublelink.c' || echo '$(srcdir)/'`libarchive/test/test_read_format_xar_doublelink.c
+
+libarchive/test/test-test_read_format_xar_doublelink.obj: libarchive/test/test_read_format_xar_doublelink.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libarchive/test/test-test_read_format_xar_doublelink.obj -MD -MP -MF libarchive/test/$(DEPDIR)/test-test_read_format_xar_doublelink.Tpo -c -o libarchive/test/test-test_read_format_xar_doublelink.obj
`if test -f 'libarchive/test/test_read_format_xar_doublelink.c'; then $(CYGPATH_W) 'libarchive/test/test_read_format_xar_doublelink.c'; else $(CYGPATH_W)
'$(srcdir)/libarchive/test/test_read_format_xar_doublelink.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_read_format_xar_doublelink.Tpo libarchive/test/$(DEPDIR)/test-test_read_format_xar_doublelink.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libarchive/test/test_read_format_xar_doublelink.c' object='libarchive/test/test-test_read_format_xar_doublelink.obj' libtool=no
@AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
libarchive/test/test-test_read_format_xar_doublelink.obj `if test -f 'libarchive/test/test_read_format_xar_doublelink.c'; then $(CYGPATH_W) 'libarchive/test/test_read_format_xar_doublelink.c'; else
$(CYGPATH_W) '$(srcdir)/libarchive/test/test_read_format_xar_doublelink.c'; fi`
+
libarchive/test/test-test_read_format_zip.o: libarchive/test/test_read_format_zip.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test/test-test_read_format_zip.o -MD -MP
-MF libarchive/test/$(DEPDIR)/test-test_read_format_zip.Tpo -c -o libarchive/test/test-test_read_format_zip.o `test -f 'libarchive/test/test_read_format_zip.c' || echo
'$(srcdir)/'`libarchive/test/test_read_format_zip.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_read_format_zip.Tpo libarchive/test/$(DEPDIR)/test-test_read_format_zip.Po
@@ -16596,6 +16619,7 @@ distclean: distclean-am
-rm -f libarchive/test/$(DEPDIR)/test-test_read_format_ustar_filename.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_read_format_warc.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_read_format_xar.Po
+ -rm -f libarchive/test/$(DEPDIR)/test-test_read_format_xar_doublelink.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_read_format_zip.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_read_format_zip_7075_utf8_paths.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_read_format_zip_comment_stored.Po
@@ -17374,6 +17398,7 @@ maintainer-clean: maintainer-clean-am
-rm -f libarchive/test/$(DEPDIR)/test-test_read_format_ustar_filename.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_read_format_warc.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_read_format_xar.Po
+ -rm -f libarchive/test/$(DEPDIR)/test-test_read_format_xar_doublelink.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_read_format_zip.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_read_format_zip_7075_utf8_paths.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_read_format_zip_comment_stored.Po
Index: pkgsrc/archivers/libarchive/files/NEWS
diff -u pkgsrc/archivers/libarchive/files/NEWS:1.15 pkgsrc/archivers/libarchive/files/NEWS:1.16
--- pkgsrc/archivers/libarchive/files/NEWS:1.15 Fri Apr 12 15:39:46 2024
+++ pkgsrc/archivers/libarchive/files/NEWS Tue Apr 30 06:05:16 2024
@@ -1,3 +1,5 @@
+Apr 26, 2024: libarchive 3.7.4 released
+
Apr 08, 2024: libarchive 3.7.3 released
Sep 12, 2023: libarchive 3.7.2 released
Index: pkgsrc/archivers/libarchive/files/README.md
diff -u pkgsrc/archivers/libarchive/files/README.md:1.5 pkgsrc/archivers/libarchive/files/README.md:1.6
--- pkgsrc/archivers/libarchive/files/README.md:1.5 Thu Jan 18 18:00:11 2024
+++ pkgsrc/archivers/libarchive/files/README.md Tue Apr 30 06:05:16 2024
@@ -201,7 +201,7 @@ questions we are asked about libarchive:
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
+ This will then lead to implicitly created directories to have 777
permissions without sticky bit.
* In particular, libarchive's modules to read or write a directory
Index: pkgsrc/archivers/libarchive/files/config.h.in
diff -u pkgsrc/archivers/libarchive/files/config.h.in:1.17 pkgsrc/archivers/libarchive/files/config.h.in:1.18
--- pkgsrc/archivers/libarchive/files/config.h.in:1.17 Fri Apr 12 15:39:46 2024
+++ pkgsrc/archivers/libarchive/files/config.h.in Tue Apr 30 06:05:16 2024
@@ -1083,6 +1083,9 @@
/* Define to 1 if you have the `symlink' function. */
#undef HAVE_SYMLINK
+/* Define to 1 if you have the `sysconf' function. */
+#undef HAVE_SYSCONF
+
/* Define to 1 if you have the <sys/acl.h> header file. */
#undef HAVE_SYS_ACL_H
Index: pkgsrc/archivers/libarchive/files/configure
diff -u pkgsrc/archivers/libarchive/files/configure:1.24 pkgsrc/archivers/libarchive/files/configure:1.25
--- pkgsrc/archivers/libarchive/files/configure:1.24 Fri Apr 12 15:39:46 2024
+++ pkgsrc/archivers/libarchive/files/configure Tue Apr 30 06:05:16 2024
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for libarchive 3.7.3.
+# Generated by GNU Autoconf 2.71 for libarchive 3.7.4.
#
# Report bugs to <libarchive-discuss%googlegroups.com@localhost>.
#
@@ -621,8 +621,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libarchive'
PACKAGE_TARNAME='libarchive'
-PACKAGE_VERSION='3.7.3'
-PACKAGE_STRING='libarchive 3.7.3'
+PACKAGE_VERSION='3.7.4'
+PACKAGE_STRING='libarchive 3.7.4'
PACKAGE_BUGREPORT='libarchive-discuss%googlegroups.com@localhost'
PACKAGE_URL=''
@@ -1434,7 +1434,7 @@ if test "$ac_init_help" = "long"; then
# 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.7.3 to adapt to many kinds of systems.
+\`configure' configures libarchive 3.7.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1505,7 +1505,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libarchive 3.7.3:";;
+ short | recursive ) echo "Configuration of libarchive 3.7.4:";;
esac
cat <<\_ACEOF
@@ -1681,7 +1681,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libarchive configure 3.7.3
+libarchive configure 3.7.4
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2475,7 +2475,7 @@ cat >config.log <<_ACEOF
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.7.3, which was
+It was created by libarchive $as_me 3.7.4, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3755,7 +3755,7 @@ fi
# Define the identity of the package.
PACKAGE='libarchive'
- VERSION='3.7.3'
+ VERSION='3.7.4'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -3928,7 +3928,7 @@ AM_BACKSLASH='\'
# Libtool interface version bumps on any API change, so increments
# whenever libarchive minor version does.
-ARCHIVE_MINOR=$(( (3007003 / 1000) % 1000 ))
+ARCHIVE_MINOR=$(( (3007004 / 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
@@ -3936,7 +3936,7 @@ ARCHIVE_MINOR=$(( (3007003 / 1000) % 100
# Libarchive 3.1 == libtool interface 13
ARCHIVE_INTERFACE=`echo $((13 + ${ARCHIVE_MINOR}))`
# Libarchive revision is bumped on any source change === libtool revision
-ARCHIVE_REVISION=$(( 3007003 % 1000 ))
+ARCHIVE_REVISION=$(( 3007004 % 1000 ))
# Libarchive minor is bumped on any interface addition === libtool age
ARCHIVE_LIBTOOL_VERSION=$ARCHIVE_INTERFACE:$ARCHIVE_REVISION:$ARCHIVE_MINOR
@@ -3945,33 +3945,33 @@ ARCHIVE_LIBTOOL_VERSION=$ARCHIVE_INTERFA
printf "%s\n" "#define __LIBARCHIVE_CONFIG_H_INCLUDED 1" >>confdefs.h
-printf "%s\n" "#define LIBARCHIVE_VERSION_STRING \"3.7.3\"" >>confdefs.h
+printf "%s\n" "#define LIBARCHIVE_VERSION_STRING \"3.7.4\"" >>confdefs.h
-printf "%s\n" "#define LIBARCHIVE_VERSION_NUMBER \"3007003\"" >>confdefs.h
+printf "%s\n" "#define LIBARCHIVE_VERSION_NUMBER \"3007004\"" >>confdefs.h
-printf "%s\n" "#define BSDCPIO_VERSION_STRING \"3.7.3\"" >>confdefs.h
+printf "%s\n" "#define BSDCPIO_VERSION_STRING \"3.7.4\"" >>confdefs.h
-printf "%s\n" "#define BSDTAR_VERSION_STRING \"3.7.3\"" >>confdefs.h
+printf "%s\n" "#define BSDTAR_VERSION_STRING \"3.7.4\"" >>confdefs.h
-printf "%s\n" "#define BSDCAT_VERSION_STRING \"3.7.3\"" >>confdefs.h
+printf "%s\n" "#define BSDCAT_VERSION_STRING \"3.7.4\"" >>confdefs.h
-printf "%s\n" "#define BSDUNZIP_VERSION_STRING \"3.7.3\"" >>confdefs.h
+printf "%s\n" "#define BSDUNZIP_VERSION_STRING \"3.7.4\"" >>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.7.3
-BSDTAR_VERSION_STRING=3.7.3
-BSDCAT_VERSION_STRING=3.7.3
-BSDUNZIP_VERSION_STRING=3.7.3
-LIBARCHIVE_VERSION_STRING=3.7.3
-LIBARCHIVE_VERSION_NUMBER=3007003
+BSDCPIO_VERSION_STRING=3.7.4
+BSDTAR_VERSION_STRING=3.7.4
+BSDCAT_VERSION_STRING=3.7.4
+BSDUNZIP_VERSION_STRING=3.7.4
+LIBARCHIVE_VERSION_STRING=3.7.4
+LIBARCHIVE_VERSION_NUMBER=3007004
# Substitute the above version numbers into the various files below.
# Yes, I believe this is the fourth time we define what are essentially
@@ -19713,6 +19713,13 @@ then :
fi
+ac_fn_c_check_func "$LINENO" "sysconf" "ac_cv_func_sysconf"
+if test "x$ac_cv_func_sysconf" = xyes
+then :
+ printf "%s\n" "#define HAVE_SYSCONF 1" >>confdefs.h
+
+fi
+
ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm"
if test "x$ac_cv_func_timegm" = xyes
then :
@@ -24168,7 +24175,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libarchive $as_me 3.7.3, which was
+This file was extended by libarchive $as_me 3.7.4, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24236,7 +24243,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-libarchive config.status 3.7.3
+libarchive config.status 3.7.4
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Index: pkgsrc/archivers/libarchive/files/configure.ac
diff -u pkgsrc/archivers/libarchive/files/configure.ac:1.23 pkgsrc/archivers/libarchive/files/configure.ac:1.24
--- pkgsrc/archivers/libarchive/files/configure.ac:1.23 Fri Apr 12 15:39:46 2024
+++ pkgsrc/archivers/libarchive/files/configure.ac Tue Apr 30 06:05:16 2024
@@ -4,8 +4,8 @@ dnl First, define all of the version num
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.7.3])
-m4_define([LIBARCHIVE_VERSION_N],[3007003])
+m4_define([LIBARCHIVE_VERSION_S],[3.7.4])
+m4_define([LIBARCHIVE_VERSION_N],[3007004])
dnl bsdtar and bsdcpio versioning tracks libarchive
m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
@@ -662,7 +662,7 @@ AC_LINK_IFELSE(
DEAD_CODE_REMOVAL="";])
LDFLAGS=$save_LDFLAGS
-if test "$DEAD_CODE_REMOVAL" == ""; then
+if test "$DEAD_CODE_REMOVAL" = ""; then
# Macos linkers have a -dead_strip flag, which is similar to --gc-sections.
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,-dead_strip"
@@ -804,6 +804,7 @@ AC_CHECK_FUNCS([nl_langinfo openat pipe
AC_CHECK_FUNCS([readpassphrase])
AC_CHECK_FUNCS([select setenv setlocale sigaction statfs statvfs])
AC_CHECK_FUNCS([strchr strdup strerror strncpy_s strnlen strrchr symlink])
+AC_CHECK_FUNCS([sysconf])
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([_fseeki64 _get_timezone])
Index: pkgsrc/archivers/libarchive/files/build/version
diff -u pkgsrc/archivers/libarchive/files/build/version:1.10 pkgsrc/archivers/libarchive/files/build/version:1.11
--- pkgsrc/archivers/libarchive/files/build/version:1.10 Fri Apr 12 15:39:46 2024
+++ pkgsrc/archivers/libarchive/files/build/version Tue Apr 30 06:05:17 2024
@@ -1 +1 @@
-3007003
+3007004
Index: pkgsrc/archivers/libarchive/files/build/cmake/config.h.in
diff -u pkgsrc/archivers/libarchive/files/build/cmake/config.h.in:1.11 pkgsrc/archivers/libarchive/files/build/cmake/config.h.in:1.12
--- pkgsrc/archivers/libarchive/files/build/cmake/config.h.in:1.11 Fri Apr 12 15:39:46 2024
+++ pkgsrc/archivers/libarchive/files/build/cmake/config.h.in Tue Apr 30 06:05:17 2024
@@ -1094,6 +1094,9 @@ typedef uint64_t uintmax_t;
/* Define to 1 if you have the `symlink' function. */
#cmakedefine HAVE_SYMLINK 1
+/* Define to 1 if you have the `sysconf' function. */
+#cmakedefine HAVE_SYSCONF 1
+
/* Define to 1 if you have the <sys/acl.h> header file. */
#cmakedefine HAVE_SYS_ACL_H 1
Index: pkgsrc/archivers/libarchive/files/contrib/libarchive.1aix53.spec
diff -u pkgsrc/archivers/libarchive/files/contrib/libarchive.1aix53.spec:1.13 pkgsrc/archivers/libarchive/files/contrib/libarchive.1aix53.spec:1.14
--- pkgsrc/archivers/libarchive/files/contrib/libarchive.1aix53.spec:1.13 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/contrib/libarchive.1aix53.spec Tue Apr 30 06:05:17 2024
@@ -127,54 +127,26 @@ rm -fr %buildroot
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log: libarchive.1aix53.spec,v $
-Revision 1.13 2024/01/18 18:00:13 adam
-libarchive: updated to 3.7.2
+Revision 1.14 2024/04/30 06:05:17 adam
+libarchive: updated to 3.7.4
-Libarchive 3.7.2 is a security, bugfix and feature release.
+Libarchive 3.7.4 is a bugfix and security release
Security fixes:
-Multiple vulnerabilities have been fixed in the PAX writer (1b4e0d0)
-Important bugfixes:
-
-bsdunzip(1) now correctly handles arguments following an -x after the zipfile
-New features:
-
-bsdunzip(1) now supports the "--version" flag
-7-zip reader now translates Windows permissions into UNIX permissions
-uudecode filter in raw mode now supports file name and file mode
-zstd filter now supports the "long" write option
-
-
-Libarchive 3.7.1 is a security, feature and bugfix release.
-
-Security fixes:
+rar: Fix OOB in rar e8 filter (CVE-2024-26256)
+zip: Fix out of boundary access
-SEGV and stack buffer overflow in verbose mode of cpio
-Feature updates:
-
-bsdunzip updated to match latest upstream code
Important bugfixes:
-miscellaneous functional bugfixes
-build fixes on multiple platforms
-
-
-Libarchive 3.7.0 is a feature and bugfix release.
-
-New features:
-
-bsdunzip: new tool ported from FreeBSD
-drop-in replacement for Info-ZIP unzip, not yet ported for Windows
-7zip reader: support for Zstandard compression
-7zip reader: support for ARM64 filter
-zstd filter: support for multi-frame zstd archives
-Other notable bugfixes and improvements:
-
-pax: fix year 2038 problem on platforms with 64-bit time_t
-Windows: Universal Windows Platform (UWP) fixes and improvements
-Windows: bcrypt usage fixes and improvements
-Windows: time function usage fixes and improvements
+7zip: Limit amount of properties
+bsdtar: Fix error handling around strtol() usages
+passphrase: Improve newline handling on Windows
+passphrase: Never allow empty passwords
+rar: Fix "File CRC Error" when extracting specific rar4 archives
+xar: Avoid infinite link loop
+zip: Update AppleDouble support for directories
+zstd: Implement core detection
Release 1aix53 2006/12/12 rm1023%dcx.com@localhost
- tweak for aix-5.3
Index: pkgsrc/archivers/libarchive/files/cpio/cmdline.c
diff -u pkgsrc/archivers/libarchive/files/cpio/cmdline.c:1.9 pkgsrc/archivers/libarchive/files/cpio/cmdline.c:1.10
--- pkgsrc/archivers/libarchive/files/cpio/cmdline.c:1.9 Fri Apr 12 15:39:47 2024
+++ pkgsrc/archivers/libarchive/files/cpio/cmdline.c Tue Apr 30 06:05:17 2024
@@ -114,12 +114,18 @@ cpio_getopt(struct cpio *cpio)
static int state = state_start;
static char *opt_word;
- const struct option *popt, *match = NULL, *match2 = NULL;
- const char *p, *long_prefix = "--";
+ const struct option *popt, *match, *match2;
+ const char *p, *long_prefix;
size_t optlength;
- int opt = '?';
- int required = 0;
+ int opt;
+ int required;
+again:
+ match = NULL;
+ match2 = NULL;
+ long_prefix = "--";
+ opt = '?';
+ required = 0;
cpio->argument = NULL;
/* First time through, initialize everything. */
@@ -169,7 +175,7 @@ cpio_getopt(struct cpio *cpio)
if (opt == '\0') {
/* End of this group; recurse to get next option. */
state = state_next_word;
- return cpio_getopt(cpio);
+ goto again;
}
/* Does this option take an argument? */
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html:1.10 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:45 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html:1.10 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:45 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html:1.10 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
@@ -381,7 +381,7 @@ archive_read_header(3) calls. If matched
archive_match_path_excluded, archive_match_time_excluded, or
archive_match_owner_excluded, then the callback function
specified by the _excluded_func parameter will execute. This
-function will recieve data provided to the fourth parameter,
+function will receive data provided to the fourth parameter,
void *_client_data.</p>
@@ -390,7 +390,7 @@ void *_client_data.</p>
<p style="margin-left:17%;">Allows the caller to set a
callback function during calls to archive_read_header(3) to
filter out metadata for each entry. The callback function
-recieves the struct archive object, void* custom filter
+receives the struct archive object, void* custom filter
data, and the struct archive_entry. If the callback function
returns an error, ARCHIVE_RETRY will be returned and the
entry will not be further processed.</p>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html:1.10 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html:1.10 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html:1.10 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html:1.10 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:28 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:48 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html:1.10 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:28 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:48 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
@@ -746,18 +746,17 @@ default).</p>
block being compressed for a compression dictionary to
improve compression ratio.</p>
-<p><b>zstd:compression-level</b></p>
+<p><b>zstd:compression-level</b>=<i>N</i></p>
<p style="margin-left:27%;">A decimal integer specifying
the zstd compression level. Supported values depend on the
library version, common values are from 1 to 22.</p>
-<p><b>zstd:threads</b></p>
+<p><b>zstd:threads</b>=<i>N</i></p>
<p style="margin-left:27%;">Specify the number of worker
-threads to use. Setting threads to a special value 0 makes
-zstd(1) use as many threads as there are CPU cores on the
-system.</p>
+threads to use, or 0 to use as many threads as there are CPU
+cores in the system.</p>
<p><b>zstd:frame-per-file</b></p>
@@ -1468,7 +1467,7 @@ incompatible ways that different archive
hardlink information.)</p>
<p style="margin-left:6%; margin-top: 1em">BSD
-March 1, 2024 BSD</p>
+April 23, 2024 BSD</p>
<hr>
</body>
</html>
Index: pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html:1.10 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:47 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html:1.10 Fri Apr 12 15:39:49 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:47 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html:1.10 Fri Apr 12 15:39:49 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:47 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html:1.10 Fri Apr 12 15:39:49 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:28 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:47 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
@@ -120,7 +120,7 @@ other clients may begin asynchronous I/O
next block on each request.</p>
-<p style="margin-left:6%; margin-top: 1em"><b>Decompresssion
+<p style="margin-left:6%; margin-top: 1em"><b>Decompression
Layer</b> <br>
The decompression layer not only handles decompression, it
also buffers data so that the format handlers see a much
Index: pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html:1.10 Fri Apr 12 15:39:49 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:28 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:48 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/tar.5.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/tar.5.html:1.10 pkgsrc/archivers/libarchive/files/doc/html/tar.5.html:1.11
--- pkgsrc/archivers/libarchive/files/doc/html/tar.5.html:1.10 Fri Apr 12 15:39:49 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/tar.5.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:28 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:48 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:45 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
@@ -484,7 +484,7 @@ with the word “default:”.</p
contain a double colon.</p>
<p style="margin-left:6%; margin-top: 1em">The following
-flags are effecive only on NFSv4 ACL:</p>
+flags are effective only on NFSv4 ACL:</p>
<p>ARCHIVE_ENTRY_ACL_STYLE_COMPACT</p>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:45 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:45 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:45 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:45 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:45 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:46 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:47 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:47 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:47 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:47 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:47 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:47 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html:1.9 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:47 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html:1.9 Fri Apr 12 15:39:49 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:47 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html:1.4 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html:1.5
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html:1.4 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:45 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html:1.6 pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html:1.7
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html:1.6 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html Tue Apr 30 06:05:17 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:45 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html:1.6 pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html:1.7
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html:1.6 Fri Apr 12 15:39:48 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html Tue Apr 30 06:05:18 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
+<!-- CreationDate: Fri Apr 26 09:23:47 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
Index: pkgsrc/archivers/libarchive/files/doc/man/archive_entry_acl.3
diff -u pkgsrc/archivers/libarchive/files/doc/man/archive_entry_acl.3:1.5 pkgsrc/archivers/libarchive/files/doc/man/archive_entry_acl.3:1.6
--- pkgsrc/archivers/libarchive/files/doc/man/archive_entry_acl.3:1.5 Tue May 26 09:16:41 2020
+++ pkgsrc/archivers/libarchive/files/doc/man/archive_entry_acl.3 Tue Apr 30 06:05:18 2024
@@ -372,7 +372,7 @@ Prefix each default ACL entry with the w
The mask and other ACLs don not contain a double colon.
.RE
.PP
-The following flags are effecive only on NFSv4 ACL:
+The following flags are effective only on NFSv4 ACL:
.RS 5
.TP
.BR ARCHIVE_ENTRY_ACL_STYLE_COMPACT
Index: pkgsrc/archivers/libarchive/files/doc/man/archive_read_disk.3
diff -u pkgsrc/archivers/libarchive/files/doc/man/archive_read_disk.3:1.6 pkgsrc/archivers/libarchive/files/doc/man/archive_read_disk.3:1.7
--- pkgsrc/archivers/libarchive/files/doc/man/archive_read_disk.3:1.6 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/man/archive_read_disk.3 Tue Apr 30 06:05:18 2024
@@ -299,12 +299,12 @@ Tn archive_match_path_excluded,
Tn archive_match_time_excluded,
or
Tn archive_match_owner_excluded,
-then the callback function specified by the _excluded_func parameter will execute. This function will recieve data provided to the fourth parameter, void *_client_data.
+then the callback function specified by the _excluded_func parameter will execute. This function will receive data provided to the fourth parameter, void *_client_data.
.TP
\fB\%archive_read_disk_set_metadata_filter_callback\fP()
Allows the caller to set a callback function during calls to
\fBarchive_read_header\fP(3)
-to filter out metadata for each entry. The callback function recieves the
+to filter out metadata for each entry. The callback function receives the
Tn struct archive
object, void* custom filter data, and the
Tn struct archive_entry.
Index: pkgsrc/archivers/libarchive/files/doc/man/bsdtar.1
diff -u pkgsrc/archivers/libarchive/files/doc/man/bsdtar.1:1.13 pkgsrc/archivers/libarchive/files/doc/man/bsdtar.1:1.14
--- pkgsrc/archivers/libarchive/files/doc/man/bsdtar.1:1.13 Fri Apr 12 15:39:49 2024
+++ pkgsrc/archivers/libarchive/files/doc/man/bsdtar.1 Tue Apr 30 06:05:18 2024
@@ -1,4 +1,4 @@
-.TH TAR 1 "March 1, 2024" ""
+.TH TAR 1 "April 23, 2024" ""
.SH NAME
.ad l
\fB\%tar\fP
@@ -726,15 +726,14 @@ A decimal integer from 4 to 7 specifying
Use the previous block of the block being compressed for
a compression dictionary to improve compression ratio.
.TP
-\fBzstd:compression-level\fP
-A decimal integer specifying the zstd compression level. Supported values depend
+\fBzstd:compression-level\fP=\fIN\fP
+A decimal integer specifying the zstd compression level.
+Supported values depend
on the library version, common values are from 1 to 22.
.TP
-\fBzstd:threads\fP
-Specify the number of worker threads to use.
-Setting threads to a special value 0 makes
-\fBzstd\fP(1)
-use as many threads as there are CPU cores on the system.
+\fBzstd:threads\fP=\fIN\fP
+Specify the number of worker threads to use, or 0 to use as many
+threads as there are CPU cores in the system.
.TP
\fBzstd:frame-per-file\fP
Start a new compression frame at the beginning of each file in the
Index: pkgsrc/archivers/libarchive/files/doc/man/libarchive_internals.3
diff -u pkgsrc/archivers/libarchive/files/doc/man/libarchive_internals.3:1.7 pkgsrc/archivers/libarchive/files/doc/man/libarchive_internals.3:1.8
--- pkgsrc/archivers/libarchive/files/doc/man/libarchive_internals.3:1.7 Tue May 26 09:16:41 2020
+++ pkgsrc/archivers/libarchive/files/doc/man/libarchive_internals.3 Tue Apr 30 06:05:18 2024
@@ -102,7 +102,7 @@ to read the entire file into memory at o
entire file to libarchive as a single block;
other clients may begin asynchronous I/O operations for the
next block on each request.
-.SS Decompresssion Layer
+.SS Decompression Layer
The decompression layer not only handles decompression,
it also buffers data so that the format handlers see a
much nicer I/O model.
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_disk.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_util.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_disk.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/bsdcpio.1.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/bsdtar.1.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/cpio.5.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/libarchive-formats.5.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/libarchive.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/libarchive_internals.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/mtree.5.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/tar.5.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_acl.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_linkify.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_paths.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_perms.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_stat.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_time.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_data.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_extract.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_filter.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_format.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_free.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_header.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_new.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_open.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_set_options.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_blocksize.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_data.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_filter.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_finish_entry.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_format.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_free.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_header.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_new.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_open.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_set_options.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/libarchive_changes.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_misc.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_add_passphrase.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_set_passphrase.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/text/archive_entry_acl.3.txt
diff -u pkgsrc/archivers/libarchive/files/doc/text/archive_entry_acl.3.txt:1.7 pkgsrc/archivers/libarchive/files/doc/text/archive_entry_acl.3.txt:1.8
--- pkgsrc/archivers/libarchive/files/doc/text/archive_entry_acl.3.txt:1.7 Thu Jan 18 18:00:15 2024
+++ pkgsrc/archivers/libarchive/files/doc/text/archive_entry_acl.3.txt Tue Apr 30 06:05:19 2024
@@ -238,7 +238,7 @@ DESCRIPTION
ARCHIVE_ENTRY_ACL_STYLE_SOLARIS
The mask and other ACLs don not contain a double colon.
- The following flags are effecive only on NFSv4 ACL:
+ The following flags are effective only on NFSv4 ACL:
ARCHIVE_ENTRY_ACL_STYLE_COMPACT
Do not output minus characters for unset permissions and
flags in NFSv4 ACL permission and flag fields.
Index: pkgsrc/archivers/libarchive/files/doc/text/archive_read_disk.3.txt
diff -u pkgsrc/archivers/libarchive/files/doc/text/archive_read_disk.3.txt:1.8 pkgsrc/archivers/libarchive/files/doc/text/archive_read_disk.3.txt:1.9
--- pkgsrc/archivers/libarchive/files/doc/text/archive_read_disk.3.txt:1.8 Thu Jan 18 18:00:16 2024
+++ pkgsrc/archivers/libarchive/files/doc/text/archive_read_disk.3.txt Tue Apr 30 06:05:19 2024
@@ -222,13 +222,13 @@ DESCRIPTION
calls to archive_match_path_excluded,
archive_match_time_excluded, or archive_match_owner_excluded,
then the callback function specified by the _excluded_func param‐
- eter will execute. This function will recieve data provided to
+ eter will execute. This function will receive data provided to
the fourth parameter, void *_client_data.
archive_read_disk_set_metadata_filter_callback()
Allows the caller to set a callback function during calls to
archive_read_header(3) to filter out metadata for each entry. The
- callback function recieves the struct archive object, void* cus‐
+ callback function receives the struct archive object, void* cus‐
tom filter data, and the struct archive_entry. If the callback
function returns an error, ARCHIVE_RETRY will be returned and the
entry will not be further processed.
Index: pkgsrc/archivers/libarchive/files/doc/text/libarchive_internals.3.txt
diff -u pkgsrc/archivers/libarchive/files/doc/text/libarchive_internals.3.txt:1.8 pkgsrc/archivers/libarchive/files/doc/text/libarchive_internals.3.txt:1.9
--- pkgsrc/archivers/libarchive/files/doc/text/libarchive_internals.3.txt:1.8 Thu Jan 18 18:00:16 2024
+++ pkgsrc/archivers/libarchive/files/doc/text/libarchive_internals.3.txt Tue Apr 30 06:05:19 2024
@@ -71,7 +71,7 @@ READ ARCHITECTURE
single block; other clients may begin asynchronous I/O operations for the
next block on each request.
- Decompresssion Layer
+ Decompression Layer
The decompression layer not only handles decompression, it also buffers
data so that the format handlers see a much nicer I/O model. The decom‐
pression API is a two stage peek/consume model. A read_ahead request
Index: pkgsrc/archivers/libarchive/files/doc/text/bsdtar.1.txt
diff -u pkgsrc/archivers/libarchive/files/doc/text/bsdtar.1.txt:1.10 pkgsrc/archivers/libarchive/files/doc/text/bsdtar.1.txt:1.11
--- pkgsrc/archivers/libarchive/files/doc/text/bsdtar.1.txt:1.10 Fri Apr 12 15:39:50 2024
+++ pkgsrc/archivers/libarchive/files/doc/text/bsdtar.1.txt Tue Apr 30 06:05:19 2024
@@ -432,14 +432,13 @@ OPTIONS
lz4:block-dependence
Use the previous block of the block being compressed for
a compression dictionary to improve compression ratio.
- zstd:compression-level
+ zstd:compression-level=N
A decimal integer specifying the zstd compression level.
Supported values depend on the library version, common
values are from 1 to 22.
- zstd:threads
- Specify the number of worker threads to use. Setting
- threads to a special value 0 makes zstd(1) use as many
- threads as there are CPU cores on the system.
+ zstd:threads=N
+ Specify the number of worker threads to use, or 0 to use
+ as many threads as there are CPU cores in the system.
zstd:frame-per-file
Start a new compression frame at the beginning of each
file in the archive.
@@ -894,4 +893,4 @@ BUGS
is a consequence of the incompatible ways that different archive formats
store hardlink information.)
-BSD March 1, 2024 BSD
+BSD April 23, 2024 BSD
Index: pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryAcl3.wiki
diff -u pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryAcl3.wiki:1.7 pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryAcl3.wiki:1.8
--- pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryAcl3.wiki:1.7 Thu Jan 18 18:00:16 2024
+++ pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveEntryAcl3.wiki Tue Apr 30 06:05:19 2024
@@ -380,7 +380,7 @@ ARCHIVE_ENTRY_ACL_STYLE_SOLARIS
The mask and other ACLs don not contain a double colon.
</dd></dl>
-The following flags are effecive only on NFSv4 ACL:
+The following flags are effective only on NFSv4 ACL:
<dl>
<dt></dt><dd>
ARCHIVE_ENTRY_ACL_STYLE_COMPACT
Index: pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveReadDisk3.wiki
diff -u pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveReadDisk3.wiki:1.8 pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveReadDisk3.wiki:1.9
--- pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveReadDisk3.wiki:1.8 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveReadDisk3.wiki Tue Apr 30 06:05:19 2024
@@ -278,11 +278,11 @@ calls. If matched based on calls to
'''archive_match_time_excluded ,'''
or
'''archive_match_owner_excluded ,'''
-then the callback function specified by the _excluded_func parameter will execute. This function will recieve data provided to the fourth parameter, void *_client_data.
+then the callback function specified by the _excluded_func parameter will execute. This function will receive data provided to the fourth parameter, void *_client_data.
</dd><dt>'''archive_read_disk_set_metadata_filter_callback'''()</dt><dd>
Allows the caller to set a callback function during calls to
[[ManPageArchiveReadHeader3]]
-to filter out metadata for each entry. The callback function recieves the
+to filter out metadata for each entry. The callback function receives the
'''struct archive'''
object, void* custom filter data, and the
'''struct archive_entry .'''
Index: pkgsrc/archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki
diff -u pkgsrc/archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki:1.8 pkgsrc/archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki:1.9
--- pkgsrc/archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki:1.8 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki Tue Apr 30 06:05:19 2024
@@ -98,7 +98,7 @@ to read the entire file into memory at o
entire file to libarchive as a single block;
other clients may begin asynchronous I/O operations for the
next block on each request.
-=== Decompresssion Layer===
+=== Decompression Layer===
The decompression layer not only handles decompression,
it also buffers data so that the format handlers see a
much nicer I/O model.
Index: pkgsrc/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki
diff -u pkgsrc/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki:1.10 pkgsrc/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki:1.11
--- pkgsrc/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki:1.10 Fri Apr 12 15:39:50 2024
+++ pkgsrc/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki Tue Apr 30 06:05:19 2024
@@ -639,14 +639,13 @@ A decimal integer from 4 to 7 specifying
</dd><dt>'''lz4:block-dependence'''</dt><dd>
Use the previous block of the block being compressed for
a compression dictionary to improve compression ratio.
-</dd><dt>'''zstd:compression-level'''</dt><dd>
-A decimal integer specifying the zstd compression level. Supported values depend
+</dd><dt>'''zstd:compression-level'''=''N''</dt><dd>
+A decimal integer specifying the zstd compression level.
+Supported values depend
on the library version, common values are from 1 to 22.
-</dd><dt>'''zstd:threads'''</dt><dd>
-Specify the number of worker threads to use.
-Setting threads to a special value 0 makes
-[[zstd(1)|http://www.freebsd.org/cgi/man.cgi?query=zstd&sektion=1]]
-use as many threads as there are CPU cores on the system.
+</dd><dt>'''zstd:threads'''=''N''</dt><dd>
+Specify the number of worker threads to use, or 0 to use as many
+threads as there are CPU cores in the system.
</dd><dt>'''zstd:frame-per-file'''</dt><dd>
Start a new compression frame at the beginning of each file in the
archive.
Index: pkgsrc/archivers/libarchive/files/libarchive/archive.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive.h:1.16 pkgsrc/archivers/libarchive/files/libarchive/archive.h:1.17
--- pkgsrc/archivers/libarchive/files/libarchive/archive.h:1.16 Fri Apr 12 15:39:50 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive.h Tue Apr 30 06:05:19 2024
@@ -34,7 +34,7 @@
* assert that ARCHIVE_VERSION_NUMBER >= 2012108.
*/
/* Note: Compiler will complain if this does not match archive_entry.h! */
-#define ARCHIVE_VERSION_NUMBER 3007003
+#define ARCHIVE_VERSION_NUMBER 3007004
#include <sys/stat.h>
#include <stddef.h> /* for wchar_t */
@@ -155,7 +155,7 @@ __LA_DECL int archive_version_number(vo
/*
* Textual name/version of the library, useful for version displays.
*/
-#define ARCHIVE_VERSION_ONLY_STRING "3.7.3"
+#define ARCHIVE_VERSION_ONLY_STRING "3.7.4"
#define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
__LA_DECL const char * archive_version_string(void);
@@ -895,7 +895,7 @@ __LA_DECL int archive_write_set_options(
const char *opts);
/*
- * Set a encryption passphrase.
+ * Set an encryption passphrase.
*/
__LA_DECL int archive_write_set_passphrase(struct archive *_a, const char *p);
__LA_DECL int archive_write_set_passphrase_callback(struct archive *,
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h:1.12 pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h:1.13
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h:1.12 Fri Apr 12 15:39:50 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h Tue Apr 30 06:05:19 2024
@@ -28,7 +28,7 @@
#define ARCHIVE_ENTRY_H_INCLUDED
/* Note: Compiler will complain if this does not match archive.h! */
-#define ARCHIVE_VERSION_NUMBER 3007003
+#define ARCHIVE_VERSION_NUMBER 3007004
/*
* Note: archive_entry.h is for use outside of libarchive; the
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_util.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_util.c:1.12 pkgsrc/archivers/libarchive/files/libarchive/archive_util.c:1.13
--- pkgsrc/archivers/libarchive/files/libarchive/archive_util.c:1.12 Fri Apr 12 15:39:51 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_util.c Tue Apr 30 06:05:19 2024
@@ -255,10 +255,9 @@ __archive_mktempx(const char *tmpdir, wc
#endif
fd = -1;
ws = NULL;
+ archive_string_init(&temp_name);
if (template == NULL) {
- archive_string_init(&temp_name);
-
/* Get a temporary directory. */
if (tmpdir == NULL) {
size_t l;
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry_acl.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry_acl.3:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_entry_acl.3:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry_acl.3:1.5 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry_acl.3 Tue Apr 30 06:05:19 2024
@@ -383,7 +383,7 @@ Prefix each default ACL entry with the w
The mask and other ACLs don not contain a double colon.
.El
.Pp
-The following flags are effecive only on NFSv4 ACL:
+The following flags are effective only on NFSv4 ACL:
.Bl -tag -offset indent -compact -width ARCHIV
.It Dv ARCHIVE_ENTRY_ACL_STYLE_COMPACT
Do not output minus characters for unset permissions and flags in NFSv4 ACL
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk.3:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk.3:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk.3:1.7 Fri Apr 12 15:39:51 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk.3 Tue Apr 30 06:05:19 2024
@@ -288,11 +288,11 @@ calls. If matched based on calls to
.Tn archive_match_time_excluded ,
or
.Tn archive_match_owner_excluded ,
-then the callback function specified by the _excluded_func parameter will execute. This function will recieve data provided to the fourth parameter, void *_client_data.
+then the callback function specified by the _excluded_func parameter will execute. This function will receive data provided to the fourth parameter, void *_client_data.
.It Fn archive_read_disk_set_metadata_filter_callback
Allows the caller to set a callback function during calls to
.Xr archive_read_header 3
-to filter out metadata for each entry. The callback function recieves the
+to filter out metadata for each entry. The callback function receives the
.Tn struct archive
object, void* custom filter data, and the
.Tn struct archive_entry .
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_all.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_all.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_all.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_all.c:1.7 Fri Apr 12 15:39:51 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_all.c Tue Apr 30 06:05:19 2024
@@ -67,7 +67,7 @@ archive_read_support_format_all(struct a
* increase the chance that a high bid from someone else will
* make it unnecessary for these to do anything at all.
*/
- /* These three have potentially large look-ahead. */
+ /* These have potentially large look-ahead. */
archive_read_support_format_7zip(a);
archive_read_support_format_cab(a);
archive_read_support_format_rar(a);
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c:1.8 Fri Apr 12 15:39:51 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c Tue Apr 30 06:05:19 2024
@@ -2037,6 +2037,8 @@ read_Folder(struct archive_read *a, stru
if (parse_7zip_uint64(
a, &(f->coders[i].propertiesSize)) < 0)
return (-1);
+ if (UMAX_ENTRY < f->coders[i].propertiesSize)
+ return (-1);
if ((p = header_bytes(
a, (size_t)f->coders[i].propertiesSize)) == NULL)
return (-1);
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_ar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_ar.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_ar.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_ar.c:1.8 Fri Apr 12 15:39:51 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_ar.c Tue Apr 30 06:05:19 2024
@@ -270,7 +270,7 @@ _ar_read_header(struct archive_read *a,
}
if (ar->strtab != NULL) {
archive_set_error(&a->archive, EINVAL,
- "More than one string tables exist");
+ "More than one string table exists");
return (ARCHIVE_FATAL);
}
@@ -515,7 +515,7 @@ archive_read_format_ar_read_data(struct
if (ar->entry_padding) {
if (skipped >= 0) {
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "Truncated ar archive- failed consuming padding");
+ "Truncated ar archive - failed consuming padding");
}
return (ARCHIVE_FATAL);
}
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_lha.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_lha.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_lha.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_lha.c:1.8 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_lha.c Tue Apr 30 06:05:19 2024
@@ -1693,7 +1693,7 @@ archive_read_format_lha_cleanup(struct a
* example.
* 1. a symbolic-name is 'aaa/bb/cc'
* 2. a filename is 'xxx/bbb'
- * then a archived pathname is 'xxx/bbb|aaa/bb/cc'
+ * then an archived pathname is 'xxx/bbb|aaa/bb/cc'
*/
static int
lha_parse_linkname(struct archive_wstring *linkname,
@@ -2385,7 +2385,7 @@ lzh_decode_blocks(struct lzh_stream *str
return (100);
}
- /* lzh_br_read_ahead() always try to fill the
+ /* lzh_br_read_ahead() always tries to fill the
* cache buffer up. In specific situation we
* are close to the end of the data, the cache
* buffer will not be full and thus we have to
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_warc.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_warc.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_warc.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_warc.c:1.8 Fri Apr 12 15:39:51 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_warc.c Tue Apr 30 06:05:19 2024
@@ -215,6 +215,7 @@ _warc_rdhdr(struct archive_read *a, stru
const char *buf;
ssize_t nrd;
const char *eoh;
+ char *tmp;
/* for the file name, saves some strndup()'ing */
warc_string_t fnam;
/* warc record type, not that we really use it a lot */
@@ -321,7 +322,14 @@ start_over:
* malloc()+free() roundtrip */
if (fnam.len + 1U > w->pool.len) {
w->pool.len = ((fnam.len + 64U) / 64U) * 64U;
- w->pool.str = realloc(w->pool.str, w->pool.len);
+ tmp = realloc(w->pool.str, w->pool.len);
+ if (tmp == NULL) {
+ archive_set_error(
+ &a->archive, ENOMEM,
+ "Out of memory");
+ return (ARCHIVE_FATAL);
+ }
+ w->pool.str = tmp;
}
memcpy(w->pool.str, fnam.str, fnam.len);
w->pool.str[fnam.len] = '\0';
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_private.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_private.h:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_write_private.h:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_private.h:1.8 Fri Apr 12 15:39:52 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_private.h Tue Apr 30 06:05:20 2024
@@ -158,7 +158,7 @@ int __archive_write_program_write(struct
struct archive_write_program_data *, const void *, size_t);
/*
- * Get a encryption passphrase.
+ * Get an encryption passphrase.
*/
const char * __archive_write_get_passphrase(struct archive_write *a);
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/libarchive_internals.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/libarchive_internals.3:1.8 pkgsrc/archivers/libarchive/files/libarchive/libarchive_internals.3:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/libarchive_internals.3:1.8 Fri Apr 12 15:39:53 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/libarchive_internals.3 Tue Apr 30 06:05:20 2024
@@ -124,7 +124,7 @@ to read the entire file into memory at o
entire file to libarchive as a single block;
other clients may begin asynchronous I/O operations for the
next block on each request.
-.Ss Decompresssion Layer
+.Ss Decompression Layer
The decompression layer not only handles decompression,
it also buffers data so that the format handlers see a
much nicer I/O model.
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c:1.14 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c:1.15
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c:1.14 Fri Apr 12 15:39:51 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c Tue Apr 30 06:05:19 2024
@@ -416,8 +416,8 @@ next_line(struct archive_read *a,
}
/*
- * Compare characters with a mtree keyword.
- * Returns the length of a mtree keyword if matched.
+ * Compare characters with an mtree keyword.
+ * Returns the length of an mtree keyword if matched.
* Returns 0 if not matched.
*/
static int
@@ -515,7 +515,7 @@ bid_keyword(const char *p, ssize_t len)
/*
* Test whether there is a set of mtree keywords.
- * Returns the number of keyword.
+ * Returns the number of keywords.
* Returns -1 if we got incorrect sequence.
* This function expects a set of "<space characters>keyword=value".
* When "unset" is specified, expects a set of "<space characters>keyword".
@@ -760,7 +760,7 @@ detect_form(struct archive_read *a, int
multiline = 1;
else {
/* We've got plenty of correct lines
- * to assume that this file is a mtree
+ * to assume that this file is an mtree
* format. */
if (++entry_cnt >= MAX_BID_ENTRY)
break;
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar.c:1.9 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar.c:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar.c:1.9 Fri Apr 12 15:39:51 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar.c Tue Apr 30 06:05:19 2024
@@ -2176,6 +2176,19 @@ read_data_compressed(struct archive_read
{
start = rar->offset;
end = start + rar->dictionary_size;
+
+ /* We don't want to overflow the window and overwrite data that we write
+ * at 'start'. Therefore, reduce the end length by the maximum match size,
+ * which is 260 bytes. You can compute this maximum by looking at the
+ * definition of 'expand', in particular when 'symbol >= 271'. */
+ /* NOTE: It's possible for 'dictionary_size' to be less than this 260
+ * value, however that will only be the case when 'unp_size' is small,
+ * which should only happen when the entry size is small and there's no
+ * risk of overflowing the buffer */
+ if (rar->dictionary_size > 260) {
+ end -= 260;
+ }
+
if (rar->filters.filterstart < end) {
end = rar->filters.filterstart;
}
@@ -3615,7 +3628,7 @@ execute_filter_e8(struct rar_filter *fil
uint32_t filesize = 0x1000000;
uint32_t i;
- if (length > PROGRAM_WORK_SIZE || length < 4)
+ if (length > PROGRAM_WORK_SIZE || length <= 4)
return 0;
for (i = 0; i <= length - 5; i++)
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_xar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_xar.c:1.9 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_xar.c:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_xar.c:1.9 Fri Apr 12 15:39:51 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_xar.c Tue Apr 30 06:05:19 2024
@@ -2055,6 +2055,11 @@ xml_start(struct archive_read *a, const
attr = attr->next) {
if (strcmp(attr->name, "link") != 0)
continue;
+ if (xar->file->hdnext != NULL || xar->file->link != 0) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "File with multiple link targets");
+ return (ARCHIVE_FATAL);
+ }
if (strcmp(attr->value, "original") == 0) {
xar->file->hdnext = xar->hdlink_orgs;
xar->hdlink_orgs = xar->file;
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_zip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_zip.c:1.13 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_zip.c:1.14
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_zip.c:1.13 Fri Apr 12 15:39:51 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_zip.c Tue Apr 30 06:05:19 2024
@@ -1393,7 +1393,7 @@ check_authentication_code(struct archive
* [CRC32] [compressed low] [compressed high] [uncompressed low] [uncompressed high] [other PK marker]
* ```
* Since the 32-bit and 64-bit compressed sizes both match, the
- * actualy size must fit in 32 bits, which implies the high-order
+ * actual size must fit in 32 bits, which implies the high-order
* word of the compressed size is zero. So we know the uncompressed
* low word is zero, which again implies that if we accept the shorter
* format, there will not be a valid PK marker following it.
@@ -4083,6 +4083,17 @@ slurp_central_directory(struct archive_r
} else {
/* Generate resource fork name to find its
* resource file at zip->tree_rsrc. */
+
+ /* If this is an entry ending with slash,
+ * make the resource for name slash-less
+ * as the actual resource fork doesn't end with '/'.
+ */
+ size_t tmp_length = filename_length;
+ if (tmp_length > 0 && name[tmp_length - 1] == '/') {
+ tmp_length--;
+ r = rsrc_basename(name, tmp_length);
+ }
+
archive_strcpy(&(zip_entry->rsrcname),
"__MACOSX/");
archive_strncat(&(zip_entry->rsrcname),
@@ -4090,7 +4101,7 @@ slurp_central_directory(struct archive_r
archive_strcat(&(zip_entry->rsrcname), "._");
archive_strncat(&(zip_entry->rsrcname),
name + (r - name),
- filename_length - (r - name));
+ tmp_length - (r - name));
/* Register an entry to RB tree to sort it by
* file offset. */
__archive_rb_tree_insert_node(&zip->tree,
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c:1.4 Fri Apr 12 15:39:52 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c Tue Apr 30 06:05:19 2024
@@ -29,6 +29,9 @@
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
@@ -38,6 +41,9 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#ifdef HAVE_ZSTD_H
#include <zstd.h>
#endif
@@ -190,6 +196,7 @@ string_to_number(const char *string, int
return (ARCHIVE_OK);
}
+#if HAVE_ZSTD_H && HAVE_ZSTD_compressStream
static int
string_to_size(const char *string, size_t *numberp)
{
@@ -224,6 +231,7 @@ string_to_size(const char *string, size_
*numberp = (size_t)(number << shift);
return (ARCHIVE_OK);
}
+#endif
/*
* Set write options.
@@ -264,7 +272,20 @@ archive_compressor_zstd_options(struct a
if (string_to_number(value, &threads) != ARCHIVE_OK) {
return (ARCHIVE_WARN);
}
- if (threads < 0) {
+
+#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
+ if (threads == 0) {
+ threads = sysconf(_SC_NPROCESSORS_ONLN);
+ }
+#elif !defined(__CYGWIN__) && defined(_WIN32_WINNT) && \
+ _WIN32_WINNT >= 0x0601 /* _WIN32_WINNT_WIN7 */
+ if (threads == 0) {
+ DWORD winCores = GetActiveProcessorCount(
+ ALL_PROCESSOR_GROUPS);
+ threads = (intmax_t)winCores;
+ }
+#endif
+ if (threads < 0 || threads > INT_MAX) {
return (ARCHIVE_WARN);
}
data->threads = (int)threads;
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.10 pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.11
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.10 Fri Apr 12 15:39:52 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c Tue Apr 30 06:05:20 2024
@@ -4427,7 +4427,8 @@ fixup_appledouble(struct archive_write_d
#else
la_stat(datafork.s, &st) == -1 ||
#endif
- (st.st_mode & AE_IFMT) != AE_IFREG)
+ (((st.st_mode & AE_IFMT) != AE_IFREG) &&
+ ((st.st_mode & AE_IFMT) != AE_IFDIR)))
goto skip_appledouble;
/*
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c:1.6 Fri Apr 12 15:39:52 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c Tue Apr 30 06:05:20 2024
@@ -387,7 +387,7 @@ archive_write_gnutar_header(struct archi
if (r != 0) {
if (errno == ENOMEM) {
archive_set_error(&a->archive, ENOMEM,
- "Can't allocate memory for Pathame");
+ "Can't allocate memory for pathname");
ret = ARCHIVE_FATAL;
goto exit_write_header;
}
Index: pkgsrc/archivers/libarchive/files/libarchive/test/CMakeLists.txt
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/CMakeLists.txt:1.10 pkgsrc/archivers/libarchive/files/libarchive/test/CMakeLists.txt:1.11
--- pkgsrc/archivers/libarchive/files/libarchive/test/CMakeLists.txt:1.10 Fri Apr 12 15:39:53 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/CMakeLists.txt Tue Apr 30 06:05:20 2024
@@ -172,6 +172,7 @@ IF(ENABLE_TEST)
test_read_format_ustar_filename.c
test_read_format_warc.c
test_read_format_xar.c
+ test_read_format_xar_doublelink.c
test_read_format_zip.c
test_read_format_zip_7075_utf8_paths.c
test_read_format_zip_comment_stored.c
Index: pkgsrc/archivers/libarchive/files/libarchive/test/list.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/list.h:1.12 pkgsrc/archivers/libarchive/files/libarchive/test/list.h:1.13
--- pkgsrc/archivers/libarchive/files/libarchive/test/list.h:1.12 Fri Apr 12 15:39:53 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/list.h Tue Apr 30 06:05:20 2024
@@ -382,6 +382,7 @@ DEFINE_TEST(test_read_format_tz)
DEFINE_TEST(test_read_format_ustar_filename)
DEFINE_TEST(test_read_format_warc)
DEFINE_TEST(test_read_format_xar)
+DEFINE_TEST(test_read_format_xar_doublelink)
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)
@@ -491,6 +492,7 @@ 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_appledouble_zip)
DEFINE_TEST(test_write_disk_failures)
DEFINE_TEST(test_write_disk_fixup)
DEFINE_TEST(test_write_disk_hardlink)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzip.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzip.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzip.c:1.2 Fri Apr 12 15:39:53 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzip.c Tue Apr 30 06:05:20 2024
@@ -195,7 +195,6 @@ compat_lzip_4(const char *name)
assertEqualString("test.bin", archive_entry_pathname(ae));
/* Verify the end-of-archive. */
- archive_set_error(a, ARCHIVE_OK, NULL);
assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
/* Verify that the format detection worked. */
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.c:1.5 Fri Apr 12 15:39:56 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.c Tue Apr 30 06:05:20 2024
@@ -236,3 +236,87 @@ DEFINE_TEST(test_write_disk_appledouble)
assertEqualFile("hfscmp/file3", "nocmp/file3");
#endif
}
+
+/* Test writing apple doubles to disk from zip format */
+DEFINE_TEST(test_write_disk_appledouble_zip)
+{
+#if !defined(__APPLE__) || !defined(UF_COMPRESSED) || !defined(HAVE_SYS_XATTR_H)\
+ || !defined(HAVE_ZLIB_H)
+ skipping("MacOS-specific AppleDouble test");
+#else
+ const char *refname = "test_write_disk_appledouble_zip.zip";
+ struct archive *ad, *a;
+ struct archive_entry *ae;
+ struct stat st;
+
+ extract_reference_file(refname);
+
+ /*
+ * Extract an archive to disk.
+ */
+ assert((ad = archive_write_disk_new()) != NULL);
+ assertEqualIntA(ad, ARCHIVE_OK,
+ archive_write_disk_set_standard_lookup(ad));
+ assertEqualIntA(ad, ARCHIVE_OK,
+ archive_write_disk_set_options(ad,
+ ARCHIVE_EXTRACT_TIME |
+ ARCHIVE_EXTRACT_SECURE_SYMLINKS |
+ ARCHIVE_EXTRACT_SECURE_NODOTDOT));
+
+ 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, 512 * 20));
+
+ /* Skip The top level directory */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualString("apple_double_dir/", archive_entry_pathname(ae));
+
+ /* Extract apple_double_test */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualString("apple_double_dir/apple_double_dir_test/", archive_entry_pathname(ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+
+ /* Extract ._apple_double_dir_test which will be merged into apple_double_dir_test as metadata. */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualString("apple_double_dir/._apple_double_dir_test", archive_entry_pathname(ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+
+ /* Extract test_file */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualString("apple_double_dir/test_file", archive_entry_pathname(ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+
+ /* Extract ._test_file which will be merged into test_file as metadata. */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualString("apple_double_dir/._test_file", archive_entry_pathname(ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+
+ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+ assertEqualIntA(ad, ARCHIVE_OK, archive_write_free(ad));
+
+ /* Test test_file */
+ assertEqualInt(0, stat("apple_double_dir/test_file", &st));
+ assertFileSize("apple_double_dir/test_file", 5);
+ failure("'%s' should have Resource Fork", "test_file");
+ assertEqualInt(1, has_xattr("apple_double_dir/test_file", "com.apple.ResourceFork"));
+
+ /* Test apple_double_dir_test */
+ failure("'%s' should have quarantine xattr", "apple_double_dir_test");
+ assertEqualInt(1, has_xattr("apple_double_dir/apple_double_dir_test", "com.apple.quarantine"));
+
+ /* Test ._test_file. */
+ failure("'apple_double_dir/._test_file' should be merged and removed");
+ assertFileNotExists("apple_double_dir/._test_file");
+
+ /* Test ._apple_double_dir_test */
+ failure("'apple_double_dir/._._apple_double_dir_test' should be merged and removed");
+ assertFileNotExists("apple_double_dir/._apple_double_dir_test");
+
+ assertChdir("..");
+
+#endif
+}
Index: pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c
diff -u pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c:1.7 pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c:1.7 Fri Apr 12 15:39:57 2024
+++ pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c Tue Apr 30 06:05:20 2024
@@ -76,6 +76,7 @@
#if defined(_WIN32) && !defined(__CYGWIN__)
+#include <string.h>
#include <windows.h>
static char *
@@ -113,8 +114,7 @@ readpassphrase(const char *prompt, char
WriteFile(hStdout, "\r\n", 2, NULL, NULL);
buf[rbytes] = '\0';
/* Remove trailing carriage return(s). */
- if (rbytes > 2 && buf[rbytes - 2] == '\r' && buf[rbytes - 1] == '\n')
- buf[rbytes - 2] = '\0';
+ buf[strcspn(buf, "\r\n")] = '\0';
return (buf);
}
Index: pkgsrc/archivers/libarchive/files/tar/bsdtar.1
diff -u pkgsrc/archivers/libarchive/files/tar/bsdtar.1:1.13 pkgsrc/archivers/libarchive/files/tar/bsdtar.1:1.14
--- pkgsrc/archivers/libarchive/files/tar/bsdtar.1:1.13 Fri Apr 12 15:39:57 2024
+++ pkgsrc/archivers/libarchive/files/tar/bsdtar.1 Tue Apr 30 06:05:20 2024
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd March 1, 2024
+.Dd April 23, 2024
.Dt TAR 1
.Os
.Sh NAME
@@ -644,14 +644,13 @@ A decimal integer from 4 to 7 specifying
.It Cm lz4:block-dependence
Use the previous block of the block being compressed for
a compression dictionary to improve compression ratio.
-.It Cm zstd:compression-level
-A decimal integer specifying the zstd compression level. Supported values depend
+.It Cm zstd:compression-level Ns = Ns Ar N
+A decimal integer specifying the zstd compression level.
+Supported values depend
on the library version, common values are from 1 to 22.
-.It Cm zstd:threads
-Specify the number of worker threads to use.
-Setting threads to a special value 0 makes
-.Xr zstd 1
-use as many threads as there are CPU cores on the system.
+.It Cm zstd:threads Ns = Ns Ar N
+Specify the number of worker threads to use, or 0 to use as many
+threads as there are CPU cores in the system.
.It Cm zstd:frame-per-file
Start a new compression frame at the beginning of each file in the
archive.
Index: pkgsrc/archivers/libarchive/files/tar/bsdtar.c
diff -u pkgsrc/archivers/libarchive/files/tar/bsdtar.c:1.12 pkgsrc/archivers/libarchive/files/tar/bsdtar.c:1.13
--- pkgsrc/archivers/libarchive/files/tar/bsdtar.c:1.12 Fri Apr 12 15:39:57 2024
+++ pkgsrc/archivers/libarchive/files/tar/bsdtar.c Tue Apr 30 06:05:20 2024
@@ -157,6 +157,7 @@ main(int argc, char **argv)
char *tptr, *uptr;
char possible_help_request;
char buff[16];
+ long l;
/*
* Use a pointer for consistency, but stack-allocated storage
@@ -301,16 +302,15 @@ main(int argc, char **argv)
/* libarchive doesn't need this; just ignore it. */
break;
case 'b': /* SUSv2 */
- errno = 0;
tptr = NULL;
- t = (int)strtol(bsdtar->argument, &tptr, 10);
- if (errno || t <= 0 || t > 8192 ||
+ l = strtol(bsdtar->argument, &tptr, 10);
+ if (l <= 0 || l > 8192L ||
*(bsdtar->argument) == '\0' || tptr == NULL ||
*tptr != '\0') {
lafe_errc(1, 0, "Invalid or out of range "
"(1..8192) argument to -b");
}
- bsdtar->bytes_per_block = 512 * t;
+ bsdtar->bytes_per_block = 512 * (int)l;
/* Explicit -b forces last block size. */
bsdtar->bytes_in_last_block = bsdtar->bytes_per_block;
break;
@@ -369,44 +369,42 @@ main(int argc, char **argv)
bsdtar->filename = bsdtar->argument;
break;
case OPTION_GID: /* cpio */
- errno = 0;
tptr = NULL;
- t = (int)strtol(bsdtar->argument, &tptr, 10);
- if (errno || t < 0 || *(bsdtar->argument) == '\0' ||
+ l = strtol(bsdtar->argument, &tptr, 10);
+ if (l < 0 || l >= INT_MAX || *(bsdtar->argument) == '\0' ||
tptr == NULL || *tptr != '\0') {
lafe_errc(1, 0, "Invalid argument to --gid");
}
- bsdtar->gid = t;
+ bsdtar->gid = (int)l;
break;
case OPTION_GNAME: /* cpio */
bsdtar->gname = bsdtar->argument;
break;
case OPTION_GROUP: /* GNU tar */
- errno = 0;
tptr = NULL;
uptr = strchr(bsdtar->argument, ':');
- if(uptr != NULL) {
- if(uptr[1] == 0) {
+ if (uptr != NULL) {
+ if (uptr[1] == '\0') {
lafe_errc(1, 0, "Invalid argument to --group (missing id after :)");
}
uptr[0] = 0;
uptr++;
- t = (int)strtol(uptr, &tptr, 10);
- if (errno || t < 0 || *uptr == '\0' ||
+ l = strtol(uptr, &tptr, 10);
+ if (l < 0 || l >= INT_MAX || *uptr == '\0' ||
tptr == NULL || *tptr != '\0') {
lafe_errc(1, 0, "Invalid argument to --group (%s is not a number)", uptr);
} else {
- bsdtar->gid = t;
+ bsdtar->gid = (int)l;
}
bsdtar->gname = bsdtar->argument;
} else {
- t = (int)strtol(bsdtar->argument, &tptr, 10);
- if (errno || t < 0 || *(bsdtar->argument) == '\0' ||
+ l = strtol(bsdtar->argument, &tptr, 10);
+ if (l < 0 || l >= INT_MAX || *(bsdtar->argument) == '\0' ||
tptr == NULL || *tptr != '\0') {
bsdtar->gname = bsdtar->argument;
} else {
- bsdtar->gid = t;
+ bsdtar->gid = (int)l;
bsdtar->gname = "";
}
}
@@ -662,31 +660,30 @@ main(int argc, char **argv)
bsdtar->option_options = bsdtar->argument;
break;
case OPTION_OWNER: /* GNU tar */
- errno = 0;
tptr = NULL;
uptr = strchr(bsdtar->argument, ':');
- if(uptr != NULL) {
- if(uptr[1] == 0) {
+ if (uptr != NULL) {
+ if (uptr[1] == 0) {
lafe_errc(1, 0, "Invalid argument to --owner (missing id after :)");
}
uptr[0] = 0;
uptr++;
- t = (int)strtol(uptr, &tptr, 10);
- if (errno || t < 0 || *uptr == '\0' ||
+ l = strtol(uptr, &tptr, 10);
+ if (l < 0 || l >= INT_MAX || *uptr == '\0' ||
tptr == NULL || *tptr != '\0') {
lafe_errc(1, 0, "Invalid argument to --owner (%s is not a number)", uptr);
} else {
- bsdtar->uid = t;
+ bsdtar->uid = (int)l;
}
bsdtar->uname = bsdtar->argument;
} else {
- t = (int)strtol(bsdtar->argument, &tptr, 10);
- if (errno || t < 0 || *(bsdtar->argument) == '\0' ||
+ l = strtol(bsdtar->argument, &tptr, 10);
+ if (l < 0 || l >= INT_MAX || *(bsdtar->argument) == '\0' ||
tptr == NULL || *tptr != '\0') {
bsdtar->uname = bsdtar->argument;
} else {
- bsdtar->uid = t;
+ bsdtar->uid = (int)l;
bsdtar->uname = "";
}
}
@@ -748,15 +745,14 @@ main(int argc, char **argv)
bsdtar->extract_flags |= ARCHIVE_EXTRACT_OWNER;
break;
case OPTION_STRIP_COMPONENTS: /* GNU tar 1.15 */
- errno = 0;
tptr = NULL;
- t = (int)strtol(bsdtar->argument, &tptr, 10);
- if (errno || t < 0 || *(bsdtar->argument) == '\0' ||
+ l = strtol(bsdtar->argument, &tptr, 10);
+ if (l < 0 || l > 100000L || *(bsdtar->argument) == '\0' ||
tptr == NULL || *tptr != '\0') {
lafe_errc(1, 0, "Invalid argument to "
"--strip-components");
}
- bsdtar->strip_components = t;
+ bsdtar->strip_components = (int)l;
break;
case 'T': /* GNU tar */
bsdtar->names_from_file = bsdtar->argument;
@@ -776,14 +772,13 @@ main(int argc, char **argv)
set_mode(bsdtar, opt);
break;
case OPTION_UID: /* cpio */
- errno = 0;
tptr = NULL;
- t = (int)strtol(bsdtar->argument, &tptr, 10);
- if (errno || t < 0 || *(bsdtar->argument) == '\0' ||
+ l = strtol(bsdtar->argument, &tptr, 10);
+ if (l < 0 || l >= INT_MAX || *(bsdtar->argument) == '\0' ||
tptr == NULL || *tptr != '\0') {
lafe_errc(1, 0, "Invalid argument to --uid");
}
- bsdtar->uid = t;
+ bsdtar->uid = (int)l;
break;
case OPTION_UNAME: /* cpio */
bsdtar->uname = bsdtar->argument;
Index: pkgsrc/archivers/libarchive/files/tar/cmdline.c
diff -u pkgsrc/archivers/libarchive/files/tar/cmdline.c:1.9 pkgsrc/archivers/libarchive/files/tar/cmdline.c:1.10
--- pkgsrc/archivers/libarchive/files/tar/cmdline.c:1.9 Fri Apr 12 15:39:57 2024
+++ pkgsrc/archivers/libarchive/files/tar/cmdline.c Tue Apr 30 06:05:20 2024
@@ -218,12 +218,18 @@ bsdtar_getopt(struct bsdtar *bsdtar)
enum { state_start = 0, state_old_tar, state_next_word,
state_short, state_long };
- const struct bsdtar_option *popt, *match = NULL, *match2 = NULL;
- const char *p, *long_prefix = "--";
+ const struct bsdtar_option *popt, *match, *match2;
+ const char *p, *long_prefix;
size_t optlength;
- int opt = '?';
- int required = 0;
+ int opt;
+ int required;
+again:
+ match = NULL;
+ match2 = NULL;
+ long_prefix = "--";
+ opt = '?';
+ required = 0;
bsdtar->argument = NULL;
/* First time through, initialize everything. */
@@ -310,7 +316,7 @@ bsdtar_getopt(struct bsdtar *bsdtar)
if (opt == '\0') {
/* End of this group; recurse to get next option. */
bsdtar->getopt_state = state_next_word;
- return bsdtar_getopt(bsdtar);
+ goto again;
}
/* Does this option take an argument? */
Home |
Main Index |
Thread Index |
Old Index