rpms/lwp/devel lwp-2.5-no-longjmp_chk.patch, NONE, 1.1 lwp.spec, 1.5, 1.6

[Adam Goode]

Author: agoode

Update of /cvs/extras/rpms/lwp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31474

Modified Files:
	lwp.spec 
Added Files:
	lwp-2.5-no-longjmp_chk.patch 
Log Message:
* Thu Aug 20 2009 Adam Goode <adam at spicenitz.org> - 2.5-3
- Add check to specfile
- Patch around lwp's creative use of longjmp that fails with fortify


lwp-2.5-no-longjmp_chk.patch:
 lwp_ucontext.h |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE lwp-2.5-no-longjmp_chk.patch ---
diff -ur lwp-2.5/src/lwp_ucontext.h lwp-2.5-new/src/lwp_ucontext.h
--- lwp-2.5/src/lwp_ucontext.h	2008-12-09 15:13:12.000000000 -0500
+++ lwp-2.5-new/src/lwp_ucontext.h	2009-08-20 12:58:41.333733985 -0400
@@ -21,7 +21,17 @@
 #include <config.h>
 #endif
 
+/* work around longjmp_chk */
+#ifdef __USE_FORTIFY_LEVEL
+#define LWP_SAVE_USE_FORTIFY_LEVEL __USE_FORTIFY_LEVEL
+#undef __USE_FORTIFY_LEVEL
 #include <setjmp.h>
+#define __USE_FORTIFY_LEVEL LWP_SAVE_USE_FORTIFY_LEVEL
+#undef LWP_SAVE_USE_FORTIFY_LEVEL
+#else
+#include <setjmp.h>
+#endif
+
 #include <signal.h>
 #include "lwp_stacktrace.h"
 


Index: lwp.spec
===================================================================
RCS file: /cvs/extras/rpms/lwp/devel/lwp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lwp.spec	25 Jul 2009 11:29:38 -0000	1.5
+++ lwp.spec	20 Aug 2009 17:04:42 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           lwp
 Version:        2.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C library for user-mode threading
 Group:          System Environment/Libraries
 License:        LGPLv2
@@ -8,6 +8,8 @@ URL:            http://www.coda.cs.cmu.e
 Source0:        ftp://ftp.coda.cs.cmu.edu/pub/coda/src/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         lwp-2.5-no-longjmp_chk.patch
+
 %description
 The LWP userspace threads library. The LWP threads library is used by the Coda
 distributed filesystem, RVM (a persistent VM library), and RPC2/SFTP (remote
@@ -26,6 +28,7 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-longjmp_chk
 
 
 %build
@@ -39,6 +42,10 @@ make install DESTDIR=$RPM_BUILD_ROOT INS
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
+%check
+./src/testlwp 2
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -61,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Adam Goode <adam at spicenitz.org> - 2.5-3
+- Add check to specfile
+- Patch around lwp's creative use of longjmp that fails with fortify
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild