[or-cvs] r16950: {torvm} More tap-win32 and winpcap build fixes. Removed all of the d (in torvm/trunk/build/win32: . files patches)
coderman at seul.org
coderman at seul.org
Wed Sep 24 02:03:39 UTC 2008
Author: coderman
Date: 2008-09-23 22:03:39 -0400 (Tue, 23 Sep 2008)
New Revision: 16950
Modified:
torvm/trunk/build/win32/Makefile
torvm/trunk/build/win32/files/buildall.sh
torvm/trunk/build/win32/files/install.bat
torvm/trunk/build/win32/patches/openvpn-tor-tap-win32-driver.patch
torvm/trunk/build/win32/patches/winpcap-tor-device-mods.patch
Log:
More tap-win32 and winpcap build fixes. Removed all of the deprecated pre-compiled winpcap parts.
Modified: torvm/trunk/build/win32/Makefile
===================================================================
--- torvm/trunk/build/win32/Makefile 2008-09-24 00:49:29 UTC (rev 16949)
+++ torvm/trunk/build/win32/Makefile 2008-09-24 02:03:39 UTC (rev 16950)
@@ -86,6 +86,14 @@
MSYSZLIB_URL=http://downloads.sourceforge.net/mingw/zlib-1.2.3-MSYS-1.0.11-1.tar.bz2?modtime=1206455079&big_mirror=1
MSYSZLIB_SUM=dff1a110b165d7ba4d7804b1c2f4a023823eec90
+MSYSCRYPT_F=crypt-1.1-1-MSYS-1.0.11-1.tar.bz2
+MSYSCRYPT_URL=http://downloads.sourceforge.net/mingw/crypt-1.1-1-MSYS-1.0.11-1.tar.bz2?modtime=1206481779&big_mirror=1
+MSYSCRYPT_SUM=072e9a158d41e73aa5a766df016494dab74085e4
+
+M4_F=m4-1.4.7-MSYS.tar.bz2
+M4_URL=http://prdownloads.sourceforge.net/mingw/m4-1.4.7-MSYS.tar.bz2?download
+M4_SUM=a00ed987824456946777d92f600612f344211dcc
+
SSL_F=openssl-0.9.8g-1-MSYS-1.0.11-2-dll098.tar.gz
SSL_URL=http://downloads.sourceforge.net/mingw/openssl-0.9.8g-1-MSYS-1.0.11-2-dll098.tar.gz?modtime=1206734099&big_mirror=1
SSL_SUM=eba5f37fdec2982727556a3dbb5ea6fd04296b76
@@ -118,22 +126,10 @@
SDL_URL=http://www.libsdl.org/release/SDL-1.2.13.tar.gz
SDL_SUM=51fcaa3e1d5c01fd813ea08688780f86b19cf539
-WPCAP_F=WinPcap_4_1_beta4.exe
-WPCAP_URL=http://www.winpcap.org/install/bin/WinPcap_4_1_beta4.exe
-WPCAP_SUM=25a56a70f9f285bc029220393f01177da5b02bb6
-
-WPCAPRT_F=WinPcap-4.1-files.tar.gz
-WPCAPRT_URL=http://peertech.org/files/WinPcap-4.1-files.tar.gz
-WPCAPRT_SUM=57d2eab8b1afcfdf65101849cfe4e4110ee3f121
-
WPCAPSRC_F=WpcapSrc_4_1_beta4.zip
WPCAPSRC_URL=http://www.winpcap.org/install/bin/WpcapSrc_4_1_beta4.zip
WPCAPSRC_SUM=1450c4d293a38c25ec8cd8a9be30e04858df36d9
-WPD_F=WpdPack_4_1_beta4.zip
-WPD_URL=http://www.winpcap.org/install/bin/WpdPack_4_1_beta4.zip
-WPD_SUM=fa5255dc1a36ff47999d5b60aeadcf8ff9fb44cd
-
QEMU_F=qemu-0.9.1.tar.gz
QEMU_URL=http://bellard.org/qemu/qemu-0.9.1.tar.gz
QEMU_SUM=630ea20b5989f0df00128de7f7be661c573ed041
@@ -146,7 +142,7 @@
WINDDK_URL=http://download.microsoft.com/download/9/0/f/90f019ac-8243-48d3-91cf-81fc4093ecfd/1830_usa_ddk.iso
WINDDK_SUM=0d2154d88a5ee252cc908630c77863bb42777387
-ALLFILES=$(ZLIB_F) $(GZIP_F) $(BZIP2_F) $(LIBARCH_F) $(BINUTILS_F) $(GCCORE_F) $(GPP_F) $(MINGWRUN_F) $(MINGWUTIL_F) $(MAKE_F) $(W32API_F) $(MSYS_F) $(MSYSCORE_F) $(BASH_F) $(DIFFUTIL_F) $(LIBTOOL_F) $(MINIRES_F) $(MSYSZLIB_F) $(SSL_F) $(SSH_F) $(ZLIBSRC_F) $(PTHREADS_F) $(AMAKE_F) $(ACONF_F) $(PERL_F) $(SDL_F) $(WPCAP_F) $(WPCAPRT_F) $(WPCAPSRC_F) $(WPD_F) $(QEMU_F) $(OVPN_F)
+ALLFILES=$(ZLIB_F) $(GZIP_F) $(BZIP2_F) $(LIBARCH_F) $(BINUTILS_F) $(GCCORE_F) $(GPP_F) $(MINGWRUN_F) $(MINGWUTIL_F) $(MAKE_F) $(W32API_F) $(MSYS_F) $(MSYSCORE_F) $(BASH_F) $(DIFFUTIL_F) $(LIBTOOL_F) $(MINIRES_F) $(MSYSZLIB_F) $(MSYSCRYPT_F) $(M4_F) $(SSL_F) $(SSH_F) $(ZLIBSRC_F) $(PTHREADS_F) $(AMAKE_F) $(ACONF_F) $(PERL_F) $(SDL_F) $(WPCAPSRC_F) $(QEMU_F) $(OVPN_F)
default all: downloads extract buildiso runinstall
@@ -170,6 +166,8 @@
@if [ ! -e $(WDLDIR)/$(LIBTOOL_F) ]; then $(DLCMD) "$(LIBTOOL_URL)" $(LIBTOOL_SUM) "$(WDLDIR)/$(LIBTOOL_F)"; fi
@if [ ! -e $(WDLDIR)/$(MINIRES_F) ]; then $(DLCMD) "$(MINIRES_URL)" $(MINIRES_SUM) "$(WDLDIR)/$(MINIRES_F)"; fi
@if [ ! -e $(WDLDIR)/$(MSYSZLIB_F) ]; then $(DLCMD) "$(MSYSZLIB_URL)" $(MSYSZLIB_SUM) "$(WDLDIR)/$(MSYSZLIB_F)"; fi
+ @if [ ! -e $(WDLDIR)/$(MSYSCRYPT_F) ]; then $(DLCMD) "$(MSYSCRYPT_URL)" $(MSYSCRYPT_SUM) "$(WDLDIR)/$(MSYSCRYPT_F)"; fi
+ @if [ ! -e $(WDLDIR)/$(M4_F) ]; then $(DLCMD) "$(M4_URL)" $(M4_SUM) "$(WDLDIR)/$(M4_F)"; fi
@if [ ! -e $(WDLDIR)/$(SSL_F) ]; then $(DLCMD) "$(SSL_URL)" $(SSL_SUM) "$(WDLDIR)/$(SSL_F)"; fi
@if [ ! -e $(WDLDIR)/$(SSH_F) ]; then $(DLCMD) "$(SSH_URL)" $(SSH_SUM) "$(WDLDIR)/$(SSH_F)"; fi
@if [ ! -e $(WDLDIR)/$(ZLIBSRC_F) ]; then $(DLCMD) "$(ZLIBSRC_URL)" $(ZLIBSRC_SUM) "$(WDLDIR)/$(ZLIBSRC_F)"; fi
@@ -178,10 +176,7 @@
@if [ ! -e $(WDLDIR)/$(AMAKE_F) ]; then $(DLCMD) "$(AMAKE_URL)" $(AMAKE_SUM) "$(WDLDIR)/$(AMAKE_F)"; fi
@if [ ! -e $(WDLDIR)/$(PERL_F) ]; then $(DLCMD) "$(PERL_URL)" $(PERL_SUM) "$(WDLDIR)/$(PERL_F)"; fi
@if [ ! -e $(WDLDIR)/$(SDL_F) ]; then $(DLCMD) "$(SDL_URL)" $(SDL_SUM) "$(WDLDIR)/$(SDL_F)"; fi
- @if [ ! -e $(WDLDIR)/$(WPCAP_F) ]; then $(DLCMD) "$(WPCAP_URL)" $(WPCAP_SUM) "$(WDLDIR)/$(WPCAP_F)"; fi
- @if [ ! -e $(WDLDIR)/$(WPCAPRT_F) ]; then $(DLCMD) "$(WPCAPRT_URL)" $(WPCAPRT_SUM) "$(WDLDIR)/$(WPCAPRT_F)"; fi
@if [ ! -e $(WDLDIR)/$(WPCAPSRC_F) ]; then $(DLCMD) "$(WPCAPSRC_URL)" $(WPCAPSRC_SUM) "$(WDLDIR)/$(WPCAPSRC_F)"; fi
- @if [ ! -e $(WDLDIR)/$(WPD_F) ]; then $(DLCMD) "$(WPD_URL)" $(WPD_SUM) "$(WDLDIR)/$(WPD_F)"; fi
@if [ ! -e $(WDLDIR)/$(OVPN_F) ]; then $(DLCMD) "$(OVPN_URL)" $(OVPN_SUM) "$(WDLDIR)/$(OVPN_F)"; fi
@if [ ! -e $(WDLDIR)/$(QEMU_F) ]; then $(DLCMD) "$(QEMU_URL)" $(QEMU_SUM) "$(WDLDIR)/$(QEMU_F)"; fi
@@ -213,9 +208,7 @@
tar jxf $(WDLDIR)/$(MSYS_F) bin/msys-1.0.dll bin/mount.exe bin/ps.exe; mv bin/* $(ISODIR)/bin/;rmdir bin; \
unzip $(WDLDIR)/$(LIBARCH_F) -d $(ISODIR)/ bin/bsdtar.exe bin/libarchive2.dll; \
cp $(addprefix $(WDLDIR)/, $(ALLFILES)) $(ISODIR)/dl/; \
- unzip $(WDLDIR)/$(WPD_F); tar cf $(ISODIR)/dl/src/WpdPack_4_1_beta4.tar WpdPack; gzip -9 $(ISODIR)/dl/src/WpdPack_4_1_beta4.tar; rm -rf WpdPack; \
unzip $(WDLDIR)/$(WPCAPSRC_F); mv winpcap WpcapSrc_4_1_beta4; tar cf $(ISODIR)/dl/src/WpcapSrc_4_1_beta4.tar WpcapSrc_4_1_beta4; gzip -9 $(ISODIR)/dl/src/WpcapSrc_4_1_beta4.tar; rm -rf WpcapSrc_4_1_beta4; \
- mv $(ISODIR)/dl/$(WPCAPRT_F) $(ISODIR)/dl/src/; \
mv $(ISODIR)/dl/$(PTHREADS_F) $(ISODIR)/dl/src/; \
mv $(ISODIR)/dl/$(QEMU_F) $(ISODIR)/dl/src/; \
mv $(ISODIR)/dl/$(SDL_F) $(ISODIR)/dl/src/; \
Modified: torvm/trunk/build/win32/files/buildall.sh
===================================================================
--- torvm/trunk/build/win32/files/buildall.sh 2008-09-24 00:49:29 UTC (rev 16949)
+++ torvm/trunk/build/win32/files/buildall.sh 2008-09-24 02:03:39 UTC (rev 16950)
@@ -7,22 +7,43 @@
export confdir="${ddir}/config"
export statedir="${ddir}/state"
+if [[ "$1" != "dobuild" ]]; then
+ cd /usr/src
+ /usr/src/buildall.sh dobuild | tee build.log
+else
+
+export WPCAP_DIR=/usr/src/WpcapSrc_4_1_beta4
+export WPCAP_INCLUDE="-I${WPCAP_DIR}/wpcap/libpcap -I${WPCAP_DIR}/wpcap/libpcap/Win32/Include"
+export WPCAP_LDFLAGS="-L${WPCAP_DIR}/wpcap/PRJ -L${WPCAP_DIR}/packetNtx/Dll/Project"
+
for dir in $ddir $libdir $bindir $confdir $statedir; do
if [ ! -d $dir ]; then
mkdir $dir
fi
done
+# enforce particular versions of some build utils
+cd /
+tar xf /dl/m4*
+
if [ -d /usr/usr ]; then
# ahh, gotta love the msys /usr <-> / equivalence hack...
cd /usr/usr
- mv local ../
+ if [ -d local ]; then
+ mv local ../
+ fi
+ if [ -d bin ]; then
+ mv bin/* ../bin/
+ rmdir bin
+ fi
+ cd ..
rmdir usr
fi
cp /usr/local/bin/aclocal-* /bin/aclocal
cp /usr/local/bin/autoconf-* /bin/autoconf
cp /usr/local/bin/autoheader-* /bin/autoheader
cp /usr/local/bin/automake-* /bin/automake
+cp /usr/local/bin/autom4te-* /bin/autom4te
cp /bin/msys-z.dll $libdir/
cp /bin/msys-1.0.dll $libdir/
@@ -103,8 +124,8 @@
DDKENV="${DDKDIR}\bin\setenv.bat"
DDKVER=`grep '^Build' "${ddkbase}/Uninstall/Uninstall.ini" | sed 's/.*=//'`
DDKMAJORVER=`echo $DDKVER | sed 's/\..*//'`
- echo "Found DDK install at $DDKDIR , using env script $DDKENV"
- cp "${$ddkbase}/tools/devcon/i386/devcon.exe" $bindir
+ echo "Found DDK install at $DDKDIR";echo " using env script $DDKENV"
+ cp "${ddkbase}/tools/devcon/i386/devcon.exe" $bindir
found=1
fi
fi
@@ -128,7 +149,7 @@
tar zxvf openvpn-2.1_rc10.tar.gz
cd openvpn-2.1_rc10
patch -p1 < ../openvpn-tor-tap-win32-driver.patch 2>/dev/null
-aclocal && autoheader && autoconf && automake --add-missing --copy
+aclocal -I . && autoheader && autoconf && automake --add-missing --copy
if (( $? != 0 )); then
echo "ERROR: openvpn autotools update failed." >&2
exit 1
@@ -143,8 +164,13 @@
echo "ERROR: openvpn configure failed." >&2
exit 1
fi
+install-win32/maketap
cd tap-win32
-echo "call $DDKENV $DDKDIR fre WXP" > dobuild.bat
+TAPDIR=`pwd | sed 's/^.usr//' | sed 's/\//\\\/g'`
+BPATH="${MSYSROOT}${TAPDIR}"
+#echo "call \"$DDKENV\" \"$DDKDIR\" fre wxp" > dobuild.bat
+echo "call \"$DDKENV\" \"$DDKDIR\" wxp f" > dobuild.bat
+echo "cd \"$BPATH\"" >> dobuild.bat
echo "build -cef" >> dobuild.bat
echo "exit 0" >> dobuild.bat
cmd.exe /k dobuild.bat
@@ -152,15 +178,23 @@
echo "ERROR: openvpn tap-win32 driver build failed." >&2
exit 1
fi
+TAPDRVN=tortap91
+cp i386/${TAPDRVN}.sys $libdir/
+cp i386/OemWin2k.inf $libdir/${TAPDRVN}.inf
echo "Building WinPcap ..."
cd /usr/src
tar zxvf WpcapSrc_4_1_beta4.tar.gz
cd WpcapSrc_4_1_beta4
+wpbase=`pwd`
patch -p1 < ../winpcap-tor-device-mods.patch 2>/dev/null
cd packetNtx
-echo "call $DDKENV $DDKDIR fre WXP" > dobuild.bat
+PCAPDIR=`pwd | sed 's/^.usr//' | sed 's/\//\\\/g'`
+BPATH="${MSYSROOT}${PCAPDIR}"
+#echo "call $DDKENV $DDKDIR fre w2k" > dobuild.bat
+echo "call \"$DDKENV\" \"$DDKDIR\" w2k f" > dobuild.bat
+echo "cd \"$BPATH\"" >> dobuild.bat
echo "./CompileDriver" >> dobuild.bat
echo "exit 0" >> dobuild.bat
cmd.exe /k dobuild.bat
@@ -168,8 +202,23 @@
echo "ERROR: WinPcap NPF.sys driver build failed." >&2
exit 1
fi
+cp driver/bin/2k/i386/npf.sys $libdir/tornpf.sys
+cd Dll/Project
+make
+if (( $? != 0 )); then
+ echo "ERROR: WinPcap Packet user space library build failed." >&2
+ exit 1
+fi
+cp Packet.dll $libdir/
+cd $wpbase
+cd wpcap/PRJ
+make
+if (( $? != 0 )); then
+ echo "ERROR: WinPcap libwpcap user space library build failed." >&2
+ exit 1
+fi
+cp wpcap.dll $libdir/
-
echo "Building qemu ..."
cd /usr/src
tar zxvf qemu-0.9.1.tar.gz
@@ -185,8 +234,8 @@
--disable-kqemu \
--disable-system \
--disable-vnc-tls \
- --extra-cflags="-DHAVE_INTSZ_TYPES -I. -I.. -I/usr/include -I/usr/local/include -I/usr/src/WpdPack/Include -I/usr/src/pthreads-w32 -I/usr/include/SDL" \
- --extra-ldflags="-L/usr/lib -L/usr/local/lib -L/usr/src/WpdPack/Lib -L/usr/src/pthreads-w32" \
+ --extra-cflags="-DHAVE_INTSZ_TYPES -I. -I.. -I/usr/include -I/usr/local/include $WPCAP_INCLUDE -I/usr/src/pthreads-w32 -I/usr/include/SDL" \
+ --extra-ldflags="-L/usr/lib -L/usr/local/lib $WPCAP_LDFLAGS -L/usr/src/pthreads-w32" \
--target-list=i386-softmmu
if (( $? != 0 )); then
echo "ERROR: Qemu configure failed." >&2
@@ -201,8 +250,12 @@
cp pc-bios/bios.bin $bindir/
cp pc-bios/vgabios.bin $bindir/
cp pc-bios/vgabios-cirrus.bin $bindir/
+
+
+# last but not least, include the virtual disk and other parts
cp /usr/src/add/* $libdir/
-#cp /usr/src/WinPcap-4.1-files/* $ddir/
echo "DONE."
exit 0
+
+fi
Modified: torvm/trunk/build/win32/files/install.bat
===================================================================
--- torvm/trunk/build/win32/files/install.bat 2008-09-24 00:49:29 UTC (rev 16949)
+++ torvm/trunk/build/win32/files/install.bat 2008-09-24 02:03:39 UTC (rev 16950)
@@ -51,9 +51,13 @@
cd /d %ISODRV%
cd add
copy *.* %DDRV%%MDIR%\%MVER%\src\add\
+cd /d %DDRV%
cd %MDIR%\%MVER%
set PATH=%DDRV%%MDIR%\%MVER%\bin;%DDRV%%MDIR%\%MVER%;%PATH%
set BUILDER=/usr/src/buildall.sh
+set MSYSROOT=C:\msys\1.0\bin\
+md etc\profile.d
+ECHO export MSYSROOT="%MSYSROOT%" > etc\profile.d\defpaths.sh
set WD=C:\msys\1.0\bin\
set PATH=%WD%;%PATH%
Modified: torvm/trunk/build/win32/patches/openvpn-tor-tap-win32-driver.patch
===================================================================
--- torvm/trunk/build/win32/patches/openvpn-tor-tap-win32-driver.patch 2008-09-24 00:49:29 UTC (rev 16949)
+++ torvm/trunk/build/win32/patches/openvpn-tor-tap-win32-driver.patch 2008-09-24 02:03:39 UTC (rev 16950)
@@ -1,18 +1,149 @@
+diff -Naur orig-openvpn-2.1_rc10/config-win32.h.in mod-openvpn-2.1_rc10/config-win32.h.in
+--- orig-openvpn-2.1_rc10/config-win32.h.in 2008-08-10 18:35:25.000000000 +0000
++++ mod-openvpn-2.1_rc10/config-win32.h.in 2008-09-24 02:04:01.653884827 +0000
+@@ -35,7 +35,6 @@
+
+ #include <windows.h>
+ #include <winsock2.h>
+-#include "autodefs/defs.h"
+
+ #define sleep(x) Sleep((x)*1000)
+
diff -Naur orig-openvpn-2.1_rc10/configure.ac mod-openvpn-2.1_rc10/configure.ac
--- orig-openvpn-2.1_rc10/configure.ac 2008-08-10 18:35:25.000000000 +0000
-+++ mod-openvpn-2.1_rc10/configure.ac 2008-09-22 20:37:09.741152353 +0000
-@@ -865,6 +865,8 @@
- openvpn.spec
- config-win32.h
- images/Makefile
-+ tap-win32/SOURCES
-+ tap-win32/i386/OemWin2k.inf
- service-win32/Makefile
- install-win32/Makefile
- install-win32/settings
++++ mod-openvpn-2.1_rc10/configure.ac 2008-09-24 01:09:44.574210076 +0000
+@@ -838,9 +838,9 @@
+ TAP_ID="PRODUCT_TAP_ID"
+ TAP_WIN32_MIN_MAJOR="PRODUCT_TAP_WIN32_MIN_MAJOR"
+ TAP_WIN32_MIN_MINOR="PRODUCT_TAP_WIN32_MIN_MINOR"
+-AC_DEFINE_UNQUOTED(TAP_ID, "${TAP_ID}", [The TAP-Win32 id defined in tap-win32/SOURCES])
+-AC_DEFINE_UNQUOTED(TAP_WIN32_MIN_MAJOR, ${TAP_WIN32_MIN_MAJOR}, [The TAP-Win32 version number is defined in tap-win32/SOURCES])
+-AC_DEFINE_UNQUOTED(TAP_WIN32_MIN_MINOR, ${TAP_WIN32_MIN_MINOR}, [The TAP-Win32 version number is defined in tap-win32/SOURCES])
++AC_DEFINE_UNQUOTED(TAP_ID, "${TAP_ID}", [The TAP-Win32 device ID])
++AC_DEFINE_UNQUOTED(TAP_WIN32_MIN_MAJOR, "${TAP_WIN32_MIN_MAJOR}", [The TAP-Win32 major version number])
++AC_DEFINE_UNQUOTED(TAP_WIN32_MIN_MINOR, "${TAP_WIN32_MIN_MINOR}", [The TAP-Win32 minor version number])
+ AC_SUBST(TAP_ID)
+ AC_SUBST(TAP_WIN32_MIN_MAJOR)
+ AC_SUBST(TAP_WIN32_MIN_MINOR)
+diff -Naur orig-openvpn-2.1_rc10/install-win32/maketap mod-openvpn-2.1_rc10/install-win32/maketap
+--- orig-openvpn-2.1_rc10/install-win32/maketap 2008-08-10 18:35:23.000000000 +0000
++++ mod-openvpn-2.1_rc10/install-win32/maketap 2008-09-24 01:20:25.104878926 +0000
+@@ -4,22 +4,27 @@
+ # Requires the Windows DDK
+
+ # get version.nsi definitions
+-. autodefs/defs.sh
++#. autodefs/defs.sh
+
+-if [ -d "/c/WINDDK/$DDKVER" ] ; then
++if [ -d "$DDKDIR" ] ; then
+
+ # common declarations for all DDK build targets
+ . install-win32/ddk-common
+
+ # configure tap driver sources
+-MACRO="perl install-win32/macro.pl autodefs/defs.in"
++MACRO="perl install-win32/macro.pl install-win32/settings.in"
+ IFDEF="perl install-win32/ifdef.pl"
+-rm -rf tap-win32/amd64
++if [ -d tap-win32/amd64 ]; then
++ rm -rf tap-win32/amd64
++fi
+ mkdir tap-win32/amd64
+ $MACRO <tap-win32/SOURCES.in >tap-win32/SOURCES
+ $MACRO <tap-win32/i386/OemWin2k.inf.in | $IFDEF >tap-win32/i386/OemWin2k.inf
+ $MACRO <tap-win32/i386/OemWin2k.inf.in | $IFDEF -DAMD64 >tap-win32/amd64/OemWin2k.inf
+
++# all we need is the inf files, build the driver ourselves...
++exit 0
++
+ if [ -n "$PRODUCT_TAP_DEBUG" ] ; then
+ w2ktarget="w2k c"
+ amdtarget="chk $x64_tag WNET"
+@@ -96,5 +101,5 @@
+ fi
+
+ else
+- echo Not building TAP driver -- DDK version $DDKVER NOT FOUND
++ echo Not building TAP driver -- DDK NOT FOUND AT \"$DDKDIR\"
+ fi
+diff -Naur orig-openvpn-2.1_rc10/install-win32/settings.in mod-openvpn-2.1_rc10/install-win32/settings.in
+--- orig-openvpn-2.1_rc10/install-win32/settings.in 2008-08-10 18:35:23.000000000 +0000
++++ mod-openvpn-2.1_rc10/install-win32/settings.in 2008-09-24 01:12:19.574403029 +0000
+@@ -38,11 +38,11 @@
+
+ # TAP Adapter parameters. Note that PRODUCT_TAP_ID is
+ # defined in version.m4.
+-!define PRODUCT_TAP_DEVICE_DESCRIPTION "TAP-Win32 Adapter V9"
+-!define PRODUCT_TAP_PROVIDER "TAP-Win32 Provider V9"
++!define PRODUCT_TAP_DEVICE_DESCRIPTION "Tor VM TAP-Win32 Adapter V9"
++!define PRODUCT_TAP_PROVIDER "Tor VM TAP-Win32 Provider V9"
+ !define PRODUCT_TAP_MAJOR_VER 9
+ !define PRODUCT_TAP_MINOR_VER 4
+-!define PRODUCT_TAP_RELDATE "01/22/2008"
++!define PRODUCT_TAP_RELDATE "09/23/2008"
+
+ ; visible=0x81 hidden=0x89
+ !define PRODUCT_TAP_CHARACTERISTICS 0x81
+@@ -52,16 +52,16 @@
+
+ # DDK Version.
+ # DDK distribution is assumed to be in C:\WINDDK\${DDKVER}
+-!define DDKVER 6001.17121
+-!define DDKVER_MAJOR 6001
++;!define DDKVER 6001.17121
++;!define DDKVER_MAJOR 6001
+
+ # Code Signing.
+ # If undefined, don't sign any files.
+-!define SIGNTOOL "../signtool"
+-!define PRODUCT_SIGN_CN "openvpn"
++;!define SIGNTOOL "../signtool"
++;!define PRODUCT_SIGN_CN "openvpn"
+
+ # -j parameter passed to make
+-!define MAKE_JOBS 2
++;!define MAKE_JOBS 2
+
+ # output directory for built binaries
+ # and other generated files
+diff -Naur orig-openvpn-2.1_rc10/tap-win32/SOURCES.in mod-openvpn-2.1_rc10/tap-win32/SOURCES.in
+--- orig-openvpn-2.1_rc10/tap-win32/SOURCES.in 2008-08-10 18:35:25.000000000 +0000
++++ mod-openvpn-2.1_rc10/tap-win32/SOURCES.in 2008-09-24 03:05:43.833514551 +0000
+@@ -4,7 +4,7 @@
+ MAJORCOMP=ntos
+ MINORCOMP=ndis
+
+-TARGETNAME=@@PRODUCT_TAP_ID@@
++TARGETNAME=tortap91
+ TARGETTYPE=DRIVER
+ TARGETPATH=.
+ TARGETLIBS=$(DDK_LIB_PATH)\ndis.lib $(DDK_LIB_PATH)\ntstrsafe.lib
+@@ -16,6 +16,7 @@
+ C_DEFINES=
+ C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MAJOR_VERSION=@@PRODUCT_TAP_MAJOR_VER@@
+ C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MINOR_VERSION=@@PRODUCT_TAP_MINOR_VER@@
++C_DEFINES=$(C_DEFINES) -DDDKVER_MAJOR=3790
+
+ # Produce the same symbolic information for both free & checked builds.
+ # This will allow us to perform full source-level debugging on both
+diff -Naur orig-openvpn-2.1_rc10/tap-win32/resource.rc mod-openvpn-2.1_rc10/tap-win32/resource.rc
+--- orig-openvpn-2.1_rc10/tap-win32/resource.rc 2008-08-10 18:35:25.000000000 +0000
++++ mod-openvpn-2.1_rc10/tap-win32/resource.rc 2008-09-24 03:00:42.600211095 +0000
+@@ -34,8 +34,8 @@
+ */
+
+ #define VER_COMPANYNAME_STR "The OpenVPN Project"
+-#define VER_FILEDESCRIPTION_STR "TAP-Win32 Virtual Network Driver"
+-#define VER_ORIGINALFILENAME_STR TAP_COMPONENT_ID ".sys"
++#define VER_FILEDESCRIPTION_STR "Tor VM TAP-Win32 Network Driver"
++#define VER_ORIGINALFILENAME_STR "tortap91.sys"
+ #define VER_LEGALCOPYRIGHT_YEARS "2003-2006"
+ #define VER_LEGALCOPYRIGHT_STR "Telethra, Inc."
+
diff -Naur orig-openvpn-2.1_rc10/tap-win32/tapdrvr.c mod-openvpn-2.1_rc10/tap-win32/tapdrvr.c
--- orig-openvpn-2.1_rc10/tap-win32/tapdrvr.c 2008-08-10 18:35:25.000000000 +0000
-+++ mod-openvpn-2.1_rc10/tap-win32/tapdrvr.c 2008-09-22 20:37:30.144483854 +0000
++++ mod-openvpn-2.1_rc10/tap-win32/tapdrvr.c 2008-09-24 02:56:19.103779332 +0000
@@ -39,7 +39,6 @@
// TAP_IOCTL_CONFIG_TUN ioctl.
//======================================================
@@ -21,14 +152,31 @@
#ifndef DDKVER_MAJOR
#error DDKVER_MAJOR must be defined as the major number of the DDK Version
#endif
+@@ -52,7 +51,7 @@
+ #define NTSTRSAFE_LIB
+
+ // Debug info output
+-#define ALSO_DBGPRINT 1
++#define ALSO_DBGPRINT 0
+ #define DEBUGP_AT_DISPATCH 0
+
+ //========================================================
diff -Naur orig-openvpn-2.1_rc10/version.m4 mod-openvpn-2.1_rc10/version.m4
--- orig-openvpn-2.1_rc10/version.m4 2008-09-10 06:55:52.000000000 +0000
-+++ mod-openvpn-2.1_rc10/version.m4 2008-09-22 20:35:28.208245859 +0000
-@@ -1,6 +1,6 @@
- dnl define the OpenVPN version
++++ mod-openvpn-2.1_rc10/version.m4 2008-09-24 01:08:38.192342317 +0000
+@@ -1,6 +1,11 @@
+-dnl define the OpenVPN version
++define(PRODUCT_NAME,[TorTap32])
define(PRODUCT_VERSION,[2.1_rc10])
- dnl define the TAP version
+-dnl define the TAP version
-define(PRODUCT_TAP_ID,[tap0901])
+define(PRODUCT_TAP_ID,[tortap91])
define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])
- define(PRODUCT_TAP_WIN32_MIN_MINOR,[1])
+-define(PRODUCT_TAP_WIN32_MIN_MINOR,[1])
++define(PRODUCT_TAP_WIN32_MIN_MINOR,[4])
++define(PRODUCT_TAP_MAJOR_VER,[9])
++define(PRODUCT_TAP_MINOR_VER,[4])
++define(PRODUCT_TAP_RELDATE,[09/22/2008])
++define(PRODUCT_TAP_DEVICE_DESCRIPTION,[Tor TAP-Win32 Adapter V9 for Qemu])
++define(PRODUCT_TAP_PROVIDER,[Tor TAP-Win32 Provider V9])
++define(PRODUCT_TAP_CHARACTERISTICS,[0x81])
Modified: torvm/trunk/build/win32/patches/winpcap-tor-device-mods.patch
===================================================================
--- torvm/trunk/build/win32/patches/winpcap-tor-device-mods.patch 2008-09-24 00:49:29 UTC (rev 16949)
+++ torvm/trunk/build/win32/patches/winpcap-tor-device-mods.patch 2008-09-24 02:03:39 UTC (rev 16950)
@@ -195,3 +195,24 @@
+#define WINPCAP_BUILD_DESCRIPTION "Modified WinPcap Driver for Tor Qemu VM"
#define WINPCAP_PRIVATE_BUILD ""
#define WINPCAP_LIBPCAP_VERSION "1.0 - branch"
+diff -Naur orig-winpcap/wpcap/PRJ/GNUmakefile mod-winpcap/wpcap/PRJ/GNUmakefile
+--- orig-winpcap/wpcap/PRJ/GNUmakefile 2008-05-20 17:30:46.000000000 +0000
++++ mod-winpcap/wpcap/PRJ/GNUmakefile 2008-09-24 03:30:16.696908481 +0000
+@@ -23,15 +23,14 @@
+ CFLAGS = -I ../libpcap -I ../libpcap/bpf -I ../libpcap/lbl \
+ -I ../libpcap/Win32/Include -I../libpcap/Win32/Include/ipv6kit \
+ -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 \
+ -mno-cygwin -shared ${OPTFLAGS}
+-LDFLAGS = -Wl,--out-implib,../lib/libwpcap.a
++LDFLAGS = -Wl,--out-implib,libwpcap.a
+ LIBS = -L ../../${PACKET_DIR}/DLL/Project -lPacket -lws2_32
+ OBJS = ../libpcap/bpf/net/bpf_filter.o \
+ ../libpcap/bpf_dump.o \
More information about the tor-commits
mailing list