|
|
@@ -1,18 +1,18 @@
|
|
|
Index: Makefile.in
|
|
|
---- Makefile.in.orig 2011-12-24 19:05:17.000000000 +0100
|
|
|
-+++ Makefile.in 2011-12-26 08:30:54.000000000 +0100
|
|
|
-@@ -1091,7 +1091,7 @@
|
|
|
+--- Makefile.in.orig 2016-05-02 07:42:03.011567000 +0200
|
|
|
++++ Makefile.in 2016-05-02 07:44:49.341534923 +0200
|
|
|
+@@ -1771,7 +1771,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
|
|
|
+ man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS) $(bsdcat_man_MANS)
|
|
|
+-BUILT_SOURCES = libarchive/test/list.h tar/test/list.h cpio/test/list.h cat/test/list.h
|
|
|
+BUILT_SOURCES =
|
|
|
- TESTS_ENVIRONMENT = $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT)
|
|
|
+ TESTS_ENVIRONMENT = $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT) $(bsdcat_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 2011-12-24 18:56:24.000000000 +0100
|
|
|
-+++ cpio/cmdline.c 2011-12-26 08:29:08.000000000 +0100
|
|
|
+--- cpio/cmdline.c.orig 2015-09-05 06:24:18.000000000 +0200
|
|
|
++++ cpio/cmdline.c 2016-05-02 07:42:03.021494876 +0200
|
|
|
@@ -56,7 +56,7 @@
|
|
|
/*
|
|
|
* Long options for cpio. Please keep this sorted.
|
|
|
@@ -22,7 +22,7 @@ Index: cpio/cmdline.c
|
|
|
const char *name;
|
|
|
int required; /* 1 if this option requires an argument */
|
|
|
int equivalent; /* Equivalent short option. */
|
|
|
-@@ -104,7 +104,7 @@
|
|
|
+@@ -111,7 +111,7 @@
|
|
|
static int state = state_start;
|
|
|
static char *opt_word;
|
|
|
|