[mingw-tcl: 12/25] update to 8.5.8

[Kalev Lember]

commit 1cdea2af70bec6e1696a5d9a3b6ce5b701a24d34
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Thu Aug 5 11:25:03 2010 +0200

    update to 8.5.8

 .gitignore               |    1 +
 mingw32-tcl.spec         |   17 +++++++++++------
 sources                  |    2 +-
 tcl-8.5.1-autopath.patch |    4 ++--
 tcl-8.5.7-sigabrt.patch  |   13 +++++++++++++
 5 files changed, 28 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 62232c7..0380310 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 tcl8.5.7-src.tar.gz
+tcl8.5.8-src.tar.gz
diff --git a/mingw32-tcl.spec b/mingw32-tcl.spec
index e3aa5f5..66d81c0 100644
--- a/mingw32-tcl.spec
+++ b/mingw32-tcl.spec
@@ -8,14 +8,14 @@
 %global majorver1 8
 %global majorver2 5
 %global majorver %{majorver1}.%{majorver2}
-%global	vers %{majorver}.7
+%global	vers %{majorver}.8
 
 %global name1 tcl
 
 Summary: MinGW Windows Tool Command Language, pronounced tickle
 Name: mingw32-%{name1}
 Version: %{vers}
-Release: 7%{?dist}
+Release: 1%{?dist}
 License: TCL
 Group: Development/Languages
 URL: http://tcl.sourceforge.net/
@@ -36,8 +36,9 @@ BuildRequires: mingw32-w32api
 Patch0: tcl-8.5.1-autopath.patch
 Patch1: tcl-8.5.0-conf.patch
 Patch2: tcl-8.5.0-hidden.patch
-Patch3: tcl-8.5.6-mingw32.patch
-Patch4: tcl-nativetclsh.patch
+Patch3: tcl-8.5.7-sigabrt.patch
+Patch4: tcl-8.5.6-mingw32.patch
+Patch5: tcl-nativetclsh.patch
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
@@ -59,8 +60,9 @@ chmod -x generic/tclThreadAlloc.c
 %patch0 -p1 -b .autopath
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .hidden
-%patch3 -p0 -b .mingw32
-%patch4 -p0 -b .nativetclsh
+%patch3 -p1 -b .sigabrt
+%patch4 -p0 -b .mingw32
+%patch5 -p0 -b .nativetclsh
 
 %build
 pushd win
@@ -128,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc license.terms
 
 %changelog
+* Thu Aug  5 2010 Thomas Sailer <t.sailer at alumni.ethz.ch> - 8.5.8-1
+- update to 8.5.8
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.5.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 0da1bfd..470e796 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f70ad8f78b5e4a9f792fe101f22b125f  tcl8.5.7-src.tar.gz
+7f123e53b3daaaba2478d3af5a0752e3  tcl8.5.8-src.tar.gz
diff --git a/tcl-8.5.1-autopath.patch b/tcl-8.5.1-autopath.patch
index 063b03b..87317d3 100644
--- a/tcl-8.5.1-autopath.patch
+++ b/tcl-8.5.1-autopath.patch
@@ -44,10 +44,10 @@ diff -up tcl8.5.7/unix/configure.in.old tcl8.5.7/unix/configure.in
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
  elif test "$prefix/lib" != "$libdir"; then
 -    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
-+    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
  else
 -    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
-+    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
  fi
  
  #--------------------------------------------------------------------
diff --git a/tcl-8.5.7-sigabrt.patch b/tcl-8.5.7-sigabrt.patch
new file mode 100644
index 0000000..6e1c4d1
--- /dev/null
+++ b/tcl-8.5.7-sigabrt.patch
@@ -0,0 +1,13 @@
+diff -ruNp tcl8.5.7/generic/tclTrace.c tcl8.5.7-master/generic/tclTrace.c
+--- tcl8.5.7/generic/tclTrace.c	2008-10-08 16:52:39.000000000 +0200
++++ tcl8.5.7-master/generic/tclTrace.c	2009-08-06 09:43:03.000000000 +0200
+@@ -909,7 +909,8 @@ TraceVariableObjCmd(
+ 	    }
+ 	    ctvarPtr->traceCmdInfo.length = length;
+ 	    flags |= TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT;
+-	    strcpy(ctvarPtr->traceCmdInfo.command, command);
++	    //strcpy(ctvarPtr->traceCmdInfo.command, command);
++        memcpy(ctvarPtr->traceCmdInfo.command, command, length + 1);
+ 	    ctvarPtr->traceInfo.traceProc = TraceVarProc;
+ 	    ctvarPtr->traceInfo.clientData = (ClientData)
+ 		    &ctvarPtr->traceCmdInfo;