httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r613336 - in /httpd/site/trunk/dist/binaries/win32/patches_applied: openssl-0.9.8d-vc32.patch openssl-0.9.8g-vc32.patch
Date Sat, 19 Jan 2008 01:19:52 GMT
Author: wrowe
Date: Fri Jan 18 17:19:51 2008
New Revision: 613336

URL: http://svn.apache.org/viewvc?rev=613336&view=rev
Log:
Drop stale patch, add refreshed patch with masm hack

Added:
    httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.8g-vc32.patch   (with
props)
Removed:
    httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.8d-vc32.patch

Added: httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.8g-vc32.patch
URL: http://svn.apache.org/viewvc/httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.8g-vc32.patch?rev=613336&view=auto
==============================================================================
--- httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.8g-vc32.patch (added)
+++ httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.8g-vc32.patch Fri Jan
18 17:19:51 2008
@@ -0,0 +1,99 @@
+# Build patches used to created apache_2.2.x-win32-openssl_0.9.8e.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. Make it possible for older masm to compile sse2 modules. PR: 1592
+#    OpenSSL_0_9_8-stable checkin 16708 by appro
+#
+--- ../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/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';
+ }
+ 
+--- crypto/perlasm/x86ms.pl	2007/07/19 10:45:03	1.18.2.3
++++ crypto/perlasm/x86ms.pl	2007/10/21 14:15:40	1.18.2.4
+@@ -339,8 +339,17 @@
+ sub main'file_end
+ 	{
+ 	# try to detect if SSE2 or MMX extensions were used...
+-	if (grep {/\b[x]?mm[0-7]\b,/i} @out) {
+-		grep {s/\.[3-7]86/\.686\n\t\.XMM/} @out;
++	my $xmmheader=<<___;
++.686
++.XMM
++IF \@Version LT 800
++XMMWORD STRUCT 16
++	DQ  2 dup (?)
++XMMWORD ENDS
++ENDIF
++___
++	if (grep {/\b[x]?mm[0-7]\b/i} @out) {
++		grep {s/\.[3-7]86/$xmmheader/} @out;
+ 		}
+ 	push(@out,"_TEXT\$	ENDS\n");
+ 	push(@out,"END\n");

Propchange: httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.8g-vc32.patch
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message