winpcap: enable *-w64-* targets

2 files changed, 65 insertions, 44 deletions

diff --git a/src/winpcap-1-fixes.patch b/src/winpcap-1-fixes.patch
index 6e4a03d..28741c0 100644
--- a/src/winpcap-1-fixes.patch
+++ b/src/winpcap-1-fixes.patch
@@ -3,21 +3,46 @@ See index.html for further information.
 
 Contains ad hoc patches for cross building.
 
-diff -ur a/wpcap/libpcap/inet.c b/wpcap/libpcap/inet.c
---- a/wpcap/libpcap/inet.c	2009-10-07 01:20:04.000000000 -0400
-+++ b/wpcap/libpcap/inet.c	2012-03-20 10:38:56.920472410 -0300
-@@ -804,7 +804,7 @@
- 		while(NAdapts--)
- 		{
- 			strcpy((char*)tUstr, tAstr);
--			(char*)tUstr += strlen(tAstr) + 1;;
-+			tUstr += strlen(tAstr) + 1;;
- 			tAstr += strlen(tAstr) + 1;
- 		}
- 
-diff -ur a/wpcap/libpcap/Win32/Src/gai_strerror.c b/wpcap/libpcap/Win32/Src/gai_strerror.c
---- a/wpcap/libpcap/Win32/Src/gai_strerror.c	2009-10-07 01:19:58.000000000 -0400
-+++ b/wpcap/libpcap/Win32/Src/gai_strerror.c	2012-03-20 10:41:17.604479218 -0300
+diff -ur winpcap/packetNtx/Dll/Packet32-Int.h winpcap.new/packetNtx/Dll/Packet32-Int.h
+--- winpcap/packetNtx/Dll/Packet32-Int.h	2010-10-14 08:16:46.000000000 +1100
++++ winpcap.new/packetNtx/Dll/Packet32-Int.h	2014-10-03 00:37:40.000000000 +1000
+@@ -43,7 +43,7 @@
+ #endif //HAVE_NPFIM_API

+ 

+ #ifdef __MINGW32__

+-#ifdef __MINGW64__

++#ifdef __MINGW64_VERSION_MAJOR

+ #include <ntddndis.h>

+ #else /*__MINGW64__*/

+ #include <ddk/ntddndis.h>

+diff -ur winpcap/wpcap/PRJ/GNUmakefile winpcap.new/wpcap/PRJ/GNUmakefile
+--- winpcap/wpcap/PRJ/GNUmakefile	2010-10-18 13:00:36.000000000 +1100
++++ winpcap.new/wpcap/PRJ/GNUmakefile	2014-10-03 00:35:44.000000000 +1000
+@@ -32,12 +32,12 @@
+ 	-DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG_LONG=8 -DWPCAP -D'_U_=' \

+ 	-DHAVE_SNPRINTF -DHAVE_VSNPRINTF \

+ 	-DSIZEOF_LONG_LONG=8 \

+-	-DHAVE_REMOTE -DHAVE_AIRPCAP_API \

++	-DHAVE_REMOTE \

+ 	-DHAVE_TC_API \

+ 	-DHAVE_ADDRINFO \

+ 	-DHAVE_LIMITS_H \

+ 	-DYY_NO_UNISTD_H \

+-	-mno-cygwin -shared ${OPTFLAGS}

++	-shared ${OPTFLAGS}

+ LDFLAGS = -Wl,--out-implib,../lib/libwpcap.a

+ LIBS = -L ../../${PACKET_DIR}/Dll/Project -lpacket -lws2_32

+ OBJS = ../libpcap/bpf/net/bpf_filter.o \

+@@ -93,3 +93,6 @@
+ 	${FLEX} ${LFLAGS} -t $< >$*.c

+ .c.o:

+ 	${CC} ${CFLAGS} -o $*.o -c $<

++libwpcap.a: ${OBJS}

++	${AR} rc $@ ${OBJS}

++	${RANLIB} $@

+diff -ur winpcap/wpcap/libpcap/Win32/Src/gai_strerror.c winpcap.new/wpcap/libpcap/Win32/Src/gai_strerror.c
+--- winpcap/wpcap/libpcap/Win32/Src/gai_strerror.c	2009-10-07 00:19:58.000000000 +1100
++++ winpcap.new/wpcap/libpcap/Win32/Src/gai_strerror.c	2014-10-03 00:35:44.000000000 +1000
 @@ -1,83 +1 @@
 -/*
 - * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -102,30 +127,29 @@ diff -ur a/wpcap/libpcap/Win32/Src/gai_strerror.c b/wpcap/libpcap/Win32/Src/gai_
 -}
 -
 -#endif /* gai_strerror */
-\ No hay ningún carácter de nueva línea al final del archivo
+\ No newline at end of file
 +/* already handled by <ws2tcpip.h> */
-diff -ur a/wpcap/PRJ/GNUmakefile b/wpcap/PRJ/GNUmakefile
---- a/wpcap/PRJ/GNUmakefile	2010-10-18 13:00:36.000000000 +0200
-+++ b/wpcap/PRJ/GNUmakefile	2013-05-23 17:43:55.297475725 +0200
-@@ -32,12 +32,12 @@
- 	-DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG_LONG=8 -DWPCAP -D'_U_=' \

- 	-DHAVE_SNPRINTF -DHAVE_VSNPRINTF \

- 	-DSIZEOF_LONG_LONG=8 \

--	-DHAVE_REMOTE -DHAVE_AIRPCAP_API \

-+	-DHAVE_REMOTE \

- 	-DHAVE_TC_API \

- 	-DHAVE_ADDRINFO \

- 	-DHAVE_LIMITS_H \

- 	-DYY_NO_UNISTD_H \

--	-mno-cygwin -shared ${OPTFLAGS}

-+	-shared ${OPTFLAGS}

- LDFLAGS = -Wl,--out-implib,../lib/libwpcap.a

- LIBS = -L ../../${PACKET_DIR}/Dll/Project -lpacket -lws2_32

- OBJS = ../libpcap/bpf/net/bpf_filter.o \

-@@ -93,3 +93,6 @@
- 	${FLEX} ${LFLAGS} -t $< >$*.c

- .c.o:

- 	${CC} ${CFLAGS} -o $*.o -c $<

-+libwpcap.a: ${OBJS}

-+	${AR} rc $@ ${OBJS}

-+	${RANLIB} $@

+diff -ur winpcap/wpcap/libpcap/inet.c winpcap.new/wpcap/libpcap/inet.c
+--- winpcap/wpcap/libpcap/inet.c	2009-10-07 00:20:04.000000000 +1100
++++ winpcap.new/wpcap/libpcap/inet.c	2014-10-03 00:35:44.000000000 +1000
+@@ -804,7 +804,7 @@
+ 		while(NAdapts--)
+ 		{
+ 			strcpy((char*)tUstr, tAstr);
+-			(char*)tUstr += strlen(tAstr) + 1;;
++			tUstr += strlen(tAstr) + 1;;
+ 			tAstr += strlen(tAstr) + 1;
+ 		}
+ 
+diff -ur winpcap/wpcap/libpcap/pcap-win32.c winpcap.new/wpcap/libpcap/pcap-win32.c
+--- winpcap/wpcap/libpcap/pcap-win32.c	2013-02-28 17:22:00.000000000 +1100
++++ winpcap.new/wpcap/libpcap/pcap-win32.c	2014-10-03 00:37:02.000000000 +1000
+@@ -38,7 +38,7 @@
+ 
+ #include <pcap-int.h>
+ #include <Packet32.h>
+-#ifdef __MINGW32__
++#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
+ #include <ddk/ndis.h>
+ #else /*__MINGW32__*/
+ #include <ntddndis.h>
diff --git a/src/winpcap.mk b/src/winpcap.mk
index 63b2590..feaccf5 100644
--- a/src/winpcap.mk
+++ b/src/winpcap.mk
@@ -37,7 +37,4 @@ define $(PKG)_BUILD
     $(INSTALL) -m644 '$(1)/wpcap/PRJ/libwpcap.a' '$(PREFIX)/$(TARGET)/lib/'
 endef
 
-$(PKG)_BUILD_x86_64-w64-mingw32 =
-$(PKG)_BUILD_i686-w64-mingw32 =
-
 $(PKG)_BUILD_SHARED =