pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers/libarchive/files Update in-tree libarchive t...
details: https://anonhg.NetBSD.org/pkgsrc/rev/644dbbebe17d
branches: trunk
changeset: 532203:644dbbebe17d
user: joerg <joerg%pkgsrc.org@localhost>
date: Mon Aug 13 18:17:26 2007 +0000
description:
Update in-tree libarchive to 2.2.6. This merges the local changes
and some bugfixes from FreeBSD.
diffstat:
archivers/libarchive/files/Makefile.am | 23 +-
archivers/libarchive/files/Makefile.in | 16 +-
archivers/libarchive/files/NEWS | 6 +
archivers/libarchive/files/config.h.in | 39 +-
archivers/libarchive/files/configure | 1453 ++++-----
archivers/libarchive/files/configure.ac | 91 +-
archivers/libarchive/files/libarchive/archive_entry.3 | 8 +-
archivers/libarchive/files/libarchive/archive_entry.c | 14 +-
archivers/libarchive/files/libarchive/archive_entry.h | 4 +-
archivers/libarchive/files/libarchive/archive_read_support_compression_program.c | 7 +-
archivers/libarchive/files/libarchive/archive_read_support_format_tar.c | 16 +-
archivers/libarchive/files/libarchive/archive_read_support_format_zip.c | 9 +-
archivers/libarchive/files/libarchive/archive_string.c | 13 +-
archivers/libarchive/files/libarchive/archive_string_sprintf.c | 6 +-
archivers/libarchive/files/libarchive/archive_write_disk.c | 7 +-
archivers/libarchive/files/libarchive/archive_write_set_format_ar.c | 8 +-
archivers/libarchive/files/libarchive/test/main.c | 112 +-
archivers/libarchive/files/libarchive/test/test.h | 14 +-
archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse.c | 28 +-
archivers/libarchive/files/libarchive/test/test_read_format_tar.c | 401 ++-
archivers/libarchive/files/libarchive/test/test_tar_filenames.c | 20 +-
archivers/libarchive/files/libarchive/test/test_write_disk_perms.c | 4 +-
archivers/libarchive/files/tar/bsdtar.c | 12 +
archivers/libarchive/files/tar/getdate.c | 14 +-
archivers/libarchive/files/tar/getdate.y | 14 +-
archivers/libarchive/files/tar/read.c | 8 +-
archivers/libarchive/files/version | 2 +-
27 files changed, 1409 insertions(+), 940 deletions(-)
diffs (truncated from 3406 to 300 lines):
diff -r d6a41f161d96 -r 644dbbebe17d archivers/libarchive/files/Makefile.am
--- a/archivers/libarchive/files/Makefile.am Mon Aug 13 17:37:58 2007 +0000
+++ b/archivers/libarchive/files/Makefile.am Mon Aug 13 18:17:26 2007 +0000
@@ -28,10 +28,9 @@
-rm -rf autom4te.cache/
-rm -f *~
+# Always build libarchive, regardless
lib_LTLIBRARIES= libarchive.la
-if BUILD_BSDTAR
-bin_PROGRAMS= bsdtar
-endif
+bin_PROGRAMS= $(bsdtar_programs)
check_PROGRAMS= libarchive_test
dist_man_MANS=$(libarchive_dist_man_MANS) $(bsdtar_dist_man_MANS)
TESTS= libarchive_test
@@ -206,13 +205,21 @@
libarchive/archive_entry.h \
libarchive/archive.h
+if STATIC_BSDTAR
+bsdtar_static=-static
+else
+bsdtar_static=
+endif
+
bsdtar_LDADD= libarchive.la
bsdtar_CPPFLAGS=-I$(top_builddir)/libarchive
-# Link libarchive statically...
-bsdtar_dist_man_MANS= tar/bsdtar.1
+bsdtar_LDFLAGS= $(bsdtar_static) -I$(destdir)/libarchive
-if STATIC_BSDTAR
-bsdtar_LDFLAGS= -static -I$(destdir)/libarchive
+if BUILD_BSDTAR
+bsdtar_dist_man_MANS= tar/bsdtar.1
+bsdtar_programs=bsdtar
else
-bsdtar_LDFLAGS= -I$(destdir)/libarchive
+bsdtar_dist_man_MANS=
+bsdtar_programs=
endif
+
diff -r d6a41f161d96 -r 644dbbebe17d archivers/libarchive/files/Makefile.in
--- a/archivers/libarchive/files/Makefile.in Mon Aug 13 17:37:58 2007 +0000
+++ b/archivers/libarchive/files/Makefile.in Mon Aug 13 18:17:26 2007 +0000
@@ -34,7 +34,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@BUILD_BSDTAR_TRUE@bin_PROGRAMS = bsdtar$(EXEEXT)
+bin_PROGRAMS = $(am__EXEEXT_1)
check_PROGRAMS = libarchive_test$(EXEEXT)
TESTS = libarchive_test$(EXEEXT)
subdir = .
@@ -122,6 +122,7 @@
libarchive_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libarchive_la_LDFLAGS) $(LDFLAGS) -o $@
+@BUILD_BSDTAR_TRUE@am__EXEEXT_1 = bsdtar$(EXEEXT)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_bsdtar_OBJECTS = tar/bsdtar-bsdtar.$(OBJEXT) \
@@ -396,6 +397,8 @@
tar/getdate.c \
cpio
+
+# Always build libarchive, regardless
lib_LTLIBRARIES = libarchive.la
dist_man_MANS = $(libarchive_dist_man_MANS) $(bsdtar_dist_man_MANS)
@@ -561,12 +564,15 @@
libarchive/archive_entry.h \
libarchive/archive.h
+@STATIC_BSDTAR_FALSE@bsdtar_static =
+@STATIC_BSDTAR_TRUE@bsdtar_static = -static
bsdtar_LDADD = libarchive.la
bsdtar_CPPFLAGS = -I$(top_builddir)/libarchive
-# Link libarchive statically...
-bsdtar_dist_man_MANS = tar/bsdtar.1
-@STATIC_BSDTAR_FALSE@bsdtar_LDFLAGS = -I$(destdir)/libarchive
-@STATIC_BSDTAR_TRUE@bsdtar_LDFLAGS = -static -I$(destdir)/libarchive
+bsdtar_LDFLAGS = $(bsdtar_static) -I$(destdir)/libarchive
+@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
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
diff -r d6a41f161d96 -r 644dbbebe17d archivers/libarchive/files/NEWS
--- a/archivers/libarchive/files/NEWS Mon Aug 13 17:37:58 2007 +0000
+++ b/archivers/libarchive/files/NEWS Mon Aug 13 18:17:26 2007 +0000
@@ -1,3 +1,9 @@
+
+Aug 05, 2007: libarchive 2.2.6 released
+
+Aug 05, 2007: New configure option --disable-bsdtar, thanks to Joerg
+ Sonnenberger.
+Aug 05, 2007: Several bug fixes from FreeBSD CVS repo.
Jul 13, 2007: libarchive 2.2.5 released
diff -r d6a41f161d96 -r 644dbbebe17d archivers/libarchive/files/config.h.in
--- a/archivers/libarchive/files/config.h.in Mon Aug 13 17:37:58 2007 +0000
+++ b/archivers/libarchive/files/config.h.in Mon Aug 13 18:17:26 2007 +0000
@@ -44,6 +44,14 @@
don't. */
#undef HAVE_DECL_INT64_MIN
+/* Define to 1 if you have the declaration of `optarg', and to 0 if you don't.
+ */
+#undef HAVE_DECL_OPTARG
+
+/* Define to 1 if you have the declaration of `optind', and to 0 if you don't.
+ */
+#undef HAVE_DECL_OPTIND
+
/* Define to 1 if you have the declaration of `SIZE_MAX', and to 0 if you
don't. */
#undef HAVE_DECL_SIZE_MAX
@@ -127,6 +135,9 @@
/* Define to 1 if you have the <grp.h> header file. */
#undef HAVE_GRP_H
+/* Define to 1 if the system has the type `intmax_t'. */
+#undef HAVE_INTMAX_T
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
@@ -175,6 +186,9 @@
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
+/* Define to 1 if the system has the type `long long int'. */
+#undef HAVE_LONG_LONG_INT
+
/* Define to 1 if you have the `lsetxattr' function. */
#undef HAVE_LSETXATTR
@@ -218,9 +232,6 @@
/* Define to 1 if you have the <pwd.h> header file. */
#undef HAVE_PWD_H
-/* Define to 1 if you have the `reallocf' function. */
-#undef HAVE_REALLOCF
-
/* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT
@@ -323,6 +334,9 @@
/* Define to 1 if the system has the type `unsigned long long'. */
#undef HAVE_UNSIGNED_LONG_LONG
+/* Define to 1 if the system has the type `unsigned long long int'. */
+#undef HAVE_UNSIGNED_LONG_LONG_INT
+
/* Define to 1 if you have the `utime' function. */
#undef HAVE_UTIME
@@ -407,6 +421,11 @@
/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES
+/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
+ #define below would cause a syntax error. */
+#undef _UINT64_T
+
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
@@ -416,16 +435,18 @@
/* Define to `unsigned long' if <sys/types.h> does not define. */
#undef id_t
-/* Define int64_t to a valid signed 64-bit type, if necessary. */
+/* Define to the type of a signed integer type of width exactly 64 bits if
+ such a type exists and the standard includes do not define it. */
#undef int64_t
-/* Define to `int64_t' if <sys/types.h> does not define. */
+/* Define to the widest signed integer type if <stdint.h> and <inttypes.h> do
+ not define. */
#undef intmax_t
/* Define to `int' if <sys/types.h> does not define. */
#undef mode_t
-/* Define to `int64_t' if <sys/types.h> does not define. */
+/* Define to `long long' if <sys/types.h> does not define. */
#undef off_t
/* Define to `unsigned int' if <sys/types.h> does not define. */
@@ -434,10 +455,12 @@
/* Define to `int' if <sys/types.h> doesn't define. */
#undef uid_t
-/* Define uint64_t to an unsigned 64-bit type, if necessary. */
+/* Define to the type of an unsigned integer type of width exactly 64 bits if
+ such a type exists and the standard includes do not define it. */
#undef uint64_t
-/* Define to `uint64_t' if <sys/types.h> does not define. */
+/* Define to the widest unsigned integer type if <stdint.h> and <inttypes.h>
+ do not define. */
#undef uintmax_t
/* Define to `unsigned int' if <sys/types.h> does not define. */
diff -r d6a41f161d96 -r 644dbbebe17d archivers/libarchive/files/configure
--- a/archivers/libarchive/files/configure Mon Aug 13 17:37:58 2007 +0000
+++ b/archivers/libarchive/files/configure Mon Aug 13 18:17:26 2007 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libarchive 2.2.5.
+# Generated by GNU Autoconf 2.61 for libarchive 2.2.6.
#
# Report bugs to <kientzle%freebsd.org@localhost>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='libarchive'
PACKAGE_TARNAME='libarchive'
-PACKAGE_VERSION='2.2.5'
-PACKAGE_STRING='libarchive 2.2.5'
+PACKAGE_VERSION='2.2.6'
+PACKAGE_STRING='libarchive 2.2.6'
PACKAGE_BUGREPORT='kientzle%freebsd.org@localhost'
ac_unique_file="libarchive"
@@ -1407,7 +1407,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libarchive 2.2.5 to adapt to many kinds of systems.
+\`configure' configures libarchive 2.2.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1477,7 +1477,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libarchive 2.2.5:";;
+ short | recursive ) echo "Configuration of libarchive 2.2.6:";;
esac
cat <<\_ACEOF
@@ -1491,6 +1491,9 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-bsdtar enable build of bsdtar (default)
+ --enable-bsdtar=static force static build of bsdtar
+ --enable-bsdtar=shared force dynamic build of bsdtar
--disable-bsdtar disable build of bsdtar
--disable-largefile omit support for large files
@@ -1586,7 +1589,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libarchive configure 2.2.5
+libarchive configure 2.2.6
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1600,7 +1603,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libarchive $as_me 2.2.5, which was
+It was created by libarchive $as_me 2.2.6, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2294,7 +2297,7 @@
# Define the identity of the package.
PACKAGE='libarchive'
- VERSION='2.2.5'
+ VERSION='2.2.6'
cat >>confdefs.h <<_ACEOF
@@ -4517,7 +4520,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4520 "configure"' > conftest.$ac_ext
+ echo '#line 4523 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7248,11 +7251,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
Home |
Main Index |
Thread Index |
Old Index