httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r399028 - in /httpd/httpd/dist/binaries/win32/patches_applied: ./ openssl-0.9.7i-vc32-2005.patch openssl-0.9.8a-vc32-2005.patch zlib-1.2.3-vc32-2005-rcver.patch
Date Tue, 02 May 2006 20:05:30 GMT
Author: wrowe
Date: Tue May  2 13:05:28 2006
New Revision: 399028

URL: http://svn.apache.org/viewcvs?rev=399028&view=rev
Log:

  Let's record our iterations of patches to these external libraries, for
  any trips back through the way way back machine.

Added:
    httpd/httpd/dist/binaries/win32/patches_applied/
    httpd/httpd/dist/binaries/win32/patches_applied/openssl-0.9.7i-vc32-2005.patch   (with
props)
    httpd/httpd/dist/binaries/win32/patches_applied/openssl-0.9.8a-vc32-2005.patch   (with
props)
    httpd/httpd/dist/binaries/win32/patches_applied/zlib-1.2.3-vc32-2005-rcver.patch   (with
props)

Added: httpd/httpd/dist/binaries/win32/patches_applied/openssl-0.9.7i-vc32-2005.patch
URL: http://svn.apache.org/viewcvs/httpd/httpd/dist/binaries/win32/patches_applied/openssl-0.9.7i-vc32-2005.patch?rev=399028&view=auto
==============================================================================
--- httpd/httpd/dist/binaries/win32/patches_applied/openssl-0.9.7i-vc32-2005.patch (added)
+++ httpd/httpd/dist/binaries/win32/patches_applied/openssl-0.9.7i-vc32-2005.patch Tue May
 2 13:05:28 2006
@@ -0,0 +1,79 @@
+--- util/pl/VC-32.pl.orig	Mon Sep 19 09:45:20 2005
++++ util/pl/VC-32.pl	Sat Apr 29 15:25:39 2006
+@@ -11,9 +11,8 @@
+ 
+ # C compiler stuff
+ $cc='cl';
+-$cflags=' /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN
-DL_ENDIAN -DDSO_WIN32';
+-$cflags.=' -D_CRT_SECURE_NO_DEPRECATE';	# shut up VC8
+-$lflags="/nologo /subsystem:console /machine:I386 /opt:ref";
++$cflags=' /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Oy- /Gs0 /GF /Gy /Zi /nologo -DOPENSSL_SYSNAME_WIN32
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
++$lflags="/nologo /subsystem:console /machine:I386 /debug /incremental:no /opt:ref";
+ $mlflags='';
+ 
+ $out_def="out32";
+@@ -23,11 +22,13 @@
+ 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;
+ 
++$cflags.=' /wd4996 -D_CRT_SECURE_NO_DEPRECATE -D_USE_32BIT_TIME_T';   # -really- shut up
VC8
++
+ $obj='.obj';
+ $ofile="/Fo";
+ 
+@@ -119,7 +120,10 @@
+ 		{
+ 		local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
+ 		$ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
+-		$ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n  \$(SHLIB_EX_OBJ)
$objs $ex\n<<\n";
++		$ret.="\t\$(LINK) \$(MLFLAGS) $efile\$@ /def:ms/${Name}.def @<<\n";
++		$ret.="\t\$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
++		$ret.="\tIF EXIST $@.manifest \\\n";
++		$ret.="\t  mt.exe -nologo -manifest \$@.manifest -outputresource:\$@;2\n";
+ 		}
+ 	$ret.="\n";
+ 	return($ret);
+@@ -133,8 +137,10 @@
+ 	$file =~ s/\//$o/g if $o ne '/';
+ 	$n=&bname($targer);
+ 	$ret.="$target: $files $dep_libs\n";
+-	$ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n";
+-	$ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n";
++	$ret.="\t\$(LINK) \$(LFLAGS) $efile\$@ @<<\n";
++	$ret.="\t\$(APP_EX_OBJ) $files $libs\n<<\n";
++	$ret.="\tIF EXIST $@.manifest \\\n";
++	$ret.="\t  mt.exe -nologo -manifest \$@.manifest -outputresource:\$@;1\n";
+ 	if (defined $sha1file)
+ 		{
+ 		$ret.="  $openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
+--- ms/do_masm.bat.orig	Tue May 11 07:46:09 2004
++++ ms/do_masm.bat	Sat Apr 29 15:31:03 2006
+@@ -58,13 +58,13 @@
+ 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
+-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
++rem perl util\mk1mf.pl no-sock %* VC-MSDOS >ms\msdos.mak
++rem perl util\mk1mf.pl %* VC-W31-32 >ms\w31.mak
++perl util\mk1mf.pl dll %* VC-W31-32 >ms\w31dll.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 16 libeay %* > ms\libeay16.def
++perl util\mkdef.pl 32 libeay %* > ms\libeay32.def
++perl util\mkdef.pl 16 ssleay %* > ms\ssleay16.def
++perl util\mkdef.pl 32 ssleay %* > ms\ssleay32.def

Propchange: httpd/httpd/dist/binaries/win32/patches_applied/openssl-0.9.7i-vc32-2005.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/dist/binaries/win32/patches_applied/openssl-0.9.8a-vc32-2005.patch
URL: http://svn.apache.org/viewcvs/httpd/httpd/dist/binaries/win32/patches_applied/openssl-0.9.8a-vc32-2005.patch?rev=399028&view=auto
==============================================================================
--- httpd/httpd/dist/binaries/win32/patches_applied/openssl-0.9.8a-vc32-2005.patch (added)
+++ httpd/httpd/dist/binaries/win32/patches_applied/openssl-0.9.8a-vc32-2005.patch Tue May
 2 13:05:28 2006
@@ -0,0 +1,101 @@
+--- util/pl/VC-32.pl.orig	Mon Sep 19 09:43:32 2005
++++ util/pl/VC-32.pl	Sat Apr 29 15:58:47 2006
+@@ -25,11 +25,13 @@
+     # per 0.9.8 release remaining warnings were explicitly examined and
+     # considered safe to ignore.
+     # 
+-    $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32
-DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
+-    $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
+-    $opt_cflags=' /MD /Ox';
++    $base_cflags=' /W3 /Gs0 /GF /Gy /Zi /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32
-DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
++    $base_cflags.=' /wd4996 -D_CRT_SECURE_NO_DEPRECATE -D_USE_32BIT_TIME_T';   # mostly
shut up VC8
++    $opt_cflags=' /MD /Ox /Oy-';
+     $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
+-    $lflags="/nologo /subsystem:console /opt:ref";
++    $base_lflags=' /nologo /subsystem:console /debug';
++    $opt_lflags=' /opt:ref /incremental:no';
++    $dbg_lflags='';
+     }
+ elsif ($FLAVOR =~ /CE/)
+     {
+@@ -83,15 +85,19 @@
+     $base_cflags.=" $wcecdefs";
+     $opt_cflags=' /MC /O1i';	# optimize for space, but with intrinsics...
+     $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
+-    $lflags="/nologo /opt:ref $wcelflag";
++    $base_lflags=' /nologo'.$wcelflag;
++    $opt_lflags=' /opt:ref';
++    $dbg_lflags=' /debug';
+     }
+ else	# Win32
+     {
+-    $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN
-DL_ENDIAN -DDSO_WIN32';
+-    $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE';	# shut up VC8
+-    $opt_cflags=' /MD /Ox /O2 /Ob2';
++    $base_cflags=' /W3 /WX /Gs0 /GF /Gy /Zi /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN
-DL_ENDIAN -DDSO_WIN32';
++    $base_cflags.=' /wd4996 -D_CRT_SECURE_NO_DEPRECATE -D_USE_32BIT_TIME_T';   # -really-
shut up VC8
++    $opt_cflags=' /MD /Ox /O2 /Ob2 /Oy-';
+     $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
+-    $lflags="/nologo /subsystem:console /machine:I386 /opt:ref";
++    $base_lflags=' /nologo /subsystem:console /machine:I386';
++    $opt_lflags=' /debug /opt:ref /incremental:no';
++    $dbg_lflags='';
+     }
+ $mlflags='';
+ 
+@@ -102,12 +108,12 @@
+ if ($debug)
+ 	{
+ 	$cflags=$dbg_cflags.$base_cflags;
+-	$lflags.=" /debug";
+-	$mlflags.=' /debug';
++	$lflags=$dbg_lflags.$base_lflags;
+ 	}
+ else
+ 	{
+ 	$cflags=$opt_cflags.$base_cflags;
++	$lflags=$opt_lflags.$base_lflags;
+ 	}
+ 
+ $obj='.obj';
+@@ -261,7 +267,10 @@
+ 			$ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
+ 			$ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
+ 			}
+-		$ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n  \$(SHLIB_EX_OBJ)
$objs $ex\n<<\n";
++		$ret.="\t\$(LINK) \$(MLFLAGS) $efile\$@ /def:ms/${Name}.def @<<\n";
++		$ret.="\t  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
++		$ret.="\tIF EXIST $@.manifest \\\n";
++		$ret.="\t  mt.exe -nologo -manifest \$@.manifest -outputresource:\$@;2\n";
+ 		}
+ 	$ret.="\n";
+ 	return($ret);
+@@ -275,8 +284,11 @@
+ 	$file =~ s/\//$o/g if $o ne '/';
+ 	$n=&bname($targer);
+ 	$ret.="$target: $files $dep_libs\n";
+-	$ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n";
+-	$ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n\n";
++	$ret.="\t\$(LINK) \$(LFLAGS) $efile\$@ @<<\n";
++	$ret.="\t  \$(APP_EX_OBJ) $files $libs\n<<\n";
++	$ret.="\tIF EXIST $@.manifest \\\n";
++	$ret.="\t  mt.exe -nologo -manifest \$@.manifest -outputresource:\$@;1\n";
++	$ret.="\n";
+ 	return($ret);
+ 	}
+ 
+--- ms/do_masm.bat.orig	Mon May 16 19:07:13 2005
++++ ms/do_masm.bat	Sat Apr 29 15:56:14 2006
+@@ -56,8 +56,8 @@
+ 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\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

Propchange: httpd/httpd/dist/binaries/win32/patches_applied/openssl-0.9.8a-vc32-2005.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/httpd/dist/binaries/win32/patches_applied/zlib-1.2.3-vc32-2005-rcver.patch
URL: http://svn.apache.org/viewcvs/httpd/httpd/dist/binaries/win32/patches_applied/zlib-1.2.3-vc32-2005-rcver.patch?rev=399028&view=auto
==============================================================================
--- httpd/httpd/dist/binaries/win32/patches_applied/zlib-1.2.3-vc32-2005-rcver.patch (added)
+++ httpd/httpd/dist/binaries/win32/patches_applied/zlib-1.2.3-vc32-2005-rcver.patch Tue May
 2 13:05:28 2006
@@ -0,0 +1,73 @@
+diff -u3 -r ..\zlib-1.2.3-orig\win32/Makefile.msc win32/Makefile.msc
+--- ..\zlib-1.2.3-orig\win32/Makefile.msc	Tue Aug 26 23:42:00 2003
++++ win32/Makefile.msc	Mon May 01 01:25:51 2006
+@@ -27,9 +27,9 @@
+ LD = link
+ AR = lib
+ RC = rc
+-CFLAGS  = -nologo -MD -O2 $(LOC)
++CFLAGS  = -nologo -MD -W3 -wd4996 -Zi -Fd"zlib_src" -O2 -Oy- $(LOC)
+ ASFLAGS = -coff
+-LDFLAGS = -nologo -release
++LDFLAGS = -nologo -debug -incremental:no -opt:ref
+ ARFLAGS = -nologo
+ RCFLAGS = /dWIN32 /r
+ 
+@@ -50,18 +50,28 @@
+ $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlib1.res
+ 	$(LD) $(LDFLAGS) -def:win32/zlib.def -dll -implib:$(IMPLIB) \
+ 	  -out:$@ $(OBJS) $(OBJA) zlib1.res
++	if exist $@.manifest \
++	  mt -nologo -manifest $@.manifest -outputresource:$@;2
+ 
+ example.exe: example.obj $(STATICLIB)
+ 	$(LD) $(LDFLAGS) example.obj $(STATICLIB)
++	if exist $@.manifest \
++	  mt -nologo -manifest $@.manifest -outputresource:$@;1
+ 
+ minigzip.exe: minigzip.obj $(STATICLIB)
+ 	$(LD) $(LDFLAGS) minigzip.obj $(STATICLIB)
++	if exist $@.manifest \
++	  mt -nologo -manifest $@.manifest -outputresource:$@;1
+ 
+ example_d.exe: example.obj $(IMPLIB)
+ 	$(LD) $(LDFLAGS) -out:$@ example.obj $(IMPLIB)
++	if exist $@.manifest \
++	  mt -nologo -manifest $@.manifest -outputresource:$@;1
+ 
+ minigzip_d.exe: minigzip.obj $(IMPLIB)
+ 	$(LD) $(LDFLAGS) -out:$@ minigzip.obj $(IMPLIB)
++	if exist $@.manifest \
++	  mt -nologo -manifest $@.manifest -outputresource:$@;1
+ 
+ .c.obj:
+ 	$(CC) -c $(CFLAGS) $<
+@@ -123,4 +133,6 @@
+ 	-del *.res
+ 	-del *.exp
+ 	-del *.exe
++	-del *.pdb
++	-del *.manifest
+ 	-del foo.gz
+diff -u3 -r ..\zlib-1.2.3-orig\win32/zlib1.rc win32/zlib1.rc
+--- ..\zlib-1.2.3-orig\win32/zlib1.rc	Sun Jul 17 21:35:36 2005
++++ win32/zlib1.rc	Mon May 01 01:24:48 2006
+@@ -5,15 +5,15 @@
+ #else
+ VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
+ #endif
+-  FILEVERSION		1,2,2,0
+-  PRODUCTVERSION	1,2,2,0
++  FILEVERSION		1,2,3,0
++  PRODUCTVERSION	1,2,3,0
+   FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
+ #ifdef _DEBUG
+   FILEFLAGS		1
+ #else
+   FILEFLAGS		0
+ #endif
+-  FILEOS		VOS_DOS_WINDOWS32
++  FILEOS		VOS__WINDOWS32
+   FILETYPE		VFT_DLL
+   FILESUBTYPE		0	// not used
+ BEGIN

Propchange: httpd/httpd/dist/binaries/win32/patches_applied/zlib-1.2.3-vc32-2005-rcver.patch
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message