Module Name: src
Committed By: joerg
Date: Wed Jul 24 14:07:17 UTC 2019
Modified Files:
src/distrib/sets/lists/comp: mi
src/external/bsd/libarchive: Makefile prepare-import.sh
src/external/bsd/libarchive/include: config_netbsd.h
src/external/bsd/libarchive/lib/libarchive: Makefile
Log Message:
Update build glue and configuration for libarchive 3.4.0.
To generate a diff of this commit:
cvs rdiff -u -r1.2277 -r1.2278 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libarchive/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libarchive/prepare-import.sh
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/libarchive/include/config_netbsd.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/libarchive/lib/libarchive/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2277 src/distrib/sets/lists/comp/mi:1.2278
--- src/distrib/sets/lists/comp/mi:1.2277 Mon Jun 10 10:28:41 2019
+++ src/distrib/sets/lists/comp/mi Wed Jul 24 14:07:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2277 2019/06/10 10:28:41 mrg Exp $
+# $NetBSD: mi,v 1.2278 2019/07/24 14:07:16 joerg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -5557,6 +5557,7 @@
./usr/share/man/cat3/archive_entry_linkresolver_free.0 comp-c-catman .cat
./usr/share/man/cat3/archive_entry_linkresolver_new.0 comp-c-catman .cat
./usr/share/man/cat3/archive_entry_linkresolver_set_strategy.0 comp-c-catman .cat
+./usr/share/man/cat3/archive_entry_misc.0 comp-c-catman .cat
./usr/share/man/cat3/archive_entry_mode.0 comp-c-catman .cat
./usr/share/man/cat3/archive_entry_mtime.0 comp-c-catman .cat
./usr/share/man/cat3/archive_entry_mtime_is_set.0 comp-c-catman .cat
@@ -13613,6 +13614,7 @@
./usr/share/man/html3/archive_entry_linkresolver_free.html comp-c-htmlman html
./usr/share/man/html3/archive_entry_linkresolver_new.html comp-c-htmlman html
./usr/share/man/html3/archive_entry_linkresolver_set_strategy.html comp-c-htmlman html
+./usr/share/man/html3/archive_entry_misc.html comp-c-htmlman html
./usr/share/man/html3/archive_entry_mode.html comp-c-htmlman html
./usr/share/man/html3/archive_entry_mtime.html comp-c-htmlman html
./usr/share/man/html3/archive_entry_mtime_is_set.html comp-c-htmlman html
@@ -21506,6 +21508,7 @@
./usr/share/man/man3/archive_entry_linkresolver_free.3 comp-c-man .man
./usr/share/man/man3/archive_entry_linkresolver_new.3 comp-c-man .man
./usr/share/man/man3/archive_entry_linkresolver_set_strategy.3 comp-c-man .man
+./usr/share/man/man3/archive_entry_misc.3 comp-c-man .man
./usr/share/man/man3/archive_entry_mode.3 comp-c-man .man
./usr/share/man/man3/archive_entry_mtime.3 comp-c-man .man
./usr/share/man/man3/archive_entry_mtime_is_set.3 comp-c-man .man
Index: src/external/bsd/libarchive/Makefile
diff -u src/external/bsd/libarchive/Makefile:1.1 src/external/bsd/libarchive/Makefile:1.2
--- src/external/bsd/libarchive/Makefile:1.1 Fri Sep 19 22:01:25 2008
+++ src/external/bsd/libarchive/Makefile Wed Jul 24 14:07:17 2019
@@ -1,5 +1,15 @@
-# $NetBSD: Makefile,v 1.1 2008/09/19 22:01:25 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2019/07/24 14:07:17 joerg Exp $
SUBDIR= lib .WAIT bin
+CONFIG_DIR:= ${.PARSEDIR}/dist
+
+run-configure:
+ [ ! -d tmp ] || rm -r tmp
+ mkdir -p tmp
+ cd tmp && CONFIG_SITE= ${CONFIG_DIR}/configure --without-xml2 --host=${MACHINE_GNU_ARCH}--netbsd \
+ CC=${CC:Q} CFLAGS=${CFLAGS:N-Werror:Q} CPPFLAGS=${CPPFLAGS:Q} LDFLAGS=${LDFLAGS:Q}
+ rm -r tmp
+
+.include <bsd.own.mk>
.include <bsd.subdir.mk>
Index: src/external/bsd/libarchive/prepare-import.sh
diff -u src/external/bsd/libarchive/prepare-import.sh:1.3 src/external/bsd/libarchive/prepare-import.sh:1.4
--- src/external/bsd/libarchive/prepare-import.sh:1.3 Thu Apr 20 13:11:04 2017
+++ src/external/bsd/libarchive/prepare-import.sh Wed Jul 24 14:07:17 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.3 2017/04/20 13:11:04 joerg Exp $
+# $NetBSD: prepare-import.sh,v 1.4 2019/07/24 14:07:17 joerg Exp $
#
# Extract the new tarball and rename the libarchive-X.Y.Z directory
# to dist. Run this script and check for additional files and
@@ -7,13 +7,6 @@
set -e
-mkdir tmp
-cd tmp
-../dist/configure --without-xml2 --without-expat
-mv config.h ../include/config_netbsd.h
-cd ..
-rm -rf tmp
-
cd dist
rm -rf build contrib doc examples test_utils autom4te.cache
Index: src/external/bsd/libarchive/include/config_netbsd.h
diff -u src/external/bsd/libarchive/include/config_netbsd.h:1.9 src/external/bsd/libarchive/include/config_netbsd.h:1.10
--- src/external/bsd/libarchive/include/config_netbsd.h:1.9 Sun May 21 22:32:55 2017
+++ src/external/bsd/libarchive/include/config_netbsd.h Wed Jul 24 14:07:17 2019
@@ -152,13 +152,13 @@
/* #undef ARCHIVE_XATTR_LINUX */
/* Version number of bsdcat */
-#define BSDCAT_VERSION_STRING "3.3.2dev"
+#define BSDCAT_VERSION_STRING "3.4.0"
/* Version number of bsdcpio */
-#define BSDCPIO_VERSION_STRING "3.3.2dev"
+#define BSDCPIO_VERSION_STRING "3.4.0"
/* Version number of bsdtar */
-#define BSDTAR_VERSION_STRING "3.3.2dev"
+#define BSDTAR_VERSION_STRING "3.4.0"
/* Define to 1 if the system has the type `ace_t'. */
/* #undef HAVE_ACE_T */
@@ -283,6 +283,9 @@
/* Define to 1 if you have the <bcrypt.h> header file. */
/* #undef HAVE_BCRYPT_H */
+/* Define to 1 if you have the <blake2.h> header file. */
+/* #undef HAVE_BLAKE2_H */
+
/* Define to 1 if you have the <bzlib.h> header file. */
#define HAVE_BZLIB_H 1
@@ -599,6 +602,9 @@
/* Define to 1 if you have the `acl' library (-lacl). */
/* #undef HAVE_LIBACL */
+/* Define to 1 if you have the `b2' library (-lb2). */
+/* #undef HAVE_LIBB2 */
+
/* Define to 1 if you have the `bz2' library (-lbz2). */
#define HAVE_LIBBZ2 1
@@ -656,6 +662,9 @@
/* Define to 1 if you have the `z' library (-lz). */
#define HAVE_LIBZ 1
+/* Define to 1 if you have the `zstd' library (-lzstd). */
+/* #undef HAVE_LIBZSTD */
+
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
@@ -814,7 +823,7 @@
#define HAVE_PIPE 1
/* Define to 1 if you have the `PKCS5_PBKDF2_HMAC_SHA1' function. */
-/* #undef HAVE_PKCS5_PBKDF2_HMAC_SHA1 */
+#define HAVE_PKCS5_PBKDF2_HMAC_SHA1 1
/* Define to 1 if you have the `poll' function. */
#define HAVE_POLL 1
@@ -911,7 +920,7 @@
/* Define to 1 if `stat' has the bug that it succeeds when given the
zero-length file name argument. */
-/* #undef HAVE_STAT_EMPTY_STRING_BUG */
+#define HAVE_STAT_EMPTY_STRING_BUG 1
/* Define to 1 if you have the <stdarg.h> header file. */
#define HAVE_STDARG_H 1
@@ -1053,6 +1062,9 @@
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
+/* Define to 1 if you have the <sys/sysmacros.h> header file. */
+/* #undef HAVE_SYS_SYSMACROS_H */
+
/* Define to 1 if you have the <sys/time.h> header file. */
#define HAVE_SYS_TIME_H 1
@@ -1089,6 +1101,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
+/* Define to 1 if you have the `unlinkat' function. */
+#define HAVE_UNLINKAT 1
+
/* Define to 1 if you have the `unsetenv' function. */
#define HAVE_UNSETENV 1
@@ -1167,6 +1182,9 @@
/* Define to 1 if you have the <zlib.h> header file. */
#define HAVE_ZLIB_H 1
+/* Define to 1 if you have the <zstd.h> header file. */
+/* #undef HAVE_ZSTD_H */
+
/* Define to 1 if you have the `_ctime64_s' function. */
/* #undef HAVE__CTIME64_S */
@@ -1186,17 +1204,16 @@
#define ICONV_CONST const
/* Version number of libarchive as a single integer */
-#define LIBARCHIVE_VERSION_NUMBER "3003002"
+#define LIBARCHIVE_VERSION_NUMBER "3004000"
/* Version number of libarchive */
-#define LIBARCHIVE_VERSION_STRING "3.3.2dev"
+#define LIBARCHIVE_VERSION_STRING "3.4.0"
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"
/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
@@ -1220,7 +1237,7 @@
#define PACKAGE_NAME "libarchive"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libarchive 3.3.2dev"
+#define PACKAGE_STRING "libarchive 3.4.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libarchive"
@@ -1229,7 +1246,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "3.3.2dev"
+#define PACKAGE_VERSION "3.4.0"
/* Define to 1 if PCRE_STATIC needs to be defined. */
/* #undef PCRE_STATIC */
@@ -1269,7 +1286,7 @@
/* Version number of package */
-#define VERSION "3.3.2dev"
+#define VERSION "3.4.0"
/* Define to '0x0502' for Windows Server 2003 APIs. */
/* #undef WINVER */
Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.9 src/external/bsd/libarchive/lib/libarchive/Makefile:1.10
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.9 Mon Feb 4 04:05:15 2019
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Wed Jul 24 14:07:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/02/04 04:05:15 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2019/07/24 14:07:17 joerg Exp $
.include <bsd.init.mk>
@@ -14,6 +14,8 @@ LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libb
z ${NETBSDSRCDIR}/lib/libz
SRCS= archive_acl.c \
+ archive_blake2sp_ref.c \
+ archive_blake2s_ref.c \
archive_check_magic.c \
archive_cmdline.c \
archive_cryptor.c \
@@ -32,17 +34,18 @@ SRCS= archive_acl.c \
archive_pack_dev.c \
archive_pathmatch.c \
archive_ppmd7.c \
+ archive_ppmd8.c \
archive_random.c \
archive_rb.c \
- archive_read.c \
archive_read_add_passphrase.c \
archive_read_append_filter.c \
+ archive_read.c \
archive_read_data_into_fd.c \
archive_read_disk_entry_from_file.c \
archive_read_disk_posix.c \
archive_read_disk_set_standard_lookup.c \
- archive_read_extract.c \
archive_read_extract2.c \
+ archive_read_extract.c \
archive_read_open_fd.c \
archive_read_open_file.c \
archive_read_open_filename.c \
@@ -62,6 +65,7 @@ SRCS= archive_acl.c \
archive_read_support_filter_rpm.c \
archive_read_support_filter_uu.c \
archive_read_support_filter_xz.c \
+ archive_read_support_filter_zstd.c \
archive_read_support_format_7zip.c \
archive_read_support_format_all.c \
archive_read_support_format_ar.c \
@@ -72,6 +76,7 @@ SRCS= archive_acl.c \
archive_read_support_format_iso9660.c \
archive_read_support_format_lha.c \
archive_read_support_format_mtree.c \
+ archive_read_support_format_rar5.c \
archive_read_support_format_rar.c \
archive_read_support_format_raw.c \
archive_read_support_format_tar.c \
@@ -83,11 +88,10 @@ SRCS= archive_acl.c \
archive_util.c \
archive_version_details.c \
archive_virtual.c \
- archive_write.c \
- archive_write_add_filter.c \
archive_write_add_filter_b64encode.c \
archive_write_add_filter_by_name.c \
archive_write_add_filter_bzip2.c \
+ archive_write_add_filter.c \
archive_write_add_filter_compress.c \
archive_write_add_filter_grzip.c \
archive_write_add_filter_gzip.c \
@@ -98,16 +102,18 @@ SRCS= archive_acl.c \
archive_write_add_filter_program.c \
archive_write_add_filter_uuencode.c \
archive_write_add_filter_xz.c \
+ archive_write_add_filter_zstd.c \
+ archive_write.c \
archive_write_disk_posix.c \
archive_write_disk_set_standard_lookup.c \
archive_write_open_fd.c \
archive_write_open_file.c \
archive_write_open_filename.c \
archive_write_open_memory.c \
- archive_write_set_format.c \
archive_write_set_format_7zip.c \
archive_write_set_format_ar.c \
archive_write_set_format_by_name.c \
+ archive_write_set_format.c \
archive_write_set_format_cpio.c \
archive_write_set_format_cpio_newc.c \
archive_write_set_format_filter_by_ext.c \
@@ -133,6 +139,7 @@ INCSDIR= /usr/include
MAN= archive_entry.3 \
archive_entry_acl.3 \
archive_entry_linkify.3 \
+ archive_entry_misc.3 \
archive_entry_paths.3 \
archive_entry_perms.3 \
archive_entry_stat.3 \
