r5544 - in glibc-package/branches/eglibc-2.17/debian: . patches/hurd-i386
Author: adconrad
Date: 2013-05-07 07:47:54 +0000 (Tue, 07 May 2013)
New Revision: 5544
Removed:
glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/unsubmitted-subhurd.diff
Modified:
glibc-package/branches/eglibc-2.17/debian/changelog
glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/libpthread_cancellation.diff
Log:
Drop hurd-i386/unsubmitted-subhurd.diff, the same fix is in hurd-i386/tg-bigmem.diff, and fix fuzz in hurd-i386/libpthread_cancellation.diff
Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-05-07 07:25:31 UTC (rev 5543)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-05-07 07:47:54 UTC (rev 5544)
@@ -1,4 +1,4 @@
-eglibc (2.17-0experimental3) UNRELEASED; urgency=low
+eglibc (2.17-1) unstable; urgency=low
[ Samuel Thibault ]
* Rename several hurd-i386 patches to reflect upstream submission status:
@@ -9,7 +9,6 @@
- patches/hurd-i386/unsubmitted-setitimer_fix.diff into
patches/hurd-i386/tg-setitimer.diff.
* patches/hurd-i386/tg-ifaddrs_v6.diff: New, fixes IPv6 in getifaddrs.
- * patches/hurd-i386/unsubmitted-subhurd.diff: New, fixes sub-hurd boot.
* patches/hurd-i386/tg-remap_getcwd.diff: New patch, fixes remap translator.
* patches/hurd-i386/tg-nice.diff: New patch, fixes nice level granularity.
* patches/hurd-i386/tg-tls.diff: Update to tg version.
Modified: glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/libpthread_cancellation.diff
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/libpthread_cancellation.diff 2013-05-07 07:25:31 UTC (rev 5543)
+++ glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/libpthread_cancellation.diff 2013-05-07 07:47:54 UTC (rev 5544)
@@ -308,7 +308,7 @@
+__pthread_cond_signal (pthread_cond_t *cond)
{
struct __pthread *wakeup;
-
+
@@ -33,24 +35,9 @@ cond_signal (struct __pthread_cond *cond, int *unblocked)
__pthread_spin_unlock (&cond->__lock);
@@ -874,7 +874,7 @@
@@ -31,8 +31,8 @@ __pthread_wakeup (struct __pthread *thread)
{
error_t err;
-
+
- err = __mach_msg (&thread->wakeupmsg, MACH_SEND_MSG,
+ err = __mach_msg (&thread->wakeupmsg, MACH_SEND_MSG | MACH_SEND_TIMEOUT,
sizeof (thread->wakeupmsg), 0, MACH_PORT_NULL,
Deleted: glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/unsubmitted-subhurd.diff
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/unsubmitted-subhurd.diff 2013-05-07 07:25:31 UTC (rev 5543)
+++ glibc-package/branches/eglibc-2.17/debian/patches/hurd-i386/unsubmitted-subhurd.diff 2013-05-07 07:47:54 UTC (rev 5544)
@@ -1,29 +0,0 @@
-The fmh function could in some cases mistakenly call vm_map with a null
-size. A recent kernel fix made that invalid and return KERN_INVALID_ARGUMENT,
-which isn't an expected code here, resulting in the linker not starting.
-Avoid calling vm_map when the computed mapping size is null to fix the
-problem.
-
-* sysdeps/mach/hurd/dl-sysdep.c (fmh): Leave loop when the computed mapping
-size fmhs becomes null.
----
- sysdeps/mach/hurd/dl-sysdep.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
-index 67391d4..83f5bac 100644
---- a/sysdeps/mach/hurd/dl-sysdep.c
-+++ b/sysdeps/mach/hurd/dl-sysdep.c
-@@ -111,6 +111,8 @@ static void fmh(void) {
- else
- while (1) {
- fmhs=max-fmha;
-+ if (fmhs == 0)
-+ break;
- err = __vm_map (__mach_task_self (),
- &fmha, fmhs, 0, 0, MACH_PORT_NULL, 0, 1,
- VM_PROT_NONE, VM_PROT_NONE, VM_INHERIT_COPY);
---
-1.7.10.4
-
-
Reply to: