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.4.0



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d02229733db
branches:  trunk
changeset: 535978:6d02229733db
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Nov 30 21:25:12 2007 +0000

description:
Import libarchive-2.4.0

diffstat:

 archivers/libarchive/files/Makefile.am                                        |  155 +-
 archivers/libarchive/files/Makefile.in                                        |  677 ++++++++-
 archivers/libarchive/files/NEWS                                               |   51 +-
 archivers/libarchive/files/README                                             |   32 +-
 archivers/libarchive/files/config.h.in                                        |   12 +
 archivers/libarchive/files/configure                                          |  231 +-
 archivers/libarchive/files/configure.ac                                       |   75 +-
 archivers/libarchive/files/contrib/README                                     |   32 +
 archivers/libarchive/files/contrib/libarchive.1aix53.spec                     |  163 ++
 archivers/libarchive/files/contrib/libarchive.spec                            |  150 +
 archivers/libarchive/files/contrib/libarchive_autodetect-st_lib_archive.m4    |  154 ++
 archivers/libarchive/files/cpio/bsdcpio.1                                     |  362 ++++
 archivers/libarchive/files/cpio/cmdline.c                                     |  245 +++
 archivers/libarchive/files/cpio/cpio.c                                        |  416 +++--
 archivers/libarchive/files/cpio/cpio.h                                        |   27 +-
 archivers/libarchive/files/cpio/cpio_platform.h                               |    3 +-
 archivers/libarchive/files/cpio/err.c                                         |   73 +
 archivers/libarchive/files/cpio/match.c                                       |   87 +
 archivers/libarchive/files/cpio/test/list.h                                   |   11 +
 archivers/libarchive/files/cpio/test/main.c                                   |  692 ++++++++
 archivers/libarchive/files/cpio/test/test.h                                   |  146 +
 archivers/libarchive/files/cpio/test/test_basic.c                             |  159 ++
 archivers/libarchive/files/cpio/test/test_gcpio_compat.c                      |  126 +
 archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.bin                |  Bin 
 archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.crc                |  Bin 
 archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.newc               |  Bin 
 archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.ustar              |  Bin 
 archivers/libarchive/files/cpio/test/test_help.c                              |   66 +
 archivers/libarchive/files/cpio/test/test_option_B.c                          |   54 +
 archivers/libarchive/files/cpio/test/test_option_d.c                          |   68 +
 archivers/libarchive/files/cpio/test/test_option_m.c                          |   68 +
 archivers/libarchive/files/cpio/test/test_option_m.cpio                       |  Bin 
 archivers/libarchive/files/cpio/test/test_option_t.c                          |   44 +
 archivers/libarchive/files/cpio/test/test_option_t.cpio                       |  Bin 
 archivers/libarchive/files/cpio/test/test_option_t.stdout                     |    1 +
 archivers/libarchive/files/cpio/test/test_option_tv.stdout                    |    1 +
 archivers/libarchive/files/cpio/test/test_owner_parse.c                       |   68 +
 archivers/libarchive/files/cpio/test/test_pathmatch.c                         |  108 +
 archivers/libarchive/files/cpio/test/test_version.c                           |   73 +
 archivers/libarchive/files/cpio/test/test_write_odc.c                         |  186 ++
 archivers/libarchive/files/doc/man/archive_entry.3                            |  382 ++++
 archivers/libarchive/files/doc/man/archive_read.3                             |  524 ++++++
 archivers/libarchive/files/doc/man/archive_util.3                             |  146 +
 archivers/libarchive/files/doc/man/archive_write.3                            |  524 ++++++
 archivers/libarchive/files/doc/man/archive_write_disk.3                       |  358 ++++
 archivers/libarchive/files/doc/man/bsdcpio.1                                  |  362 ++++
 archivers/libarchive/files/doc/man/bsdtar.1                                   |  769 ++++++++++
 archivers/libarchive/files/doc/man/cpio.5                                     |  325 ++++
 archivers/libarchive/files/doc/man/libarchive-formats.5                       |  272 +++
 archivers/libarchive/files/doc/man/libarchive.3                               |  331 ++++
 archivers/libarchive/files/doc/man/libarchive_internals.3                     |  366 ++++
 archivers/libarchive/files/doc/man/mtree.5                                    |  270 +++
 archivers/libarchive/files/doc/man/tar.5                                      |  730 +++++++++
 archivers/libarchive/files/doc/text/archive_entry.3.txt                       |  350 ++++
 archivers/libarchive/files/doc/text/archive_read.3.txt                        |  395 +++++
 archivers/libarchive/files/doc/text/archive_util.3.txt                        |   91 +
 archivers/libarchive/files/doc/text/archive_write.3.txt                       |  420 +++++
 archivers/libarchive/files/doc/text/archive_write_disk.3.txt                  |  253 +++
 archivers/libarchive/files/doc/text/bsdcpio.1.txt                             |  199 ++
 archivers/libarchive/files/doc/text/bsdtar.1.txt                              |  450 +++++
 archivers/libarchive/files/doc/text/cpio.5.txt                                |  235 +++
 archivers/libarchive/files/doc/text/libarchive-formats.5.txt                  |  180 ++
 archivers/libarchive/files/doc/text/libarchive.3.txt                          |  185 ++
 archivers/libarchive/files/doc/text/libarchive_internals.3.txt                |  248 +++
 archivers/libarchive/files/doc/text/mtree.5.txt                               |  158 ++
 archivers/libarchive/files/doc/text/tar.5.txt                                 |  534 ++++++
 archivers/libarchive/files/libarchive/archive.h.in                            |   54 +-
 archivers/libarchive/files/libarchive/archive_entry.h                         |   34 +-
 archivers/libarchive/files/libarchive/archive_entry_link_resolver.c           |  222 ++
 archivers/libarchive/files/libarchive/archive_entry_private.h                 |    2 +
 archivers/libarchive/files/libarchive/archive_entry_strmode.c                 |   83 +
 archivers/libarchive/files/libarchive/archive_platform.h                      |    3 +-
 archivers/libarchive/files/libarchive/archive_read.3                          |    4 +-
 archivers/libarchive/files/libarchive/archive_read.c                          |   18 +-
 archivers/libarchive/files/libarchive/archive_read_support_compression_none.c |  109 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_ar.c        |    8 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_cpio.c      |  179 ++-
 archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c   |   17 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c     |   19 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_tar.c       |   89 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_zip.c       |   30 +-
 archivers/libarchive/files/libarchive/archive_util.c                          |    2 +-
 archivers/libarchive/files/libarchive/archive_write_disk.c                    |   21 +-
 archivers/libarchive/files/libarchive/archive_write_set_compression_none.c    |   43 +-
 archivers/libarchive/files/libarchive/archive_write_set_format_cpio.c         |   10 +-
 archivers/libarchive/files/libarchive/archive_write_set_format_cpio_newc.c    |    9 +-
 archivers/libarchive/files/libarchive/archive_write_set_format_pax.c          |   13 +-
 archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c        |   13 +-
 archivers/libarchive/files/libarchive/config_windows.h                        |    3 -
 archivers/libarchive/files/libarchive/cpio.5                                  |  325 ++++
 archivers/libarchive/files/libarchive/libarchive-formats.5                    |   32 +-
 archivers/libarchive/files/libarchive/libarchive_internals.3                  |   22 +-
 archivers/libarchive/files/libarchive/mtree.5                                 |  270 +++
 archivers/libarchive/files/libarchive/test/list.h                             |    4 +
 archivers/libarchive/files/libarchive/test/main.c                             |  288 +++-
 archivers/libarchive/files/libarchive/test/read_open_memory.c                 |    2 +-
 archivers/libarchive/files/libarchive/test/test.h                             |   90 +-
 archivers/libarchive/files/libarchive/test/test_entry_strmode.c               |   48 +
 archivers/libarchive/files/libarchive/test/test_read_format_cpio_odc.c        |    2 +-
 archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse.c     |   57 +-
 archivers/libarchive/files/libarchive/test/test_read_format_isorr_bz2.c       |    3 +
 archivers/libarchive/files/libarchive/test/test_read_format_zip.c             |    6 +
 archivers/libarchive/files/libarchive/test/test_read_pax_truncated.c          |    4 +-
 archivers/libarchive/files/libarchive/test/test_tar_filenames.c               |    2 +-
 archivers/libarchive/files/libarchive/test/test_tar_large.c                   |  307 +++
 archivers/libarchive/files/libarchive/test/test_write_disk.c                  |   79 +-
 archivers/libarchive/files/libarchive/test/test_write_format_cpio.c           |   96 +-
 archivers/libarchive/files/libarchive/test/test_write_format_cpio_newc.c      |  172 ++
 archivers/libarchive/files/libarchive/test/test_write_format_cpio_odc.c       |  224 ++
 archivers/libarchive/files/tar/bsdtar.1                                       |    2 +-
 archivers/libarchive/files/tar/bsdtar.c                                       |    4 +-
 archivers/libarchive/files/tar/bsdtar.h                                       |    1 -
 archivers/libarchive/files/tar/bsdtar_platform.h                              |    3 +-
 archivers/libarchive/files/tar/read.c                                         |    5 +-
 archivers/libarchive/files/tar/test/config.sh                                 |    1 +
 archivers/libarchive/files/tar/test/test-basic.sh                             |   40 +-
 archivers/libarchive/files/tar/util.c                                         |   50 -
 archivers/libarchive/files/version                                            |    2 +-
 118 files changed, 16144 insertions(+), 855 deletions(-)

diffs (truncated from 20025 to 300 lines):

diff -r 035a9fc4884c -r 6d02229733db archivers/libarchive/files/Makefile.am
--- a/archivers/libarchive/files/Makefile.am    Fri Nov 30 21:13:53 2007 +0000
+++ b/archivers/libarchive/files/Makefile.am    Fri Nov 30 21:25:12 2007 +0000
@@ -1,18 +1,37 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign subdir-objects
+AUTOMAKE_OPTIONS= foreign subdir-objects
 
-BUILT_SOURCES = libarchive/test/list.h libarchive/archive.h
+#
+# What to build and install
+#
+lib_LTLIBRARIES=       libarchive.la
+bin_PROGRAMS=  $(bsdtar_programs) $(bsdcpio_programs)
+man_MANS= $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS)
+BUILT_SOURCES= libarchive/test/list.h cpio/test/list.h
 
-EXTRA_DIST= version                            \
-       config.h.in                             \
-       examples                                \
-       libarchive/test/list.h                  \
-       tar/test                                \
-       tar/getdate.c
+#
+# What to test
+#
+check_PROGRAMS= libarchive_test $(bsdcpio_test_programs)
+TESTS= libarchive_test $(bsdcpio_test_programs)
+TESTS_ENVIRONMENT= $(bsdcpio_TESTS_ENVIRONMENT)
+# Always build and test bsdcpio as part of 'distcheck'
+DISTCHECK_CONFIGURE_FLAGS = --enable-bsdcpio
 
-# Clean out some unneeded files and directories
-# that get picked up as part of the directories in EXTRA_DIST above.
+#
+# What to include in the distribution
+#
+EXTRA_DIST= version                    \
+       contrib                         \
+       examples                        \
+       $(libarchive_EXTRA_DIST)        \
+       $(bsdtar_EXTRA_DIST)            \
+       $(bsdcpio_EXTRA_DIST)           \
+       $(bsdcpio_test_EXTRA_DIST)
+
+# a) Clean out some unneeded files and directories
+# b) Collect all documentation and format it for distribution.
 dist-hook:
        rm -rf `find $(distdir) -name CVS -type d`
        rm -rf `find $(distdir) -name .svn -type d`
@@ -20,20 +39,20 @@
        rm -f `find $(distdir) -name '*.out'`
        rm -f `find $(distdir) -name '*.core'`
        rm -f $(distdir)/*/Makefile
+       mkdir -p $(distdir)/doc/man
+       cp $(distdir)/libarchive/*.[135] $(distdir)/doc/man
+       cp $(distdir)/tar/*.[135] $(distdir)/doc/man
+       cp $(distdir)/cpio/*.[135] $(distdir)/doc/man
+       mkdir -p $(distdir)/doc/text
+       cd $(distdir)/doc/man; for f in *.[135]; do nroff -mdoc $$f | col -b > ../text/`basename $$f`.txt; done
 
 distclean-local:
        -rm -f tar/getdate.c tar/getdate.h
        -rm -f libarchive/test/list.h
+       -rm -f cpio/test/list.h
        -rm -rf autom4te.cache/
        -rm -f *~
 
-# Always build libarchive, regardless
-lib_LTLIBRARIES=       libarchive.la
-bin_PROGRAMS=  $(bsdtar_programs) $(bsdcpio_programs)
-check_PROGRAMS= libarchive_test
-dist_man_MANS=$(libarchive_dist_man_MANS) $(bsdtar_dist_man_MANS) $(bsdcpio_dist_man_MANS)
-TESTS= libarchive_test
-
 #
 # Libarchive headers, source, etc.
 #
@@ -49,8 +68,10 @@
        libarchive/archive_entry.c                              \
        libarchive/archive_entry.h                              \
        libarchive/archive_entry_copy_stat.c                    \
+       libarchive/archive_entry_link_resolver.c                \
        libarchive/archive_entry_private.h                      \
        libarchive/archive_entry_stat.c                         \
+       libarchive/archive_entry_strmode.c                      \
        libarchive/archive_platform.h                           \
        libarchive/archive_private.h                            \
        libarchive/archive_read.c                               \
@@ -107,20 +128,28 @@
        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_CPPFLAGS= -I$(top_builddir)/libarchive
 libarchive_la_LDFLAGS= -version-info $(ARCHIVE_LIBTOOL_VERSION)
 
-libarchive_dist_man_MANS=                                      \
+# Manpages to install
+libarchive_man_MANS=                                           \
        libarchive/archive_entry.3                              \
        libarchive/archive_read.3                               \
        libarchive/archive_util.3                               \
        libarchive/archive_write.3                              \
        libarchive/archive_write_disk.3                         \
+       libarchive/cpio.5                                       \
        libarchive/libarchive.3                                 \
        libarchive/libarchive_internals.3                       \
        libarchive/libarchive-formats.5                         \
+       libarchive/mtree.5                                      \
        libarchive/tar.5
 
+# Additional libarchive files to include in the distribution
+libarchive_EXTRA_DIST=         \
+       libarchive/test/list.h  \
+       $(libarchive_man_MANS)
+
 #
 #
 # libarchive_test program
@@ -136,6 +165,7 @@
        libarchive/test/test_archive_api_feature.c              \
        libarchive/test/test_bad_fd.c                           \
        libarchive/test/test_entry.c                            \
+       libarchive/test/test_entry_strmode.c                    \
        libarchive/test/test_read_compress_program.c            \
        libarchive/test/test_read_data_large.c                  \
        libarchive/test/test_read_extract.c                     \
@@ -164,6 +194,7 @@
        libarchive/test/test_read_position.c                    \
        libarchive/test/test_read_truncated.c                   \
        libarchive/test/test_tar_filenames.c                    \
+       libarchive/test/test_tar_large.c                        \
        libarchive/test/test_write_compress_program.c           \
        libarchive/test/test_write_disk.c                       \
        libarchive/test/test_write_disk_perms.c                 \
@@ -171,12 +202,14 @@
        libarchive/test/test_write_format_ar.c                  \
        libarchive/test/test_write_format_cpio.c                \
        libarchive/test/test_write_format_cpio_empty.c          \
+       libarchive/test/test_write_format_cpio_odc.c            \
+       libarchive/test/test_write_format_cpio_newc.c           \
        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_open_memory.c
 
-libarchive_test_CPPFLAGS=-I$(top_builddir)/libarchive -I$(top_builddir)/libarchive/test
+libarchive_test_CPPFLAGS= -I$(top_builddir)/libarchive -I$(top_builddir)/libarchive/test
 
 # The "list.h" file just lists all of the tests defined in all of the sources.
 # Building it automatically provides a sanity-check on libarchive_test_SOURCES
@@ -202,25 +235,28 @@
                tar/util.c              \
                tar/write.c
 
-bsdtar_DEPENDENCIES = libarchive.la            \
+bsdtar_DEPENDENCIES= libarchive.la             \
                libarchive/archive_entry.h      \
                libarchive/archive.h
 
 if STATIC_BSDTAR
-bsdtar_static=-static
+bsdtar_static= -static
 else
 bsdtar_static=
 endif
 
 bsdtar_LDADD= libarchive.la
-bsdtar_CPPFLAGS=-I$(top_builddir)/libarchive -I$(top_srcdir)/libarchive
+bsdtar_CPPFLAGS= -I$(top_builddir)/libarchive -I$(top_srcdir)/libarchive
 bsdtar_LDFLAGS= $(bsdtar_static)
+bsdtar_EXTRA_DIST=             \
+       tar/test                \
+       tar/bsdtar.1
 
 if BUILD_BSDTAR
-bsdtar_dist_man_MANS=  tar/bsdtar.1
-bsdtar_programs=bsdtar
+bsdtar_man_MANS= tar/bsdtar.1
+bsdtar_programs= bsdtar
 else
-bsdtar_dist_man_MANS=
+bsdtar_man_MANS=
 bsdtar_programs=
 endif
 
@@ -232,25 +268,82 @@
 #
 
 bsdcpio_SOURCES=                       \
+               cpio/cmdline.c          \
                cpio/cpio.c             \
                cpio/cpio.h             \
                cpio/cpio_platform.h    \
-               cpio/util.c
+               cpio/err.c              \
+               cpio/match.c
 
 bsdcpio_DEPENDENCIES = libarchive.la           \
                libarchive/archive_entry.h      \
                libarchive/archive.h
 
+
+if STATIC_BSDCPIO
 bsdcpio_static= -static
+else
+bsdcpio_static=
+endif
+
 bsdcpio_LDADD= libarchive.la
-bsdcpio_CPPFLAGS=-I$(top_builddir)/libarchive -I$(top_srcdir)/libarchive
+bsdcpio_CPPFLAGS= -I$(top_builddir)/libarchive -I$(top_srcdir)/libarchive
 bsdcpio_LDFLAGS= $(bsdcpio_static)
+bsdcpio_EXTRA_DIST=            \
+       cpio/test/list.h        \
+       cpio/bsdcpio.1
 
 if BUILD_BSDCPIO
-bsdcpio_dist_man_MANS= cpio/bsdcpio.1
-bsdcpio_programs=bsdcpio
+# Manpages to install
+bsdcpio_man_MANS= cpio/bsdcpio.1
+bsdcpio_programs= bsdcpio
 else
-bsdcpio_dist_man_MANS=
+bsdcpio_man_MANS=
 bsdcpio_programs=
 endif
 
+#
+# bsdcpio_test
+#
+
+bsdcpio_test_SOURCES=                                          \
+       cpio/cmdline.c                                          \
+       cpio/err.c                                              \
+       cpio/match.c                                            \
+       cpio/test/main.c                                        \
+       cpio/test/test.h                                        \
+       cpio/test/test_basic.c                                  \
+       cpio/test/test_gcpio_compat.c                           \
+       cpio/test/test_help.c                                   \
+       cpio/test/test_option_B.c                               \
+       cpio/test/test_option_d.c                               \
+       cpio/test/test_option_m.c                               \
+       cpio/test/test_option_t.c                               \
+       cpio/test/test_owner_parse.c                            \
+       cpio/test/test_pathmatch.c                              \
+       cpio/test/test_version.c                                \
+       cpio/test/test_write_odc.c
+
+bsdcpio_test_EXTRA_DIST=                       \
+       cpio/test/test_gcpio_compat_ref.bin     \
+       cpio/test/test_gcpio_compat_ref.crc     \
+       cpio/test/test_gcpio_compat_ref.newc    \
+       cpio/test/test_gcpio_compat_ref.ustar   \
+       cpio/test/test_option_m.cpio            \
+       cpio/test/test_option_t.cpio            \
+       cpio/test/test_option_t.stdout          \
+       cpio/test/test_option_tv.stdout
+
+bsdcpio_test_CPPFLAGS= -I$(top_builddir)/cpio/test
+
+cpio/test/list.h: Makefile
+       cat $(top_srcdir)/cpio/test/test_*.c | grep DEFINE_TEST > cpio/test/list.h
+
+if BUILD_BSDCPIO
+bsdcpio_test_programs= bsdcpio_test
+bsdcpio_TESTS_ENVIRONMENT= BSDCPIO=`cd $(top_builddir);/bin/pwd`/bsdcpio BSDCPIO_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/cpio/test
+else
+bsdcpio_test_programs=
+bsdcpio_TESTS_ENVIRONMENT=
+endif
+
diff -r 035a9fc4884c -r 6d02229733db archivers/libarchive/files/Makefile.in
--- a/archivers/libarchive/files/Makefile.in    Fri Nov 30 21:13:53 2007 +0000
+++ b/archivers/libarchive/files/Makefile.in    Fri Nov 30 21:25:12 2007 +0000
@@ -35,11 +35,11 @@
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
-check_PROGRAMS = libarchive_test$(EXEEXT)
-TESTS = libarchive_test$(EXEEXT)
+check_PROGRAMS = libarchive_test$(EXEEXT) $(am__EXEEXT_3)
+TESTS = libarchive_test$(EXEEXT) $(am__EXEEXT_3)
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
-       $(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+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 \
@@ -73,7 +73,9 @@
        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 \



Home | Main Index | Thread Index | Old Index