diff options
author | Martin Matuska <mm@FreeBSD.org> | 2012-02-25 10:58:02 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2012-02-25 10:58:02 +0000 |
commit | 6c95142e7977d720e7f1c70672b358aa09fa6bfa (patch) | |
tree | 117e869a99c6fa7f789c6d9a87cf7eac26ae69e3 /usr.bin | |
parent | 662c901c5429a3d06e28f5ce05df481159fb74c0 (diff) | |
parent | 17993d47e9beebea021707962fcdf2387b27cae9 (diff) | |
download | src-6c95142e7977d720e7f1c70672b358aa09fa6bfa.tar.gz src-6c95142e7977d720e7f1c70672b358aa09fa6bfa.zip |
Update libarchive to 3.0.3
Some of new features:
- New readers: RAR, LHA/LZH, CAB reader, 7-Zip
- New writers: ISO9660, XAR
- Improvements to many formats, especially including ISO9660 and Zip
- Stackable write filters to write, e.g., tar.gz.uu in a single pass
- Exploit seekable input; new "seekable" Zip reader can exploit the Zip
Central Directory when it's available; the old "streamable" Zip reader
is still fully supported for cases where seeking is not possible.
Full release notes available at:
https://github.com/libarchive/libarchive/wiki/ReleaseNotes
Notes
Notes:
svn path=/head/; revision=232153
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/ar/ar.c | 4 | ||||
-rw-r--r-- | usr.bin/cpio/Makefile | 9 | ||||
-rw-r--r-- | usr.bin/cpio/config_freebsd.h | 57 | ||||
-rw-r--r-- | usr.bin/cpio/test/Makefile | 1 | ||||
-rw-r--r-- | usr.bin/tar/Makefile | 8 | ||||
-rw-r--r-- | usr.bin/tar/config_freebsd.h | 82 | ||||
-rw-r--r-- | usr.bin/tar/test/Makefile | 19 |
7 files changed, 33 insertions, 147 deletions
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c index 4b1b7a0550f6..7c76290207ea 100644 --- a/usr.bin/ar/ar.c +++ b/usr.bin/ar/ar.c @@ -386,13 +386,13 @@ ranlib_usage(void) static void bsdar_version(void) { - (void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version()); + (void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version_string()); exit(EX_OK); } static void ranlib_version(void) { - (void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version()); + (void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version_string()); exit(EX_OK); } diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index f13b626a3cfd..13579c11ad6b 100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -3,9 +3,10 @@ .include <bsd.own.mk> LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive +LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive PROG= bsdcpio -BSDCPIO_VERSION_STRING=2.8.5 +BSDCPIO_VERSION_STRING= 3.0.3 .PATH: ${LIBARCHIVEDIR}/cpio SRCS= cpio.c cmdline.c @@ -14,7 +15,7 @@ SRCS= cpio.c cmdline.c SRCS+= err.c line_reader.c matching.c pathmatch.c CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\" -CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" +CFLAGS+= -DPLATFORM_CONFIG_H=\"${LIBARCHIVECONFDIR}/config_freebsd.h\" CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe .ifdef RELEASE_CRUNCH @@ -32,6 +33,10 @@ DPADD+= ${LIBMD} LDADD+= -lmd .endif +.if ${MK_ICONV} != "no" +CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const +.endif + SYMLINKS=bsdcpio ${BINDIR}/cpio MLINKS= bsdcpio.1 cpio.1 diff --git a/usr.bin/cpio/config_freebsd.h b/usr.bin/cpio/config_freebsd.h deleted file mode 100644 index bf24b9ec9f27..000000000000 --- a/usr.bin/cpio/config_freebsd.h +++ /dev/null @@ -1,57 +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. - * - * $FreeBSD$ - */ - -/* A hand-tooled configuration for FreeBSD. */ - -#include <sys/param.h> /* __FreeBSD_version */ - -#define HAVE_DIRENT_H 1 -#define HAVE_ERRNO_H 1 -#define HAVE_FCNTL_H 1 -#define HAVE_FUTIMES 1 -#define HAVE_GRP_H 1 -#define HAVE_LIBARCHIVE 1 -#define HAVE_LINK 1 -#define HAVE_LSTAT 1 -#define HAVE_LUTIMES 1 -#define HAVE_PWD_H 1 -#define HAVE_READLINK 1 -#define HAVE_STDARG_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_SYMLINK 1 -#define HAVE_SYS_CDEFS_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_SYS_TIME_H 1 -#define HAVE_TIME_H 1 -#define HAVE_UINTMAX_T 1 -#define HAVE_UNISTD_H 1 -#define HAVE_UNSIGNED_LONG_LONG 1 -#define HAVE_UTIME_H 1 -#define HAVE_UTIMES 1 -#define HAVE_WCSCMP 1 - diff --git a/usr.bin/cpio/test/Makefile b/usr.bin/cpio/test/Makefile index 850373bb76c6..1da6b1c074a2 100644 --- a/usr.bin/cpio/test/Makefile +++ b/usr.bin/cpio/test/Makefile @@ -14,6 +14,7 @@ TESTS= \ test_basic.c \ test_format_newc.c \ test_gcpio_compat.c \ + test_option_0.c \ test_option_B_upper.c \ test_option_C_upper.c \ test_option_J_upper.c \ diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index 7d3abf88eee3..dc76935aa65e 100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -4,7 +4,7 @@ LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive PROG= bsdtar -BSDTAR_VERSION_STRING=2.8.5 +BSDTAR_VERSION_STRING= 3.0.3 .PATH: ${LIBARCHIVEDIR}/tar SRCS= bsdtar.c \ @@ -32,8 +32,12 @@ DPADD+= ${LIBMD} LDADD+= -lmd .endif +.if ${MK_ICONV} != "no" +CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const +.endif + CFLAGS+= -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\" -CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\" +CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../lib/libarchive/config_freebsd.h\" CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/libarchive CFLAGS+= -I${LIBARCHIVEDIR}/libarchive_fe SYMLINKS= bsdtar ${BINDIR}/tar diff --git a/usr.bin/tar/config_freebsd.h b/usr.bin/tar/config_freebsd.h deleted file mode 100644 index 4c8ec3a05856..000000000000 --- a/usr.bin/tar/config_freebsd.h +++ /dev/null @@ -1,82 +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. - * - * $FreeBSD$ - */ - -/* A default configuration for FreeBSD, used if there is no config.h. */ -#include <sys/param.h> /* __FreeBSD_version */ - -#undef HAVE_ATTR_XATTR_H -#define HAVE_CHROOT 1 -#undef HAVE_DIRECT_H -#define HAVE_DIRENT_D_NAMLEN 1 -#define HAVE_DIRENT_H 1 -#define HAVE_D_MD_ORDER 1 -#define HAVE_ERRNO_H 1 -#undef HAVE_EXT2FS_EXT2_FS_H -#define HAVE_FCHDIR 1 -#define HAVE_FCNTL_H 1 -#define HAVE_GRP_H 1 -#undef HAVE_IO_H -#define HAVE_LANGINFO_H 1 -#undef HAVE_LIBACL -#define HAVE_LIBARCHIVE 1 -#define HAVE_LIMITS_H 1 -#define HAVE_LINK 1 -#undef HAVE_LINUX_EXT2_FS_H -#undef HAVE_LINUX_FS_H -#define HAVE_LOCALE_H 1 -#define HAVE_MBTOWC 1 -#undef HAVE_NDIR_H -#define HAVE_NL_LANGINFO 1 -#define HAVE_PATHS_H 1 -#define HAVE_PWD_H 1 -#define HAVE_REGEX_H 1 -#define HAVE_SETLOCALE 1 -#define HAVE_SIGACTION 1 -#define HAVE_SIGNAL_H 1 -#define HAVE_STDARG_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#undef HAVE_STRNCPY_S -#define HAVE_STRUCT_STAT_ST_FLAGS 1 -#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1 -#undef HAVE_STRUCT_STAT_ST_MTIME_N -#undef HAVE_STRUCT_STAT_ST_MTIME_USEC -#undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC -#undef HAVE_STRUCT_STAT_ST_UMTIME -#define HAVE_SYS_CDEFS_H 1 -#define HAVE_SYS_DIR_H 1 -#define HAVE_SYS_IOCTL_H 1 -#undef HAVE_SYS_NDIR_H -#define HAVE_SYS_PARAM_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_TIME_H 1 -#define HAVE_UNISTD_H 1 -#define HAVE_WCTYPE_H 1 -#define HAVE_WCSCMP 1 -#undef HAVE_WINDOWS_H diff --git a/usr.bin/tar/test/Makefile b/usr.bin/tar/test/Makefile index 3e99fc237261..16fdcc63fb20 100644 --- a/usr.bin/tar/test/Makefile +++ b/usr.bin/tar/test/Makefile @@ -15,11 +15,26 @@ TESTS= \ test_empty_mtree.c \ test_getdate.c \ test_help.c \ + test_option_C_upper.c \ + test_option_H_upper.c \ + test_option_L_upper.c \ + test_option_O_upper.c \ test_option_T_upper.c \ + test_option_U_upper.c \ + test_option_X_upper.c \ + test_option_b.c \ + test_option_exclude.c \ + test_option_gid_gname.c \ + test_option_k.c \ + test_option_keep_newer_files.c \ + test_option_n.c \ + test_option_newer_than.c \ test_option_q.c \ test_option_r.c \ test_option_s.c \ + test_option_uid_uname.c \ test_patterns.c \ + test_print_longpath.c \ test_stdio.c \ test_strip_components.c \ test_symlink_dir.c \ @@ -37,10 +52,10 @@ NO_MAN=yes PROG=bsdtar_test DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} -CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../config_freebsd.h\" +CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../../lib/libarchive/config_freebsd.h\" LDADD= -larchive -lz -lbz2 -llzma CFLAGS+= -static -g -O2 -Wall -CFLAGS+= -I${.CURDIR}/.. -I${.OBJDIR} +CFLAGS+= -I${.CURDIR}/../../../lib/libarchive -I${.OBJDIR} CFLAGS+= -I${LIBARCHIVEDIR}/tar # Uncomment to link against dmalloc |