From 0c007d188ce734cba5961b6f0f0796274efcef48 Mon Sep 17 00:00:00 2001
From: Nikola Pajkovsky <npajkovs@fedoraproject.org>
Date: Mon, 10 Aug 2009 10:30:46 +0000
Subject: [PATCH] Enable SELinix policy for libtcl and fix sigabort bug

---
 tcl-8.5.7-sigabrt.patch | 13 +++++++++++++
 tcl.spec                | 18 ++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 tcl-8.5.7-sigabrt.patch

diff --git a/tcl-8.5.7-sigabrt.patch b/tcl-8.5.7-sigabrt.patch
new file mode 100644
index 0000000..a1d46cd
--- /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 );
+ 	    ctvarPtr->traceInfo.traceProc = TraceVarProc;
+ 	    ctvarPtr->traceInfo.clientData = (ClientData)
+ 		    &ctvarPtr->traceCmdInfo;
diff --git a/tcl.spec b/tcl.spec
index 797901e..d5e5f25 100644
--- a/tcl.spec
+++ b/tcl.spec
@@ -5,7 +5,7 @@
 Summary: Tool Command Language, pronounced tickle
 Name: tcl
 Version: %{vers}
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: TCL
 Group: Development/Languages
@@ -19,7 +19,7 @@ Provides: tcl-tcldict = %{vers}
 Patch0: tcl-8.5.1-autopath.patch
 Patch1: tcl-8.5.0-conf.patch
 Patch2: tcl-8.5.0-hidden.patch
-Patch3: pic.patch
+Patch3: tcl-8.5.7-sigabrt.patch
 
 %if %sdt
 BuildRequires: systemtap-sdt-devel
@@ -57,7 +57,7 @@ chmod -x generic/tclThreadAlloc.c
 %patch0 -p1 -b .autopath
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .hidden
-%patch3 -p1 -b .next_pic
+%patch3 -p1 -b .sigabrt
 
 %build
 pushd unix
@@ -67,7 +67,8 @@ autoconf
 --enable-dtrace \
 %endif
 --disable-threads \
---enable-symbols
+--enable-symbols \
+--enable-shared
 
 make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
@@ -111,10 +112,7 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/ldAix
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-#SELinux policy reloc problem with libtcl8.5.so
-chcon -t textrel_shlib_t $RPM_BUILD_ROOT%{_libdir}/lib%{name}%{majorver}.so
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
@@ -140,6 +138,10 @@ chcon -t textrel_shlib_t $RPM_BUILD_ROOT%{_libdir}/lib%{name}%{majorver}.so
 %{_libdir}/%{name}8.5/%{name}Config.sh
 
 %changelog
+* Mon Aug 10 2009 Nikola Pajkovsky <npajkovs@redhat.com> - 1:8.5.7-4
+- Enable SEPolicy for libtcl. 
+- fix sigabort
+
 * Tue Jul 28 2009 Nikola Pajkovsky <npajkovs@redhat.com> - 1:8.5.7-3
 - 513997 fixed. SELinux policy problem with libtcl8.5.so