From 2c704cf1f86315af64342b216a1ae5a7a54b92311a0f70ff04b1e46c55a89d8e Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 28 Jan 2010 12:06:21 +0000 Subject: [PATCH 1/3] Accepting request 30222 from Base:build Copy from Base:build/tcl via accept of submit request 30222 revision 4. Request was accepted with message: Thanks. OBS-URL: https://build.opensuse.org/request/show/30222 OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tcl?expand=0&rev=30 --- tcl-fortify.patch | 11 +++++++++++ tcl.changes | 5 +++++ tcl.spec | 2 ++ 3 files changed, 18 insertions(+) create mode 100644 tcl-fortify.patch diff --git a/tcl-fortify.patch b/tcl-fortify.patch new file mode 100644 index 0000000..e57fca6 --- /dev/null +++ b/tcl-fortify.patch @@ -0,0 +1,11 @@ +--- generic/tclTrace.c.orig 2010-01-21 12:38:47.000000000 +0100 ++++ generic/tclTrace.c 2010-01-21 12:55:05.000000000 +0100 +@@ -909,7 +909,7 @@ + } + ctvarPtr->traceCmdInfo.length = length; + flags |= TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT; +- strcpy(ctvarPtr->traceCmdInfo.command, command); ++ memcpy(ctvarPtr->traceCmdInfo.command, command, length + 1); + ctvarPtr->traceInfo.traceProc = TraceVarProc; + ctvarPtr->traceInfo.clientData = (ClientData) + &ctvarPtr->traceCmdInfo; diff --git a/tcl.changes b/tcl.changes index a74a83f..a30c856 100644 --- a/tcl.changes +++ b/tcl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 21 12:55:33 CET 2010 - rguenther@suse.de + +- Fix fortify violation in TraceVariableObjCmd. + ------------------------------------------------------------------- Wed Nov 18 16:18:20 CET 2009 - max@suse.de diff --git a/tcl.spec b/tcl.spec index 4be5922..3d72082 100644 --- a/tcl.spec +++ b/tcl.spec @@ -41,6 +41,7 @@ Source2: baselibs.conf Source3: macros.tcl Patch0: tcl.patch Patch1: tcl-unload.patch +Patch2: tcl-fortify.patch %description Tcl (Tool Command Language) is a very powerful but easy to learn @@ -88,6 +89,7 @@ Authors: %setup -q -n %name%version %patch0 %patch1 +%patch2 %build cd unix From 25f5e7431badcf8ed27a37f122366313c18a9607907985392e303d92413c5b2f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 29 Jan 2010 13:54:39 +0000 Subject: [PATCH 2/3] checked in (request 30690) OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tcl?expand=0&rev=31 --- tcl-fortify.patch | 11 ----------- tcl.changes | 5 ----- tcl.spec | 2 -- 3 files changed, 18 deletions(-) delete mode 100644 tcl-fortify.patch diff --git a/tcl-fortify.patch b/tcl-fortify.patch deleted file mode 100644 index e57fca6..0000000 --- a/tcl-fortify.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- generic/tclTrace.c.orig 2010-01-21 12:38:47.000000000 +0100 -+++ generic/tclTrace.c 2010-01-21 12:55:05.000000000 +0100 -@@ -909,7 +909,7 @@ - } - ctvarPtr->traceCmdInfo.length = length; - flags |= TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT; -- strcpy(ctvarPtr->traceCmdInfo.command, command); -+ memcpy(ctvarPtr->traceCmdInfo.command, command, length + 1); - ctvarPtr->traceInfo.traceProc = TraceVarProc; - ctvarPtr->traceInfo.clientData = (ClientData) - &ctvarPtr->traceCmdInfo; diff --git a/tcl.changes b/tcl.changes index a30c856..a74a83f 100644 --- a/tcl.changes +++ b/tcl.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Jan 21 12:55:33 CET 2010 - rguenther@suse.de - -- Fix fortify violation in TraceVariableObjCmd. - ------------------------------------------------------------------- Wed Nov 18 16:18:20 CET 2009 - max@suse.de diff --git a/tcl.spec b/tcl.spec index 3d72082..4be5922 100644 --- a/tcl.spec +++ b/tcl.spec @@ -41,7 +41,6 @@ Source2: baselibs.conf Source3: macros.tcl Patch0: tcl.patch Patch1: tcl-unload.patch -Patch2: tcl-fortify.patch %description Tcl (Tool Command Language) is a very powerful but easy to learn @@ -89,7 +88,6 @@ Authors: %setup -q -n %name%version %patch0 %patch1 -%patch2 %build cd unix From bb1efeda28809ddc422bcda95ab650c2868402586db5c5c9e7d1f69ae1ce2bd3 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 29 Jan 2010 13:54:40 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/tcl revision 19.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tcl?expand=0&rev=b3d7566b877dade88f3854eafb6ae28b --- tcl-fortify.patch | 11 +++++++++++ tcl.changes | 5 +++++ tcl.spec | 10 ++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 tcl-fortify.patch diff --git a/tcl-fortify.patch b/tcl-fortify.patch new file mode 100644 index 0000000..e57fca6 --- /dev/null +++ b/tcl-fortify.patch @@ -0,0 +1,11 @@ +--- generic/tclTrace.c.orig 2010-01-21 12:38:47.000000000 +0100 ++++ generic/tclTrace.c 2010-01-21 12:55:05.000000000 +0100 +@@ -909,7 +909,7 @@ + } + ctvarPtr->traceCmdInfo.length = length; + flags |= TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT; +- strcpy(ctvarPtr->traceCmdInfo.command, command); ++ memcpy(ctvarPtr->traceCmdInfo.command, command, length + 1); + ctvarPtr->traceInfo.traceProc = TraceVarProc; + ctvarPtr->traceInfo.clientData = (ClientData) + &ctvarPtr->traceCmdInfo; diff --git a/tcl.changes b/tcl.changes index a74a83f..a30c856 100644 --- a/tcl.changes +++ b/tcl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 21 12:55:33 CET 2010 - rguenther@suse.de + +- Fix fortify violation in TraceVariableObjCmd. + ------------------------------------------------------------------- Wed Nov 18 16:18:20 CET 2009 - max@suse.de diff --git a/tcl.spec b/tcl.spec index 4be5922..e92e755 100644 --- a/tcl.spec +++ b/tcl.spec @@ -1,7 +1,7 @@ # # spec file for package tcl (Version 8.5.8) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,11 +21,11 @@ Name: tcl Url: http://www.tcl.tk Version: 8.5.8 -Release: 1 +Release: 2 %define TCL_MINOR %(echo %version | cut -c1-3) BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: The Tcl Programming Language -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Group: Development/Languages/Tcl AutoReqProv: on # bug437293 @@ -41,6 +41,7 @@ Source2: baselibs.conf Source3: macros.tcl Patch0: tcl.patch Patch1: tcl-unload.patch +Patch2: tcl-fortify.patch %description Tcl (Tool Command Language) is a very powerful but easy to learn @@ -61,7 +62,7 @@ Authors: %package devel Group: Development/Libraries/Tcl -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Summary: Header Files and C API Documentation for Tcl Requires: tcl = %version # bug437293 @@ -88,6 +89,7 @@ Authors: %setup -q -n %name%version %patch0 %patch1 +%patch2 %build cd unix