rpms/mingw32-wpcap/devel mingw32-wpcap.spec, NONE, 1.1 wpcap.patch, NONE, 1.1 wpcap.pc, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Thomas M. Sailer sailer at fedoraproject.org
Fri Mar 27 20:55:49 UTC 2009


Author: sailer

Update of /cvs/extras/rpms/mingw32-wpcap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16451

Modified Files:
	.cvsignore sources 
Added Files:
	mingw32-wpcap.spec wpcap.patch wpcap.pc 
Log Message:
initial import.



--- NEW FILE mingw32-wpcap.spec ---
%define versionmajor 4
%define versionminor 1
%define versionsuffix beta5

%define wpcapexamples %{_docdir}/%{name}/examples
%define wpcapdoc %{_docdir}/%{name}

Name:           mingw32-wpcap
Version:        %{versionmajor}.%{versionminor}.%{versionsuffix}
Release:        2%{?dist}
Summary:        MinGW user-level packet capture

Group:          Development/Libraries
License:        BSD with advertising
URL:            http://www.winpcap.org/
Source0:        http://www.winpcap.org/install/bin/WpcapSrc_%{versionmajor}_%{versionminor}_%{versionsuffix}.zip
Source1:        wpcap.pc
Patch0:         wpcap.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-gcc doxygen unzip dos2unix
Requires:       mingw32-filesystem

%description
MinGW Windows pcap library.

%package examples
Summary:        Example source code for MinGW pcap
Group:          Development/Libraries

%description examples
This package contains examples on the usage of the Windows pcap
library.

%package docs
Summary:        MinGW pcap documentation
Group:          Development/Libraries

%description docs
This package contains the Windows pcap library documentation.

%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}

%prep
%setup -q -n winpcap
%patch0 -p0 -b .build
find . -type f -print0 |xargs -0 dos2unix
pushd wpcap/libpcap/Win32/Include/
mv ip6_misc.h IP6_misc.h
popd

%build
pushd packetNtx/Dll/Project
make -f GNUmakefile CC=i686-pc-mingw32-gcc %{?_smp_mflags} 
popd
pushd wpcap/PRJ
make -f GNUmakefile CC=i686-pc-mingw32-gcc %{?_smp_mflags} 
popd
pushd dox/prj
doxygen winpcap_noc.dox
popd


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/%{_mingw32_bindir}
install -d $RPM_BUILD_ROOT/%{_mingw32_libdir}/pkgconfig
install -m0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mingw32_libdir}/pkgconfig
install -m0644 packetNtx/Dll/Project/libpacket.a $RPM_BUILD_ROOT/%{_mingw32_libdir}/libpacket.dll.a
install -m0644 packetNtx/Dll/Project/Packet.dll $RPM_BUILD_ROOT/%{_mingw32_bindir}/packet.dll
install -m0644 wpcap/lib/libwpcap.a $RPM_BUILD_ROOT/%{_mingw32_libdir}/libwpcap.dll.a
install -m0644 wpcap/PRJ/wpcap.dll $RPM_BUILD_ROOT/%{_mingw32_bindir}
install -m0644 packetNtx/Dll/Packet.def $RPM_BUILD_ROOT/%{_mingw32_libdir}/packet.def
install -m0644 wpcap/PRJ/WPCAP.DEF $RPM_BUILD_ROOT/%{_mingw32_libdir}/wpcap.def
install -d $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/pcap
install -m0644 wpcap/libpcap/pcap/*.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/pcap
install -m0644 wpcap/libpcap/pcap.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
install -m0644 wpcap/libpcap/pcap-int.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
install -m0644 wpcap/libpcap/pcap-bpf.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
install -m0644 wpcap/libpcap/pcap-namedb.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
install -m0644 wpcap/libpcap/remote-ext.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
install -m0644 wpcap/libpcap/pcap-stdinc.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
install -m0644 wpcap/Win32-Extensions/Win32-Extensions.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
install -m0644 wpcap/libpcap/Win32/Include/bittypes.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
install -m0644 wpcap/libpcap/Win32/Include/IP6_misc.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
install -m0644 wpcap/libpcap/Win32/Include/Gnuc.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
install -m0644 Common/Packet32.h $RPM_BUILD_ROOT/%{_mingw32_includedir}/wpcap/
install -d $RPM_BUILD_ROOT/%{wpcapdoc}/html
install -m0644 dox/WinPcap_docs.html $RPM_BUILD_ROOT/%{wpcapdoc}/
install -m0644 dox/prj/docs/* $RPM_BUILD_ROOT/%{wpcapdoc}/html
install -m0644 dox/pics/*.gif $RPM_BUILD_ROOT/%{wpcapdoc}/html
install -m0644 dox/*.gif $RPM_BUILD_ROOT/%{wpcapdoc}/html
install -d $RPM_BUILD_ROOT/%{wpcapexamples}
install -d $RPM_BUILD_ROOT/%{wpcapexamples}
cp -r Examples $RPM_BUILD_ROOT/%{wpcapexamples}/remote
cp -r Examples-pcap $RPM_BUILD_ROOT/%{wpcapexamples}/pcap
rm -rf $RPM_BUILD_ROOT/%{wpcapexamples}/remote/NetMeter
rm -rf $RPM_BUILD_ROOT/%{wpcapexamples}/remote/kdump
rm -rf $RPM_BUILD_ROOT/%{wpcapexamples}/pcap/winpcap_stress
rm -rf $RPM_BUILD_ROOT/%{wpcapexamples}/pcap/stats


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc wpcap/libpcap/LICENSE
%{_mingw32_libdir}/pkgconfig/wpcap.pc
%{_mingw32_bindir}/packet.dll
%{_mingw32_bindir}/wpcap.dll
%{_mingw32_libdir}/libpacket.dll.a
%{_mingw32_libdir}/libwpcap.dll.a
%{_mingw32_libdir}/packet.def
%{_mingw32_libdir}/wpcap.def
%{_mingw32_includedir}/wpcap

%files docs
%defattr(-,root,root,-)
%{wpcapdoc}/WinPcap_docs.html
%{wpcapdoc}/html

%files examples
%defattr(-,root,root,-)
%{wpcapexamples}

%changelog
* Wed Mar 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.1.beta5-2
- fix BR
- add license file
- rename implibs

* Mon Feb 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.1.beta5-1
- initial package


wpcap.patch:

--- NEW FILE wpcap.patch ---
--- ./packetNtx/Dll/Project/GNUmakefile.orig	2009-02-16 19:35:23.000000000 +0100
+++ ./packetNtx/Dll/Project/GNUmakefile	2009-02-16 19:35:35.000000000 +0100
@@ -5,7 +5,7 @@
 OPTFLAGS = -O -D_WINNT4
 # I am suspicious of -O2 since it hosed wpcap.dll. To be safe, use -O only
 
-CFLAGS = -I ../../../common -shared -mno-cygwin ${OPTFLAGS} -I..
+CFLAGS = -I ../../../Common -shared -mno-cygwin ${OPTFLAGS} -I..
 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 @@
 		while(NAdapts--)
 		{
 			strcpy((char*)tUstr, tAstr);
-			(char*)tUstr += strlen(tAstr) + 1;;
+			tUstr = (WCHAR *)((char *)tUstr + strlen(tAstr) + 1);
 			tAstr += strlen(tAstr) + 1;
 		}
 
--- ./wpcap/PRJ/GNUmakefile.orig	2008-12-21 04:46:22.000000000 +0100
+++ ./wpcap/PRJ/GNUmakefile	2009-02-16 19:38:23.000000000 +0100
@@ -17,23 +17,23 @@
 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 \
 	-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 \
@@ -66,7 +66,7 @@
 main: ${OBJS}
 	@${RM} -rf ../lib/
 	mkdir ../lib/
-	${CC} ${CFLAGS} ${LDFLAGS} -o wpcap.dll wpcap.def ${OBJS} ${LIBS}
+	${CC} ${CFLAGS} ${LDFLAGS} -o wpcap.dll WPCAP.DEF ${OBJS} ${LIBS}
 
 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>


--- NEW FILE wpcap.pc ---
# Package Information for pkg-config

prefix=/usr/i686-pc-mingw32/sys-root/mingw
exec_prefix=/usr/i686-pc-mingw32/sys-root/mingw
libdir=/usr/i686-pc-mingw32/sys-root/mingw/lib
includedir=/usr/i686-pc-mingw32/sys-root/mingw/include

Name: WPCAP
Description: Windows Packet Capture Library
Version: 4.1.beta5
Libs: -L${libdir} -lpacket -lwpcap
Libs.private: 
Cflags: -I${includedir}/wpcap


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-wpcap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Mar 2009 20:20:57 -0000	1.1
+++ .cvsignore	27 Mar 2009 20:55:19 -0000	1.2
@@ -0,0 +1 @@
+WpcapSrc_4_1_beta5.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-wpcap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Mar 2009 20:20:57 -0000	1.1
+++ sources	27 Mar 2009 20:55:19 -0000	1.2
@@ -0,0 +1 @@
+408a8cee8df478f5901f94a4294288a8  WpcapSrc_4_1_beta5.zip




More information about the fedora-extras-commits mailing list