openpkg/diffutils.patch@c10fb90893b9 (annotated)
openpkg/diffutils.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
- 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: lib/c-stack.c |
| michael@428 | 2 | --- lib/c-stack.c.orig 2011-08-28 13:55:52.000000000 +0200 |
| michael@428 | 3 | +++ lib/c-stack.c 2012-05-12 10:06:32.000000000 +0200 |
| michael@428 | 4 | @@ -35,6 +35,10 @@ |
| michael@428 | 5 | |
| michael@428 | 6 | #include <config.h> |
| michael@428 | 7 | |
| michael@428 | 8 | +#if defined(__FreeBSD__) |
| michael@428 | 9 | +#include <sys/types.h> |
| michael@428 | 10 | +#endif |
| michael@428 | 11 | + |
| michael@428 | 12 | #ifndef __attribute__ |
| michael@428 | 13 | # if __GNUC__ < 3 |
| michael@428 | 14 | # define __attribute__(x) |
| michael@428 | 15 | Index: man/diff3.1 |
| michael@428 | 16 | --- man/diff3.1.orig 2011-09-02 17:19:12.000000000 +0200 |
| michael@428 | 17 | +++ man/diff3.1 2012-05-12 10:06:32.000000000 +0200 |
| michael@428 | 18 | @@ -39,6 +39,9 @@ |
| michael@428 | 19 | \fB\-a\fR, \fB\-\-text\fR |
| michael@428 | 20 | treat all files as text |
| michael@428 | 21 | .TP |
| michael@428 | 22 | +\fB\-O\fR |
| michael@428 | 23 | +Always show content of OLDFILE in bracketing output of unmerged changes. (OpenPKG only) |
| michael@428 | 24 | +.TP |
| michael@428 | 25 | \fB\-\-strip\-trailing\-cr\fR |
| michael@428 | 26 | strip trailing carriage return on input |
| michael@428 | 27 | .TP |
| michael@428 | 28 | Index: src/diff3.c |
| michael@428 | 29 | --- src/diff3.c.orig 2011-07-03 22:42:54.000000000 +0200 |
| michael@428 | 30 | +++ src/diff3.c 2012-05-12 10:06:32.000000000 +0200 |
| michael@428 | 31 | @@ -158,6 +158,9 @@ |
| michael@428 | 32 | /* If nonzero, show information for DIFF_2ND diffs. */ |
| michael@428 | 33 | static bool show_2nd; |
| michael@428 | 34 | |
| michael@428 | 35 | +/* If nonzero, show information for DIFF_2ND on overlaps, too. */ |
| michael@428 | 36 | +static bool show_2nd_on_overlap; |
| michael@428 | 37 | + |
| michael@428 | 38 | /* If nonzero, include `:wq' at the end of the script |
| michael@428 | 39 | to write out the file being edited. */ |
| michael@428 | 40 | static bool finalwrite; |
| michael@428 | 41 | @@ -237,7 +240,7 @@ |
| michael@428 | 42 | textdomain (PACKAGE); |
| michael@428 | 43 | c_stack_action (0); |
| michael@428 | 44 | |
| michael@428 | 45 | - while ((c = getopt_long (argc, argv, "aeimvx3AEL:TX", longopts, 0)) != -1) |
| michael@428 | 46 | + while ((c = getopt_long (argc, argv, "aeimvx3AEL:TXO", longopts, 0)) != -1) |
| michael@428 | 47 | { |
| michael@428 | 48 | switch (c) |
| michael@428 | 49 | { |
| michael@428 | 50 | @@ -272,6 +275,9 @@ |
| michael@428 | 51 | case 'e': |
| michael@428 | 52 | incompat++; |
| michael@428 | 53 | break; |
| michael@428 | 54 | + case 'O': |
| michael@428 | 55 | + show_2nd_on_overlap = true; |
| michael@428 | 56 | + break; |
| michael@428 | 57 | case 'T': |
| michael@428 | 58 | initial_tab = true; |
| michael@428 | 59 | break; |
| michael@428 | 60 | @@ -1547,7 +1553,7 @@ |
| michael@428 | 61 | leading_dot = false; |
| michael@428 | 62 | if (type == DIFF_ALL) |
| michael@428 | 63 | { |
| michael@428 | 64 | - if (show_2nd) |
| michael@428 | 65 | + if (show_2nd || show_2nd_on_overlap) |
| michael@428 | 66 | { |
| michael@428 | 67 | /* Append lines from FILE1. */ |
| michael@428 | 68 | fprintf (outputfile, "||||||| %s\n", file1); |
| michael@428 | 69 | @@ -1686,7 +1692,7 @@ |
| michael@428 | 70 | D_RELLEN (b, mapping[FILE0], i), outputfile); |
| michael@428 | 71 | } |
| michael@428 | 72 | |
| michael@428 | 73 | - if (show_2nd) |
| michael@428 | 74 | + if (show_2nd || show_2nd_on_overlap) |
| michael@428 | 75 | { |
| michael@428 | 76 | /* Put in lines from FILE1 with bracket. */ |
| michael@428 | 77 | fprintf (outputfile, format_2nd, file1); |
