- Fix prototype of sigsetjmp in pthread.h (#857236).

This commit is contained in:
Jeff Law 2012-09-14 11:34:29 -06:00
parent 8943ff055d
commit 4be2fd778c
2 changed files with 20 additions and 1 deletions

12
glibc-rh857236.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Nrup a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h
--- a/nptl/sysdeps/pthread/pthread.h 2012-06-30 13:12:34.000000000 -0600
+++ b/nptl/sysdeps/pthread/pthread.h 2012-09-14 06:37:42.165093926 -0600
@@ -731,7 +731,7 @@ extern void __pthread_unwind_next (__pth
/* Function used in the macros. */
struct __jmp_buf_tag;
-extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask) __THROW;
+extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask) __THROWNL;
/* Mutex handling. */

View File

@ -28,7 +28,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
Release: 56%{?dist}
Release: 57%{?dist}
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@ -216,6 +216,9 @@ Patch2065: %{name}-rh841787.patch
# Upstream BZ 14459
Patch2069: %{name}-rh847718.patch
# Upstream BZ 14583
Patch2070: %{name}-rh857236.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: glibc-profile < 2.4
Obsoletes: nss_db
@ -507,6 +510,7 @@ popd
%patch0067 -p1
%patch1068 -p1
%patch2069 -p1
%patch2070 -p1
# A lot of programs still misuse memcpy when they have to use
# memmove. The memcpy implementation below is not tolerant at
@ -1373,6 +1377,9 @@ rm -f *.filelist*
%endif
%changelog
* Fri Sep 14 2012 Jeff Law <law@redhat.com> - 2.15.57
- Fix prototype of sigsetjmp in pthread.h (#857236).
* Wed Aug 15 2012 Jeff Law <law@redhat.com> - 2.15.56
- Fix integer overflow leading to buffer overflow in strto* (#847718)