From d03d6e606b40157d910ddf99ab018156abeb8ef0 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Mon, 28 Feb 2011 18:59:32 +0100 Subject: add wdk changes to named branch --- ext/openssl-wdk/openssl-wdk.patch | 64 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 ext/openssl-wdk/openssl-wdk.patch (limited to 'ext/openssl-wdk/openssl-wdk.patch') diff --git a/ext/openssl-wdk/openssl-wdk.patch b/ext/openssl-wdk/openssl-wdk.patch new file mode 100644 index 00000000..38cd7776 --- /dev/null +++ b/ext/openssl-wdk/openssl-wdk.patch @@ -0,0 +1,64 @@ +diff -ruN --strip-trailing-cr openssl-1.0.0d.orig/Configure openssl-1.0.0d/Configure +--- openssl-1.0.0d.orig/Configure 2010-11-30 23:19:26 +0100 ++++ openssl-1.0.0d/Configure 2011-02-10 23:57:56 +0100 +@@ -491,12 +491,12 @@ + # + # Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64 + "VC-WIN64I","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32", +-"VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32", ++"VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32", + "debug-VC-WIN64I","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32", + "debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32", + # x86 Win32 target defaults to ANSI API, if you want UNICODE, complement + # 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE' +-"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -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-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", + # 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/engines/e_aep.c openssl-1.0.0d/engines/e_aep.c +--- openssl-1.0.0d.orig/engines/e_aep.c 2010-11-18 23:59:42 +0100 ++++ openssl-1.0.0d/engines/e_aep.c 2011-02-10 23:57:56 +0100 +@@ -61,7 +61,12 @@ + #include + #include + #else ++#ifdef _MSC_VER ++#include ++#define _getpid GetCurrentProcessId ++#else + #include ++#endif + typedef int pid_t; + #endif + +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 19:28:34 +0200 ++++ openssl-1.0.0d/util/pl/VC-32.pl 2011-02-10 23:57:56 +0100 +@@ -37,7 +37,7 @@ + $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib + $opt_cflags=$f.' /Ox'; + $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; +- $lflags="/nologo /subsystem:console /opt:ref"; ++ $lflags="/nologo /subsystem:console /opt:ref msvcrt_win2003.obj"; + + *::perlasm_compile_target = sub { + my ($target,$source,$bname)=@_; +@@ -118,7 +118,7 @@ + $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib + $opt_cflags=$f.' /Ox /O2 /Ob2'; + $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; +- $lflags="/nologo /subsystem:console /opt:ref"; ++ $lflags="/nologo /subsystem:console /opt:ref msvcrt_winxp.obj"; + } + $mlflags=''; + +@@ -179,7 +179,7 @@ + $lfile='/out:'; + + $shlib_ex_obj=""; +-$app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/); ++$app_ex_obj="" if ($FLAVOR !~ /CE/); + if ($FLAVOR =~ /WIN64A/) { + if (`nasm -v 2>NUL` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) { + $asm='nasm -f win64 -DNEAR -Ox -g'; -- cgit 1.4.1 From c2701d7792906e796cc607d3371a15477a4a3ebf Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Mon, 28 Mar 2011 05:52:18 +0200 Subject: zlib-wdk support for openssl-wdk --- ext/openssl-wdk/build-x64.bat | 2 +- ext/openssl-wdk/build-x86.bat | 2 +- ext/openssl-wdk/openssl-wdk.patch | 44 +++++++++++++++++++++++++++++++-------- 3 files changed, 37 insertions(+), 11 deletions(-) (limited to 'ext/openssl-wdk/openssl-wdk.patch') diff --git a/ext/openssl-wdk/build-x64.bat b/ext/openssl-wdk/build-x64.bat index 4c9d45cf..86976c21 100644 --- a/ext/openssl-wdk/build-x64.bat +++ b/ext/openssl-wdk/build-x64.bat @@ -24,7 +24,7 @@ move lib %OPENSSL_DEST% mkdir %OPENSSL_DEST%\share move openssl.cnf %OPENSSL_DEST%\share\openssl.cnf.example move include-orig include -copy zlib-x64\bin\zlib1.dll %OPENSSL_DEST%\bin +copy zlib-x64\bin\zlibwapi.dll %OPENSSL_DEST%\bin move cert.pem %OPENSSL_DEST%\bin echo.Finished! pause diff --git a/ext/openssl-wdk/build-x86.bat b/ext/openssl-wdk/build-x86.bat index 9b909a52..534d2598 100644 --- a/ext/openssl-wdk/build-x86.bat +++ b/ext/openssl-wdk/build-x86.bat @@ -25,7 +25,7 @@ move lib %OPENSSL_DEST% mkdir %OPENSSL_DEST%\share move openssl.cnf %OPENSSL_DEST%\share\openssl.cnf.example move include-orig include -copy zlib-x86\bin\zlib1.dll %OPENSSL_DEST%\bin +copy zlib-x86\bin\zlibwapi.dll %OPENSSL_DEST%\bin move cert.pem %OPENSSL_DEST%\bin echo.Finished! pause diff --git a/ext/openssl-wdk/openssl-wdk.patch b/ext/openssl-wdk/openssl-wdk.patch index 38cd7776..b46a152a 100644 --- a/ext/openssl-wdk/openssl-wdk.patch +++ b/ext/openssl-wdk/openssl-wdk.patch @@ -1,6 +1,6 @@ diff -ruN --strip-trailing-cr openssl-1.0.0d.orig/Configure openssl-1.0.0d/Configure ---- openssl-1.0.0d.orig/Configure 2010-11-30 23:19:26 +0100 -+++ openssl-1.0.0d/Configure 2011-02-10 23:57:56 +0100 +--- openssl-1.0.0d.orig/Configure 2010-11-30 22:19:26 +0100 ++++ openssl-1.0.0d/Configure 2011-03-28 05:48:11 +0200 @@ -491,12 +491,12 @@ # # Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64 @@ -16,9 +16,25 @@ 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 23:59:42 +0100 -+++ openssl-1.0.0d/engines/e_aep.c 2011-02-10 23:57:56 +0100 +--- 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 @@ -61,7 +61,12 @@ #include #include @@ -33,9 +49,19 @@ diff -ruN --strip-trailing-cr openssl-1.0.0d.orig/engines/e_aep.c openssl-1.0.0d #endif 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 19:28:34 +0200 -+++ openssl-1.0.0d/util/pl/VC-32.pl 2011-02-10 23:57:56 +0100 -@@ -37,7 +37,7 @@ +--- 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'; $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; @@ -44,7 +70,7 @@ diff -ruN --strip-trailing-cr openssl-1.0.0d.orig/util/pl/VC-32.pl openssl-1.0.0 *::perlasm_compile_target = sub { my ($target,$source,$bname)=@_; -@@ -118,7 +118,7 @@ +@@ -118,7 +119,7 @@ $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib $opt_cflags=$f.' /Ox /O2 /Ob2'; $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; @@ -53,7 +79,7 @@ diff -ruN --strip-trailing-cr openssl-1.0.0d.orig/util/pl/VC-32.pl openssl-1.0.0 } $mlflags=''; -@@ -179,7 +179,7 @@ +@@ -179,7 +180,7 @@ $lfile='/out:'; $shlib_ex_obj=""; -- cgit 1.4.1 From 4d3c04bd590a93ed35836a784ff3ef215676daa9 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Mon, 28 Mar 2011 05:53:50 +0200 Subject: multi-core compilation support for openssl-wdk --- ext/openssl-wdk/openssl-wdk.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/openssl-wdk/openssl-wdk.patch') diff --git a/ext/openssl-wdk/openssl-wdk.patch b/ext/openssl-wdk/openssl-wdk.patch index b46a152a..b28f82ab 100644 --- a/ext/openssl-wdk/openssl-wdk.patch +++ b/ext/openssl-wdk/openssl-wdk.patch @@ -1,18 +1,18 @@ diff -ruN --strip-trailing-cr openssl-1.0.0d.orig/Configure openssl-1.0.0d/Configure --- openssl-1.0.0d.orig/Configure 2010-11-30 22:19:26 +0100 -+++ openssl-1.0.0d/Configure 2011-03-28 05:48:11 +0200 ++++ openssl-1.0.0d/Configure 2011-03-28 04:16:11 +0200 @@ -491,12 +491,12 @@ # # Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64 "VC-WIN64I","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32", -"VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32", -+"VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32", ++"VC-WIN64A","cl:-W3 -MP -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32", "debug-VC-WIN64I","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32", "debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32", # x86 Win32 target defaults to ANSI API, if you want UNICODE, complement # 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE' -"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -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-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", ++"VC-WIN32","cl:-W3 -WX -MP -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32", # 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", -- cgit 1.4.1