From 5365502c2fe9ef91c6c8c1b45e249bbbcb062ba9 Mon Sep 17 00:00:00 2001
From: "berkeviktor@aol.com" <berkeviktor@aol.com>
Date: Sun, 26 Dec 2010 22:01:57 +0100
Subject: [PATCH] update openssl patch for 1.0.0c

---
 ext/openssl-wdk/openssl-wdk.patch | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/ext/openssl-wdk/openssl-wdk.patch b/ext/openssl-wdk/openssl-wdk.patch
index 9f39c31a..9f41e221 100644
--- a/ext/openssl-wdk/openssl-wdk.patch
+++ b/ext/openssl-wdk/openssl-wdk.patch
@@ -1,12 +1,14 @@
-diff -ruN openssl-1.0.0a.orig/Configure openssl-1.0.0a/Configure
---- openssl-1.0.0a.orig/Configure	2010-06-01 07:53:35 +0200
-+++ openssl-1.0.0a/Configure	2010-08-11 02:31:03 +0200
-@@ -491,10 +491,10 @@
+diff -ruN --strip-trailing-cr openssl-1.0.0c.orig/Configure openssl-1.0.0c/Configure
+--- openssl-1.0.0c.orig/Configure	2010-11-30 23:19:26 +0100
++++ openssl-1.0.0c/Configure	2010-12-26 21:57:02 +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",
@@ -14,9 +16,9 @@ diff -ruN openssl-1.0.0a.orig/Configure openssl-1.0.0a/Configure
  # 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 openssl-1.0.0a.orig/engines/e_aep.c openssl-1.0.0a/engines/e_aep.c
---- openssl-1.0.0a.orig/engines/e_aep.c	2008-12-22 13:54:12 +0100
-+++ openssl-1.0.0a/engines/e_aep.c	2010-08-11 02:31:03 +0200
+diff -ruN --strip-trailing-cr openssl-1.0.0c.orig/engines/e_aep.c openssl-1.0.0c/engines/e_aep.c
+--- openssl-1.0.0c.orig/engines/e_aep.c	2010-11-18 23:59:42 +0100
++++ openssl-1.0.0c/engines/e_aep.c	2010-12-26 21:56:41 +0100
 @@ -61,7 +61,12 @@
  #include <sys/types.h>
  #include <unistd.h>
@@ -30,9 +32,9 @@ diff -ruN openssl-1.0.0a.orig/engines/e_aep.c openssl-1.0.0a/engines/e_aep.c
  typedef int pid_t;
  #endif
  
-diff -ruN openssl-1.0.0a.orig/util/pl/VC-32.pl openssl-1.0.0a/util/pl/VC-32.pl
---- openssl-1.0.0a.orig/util/pl/VC-32.pl	2010-06-01 08:03:20 +0200
-+++ openssl-1.0.0a/util/pl/VC-32.pl	2010-08-11 02:31:03 +0200
+diff -ruN --strip-trailing-cr openssl-1.0.0c.orig/util/pl/VC-32.pl openssl-1.0.0c/util/pl/VC-32.pl
+--- openssl-1.0.0c.orig/util/pl/VC-32.pl	2010-09-13 19:28:34 +0200
++++ openssl-1.0.0c/util/pl/VC-32.pl	2010-12-26 21:56:41 +0100
 @@ -37,7 +37,7 @@
      $lib_cflag='/Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib
      $opt_cflags=$f.' /Ox';