You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
77 lines
2.5 KiB
77 lines
2.5 KiB
Index: Makefile.in |
|
--- Makefile.in.orig 2010-06-30 11:54:48.000000000 +0200 |
|
+++ Makefile.in 2010-09-02 14:18:18.000000000 +0200 |
|
@@ -885,7 +885,7 @@ |
|
lib_LTLIBRARIES = libarchive.la |
|
noinst_LTLIBRARIES = libarchive_fe.la |
|
man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS) |
|
-BUILT_SOURCES = libarchive/test/list.h tar/test/list.h cpio/test/list.h |
|
+BUILT_SOURCES = |
|
TESTS_ENVIRONMENT = $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT) |
|
# Always build and test both bsdtar and bsdcpio as part of 'distcheck' |
|
DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio |
|
Index: cpio/cmdline.c |
|
--- cpio/cmdline.c.orig 2010-03-07 19:06:15.000000000 +0100 |
|
+++ cpio/cmdline.c 2010-09-02 14:18:40.000000000 +0200 |
|
@@ -56,7 +56,7 @@ |
|
/* |
|
* Long options for cpio. Please keep this sorted. |
|
*/ |
|
-static const struct option { |
|
+static const struct libarchive_option { |
|
const char *name; |
|
int required; /* 1 if this option requires an argument */ |
|
int equivalent; /* Equivalent short option. */ |
|
@@ -103,7 +103,7 @@ |
|
static int state = state_start; |
|
static char *opt_word; |
|
|
|
- const struct option *popt, *match = NULL, *match2 = NULL; |
|
+ const struct libarchive_option *popt, *match = NULL, *match2 = NULL; |
|
const char *p, *long_prefix = "--"; |
|
size_t optlength; |
|
int opt = '?'; |
|
Index: cpio/cpio.c |
|
--- cpio/cpio.c.orig 2010-03-07 19:06:15.000000000 +0100 |
|
+++ cpio/cpio.c 2010-09-02 14:18:18.000000000 +0200 |
|
@@ -29,6 +29,9 @@ |
|
__FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.15 2008/12/06 07:30:40 kientzle Exp $"); |
|
|
|
#include <sys/types.h> |
|
+#ifdef MAJOR_IN_MKDEV |
|
+# include <sys/mkdev.h> |
|
+#endif |
|
#include <archive.h> |
|
#include <archive_entry.h> |
|
|
|
@@ -75,6 +78,9 @@ |
|
#ifdef HAVE_TIME_H |
|
#include <time.h> |
|
#endif |
|
+#ifdef HAVE_SYS_TIME_H |
|
+#include <sys/time.h> |
|
+#endif |
|
|
|
#include "cpio.h" |
|
#include "err.h" |
|
Index: tar/cmdline.c |
|
--- tar/cmdline.c.orig 2010-03-07 19:06:05.000000000 +0100 |
|
+++ tar/cmdline.c 2010-09-02 14:18:59.000000000 +0200 |
|
@@ -58,7 +58,7 @@ |
|
* a small change to the code below. |
|
*/ |
|
|
|
-static struct option { |
|
+static struct libarchive_option { |
|
const char *name; |
|
int required; /* 1 if this option requires an argument. */ |
|
int equivalent; /* Equivalent short option. */ |
|
@@ -179,7 +179,7 @@ |
|
static int state = state_start; |
|
static char *opt_word; |
|
|
|
- const struct option *popt, *match = NULL, *match2 = NULL; |
|
+ const struct libarchive_option *popt, *match = NULL, *match2 = NULL; |
|
const char *p, *long_prefix = "--"; |
|
size_t optlength; |
|
int opt = '?';
|
|
|