rpms/lwp/F-13 lwp-2.6-no-longjmp_chk.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 lwp.spec, 1.6, 1.7 sources, 1.3, 1.4 lwp-2.5-no-longjmp_chk.patch, 1.1, NONE
Adam Goode
agoode at fedoraproject.org
Tue May 18 19:31:13 UTC 2010
- Previous message: rpms/coda/devel coda.spec,1.20,1.21
- Next message: rpms/lwp/F-12 lwp-2.6-no-longjmp_chk.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 lwp.spec, 1.6, 1.7 sources, 1.3, 1.4 lwp-2.5-no-longjmp_chk.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: agoode
Update of /cvs/pkgs/rpms/lwp/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1757
Modified Files:
.cvsignore lwp.spec sources
Added Files:
lwp-2.6-no-longjmp_chk.patch
Removed Files:
lwp-2.5-no-longjmp_chk.patch
Log Message:
* Thu Apr 1 2010 Adam Goode <adam at spicenitz.org> - 2.6-1
- New upstream release
+ Fix fortify failure whenever a new thread is started (not really)
+ ARM thumb2 assembly fix
- Update longjmp patch, upstream is not quite right yet
lwp-2.6-no-longjmp_chk.patch:
lwp_ucontext.c | 3 ---
lwp_ucontext.h | 10 ++++++++++
2 files changed, 10 insertions(+), 3 deletions(-)
--- NEW FILE lwp-2.6-no-longjmp_chk.patch ---
diff -ur lwp-2.6~/src/lwp_ucontext.c lwp-2.6/src/lwp_ucontext.c
--- lwp-2.6~/src/lwp_ucontext.c 2010-03-17 16:32:51.000000000 -0400
+++ lwp-2.6/src/lwp_ucontext.c 2010-04-01 11:38:55.495718223 -0400
@@ -21,9 +21,6 @@
#include <string.h>
#include <unistd.h>
-/* avoid breaking longjmp stack switching */
-#undef _FORTIFY_SOURCE
-#define _FORTIFY_SOURCE 0
#include "lwp_ucontext.h"
/* Some architectures have a stack that grows up instead of down */
diff -ur lwp-2.6~/src/lwp_ucontext.h lwp-2.6/src/lwp_ucontext.h
--- lwp-2.6~/src/lwp_ucontext.h 2008-12-09 15:13:12.000000000 -0500
+++ lwp-2.6/src/lwp_ucontext.h 2010-04-01 11:38:36.160841037 -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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lwp/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 27 Feb 2009 16:44:25 -0000 1.3
+++ .cvsignore 18 May 2010 19:31:13 -0000 1.4
@@ -1 +1 @@
-lwp-2.5.tar.gz
+lwp-2.6.tar.gz
Index: lwp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lwp/F-13/lwp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lwp.spec 20 Aug 2009 17:04:42 -0000 1.6
+++ lwp.spec 18 May 2010 19:31:13 -0000 1.7
@@ -1,14 +1,12 @@
Name: lwp
-Version: 2.5
-Release: 3%{?dist}
+Version: 2.6
+Release: 1%{?dist}
Summary: C library for user-mode threading
Group: System Environment/Libraries
License: LGPLv2
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
+Patch0: lwp-2.6-no-longjmp_chk.patch
%description
The LWP userspace threads library. The LWP threads library is used by the Coda
@@ -28,7 +26,7 @@ developing applications that use %{name}
%prep
%setup -q
-%patch0 -p1 -b .no-longjmp_chk
+%patch -P 0 -p1
%build
@@ -37,7 +35,6 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -60,6 +57,7 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING NEWS README
%{_libdir}/*.so.*
+
%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}
@@ -68,6 +66,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Apr 1 2010 Adam Goode <adam at spicenitz.org> - 2.6-1
+- New upstream release
+ + Fix fortify failure whenever a new thread is started (not really)
+ + ARM thumb2 assembly fix
+- Update longjmp patch, upstream is not quite right yet
+
* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lwp/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 27 Feb 2009 16:44:25 -0000 1.3
+++ sources 18 May 2010 19:31:13 -0000 1.4
@@ -1 +1 @@
-4cd784683bd672973897c22eab790038 lwp-2.5.tar.gz
+65ba6faddf2c9741d4a481b0e9661a34 lwp-2.6.tar.gz
--- lwp-2.5-no-longjmp_chk.patch DELETED ---
- Previous message: rpms/coda/devel coda.spec,1.20,1.21
- Next message: rpms/lwp/F-12 lwp-2.6-no-longjmp_chk.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 lwp.spec, 1.6, 1.7 sources, 1.3, 1.4 lwp-2.5-no-longjmp_chk.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list