[or-cvs] r16970: {torvm} Fix errors in openvpn configure.ac file related to device st (torvm/trunk/build/win32/patches)

[coderman at seul.org]

Author: coderman
Date: 2008-09-26 04:46:18 -0400 (Fri, 26 Sep 2008)
New Revision: 16970

Modified:
   torvm/trunk/build/win32/patches/openvpn-tor-tap-win32-driver.patch
Log:
Fix errors in openvpn configure.ac file related to device strings that are now set in the .rc file for the driver instead of configure.

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-26 08:16:33 UTC (rev 16969)
+++ torvm/trunk/build/win32/patches/openvpn-tor-tap-win32-driver.patch	2008-09-26 08:46:18 UTC (rev 16970)
@@ -1,53 +1,7 @@
 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-23 11:02:18.986773240 +0000
-@@ -838,12 +838,45 @@
- TAP_ID="PRODUCT_TAP_ID"
- TAP_WIN32_MIN_MAJOR="PRODUCT_TAP_WIN32_MIN_MAJOR"
- TAP_WIN32_MIN_MINOR="PRODUCT_TAP_WIN32_MIN_MINOR"
-+PRODUCT_NAME="PRODUCT_NAME"
-+PRODUCT_VERSION="PRODUCT_VERSION"
-+PRODUCT_TAP_ID="PRODUCT_TAP_ID"
-+PRODUCT_TAP_WIN32_MIN_MAJOR="PRODUCT_TAP_WIN32_MIN_MAJOR"
-+PRODUCT_TAP_WIN32_MIN_MINOR="PRODUCT_TAP_WIN32_MIN_MINOR"
-+PRODUCT_TAP_MAJOR_VER="PRODUCT_TAP_WIN32_MIN_MAJOR"
-+PRODUCT_TAP_MINOR_VER="PRODUCT_TAP_WIN32_MIN_MINOR"
-+PRODUCT_TAP_DEVICE_DESCRIPTION="PRODUCT_TAP_DEVICE_DESCRIPTION"
-+PRODUCT_TAP_RELDATE="PRODUCT_TAP_RELDATE"
-+PRODUCT_TAP_PROVIDER="PRODUCT_TAP_PROVIDER"
-+PRODUCT_TAP_CHARACTERISTICS="PRODUCT_TAP_CHARACTERISTICS"
- 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(PRODUCT_NAME, ${PRODUCT_NAME}, [description goes here])
-+AC_DEFINE_UNQUOTED(PRODUCT_VERSION, ${PRODUCT_VERSION}, [description goes here])
-+AC_DEFINE_UNQUOTED(PRODUCT_TAP_ID, ${PRODUCT_TAP_ID}, [description goes here])
-+AC_DEFINE_UNQUOTED(PRODUCT_TAP_WIN32_MIN_MAJOR, ${PRODUCT_TAP_WIN32_MIN_MAJOR}, [description goes here])
-+AC_DEFINE_UNQUOTED(PRODUCT_TAP_WIN32_MIN_MINOR, ${PRODUCT_TAP_WIN32_MIN_MINOR}, [description goes here])
-+AC_DEFINE_UNQUOTED(PRODUCT_TAP_MAJOR_VER, ${PRODUCT_TAP_MAJOR_VER}, [description goes here])
-+AC_DEFINE_UNQUOTED(PRODUCT_TAP_MINOR_VER, ${PRODUCT_TAP_MINOR_VER}, [description goes here])
-+AC_DEFINE(PRODUCT_TAP_DEVICE_DESCRIPTION, ${PRODUCT_TAP_DEVICE_DESCRIPTION}, [description goes here])
-+AC_DEFINE(PRODUCT_TAP_RELDATE, ${PRODUCT_TAP_RELDATE}, [description goes here])
-+AC_DEFINE(PRODUCT_TAP_PROVIDER, ${PRODUCT_TAP_PROVIDER}, [description goes here])
-+AC_DEFINE_UNQUOTED(PRODUCT_TAP_CHARACTERISTICS, ${PRODUCT_TAP_CHARACTERISTICS}, [description goes here])
- AC_SUBST(TAP_ID)
- AC_SUBST(TAP_WIN32_MIN_MAJOR)
- AC_SUBST(TAP_WIN32_MIN_MINOR)
-+AC_SUBST(PRODUCT_NAME)
-+AC_SUBST(PRODUCT_VERSION)
-+AC_SUBST(PRODUCT_TAP_ID)
-+AC_SUBST(PRODUCT_TAP_WIN32_MIN_MAJOR)
-+AC_SUBST(PRODUCT_TAP_WIN32_MIN_MINOR)
-+AC_SUBST(PRODUCT_TAP_MAJOR_VER)
-+AC_SUBST(PRODUCT_TAP_MINOR_VER)
-+AC_SUBST(PRODUCT_TAP_DEVICE_DESCRIPTION)
-+AC_SUBST(PRODUCT_TAP_RELDATE)
-+AC_SUBST(PRODUCT_TAP_PROVIDER)
-+AC_SUBST(PRODUCT_TAP_CHARACTERISTICS)
- 
- win32datadir="\${datadir}/${PACKAGE}-win32"
- AC_SUBST(win32datadir)
-@@ -865,6 +898,8 @@
++++ mod-openvpn-2.1_rc10/configure.ac	2008-09-26 08:44:00.800271312 +0000
+@@ -865,6 +865,8 @@
  	openvpn.spec
  	config-win32.h
  	images/Makefile