- Add check to specfile

- Patch around lwp's creative use of longjmp that fails with fortify
This commit is contained in:
Adam Goode 2009-08-20 17:04:42 +00:00
parent 7910f649f0
commit 74492d2549
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,21 @@
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"

View File

@ -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.edu/
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 INSTALL="install -p"
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@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@lists.fedoraproject.org> - 2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild