# Build patches used to created apache_2.2.x-win32-openssl_0.9.8d.msi
# binary packages
#
# 1. ensure perl Configure no-idea no-rc5 no-mdc2 zlib flags are passed 
#    to all ms\do_masm invoked utilities
# 2. correct package error, code the omitted ordinals to match 0.9.8 branch
# 3. propogate /debug flag to cl/masm/link to produce .PDB debugging symbols
#    and toggle /Oy- to present a legible backtrace in Dr Watson etc.
#
--- ../openssl-0.9.8d-orig/ms/do_masm.bat	Mon May 16 19:07:13 2005
+++ ./ms/do_masm.bat	Tue Jan 09 22:34:40 2007
@@ -55,9 +55,9 @@
 
 echo on
 
-perl util\mkfiles.pl >MINFO
-perl util\mk1mf.pl VC-WIN32 >ms\nt.mak
-perl util\mk1mf.pl dll VC-WIN32 >ms\ntdll.mak
+perl util\mkfiles.pl %* >MINFO
+perl util\mk1mf.pl %* VC-WIN32 >ms\nt.mak
+perl util\mk1mf.pl dll %* VC-WIN32 >ms\ntdll.mak
 
-perl util\mkdef.pl 32 libeay > ms\libeay32.def
-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
+perl util\mkdef.pl 32 libeay %* > ms\libeay32.def
+perl util\mkdef.pl 32 ssleay %* > ms\ssleay32.def
--- ../openssl-0.9.8d-orig/util/libeay.num	Fri Jun 09 10:42:20 2006
+++ ./util/libeay.num	Fri Jan 05 22:42:55 2007
@@ -3409,3 +3409,5 @@
 EVP_camellia_256_cfb8                   3810	EXIST::FUNCTION:CAMELLIA
 EVP_camellia_256_ecb                    3811	EXIST::FUNCTION:CAMELLIA
 EVP_camellia_256_ofb                    3812	EXIST::FUNCTION:CAMELLIA
+AES_ige_encrypt                         3829	EXIST::FUNCTION:AES
+AES_bi_ige_encrypt                      3860	EXIST::FUNCTION:AES
--- ../openssl-0.9.8d-orig/util/pl/VC-32.pl	Sun Jan 15 07:46:20 2006
+++ ./util/pl/VC-32.pl	Fri Jan 12 00:05:23 2007
@@ -11,7 +11,7 @@
 $mkdir='$(PERL) util/mkdir-p.pl';
 $rm='del';
 
-$zlib_lib="zlib1.lib";
+$zlib_lib="zdll.lib";
 
 # C compiler stuff
 $cc='cl';
@@ -91,12 +91,12 @@
     }
 else	# Win32
     {
-    $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
+    $base_cflags=' /W3 /WX /Gs0 /GF /Gy /Zi /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
     $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE';	# shut up VC8
     $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';	# shut up VC8
-    $opt_cflags=' /MD /Ox /O2 /Ob2';
+    $opt_cflags=' /MD /Ox /O2 /Ob2 /Oy-';
     $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
-    $lflags="/nologo /subsystem:console /opt:ref";
+    $lflags="/nologo /debug /subsystem:console /opt:ref";
     }
 $mlflags='';
 
@@ -107,12 +107,12 @@
 if ($debug)
 	{
 	$cflags=$dbg_cflags.$base_cflags;
-	$lflags.=" /debug";
 	$mlflags.=' /debug';
 	}
 else
 	{
 	$cflags=$opt_cflags.$base_cflags;
+	$mlflags.=' /debug';
 	}
 
 $obj='.obj';
@@ -160,7 +160,7 @@
 	$afile='-o ';
 } else {
 	$asm='ml /Cp /coff /c /Cx';
-	$asm.=" /Zi" if $debug;
+	$asm.=" /Zi";
 	$afile='/Fo';
 }