openpkg/libarchive.patch@c10fb90893b9 (annotated)
openpkg/libarchive.patch
Thu, 04 Oct 2012 20:30:05 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 04 Oct 2012 20:30:05 +0200
- changeset 715
- c10fb90893b9
- parent 428
- f880f219c566
- permissions
- -rw-r--r--
Correct out of date build configuration, porting to Solaris 11 network
link infrastructure and new libpcap logic. This additionally allows for
device drivers in subdirectories of /dev. Correct packaged nmap
personalities and signatures to work out of the box. Finally, hack
arpd logic to properly close sockets and quit on TERM by repeating
signaling in the run command script. Sadly, all this fails to correct
the run time behaviour of honeyd which fails to bind to the IP layer.
| michael@428 | 1 | Index: Makefile.in |
| michael@428 | 2 | --- Makefile.in.orig 2011-12-24 19:05:17.000000000 +0100 |
| michael@428 | 3 | +++ Makefile.in 2011-12-26 08:30:54.000000000 +0100 |
| michael@431 | 4 | @@ -1094,7 +1094,7 @@ |
| michael@428 | 5 | lib_LTLIBRARIES = libarchive.la |
| michael@428 | 6 | noinst_LTLIBRARIES = libarchive_fe.la |
| michael@428 | 7 | man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS) |
| michael@428 | 8 | -BUILT_SOURCES = libarchive/test/list.h tar/test/list.h cpio/test/list.h |
| michael@428 | 9 | +BUILT_SOURCES = |
| michael@428 | 10 | TESTS_ENVIRONMENT = $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT) |
| michael@428 | 11 | # Always build and test both bsdtar and bsdcpio as part of 'distcheck' |
| michael@428 | 12 | DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio |
| michael@428 | 13 | Index: cpio/cmdline.c |
| michael@428 | 14 | --- cpio/cmdline.c.orig 2011-12-24 18:56:24.000000000 +0100 |
| michael@428 | 15 | +++ cpio/cmdline.c 2011-12-26 08:29:08.000000000 +0100 |
| michael@428 | 16 | @@ -56,7 +56,7 @@ |
| michael@428 | 17 | /* |
| michael@428 | 18 | * Long options for cpio. Please keep this sorted. |
| michael@428 | 19 | */ |
| michael@428 | 20 | -static const struct option { |
| michael@428 | 21 | +static const struct libarchive_option { |
| michael@428 | 22 | const char *name; |
| michael@428 | 23 | int required; /* 1 if this option requires an argument */ |
| michael@428 | 24 | int equivalent; /* Equivalent short option. */ |
| michael@428 | 25 | @@ -104,7 +104,7 @@ |
| michael@428 | 26 | static int state = state_start; |
| michael@428 | 27 | static char *opt_word; |
| michael@428 | 28 | |
| michael@428 | 29 | - const struct option *popt, *match = NULL, *match2 = NULL; |
| michael@428 | 30 | + const struct libarchive_option *popt, *match = NULL, *match2 = NULL; |
| michael@428 | 31 | const char *p, *long_prefix = "--"; |
| michael@428 | 32 | size_t optlength; |
| michael@428 | 33 | int opt = '?'; |
