diff options
| author | Berke Viktor <berkeviktor@aol.com> | 2011-08-15 00:57:45 +0200 |
|---|---|---|
| committer | Berke Viktor <berkeviktor@aol.com> | 2011-08-15 00:57:45 +0200 |
| commit | b29c1811e9f80aeafbf6e584b9e635596f08407c (patch) | |
| tree | b4c0ab6b8a19a92c52456684175bc6389e32ecf7 /ext/openssl-wdk/openssl-wdk.patch | |
| parent | 19345289008d27dcd8631776c29e462d992ed638 (diff) | |
openssl-wdk updates
Diffstat (limited to 'ext/openssl-wdk/openssl-wdk.patch')
| -rw-r--r-- | ext/openssl-wdk/openssl-wdk.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/ext/openssl-wdk/openssl-wdk.patch b/ext/openssl-wdk/openssl-wdk.patch index b28f82ab..ceab5fed 100644 --- a/ext/openssl-wdk/openssl-wdk.patch +++ b/ext/openssl-wdk/openssl-wdk.patch @@ -16,22 +16,6 @@ diff -ruN --strip-trailing-cr openssl-1.0.0d.orig/Configure openssl-1.0.0d/Confi # Unified CE target "debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", "VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32", -diff -ruN --strip-trailing-cr openssl-1.0.0d.orig/crypto/comp/c_zlib.c openssl-1.0.0d/crypto/comp/c_zlib.c ---- openssl-1.0.0d.orig/crypto/comp/c_zlib.c 2010-01-13 18:46:00 +0100 -+++ openssl-1.0.0d/crypto/comp/c_zlib.c 2011-03-28 04:44:35 +0200 -@@ -346,8 +346,12 @@ - if (!zlib_loaded) - { - #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) -+#ifdef ZLIB_DLL - zlib_dso = DSO_load(NULL, "ZLIB1", NULL, 0); - #else -+ zlib_dso = DSO_load(NULL, "ZLIBWAPI", NULL, 0); -+#endif -+#else - zlib_dso = DSO_load(NULL, "z", NULL, 0); - #endif - if (zlib_dso != NULL) diff -ruN --strip-trailing-cr openssl-1.0.0d.orig/engines/e_aep.c openssl-1.0.0d/engines/e_aep.c --- openssl-1.0.0d.orig/engines/e_aep.c 2010-11-18 22:59:42 +0100 +++ openssl-1.0.0d/engines/e_aep.c 2011-03-28 05:48:11 +0200 @@ -51,16 +35,6 @@ diff -ruN --strip-trailing-cr openssl-1.0.0d.orig/engines/e_aep.c openssl-1.0.0d diff -ruN --strip-trailing-cr openssl-1.0.0d.orig/util/pl/VC-32.pl openssl-1.0.0d/util/pl/VC-32.pl --- openssl-1.0.0d.orig/util/pl/VC-32.pl 2010-09-13 18:28:34 +0200 +++ openssl-1.0.0d/util/pl/VC-32.pl 2011-03-28 04:53:44 +0200 -@@ -11,7 +11,8 @@ - $mkdir='$(PERL) util/mkdir-p.pl'; - $rm='del /Q'; - --$zlib_lib="zlib1.lib"; -+#$zlib_lib="zlib1.lib"; -+$zlib_lib="zlibwapi.lib"; - - # Santize -L options for ms link - $l_flags =~ s/-L("\[^"]+")/\/libpath:$1/g; @@ -37,7 +38,7 @@ $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib $opt_cflags=$f.' /Ox'; |