r5834 - glibc-package/branches/eglibc-2.18/debian/patches
Author: aurel32
Date: 2013-11-30 10:35:25 +0000 (Sat, 30 Nov 2013)
New Revision: 5834
Modified:
glibc-package/branches/eglibc-2.18/debian/patches/svn-updates.diff
Log:
Fix svn-updates.diff
Modified: glibc-package/branches/eglibc-2.18/debian/patches/svn-updates.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/svn-updates.diff 2013-11-30 10:07:00 UTC (rev 5833)
+++ glibc-package/branches/eglibc-2.18/debian/patches/svn-updates.diff 2013-11-30 10:35:25 UTC (rev 5834)
@@ -23,14 +23,14 @@
* po/zh_TW.po: Update Chinese (traditional) translation from
diff --git a/NEWS b/NEWS
-index f64fb82..df97235 100644
+index fb6069d..df97235 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.18.1
* The following bugs are resolved with this release:
-- 15909.
+- 15909, 15996.
+ 15909, 15996, 16150.
Version 2.18
@@ -44,59 +44,6 @@
* CVE-2013-2207 Incorrectly granting access to another user's pseudo-terminal
has been fixed by disabling the use of pt_chown (Bugzilla #15755).
-diff --git a/nptl/ChangeLog b/nptl/ChangeLog
-index eae5079..2d78490 100644
---- a/nptl/ChangeLog
-+++ b/nptl/ChangeLog
-@@ -1,3 +1,12 @@
-+2013-10-03 Siddhesh Poyarekar <siddhesh@redhat.com>
-+
-+ [BZ #15996]
-+ * pthread_cond_broadcast.c (__pthread_cond_broadcast)
-+ [lll_futex_cmp_requeue_pi && __ASSUME_REQUEUE_PI]: Use
-+ USE_REQUEUE_PI.
-+ * pthread_cond_signal.c (__pthread_cond_signal)
-+ [lll_futex_cmd_requeue_pi && __ASSUME_REQUEUE_PI]: Likewise.
-+
- 2013-07-23 David S. Miller <davem@davemloft.net>
-
- * tst-cancel4.c (WRITE_BUFFER_SIZE): Adjust comment.
-diff --git a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c
-index 0702ec0..7ba9efa 100644
---- a/nptl/pthread_cond_broadcast.c
-+++ b/nptl/pthread_cond_broadcast.c
-@@ -63,10 +63,7 @@ __pthread_cond_broadcast (cond)
-
- #if (defined lll_futex_cmp_requeue_pi \
- && defined __ASSUME_REQUEUE_PI)
-- int pi_flag = PTHREAD_MUTEX_PRIO_INHERIT_NP | PTHREAD_MUTEX_ROBUST_NP;
-- pi_flag &= mut->__data.__kind;
--
-- if (pi_flag == PTHREAD_MUTEX_PRIO_INHERIT_NP)
-+ if (USE_REQUEUE_PI (mut))
- {
- if (lll_futex_cmp_requeue_pi (&cond->__data.__futex, 1, INT_MAX,
- &mut->__data.__lock, futex_val,
-diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c
-index 102d0b3..ffc35dc 100644
---- a/nptl/pthread_cond_signal.c
-+++ b/nptl/pthread_cond_signal.c
-@@ -49,14 +49,9 @@ __pthread_cond_signal (cond)
-
- #if (defined lll_futex_cmp_requeue_pi \
- && defined __ASSUME_REQUEUE_PI)
-- int pi_flag = PTHREAD_MUTEX_PRIO_INHERIT_NP | PTHREAD_MUTEX_ROBUST_NP;
- pthread_mutex_t *mut = cond->__data.__mutex;
-
-- /* Do not use requeue for pshared condvars. */
-- if (mut != (void *) ~0l)
-- pi_flag &= mut->__data.__kind;
--
-- if (__builtin_expect (pi_flag == PTHREAD_MUTEX_PRIO_INHERIT_NP, 0)
-+ if (USE_REQUEUE_PI (mut)
- /* This can only really fail with a ENOSYS, since nobody can modify
- futex while we have the cond_lock. */
- && lll_futex_cmp_requeue_pi (&cond->__data.__futex, 1, 0,
diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 4a4db09..0fc0a4b 100644
--- a/ports/ChangeLog.alpha
Reply to: