aboutsummaryrefslogtreecommitdiff
path: root/install-win32/openssl.patch
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-01-22 22:08:35 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-01-22 22:08:35 +0000
commitf02576fa8b18132df009ea1f8d6aea07e06d5059 (patch)
treec25e560fdb660f7295899fdfbc26226091d2bf28 /install-win32/openssl.patch
parentChanged ASSERT(0) to a more descriptive fatal error in tun.c (diff)
downloadopenvpn-f02576fa8b18132df009ea1f8d6aea07e06d5059.tar.xz
Incremented version number to 2.1_rc4a.
Windows changes: Incremented included OpenSSL version to openssl-0.9.7m. Updated openssl.patch for openssl-0.9.7m and added some brief usage comments to the head of the patch. Added build-pkcs11-helper.sh for building the pkcs11-helper library. Integrated inclusion of pkcs11-helper into Windows build system. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2649 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to '')
-rw-r--r--install-win32/openssl.patch42
1 files changed, 34 insertions, 8 deletions
diff --git a/install-win32/openssl.patch b/install-win32/openssl.patch
index 16ba7c8..1a041cf 100644
--- a/install-win32/openssl.patch
+++ b/install-win32/openssl.patch
@@ -1,7 +1,32 @@
-diff -wur /y/openssl/openssl-0.9.7l/ms/mw.bat openssl-0.9.7l-modified/ms/mw.bat
---- /y/openssl/openssl-0.9.7l/ms/mw.bat Sat Feb 22 10:02:45 2003
-+++ openssl-0.9.7l-modified/ms/mw.bat Sun Oct 1 04:24:02 2006
-@@ -11,7 +11,9 @@
+[in msys bash window]
+cd /c/src/openssl-0.9.7m
+patch -p1 <../21/install-win32/openssl.patch
+
+[open command prompt window]
+cd \src\openssl-0.9.7m
+ms\mw
+
+diff -wur openssl-0.9.7m.orig/ms/mw.bat openssl-0.9.7m/ms/mw.bat
+--- openssl-0.9.7m.orig/ms/mw.bat Sat Feb 22 11:02:46 2003
++++ openssl-0.9.7m/ms/mw.bat Mon Jan 21 23:12:34 2008
+@@ -1,17 +1,23 @@
+ @rem OpenSSL with Mingw32
+ @rem --------------------
+
++@rem Include MinGW, MSYS, and ActiveState Perl in path
++set PATH=c:\perl\bin;c:\MinGW\bin;c:\msys\1.0\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem
++
+ @rem Makefile
+ perl util\mkfiles.pl >MINFO
+-perl util\mk1mf.pl Mingw32 >ms\mingw32.mak
++perl util\mk1mf.pl no-idea no-mdc2 no-rc5 Mingw32 >ms\mingw32.mak
++
+ @rem DLL definition files
+-perl util\mkdef.pl 32 libeay >ms\libeay32.def
++perl util\mkdef.pl no-idea no-mdc2 no-rc5 32 libeay >ms\libeay32.def
+ if errorlevel 1 goto end
+-perl util\mkdef.pl 32 ssleay >ms\ssleay32.def
++perl util\mkdef.pl no-idea no-mdc2 no-rc5 32 ssleay >ms\ssleay32.def
if errorlevel 1 goto end
@rem Build the libraries
@@ -12,7 +37,7 @@ diff -wur /y/openssl/openssl-0.9.7l/ms/mw.bat openssl-0.9.7l-modified/ms/mw.bat
if errorlevel 1 goto end
@rem Generate the DLLs and input libraries
-@@ -20,6 +22,9 @@
+@@ -20,7 +26,9 @@
dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
if errorlevel 1 goto end
@@ -22,9 +47,10 @@ diff -wur /y/openssl/openssl-0.9.7l/ms/mw.bat openssl-0.9.7l-modified/ms/mw.bat
echo Done compiling OpenSSL
:end
-diff -wur /y/openssl/openssl-0.9.7l/util/pl/Mingw32.pl openssl-0.9.7l-modified/util/pl/Mingw32.pl
---- /y/openssl/openssl-0.9.7l/util/pl/Mingw32.pl Sun May 16 22:28:31 2004
-+++ openssl-0.9.7l-modified/util/pl/Mingw32.pl Sun Oct 1 04:54:04 2006
+-
+diff -wur openssl-0.9.7m.orig/util/pl/Mingw32.pl openssl-0.9.7m/util/pl/Mingw32.pl
+--- openssl-0.9.7m.orig/util/pl/Mingw32.pl Sun May 16 23:28:32 2004
++++ openssl-0.9.7m/util/pl/Mingw32.pl Mon Jan 21 17:52:36 2008
@@ -99,10 +99,10 @@
$n=&bname($target);
$ret.="$target: $files $dep_libs\n";