pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers/libarchive/files Import libarchive-2.5.4b. M...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2300d3379a79
branches: trunk
changeset: 542705:2300d3379a79
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun May 25 19:41:18 2008 +0000
description:
Import libarchive-2.5.4b. Major changes:
- much improved mtree support
- fix a number of non-exploitable integer and buffer overflows
- bsdtar get -s and SIGINFO/SIGUSR1 support
- fix hardlink extraction bug where latter hardlinks would overwrite the
permissions of earlier entries even when they don't carry data
- fix bsdtar crashes on entries with empty filenames
diffstat:
archivers/libarchive/files/COPYING | 40 +-
archivers/libarchive/files/Makefile.am | 52 +-
archivers/libarchive/files/Makefile.in | 1220 ++++-----
archivers/libarchive/files/NEWS | 50 +
archivers/libarchive/files/README | 1 +
archivers/libarchive/files/config.h.in | 12 +
archivers/libarchive/files/configure | 111 +-
archivers/libarchive/files/configure.ac | 15 +-
archivers/libarchive/files/contrib/psota-benchmark/results.txt | 122 +
archivers/libarchive/files/contrib/psota-benchmark/tcp.sh | 104 +
archivers/libarchive/files/cpio/cpio.c | 95 +-
archivers/libarchive/files/cpio/test/list.h | 1 +
archivers/libarchive/files/cpio/test/main.c | 60 +-
archivers/libarchive/files/cpio/test/test_0.c | 62 +
archivers/libarchive/files/cpio/test/test_basic.c | 110 +-
archivers/libarchive/files/cpio/test/test_format_newc.c | 18 +-
archivers/libarchive/files/cpio/test/test_gcpio_compat.c | 16 +-
archivers/libarchive/files/cpio/test/test_option_B.c | 8 +-
archivers/libarchive/files/cpio/test/test_option_L.c | 12 +-
archivers/libarchive/files/cpio/test/test_option_a.c | 125 +-
archivers/libarchive/files/cpio/test/test_option_c.c | 4 +-
archivers/libarchive/files/cpio/test/test_option_d.c | 8 +-
archivers/libarchive/files/cpio/test/test_option_ell.c | 4 +-
archivers/libarchive/files/cpio/test/test_option_f.c | 2 +-
archivers/libarchive/files/cpio/test/test_option_u.c | 19 +-
archivers/libarchive/files/cpio/test/test_option_version.c | 8 +
archivers/libarchive/files/doc/man/archive_entry.3 | 30 +-
archivers/libarchive/files/doc/man/archive_read.3 | 37 +
archivers/libarchive/files/doc/man/archive_write.3 | 13 +-
archivers/libarchive/files/doc/man/archive_write_disk.3 | 5 +
archivers/libarchive/files/doc/man/bsdtar.1 | 63 +-
archivers/libarchive/files/doc/man/libarchive-formats.5 | 8 +
archivers/libarchive/files/doc/man/mtree.5 | 9 +-
archivers/libarchive/files/doc/text/archive_entry.3 | 60 +-
archivers/libarchive/files/doc/text/archive_read.3 | 19 +-
archivers/libarchive/files/doc/text/archive_write.3 | 11 +-
archivers/libarchive/files/doc/text/archive_write_disk.3 | 5 +
archivers/libarchive/files/doc/text/bsdtar.1 | 61 +-
archivers/libarchive/files/doc/text/libarchive-formats.5 | 6 +
archivers/libarchive/files/doc/text/mtree.5 | 10 +-
archivers/libarchive/files/libarchive/archive.h | 592 ++++
archivers/libarchive/files/libarchive/archive_endian.h | 14 +
archivers/libarchive/files/libarchive/archive_entry.3 | 15 +-
archivers/libarchive/files/libarchive/archive_entry.c | 83 +-
archivers/libarchive/files/libarchive/archive_entry.h | 89 +-
archivers/libarchive/files/libarchive/archive_entry_private.h | 21 +-
archivers/libarchive/files/libarchive/archive_entry_strmode.c | 5 +-
archivers/libarchive/files/libarchive/archive_read.3 | 23 +
archivers/libarchive/files/libarchive/archive_read_data_into_fd.c | 12 +-
archivers/libarchive/files/libarchive/archive_read_extract.c | 28 +-
archivers/libarchive/files/libarchive/archive_read_support_compression_bzip2.c | 32 +-
archivers/libarchive/files/libarchive/archive_read_support_compression_program.c | 20 +
archivers/libarchive/files/libarchive/archive_read_support_format_ar.c | 8 +-
archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c | 59 +-
archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c | 665 ++++-
archivers/libarchive/files/libarchive/archive_read_support_format_tar.c | 2 +-
archivers/libarchive/files/libarchive/archive_string.c | 8 +
archivers/libarchive/files/libarchive/archive_windows.c | 188 +
archivers/libarchive/files/libarchive/archive_windows.h | 152 +
archivers/libarchive/files/libarchive/archive_write.3 | 6 +-
archivers/libarchive/files/libarchive/archive_write_disk.3 | 4 +
archivers/libarchive/files/libarchive/archive_write_disk.c | 163 +-
archivers/libarchive/files/libarchive/archive_write_set_compression_program.c | 19 +
archivers/libarchive/files/libarchive/archive_write_set_format_ar.c | 11 +-
archivers/libarchive/files/libarchive/archive_write_set_format_pax.c | 79 +-
archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c | 70 +-
archivers/libarchive/files/libarchive/config_freebsd.h | 3 +
archivers/libarchive/files/libarchive/config_windows.h | 1198 +++++----
archivers/libarchive/files/libarchive/filter_fork.c | 5 +
archivers/libarchive/files/libarchive/libarchive-formats.5 | 8 +
archivers/libarchive/files/libarchive/mtree.5 | 9 +-
archivers/libarchive/files/libarchive/test/list.h | 3 +
archivers/libarchive/files/libarchive/test/main.c | 60 +-
archivers/libarchive/files/libarchive/test/test_entry.c | 5 +
archivers/libarchive/files/libarchive/test/test_read_format_mtree.c | 10 +-
archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.c | 66 +
archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.tar.uu | 38 +
archivers/libarchive/files/libarchive/test/test_tar_filenames.c | 34 +-
archivers/libarchive/files/libarchive/test/test_tar_large.c | 5 +
archivers/libarchive/files/libarchive/test/test_ustar_filenames.c | 183 +
archivers/libarchive/files/libarchive/test/test_write_disk_hardlink.c | 16 +-
archivers/libarchive/files/libarchive/test/test_write_format_ar.c | 3 +-
archivers/libarchive/files/libarchive/test/test_write_format_tar_ustar.c | 342 ++
archivers/libarchive/files/tar/bsdtar.1 | 54 +-
archivers/libarchive/files/tar/bsdtar.c | 37 +-
archivers/libarchive/files/tar/bsdtar.h | 18 +-
archivers/libarchive/files/tar/matching.c | 23 +
archivers/libarchive/files/tar/read.c | 35 +-
archivers/libarchive/files/tar/siginfo.c | 147 +
archivers/libarchive/files/tar/subst.c | 275 ++
archivers/libarchive/files/tar/test/main.c | 102 +-
archivers/libarchive/files/tar/test/test.h | 9 +-
archivers/libarchive/files/tar/test/test_0.c | 62 +
archivers/libarchive/files/tar/test/test_copy.c | 185 +-
archivers/libarchive/files/tar/test/test_option_T.c | 142 +
archivers/libarchive/files/tar/test/test_patterns.c | 47 +
archivers/libarchive/files/tar/test/test_version.c | 8 +
archivers/libarchive/files/tar/util.c | 60 +-
archivers/libarchive/files/tar/write.c | 342 +-
archivers/libarchive/files/version | 2 +-
archivers/libarchive/files/windows/mvcpp.nt | 126 +
archivers/libarchive/files/windows/wccpp.nt | 116 +
102 files changed, 6454 insertions(+), 2308 deletions(-)
diffs (truncated from 13047 to 300 lines):
diff -r 9a328b681dbb -r 2300d3379a79 archivers/libarchive/files/COPYING
--- a/archivers/libarchive/files/COPYING Sun May 25 19:23:26 2008 +0000
+++ b/archivers/libarchive/files/COPYING Sun May 25 19:41:18 2008 +0000
@@ -1,7 +1,41 @@
-All of the C source code and documentation in this package is subject
-to the following:
+The libarchive distribution as a whole is Copyright by Tim Kientzle
+and is subject to the copyright notice reproduced at the bottom of
+this file.
+
+Each individual file in this distribution should have a clear
+copyright/licensing statement at the beginning of the file. If any do
+not, please let me know and I will rectify it. The following is
+intended to summarize the copyright status of the individual files;
+the actual statements in the files are controlling.
+
+* Except as listed below, all C sources (including .c and .h files)
+ and documentation files are subject to the copyright notice reproduced
+ at the bottom of this file.
-Copyright (c) 2003-2006 Tim Kientzle
+* The following source files are also subject in whole or in part to
+ a 3-clause UC Regents copyright; please read the individual source
+ files for details:
+ libarchive/archive_entry.c
+ libarchive/archive_read_support_compression_compress.c
+ libarchive/archive_write_set_compression_compress.c
+ libarchive/mtree.5
+ tar/matching.c
+
+* The following source files are in the public domain:
+ tar/getdate.y
+
+* The build files---including Makefiles, configure scripts,
+ and auxiliary scripts used as part of the compile process---have
+ widely varying licensing terms. Please check individual files before
+ distributing them to see if those restrictions apply to you.
+
+I intend for all new source code to use the license below and hope over
+time to replace code with other licenses with new implementations that
+do use the license below. The varying licensing of the build scripts
+seems to be an unavoidable mess.
+
+
+Copyright (c) 2003-2008 <author(s)>
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff -r 9a328b681dbb -r 2300d3379a79 archivers/libarchive/files/Makefile.am
--- a/archivers/libarchive/files/Makefile.am Sun May 25 19:23:26 2008 +0000
+++ b/archivers/libarchive/files/Makefile.am Sun May 25 19:41:18 2008 +0000
@@ -25,8 +25,9 @@
#
EXTRA_DIST= version \
contrib \
+ doc \
examples \
- doc \
+ windows \
$(libarchive_EXTRA_DIST) \
$(libarchive_test_EXTRA_DIST) \
$(bsdtar_EXTRA_DIST) \
@@ -43,7 +44,7 @@
rm -f `find $(distdir) -name '*.out'`
rm -f `find $(distdir) -name '*.core'`
-rm -f $(distdir)/*/Makefile $(distdir)/*/*/Makefile
- cd $(distdir)/doc && ./update.sh
+ cd $(distdir)/doc && /bin/sh update.sh
#
# Extra rules for cleanup
@@ -57,16 +58,19 @@
-rm -rf .ref
-rm -rf autom4te.cache/
-rm -f *~
+ -[ -f libarchive/Makefile ] && cd libarchive && make clean
+ -[ -f libarchive/test/Makefile ] && cd libarchive/test && make clean
+ -[ -f tar/Makefile ] && cd tar && make clean
+ -[ -f tar/test/Makefile ] && cd tar/test && make clean
+ -[ -f cpio/Makefile ] && cd cpio && make clean
+ -[ -f cpio/test/Makefile ] && cd cpio/test && make clean
#
# Libarchive headers, source, etc.
#
#
-include_HEADERS= libarchive/archive_entry.h
-# Note: archive.h is built from archive.h.in, so don't
-# include archive.h in the distfile, but do install it.
-nodist_include_HEADERS= libarchive/archive.h
+include_HEADERS= libarchive/archive.h libarchive/archive_entry.h
libarchive_la_SOURCES= \
libarchive/archive_check_magic.c \
@@ -134,9 +138,9 @@
libarchive/filter_fork.c \
libarchive/filter_fork.h
-# archive.h ends up in the build directory, so make sure we can find it.
-libarchive_la_CPPFLAGS= -I$(top_builddir)/libarchive
-libarchive_la_LDFLAGS= -version-info $(ARCHIVE_LIBTOOL_VERSION)
+# cygwin barfs without -no-undefined; I don't know what it does or
+# whether it helps or hurts other platforms...
+libarchive_la_LDFLAGS= -no-undefined -version-info $(ARCHIVE_LIBTOOL_VERSION)
# Manpages to install
libarchive_man_MANS= \
@@ -153,8 +157,10 @@
libarchive/tar.5
# Additional libarchive files to include in the distribution
-libarchive_EXTRA_DIST= \
- libarchive/test/list.h \
+libarchive_EXTRA_DIST= \
+ libarchive/test/list.h \
+ libarchive/archive_windows.c \
+ libarchive/archive_windows.h \
$(libarchive_man_MANS)
#
@@ -198,6 +204,7 @@
libarchive/test/test_read_format_mtree.c \
libarchive/test/test_read_format_pax_bz2.c \
libarchive/test/test_read_format_tar.c \
+ libarchive/test/test_read_format_tar_empty_filename.c \
libarchive/test/test_read_format_tbz.c \
libarchive/test/test_read_format_tgz.c \
libarchive/test/test_read_format_tz.c \
@@ -208,6 +215,7 @@
libarchive/test/test_read_truncated.c \
libarchive/test/test_tar_filenames.c \
libarchive/test/test_tar_large.c \
+ libarchive/test/test_ustar_filenames.c \
libarchive/test/test_write_compress.c \
libarchive/test/test_write_compress_program.c \
libarchive/test/test_write_disk.c \
@@ -222,6 +230,7 @@
libarchive/test/test_write_format_shar_empty.c \
libarchive/test/test_write_format_tar.c \
libarchive/test/test_write_format_tar_empty.c \
+ libarchive/test/test_write_format_tar_ustar.c \
libarchive/test/test_write_open_memory.c
libarchive_test_CPPFLAGS= -I$(top_builddir)/libarchive -I$(top_srcdir)/libarchive -I$(top_builddir)/libarchive/test
@@ -244,7 +253,9 @@
libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu \
libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu \
libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu \
- libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
+ libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu \
+ libarchive/test/test_read_format_tar_empty_filename.tar.uu
+
#
#
@@ -259,14 +270,14 @@
tar/getdate.y \
tar/matching.c \
tar/read.c \
+ tar/siginfo.c \
+ tar/subst.c \
tar/tree.c \
tar/tree.h \
tar/util.c \
tar/write.c
-bsdtar_DEPENDENCIES= libarchive.la \
- libarchive/archive_entry.h \
- libarchive/archive.h
+bsdtar_DEPENDENCIES= libarchive.la
if STATIC_BSDTAR
bsdtar_static= -static
@@ -296,16 +307,16 @@
tar/getdate.c \
tar/test/main.c \
tar/test/test.h \
+ tar/test/test_0.c \
tar/test/test_basic.c \
tar/test/test_copy.c \
tar/test/test_getdate.c \
tar/test/test_help.c \
+ tar/test/test_option_T.c \
+ tar/test/test_patterns.c \
tar/test/test_stdio.c \
tar/test/test_version.c
-bsdtar_test_EXTRA_DIST= \
- tar/test/old
-
bsdtar_test_CPPFLAGS= -I$(top_builddir)/tar/test
tar/test/list.h: Makefile
@@ -337,9 +348,7 @@
cpio/pathmatch.c \
cpio/pathmatch.h
-bsdcpio_DEPENDENCIES = libarchive.la \
- libarchive/archive_entry.h \
- libarchive/archive.h
+bsdcpio_DEPENDENCIES = libarchive.la
if STATIC_BSDCPIO
@@ -374,6 +383,7 @@
cpio/pathmatch.c \
cpio/test/main.c \
cpio/test/test.h \
+ cpio/test/test_0.c \
cpio/test/test_basic.c \
cpio/test/test_format_newc.c \
cpio/test/test_gcpio_compat.c \
diff -r 9a328b681dbb -r 2300d3379a79 archivers/libarchive/files/Makefile.in
--- a/archivers/libarchive/files/Makefile.in Sun May 25 19:23:26 2008 +0000
+++ b/archivers/libarchive/files/Makefile.in Sun May 25 19:41:18 2008 +0000
@@ -41,9 +41,8 @@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/configure \
- $(top_srcdir)/libarchive/archive.h.in COPYING INSTALL NEWS \
- config.aux/compile config.aux/config.guess \
+ $(srcdir)/config.h.in $(top_srcdir)/configure COPYING INSTALL \
+ NEWS config.aux/compile config.aux/config.guess \
config.aux/config.sub config.aux/depcomp config.aux/install-sh \
config.aux/ltmain.sh config.aux/missing config.aux/ylwrap \
tar/getdate.c
@@ -55,7 +54,7 @@
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libarchive/archive.h
+CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -64,65 +63,60 @@
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" \
- "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(includedir)" \
- "$(DESTDIR)$(includedir)"
+ "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(includedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libarchive_la_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
-am_libarchive_la_OBJECTS = \
- libarchive/libarchive_la-archive_check_magic.lo \
- libarchive/libarchive_la-archive_entry.lo \
- libarchive/libarchive_la-archive_entry_copy_stat.lo \
- libarchive/libarchive_la-archive_entry_link_resolver.lo \
- libarchive/libarchive_la-archive_entry_stat.lo \
- libarchive/libarchive_la-archive_entry_strmode.lo \
- libarchive/libarchive_la-archive_read.lo \
- libarchive/libarchive_la-archive_read_data_into_fd.lo \
- libarchive/libarchive_la-archive_read_extract.lo \
- libarchive/libarchive_la-archive_read_open_fd.lo \
- libarchive/libarchive_la-archive_read_open_file.lo \
- libarchive/libarchive_la-archive_read_open_filename.lo \
- libarchive/libarchive_la-archive_read_open_memory.lo \
- libarchive/libarchive_la-archive_read_support_compression_all.lo \
- libarchive/libarchive_la-archive_read_support_compression_bzip2.lo \
- libarchive/libarchive_la-archive_read_support_compression_compress.lo \
- libarchive/libarchive_la-archive_read_support_compression_gzip.lo \
- libarchive/libarchive_la-archive_read_support_compression_none.lo \
- libarchive/libarchive_la-archive_read_support_compression_program.lo \
- libarchive/libarchive_la-archive_read_support_format_all.lo \
- libarchive/libarchive_la-archive_read_support_format_ar.lo \
- libarchive/libarchive_la-archive_read_support_format_cpio.lo \
- libarchive/libarchive_la-archive_read_support_format_empty.lo \
- libarchive/libarchive_la-archive_read_support_format_iso9660.lo \
- libarchive/libarchive_la-archive_read_support_format_mtree.lo \
- libarchive/libarchive_la-archive_read_support_format_tar.lo \
- libarchive/libarchive_la-archive_read_support_format_zip.lo \
- libarchive/libarchive_la-archive_string.lo \
- libarchive/libarchive_la-archive_string_sprintf.lo \
- libarchive/libarchive_la-archive_util.lo \
- libarchive/libarchive_la-archive_virtual.lo \
- libarchive/libarchive_la-archive_write.lo \
- libarchive/libarchive_la-archive_write_disk.lo \
- libarchive/libarchive_la-archive_write_disk_set_standard_lookup.lo \
- libarchive/libarchive_la-archive_write_open_fd.lo \
- libarchive/libarchive_la-archive_write_open_file.lo \
- libarchive/libarchive_la-archive_write_open_filename.lo \
- libarchive/libarchive_la-archive_write_open_memory.lo \
- libarchive/libarchive_la-archive_write_set_compression_bzip2.lo \
- libarchive/libarchive_la-archive_write_set_compression_compress.lo \
- libarchive/libarchive_la-archive_write_set_compression_gzip.lo \
- libarchive/libarchive_la-archive_write_set_compression_none.lo \
- libarchive/libarchive_la-archive_write_set_compression_program.lo \
- libarchive/libarchive_la-archive_write_set_format.lo \
- libarchive/libarchive_la-archive_write_set_format_ar.lo \
- libarchive/libarchive_la-archive_write_set_format_by_name.lo \
- libarchive/libarchive_la-archive_write_set_format_cpio.lo \
- libarchive/libarchive_la-archive_write_set_format_cpio_newc.lo \
- libarchive/libarchive_la-archive_write_set_format_pax.lo \
- libarchive/libarchive_la-archive_write_set_format_shar.lo \
- libarchive/libarchive_la-archive_write_set_format_ustar.lo \
Home |
Main Index |
Thread Index |
Old Index