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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7e5c3730ae7
branches:  trunk
changeset: 533329:f7e5c3730ae7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Sep 15 11:39:49 2007 +0000

description:
Import libarchive-2.2.8

diffstat:

 archivers/libarchive/files/Makefile.am                                    |    43 +-
 archivers/libarchive/files/Makefile.in                                    |   157 +-
 archivers/libarchive/files/NEWS                                           |    18 +
 archivers/libarchive/files/aclocal.m4                                     |  7273 ++++++++++
 archivers/libarchive/files/config.h.in                                    |     3 +
 archivers/libarchive/files/configure                                      |   117 +-
 archivers/libarchive/files/configure.ac                                   |    21 +-
 archivers/libarchive/files/cpio/cpio.c                                    |   526 +-
 archivers/libarchive/files/cpio/cpio.h                                    |     5 +
 archivers/libarchive/files/libarchive/archive.h.in                        |     4 +
 archivers/libarchive/files/libarchive/archive_entry.c                     |    31 +-
 archivers/libarchive/files/libarchive/archive_entry.h                     |     1 +
 archivers/libarchive/files/libarchive/archive_platform.h                  |     2 +-
 archivers/libarchive/files/libarchive/archive_read_support_format_all.c   |     1 +
 archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c |   708 +
 archivers/libarchive/files/libarchive/archive_read_support_format_tar.c   |   112 +-
 archivers/libarchive/files/libarchive/archive_write_disk.c                |    30 +-
 archivers/libarchive/files/libarchive/filter_fork.c                       |     2 +
 archivers/libarchive/files/libarchive/test/list.h                         |    44 +
 archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse.c |   855 +-
 archivers/libarchive/files/libarchive/test/test_read_format_mtree.c       |   113 +
 archivers/libarchive/files/libarchive/test/test_write_disk_perms.c        |    72 +-
 archivers/libarchive/files/tar/bsdtar.c                                   |     7 +-
 archivers/libarchive/files/version                                        |     2 +-
 24 files changed, 9841 insertions(+), 306 deletions(-)

diffs (truncated from 11385 to 300 lines):

diff -r b69de7464bf2 -r f7e5c3730ae7 archivers/libarchive/files/Makefile.am
--- a/archivers/libarchive/files/Makefile.am    Sat Sep 15 11:39:16 2007 +0000
+++ b/archivers/libarchive/files/Makefile.am    Sat Sep 15 11:39:49 2007 +0000
@@ -9,8 +9,7 @@
        examples                                \
        libarchive/test/list.h                  \
        tar/test                                \
-       tar/getdate.c                           \
-       cpio
+       tar/getdate.c
 
 # Clean out some unneeded files and directories
 # that get picked up as part of the directories in EXTRA_DIST above.
@@ -30,9 +29,9 @@
 
 # Always build libarchive, regardless
 lib_LTLIBRARIES=       libarchive.la
-bin_PROGRAMS=  $(bsdtar_programs)
+bin_PROGRAMS=  $(bsdtar_programs) $(bsdcpio_programs)
 check_PROGRAMS= libarchive_test
-dist_man_MANS=$(libarchive_dist_man_MANS) $(bsdtar_dist_man_MANS)
+dist_man_MANS=$(libarchive_dist_man_MANS) $(bsdtar_dist_man_MANS) $(bsdcpio_dist_man_MANS)
 TESTS= libarchive_test
 
 #
@@ -73,6 +72,7 @@
        libarchive/archive_read_support_format_cpio.c           \
        libarchive/archive_read_support_format_empty.c          \
        libarchive/archive_read_support_format_iso9660.c        \
+       libarchive/archive_read_support_format_mtree.c          \
        libarchive/archive_read_support_format_tar.c            \
        libarchive/archive_read_support_format_zip.c            \
        libarchive/archive_string.c                             \
@@ -152,6 +152,7 @@
        libarchive/test/test_read_format_gtar_sparse.c          \
        libarchive/test/test_read_format_iso_gz.c               \
        libarchive/test/test_read_format_isorr_bz2.c            \
+       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_tbz.c                  \
@@ -212,8 +213,8 @@
 endif
 
 bsdtar_LDADD= libarchive.la
-bsdtar_CPPFLAGS=-I$(top_builddir)/libarchive
-bsdtar_LDFLAGS= $(bsdtar_static) -I$(destdir)/libarchive
+bsdtar_CPPFLAGS=-I$(top_builddir)/libarchive -I$(top_srcdir)/libarchive
+bsdtar_LDFLAGS= $(bsdtar_static)
 
 if BUILD_BSDTAR
 bsdtar_dist_man_MANS=  tar/bsdtar.1
@@ -223,3 +224,33 @@
 bsdtar_programs=
 endif
 
+
+#
+#
+# bsdcpio source, docs, etc.
+#
+#
+
+bsdcpio_SOURCES=                       \
+               cpio/cpio.c             \
+               cpio/cpio.h             \
+               cpio/cpio_platform.h    \
+               cpio/util.c
+
+bsdcpio_DEPENDENCIES = libarchive.la           \
+               libarchive/archive_entry.h      \
+               libarchive/archive.h
+
+bsdcpio_static= -static
+bsdcpio_LDADD= libarchive.la
+bsdcpio_CPPFLAGS=-I$(top_builddir)/libarchive -I$(top_srcdir)/libarchive
+bsdcpio_LDFLAGS= $(bsdcpio_static)
+
+if BUILD_BSDCPIO
+bsdcpio_dist_man_MANS= cpio/bsdcpio.1
+bsdcpio_programs=bsdcpio
+else
+bsdcpio_dist_man_MANS=
+bsdcpio_programs=
+endif
+
diff -r b69de7464bf2 -r f7e5c3730ae7 archivers/libarchive/files/Makefile.in
--- a/archivers/libarchive/files/Makefile.in    Sat Sep 15 11:39:16 2007 +0000
+++ b/archivers/libarchive/files/Makefile.in    Sat Sep 15 11:39:49 2007 +0000
@@ -34,7 +34,7 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = $(am__EXEEXT_1)
+bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
 check_PROGRAMS = libarchive_test$(EXEEXT)
 TESTS = libarchive_test$(EXEEXT)
 subdir = .
@@ -92,6 +92,7 @@
        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 \
@@ -123,8 +124,15 @@
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libarchive_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_BSDTAR_TRUE@am__EXEEXT_1 = bsdtar$(EXEEXT)
+@BUILD_BSDCPIO_TRUE@am__EXEEXT_2 = bsdcpio$(EXEEXT)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
+am_bsdcpio_OBJECTS = cpio/bsdcpio-cpio.$(OBJEXT) \
+       cpio/bsdcpio-util.$(OBJEXT)
+bsdcpio_OBJECTS = $(am_bsdcpio_OBJECTS)
+bsdcpio_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(bsdcpio_LDFLAGS) \
+       $(LDFLAGS) -o $@
 am_bsdtar_OBJECTS = tar/bsdtar-bsdtar.$(OBJEXT) \
        tar/bsdtar-getdate.$(OBJEXT) tar/bsdtar-matching.$(OBJEXT) \
        tar/bsdtar-read.$(OBJEXT) tar/bsdtar-tree.$(OBJEXT) \
@@ -156,6 +164,7 @@
        libarchive/libarchive_test-archive_read_support_format_cpio.$(OBJEXT) \
        libarchive/libarchive_test-archive_read_support_format_empty.$(OBJEXT) \
        libarchive/libarchive_test-archive_read_support_format_iso9660.$(OBJEXT) \
+       libarchive/libarchive_test-archive_read_support_format_mtree.$(OBJEXT) \
        libarchive/libarchive_test-archive_read_support_format_tar.$(OBJEXT) \
        libarchive/libarchive_test-archive_read_support_format_zip.$(OBJEXT) \
        libarchive/libarchive_test-archive_string.$(OBJEXT) \
@@ -206,6 +215,7 @@
        libarchive/test/libarchive_test-test_read_format_gtar_sparse.$(OBJEXT) \
        libarchive/test/libarchive_test-test_read_format_iso_gz.$(OBJEXT) \
        libarchive/test/libarchive_test-test_read_format_isorr_bz2.$(OBJEXT) \
+       libarchive/test/libarchive_test-test_read_format_mtree.$(OBJEXT) \
        libarchive/test/libarchive_test-test_read_format_pax_bz2.$(OBJEXT) \
        libarchive/test/libarchive_test-test_read_format_tar.$(OBJEXT) \
        libarchive/test/libarchive_test-test_read_format_tbz.$(OBJEXT) \
@@ -246,10 +256,10 @@
 LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
 YLWRAP = $(top_srcdir)/config.aux/ylwrap
-SOURCES = $(libarchive_la_SOURCES) $(bsdtar_SOURCES) \
-       $(libarchive_test_SOURCES)
-DIST_SOURCES = $(libarchive_la_SOURCES) $(bsdtar_SOURCES) \
-       $(libarchive_test_SOURCES)
+SOURCES = $(libarchive_la_SOURCES) $(bsdcpio_SOURCES) \
+       $(bsdtar_SOURCES) $(libarchive_test_SOURCES)
+DIST_SOURCES = $(libarchive_la_SOURCES) $(bsdcpio_SOURCES) \
+       $(bsdtar_SOURCES) $(libarchive_test_SOURCES)
 man1dir = $(mandir)/man1
 man3dir = $(mandir)/man3
 man5dir = $(mandir)/man5
@@ -394,13 +404,12 @@
        examples                                \
        libarchive/test/list.h                  \
        tar/test                                \
-       tar/getdate.c                           \
-       cpio
+       tar/getdate.c
 
 
 # Always build libarchive, regardless
 lib_LTLIBRARIES = libarchive.la
-dist_man_MANS = $(libarchive_dist_man_MANS) $(bsdtar_dist_man_MANS)
+dist_man_MANS = $(libarchive_dist_man_MANS) $(bsdtar_dist_man_MANS) $(bsdcpio_dist_man_MANS)
 
 #
 # Libarchive headers, source, etc.
@@ -438,6 +447,7 @@
        libarchive/archive_read_support_format_cpio.c           \
        libarchive/archive_read_support_format_empty.c          \
        libarchive/archive_read_support_format_iso9660.c        \
+       libarchive/archive_read_support_format_mtree.c          \
        libarchive/archive_read_support_format_tar.c            \
        libarchive/archive_read_support_format_zip.c            \
        libarchive/archive_string.c                             \
@@ -518,6 +528,7 @@
        libarchive/test/test_read_format_gtar_sparse.c          \
        libarchive/test/test_read_format_iso_gz.c               \
        libarchive/test/test_read_format_isorr_bz2.c            \
+       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_tbz.c                  \
@@ -567,12 +578,36 @@
 @STATIC_BSDTAR_FALSE@bsdtar_static = 
 @STATIC_BSDTAR_TRUE@bsdtar_static = -static
 bsdtar_LDADD = libarchive.la
-bsdtar_CPPFLAGS = -I$(top_builddir)/libarchive
-bsdtar_LDFLAGS = $(bsdtar_static) -I$(destdir)/libarchive
+bsdtar_CPPFLAGS = -I$(top_builddir)/libarchive -I$(top_srcdir)/libarchive
+bsdtar_LDFLAGS = $(bsdtar_static)
 @BUILD_BSDTAR_FALSE@bsdtar_dist_man_MANS = 
 @BUILD_BSDTAR_TRUE@bsdtar_dist_man_MANS = tar/bsdtar.1
 @BUILD_BSDTAR_FALSE@bsdtar_programs = 
 @BUILD_BSDTAR_TRUE@bsdtar_programs = bsdtar
+
+#
+#
+# bsdcpio source, docs, etc.
+#
+#
+bsdcpio_SOURCES = \
+               cpio/cpio.c             \
+               cpio/cpio.h             \
+               cpio/cpio_platform.h    \
+               cpio/util.c
+
+bsdcpio_DEPENDENCIES = libarchive.la           \
+               libarchive/archive_entry.h      \
+               libarchive/archive.h
+
+bsdcpio_static = -static
+bsdcpio_LDADD = libarchive.la
+bsdcpio_CPPFLAGS = -I$(top_builddir)/libarchive -I$(top_srcdir)/libarchive
+bsdcpio_LDFLAGS = $(bsdcpio_static)
+@BUILD_BSDCPIO_FALSE@bsdcpio_dist_man_MANS = 
+@BUILD_BSDCPIO_TRUE@bsdcpio_dist_man_MANS = cpio/bsdcpio.1
+@BUILD_BSDCPIO_FALSE@bsdcpio_programs = 
+@BUILD_BSDCPIO_TRUE@bsdcpio_programs = bsdcpio
 all: $(BUILT_SOURCES) config.h
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -727,6 +762,9 @@
 libarchive/libarchive_la-archive_read_support_format_iso9660.lo:  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/libarchive_la-archive_read_support_format_mtree.lo:  \
+       libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/libarchive_la-archive_read_support_format_tar.lo:  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
@@ -839,6 +877,19 @@
          echo " rm -f $$p $$f"; \
          rm -f $$p $$f ; \
        done
+cpio/$(am__dirstamp):
+       @$(MKDIR_P) cpio
+       @: > cpio/$(am__dirstamp)
+cpio/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) cpio/$(DEPDIR)
+       @: > cpio/$(DEPDIR)/$(am__dirstamp)
+cpio/bsdcpio-cpio.$(OBJEXT): cpio/$(am__dirstamp) \
+       cpio/$(DEPDIR)/$(am__dirstamp)
+cpio/bsdcpio-util.$(OBJEXT): cpio/$(am__dirstamp) \
+       cpio/$(DEPDIR)/$(am__dirstamp)
+bsdcpio$(EXEEXT): $(bsdcpio_OBJECTS) $(bsdcpio_DEPENDENCIES) 
+       @rm -f bsdcpio$(EXEEXT)
+       $(bsdcpio_LINK) $(bsdcpio_OBJECTS) $(bsdcpio_LDADD) $(LIBS)
 tar/$(am__dirstamp):
        @$(MKDIR_P) tar
        @: > tar/$(am__dirstamp)
@@ -928,6 +979,9 @@
 libarchive/libarchive_test-archive_read_support_format_iso9660.$(OBJEXT):  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/libarchive_test-archive_read_support_format_mtree.$(OBJEXT):  \
+       libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/libarchive_test-archive_read_support_format_tar.$(OBJEXT):  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
@@ -1081,6 +1135,9 @@
 libarchive/test/libarchive_test-test_read_format_isorr_bz2.$(OBJEXT):  \
        libarchive/test/$(am__dirstamp) \
        libarchive/test/$(DEPDIR)/$(am__dirstamp)
+libarchive/test/libarchive_test-test_read_format_mtree.$(OBJEXT):  \
+       libarchive/test/$(am__dirstamp) \
+       libarchive/test/$(DEPDIR)/$(am__dirstamp)
 libarchive/test/libarchive_test-test_read_format_pax_bz2.$(OBJEXT):  \
        libarchive/test/$(am__dirstamp) \
        libarchive/test/$(DEPDIR)/$(am__dirstamp)
@@ -1153,6 +1210,8 @@
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
+       -rm -f cpio/bsdcpio-cpio.$(OBJEXT)
+       -rm -f cpio/bsdcpio-util.$(OBJEXT)
        -rm -f libarchive/libarchive_la-archive_check_magic.$(OBJEXT)
        -rm -f libarchive/libarchive_la-archive_check_magic.lo
        -rm -f libarchive/libarchive_la-archive_entry.$(OBJEXT)
@@ -1197,6 +1256,8 @@
        -rm -f libarchive/libarchive_la-archive_read_support_format_empty.lo
        -rm -f libarchive/libarchive_la-archive_read_support_format_iso9660.$(OBJEXT)
        -rm -f libarchive/libarchive_la-archive_read_support_format_iso9660.lo
+       -rm -f libarchive/libarchive_la-archive_read_support_format_mtree.$(OBJEXT)
+       -rm -f libarchive/libarchive_la-archive_read_support_format_mtree.lo
        -rm -f libarchive/libarchive_la-archive_read_support_format_tar.$(OBJEXT)
        -rm -f libarchive/libarchive_la-archive_read_support_format_tar.lo
        -rm -f libarchive/libarchive_la-archive_read_support_format_zip.$(OBJEXT)
@@ -1271,6 +1332,7 @@
        -rm -f libarchive/libarchive_test-archive_read_support_format_cpio.$(OBJEXT)
        -rm -f libarchive/libarchive_test-archive_read_support_format_empty.$(OBJEXT)
        -rm -f libarchive/libarchive_test-archive_read_support_format_iso9660.$(OBJEXT)
+       -rm -f libarchive/libarchive_test-archive_read_support_format_mtree.$(OBJEXT)
        -rm -f libarchive/libarchive_test-archive_read_support_format_tar.$(OBJEXT)
        -rm -f libarchive/libarchive_test-archive_read_support_format_zip.$(OBJEXT)
        -rm -f libarchive/libarchive_test-archive_string.$(OBJEXT)



Home | Main Index | Thread Index | Old Index