• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision16013 (tree)
Zeit2009-04-03 01:49:43
Autorstefankueng

Log Message

Merge r16012 from trunk:
* Update to OpenSSL 0.9.8k.

Ändern Zusammenfassung

Diff

--- branches/1.6.x/Languages/Tortoise_ca_ES.po (revision 16012)
+++ branches/1.6.x/Languages/Tortoise_ca_ES.po (revision 16013)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_ca_ES.po:r16012
--- branches/1.6.x/Languages/Tortoise_da.po (revision 16012)
+++ branches/1.6.x/Languages/Tortoise_da.po (revision 16013)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_da.po:r16012
--- branches/1.6.x/Languages/Tortoise_es.po (revision 16012)
+++ branches/1.6.x/Languages/Tortoise_es.po (revision 16013)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_es.po:r16012
--- branches/1.6.x/Languages/Tortoise_it.po (revision 16012)
+++ branches/1.6.x/Languages/Tortoise_it.po (revision 16013)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_it.po:r16012
--- branches/1.6.x/Languages/Tortoise_nb.po (revision 16012)
+++ branches/1.6.x/Languages/Tortoise_nb.po (revision 16013)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_nb.po:r16012
--- branches/1.6.x/Languages/Tortoise_pt_PT.po (revision 16012)
+++ branches/1.6.x/Languages/Tortoise_pt_PT.po (revision 16013)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_pt_PT.po:r16012
--- branches/1.6.x/Languages/Tortoise_sv.po (revision 16012)
+++ branches/1.6.x/Languages/Tortoise_sv.po (revision 16013)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_sv.po:r16012
--- branches/1.6.x/build.txt (revision 16012)
+++ branches/1.6.x/build.txt (revision 16013)
@@ -72,7 +72,7 @@
7272
7373 \subsection Requirements3 Next you need to download some more.
7474 - OpenSSL source http://www.openssl.org/source/
75- You will need version 0.9.8j
75+ You will need version 0.9.8k
7676 - ZLib source http://www.gzip.org/zlib/
7777 - tools collection http://tortoisesvn.tigris.org/files/documents/406/42347/Tools-1.5.zip
7878 - dictionaries/thesauri(\b Optional) http://lingucomponent.openoffice.org/
--- branches/1.6.x/ext/build/VC-32.pl (revision 16012)
+++ branches/1.6.x/ext/build/VC-32.pl (revision 16013)
@@ -163,7 +163,7 @@
163163 $ex_libs="unicows.lib $ex_libs";
164164 }
165165 # static library stuff
166-$mklib='lib';
166+$mklib='lib /nologo';
167167 $ranlib='';
168168 $plib="";
169169 $libp=".lib";
@@ -183,7 +183,7 @@
183183 $asm.=' /Zi' if $debug;
184184 $afile='/Fo';
185185 } else {
186- $asm='ml /Cp /coff /c /Cx';
186+ $asm='ml /nologo /Cp /coff /c /Cx';
187187 $asm.=" /Zi" if $debug;
188188 $afile='/Fo';
189189 }
@@ -404,7 +404,7 @@
404404 if ($standalone == 1)
405405 {
406406 $ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n\t";
407- $ret.= "$mwex advapi32.lib " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild);
407+ $ret.= "\$(EX_LIBS) " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild);
408408 $ret.="$files $libs\n<<\n";
409409 }
410410 elsif ($standalone == 2)
--- branches/1.6.x/src/Changelog.txt (revision 16012)
+++ branches/1.6.x/src/Changelog.txt (revision 16013)
@@ -4,6 +4,7 @@
44 commit dlg, use the bugtraq:logregex to extract the bug ID and fill
55 the bug ID field if possible and only use the bugtraq:message value
66 if the logregex doesn't return a bug ID. (Stefan)
7+- CHG: Updated to OpenSSL 0.9.8k (Stefan)
78 - BUG: Showing properties from the explorer svn properties tab did not work
89 if a language other than English was set. (Stefan)
910 - BUG: Crash in "cleanup". (Stefan)
Show on old repository browser