Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r521095 - in
 /httpd/site/trunk/dist/binaries/win32/patches_applied:
 openssl-0.9.7i-vc32-2005.patch openssl-0.9.7j-vc32.patch
 openssl-0.9.8a-vc32-2005.patch openssl-0.9.8d-vc32.patch
Date: Thu, 22 Mar 2007 03:02:34 -0000
To: cvs@httpd.apache.org
From: wrowe@apache.org
Message-Id: <20070322030234.987A71A9838@eris.apache.org>

Author: wrowe
Date: Wed Mar 21 20:02:33 2007
New Revision: 521095

URL: http://svn.apache.org/viewvc?view=rev&rev=521095
Log:
Forgot these were tracked in svn - refresh for shipping flavors

Added:
    httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.7j-vc32.patch   (with props)
    httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.8d-vc32.patch   (with props)
Removed:
    httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.7i-vc32-2005.patch
    httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.8a-vc32-2005.patch

Added: httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.7j-vc32.patch
URL: http://svn.apache.org/viewvc/httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.7j-vc32.patch?view=auto&rev=521095
==============================================================================
--- httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.7j-vc32.patch (added)
+++ httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.7j-vc32.patch Wed Mar 21 20:02:33 2007
@@ -0,0 +1,52 @@
+# Build patches used to created apache_2.0.x-win32-openssl_0.9.7j.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. 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.7j-orig/ms/do_masm.bat	Sat Jan 21 16:14:05 2006
++++ ./ms/do_masm.bat	Mon Aug 28 12:27:37 2006
+@@ -57,13 +57,8 @@
+ echo on
+ 
+ perl util\mkfiles.pl >MINFO
+-rem perl util\mk1mf.pl no-sock %1 VC-MSDOS >ms\msdos.mak
+-rem perl util\mk1mf.pl %1 VC-W31-32 >ms\w31.mak
+-rem perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak
+-perl util\mk1mf.pl %1 VC-WIN32 >ms\nt.mak
+-perl util\mk1mf.pl dll %1 VC-WIN32 >ms\ntdll.mak
++perl util\mk1mf.pl %* VC-WIN32 >ms\nt.mak
++perl util\mk1mf.pl dll %* VC-WIN32 >ms\ntdll.mak
+ 
+-perl util\mkdef.pl 16 libeay %1 > ms\libeay16.def
+-perl util\mkdef.pl 32 libeay %1 > ms\libeay32.def
+-perl util\mkdef.pl 16 ssleay %1 > ms\ssleay16.def
+-perl util\mkdef.pl 32 ssleay %1 > ms\ssleay32.def
++perl util\mkdef.pl 32 libeay %* > ms\libeay32.def
++perl util\mkdef.pl 32 ssleay %* > ms\ssleay32.def
+--- ../openssl-0.9.7j-orig/util/pl/VC-32.pl	Thu Apr 06 19:15:44 2006
++++ ./util/pl/VC-32.pl	Mon Aug 28 13:19:18 2006
+@@ -22,10 +22,10 @@
+ 
+ # C compiler stuff
+ $cc='cl';
+-$cflags=' /MD /W3 /WX /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
++$cflags=' /MD /W3 /WX /Ox /O2 /Ob2 /Oy- /Gs0 /GF /Gy /Zi /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
+ $cflags.=' -D_CRT_SECURE_NO_DEPRECATE';		# shut up VC8
+ $cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';	# shut up VC8
+-$lflags="/nologo /subsystem:console /machine:I386 /opt:ref";
++$lflags="/nologo /subsystem:console /machine:I386 /debug /incremental:no /opt:ref";
+ $mlflags='';
+ 
+ $out_def="out32";
+@@ -35,7 +35,7 @@
+ if ($debug)
+ 	{
+ 	$cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DOPENSSL_SYSNAME_WIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG -DDSO_WIN32";
+-	$lflags.=" /debug";
++	$lflags=" /nologo /subsystem:console /machine:I386 /debug";
+ 	$mlflags.=' /debug';
+ 	}
+ $cflags .= " -DOPENSSL_SYSNAME_WINNT" if $NT == 1;

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

Added: httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.8d-vc32.patch
URL: http://svn.apache.org/viewvc/httpd/site/trunk/dist/binaries/win32/patches_applied/openssl-0.9.8d-vc32.patch?view=auto&rev=521095
==============================================================================
--- 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.8d-vc32.patch Wed Mar 21 20:02:33 2007
@@ -0,0 +1,84 @@
+# 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';
+ }
+ 

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