r3709 - in glibc-package/branches/multiarch/debian: . control.in patches patches/any
Author: aurel32
Date: 2009-07-27 13:52:15 +0000 (Mon, 27 Jul 2009)
New Revision: 3709
Modified:
glibc-package/branches/multiarch/debian/changelog
glibc-package/branches/multiarch/debian/control
glibc-package/branches/multiarch/debian/control.in/i386
glibc-package/branches/multiarch/debian/patches/any/cvs-broken-dns.diff
glibc-package/branches/multiarch/debian/patches/any/submitted-signalfd-eventfd.diff
glibc-package/branches/multiarch/debian/patches/series
Log:
multiarch: update from trunk
Modified: glibc-package/branches/multiarch/debian/changelog
===================================================================
--- glibc-package/branches/multiarch/debian/changelog 2009-07-27 13:38:04 UTC (rev 3708)
+++ glibc-package/branches/multiarch/debian/changelog 2009-07-27 13:52:15 UTC (rev 3709)
@@ -1,11 +1,11 @@
-eglibc (2.9-23~multiarch) experimental; urgency=low
+eglibc (2.9-23+multiarch) experimental; urgency=low
* Split out libc-bin from libc6 and libc-dev-bin from libc6-dev.
Closes: #330735.
-- Aurelien Jarno <aurel32@debian.org> Mon, 27 Jul 2009 01:10:35 +0200
-eglibc (2.9-23) UNRELEASED; urgency=low
+eglibc (2.9-23) unstable; urgency=low
* debhelper.in/libc.postinst, sysdeps/depflags.pl: remove upgrade code
for pre-etch installations.
@@ -21,8 +21,18 @@
* Move all upstream changelogs in glibc-docs, and install a small
changelog file explaining the reason.
* Ship README.libm in libc6-dev.
+ * Update any/cvs-broken-dns.diff from upstream.
+ * any/cvs-pthread_mutex_lock.diff: new patch from upstream to fix
+ a memory ordering problem in pthread_mutex_{,timed}lock.
+ * Replace any/submitted-signalfd-eventfd.diff by upstream version
+ any/cvs-signalfd-eventfd.diff.
+ * alpha/submitted-asm-memchr.diff: new patch to fix broken prefetching
+ in memchr() on alpha.
+ * control.in/i386: replace the Pre-Depends by a Conflicts. Closes:
+ #538807. Update the breaks version of the packages not yet
+ transitioned.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 26 Jul 2009 19:17:08 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 27 Jul 2009 15:37:54 +0200
eglibc (2.9-22) unstable; urgency=low
Modified: glibc-package/branches/multiarch/debian/control
===================================================================
--- glibc-package/branches/multiarch/debian/control 2009-07-27 13:38:04 UTC (rev 3708)
+++ glibc-package/branches/multiarch/debian/control 2009-07-27 13:52:15 UTC (rev 3709)
@@ -376,7 +376,7 @@
Priority: optional
Depends: libc6 (= ${binary:Version})
Replaces: libc6-dev-i386
-Breaks: fakeroot (<= 1.12.2), gnu-efi (<= 3.0e-2), fakechroot (<= 2.9-1), fglrx-glx-ia32 (<= 1:9-5-1), ia32-libs (<= 2.7), ia32-libs-gtk (<= 2.7), lib32asound2 (<= 1.0.20-2), lib32asound2-dev (<= 1.0.20-2), lib32bz2-1.0 (<= 1.0.5-2), lib32bz2-dev (<= 1.0.5-2), lib32ffi-dev (<= 3.0.7-1), lib32ffi5 (<= 3.0.7-1), lib32g2c0 (<= 1:3.4.6-9), lib32gcc1 (<= 1:4.4.0-6), lib32gfortran3 (<= 4.4.0-6), lib32gmp3 (<= 2:4.3.1+dfsg-1), lib32gmp3-dev (<= 2:4.3.1+dfsg-1), lib32gmpxx4 (<= 2:4.3.1+dfsg-1), lib32gomp1 (<= 4.4.0-6), lib32icu-dev (<= 4.0.1-2), lib32icu38 (<= 4.0.1-2), lib32icu40 (<= 4.0.1-2), lib32mudflap0 (<= 4.4.0-6), lib32ncurses5 (<= 5.7+20090523-1), lib32ncurses5-dev (<= 5.7+20090523-1), lib32ncursesw5 (<= 5.7+20090523-1), lib32ncursesw5-dev (<= 5.7+20090523-1), lib32nss-mdns (<= 0.10-3), lib32objc2 (<= 4.4.0-6), lib32readline5 (<= 5.2-4), lib32readline5-dev (<= 5.2-4), lib32stdc++6 (<= 4.4.0-6), lib32stdc++6-4.4-dbg (<= 4.4.0-6), lib32z1 (<= 1:1.2.3.3.dfsg-13), lib32z1-dev (
<= 1:1.2.3.3.dfsg-13), libc6-dev-i386 (<= 2.9-14), nvidia-glx-ia32 (<= 185.18.14-1), nvidia-libvdpau-ia32 (<= 185.18.14-1)
+Breaks: fakeroot (<= 1.12.2), gnu-efi (<= 3.0e-2), fakechroot (<= 2.9-1), fglrx-glx-ia32 (<= 1:9-5-1), ia32-libs (<= 2.7), ia32-libs-gtk (<= 2.7), lib32asound2 (<= 1.0.20-2), lib32asound2-dev (<= 1.0.20-2), lib32bz2-1.0 (<= 1.0.5-2), lib32bz2-dev (<= 1.0.5-2), lib32ffi-dev (<= 3.0.7-1), lib32ffi5 (<= 3.0.7-1), lib32g2c0 (<= 1:3.4.6-9), lib32gcc1 (<= 1:4.4.0-6), lib32gfortran3 (<= 4.4.0-6), lib32gmp3 (<= 2:4.3.1+dfsg-2), lib32gmp3-dev (<= 2:4.3.1+dfsg-2), lib32gmpxx4 (<= 2:4.3.1+dfsg-2), lib32gomp1 (<= 4.4.0-6), lib32icu-dev (<= 4.0.1-2), lib32icu38 (<= 4.0.1-2), lib32icu40 (<= 4.0.1-2), lib32mudflap0 (<= 4.4.0-6), lib32ncurses5 (<= 5.7+20090523-1), lib32ncurses5-dev (<= 5.7+20090523-1), lib32ncursesw5 (<= 5.7+20090523-1), lib32ncursesw5-dev (<= 5.7+20090523-1), lib32nss-mdns (<= 0.10-3), lib32objc2 (<= 4.4.0-6), lib32readline5 (<= 5.2-4), lib32readline5-dev (<= 5.2-4), lib32stdc++6 (<= 4.4.0-6), lib32stdc++6-4.4-dbg (<= 4.4.0-6), lib32z1 (<= 1:1.2.3.3.dfsg-13), lib32z1-dev (
<= 1:1.2.3.3.dfsg-13), libc6-dev-i386 (<= 2.9-14), nvidia-glx-ia32 (<= 185.18.14-1), nvidia-libvdpau1-ia32 (<= 185.18.14-1)
Description: GNU C Library: 32-bit shared libraries for AMD64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -387,7 +387,7 @@
Section: libdevel
Priority: optional
Provides: lib32c-dev
-Pre-Depends: libc6-i386 (>= 2.9-21)
+Conflicts: libc6-i386 (<= 2.9-18)
Depends: libc6-i386 (= ${binary:Version}), libc6-dev (= ${binary:Version})
Recommends: gcc-multilib
Description: GNU C Library: 32-bit development libraries for AMD64
Modified: glibc-package/branches/multiarch/debian/control.in/i386
===================================================================
--- glibc-package/branches/multiarch/debian/control.in/i386 2009-07-27 13:38:04 UTC (rev 3708)
+++ glibc-package/branches/multiarch/debian/control.in/i386 2009-07-27 13:52:15 UTC (rev 3709)
@@ -4,7 +4,7 @@
Priority: optional
Depends: libc6 (= ${binary:Version})
Replaces: libc6-dev-i386
-Breaks: fakeroot (<= 1.12.2), gnu-efi (<= 3.0e-2), fakechroot (<= 2.9-1), fglrx-glx-ia32 (<= 1:9-5-1), ia32-libs (<= 2.7), ia32-libs-gtk (<= 2.7), lib32asound2 (<= 1.0.20-2), lib32asound2-dev (<= 1.0.20-2), lib32bz2-1.0 (<= 1.0.5-2), lib32bz2-dev (<= 1.0.5-2), lib32ffi-dev (<= 3.0.7-1), lib32ffi5 (<= 3.0.7-1), lib32g2c0 (<= 1:3.4.6-9), lib32gcc1 (<= 1:4.4.0-6), lib32gfortran3 (<= 4.4.0-6), lib32gmp3 (<= 2:4.3.1+dfsg-1), lib32gmp3-dev (<= 2:4.3.1+dfsg-1), lib32gmpxx4 (<= 2:4.3.1+dfsg-1), lib32gomp1 (<= 4.4.0-6), lib32icu-dev (<= 4.0.1-2), lib32icu38 (<= 4.0.1-2), lib32icu40 (<= 4.0.1-2), lib32mudflap0 (<= 4.4.0-6), lib32ncurses5 (<= 5.7+20090523-1), lib32ncurses5-dev (<= 5.7+20090523-1), lib32ncursesw5 (<= 5.7+20090523-1), lib32ncursesw5-dev (<= 5.7+20090523-1), lib32nss-mdns (<= 0.10-3), lib32objc2 (<= 4.4.0-6), lib32readline5 (<= 5.2-4), lib32readline5-dev (<= 5.2-4), lib32stdc++6 (<= 4.4.0-6), lib32stdc++6-4.4-dbg (<= 4.4.0-6), lib32z1 (<= 1:1.2.3.3.dfsg-13), lib32z1-dev (
<= 1:1.2.3.3.dfsg-13), libc6-dev-i386 (<= 2.9-14), nvidia-glx-ia32 (<= 185.18.14-1), nvidia-libvdpau-ia32 (<= 185.18.14-1)
+Breaks: fakeroot (<= 1.12.2), gnu-efi (<= 3.0e-2), fakechroot (<= 2.9-1), fglrx-glx-ia32 (<= 1:9-5-1), ia32-libs (<= 2.7), ia32-libs-gtk (<= 2.7), lib32asound2 (<= 1.0.20-2), lib32asound2-dev (<= 1.0.20-2), lib32bz2-1.0 (<= 1.0.5-2), lib32bz2-dev (<= 1.0.5-2), lib32ffi-dev (<= 3.0.7-1), lib32ffi5 (<= 3.0.7-1), lib32g2c0 (<= 1:3.4.6-9), lib32gcc1 (<= 1:4.4.0-6), lib32gfortran3 (<= 4.4.0-6), lib32gmp3 (<= 2:4.3.1+dfsg-2), lib32gmp3-dev (<= 2:4.3.1+dfsg-2), lib32gmpxx4 (<= 2:4.3.1+dfsg-2), lib32gomp1 (<= 4.4.0-6), lib32icu-dev (<= 4.0.1-2), lib32icu38 (<= 4.0.1-2), lib32icu40 (<= 4.0.1-2), lib32mudflap0 (<= 4.4.0-6), lib32ncurses5 (<= 5.7+20090523-1), lib32ncurses5-dev (<= 5.7+20090523-1), lib32ncursesw5 (<= 5.7+20090523-1), lib32ncursesw5-dev (<= 5.7+20090523-1), lib32nss-mdns (<= 0.10-3), lib32objc2 (<= 4.4.0-6), lib32readline5 (<= 5.2-4), lib32readline5-dev (<= 5.2-4), lib32stdc++6 (<= 4.4.0-6), lib32stdc++6-4.4-dbg (<= 4.4.0-6), lib32z1 (<= 1:1.2.3.3.dfsg-13), lib32z1-dev (
<= 1:1.2.3.3.dfsg-13), libc6-dev-i386 (<= 2.9-14), nvidia-glx-ia32 (<= 185.18.14-1), nvidia-libvdpau1-ia32 (<= 185.18.14-1)
Description: GNU C Library: 32-bit shared libraries for AMD64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -15,7 +15,7 @@
Section: libdevel
Priority: optional
Provides: lib32c-dev
-Pre-Depends: libc6-i386 (>= 2.9-21)
+Conflicts: libc6-i386 (<= 2.9-18)
Depends: libc6-i386 (= ${binary:Version}), libc6-dev (= ${binary:Version})
Recommends: gcc-multilib
Description: GNU C Library: 32-bit development libraries for AMD64
Modified: glibc-package/branches/multiarch/debian/patches/any/cvs-broken-dns.diff
===================================================================
--- glibc-package/branches/multiarch/debian/patches/any/cvs-broken-dns.diff 2009-07-27 13:38:04 UTC (rev 3708)
+++ glibc-package/branches/multiarch/debian/patches/any/cvs-broken-dns.diff 2009-07-27 13:52:15 UTC (rev 3709)
@@ -1,3 +1,9 @@
+2009-07-26 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #10452]
+ * resolv/res_send.c (send_dg): Pass full SERVFAIL, NOTIMP, REFUSED
+ replies up.
+
2009-06-26 Ulrich Drepper <drepper@redhat.com>
* resolv/resolv.h: Define RES_SNGLKUPREOP.
@@ -49,10 +55,10 @@
---
resolv/res_init.c | 6 ++
resolv/res_query.c | 7 +++
- resolv/res_send.c | 90 ++++++++++++++++++++++++++++++++++----------
+ resolv/res_send.c | 96 +++++++++++++++++++++++++++++++++-----------
resolv/resolv.h | 3 +
sysdeps/posix/getaddrinfo.c | 4 +
- 5 files changed, 91 insertions(+), 19 deletions(-)
+ 5 files changed, 92 insertions(+), 24 deletions(-)
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -178,7 +184,23 @@
pfd[0].events = POLLIN;
else
pfd[0].events = POLLIN | POLLOUT;
-@@ -1250,8 +1292,18 @@
+@@ -1200,14 +1242,10 @@
+ ? *thisanssiz : *thisresplen);
+
+ if (recvresp1 || (buf2 != NULL && recvresp2))
+- {
+- *resplen2 = 1;
+- return resplen;
+- }
++ return resplen;
+ if (buf2 != NULL)
+ {
+ /* We are waiting for a possible second reply. */
+- resplen = 1;
+ if (hp->id == anhp->id)
+ recvresp1 = 1;
+ else
+@@ -1250,8 +1288,18 @@
else
recvresp2 = 1;
/* Repeat waiting if we have a second answer to arrive. */
Modified: glibc-package/branches/multiarch/debian/patches/any/submitted-signalfd-eventfd.diff
===================================================================
--- glibc-package/branches/multiarch/debian/patches/any/submitted-signalfd-eventfd.diff 2009-07-27 13:38:04 UTC (rev 3708)
+++ glibc-package/branches/multiarch/debian/patches/any/submitted-signalfd-eventfd.diff 2009-07-27 13:52:15 UTC (rev 3709)
@@ -1,162 +0,0 @@
-2009-07-20 Aurelien Jarno <aurelien@aurel32.net>
-
- * sysdeps/unix/sysv/linux/kernel-features.h: Define
- __ASSUME_EVENTFD2 and __ASSUME_SIGNALFD4.
- * sysdeps/unix/sysv/linux/eventfd.c: Fall back to the old syscall
- in case the signalfd4 syscall is not available.
- * sysdeps/unix/sysv/linux/signalfd.c: Fall back to the old syscall
- in case the eventfd2 syscall is not available.
-
---- a/sysdeps/unix/sysv/linux/eventfd.c
-+++ b/sysdeps/unix/sysv/linux/eventfd.c
-@@ -19,14 +19,20 @@
- #include <errno.h>
- #include <sys/eventfd.h>
- #include <sysdep.h>
-+#include <kernel-features.h>
-
-
- int
- eventfd (int count, int flags)
- {
- #ifdef __NR_eventfd2
-- return INLINE_SYSCALL (eventfd2, 2, count, flags);
--#else
-+ int res = INLINE_SYSCALL (eventfd2, 2, count, flags);
-+# ifndef __ASSUME_EVENTFD2
-+ if (res != -1 || errno != ENOSYS)
-+# endif
-+ return res;
-+#endif
-+
- /* The old system call has no flag parameter which is bad. So we have
- to wait until we have to support to pass additional values to the
- kernel (sys_indirect) before implementing setting flags like
-@@ -37,11 +43,10 @@ eventfd (int count, int flags)
- return -1;
- }
-
--# ifdef __NR_eventfd
-+#ifdef __NR_eventfd
- return INLINE_SYSCALL (eventfd, 1, count);
--# else
-+#else
- __set_errno (ENOSYS);
- return -1;
--# endif
- #endif
- }
---- a/sysdeps/unix/sysv/linux/kernel-features.h
-+++ b/sysdeps/unix/sysv/linux/kernel-features.h
-@@ -529,3 +529,12 @@
- # define __ASSUME_PIPE2 1
- # define __ASSUME_PACCEPT 1
- #endif
-+
-+/* Support for the eventfd2 and signalfd4 syscalls was added in 2.6.27. */
-+#if __LINUX_KERNEL_VERSION >= 0x02061b \
-+ && (defined __i386__ || defined __x86_64__ || defined __ia64__ \
-+ || defined __powerpc__ || defined __s390__ || defined __sparc__ \
-+ || defined __sh__)
-+# define __ASSUME_EVENTFD2 1
-+# define __ASSUME_SIGNALFD4 1
-+#endif
---- a/sysdeps/unix/sysv/linux/signalfd.c
-+++ b/sysdeps/unix/sysv/linux/signalfd.c
-@@ -20,14 +20,20 @@
- #include <signal.h>
- #include <sys/signalfd.h>
- #include <sysdep.h>
-+#include <kernel-features.h>
-
-
- int
- signalfd (int fd, const sigset_t *mask, int flags)
- {
- #ifdef __NR_signalfd4
-- return INLINE_SYSCALL (signalfd4, 4, fd, mask, _NSIG / 8, flags);
--#else
-+ int res = INLINE_SYSCALL (signalfd4, 4, fd, mask, _NSIG / 8, flags);
-+# ifndef __ASSUME_SIGNALFD4
-+ if (res != -1 || errno != ENOSYS)
-+# endif
-+ return res;
-+#endif
-+
- /* The old system call has no flag parameter which is bad. So we have
- to wait until we have to support to pass additional values to the
- kernel (sys_indirect) before implementing setting flags like
-@@ -38,11 +44,10 @@ signalfd (int fd, const sigset_t *mask, int flags)
- return -1;
- }
-
--# ifdef __NR_signalfd
-+#ifdef __NR_signalfd
- return INLINE_SYSCALL (signalfd, 3, fd, mask, _NSIG / 8);
--# else
-+#else
- __set_errno (ENOSYS);
- return -1;
--# endif
- #endif
- }
-2009-07-20 Aurelien Jarno <aurelien@aurel32.net>
-
- * sysdeps/unix/sysv/linux/arm/kernel-features.h: Define
- __ASSUME_EVENTFD2 and __ASSUME_SIGNALFD4.
-
---- a/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
-+++ b/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
-@@ -61,6 +61,12 @@
- # define __ASSUME_FUTEX_LOCK_PI 1
- #endif
-
-+/* Support for the eventfd2 and signalfd4 syscalls was added in 2.6.27. */
-+#if __LINUX_KERNEL_VERSION >= 0x02061b
-+# define __ASSUME_EVENTFD2 1
-+# define __ASSUME_SIGNALFD4 1
-+#endif
-+
- #include_next <kernel-features.h>
-
- /* These syscalls are not implemented yet for ARM. */
-
-
-2009-07-20 Aurelien Jarno <aurelien@aurel32.net>
-
- * sysdeps/unix/sysv/linux/hppa/kernel-features.h: Define
- __ASSUME_EVENTFD2 and __ASSUME_SIGNALFD4.
-
---- a/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h
-+++ b/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h
-@@ -46,4 +46,10 @@
- # define __ASSUME_FUTEX_LOCK_PI 1
- #endif
-
-+/* Support for the eventfd2 and signalfd4 syscalls was added in 2.6.28. */
-+#if __LINUX_KERNEL_VERSION >= 0x02061c
-+# define __ASSUME_EVENTFD2 1
-+# define __ASSUME_SIGNALFD4 1
-+#endif
-+
- #include_next <kernel-features.h>
-
-
-2009-07-20 Aurelien Jarno <aurelien@aurel32.net>
-
- * sysdeps/unix/sysv/linux/mips/kernel-features.h: Define
- __ASSUME_EVENTFD2 and __ASSUME_SIGNALFD4.
-
---- a/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
-+++ b/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
-@@ -42,4 +42,10 @@
- # define __ASSUME_FUTEX_LOCK_PI 1
- #endif
-
-+/* Support for the eventfd2 and signalfd4 syscalls was added in 2.6.27. */
-+#if __LINUX_KERNEL_VERSION >= 0x02061c
-+# define __ASSUME_EVENTFD2 1
-+# define __ASSUME_SIGNALFD4 1
-+#endif
-+
- #include_next <kernel-features.h>
Modified: glibc-package/branches/multiarch/debian/patches/series
===================================================================
--- glibc-package/branches/multiarch/debian/patches/series 2009-07-27 13:38:04 UTC (rev 3708)
+++ glibc-package/branches/multiarch/debian/patches/series 2009-07-27 13:52:15 UTC (rev 3709)
@@ -52,6 +52,7 @@
alpha/submitted-fpu-round.diff
alpha/submitted-PTR_MANGLE.diff
alpha/submitted-procfs_h.diff
+alpha/submitted-asm-memchr.diff
amd64/local-biarch.diff
amd64/local-clone.diff
@@ -213,5 +214,6 @@
any/local-revert-3270.diff
any/cvs-sunrpc-license.diff
any/submitted-tst-cpucount.diff
-any/submitted-signalfd-eventfd.diff
any/cvs-getaddrinfo-nss-notfound.diff
+any/cvs-pthread_mutex_lock.diff
+any/cvs-signalfd-eventfd.diff
Reply to: