[mingw-wpcap] update to 4.1.3
sailer
sailer at fedoraproject.org
Sun Jan 4 00:17:48 UTC 2015
commit 939b32c7acc4dd3f6c0d6eedfc377f2e4e0d486a
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Sun Jan 4 00:34:16 2015 +0100
update to 4.1.3
.gitignore | 1 +
mingw-wpcap.spec | 7 +++-
sources | 2 +-
wpcap.patch | 88 ------------------------------------------------------
4 files changed, 7 insertions(+), 91 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fee0c8..577e339 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
WpcapSrc_4_1_beta5.zip
WpcapSrc_4_1_1.zip
WpcapSrc_4_1_2.zip
+/WpcapSrc_4_1_3.zip
diff --git a/mingw-wpcap.spec b/mingw-wpcap.spec
index 195c29e..ee3d3cb 100644
--- a/mingw-wpcap.spec
+++ b/mingw-wpcap.spec
@@ -2,14 +2,14 @@
%global versionmajor 4
%global versionminor 1
-%global versionsuffix 2
+%global versionsuffix 3
%global wpcapexamples %{_docdir}/%{name}/examples
%global wpcapdoc %{_docdir}/%{name}
Name: mingw-wpcap
Version: %{versionmajor}.%{versionminor}.final%{versionsuffix}
-Release: 13%{?dist}
+Release: 1%{?dist}
Summary: MinGW user-level packet capture
Group: Development/Libraries
@@ -205,6 +205,9 @@ rm -rf $RPM_BUILD_ROOT/%{wpcapexamples}/pcap/stats
%{mingw64_includedir}/wpcap
%changelog
+* Sat Jan 04 2015 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.1.final3-1
+- update to 4.1.3
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.final2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index e038ecb..9fc8915 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-225227c662a32c743d304dee1c63ab1f WpcapSrc_4_1_2.zip
+3a47076c5a437c023e76a58b77cfa890 WpcapSrc_4_1_3.zip
diff --git a/wpcap.patch b/wpcap.patch
index 0fbed73..ec8c99a 100644
--- a/wpcap.patch
+++ b/wpcap.patch
@@ -9,54 +9,6 @@
LDFLAGS = -Wl,--out-implib,libpacket.a
OBJS = ../Packet32.o ../AdInfo.o
LIBS = -lws2_32 -lversion
---- ./packetNtx/Dll/AdInfo.c.orig 2009-02-16 19:35:13.000000000 +0100
-+++ ./packetNtx/Dll/AdInfo.c 2009-02-16 19:36:30.000000000 +0100
-@@ -53,7 +53,7 @@
- //
- #define _CRT_SECURE_NO_DEPRECATE
-
--#include <packet32.h>
-+#include <Packet32.h>
- #include "Packet32-Int.h"
- #include "debug.h"
-
-@@ -63,7 +63,7 @@
-
- #include <windows.h>
- #include <windowsx.h>
--#include <Iphlpapi.h>
-+#include <iphlpapi.h>
- #include <strsafe.h>
- #include <WpcapNames.h>
-
---- ./packetNtx/Dll/Packet32.c.orig 2009-02-16 19:35:09.000000000 +0100
-+++ ./packetNtx/Dll/Packet32.c 2009-02-16 19:36:04.000000000 +0100
-@@ -44,11 +44,11 @@
- //
- #define _CRT_SECURE_NO_WARNINGS
-
--#include <packet32.h>
--#include <StrSafe.h>
-+#include <Packet32.h>
-+#include <strsafe.h>
-
- #include "Packet32-Int.h"
--#include "..\driver\ioctls.h"
-+#include "../driver/ioctls.h"
-
- #ifdef HAVE_WANPACKET_API
- #include "wanpacket/wanpacket.h"
-@@ -98,8 +98,8 @@
-
- #include <windows.h>
- #include <windowsx.h>
--#include <Iphlpapi.h>
--#include <IPIfCons.h>
-+#include <iphlpapi.h>
-+#include <ipifcons.h>
-
- #include <WpcapNames.h>
-
--- ./wpcap/libpcap/inet.c.orig 2009-02-16 19:40:53.000000000 +0100
+++ ./wpcap/libpcap/inet.c 2009-02-16 19:41:37.000000000 +0100
@@ -804,7 +804,7 @@
@@ -70,35 +22,6 @@
--- ./wpcap/PRJ/GNUmakefile.orig 2008-12-21 04:46:22.000000000 +0100
+++ ./wpcap/PRJ/GNUmakefile 2009-02-16 19:38:23.000000000 +0100
-@@ -17,24 +17,24 @@
- LFLAGS = -Ppcap_
- YFLAGS = -y -p pcap_
-
--PACKET_DIR = packetNTx
-+PACKET_DIR = packetNtx
- INSTALL_DIR = ${SYSTEMROOT}\system32
-
- CFLAGS = -I ../libpcap -I ../libpcap/bpf -I ../libpcap/lbl \
- -I ../libpcap/Win32/Include -I../libpcap/Win32/Include/ipv6kit \
-- -I ../../common -I ../Win32-Extensions \
-+ -I ../../Common -I ../Win32-Extensions \
- -I ../../../Airpcap_DevPack/include \
- -DLIBPCAP_EXPORTS -DYY_NEVER_INTERACTIVE -Dyylval=pcap_lval \
- -DHAVE_STRERROR -DNEED_ADDRINFO_H -DINET6 -DWIN32 \
- -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 \
- -mno-cygwin -shared ${OPTFLAGS}
- LDFLAGS = -Wl,--out-implib,../lib/libwpcap.a
--LIBS = -L ../../${PACKET_DIR}/DLL/Project -lPacket -lws2_32
-+LIBS = -L ../../${PACKET_DIR}/Dll/Project -lPacket -lws2_32
- OBJS = ../libpcap/bpf/net/bpf_filter.o \
- ../libpcap/bpf_dump.o \
- ../libpcap/bpf_image.o \
@@ -67,7 +67,7 @@
main: ${OBJS}
@${RM} -rf ../lib/
@@ -108,14 +31,3 @@
install:
cp wpcap.dll ${INSTALL_DIR}
---- ./wpcap/Win32-Extensions/Win32-Extensions.c.orig 2009-02-16 19:43:25.000000000 +0100
-+++ ./wpcap/Win32-Extensions/Win32-Extensions.c 2009-02-16 19:43:33.000000000 +0100
-@@ -33,7 +33,7 @@
-
-
- #include "pcap-int.h"
--#include <packet32.h>
-+#include <Packet32.h>
-
- #ifdef HAVE_REMOTE
- #include <pcap-remote.h>
More information about the scm-commits
mailing list