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