r940 - in glibc-package/trunk/debian: . patches
Author: gotom
Date: 2005-07-12 14:30:21 +0000 (Tue, 12 Jul 2005)
New Revision: 940
Removed:
glibc-package/trunk/debian/patches/glibc232-clock_settime.dpatch
glibc-package/trunk/debian/patches/glibc232-pthread-cancellation.dpatch
glibc-package/trunk/debian/patches/glibc232-sigsetjmp.dpatch
glibc-package/trunk/debian/patches/hurd-weak-aliases.dpatch
glibc-package/trunk/debian/patches/rtld-vdso-assertion.dpatch
glibc-package/trunk/debian/patches/sched-update.dpatch
Modified:
glibc-package/trunk/debian/changelog
Log:
* These dpatches are removed from debian/patches because the similar
patches are already applied in the latest version:
- debian/patches/rtld-vdso-assertion.dpatch
- debian/patches/glibc232-sigsetjmp.dpatch
- debian/patches/hurd-weak-aliases.dpatch
- debian/patches/sched-update.dpatch
- debian/patches/glibc232-pthread-cancellation.dpatch
- debian/patches/glibc232-clock_settime.dpatch
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2005-07-11 18:56:13 UTC (rev 939)
+++ glibc-package/trunk/debian/changelog 2005-07-12 14:30:21 UTC (rev 940)
@@ -2,6 +2,17 @@
* GOTO Masanori <gotom@debian.org>
+ * Merge glibc-2.3.4 branch to the main trunk for etch development.
+
+ * These dpatches are removed from debian/patches because the similar
+ patches are already applied in the latest version:
+ - debian/patches/rtld-vdso-assertion.dpatch
+ - debian/patches/glibc232-sigsetjmp.dpatch
+ - debian/patches/hurd-weak-aliases.dpatch
+ - debian/patches/sched-update.dpatch
+ - debian/patches/glibc232-pthread-cancellation.dpatch
+ - debian/patches/glibc232-clock_settime.dpatch
+
* Move /etc/locale.alias to /usr/share/locale/locale.alias.
Don't install locale.alias.5. (Closes: #144670, #185991, #298784)
- debian/local/usr_sbin/locale-gen: Use /usr/share/locale/locale.alias
Deleted: glibc-package/trunk/debian/patches/glibc232-clock_settime.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/glibc232-clock_settime.dpatch 2005-07-11 18:56:13 UTC (rev 939)
+++ glibc-package/trunk/debian/patches/glibc232-clock_settime.dpatch 2005-07-12 14:30:21 UTC (rev 940)
@@ -1,41 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: There is a typo in clock_settime which causes
-# DP: any and every call to clock_settime to terminate with EINVAL.
-# DP: Related bugs: #304668: calls to clock_settime() fail with "invalid argument" error always
-# DP: Dpatch author: Khalid Aziz <khalid.aziz@hp.com>
-# DP: Patch author:
-# DP: Upstream status: In CVS
-# DP: Status Details:
-# DP: Date: 2005-04-13
-
-PATCHLEVEL=1
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
---- glibc-2.3.2/sysdeps/unix/clock_settime.c 2005-04-13 10:51:46.299187007 -0600
-+++ glibc-2.3.2-settime_fix/sysdeps/unix/clock_settime.c 2005-04-13 10:51:32.786491860 -0600
-@@ -64,8 +64,8 @@ clock_settime (clockid_t clock_id, const
- retval = settimeofday (&tv, NULL); \
- } while (0)
-
--#ifdef SYSDEP_GETTIME
-- SYSDEP_GETTIME;
-+#ifdef SYSDEP_SETTIME
-+ SYSDEP_SETTIME;
- #endif
-
- #ifndef HANDLED_REALTIME
Deleted: glibc-package/trunk/debian/patches/glibc232-pthread-cancellation.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/glibc232-pthread-cancellation.dpatch 2005-07-11 18:56:13 UTC (rev 939)
+++ glibc-package/trunk/debian/patches/glibc232-pthread-cancellation.dpatch 2005-07-12 14:30:21 UTC (rev 940)
@@ -1,322 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix pthread cancellation bug, don't cancel when
-# CANCELSTATE_BITMASK is used. This fixes JVM
-# lockups problem.
-# DP: Related bugs: #300943
-# DP: Dpatch author: Jeff Bailey
-# DP: Patch author:
-# DP: Upstream status: In CVS
-# DP: Status Details:
-# DP: Date: 2005-03-22
-
-PATCHLEVEL=1
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
-
-2003-12-19 Jakub Jelinek <jakub@redhat.com>
-
- * libc-cancellation.c (__libc_enable_asynccancel): Don't cancel
- if CANCELSTATE_BITMASK is set.
- * sysdeps/pthread/librt-cancellation.c (__librt_enable_asynccancel):
- Likewise.
-
- * Makefile (tests): Add tst-cancel22 and tst-cancel23.
- (tests-reverse): Add tst-cancel23.
- * tst-cancel22.c: New test.
- * tst-cancel23.c: New test.
-
-2003-11-05 Jakub Jelinek <jakub@redhat.com>
-
- * unwind.c (FRAME_LEFT): Define.
- (unwind_stop): Handle old style cleanups here.
- (__pthread_unwind): Handle old style cleanups only if
- !HAVE_FORCED_UNWIND.
-
-
---- libc/nptl/Makefile 19 Dec 2003 01:34:09 -0000 1.132
-+++ libc/nptl/Makefile 21 Dec 2003 20:05:16 -0000 1.133
-@@ -215,7 +215,7 @@
- tst-cancel1 tst-cancel2 tst-cancel3 tst-cancel4 tst-cancel5 \
- tst-cancel6 tst-cancel7 tst-cancel8 tst-cancel9 tst-cancel10 \
- tst-cancel11 tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 \
-- tst-cancel16 tst-cancel17 tst-cancel18 \
-+ tst-cancel16 tst-cancel17 tst-cancel18 tst-cancel22 tst-cancel23 \
- tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 \
- tst-flock1 tst-flock2 \
- tst-signal1 tst-signal2 tst-signal3 tst-signal4 tst-signal5 \
-@@ -326,7 +326,7 @@ ifeq ($(build-static),yes)
- tests-static += tst-locale1 tst-locale2
- endif
- # These tests are linked with libc before libpthread
--tests-reverse += tst-cancel5
-+tests-reverse += tst-cancel5 tst-cancel23
-
- include ../Rules
-
---- libc/nptl/libc-cancellation.c 2 Jul 2003 05:12:20 -0000 1.9
-+++ libc/nptl/libc-cancellation.c 20 Dec 2003 06:31:25 -0000 1.10
-@@ -42,8 +42,9 @@ __libc_enable_asynccancel (void)
-
- if (__builtin_expect ((oldval & CANCELED_BITMASK) != 0, 0))
- {
-- /* If we are already exiting stop right here. */
-- if ((oldval & EXITING_BITMASK) != 0)
-+ /* If we are already exiting or if PTHREAD_CANCEL_DISABLED,
-+ stop right here. */
-+ if ((oldval & (EXITING_BITMASK | CANCELSTATE_BITMASK)) != 0)
- break;
-
- int curval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling,
---- libc/nptl/tst-cancel22.c 1 Jan 1970 00:00:00 -0000
-+++ libc/nptl/tst-cancel22.c 20 Dec 2003 06:32:20 -0000 1.1
-@@ -0,0 +1,121 @@
-+/* Copyright (C) 2003 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+ Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#include <errno.h>
-+#include <pthread.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+
-+pthread_barrier_t b;
-+int seen;
-+
-+static void *
-+tf (void *arg)
-+{
-+ int old;
-+ int r = pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &old);
-+ if (r != 0)
-+ {
-+ puts ("setcancelstate failed");
-+ exit (1);
-+ }
-+
-+ r = pthread_barrier_wait (&b);
-+ if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
-+ {
-+ puts ("barrier_wait failed");
-+ exit (1);
-+ }
-+
-+ for (int i = 0; i < 10; ++i)
-+ {
-+ struct timespec ts = { .tv_sec = 0, .tv_nsec = 100000000 };
-+ TEMP_FAILURE_RETRY (nanosleep (&ts, &ts));
-+ }
-+
-+ seen = 1;
-+ pthread_setcancelstate (old, NULL);
-+
-+ struct timespec ts = { .tv_sec = 0, .tv_nsec = 100000000 };
-+ TEMP_FAILURE_RETRY (nanosleep (&ts, &ts));
-+
-+ exit (1);
-+}
-+
-+
-+static int
-+do_test (void)
-+{
-+ if (pthread_barrier_init (&b, NULL, 2) != 0)
-+ {
-+ puts ("barrier init failed");
-+ return 1;
-+ }
-+
-+ pthread_t th;
-+ if (pthread_create (&th, NULL, tf, NULL) != 0)
-+ {
-+ puts ("thread creation failed");
-+ return 1;
-+ }
-+
-+ int r = pthread_barrier_wait (&b);
-+ if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
-+ {
-+ puts ("barrier_wait failed");
-+ return 1;
-+ }
-+
-+ if (pthread_cancel (th) != 0)
-+ {
-+ puts ("cancel failed");
-+ return 1;
-+ }
-+
-+ void *status;
-+ if (pthread_join (th, &status) != 0)
-+ {
-+ puts ("join failed");
-+ return 1;
-+ }
-+ if (status != PTHREAD_CANCELED)
-+ {
-+ puts ("thread not canceled");
-+ return 1;
-+ }
-+
-+ if (pthread_barrier_destroy (&b) != 0)
-+ {
-+ puts ("barrier_destroy failed");
-+ return 1;
-+ }
-+
-+ if (seen != 1)
-+ {
-+ puts ("thread cancelled when PTHREAD_CANCEL_DISABLED");
-+ return 1;
-+ }
-+
-+ return 0;
-+}
-+
-+#define TIMEOUT 5
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
---- libc/nptl/tst-cancel23.c 1 Jan 1970 00:00:00 -0000
-+++ libc/nptl/tst-cancel23.c 20 Dec 2003 06:32:20 -0000 1.1
-@@ -0,0 +1 @@
-+#include "tst-cancel22.c"
---- libc/nptl/sysdeps/pthread/librt-cancellation.c 3 Jul 2003 07:35:59 -0000 1.3
-+++ libc/nptl/sysdeps/pthread/librt-cancellation.c 20 Dec 2003 06:31:48 -0000 1.4
-@@ -41,8 +41,9 @@ __librt_enable_asynccancel (void)
-
- if (__builtin_expect ((oldval & CANCELED_BITMASK) != 0, 0))
- {
-- /* If we are already exiting stop right here. */
-- if ((oldval & EXITING_BITMASK) != 0)
-+ /* If we are already exiting or if PTHREAD_CANCEL_DISABLED,
-+ stop right here. */
-+ if ((oldval & (EXITING_BITMASK | CANCELSTATE_BITMASK)) != 0)
- break;
-
- int curval = THREAD_ATOMIC_CMPXCHG_VAL (self, cancelhandling,
---- libc/nptl/unwind.c 4 Sep 2003 05:43:37 -0000 1.9
-+++ libc/nptl/unwind.c 6 Nov 2003 04:29:04 -0000 1.10
-@@ -27,6 +27,14 @@
-
- #ifdef HAVE_FORCED_UNWIND
-
-+#ifdef _STACK_GROWS_DOWN
-+# define FRAME_LEFT(frame, other) ((char *) frame >= (char *) other)
-+#elif _STACK_GROWS_UP
-+# define FRAME_LEFT(frame, other) ((char *) frame <= (char *) other)
-+#else
-+# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
-+#endif
-+
- static _Unwind_Reason_Code
- unwind_stop (int version, _Unwind_Action actions,
- _Unwind_Exception_Class exc_class,
-@@ -34,6 +42,9 @@ unwind_stop (int version, _Unwind_Action
- struct _Unwind_Context *context, void *stop_parameter)
- {
- struct pthread_unwind_buf *buf = stop_parameter;
-+ struct pthread *self = THREAD_SELF;
-+ struct _pthread_cleanup_buffer *curp = THREAD_GETMEM (self, cleanup);
-+ int do_longjump = 0;
-
- /* Do longjmp if we're at "end of stack", aka "end of unwind data".
- We assume there are only C frame without unwind data in between
-@@ -42,6 +53,37 @@ unwind_stop (int version, _Unwind_Action
- previous frame. */
- if ((actions & _UA_END_OF_STACK)
- || ! _JMPBUF_CFA_UNWINDS (buf->cancel_jmp_buf[0].jmp_buf, context))
-+ do_longjump = 1;
-+
-+ if (__builtin_expect (curp != NULL, 0))
-+ {
-+ /* Handle the compatibility stuff. Execute all handlers
-+ registered with the old method which would be unwound by this
-+ step. */
-+ struct _pthread_cleanup_buffer *oldp = buf->priv.data.cleanup;
-+ void *cfa = (void *) _Unwind_GetCFA (context);
-+
-+ if (curp != oldp && (do_longjump || FRAME_LEFT (cfa, curp)))
-+ {
-+ do
-+ {
-+ /* Pointer to the next element. */
-+ struct _pthread_cleanup_buffer *nextp = curp->__prev;
-+
-+ /* Call the handler. */
-+ curp->__routine (curp->__arg);
-+
-+ /* To the next. */
-+ curp = nextp;
-+ }
-+ while (curp != oldp && (do_longjump || FRAME_LEFT (cfa, curp)));
-+
-+ /* Mark the current element as handled. */
-+ THREAD_SETMEM (self, cleanup, curp);
-+ }
-+ }
-+
-+ if (do_longjump)
- __libc_longjmp ((struct __jmp_buf_tag *) buf->cancel_jmp_buf, 1);
-
- return _URC_NO_REASON;
-@@ -70,6 +112,14 @@ __pthread_unwind (__pthread_unwind_buf_t
- struct pthread_unwind_buf *ibuf = (struct pthread_unwind_buf *) buf;
- struct pthread *self = THREAD_SELF;
-
-+#ifdef HAVE_FORCED_UNWIND
-+ /* This is not a catchable exception, so don't provide any details about
-+ the exception type. We do need to initialize the field though. */
-+ THREAD_SETMEM (self, exc.exception_class, 0);
-+ THREAD_SETMEM (self, exc.exception_cleanup, unwind_cleanup);
-+
-+ _Unwind_ForcedUnwind (&self->exc, unwind_stop, ibuf);
-+#else
- /* Handle the compatibility stuff first. Execute all handlers
- registered with the old method. We don't execute them in order,
- instead, they will run first. */
-@@ -95,14 +145,6 @@ __pthread_unwind (__pthread_unwind_buf_t
- THREAD_SETMEM (self, cleanup, curp);
- }
-
--#ifdef HAVE_FORCED_UNWIND
-- /* This is not a catchable exception, so don't provide any details about
-- the exception type. We do need to initialize the field though. */
-- THREAD_SETMEM (self, exc.exception_class, 0);
-- THREAD_SETMEM (self, exc.exception_cleanup, unwind_cleanup);
--
-- _Unwind_ForcedUnwind (&self->exc, unwind_stop, ibuf);
--#else
- /* We simply jump to the registered setjmp buffer. */
- __libc_longjmp ((struct __jmp_buf_tag *) ibuf->cancel_jmp_buf, 1);
- #endif
-
Deleted: glibc-package/trunk/debian/patches/glibc232-sigsetjmp.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/glibc232-sigsetjmp.dpatch 2005-07-11 18:56:13 UTC (rev 939)
+++ glibc-package/trunk/debian/patches/glibc232-sigsetjmp.dpatch 2005-07-12 14:30:21 UTC (rev 940)
@@ -1,55 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix gcc-4.0 compilation breakage.
-# DP: Related bugs: #295457
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: Richard Henderson <rth@redhat.com>
-# DP: Upstream status: In CVS
-# DP: Status Details: In CVS
-# DP: Date: 2005-04-09
-
-PATCHLEVEL=0
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
-2005-02-07 Richard Henderson <rth@redhat.com>
-
- * sysdeps/pthread/pthread.h (__sigsetjmp): Use pointer as first
- argument.
-
-Index: nptl/sysdeps/pthread/pthread.h
-===================================================================
-RCS file: /cvs/glibc/libc/nptl/sysdeps/pthread/pthread.h,v
-retrieving revision 1.30
-retrieving revision 1.31
-diff -u -p -r1.30 -r1.31
---- nptl/sysdeps/pthread/pthread.h 24 Nov 2004 22:55:24 -0000 1.30
-+++ nptl/sysdeps/pthread/pthread.h 8 Feb 2005 08:59:03 -0000 1.31
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -661,7 +661,7 @@ extern void __pthread_unwind_next (__pth
-
- /* Function used in the macros. */
- struct __jmp_buf_tag;
--extern int __sigsetjmp (struct __jmp_buf_tag __env[1], int __savemask) __THROW;
-+extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask) __THROW;
-
-
- /* Mutex handling. */
Deleted: glibc-package/trunk/debian/patches/hurd-weak-aliases.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/hurd-weak-aliases.dpatch 2005-07-11 18:56:13 UTC (rev 939)
+++ glibc-package/trunk/debian/patches/hurd-weak-aliases.dpatch 2005-07-12 14:30:21 UTC (rev 940)
@@ -1,71 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Barry DeFrese adds weak_aliases to setresgid and setresuid,
-# fixing undefined references when e.g. building putty.
-# DP: Related bugs: #295118: libc0.3-dev: undefined references to setres{g,u}id
-# DP: Dpatch author: Michael Banck <mbanck@debian.org>, GOTO Masanori <gotom@debian.org>
-# DP: Patch author:
-# DP: Upstream status: In CVS
-# DP: Status Details:
-# DP: Date: 2005-04-10
-
-PATCHLEVEL=0
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
-2005-02-10 Barry deFrese <bddebian@comcast.net>
-
- * sysdeps/mach/hurd/setresgid.c: Add weak alias.
- * sysdeps/mach/hurd/setresuid.c: Add weak alias.
-
-Index: setresgid.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/setresgid.c,v
-retrieving revision 1.1
-diff -u -r1.1 setresgid.c
---- sysdeps/mach/hurd/setresgid.c 14 Oct 2002 01:03:11 -0000 1.1
-+++ sysdeps/mach/hurd/setresgid.c 13 Feb 2005 20:08:02 -0000
-@@ -1,5 +1,5 @@
- /* setresgid -- set effective group ID, real group ID, and saved-set group ID
-- Copyright (C) 2002 Free Software Foundation, Inc.
-+ Copyright (C) 2002, 2005 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -75,3 +75,4 @@
- return err;
- }
- libc_hidden_def (__setresgid)
-+weak_alias (__setresgid, setresgid)
-Index: setresuid.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/setresuid.c,v
-retrieving revision 1.1
-diff -u -r1.1 setresuid.c
---- sysdeps/mach/hurd/setresuid.c 14 Oct 2002 01:03:11 -0000 1.1
-+++ sysdeps/mach/hurd/setresuid.c 13 Feb 2005 20:08:02 -0000
-@@ -1,5 +1,5 @@
- /* setresuid -- set effective user ID, real user ID, and saved-set user ID
-- Copyright (C) 2002 Free Software Foundation, Inc.
-+ Copyright (C) 2002, 2005 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -75,3 +75,4 @@
- return err;
- }
- libc_hidden_def (__setresuid)
-+weak_alias (__setresuid, setresuid)
Deleted: glibc-package/trunk/debian/patches/rtld-vdso-assertion.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/rtld-vdso-assertion.dpatch 2005-07-11 18:56:13 UTC (rev 939)
+++ glibc-package/trunk/debian/patches/rtld-vdso-assertion.dpatch 2005-07-12 14:30:21 UTC (rev 940)
@@ -1,157 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Correct a bit of VDSO support which broke running
-# DP: binaries linked against ld.so directly.
-# DP: Related bugs: 207872, 210840, 274852, 276384
-# DP: Dpatch author: Daniel Jacobowitz <dan@debian.org>
-# DP: Patch author: Daniel Jacobowitz, Roland McGrath, Jakub Jelinek
-# DP: Upstream status: In CVS
-# DP: Status Details: Backported
-# DP: Date: 2005-05-08
-
-PATCHLEVEL=1
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
-
-2004-02-27 Jakub Jelinek <jakub@redhat.com>
-
- * elf/rtld.c (dl_main): Adjust l->l_ld of the vDSO by l->l_addr.
- * sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Only set
- GL(dl_sysinfo) if non-zero.
-
-2004-02-26 Jakub Jelinek <jakub@redhat.com>
-
- * elf/rtld.c (dl_main): Correctly set up l_map_end and l_addr
- in vDSO's link_map, don't assume l_addr == 0. Set GL(dl_sysinfo)
- from e_entry only if AT_SYSINFO not present and adjust by l_addr.
- Take vDSO into account when inserting rtld into _dl_loaded chain.
-
-2003-10-09 Roland McGrath <roland@redhat.com>
-
- * elf/rtld.c (dl_main): Don't set l_name for sysinfo DSO, since there
- is no file to name.
-
-2003-10-08 Jakub Jelinek <jakub@redhat.com>
-
- * sysdeps/generic/dl-sysdep.c (_dl_important_hwcaps): Don't generate
- two identical copies of strings.
-
-2003-09-30 Daniel Jacobowitz <drow@mvista.com>
-
- * elf/rtld.c (dl_main): Set l_libname and l_name for the sysinfo DSO
- to work around kernel problem.
-
---- glibc-2.3.2/elf/rtld.c.orig 2005-05-08 10:25:33.775671493 -0400
-+++ glibc-2.3.2/elf/rtld.c 2005-05-08 10:29:36.631515133 -0400
-@@ -1161,11 +1161,9 @@ of this helper program; chances are you
- }
-
- #ifdef NEED_DL_SYSINFO
-+ struct link_map *sysinfo_map = NULL;
- if (GL(dl_sysinfo_dso) != NULL)
- {
-- /* We have a prelinked DSO preloaded by the system. */
-- GL(dl_sysinfo) = GL(dl_sysinfo_dso)->e_entry;
--
- /* Do an abridged version of the work _dl_map_object_from_fd would do
- to map in the object. It's already mapped and prelinked (and
- better be, since it's read-only and so we couldn't relocate it).
-@@ -1174,7 +1172,7 @@ of this helper program; chances are you
- struct link_map *l = _dl_new_object ((char *) "", "", lt_library, NULL);
- if (__builtin_expect (l != NULL, 1))
- {
-- static ElfW(Dyn) dyn_temp [DL_RO_DYN_TEMP_CNT];
-+ static ElfW(Dyn) dyn_temp[DL_RO_DYN_TEMP_CNT];
-
- l->l_phdr = ((const void *) GL(dl_sysinfo_dso)
- + GL(dl_sysinfo_dso)->e_phoff);
-@@ -1188,18 +1186,32 @@ of this helper program; chances are you
- l->l_ldnum = ph->p_memsz / sizeof (ElfW(Dyn));
- break;
- }
-- if (ph->p_type == PT_LOAD)
-- assert ((void *) ph->p_vaddr == GL(dl_sysinfo_dso));
-+ else if (ph->p_type == PT_LOAD)
-+ {
-+ if (! l->l_addr)
-+ l->l_addr = ph->p_vaddr;
-+ else if (ph->p_vaddr + ph->p_memsz >= l->l_map_end)
-+ l->l_map_end = ph->p_vaddr + ph->p_memsz;
-+ }
- }
-+ l->l_map_start = (ElfW(Addr)) GL(dl_sysinfo_dso);
-+ l->l_addr = l->l_map_start - l->l_addr;
-+ l->l_map_end += l->l_addr;
-+ l->l_ld = (void *) ((ElfW(Addr)) l->l_ld + l->l_addr);
- elf_get_dynamic_info (l, dyn_temp);
- _dl_setup_hash (l);
- l->l_relocated = 1;
-
- /* Now that we have the info handy, use the DSO image's soname
- so this object can be looked up by name. */
- if (l->l_info[DT_SONAME] != NULL)
- l->l_libname->name = ((char *) D_PTR (l, l_info[DT_STRTAB])
- + l->l_info[DT_SONAME]->d_un.d_val);
-+
-+ /* We have a prelinked DSO preloaded by the system. */
-+ if (GL(dl_sysinfo) == DL_SYSINFO_DEFAULT)
-+ GL(dl_sysinfo) = GL(dl_sysinfo_dso)->e_entry + l->l_addr;
-+ sysinfo_map = l;
- }
- }
- #endif
-@@ -1245,9 +1268,17 @@ of this helper program; chances are you
- ++i;
- GL(dl_rtld_map).l_prev = GL(dl_loaded)->l_searchlist.r_list[i - 1];
- if (__builtin_expect (mode, normal) == normal)
-- GL(dl_rtld_map).l_next = (i + 1 < GL(dl_loaded)->l_searchlist.r_nlist
-- ? GL(dl_loaded)->l_searchlist.r_list[i + 1]
-- : NULL);
-+ {
-+ GL(dl_rtld_map).l_next = (i + 1 < GL(dl_loaded)->l_searchlist.r_nlist
-+ ? GL(dl_loaded)->l_searchlist.r_list[i + 1]
-+ : NULL);
-+#ifdef NEED_DL_SYSINFO
-+ if (sysinfo_map != NULL
-+ && GL(dl_rtld_map).l_prev->l_next == sysinfo_map
-+ && GL(dl_rtld_map).l_next != sysinfo_map)
-+ GL(dl_rtld_map).l_prev = sysinfo_map;
-+#endif
-+ }
- else
- /* In trace mode there might be an invisible object (which we
- could not find) after the previous one in the search list.
---- glibc-2.3.2/sysdeps/generic/dl-sysdep.c.orig 2005-05-08 10:16:09.270961000 -0400
-+++ glibc-2.3.2/sysdeps/generic/dl-sysdep.c 2005-05-08 10:41:11.607089482 -0400
-@@ -196,7 +196,7 @@ _dl_sysdep_start (void **start_argptr,
-
- #if defined NEED_DL_SYSINFO
- /* Only set the sysinfo value if we also have the vsyscall DSO. */
-- if (GL(dl_sysinfo_dso) != 0)
-+ if (GL(dl_sysinfo_dso) != 0 && new_sysinfo)
- GL(dl_sysinfo) = new_sysinfo;
- #endif
-
-@@ -454,7 +454,7 @@ _dl_important_hwcaps (const char *platfo
- }
- else
- {
-- n = 1 << cnt;
-+ n = 1 << (cnt - 1);
- do
- {
- n -= 2;
Deleted: glibc-package/trunk/debian/patches/sched-update.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/sched-update.dpatch 2005-07-11 18:56:13 UTC (rev 939)
+++ glibc-package/trunk/debian/patches/sched-update.dpatch 2005-07-12 14:30:21 UTC (rev 940)
@@ -1,252 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Update sched_[gs]et_affinity to new interface and library version.
-# DP: Related bugs: #297769
-# DP: Dpatch author: Bastian Blank <waldi@debian.org>, GOTO Masanori <gotom@debian.org>
-# DP: Patch author: Bastian Blank <waldi@debian.org>
-# DP: Upstream status: In CVS
-# DP: Status Details:
-# DP: Date: 2005-03-24
-
-PATCHLEVEL=0
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-
-# append the patch here and adjust the -p? flag in the patch calls.
-(this changelog is written by gotom)
-2005-03-24 Bastian Blank <waldi@debian.org>
-
- * Versions.def: Add GLIBC_2.3.4 symbol for new
- sched_{set,get}affinity.
- * sysdeps/unix/sysv/linux/Versions: Likewise.
-
- * posix/sched.h: Update new sched_{set,get}affinity from cvs.
- * sysdeps/generic/sched_getaffinity.c: Likewise.
- * sysdeps/generic/sched_setaffinity.c: Likewise.
- * sysdeps/unix/sysv/linux/sched_getaffinity.c: Likewise.
- * sysdeps/unix/sysv/linux/sched_setaffinity.c: Likewise.
-
-
---- Versions.def 2005-03-24 12:47:59.279008144 +0000
-+++ Versions.def 2005-03-24 13:53:32.651007992 +0000
-@@ -19,6 +19,7 @@
- GLIBC_2.3.1
- GLIBC_2.3.2
- GLIBC_2.3.3
-+ GLIBC_2.3.4
- %ifdef USE_IN_LIBIO
- HURD_CTHREADS_0.3
- %endif
---- posix/sched.h 2005-03-24 12:08:26.376014592 +0000
-+++ posix/sched.h 2005-03-24 12:04:15.878891472 +0000
-@@ -73,11 +73,12 @@
-
-
- /* Set the CPU affinity for a task */
--extern int sched_setaffinity (__pid_t __pid, __const cpu_set_t *__mask)
-- __THROW;
-+extern int sched_setaffinity (__pid_t __pid, size_t __cpusetsize,
-+ __const cpu_set_t *__cpuset) __THROW;
-
- /* Get the CPU affinity for a task */
--extern int sched_getaffinity (__pid_t __pid, cpu_set_t *__mask) __THROW;
-+extern int sched_getaffinity (__pid_t __pid, size_t __cpusetsize,
-+ cpu_set_t *__cpuset) __THROW;
- #endif
-
- __END_DECLS
---- sysdeps/generic/sched_getaffinity.c 2005-03-24 12:08:26.502995288 +0000
-+++ sysdeps/generic/sched_getaffinity.c 2005-03-24 12:00:21.055915184 +0000
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -23,8 +23,9 @@
-
- /* Retrieve the CPU affinity mask for a particular process. */
- int
--sched_getaffinity (pid, cpuset)
-+sched_getaffinity (pid, cpusetsize, cpuset)
- pid_t pid;
-+ size_t cpusetsize;
- cpu_set_t *cpuset;
- {
- __set_errno (ENOSYS);
---- sysdeps/generic/sched_setaffinity.c 2005-03-24 12:08:26.503995136 +0000
-+++ sysdeps/generic/sched_setaffinity.c 2005-03-24 12:00:23.306972184 +0000
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -23,8 +23,9 @@
-
- /* Retrieve the CPU affinity mask for a particular process. */
- int
--sched_setaffinity (pid, cpuset)
-+sched_setaffinity (pid, cpusetsize, cpuset)
- pid_t pid;
-+ size_t cpusetsize;
- const cpu_set_t *cpuset;
- {
- __set_errno (ENOSYS);
---- sysdeps/unix/sysv/linux/sched_getaffinity.c 2005-03-24 12:08:26.876938440 +0000
-+++ sysdeps/unix/sysv/linux/sched_getaffinity.c 2005-03-24 12:00:10.236962456 +0000
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -21,25 +21,37 @@
- #include <string.h>
- #include <sysdep.h>
- #include <sys/types.h>
-+#include <shlib-compat.h>
-
-
- #ifdef __NR_sched_getaffinity
- int
--sched_getaffinity (pid, cpuset)
-- pid_t pid;
-- cpu_set_t *cpuset;
-+__sched_getaffinity_new (pid_t pid, size_t cpusetsize, cpu_set_t *cpuset)
- {
- int res = INLINE_SYSCALL (sched_getaffinity, 3, pid, sizeof (cpu_set_t),
- cpuset);
- if (res != -1)
- {
- /* Clean the rest of the memory the kernel didn't do. */
-- memset ((char *) cpuset + res, '\0', sizeof (cpu_set_t) - res);
-+ memset ((char *) cpuset + res, '\0', cpusetsize - res);
-
- res = 0;
- }
- return res;
- }
-+versioned_symbol (libc, __sched_getaffinity_new, sched_getaffinity,
-+ GLIBC_2_3_4);
-+
-+
-+# if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_3_4)
-+int
-+__sched_getaffinity_old (pid_t pid, cpu_set_t *cpuset)
-+{
-+ /* The old interface by default assumed a 1024 processor bitmap. */
-+ return __sched_getaffinity_new (pid, 128, cpuset);
-+}
-+compat_symbol (libc, __sched_getaffinity_old, sched_getaffinity, GLIBC_2_3_3);
-+# endif
- #else
- # include <sysdeps/generic/sched_getaffinity.c>
- #endif
---- sysdeps/unix/sysv/linux/sched_setaffinity.c 2005-03-24 12:08:26.877938288 +0000
-+++ sysdeps/unix/sysv/linux/sched_setaffinity.c 2005-03-24 11:59:07.421926736 +0000
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -20,18 +20,68 @@
- #include <sched.h>
- #include <string.h>
- #include <sysdep.h>
-+#include <unistd.h>
- #include <sys/types.h>
-+#include <shlib-compat.h>
-+#include <alloca.h>
-
-
- #ifdef __NR_sched_setaffinity
-+static size_t __kernel_cpumask_size;
-+
-+
-+int
-+__sched_setaffinity_new (pid_t pid, size_t cpusetsize, const cpu_set_t *cpuset)
-+{
-+ if (__builtin_expect (__kernel_cpumask_size == 0, 0))
-+ {
-+ INTERNAL_SYSCALL_DECL (err);
-+ int res;
-+
-+ size_t psize = 128;
-+ void *p = alloca (psize);
-+
-+ while (res = INTERNAL_SYSCALL (sched_getaffinity, err, 3, getpid (),
-+ psize, p),
-+ INTERNAL_SYSCALL_ERROR_P (res, err)
-+ && INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL)
-+ p = extend_alloca (p, psize, 2 * psize);
-+
-+ if (res == 0 || INTERNAL_SYSCALL_ERROR_P (res, err))
-+ {
-+ __set_errno (INTERNAL_SYSCALL_ERRNO (res, err));
-+ return -1;
-+ }
-+
-+ __kernel_cpumask_size = res;
-+ }
-+
-+ /* We now know the size of the kernel cpumask_t. Make sure the user
-+ does not request to set a bit beyond that. */
-+ for (size_t cnt = __kernel_cpumask_size; cnt < cpusetsize; ++cnt)
-+ if (((char *) cpuset)[cnt] != '\0')
-+ {
-+ /* Found a nonzero byte. This means the user request cannot be
-+ fulfilled. */
-+ __set_errno (EINVAL);
-+ return -1;
-+ }
-+
-+ return INLINE_SYSCALL (sched_setaffinity, 3, pid, cpusetsize, cpuset);
-+}
-+versioned_symbol (libc, __sched_setaffinity_new, sched_setaffinity,
-+ GLIBC_2_3_4);
-+
-+
-+# if SHLIB_COMPAT (libc, GLIBC_2_3_3, GLIBC_2_3_4)
- int
--sched_setaffinity (pid, cpuset)
-- pid_t pid;
-- const cpu_set_t *cpuset;
-+__sched_setaffinity_old (pid_t pid, const cpu_set_t *cpuset)
- {
-- return INLINE_SYSCALL (sched_setaffinity, 3, pid, sizeof (cpu_set_t),
-- cpuset);
-+ /* The old interface by default assumed a 1024 processor bitmap. */
-+ return __sched_setaffinity_new (pid, 128, cpuset);
- }
-+compat_symbol (libc, __sched_setaffinity_old, sched_setaffinity, GLIBC_2_3_3);
-+# endif
- #else
- # include <sysdeps/generic/sched_setaffinity.c>
- #endif
---- sysdeps/unix/sysv/linux/Versions 2002-12-16 23:28:17.000000000 +0000
-+++ sysdeps/unix/sysv/linux/Versions 2005-03-24 12:05:43.712983888 +0000
-@@ -109,6 +109,9 @@
- # New kernel interfaces.
- epoll_create; epoll_ctl; epoll_wait;
- }
-+ GLIBC_2.3.4 {
-+ sched_getaffinity; sched_setaffinity;
-+ }
- GLIBC_PRIVATE {
- # needed by libpthread.
- __libc_sigaction;
Reply to: