libpcap/libpcap.patch@9dacbd1d1aa2 (annotated)
libpcap/libpcap.patch
Fri, 07 Sep 2012 19:08:07 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 07 Sep 2012 19:08:07 +0200
- changeset 667
- 9dacbd1d1aa2
- parent 489
- 0348d09236d3
- permissions
- -rw-r--r--
Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.
| michael@488 | 1 | Index: Makefile.in |
| michael@488 | 2 | --- Makefile.in.orig 2010-03-12 02:56:53.000000000 +0100 |
| michael@488 | 3 | +++ Makefile.in 2010-03-31 09:50:02.000000000 +0200 |
| michael@489 | 4 | @@ -345,7 +345,7 @@ |
| michael@488 | 5 | Win32/Src/inet_net.c \ |
| michael@488 | 6 | Win32/Src/inet_pton.c |
| michael@488 | 7 | |
| michael@488 | 8 | -all: libpcap.a shared pcap-config |
| michael@488 | 9 | +all: libpcap.a pcap-config |
| michael@488 | 10 | |
| michael@488 | 11 | libpcap.a: $(OBJ) |
| michael@488 | 12 | @rm -f $@ |
| michael@489 | 13 | @@ -530,7 +530,7 @@ |
| michael@489 | 14 | selpolltest: tests/selpolltest.c libpcap.a |
| michael@489 | 15 | $(CC) $(FULL_CFLAGS) -I. -L. -o selpolltest $(srcdir)/tests/selpolltest.c libpcap.a $(LIBS) |
| michael@488 | 16 | |
| michael@488 | 17 | -install: install-shared install-archive pcap-config |
| michael@488 | 18 | +install: install-archive pcap-config |
| michael@488 | 19 | [ -d $(DESTDIR)$(libdir) ] || \ |
| michael@488 | 20 | (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) |
| michael@488 | 21 | [ -d $(DESTDIR)$(includedir) ] || \ |
| michael@27 | 22 | Index: scanner.l |
| michael@488 | 23 | --- scanner.l.orig 2010-03-12 02:56:54.000000000 +0100 |
| michael@488 | 24 | +++ scanner.l 2010-03-31 09:46:58.000000000 +0200 |
| michael@489 | 25 | @@ -97,13 +97,6 @@ |
| michael@488 | 26 | B2 ([0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f]) |
| michael@27 | 27 | W ([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?) |
| michael@27 | 28 | |
| michael@27 | 29 | -%a 18400 |
| michael@27 | 30 | -%o 21500 |
| michael@27 | 31 | -%e 7600 |
| michael@27 | 32 | -%k 4550 |
| michael@27 | 33 | -%p 27600 |
| michael@27 | 34 | -%n 2000 |
| michael@27 | 35 | - |
| michael@27 | 36 | V680 {W}:{W}:{W}:{W}:{W}:{W}:{W}:{W} |
| michael@27 | 37 | |
| michael@27 | 38 | V670 ::{W}:{W}:{W}:{W}:{W}:{W}:{W} |
| michael@489 | 39 | Index: Makefile.in |
| michael@489 | 40 | --- fad-getad.c.orig 2012-03-29 14:57:32.000000000 +0200 |
| michael@489 | 41 | +++ fad-getad.c 2012-08-08 19:22:54.524951872 +0200 |
| michael@489 | 42 | @@ -60,7 +60,10 @@ |
| michael@489 | 43 | #include "os-proto.h" |
| michael@489 | 44 | #endif |
| michael@489 | 45 | |
| michael@489 | 46 | -#ifdef AF_PACKET |
| michael@489 | 47 | +/* Yes Solaris 11 defines AF_PACKET but it does so in sys/socket.h */ |
| michael@489 | 48 | +/* rather than netpacket/packet.h as claimed here. Not ready for */ |
| michael@489 | 49 | +/* prime time time so circumvent until corrected upstream. */ |
| michael@499 | 50 | +#ifdef __linux || AF_PACKET_KAPUTTIBUG |
| michael@489 | 51 | # ifdef HAVE_NETPACKET_PACKET_H |
| michael@489 | 52 | /* Solaris 11 and later, Linux distributions with newer glibc */ |
| michael@489 | 53 | # include <netpacket/packet.h> |
