libpcap/libpcap.patch

Mon, 28 Jan 2013 17:37:18 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Mon, 28 Jan 2013 17:37:18 +0100
changeset 758
a2c6460cfb16
parent 489
0348d09236d3
permissions
-rw-r--r--

Correct socket error reporting improvement with IPv6 portable code,
after helpful recommendation by Saúl Ibarra Corretgé on OSips devlist.

     1 Index: Makefile.in
     2 --- Makefile.in.orig	2010-03-12 02:56:53.000000000 +0100
     3 +++ Makefile.in	2010-03-31 09:50:02.000000000 +0200
     4 @@ -345,7 +345,7 @@
     5  	Win32/Src/inet_net.c \
     6  	Win32/Src/inet_pton.c
     8 -all: libpcap.a shared pcap-config
     9 +all: libpcap.a pcap-config
    11  libpcap.a: $(OBJ)
    12  	@rm -f $@
    13 @@ -530,7 +530,7 @@
    14  selpolltest: tests/selpolltest.c libpcap.a
    15  	$(CC) $(FULL_CFLAGS) -I. -L. -o selpolltest $(srcdir)/tests/selpolltest.c libpcap.a $(LIBS)
    17 -install: install-shared install-archive pcap-config
    18 +install: install-archive pcap-config
    19  	[ -d $(DESTDIR)$(libdir) ] || \
    20  	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
    21  	[ -d $(DESTDIR)$(includedir) ] || \
    22 Index: scanner.l
    23 --- scanner.l.orig	2010-03-12 02:56:54.000000000 +0100
    24 +++ scanner.l	2010-03-31 09:46:58.000000000 +0200
    25 @@ -97,13 +97,6 @@
    26  B2		([0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f][0-9A-Fa-f])
    27  W		([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?)
    29 -%a 18400
    30 -%o 21500
    31 -%e 7600
    32 -%k 4550
    33 -%p 27600
    34 -%n 2000
    35 -
    36  V680		{W}:{W}:{W}:{W}:{W}:{W}:{W}:{W}
    38  V670		::{W}:{W}:{W}:{W}:{W}:{W}:{W}
    39 Index: Makefile.in
    40 --- fad-getad.c.orig	2012-03-29 14:57:32.000000000 +0200
    41 +++ fad-getad.c	2012-08-08 19:22:54.524951872 +0200
    42 @@ -60,7 +60,10 @@
    43  #include "os-proto.h"
    44  #endif
    46 -#ifdef AF_PACKET
    47 +/* Yes Solaris 11 defines AF_PACKET but it does so in sys/socket.h */
    48 +/* rather than netpacket/packet.h as claimed here. Not ready for   */
    49 +/* prime time time so circumvent until corrected upstream.         */
    50 +#ifdef __linux || AF_PACKET_KAPUTTIBUG
    51  # ifdef HAVE_NETPACKET_PACKET_H
    52  /* Solaris 11 and later, Linux distributions with newer glibc */
    53  #  include <netpacket/packet.h>

mercurial