# Build patches used to created apache_2.2.x-win32-openssl_0.9.8h.msi
# binary packages
#
# 1. ensure perl Configure no-idea no-rc5 no-mdc2 enable-zlib flags are passed 
# to all ms\do_masm invoked utilities
# 2. propogate /debug flag to cl/masm/link to produce .PDB debugging symbols
# and toggle /Oy- to present a legible backtrace in Dr Watson etc.
# 3. per http://www.mail-archive.com/openssl-dev@openssl.org/msg24059.html
# for ticket 1681, fix spurious $extra in crypto/perlasm/x86ms.pl
#
--- ./ms/do_masm.bat.orig	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
--- util\pl\VC-32.pl.orig	Thu Jan 03 18:40:00 2008
+++ util\pl\VC-32.pl	Tue Jun 10 15:50:56 2008
@@ -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';
@@ -93,14 +93,14 @@
 }
 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
 my $f = $shlib?' /MD':' /MT';
 $lib_cflag='/Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib
- $opt_cflags=$f.' /Ox /O2 /Ob2';
+ $opt_cflags=$f.' /Ox /O2 /Ob2 /Oy- ';
 $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
- $lflags="/nologo /subsystem:console /opt:ref";
+ $lflags="/nologo /debug /subsystem:console /opt:ref";
 }
 $mlflags='';
 
@@ -111,12 +111,12 @@
 if ($debug)
 	{
 	$cflags=$dbg_cflags.$base_cflags;
-	$lflags.=" /debug";
 	$mlflags.=' /debug';
 	}
 else
 	{
 	$cflags=$opt_cflags.$base_cflags;
+	$mlflags.=' /debug';
 	}
 
 $obj='.obj';
@@ -167,7 +167,7 @@
 	$afile='-o ';
 } else {
 	$asm='ml /Cp /coff /c /Cx';
-	$asm.=" /Zi" if $debug;
+	$asm.=" /Zi";
 	$afile='/Fo';
 }
 
--- crypto/perlasm/x86ms.pl.orig	Thu May 01 18:11:32 2008
+++ crypto/perlasm/x86ms.pl	Tue Jun 10 16:02:53 2008
@@ -270,7 +270,6 @@
 
 	local($tmp)=<<"eof";
 PUBLIC	_$func
-$extra
 _$func PROC NEAR
 	push	ebp
 	push	ebx
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="http://archive.apache.org/dist/httpd/binaries/win32/patches_applied/openssl-0.9.8i-vc32.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="http://archive.apache.org/dist/httpd/binaries/win32/patches_applied/openssl-0.9.8i-vc32.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>