aboutsummaryrefslogtreecommitdiff
path: root/install-win32/openssl
diff options
context:
space:
mode:
authorSamuli Seppänen <samuli@openvpn.net>2011-04-14 17:18:47 +0300
committerDavid Sommerseth <davids@redhat.com>2011-04-14 16:38:24 +0200
commit6b2883a637fe73492f09816ee95b00c1b88d5fcb (patch)
tree8d9bc4b80b8c7dd29a1879be0565710611eb4093 /install-win32/openssl
parentAdd man page entry for --redirect-private (diff)
downloadopenvpn-6b2883a637fe73492f09816ee95b00c1b88d5fcb.tar.xz
Change all CRLF linefeeds to LF linefeeds
Signed-off-by: Samuli Seppänen <samuli@openvpn.net> Acked-by: David Sommerseth <davids@redhat.com> Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'install-win32/openssl')
-rw-r--r--install-win32/openssl/openssl097.patch48
-rw-r--r--install-win32/openssl/openssl098.patch34
2 files changed, 41 insertions, 41 deletions
diff --git a/install-win32/openssl/openssl097.patch b/install-win32/openssl/openssl097.patch
index 1a041cf..ccef40a 100644
--- a/install-win32/openssl/openssl097.patch
+++ b/install-win32/openssl/openssl097.patch
@@ -10,44 +10,44 @@ 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 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
+ @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
+ @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
+ 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
--make -f ms/mingw32.mak
+ if errorlevel 1 goto end
+
+ @rem Build the libraries
+-make -f ms/mingw32.mak
+
+@rem JY added --win32 flag
+make --win32 -f ms/mingw32.mak
- if errorlevel 1 goto end
-
- @rem Generate the DLLs and input libraries
+ if errorlevel 1 goto end
+
+ @rem Generate the DLLs and input libraries
@@ -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
-
+ dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
+ if errorlevel 1 goto end
+
+@rem JY added openssl.exe linked to DLL
+gcc -o openssl tmp\verify.o tmp\asn1pars.o tmp\req.o tmp\dgst.o tmp\dh.o tmp\dhparam.o tmp\enc.o tmp\passwd.o tmp\gendh.o tmp\errstr.o tmp\ca.o tmp\pkcs7.o tmp\crl2p7.o tmp\crl.o tmp\rsa.o tmp\rsautl.o tmp\dsa.o tmp\dsaparam.o tmp\x509.o tmp\genrsa.o tmp\gendsa.o tmp\s_server.o tmp\s_client.o tmp\speed.o tmp\s_time.o tmp\apps.o tmp\s_cb.o tmp\s_socket.o tmp\app_rand.o tmp\version.o tmp\sess_id.o tmp\ciphers.o tmp\nseq.o tmp\pkcs12.o tmp\pkcs8.o tmp\spkac.o tmp\smime.o tmp\rand.o tmp\engine.o tmp\ocsp.o tmp\prime.o tmp\openssl.o -leay32 -lssl32 -L. -lwsock32 -lgdi32
+
- echo Done compiling OpenSSL
-
- :end
--
+ echo Done compiling OpenSSL
+
+ :end
+-
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
diff --git a/install-win32/openssl/openssl098.patch b/install-win32/openssl/openssl098.patch
index 085ce94..653d2fe 100644
--- a/install-win32/openssl/openssl098.patch
+++ b/install-win32/openssl/openssl098.patch
@@ -27,30 +27,30 @@ diff -urw tmp/openssl-0.9.8h/ms/mw.bat openssl-0.9.8h/ms/mw.bat
--- tmp/openssl-0.9.8h/ms/mw.bat Sat Feb 22 11:00:10 2003
+++ openssl-0.9.8h/ms/mw.bat Wed Jun 4 02:56:54 2008
@@ -1,17 +1,23 @@
- @rem OpenSSL with Mingw32
- @rem --------------------
-
+ @rem OpenSSL with Mingw32
+ @rem --------------------
+
+@rem Include MinGW, MSYS, and ActiveState Perl in path
+set PATH=c:\bin;C:\Perl\bin\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;c:\MinGW\bin;c:\msys\1.0\bin
+
- @rem Makefile
- perl util\mkfiles.pl >MINFO
--perl util\mk1mf.pl Mingw32 >ms\mingw32.mak
+ @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
+ @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
+ 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
--make -f ms/mingw32.mak
+ if errorlevel 1 goto end
+
+ @rem Build the libraries
+-make -f ms/mingw32.mak
+
+@rem JY added --win32
+make --win32 -f ms/mingw32.mak
- if errorlevel 1 goto end
-
- @rem Generate the DLLs and input libraries
+ if errorlevel 1 goto end
+
+ @rem Generate the DLLs and input libraries