Author: jfrederic.clere(a)jboss.com Date: 2013-06-07 03:23:39 -0400 (Fri, 07 Jun 2013) New Revision: 3086 Modified: trunk/build/patch/openssl-0.9.8r.patch Log: Arrange the patch. Modified: trunk/build/patch/openssl-0.9.8r.patch =================================================================== --- trunk/build/patch/openssl-0.9.8r.patch 2013-06-06 16:12:57 UTC (rev 3085) +++ trunk/build/patch/openssl-0.9.8r.patch 2013-06-07 07:23:39 UTC (rev 3086) @@ -1,28 +1,28 @@ ---- util/pl/VC-32.pl.org 2013-06-06 18:03:18.555201964 +0200 -+++ util/pl/VC-32.pl 2013-06-06 18:10:08.247319371 +0200 -@@ -31,7 +31,7 @@ +--- util/pl/VC-32.pl.orig 2010-05-27 15:16:28.000000000 +0200 ++++ util/pl/VC-32.pl 2013-06-07 09:21:08.371962819 +0200 +@@ -49,7 +49,7 @@ $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 $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 -- my $f = $shlib?' /MD':' /MT'; +- my $f = $shlib || $fips ?' /MD':' /MT'; + my $f = ' /MD'; $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib $opt_cflags=$f.' /Ox'; $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; -@@ -96,7 +96,7 @@ +@@ -114,7 +114,7 @@ $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 $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8 -- my $f = $shlib?' /MD':' /MT'; +- my $f = $shlib || $fips ?' /MD':' /MT'; + my $f = ' /MD'; $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib $opt_cflags=$f.' /Ox /O2 /Ob2'; $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; -@@ -288,6 +288,7 @@ +@@ -371,6 +371,7 @@ $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib'; $ex.=' crypt32.lib'; - $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/); + $ex.= $oflow; + $ex.=' $(EXTRA_LIBS)'; } $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/; - $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n"; +