From 110a2625fe7dcee78b96ca8589b6e0d5f2f76983 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Mon, 1 Apr 2013 05:05:33 +0200 Subject: Remove another bunch of obsolete junk --- win32/ext/openssl-wdk/openssl-wdk.patch | 64 --------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 win32/ext/openssl-wdk/openssl-wdk.patch (limited to 'win32/ext/openssl-wdk/openssl-wdk.patch') diff --git a/win32/ext/openssl-wdk/openssl-wdk.patch b/win32/ext/openssl-wdk/openssl-wdk.patch deleted file mode 100644 index 36cd861d..00000000 --- a/win32/ext/openssl-wdk/openssl-wdk.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ruN --strip-trailing-cr openssl-1.0.1.orig/Configure openssl-1.0.1/Configure ---- openssl-1.0.1.orig/Configure 2012-03-03 14:18:06 +0100 -+++ openssl-1.0.1/Configure 2012-03-14 20:34:29 +0100 -@@ -517,12 +517,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 ia64-mont.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ghash-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:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":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:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":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:::::::ghash-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:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":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 -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 -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.1.orig/engines/e_aep.c openssl-1.0.1/engines/e_aep.c ---- openssl-1.0.1.orig/engines/e_aep.c 2012-01-25 00:00:36 +0100 -+++ openssl-1.0.1/engines/e_aep.c 2012-03-14 20:33:58 +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.1.orig/util/pl/VC-32.pl openssl-1.0.1/util/pl/VC-32.pl ---- openssl-1.0.1.orig/util/pl/VC-32.pl 2011-06-17 15:50:40 +0200 -+++ openssl-1.0.1/util/pl/VC-32.pl 2012-03-14 20:33:58 +0100 -@@ -47,7 +47,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)=@_; -@@ -128,7 +128,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=''; - -@@ -189,7 +189,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