release/src/router/openvpn/install-win32/openssl/openssl097.patch

   1 [in msys bash window]
   2 cd /c/src/openssl-0.9.7m
   3 patch -p1 <../21/install-win32/openssl.patch
   4
   5 [open command prompt window]
   6 cd \src\openssl-0.9.7m
   7 ms\mw
   8
   9 diff -wur openssl-0.9.7m.orig/ms/mw.bat openssl-0.9.7m/ms/mw.bat
  10 --- openssl-0.9.7m.orig/ms/mw.bat       Sat Feb 22 11:02:46 2003
  11 +++ openssl-0.9.7m/ms/mw.bat    Mon Jan 21 23:12:34 2008
  12 @@ -1,17 +1,23 @@
  13  @rem OpenSSL with Mingw32
  14  @rem --------------------
  15
  16 +@rem Include MinGW, MSYS, and ActiveState Perl in path
  17 +set PATH=c:\perl\bin;c:\MinGW\bin;c:\msys\1.0\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem
  18 +
  19  @rem Makefile
  20  perl util\mkfiles.pl >MINFO
  21 -perl util\mk1mf.pl Mingw32 >ms\mingw32.mak
  22 +perl util\mk1mf.pl no-idea no-mdc2 no-rc5 Mingw32 >ms\mingw32.mak
  23 +
  24  @rem DLL definition files
  25 -perl util\mkdef.pl 32 libeay >ms\libeay32.def
  26 +perl util\mkdef.pl no-idea no-mdc2 no-rc5 32 libeay >ms\libeay32.def
  27  if errorlevel 1 goto end
  28 -perl util\mkdef.pl 32 ssleay >ms\ssleay32.def
  29 +perl util\mkdef.pl no-idea no-mdc2 no-rc5 32 ssleay >ms\ssleay32.def
  30  if errorlevel 1 goto end
  31
  32  @rem Build the libraries
  33 -make -f ms/mingw32.mak
  34 +
  35 +@rem JY added --win32 flag
  36 +make --win32 -f ms/mingw32.mak
  37  if errorlevel 1 goto end
  38
  39  @rem Generate the DLLs and input libraries
  40 @@ -20,7 +26,9 @@
  41  dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a
  42  if errorlevel 1 goto end
  43
  44 +@rem JY added openssl.exe linked to DLL
  45 +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
  46 +
  47  echo Done compiling OpenSSL
  48
  49  :end
  50 -
  51 diff -wur openssl-0.9.7m.orig/util/pl/Mingw32.pl openssl-0.9.7m/util/pl/Mingw32.pl
  52 --- openssl-0.9.7m.orig/util/pl/Mingw32.pl      Sun May 16 23:28:32 2004
  53 +++ openssl-0.9.7m/util/pl/Mingw32.pl   Mon Jan 21 17:52:36 2008
  54 @@ -99,10 +99,10 @@
  55         $n=&bname($target);
  56         $ret.="$target: $files $dep_libs\n";
  57         $ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n";
  58 -       if (defined $sha1file)
  59 -               {
  60 -               $ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
  61 -               }
  62 +#      if (defined $sha1file)
  63 +#              {
  64 +#              $ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
  65 +#              }
  66         $ret.="\n";
  67         return($ret);
  68         }