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.1b.
details: https://anonhg.NetBSD.org/pkgsrc/rev/08ab1521e586
branches: trunk
changeset: 541748:08ab1521e586
user: joerg <joerg%pkgsrc.org@localhost>
date: Fri Apr 25 15:07:17 2008 +0000
description:
Import libarchive-2.5.1b.
diffstat:
archivers/libarchive/files/NEWS | 2 +
archivers/libarchive/files/configure | 46 +-
archivers/libarchive/files/configure.ac | 4 +-
archivers/libarchive/files/cpio/cmdline.c | 2 +-
archivers/libarchive/files/cpio/cpio.c | 26 +-
archivers/libarchive/files/cpio/test/main.c | 91 ++-
archivers/libarchive/files/cpio/test/test_option_L.c | 12 +-
archivers/libarchive/files/cpio/test/test_option_a.c | 58 +-
archivers/libarchive/files/doc/man/cpio.5 | 10 +-
archivers/libarchive/files/doc/man/tar.5 | 12 +-
archivers/libarchive/files/doc/text/cpio.5 | 18 +-
archivers/libarchive/files/doc/text/tar.5 | 12 +-
archivers/libarchive/files/libarchive/archive.h.in | 266 ++++---
archivers/libarchive/files/libarchive/archive_entry.c | 377 ++++++---
archivers/libarchive/files/libarchive/archive_entry.h | 244 +++--
archivers/libarchive/files/libarchive/archive_entry_private.h | 9 +-
archivers/libarchive/files/libarchive/archive_platform.h | 3 +
archivers/libarchive/files/libarchive/archive_read_support_format_tar.c | 92 +-
archivers/libarchive/files/libarchive/archive_string.c | 255 ++++++-
archivers/libarchive/files/libarchive/archive_string.h | 26 +-
archivers/libarchive/files/libarchive/archive_write_set_format_pax.c | 58 +-
archivers/libarchive/files/libarchive/cpio.5 | 12 +-
archivers/libarchive/files/libarchive/tar.5 | 12 +-
archivers/libarchive/files/libarchive/test/list.h | 4 +-
archivers/libarchive/files/libarchive/test/main.c | 73 +-
archivers/libarchive/files/libarchive/test/test_acl_pax.c | 12 +-
archivers/libarchive/files/libarchive/test/test_archive_api_feature.c | 2 +-
archivers/libarchive/files/libarchive/test/test_entry.c | 30 +-
archivers/libarchive/files/libarchive/test/test_pax_filename_encoding.c | 166 ++++-
archivers/libarchive/files/tar/matching.c | 4 +-
archivers/libarchive/files/tar/test/main.c | 91 ++-
archivers/libarchive/files/tar/test/test_copy.c | 98 +-
archivers/libarchive/files/version | 2 +-
33 files changed, 1517 insertions(+), 612 deletions(-)
diffs (truncated from 3698 to 300 lines):
diff -r 83728e8e8223 -r 08ab1521e586 archivers/libarchive/files/NEWS
--- a/archivers/libarchive/files/NEWS Fri Apr 25 15:04:32 2008 +0000
+++ b/archivers/libarchive/files/NEWS Fri Apr 25 15:07:17 2008 +0000
@@ -1,3 +1,5 @@
+
+Mar 30, 2008: libarchive 2.5.1b released
Mar 15, 2008: libarchive 2.5.0b released
Mar 15, 2008: bsdcpio now seems to correctly write hardlinks into newc,
diff -r 83728e8e8223 -r 08ab1521e586 archivers/libarchive/files/configure
--- a/archivers/libarchive/files/configure Fri Apr 25 15:04:32 2008 +0000
+++ b/archivers/libarchive/files/configure Fri Apr 25 15:07:17 2008 +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.5.0b.
+# Generated by GNU Autoconf 2.61 for libarchive 2.5.1b.
#
# Report bugs to <kientzle%freebsd.org@localhost>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='libarchive'
PACKAGE_TARNAME='libarchive'
-PACKAGE_VERSION='2.5.0b'
-PACKAGE_STRING='libarchive 2.5.0b'
+PACKAGE_VERSION='2.5.1b'
+PACKAGE_STRING='libarchive 2.5.1b'
PACKAGE_BUGREPORT='kientzle%freebsd.org@localhost'
ac_unique_file="libarchive"
@@ -1408,7 +1408,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.5.0b to adapt to many kinds of systems.
+\`configure' configures libarchive 2.5.1b to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1478,7 +1478,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libarchive 2.5.0b:";;
+ short | recursive ) echo "Configuration of libarchive 2.5.1b:";;
esac
cat <<\_ACEOF
@@ -1596,7 +1596,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libarchive configure 2.5.0b
+libarchive configure 2.5.1b
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1610,7 +1610,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.5.0b, which was
+It was created by libarchive $as_me 2.5.1b, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2304,7 +2304,7 @@
# Define the identity of the package.
PACKAGE='libarchive'
- VERSION='2.5.0b'
+ VERSION='2.5.1b'
cat >>confdefs.h <<_ACEOF
@@ -2455,21 +2455,21 @@
# platforms. At least on FreeBSD, libtool uses an overly complex
# convention that attempts to solve problems that most people just
# don't have and which just causes confusion for most end users.
-ARCHIVE_MAJOR=$(( 2005000 / 1000000 ))
-ARCHIVE_MINOR=$(( (2005000 / 1000) % 1000 ))
-ARCHIVE_REVISION=$(( 2005000 % 1000 ))
+ARCHIVE_MAJOR=$(( 2005001 / 1000000 ))
+ARCHIVE_MINOR=$(( (2005001 / 1000) % 1000 ))
+ARCHIVE_REVISION=$(( 2005001 % 1000 ))
ARCHIVE_LIBTOOL_MAJOR=`echo $((${ARCHIVE_MAJOR} + ${ARCHIVE_MINOR}))`
ARCHIVE_LIBTOOL_VERSION=$ARCHIVE_LIBTOOL_MAJOR:$ARCHIVE_REVISION:$ARCHIVE_MINOR
# Stick the version numbers into config.h
cat >>confdefs.h <<\_ACEOF
-#define LIBARCHIVE_VERSION_STRING "2.5.0b"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define LIBARCHIVE_VERSION_NUMBER "2005000"
+#define LIBARCHIVE_VERSION_STRING "2.5.1b"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define LIBARCHIVE_VERSION_NUMBER "2005001"
_ACEOF
@@ -2479,7 +2479,7 @@
cat >>confdefs.h <<\_ACEOF
-#define BSDTAR_VERSION_STRING "2.5.0b"
+#define BSDTAR_VERSION_STRING "2.5.1b"
_ACEOF
@@ -2487,9 +2487,9 @@
# below, but the shell variable names apparently cannot be the same as
# the m4 macro names above. Why? Ask autoconf.
BSDCPIO_VERSION_STRING=0.9.9a
-BSDTAR_VERSION_STRING=2.5.0b
-LIBARCHIVE_VERSION_STRING=2.5.0b
-LIBARCHIVE_VERSION_NUMBER=2005000
+BSDTAR_VERSION_STRING=2.5.1b
+LIBARCHIVE_VERSION_STRING=2.5.1b
+LIBARCHIVE_VERSION_NUMBER=2005001
# Substitute the above version numbers into the various files below.
# Yes, I believe this is the fourth time we define what are essentially
@@ -27783,7 +27783,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libarchive $as_me 2.5.0b, which was
+This file was extended by libarchive $as_me 2.5.1b, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -27836,7 +27836,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libarchive config.status 2.5.0b
+libarchive config.status 2.5.1b
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -r 83728e8e8223 -r 08ab1521e586 archivers/libarchive/files/configure.ac
--- a/archivers/libarchive/files/configure.ac Fri Apr 25 15:04:32 2008 +0000
+++ b/archivers/libarchive/files/configure.ac Fri Apr 25 15:07:17 2008 +0000
@@ -4,8 +4,8 @@
dnl In particular, this allows the version macro to be used in AC_INIT
dnl These first two version numbers are updated automatically on each release.
-m4_define([LIBARCHIVE_VERSION_S],[2.5.0b])
-m4_define([LIBARCHIVE_VERSION_N],[2005000])
+m4_define([LIBARCHIVE_VERSION_S],[2.5.1b])
+m4_define([LIBARCHIVE_VERSION_N],[2005001])
dnl bsdtar versioning tracks libarchive
m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
diff -r 83728e8e8223 -r 08ab1521e586 archivers/libarchive/files/cpio/cmdline.c
--- a/archivers/libarchive/files/cpio/cmdline.c Fri Apr 25 15:04:32 2008 +0000
+++ b/archivers/libarchive/files/cpio/cmdline.c Fri Apr 25 15:07:17 2008 +0000
@@ -112,7 +112,7 @@
opt = getopt_long(cpio->argc, cpio->argv, cpio_opts,
cpio_longopts, &option_index);
#else
- opt = getopt(cpio->argc, cpio->argv, optstring);
+ opt = getopt(cpio->argc, cpio->argv, cpio_opts);
#endif
/* Support long options through -W longopt=value */
diff -r 83728e8e8223 -r 08ab1521e586 archivers/libarchive/files/cpio/cpio.c
--- a/archivers/libarchive/files/cpio/cpio.c Fri Apr 25 15:04:32 2008 +0000
+++ b/archivers/libarchive/files/cpio/cpio.c Fri Apr 25 15:07:17 2008 +0000
@@ -478,7 +478,8 @@
static int
entry_to_archive(struct cpio *cpio, struct archive_entry *entry)
{
- const char *destpath, *srcpath;
+ const char *destpath;
+ char *srcpath;
int fd = -1;
ssize_t bytes_read;
size_t len;
@@ -488,7 +489,12 @@
/*
* Generate a target path for this entry.
*/
- destpath = srcpath = archive_entry_pathname(entry);
+ p = archive_entry_pathname(entry);
+ srcpath = malloc(strlen(p) + 1);
+ if (srcpath == NULL)
+ cpio_errc(1, ENOMEM, "Can't allocate path buffer");
+ strcpy(srcpath, p);
+ destpath = srcpath;
if (cpio->destdir) {
len = strlen(cpio->destdir) + strlen(srcpath) + 8;
if (len >= cpio->pass_destpath_alloc) {
@@ -511,8 +517,10 @@
}
if (cpio->option_rename)
destpath = cpio_rename(destpath);
- if (destpath == NULL)
+ if (destpath == NULL) {
+ free(srcpath);
return (0);
+ }
archive_entry_copy_pathname(entry, destpath);
/* Print out the destination name to the user. */
@@ -526,12 +534,12 @@
/* Note: link(2) doesn't create parent directories. */
archive_entry_set_hardlink(entry, srcpath);
r = archive_write_header(cpio->archive, entry);
- if (r == ARCHIVE_OK)
- return (0);
- cpio_warnc(archive_errno(cpio->archive),
- archive_error_string(cpio->archive));
+ if (r != ARCHIVE_OK)
+ cpio_warnc(archive_errno(cpio->archive),
+ archive_error_string(cpio->archive));
if (r == ARCHIVE_FATAL)
exit(1);
+ free(srcpath);
return (0);
}
@@ -563,8 +571,7 @@
if (r == ARCHIVE_FATAL)
exit(1);
- if (r >= ARCHIVE_WARN && fd >= 0 && archive_entry_size(entry) > 0) {
- fd = open(srcpath, O_RDONLY);
+ if (r >= ARCHIVE_WARN && fd >= 0) {
bytes_read = read(fd, cpio->buff, cpio->buff_size);
while (bytes_read > 0) {
r = archive_write_data(cpio->archive,
@@ -587,6 +594,7 @@
fprintf(stderr,"\n");
if (fd >= 0)
close(fd);
+ free(srcpath);
return (0);
}
diff -r 83728e8e8223 -r 08ab1521e586 archivers/libarchive/files/cpio/test/main.c
--- a/archivers/libarchive/files/cpio/test/main.c Fri Apr 25 15:04:32 2008 +0000
+++ b/archivers/libarchive/files/cpio/test/main.c Fri Apr 25 15:07:17 2008 +0000
@@ -39,7 +39,7 @@
*
* The next few lines are the only differences.
*/
-#define PROGRAM "bsdcpio" /* Program being tested. */
+#define PROGRAM "bsdcpio" /* Name of program being tested. */
#define ENVBASE "BSDCPIO" /* Prefix for environment variables. */
#undef EXTRA_DUMP /* How to dump extra data */
/* How to generate extra version info. */
@@ -55,7 +55,7 @@
* test functions.
*/
#undef DEFINE_TEST
-#define DEFINE_TEST(name) void name(void);
+#define DEFINE_TEST(name) void name(void);
#include "list.h"
/* Interix doesn't define these in a standard header. */
@@ -272,6 +272,30 @@
return (0);
}
+static void strdump(const char *p)
+{
+ if (p == NULL) {
+ fprintf(stderr, "(null)");
+ return;
+ }
+ fprintf(stderr, "\"");
+ while (*p != '\0') {
+ unsigned int c = 0xff & *p++;
+ switch (c) {
+ case '\a': fprintf(stderr, "\a"); break;
+ case '\b': fprintf(stderr, "\b"); break;
+ case '\n': fprintf(stderr, "\n"); break;
+ case '\r': fprintf(stderr, "\r"); break;
+ default:
+ if (c >= 32 && c < 127)
+ fprintf(stderr, "%c", c);
+ else
+ fprintf(stderr, "\\x%02X", c);
+ }
+ }
+ fprintf(stderr, "\"");
+}
+
/* assertEqualString() displays the values of the two strings. */
int
test_assert_equal_string(const char *file, int line,
@@ -294,12 +318,37 @@
Home |
Main Index |
Thread Index |
Old Index