[Midnightbsd-cvs] src [11135] trunk/lib/libarchive: update libarchive
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Jun 19 16:51:03 EDT 2018
Revision: 11135
http://svnweb.midnightbsd.org/src/?rev=11135
Author: laffer1
Date: 2018-06-19 16:51:03 -0400 (Tue, 19 Jun 2018)
Log Message:
-----------
update libarchive
Modified Paths:
--------------
trunk/lib/libarchive/Makefile
Added Paths:
-----------
trunk/lib/libarchive/config_midnightbsd.h
trunk/lib/libarchive/tests/
trunk/lib/libarchive/tests/Makefile
trunk/lib/libarchive/tests/functional_test.sh
Removed Paths:
-------------
trunk/lib/libarchive/config.h
Modified: trunk/lib/libarchive/Makefile
===================================================================
--- trunk/lib/libarchive/Makefile 2018-06-19 20:42:35 UTC (rev 11134)
+++ trunk/lib/libarchive/Makefile 2018-06-19 20:51:03 UTC (rev 11135)
@@ -1,29 +1,18 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libarchive/Makefile 324418 2017-10-08 20:55:45Z mm $
.include <bsd.own.mk>
-LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive
+LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
LIB= archive
-DPADD= ${LIBZ}
-LDADD= -lz
+DPADD= ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBPTHREAD} ${LIBBSDXML}
+LDADD= -lz -lbz2 -llzma -lpthread -lbsdxml
+CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
-DPADD+= ${LIBBZ2}
-LDADD+= -lbz2
-CFLAGS+= -DHAVE_BZLIB_H=1
-
-DPADD+= ${LIBLZMA}
-LDADD+= -llzma
-CFLAGS+=-DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
-
-DPADD+= ${LIBBSDXML}
-LDADD+= -lbsdxml
-
# It has no real relation to the libarchive version number.
SHLIB_MAJOR= 6
-WARNS?= 0
-
-CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config.h\"
+CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_midnightbsd.h\"
CFLAGS+= -I${.OBJDIR}
.if ${MK_OPENSSL} != "no"
@@ -41,6 +30,13 @@
SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=
.endif
+.if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mmips*} != "" || \
+ ${MACHINE_ARCH:Msparc64*} != "" || ${MACHINE_ARCH:Mia64*} != ""
+NO_WCAST_ALIGN= yes
+.if ${MACHINE_ARCH:M*64*} == ""
+CFLAGS+= -DPPMD_32BIT
+.endif
+.endif
NO_WCAST_ALIGN.clang=
.PATH: ${LIBARCHIVEDIR}/libarchive
@@ -53,6 +49,7 @@
archive_check_magic.c \
archive_cmdline.c \
archive_cryptor.c \
+ archive_disk_acl_freebsd.c \
archive_digest.c \
archive_entry.c \
archive_entry_copy_stat.c \
@@ -98,6 +95,7 @@
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 \
@@ -117,10 +115,10 @@
archive_string.c \
archive_string_sprintf.c \
archive_util.c \
+ archive_version_details.c \
archive_virtual.c \
archive_write.c \
archive_write_add_filter.c \
- archive_write_disk_acl.c \
archive_write_disk_set_standard_lookup.c \
archive_write_disk_posix.c \
archive_write_open_fd.c \
@@ -140,6 +138,7 @@
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_set_format.c \
archive_write_set_format_7zip.c \
archive_write_set_format_ar.c \
@@ -417,11 +416,8 @@
MLINKS+= archive_write_set_options.3 archive_write_set_option.3
MLINKS+= libarchive.3 archive.3
-.PHONY: check test clean-test
-check test:
- cd ${.CURDIR}/test && make obj && make test
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
-clean-test:
- cd ${.CURDIR}/test && make clean
-
.include <bsd.lib.mk>
Deleted: trunk/lib/libarchive/config.h
===================================================================
--- trunk/lib/libarchive/config.h 2018-06-19 20:42:35 UTC (rev 11134)
+++ trunk/lib/libarchive/config.h 2018-06-19 20:51:03 UTC (rev 11135)
@@ -1,250 +0,0 @@
-/*-
- * Copyright (c) 2003-2007 Tim Kientzle
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $MidnightBSD$
- */
-
-#include <osreldate.h>
-
-#define HAVE_ACL_CREATE_ENTRY 1
-#define HAVE_ACL_GET_FD_NP 1
-#define HAVE_ACL_GET_LINK_NP 1
-#define HAVE_ACL_GET_PERM_NP 1
-#define HAVE_ACL_INIT 1
-#define HAVE_ACL_IS_TRIVIAL_NP 1
-#define HAVE_ACL_PERMSET_T 1
-#define HAVE_ACL_SET_FD 1
-#define HAVE_ACL_SET_FD_NP 1
-#define HAVE_ACL_SET_FILE 1
-#define HAVE_ACL_SET_LINK_NP 1
-#define HAVE_ACL_USER 1
-#define HAVE_ARC4RANDOM_BUF 1
-#define HAVE_EXTATTR_GET_FILE 1
-#define HAVE_EXTATTR_LIST_FILE 1
-#define HAVE_EXTATTR_SET_FD 1
-#define HAVE_EXTATTR_SET_FILE 1
-#define HAVE_LZMA_STREAM_ENCODER_MT 1
-#define HAVE_STRUCT_XVFSCONF 1
-#define HAVE_SYS_ACL_H 1
-#define HAVE_SYS_EXTATTR_H 1
-
-#ifdef WITH_OPENSSL
-#define HAVE_LIBCRYPTO 1
-#define HAVE_OPENSSL_EVP_H 1
-#define HAVE_OPENSSL_MD5_H 1
-#define HAVE_OPENSSL_RIPEMD_H 1
-#define HAVE_OPENSSL_SHA_H 1
-#define HAVE_OPENSSL_SHA256_INIT 1
-#define HAVE_OPENSSL_SHA384_INIT 1
-#define HAVE_OPENSSL_SHA512_INIT 1
-#define HAVE_PKCS5_PBKDF2_HMAC_SHA1 1
-#define HAVE_SHA256 1
-#define HAVE_SHA384 1
-#define HAVE_SHA512 1
-#else
-#define HAVE_LIBMD 1
-#define HAVE_MD5_H 1
-#define HAVE_MD5INIT 1
-#define HAVE_RIPEMD_H 1
-#define HAVE_SHA_H 1
-#define HAVE_SHA1 1
-#define HAVE_SHA1_INIT 1
-#define HAVE_SHA256 1
-#define HAVE_SHA256_H 1
-#define HAVE_SHA256_INIT 1
-#define HAVE_SHA512 1
-#define HAVE_SHA512_H 1
-#define HAVE_SHA512_INIT 1
-#endif
-
-#define HAVE_BSDXML_H 1
-#define HAVE_BZLIB_H 1
-#define HAVE_CHFLAGS 1
-#define HAVE_CHOWN 1
-#define HAVE_CHROOT 1
-#define HAVE_CTIME_R 1
-#define HAVE_CTYPE_H 1
-#define HAVE_DECL_EXTATTR_NAMESPACE_USER 1
-#define HAVE_DECL_INT32_MAX 1
-#define HAVE_DECL_INT32_MIN 1
-#define HAVE_DECL_INT64_MAX 1
-#define HAVE_DECL_INT64_MIN 1
-#define HAVE_DECL_INTMAX_MAX 1
-#define HAVE_DECL_INTMAX_MIN 1
-#define HAVE_DECL_SIZE_MAX 1
-#define HAVE_DECL_SSIZE_MAX 1
-#define HAVE_DECL_STRERROR_R 1
-#define HAVE_DECL_UINT32_MAX 1
-#define HAVE_DECL_UINT64_MAX 1
-#define HAVE_DECL_UINTMAX_MAX 1
-#define HAVE_DIRENT_H 1
-#define HAVE_DLFCN_H 1
-#define HAVE_D_MD_ORDER 1
-#define HAVE_EFTYPE 1
-#define HAVE_EILSEQ 1
-#define HAVE_ERRNO_H 1
-#define HAVE_FCHDIR 1
-#define HAVE_FCHFLAGS 1
-#define HAVE_FCHMOD 1
-#define HAVE_FCHOWN 1
-#define HAVE_FCNTL 1
-#define HAVE_FCNTL_H 1
-#define HAVE_FDOPENDIR 1
-#define HAVE_FORK 1
-#define HAVE_FSEEKO 1
-#define HAVE_FSTAT 1
-#define HAVE_FSTATAT 1
-#define HAVE_FSTATFS 1
-#define HAVE_FSTATVFS 1
-#define HAVE_FTRUNCATE 1
-#define HAVE_FUTIMES 1
-#define HAVE_FUTIMESAT 1
-#define HAVE_GETEUID 1
-#define HAVE_GETGRGID_R 1
-#define HAVE_GETGRNAM_R 1
-#define HAVE_GETPID 1
-#define HAVE_GETPWNAM_R 1
-#define HAVE_GETPWUID_R 1
-#define HAVE_GETVFSBYNAME 1
-#define HAVE_GMTIME_R 1
-#define HAVE_GRP_H 1
-#define HAVE_INTMAX_T 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_LANGINFO_H 1
-#define HAVE_LCHFLAGS 1
-#define HAVE_LCHMOD 1
-#define HAVE_LCHOWN 1
-#define HAVE_LIBZ 1
-#define HAVE_LIMITS_H 1
-#define HAVE_LINK 1
-#define HAVE_LOCALE_H 1
-#define HAVE_LOCALTIME_R 1
-#define HAVE_LONG_LONG_INT 1
-#define HAVE_LSTAT 1
-#define HAVE_LUTIMES 1
-#define HAVE_MBRTOWC 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMORY_H 1
-#define HAVE_MEMSET 1
-#define HAVE_MKDIR 1
-#define HAVE_MKFIFO 1
-#define HAVE_MKNOD 1
-#define HAVE_MKSTEMP 1
-#define HAVE_NL_LANGINFO 1
-#define HAVE_OPENAT 1
-#define HAVE_PATHS_H 1
-#define HAVE_PIPE 1
-#define HAVE_POLL 1
-#define HAVE_POLL_H 1
-#define HAVE_POSIX_SPAWNP 1
-#define HAVE_PTHREAD_H 1
-#define HAVE_PWD_H 1
-#define HAVE_READDIR_R 1
-#define HAVE_READLINK 1
-#define HAVE_READLINKAT 1
-#define HAVE_READPASSPHRASE 1
-#define HAVE_READPASSPHRASE_H 1
-#define HAVE_REGEX_H 1
-#define HAVE_SELECT 1
-#define HAVE_SETENV 1
-#define HAVE_SETLOCALE 1
-#define HAVE_SIGACTION 1
-#define HAVE_SIGNAL_H 1
-#define HAVE_SPAWN_H 1
-#define HAVE_STATFS 1
-#define HAVE_STATVFS 1
-#define HAVE_STDARG_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRCHR 1
-#define HAVE_STRDUP 1
-#define HAVE_STRERROR 1
-#define HAVE_STRERROR_R 1
-#define HAVE_STRFTIME 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRUCT_STATFS_F_NAMEMAX 1
-#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
-#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-#define HAVE_STRUCT_STAT_ST_FLAGS 1
-#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
-#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-#define HAVE_STRUCT_TM_TM_GMTOFF 1
-#define HAVE_SYMLINK 1
-#define HAVE_SYS_CDEFS_H 1
-#define HAVE_SYS_IOCTL_H 1
-#define HAVE_SYS_MOUNT_H 1
-#define HAVE_SYS_PARAM_H 1
-#define HAVE_SYS_POLL_H 1
-#define HAVE_SYS_SELECT_H 1
-#define HAVE_SYS_STATVFS_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TIME_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_UTSNAME_H 1
-#define HAVE_SYS_WAIT_H 1
-#define HAVE_TIMEGM 1
-#define HAVE_TIME_H 1
-#define HAVE_TZSET 1
-#define HAVE_UINTMAX_T 1
-#define HAVE_UNISTD_H 1
-#define HAVE_UNSETENV 1
-#define HAVE_UNSIGNED_LONG_LONG 1
-#define HAVE_UNSIGNED_LONG_LONG_INT 1
-#define HAVE_UTIME 1
-#define HAVE_UTIMES 1
-#define HAVE_UTIME_H 1
-#define HAVE_VFORK 1
-#define HAVE_VPRINTF 1
-#define HAVE_WCHAR_H 1
-#define HAVE_WCHAR_T 1
-#define HAVE_WCRTOMB 1
-#define HAVE_WCSCMP 1
-#define HAVE_WCSCPY 1
-#define HAVE_WCSLEN 1
-#define HAVE_WCTOMB 1
-#define HAVE_WCTYPE_H 1
-#define HAVE_WMEMCMP 1
-#define HAVE_WMEMCPY 1
-#define HAVE_WMEMMOVE 1
-#define HAVE_ZLIB_H 1
-#define TIME_WITH_SYS_TIME 1
-
-/* BSD defines for archive_hash.h */
-#ifdef WITH_OPENSSL
-#define ARCHIVE_CRYPTO_MD5_OPENSSL 1
-#define ARCHIVE_CRYPTO_RMD160_OPENSSL 1
-#define ARCHIVE_CRYPTO_SHA1_OPENSSL
-#define ARCHIVE_CRYPTO_SHA256_OPENSSL 1
-#define ARCHIVE_CRYPTO_SHA384_OPENSSL 1
-#define ARCHIVE_CRYPTO_SHA512_OPENSSL 1
-#else
-#define ARCHIVE_CRYPTO_MD5_LIBMD 1
-#define ARCHIVE_CRYPTO_SHA1_LIBMD 1
-#define ARCHIVE_CRYPTO_SHA256_LIBMD 1
-#define ARCHIVE_CRYPTO_SHA512_LIBMD 1
-#endif
-
Added: trunk/lib/libarchive/config_midnightbsd.h
===================================================================
--- trunk/lib/libarchive/config_midnightbsd.h (rev 0)
+++ trunk/lib/libarchive/config_midnightbsd.h 2018-06-19 20:51:03 UTC (rev 11135)
@@ -0,0 +1,237 @@
+/* $MidnightBSD$ */
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#define ARCHIVE_ACL_FREEBSD 1
+#define ARCHIVE_XATTR_FREEBSD 1
+#define HAVE_ACL_GET_PERM_NP 1
+#define HAVE_ARC4RANDOM_BUF 1
+#define HAVE_STRUCT_XVFSCONF 1
+#define HAVE_SYS_ACL_H 1
+#define HAVE_SYS_EXTATTR_H 1
+#define ARCHIVE_ACL_FREEBSD_NFS4 1
+#define HAVE_ACL_GET_LINK_NP 1
+#define HAVE_ACL_IS_TRIVIAL_NP 1
+#define HAVE_ACL_SET_LINK_NP 1
+
+#ifdef WITH_OPENSSL
+#define HAVE_LIBCRYPTO 1
+#define HAVE_OPENSSL_EVP_H 1
+#define HAVE_OPENSSL_MD5_H 1
+#define HAVE_OPENSSL_RIPEMD_H 1
+#define HAVE_OPENSSL_SHA_H 1
+#define HAVE_OPENSSL_SHA256_INIT 1
+#define HAVE_OPENSSL_SHA384_INIT 1
+#define HAVE_OPENSSL_SHA512_INIT 1
+#define HAVE_PKCS5_PBKDF2_HMAC_SHA1 1
+#define HAVE_SHA256 1
+#define HAVE_SHA384 1
+#define HAVE_SHA512 1
+#else
+#define HAVE_LIBMD 1
+#define HAVE_MD5_H 1
+#define HAVE_MD5INIT 1
+#define HAVE_RIPEMD_H 1
+#define HAVE_SHA_H 1
+#define HAVE_SHA1 1
+#define HAVE_SHA1_INIT 1
+#define HAVE_SHA256 1
+#define HAVE_SHA256_H 1
+#define HAVE_SHA256_INIT 1
+#define HAVE_SHA512 1
+#define HAVE_SHA512_H 1
+#define HAVE_SHA512_INIT 1
+#endif
+
+#define HAVE_BSDXML_H 1
+#define HAVE_BZLIB_H 1
+#define HAVE_CHFLAGS 1
+#define HAVE_CHOWN 1
+#define HAVE_CHROOT 1
+#define HAVE_CTIME_R 1
+#define HAVE_CTYPE_H 1
+#define HAVE_DECL_EXTATTR_NAMESPACE_USER 1
+#define HAVE_DECL_INT32_MAX 1
+#define HAVE_DECL_INT32_MIN 1
+#define HAVE_DECL_INT64_MAX 1
+#define HAVE_DECL_INT64_MIN 1
+#define HAVE_DECL_INTMAX_MAX 1
+#define HAVE_DECL_INTMAX_MIN 1
+#define HAVE_DECL_SIZE_MAX 1
+#define HAVE_DECL_SSIZE_MAX 1
+#define HAVE_DECL_STRERROR_R 1
+#define HAVE_DECL_UINT32_MAX 1
+#define HAVE_DECL_UINT64_MAX 1
+#define HAVE_DECL_UINTMAX_MAX 1
+#define HAVE_DIRENT_H 1
+#define HAVE_DLFCN_H 1
+#define HAVE_D_MD_ORDER 1
+#define HAVE_EFTYPE 1
+#define HAVE_EILSEQ 1
+#define HAVE_ERRNO_H 1
+#define HAVE_FCHDIR 1
+#define HAVE_FCHFLAGS 1
+#define HAVE_FCHMOD 1
+#define HAVE_FCHOWN 1
+#define HAVE_FCNTL 1
+#define HAVE_FCNTL_H 1
+#define HAVE_FDOPENDIR 1
+#define HAVE_FORK 1
+#define HAVE_FSEEKO 1
+#define HAVE_FSTAT 1
+#define HAVE_FSTATAT 1
+#define HAVE_FSTATFS 1
+#define HAVE_FSTATVFS 1
+#define HAVE_FTRUNCATE 1
+#define HAVE_FUTIMES 1
+#define HAVE_FUTIMESAT 1
+#define HAVE_GETEUID 1
+#define HAVE_GETGRGID_R 1
+#define HAVE_GETGRNAM_R 1
+#define HAVE_GETPID 1
+#define HAVE_GETPWNAM_R 1
+#define HAVE_GETPWUID_R 1
+#define HAVE_GETVFSBYNAME 1
+#define HAVE_GMTIME_R 1
+#define HAVE_GRP_H 1
+#define HAVE_INTMAX_T 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_LANGINFO_H 1
+#define HAVE_LCHFLAGS 1
+#define HAVE_LCHMOD 1
+#define HAVE_LCHOWN 1
+#define HAVE_LIBZ 1
+#define HAVE_LIMITS_H 1
+#define HAVE_LINK 1
+#define HAVE_LOCALE_H 1
+#define HAVE_LOCALTIME_R 1
+#define HAVE_LONG_LONG_INT 1
+#define HAVE_LSTAT 1
+#define HAVE_LUTIMES 1
+#define HAVE_MBRTOWC 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MEMORY_H 1
+#define HAVE_MEMSET 1
+#define HAVE_MKDIR 1
+#define HAVE_MKFIFO 1
+#define HAVE_MKNOD 1
+#define HAVE_MKSTEMP 1
+#define HAVE_NL_LANGINFO 1
+#define HAVE_OPENAT 1
+#define HAVE_PATHS_H 1
+#define HAVE_PIPE 1
+#define HAVE_POLL 1
+#define HAVE_POLL_H 1
+#define HAVE_POSIX_SPAWNP 1
+#define HAVE_PTHREAD_H 1
+#define HAVE_PWD_H 1
+#define HAVE_READDIR_R 1
+#define HAVE_READLINK 1
+#define HAVE_READLINKAT 1
+#define HAVE_READPASSPHRASE 1
+#define HAVE_READPASSPHRASE_H 1
+#define HAVE_REGEX_H 1
+#define HAVE_SELECT 1
+#define HAVE_SETENV 1
+#define HAVE_SETLOCALE 1
+#define HAVE_SIGACTION 1
+#define HAVE_SIGNAL_H 1
+#define HAVE_SPAWN_H 1
+#define HAVE_STATFS 1
+#define HAVE_STATVFS 1
+#define HAVE_STDARG_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRCHR 1
+#define HAVE_STRDUP 1
+#define HAVE_STRERROR 1
+#define HAVE_STRERROR_R 1
+#define HAVE_STRFTIME 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRUCT_STATFS_F_NAMEMAX 1
+#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
+#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+#define HAVE_STRUCT_STAT_ST_FLAGS 1
+#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
+#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
+#define HAVE_STRUCT_TM_TM_GMTOFF 1
+#define HAVE_SYMLINK 1
+#define HAVE_SYS_CDEFS_H 1
+#define HAVE_SYS_IOCTL_H 1
+#define HAVE_SYS_MOUNT_H 1
+#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_POLL_H 1
+#define HAVE_SYS_SELECT_H 1
+#define HAVE_SYS_STATVFS_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_UTSNAME_H 1
+#define HAVE_SYS_WAIT_H 1
+#define HAVE_TIMEGM 1
+#define HAVE_TIME_H 1
+#define HAVE_TZSET 1
+#define HAVE_UINTMAX_T 1
+#define HAVE_UNISTD_H 1
+#define HAVE_UNSETENV 1
+#define HAVE_UNSIGNED_LONG_LONG 1
+#define HAVE_UNSIGNED_LONG_LONG_INT 1
+#define HAVE_UTIME 1
+#define HAVE_UTIMES 1
+#define HAVE_UTIME_H 1
+#define HAVE_VFORK 1
+#define HAVE_VPRINTF 1
+#define HAVE_WCHAR_H 1
+#define HAVE_WCHAR_T 1
+#define HAVE_WCRTOMB 1
+#define HAVE_WCSCMP 1
+#define HAVE_WCSCPY 1
+#define HAVE_WCSLEN 1
+#define HAVE_WCTOMB 1
+#define HAVE_WCTYPE_H 1
+#define HAVE_WMEMCMP 1
+#define HAVE_WMEMCPY 1
+#define HAVE_WMEMMOVE 1
+#define HAVE_ZLIB_H 1
+#define TIME_WITH_SYS_TIME 1
+
+/* MidnightBSD defines for archive_hash.h */
+#ifdef WITH_OPENSSL
+#define ARCHIVE_CRYPTO_MD5_OPENSSL 1
+#define ARCHIVE_CRYPTO_RMD160_OPENSSL 1
+#define ARCHIVE_CRYPTO_SHA1_OPENSSL
+#define ARCHIVE_CRYPTO_SHA256_OPENSSL 1
+#define ARCHIVE_CRYPTO_SHA384_OPENSSL 1
+#define ARCHIVE_CRYPTO_SHA512_OPENSSL 1
+#else
+#define ARCHIVE_CRYPTO_MD5_LIBMD 1
+#define ARCHIVE_CRYPTO_SHA1_LIBMD 1
+#define ARCHIVE_CRYPTO_SHA256_LIBMD 1
+#define ARCHIVE_CRYPTO_SHA512_LIBMD 1
+#endif
Property changes on: trunk/lib/libarchive/config_midnightbsd.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/lib/libarchive/tests/Makefile
===================================================================
--- trunk/lib/libarchive/tests/Makefile (rev 0)
+++ trunk/lib/libarchive/tests/Makefile 2018-06-19 20:51:03 UTC (rev 11135)
@@ -0,0 +1,576 @@
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libarchive/tests/Makefile 328828 2018-02-03 02:17:25Z mm $
+
+SRCTOP= ${.CURDIR:H:H:H}
+TESTSDIR= ${TESTSBASE}/lib/libarchive
+
+LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
+
+ATF_TESTS_SH+= functional_test
+
+BINDIR= ${TESTSDIR}
+
+PROGS+= libarchive_test
+
+CFLAGS+= -I${.CURDIR} -I${.CURDIR:H} -I${.OBJDIR}
+CFLAGS+= -I${LIBARCHIVEDIR}/libarchive -I${LIBARCHIVEDIR}/libarchive/test
+CFLAGS+= -I${LIBARCHIVEDIR}/test_utils
+CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
+
+# Uncomment to link against dmalloc
+#LDADD+= -L/usr/local/lib -ldmalloc
+#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
+
+.PATH: ${LIBARCHIVEDIR}/libarchive/test
+TESTS_SRCS= \
+ test_acl_nfs4.c \
+ test_acl_pax.c \
+ test_acl_platform_nfs4.c \
+ test_acl_platform_posix1e.c \
+ test_acl_posix1e.c \
+ test_acl_text.c \
+ test_archive_api_feature.c \
+ test_archive_clear_error.c \
+ test_archive_cmdline.c \
+ test_archive_digest.c \
+ test_archive_getdate.c \
+ test_archive_match_time.c \
+ test_archive_match_owner.c \
+ test_archive_match_path.c \
+ test_archive_pathmatch.c \
+ test_archive_read_add_passphrase.c \
+ test_archive_read_close_twice.c \
+ test_archive_read_close_twice_open_fd.c \
+ test_archive_read_close_twice_open_filename.c \
+ test_archive_read_multiple_data_objects.c \
+ test_archive_read_next_header_empty.c \
+ test_archive_read_next_header_raw.c \
+ test_archive_read_open2.c \
+ test_archive_read_set_filter_option.c \
+ test_archive_read_set_format_option.c \
+ test_archive_read_set_option.c \
+ test_archive_read_set_options.c \
+ test_archive_read_support.c \
+ test_archive_set_error.c \
+ test_archive_string.c \
+ test_archive_string_conversion.c \
+ test_archive_write_add_filter_by_name.c \
+ test_archive_write_set_filter_option.c \
+ test_archive_write_set_format_by_name.c \
+ test_archive_write_set_format_filter_by_ext.c \
+ test_archive_write_set_format_option.c \
+ test_archive_write_set_option.c \
+ test_archive_write_set_options.c \
+ test_archive_write_set_passphrase.c \
+ test_bad_fd.c \
+ test_compat_bzip2.c \
+ test_compat_cpio.c \
+ test_compat_gtar.c \
+ test_compat_gzip.c \
+ test_compat_lz4.c \
+ test_compat_lzip.c \
+ test_compat_lzma.c \
+ test_compat_lzop.c \
+ test_compat_mac.c \
+ test_compat_pax_libarchive_2x.c \
+ test_compat_perl_archive_tar.c \
+ test_compat_plexus_archiver_tar.c \
+ test_compat_solaris_tar_acl.c \
+ test_compat_solaris_pax_sparse.c \
+ test_compat_star_acl.c \
+ test_compat_tar_hardlink.c \
+ test_compat_uudecode.c \
+ test_compat_uudecode_large.c \
+ test_compat_xz.c \
+ test_compat_zip.c \
+ test_compat_zstd.c \
+ test_empty_write.c \
+ test_entry.c \
+ test_entry_strmode.c \
+ test_extattr_freebsd.c \
+ test_filter_count.c \
+ test_fuzz.c \
+ test_gnutar_filename_encoding.c \
+ test_link_resolver.c \
+ test_open_fd.c \
+ test_open_failure.c \
+ test_open_file.c \
+ test_open_filename.c \
+ test_pax_filename_encoding.c \
+ test_read_data_large.c \
+ test_read_disk.c \
+ test_read_disk_directory_traversals.c \
+ test_read_disk_entry_from_file.c \
+ test_read_extract.c \
+ test_read_file_nonexistent.c \
+ test_read_filter_compress.c \
+ test_read_filter_grzip.c \
+ test_read_filter_lrzip.c \
+ test_read_filter_lzop.c \
+ test_read_filter_lzop_multiple_parts.c \
+ test_read_filter_program.c \
+ test_read_filter_program_signature.c \
+ test_read_filter_uudecode.c \
+ test_read_format_7zip.c \
+ test_read_format_7zip_encryption_data.c \
+ test_read_format_7zip_encryption_header.c \
+ test_read_format_7zip_encryption_partially.c \
+ test_read_format_7zip_malformed.c \
+ test_read_format_ar.c \
+ test_read_format_cab.c \
+ test_read_format_cab_filename.c \
+ test_read_format_cpio_afio.c \
+ test_read_format_cpio_bin.c \
+ test_read_format_cpio_bin_Z.c \
+ test_read_format_cpio_bin_be.c \
+ test_read_format_cpio_bin_bz2.c \
+ test_read_format_cpio_bin_gz.c \
+ test_read_format_cpio_bin_le.c \
+ test_read_format_cpio_bin_lzip.c \
+ test_read_format_cpio_bin_lzma.c \
+ test_read_format_cpio_bin_xz.c \
+ test_read_format_cpio_filename.c \
+ test_read_format_cpio_odc.c \
+ test_read_format_cpio_svr4_gzip.c \
+ test_read_format_cpio_svr4c_Z.c \
+ test_read_format_cpio_svr4_bzip2_rpm.c \
+ test_read_format_cpio_svr4_gzip_rpm.c \
+ test_read_format_empty.c \
+ test_read_format_gtar_filename.c \
+ test_read_format_gtar_gz.c \
+ test_read_format_gtar_lzma.c \
+ test_read_format_gtar_sparse.c \
+ test_read_format_gtar_sparse_skip_entry.c \
+ test_read_format_iso_Z.c \
+ test_read_format_iso_multi_extent.c \
+ test_read_format_iso_xorriso.c \
+ test_read_format_isorr_rr_moved.c \
+ test_read_format_isojoliet_bz2.c \
+ test_read_format_isojoliet_long.c \
+ test_read_format_isojoliet_rr.c \
+ test_read_format_isojoliet_versioned.c \
+ test_read_format_isorr_bz2.c \
+ test_read_format_isorr_ce.c \
+ test_read_format_isorr_new_bz2.c \
+ test_read_format_isozisofs_bz2.c \
+ test_read_format_lha.c \
+ test_read_format_lha_bugfix_0.c \
+ test_read_format_lha_filename.c \
+ test_read_format_mtree.c \
+ test_read_format_mtree_crash747.c \
+ test_read_format_pax_bz2.c \
+ test_read_format_rar.c \
+ test_read_format_rar_encryption_data.c \
+ test_read_format_rar_encryption_header.c \
+ test_read_format_rar_encryption_partially.c \
+ test_read_format_rar_invalid1.c \
+ test_read_format_raw.c \
+ test_read_format_tar.c \
+ test_read_format_tar_concatenated.c \
+ test_read_format_tar_empty_filename.c \
+ test_read_format_tar_empty_pax.c \
+ test_read_format_tar_filename.c \
+ test_read_format_tbz.c \
+ test_read_format_tgz.c \
+ test_read_format_tlz.c \
+ test_read_format_txz.c \
+ test_read_format_tz.c \
+ test_read_format_ustar_filename.c \
+ test_read_format_warc.c \
+ test_read_format_xar.c \
+ test_read_format_zip.c \
+ test_read_format_zip_comment_stored.c \
+ test_read_format_zip_encryption_data.c \
+ test_read_format_zip_encryption_header.c \
+ test_read_format_zip_encryption_partially.c \
+ test_read_format_zip_filename.c \
+ test_read_format_zip_high_compression.c \
+ test_read_format_zip_jar.c \
+ test_read_format_zip_mac_metadata.c \
+ test_read_format_zip_malformed.c \
+ test_read_format_zip_msdos.c \
+ test_read_format_zip_nested.c \
+ test_read_format_zip_nofiletype.c \
+ test_read_format_zip_padded.c \
+ test_read_format_zip_sfx.c \
+ test_read_format_zip_traditional_encryption_data.c \
+ test_read_format_zip_winzip_aes.c \
+ test_read_format_zip_winzip_aes_large.c \
+ test_read_format_zip_with_invalid_traditional_eocd.c \
+ test_read_format_zip_zip64.c \
+ test_read_large.c \
+ test_read_pax_truncated.c \
+ test_read_position.c \
+ test_read_set_format.c \
+ test_read_too_many_filters.c \
+ test_read_truncated.c \
+ test_read_truncated_filter.c \
+ test_sparse_basic.c \
+ test_tar_filenames.c \
+ test_tar_large.c \
+ test_warn_missing_hardlink_target.c \
+ test_ustar_filenames.c \
+ test_ustar_filename_encoding.c \
+ test_write_disk.c \
+ test_write_disk_appledouble.c \
+ test_write_disk_failures.c \
+ test_write_disk_hardlink.c \
+ test_write_disk_hfs_compression.c \
+ test_write_disk_lookup.c \
+ test_write_disk_mac_metadata.c \
+ test_write_disk_no_hfs_compression.c \
+ test_write_disk_perms.c \
+ test_write_disk_secure.c \
+ test_write_disk_secure744.c \
+ test_write_disk_secure745.c \
+ test_write_disk_secure746.c \
+ test_write_disk_sparse.c \
+ test_write_disk_symlink.c \
+ test_write_disk_times.c \
+ test_write_filter_b64encode.c \
+ test_write_filter_bzip2.c \
+ test_write_filter_compress.c \
+ test_write_filter_gzip.c \
+ test_write_filter_gzip_timestamp.c \
+ test_write_filter_lrzip.c \
+ test_write_filter_lz4.c \
+ test_write_filter_lzip.c \
+ test_write_filter_lzma.c \
+ test_write_filter_lzop.c \
+ test_write_filter_program.c \
+ test_write_filter_uuencode.c \
+ test_write_filter_xz.c \
+ test_write_filter_zstd.c \
+ test_write_format_7zip.c \
+ test_write_format_7zip_empty.c \
+ test_write_format_7zip_large.c \
+ test_write_format_ar.c \
+ test_write_format_cpio.c \
+ test_write_format_cpio_empty.c \
+ test_write_format_cpio_newc.c \
+ test_write_format_cpio_odc.c \
+ test_write_format_gnutar.c \
+ test_write_format_gnutar_filenames.c \
+ test_write_format_iso9660.c \
+ test_write_format_iso9660_boot.c \
+ test_write_format_iso9660_empty.c \
+ test_write_format_iso9660_filename.c \
+ test_write_format_iso9660_zisofs.c \
+ test_write_format_mtree.c \
+ test_write_format_mtree_absolute_path.c \
+ test_write_format_mtree_classic.c \
+ test_write_format_mtree_classic_indent.c \
+ test_write_format_mtree_fflags.c \
+ test_write_format_mtree_no_separator.c \
+ test_write_format_mtree_quoted_filename.c \
+ test_write_format_pax.c \
+ test_write_format_raw.c \
+ test_write_format_raw_b64.c \
+ test_write_format_shar_empty.c \
+ test_write_format_tar.c \
+ test_write_format_tar_empty.c \
+ test_write_format_tar_sparse.c \
+ test_write_format_tar_ustar.c \
+ test_write_format_tar_v7tar.c \
+ test_write_format_warc.c \
+ test_write_format_warc_empty.c \
+ test_write_format_xar.c \
+ test_write_format_xar_empty.c \
+ test_write_format_zip.c \
+ test_write_format_zip_compression_store.c \
+ test_write_format_zip_empty.c \
+ test_write_format_zip_empty_zip64.c \
+ test_write_format_zip_file.c \
+ test_write_format_zip_file_zip64.c \
+ test_write_format_zip_large.c \
+ test_write_format_zip_zip64.c \
+ test_write_open_memory.c \
+ test_write_read_format_zip.c \
+ test_xattr_platform.c \
+ test_zip_filename_encoding.c
+
+# Deterministic failures:
+# Crashes with SIGBUS
+BROKEN_TESTS+= test_archive_rmd160
+# Fails with `libarchive/test/test_archive_crypto.c:121: md != actualmd`
+BROKEN_TESTS+= test_archive_sha384
+# Fails with `test_compat_pax_libarchive_2x.c:122: ARCHIVE_WARN != archive_read_next_header(a, &ae)`
+BROKEN_TESTS+= test_compat_pax_libarchive_2x
+# Fails with `test_read_disk_directory_traversals.c:1094: File at has atime 886622, 1443306049 seconds ago`
+BROKEN_TESTS+= test_read_disk_directory_traversals
+
+# Non-deterministic failures:
+# (Times out?) [and] crashes
+BROKEN_TESTS+= test_fuzz_rar
+
+# Build the test program.
+SRCS.libarchive_test= \
+ ${TESTS_SRCS} \
+ read_open_memory.c \
+ list.h
+
+DPADD.libarchive_test= ${LIBARCHIVE}
+LDADD.libarchive_test= -larchive
+
+.PATH: ${LIBARCHIVEDIR}/test_utils
+SRCS.libarchive_test+= test_main.c \
+ test_utils.c
+
+# list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines
+list.h: ${TESTS_SRCS} Makefile
+ @(cd ${LIBARCHIVEDIR}/libarchive/test && \
+ grep -E -h ^DEFINE_TEST ${.ALLSRC:N*Makefile} | \
+ egrep -v '${BROKEN_TESTS:tW:C/ /|/g}') > ${.TARGET}.tmp
+ @mv ${.TARGET}.tmp ${.TARGET}
+
+CLEANFILES+= list.h list.h.tmp
+
+FILES+= README
+FILES+= test_acl_pax_posix1e.tar.uu
+FILES+= test_acl_pax_nfs4.tar.uu
+FILES+= test_archive_string_conversion.txt.Z.uu
+FILES+= test_compat_bzip2_1.tbz.uu
+FILES+= test_compat_bzip2_2.tbz.uu
+FILES+= test_compat_cpio_1.cpio.uu
+FILES+= test_compat_gtar_1.tar.uu
+FILES+= test_compat_gtar_2.tar.uu
+FILES+= test_compat_gzip_1.tgz.uu
+FILES+= test_compat_gzip_2.tgz.uu
+FILES+= test_compat_lz4_1.tar.lz4.uu
+FILES+= test_compat_lz4_2.tar.lz4.uu
+FILES+= test_compat_lz4_3.tar.lz4.uu
+FILES+= test_compat_lz4_B4.tar.lz4.uu
+FILES+= test_compat_lz4_B4BD.tar.lz4.uu
+FILES+= test_compat_lz4_B4BDBX.tar.lz4.uu
+FILES+= test_compat_lz4_B5.tar.lz4.uu
+FILES+= test_compat_lz4_B5BD.tar.lz4.uu
+FILES+= test_compat_lz4_B6.tar.lz4.uu
+FILES+= test_compat_lz4_B6BD.tar.lz4.uu
+FILES+= test_compat_lz4_B7.tar.lz4.uu
+FILES+= test_compat_lz4_B7BD.tar.lz4.uu
+FILES+= test_compat_lzip_1.tlz.uu
+FILES+= test_compat_lzip_2.tlz.uu
+FILES+= test_compat_lzma_1.tlz.uu
+FILES+= test_compat_lzma_2.tlz.uu
+FILES+= test_compat_lzma_3.tlz.uu
+FILES+= test_compat_lzop_1.tar.lzo.uu
+FILES+= test_compat_lzop_2.tar.lzo.uu
+FILES+= test_compat_lzop_3.tar.lzo.uu
+FILES+= test_compat_mac-1.tar.Z.uu
+FILES+= test_compat_mac-2.tar.Z.uu
+FILES+= test_compat_pax_libarchive_2x.tar.Z.uu
+FILES+= test_compat_perl_archive_tar.tar.uu
+FILES+= test_compat_plexus_archiver_tar.tar.uu
+FILES+= test_compat_solaris_pax_sparse_1.pax.Z.uu
+FILES+= test_compat_solaris_pax_sparse_2.pax.Z.uu
+FILES+= test_compat_solaris_tar_acl.tar.uu
+FILES+= test_compat_star_acl_nfs4.tar.uu
+FILES+= test_compat_star_acl_posix1e.tar.uu
+FILES+= test_compat_tar_hardlink_1.tar.uu
+FILES+= test_compat_uudecode_large.tar.Z.uu
+FILES+= test_compat_xz_1.txz.uu
+FILES+= test_compat_zip_1.zip.uu
+FILES+= test_compat_zip_2.zip.uu
+FILES+= test_compat_zip_3.zip.uu
+FILES+= test_compat_zip_4.zip.uu
+FILES+= test_compat_zip_5.zip.uu
+FILES+= test_compat_zip_6.zip.uu
+FILES+= test_compat_zip_7.xps.uu
+FILES+= test_compat_zip_8.zip.uu
+FILES+= test_compat_zstd_1.tar.zst.uu
+FILES+= test_fuzz.cab.uu
+FILES+= test_fuzz.lzh.uu
+FILES+= test_fuzz_1.iso.Z.uu
+FILES+= test_pax_filename_encoding.tar.uu
+FILES+= test_rar_multivolume_multiple_files.part1.rar.uu
+FILES+= test_rar_multivolume_multiple_files.part2.rar.uu
+FILES+= test_rar_multivolume_multiple_files.part3.rar.uu
+FILES+= test_rar_multivolume_multiple_files.part4.rar.uu
+FILES+= test_rar_multivolume_multiple_files.part5.rar.uu
+FILES+= test_rar_multivolume_multiple_files.part6.rar.uu
+FILES+= test_rar_multivolume_single_file.part1.rar.uu
+FILES+= test_rar_multivolume_single_file.part2.rar.uu
+FILES+= test_rar_multivolume_single_file.part3.rar.uu
+FILES+= test_rar_multivolume_uncompressed_files.part01.rar.uu
+FILES+= test_rar_multivolume_uncompressed_files.part02.rar.uu
+FILES+= test_rar_multivolume_uncompressed_files.part03.rar.uu
+FILES+= test_rar_multivolume_uncompressed_files.part04.rar.uu
+FILES+= test_rar_multivolume_uncompressed_files.part05.rar.uu
+FILES+= test_rar_multivolume_uncompressed_files.part06.rar.uu
+FILES+= test_rar_multivolume_uncompressed_files.part07.rar.uu
+FILES+= test_rar_multivolume_uncompressed_files.part08.rar.uu
+FILES+= test_rar_multivolume_uncompressed_files.part09.rar.uu
+FILES+= test_rar_multivolume_uncompressed_files.part10.rar.uu
+FILES+= test_read_filter_grzip.tar.grz.uu
+FILES+= test_read_filter_lrzip.tar.lrz.uu
+FILES+= test_read_filter_lzop.tar.lzo.uu
+FILES+= test_read_filter_lzop_multiple_parts.tar.lzo.uu
+FILES+= test_read_format_7zip_bcj2_bzip2.7z.uu
+FILES+= test_read_format_7zip_bcj2_copy_1.7z.uu
+FILES+= test_read_format_7zip_bcj2_copy_2.7z.uu
+FILES+= test_read_format_7zip_bcj2_copy_lzma.7z.uu
+FILES+= test_read_format_7zip_bcj2_deflate.7z.uu
+FILES+= test_read_format_7zip_bcj2_lzma1_1.7z.uu
+FILES+= test_read_format_7zip_bcj2_lzma1_2.7z.uu
+FILES+= test_read_format_7zip_bcj2_lzma2_1.7z.uu
+FILES+= test_read_format_7zip_bcj2_lzma2_2.7z.uu
+FILES+= test_read_format_7zip_bcj_bzip2.7z.uu
+FILES+= test_read_format_7zip_bcj_copy.7z.uu
+FILES+= test_read_format_7zip_bcj_deflate.7z.uu
+FILES+= test_read_format_7zip_bcj_lzma1.7z.uu
+FILES+= test_read_format_7zip_bcj_lzma2.7z.uu
+FILES+= test_read_format_7zip_bzip2.7z.uu
+FILES+= test_read_format_7zip_copy.7z.uu
+FILES+= test_read_format_7zip_copy_2.7z.uu
+FILES+= test_read_format_7zip_deflate.7z.uu
+FILES+= test_read_format_7zip_delta_lzma1.7z.uu
+FILES+= test_read_format_7zip_delta_lzma2.7z.uu
+FILES+= test_read_format_7zip_empty_archive.7z.uu
+FILES+= test_read_format_7zip_empty_file.7z.uu
+FILES+= test_read_format_7zip_encryption.7z.uu
+FILES+= test_read_format_7zip_encryption_header.7z.uu
+FILES+= test_read_format_7zip_encryption_partially.7z.uu
+FILES+= test_read_format_7zip_lzma1.7z.uu
+FILES+= test_read_format_7zip_lzma1_2.7z.uu
+FILES+= test_read_format_7zip_lzma1_lzma2.7z.uu
+FILES+= test_read_format_7zip_lzma2.7z.uu
+FILES+= test_read_format_7zip_malformed.7z.uu
+FILES+= test_read_format_7zip_malformed2.7z.uu
+FILES+= test_read_format_7zip_ppmd.7z.uu
+FILES+= test_read_format_7zip_symbolic_name.7z.uu
+FILES+= test_read_format_ar.ar.uu
+FILES+= test_read_format_cab_1.cab.uu
+FILES+= test_read_format_cab_2.cab.uu
+FILES+= test_read_format_cab_3.cab.uu
+FILES+= test_read_format_cab_filename_cp932.cab.uu
+FILES+= test_read_format_cpio_bin_be.cpio.uu
+FILES+= test_read_format_cpio_bin_le.cpio.uu
+FILES+= test_read_format_cpio_filename_cp866.cpio.uu
+FILES+= test_read_format_cpio_filename_eucjp.cpio.uu
+FILES+= test_read_format_cpio_filename_koi8r.cpio.uu
+FILES+= test_read_format_cpio_filename_utf8_jp.cpio.uu
+FILES+= test_read_format_cpio_filename_utf8_ru.cpio.uu
+FILES+= test_read_format_cpio_svr4_bzip2_rpm.rpm.uu
+FILES+= test_read_format_cpio_svr4_gzip_rpm.rpm.uu
+FILES+= test_read_format_gtar_filename_cp866.tar.Z.uu
+FILES+= test_read_format_gtar_filename_eucjp.tar.Z.uu
+FILES+= test_read_format_gtar_filename_koi8r.tar.Z.uu
+FILES+= test_read_format_gtar_sparse_1_13.tar.uu
+FILES+= test_read_format_gtar_sparse_1_17.tar.uu
+FILES+= test_read_format_gtar_sparse_1_17_posix00.tar.uu
+FILES+= test_read_format_gtar_sparse_1_17_posix01.tar.uu
+FILES+= test_read_format_gtar_sparse_1_17_posix10.tar.uu
+FILES+= test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
+FILES+= test_read_format_gtar_sparse_skip_entry.tar.Z.uu
+FILES+= test_read_format_iso.iso.Z.uu
+FILES+= test_read_format_iso_2.iso.Z.uu
+FILES+= test_read_format_iso_joliet.iso.Z.uu
+FILES+= test_read_format_iso_joliet_by_nero.iso.Z.uu
+FILES+= test_read_format_iso_joliet_long.iso.Z.uu
+FILES+= test_read_format_iso_joliet_rockridge.iso.Z.uu
+FILES+= test_read_format_iso_multi_extent.iso.Z.uu
+FILES+= test_read_format_iso_rockridge.iso.Z.uu
+FILES+= test_read_format_iso_rockridge_ce.iso.Z.uu
+FILES+= test_read_format_iso_rockridge_new.iso.Z.uu
+FILES+= test_read_format_iso_rockridge_rr_moved.iso.Z.uu
+FILES+= test_read_format_iso_xorriso.iso.Z.uu
+FILES+= test_read_format_iso_zisofs.iso.Z.uu
+FILES+= test_read_format_lha_bugfix_0.lzh.uu
+FILES+= test_read_format_lha_filename_cp932.lzh.uu
+FILES+= test_read_format_lha_header0.lzh.uu
+FILES+= test_read_format_lha_header1.lzh.uu
+FILES+= test_read_format_lha_header2.lzh.uu
+FILES+= test_read_format_lha_header3.lzh.uu
+FILES+= test_read_format_lha_lh0.lzh.uu
+FILES+= test_read_format_lha_lh6.lzh.uu
+FILES+= test_read_format_lha_lh7.lzh.uu
+FILES+= test_read_format_lha_withjunk.lzh.uu
+FILES+= test_read_format_mtree.mtree.uu
+FILES+= test_read_format_mtree_crash747.mtree.bz2.uu
+FILES+= test_read_format_mtree_nomagic.mtree.uu
+FILES+= test_read_format_mtree_nomagic2.mtree.uu
+FILES+= test_read_format_mtree_nomagic3.mtree.uu
+FILES+= test_read_format_rar.rar.uu
+FILES+= test_read_format_rar_binary_data.rar.uu
+FILES+= test_read_format_rar_compress_best.rar.uu
+FILES+= test_read_format_rar_compress_normal.rar.uu
+FILES+= test_read_format_rar_encryption_data.rar.uu
+FILES+= test_read_format_rar_encryption_header.rar.uu
+FILES+= test_read_format_rar_encryption_partially.rar.uu
+FILES+= test_read_format_rar_invalid1.rar.uu
+FILES+= test_read_format_rar_multi_lzss_blocks.rar.uu
+FILES+= test_read_format_rar_multivolume.part0001.rar.uu
+FILES+= test_read_format_rar_multivolume.part0002.rar.uu
+FILES+= test_read_format_rar_multivolume.part0003.rar.uu
+FILES+= test_read_format_rar_multivolume.part0004.rar.uu
+FILES+= test_read_format_rar_noeof.rar.uu
+FILES+= test_read_format_rar_ppmd_lzss_conversion.rar.uu
+FILES+= test_read_format_rar_sfx.exe.uu
+FILES+= test_read_format_rar_subblock.rar.uu
+FILES+= test_read_format_rar_unicode.rar.uu
+FILES+= test_read_format_rar_windows.rar.uu
+FILES+= test_read_format_raw.bufr.uu
+FILES+= test_read_format_raw.data.Z.uu
+FILES+= test_read_format_raw.data.uu
+FILES+= test_read_format_tar_concatenated.tar.uu
+FILES+= test_read_format_tar_empty_filename.tar.uu
+FILES+= test_read_format_tar_empty_pax.tar.Z.uu
+FILES+= test_read_format_tar_filename_koi8r.tar.Z.uu
+FILES+= test_read_format_ustar_filename_cp866.tar.Z.uu
+FILES+= test_read_format_ustar_filename_eucjp.tar.Z.uu
+FILES+= test_read_format_ustar_filename_koi8r.tar.Z.uu
+FILES+= test_read_format_warc.warc.uu
+FILES+= test_read_format_zip.zip.uu
+FILES+= test_read_format_zip_comment_stored_1.zip.uu
+FILES+= test_read_format_zip_comment_stored_2.zip.uu
+FILES+= test_read_format_zip_encryption_data.zip.uu
+FILES+= test_read_format_zip_encryption_header.zip.uu
+FILES+= test_read_format_zip_encryption_partially.zip.uu
+FILES+= test_read_format_zip_filename_cp866.zip.uu
+FILES+= test_read_format_zip_filename_cp932.zip.uu
+FILES+= test_read_format_zip_filename_koi8r.zip.uu
+FILES+= test_read_format_zip_filename_utf8_jp.zip.uu
+FILES+= test_read_format_zip_filename_utf8_ru.zip.uu
+FILES+= test_read_format_zip_filename_utf8_ru2.zip.uu
+FILES+= test_read_format_zip_high_compression.zip.uu
+FILES+= test_read_format_zip_jar.jar.uu
+FILES+= test_read_format_zip_length_at_end.zip.uu
+FILES+= test_read_format_zip_mac_metadata.zip.uu
+FILES+= test_read_format_zip_malformed1.zip.uu
+FILES+= test_read_format_zip_msdos.zip.uu
+FILES+= test_read_format_zip_nested.zip.uu
+FILES+= test_read_format_zip_nofiletype.zip.uu
+FILES+= test_read_format_zip_padded1.zip.uu
+FILES+= test_read_format_zip_padded2.zip.uu
+FILES+= test_read_format_zip_padded3.zip.uu
+FILES+= test_read_format_zip_sfx.uu
+FILES+= test_read_format_zip_symlink.zip.uu
+FILES+= test_read_format_zip_traditional_encryption_data.zip.uu
+FILES+= test_read_format_zip_ux.zip.uu
+FILES+= test_read_format_zip_with_invalid_traditional_eocd.zip.uu
+FILES+= test_read_format_zip_winzip_aes128.zip.uu
+FILES+= test_read_format_zip_winzip_aes256.zip.uu
+FILES+= test_read_format_zip_winzip_aes256_large.zip.uu
+FILES+= test_read_format_zip_winzip_aes256_stored.zip.uu
+FILES+= test_read_format_zip_zip64a.zip.uu
+FILES+= test_read_format_zip_zip64b.zip.uu
+FILES+= test_read_large_splitted_rar_aa.uu
+FILES+= test_read_large_splitted_rar_ab.uu
+FILES+= test_read_large_splitted_rar_ac.uu
+FILES+= test_read_large_splitted_rar_ad.uu
+FILES+= test_read_large_splitted_rar_ae.uu
+FILES+= test_read_pax_schily_xattr.tar.uu
+FILES+= test_read_splitted_rar_aa.uu
+FILES+= test_read_splitted_rar_ab.uu
+FILES+= test_read_splitted_rar_ac.uu
+FILES+= test_read_splitted_rar_ad.uu
+FILES+= test_read_too_many_filters.gz.uu
+FILES+= test_splitted_rar_seek_support_aa.uu
+FILES+= test_splitted_rar_seek_support_ab.uu
+FILES+= test_splitted_rar_seek_support_ac.uu
+FILES+= test_write_disk_appledouble.cpio.gz.uu
+FILES+= test_write_disk_hfs_compression.tgz.uu
+FILES+= test_write_disk_mac_metadata.tar.gz.uu
+FILES+= test_write_disk_no_hfs_compression.tgz.uu
+
+.include <bsd.test.mk>
Property changes on: trunk/lib/libarchive/tests/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/lib/libarchive/tests/functional_test.sh
===================================================================
--- trunk/lib/libarchive/tests/functional_test.sh (rev 0)
+++ trunk/lib/libarchive/tests/functional_test.sh 2018-06-19 20:51:03 UTC (rev 11135)
@@ -0,0 +1,51 @@
+#
+# Copyright 2015 EMC Corp.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libarchive/tests/functional_test.sh 288976 2015-10-07 05:20:44Z ngie $
+
+SRCDIR=$(atf_get_srcdir)
+TESTER="${SRCDIR}/libarchive_test"
+
+check()
+{
+ local testcase=${1}; shift
+
+ atf_check -o ignore -s exit:0 ${TESTER} -d -r "${SRCDIR}" -v "${testcase}"
+}
+
+atf_init_test_cases()
+{
+ # Redirect stderr to stdout for the usage message because if you don't
+ # kyua list/kyua test will break:
+ # https://github.com/jmmv/kyua/issues/149
+ testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }')
+ for testcase in ${testcases}; do
+ atf_test_case ${testcase}
+ eval "${testcase}_body() { check ${testcase}; }"
+ atf_add_test_case ${testcase}
+ done
+}
Property changes on: trunk/lib/libarchive/tests/functional_test.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list