r1824 - in glibc-package/branches/glibc-2.5/debian: . patches patches/any patches/locale patches/mips patches/powerpc
Author: aurel32
Date: 2006-10-01 19:29:36 +0000 (Sun, 01 Oct 2006)
New Revision: 1824
Removed:
glibc-package/branches/glibc-2.5/debian/patches/any/cvs-argp_h.diff
glibc-package/branches/glibc-2.5/debian/patches/any/cvs-sysctl.diff
glibc-package/branches/glibc-2.5/debian/patches/any/cvs-thread_signals.diff
glibc-package/branches/glibc-2.5/debian/patches/any/cvs-uio_h.diff
glibc-package/branches/glibc-2.5/debian/patches/locale/cvs-iso3166.diff
glibc-package/branches/glibc-2.5/debian/patches/mips/cvs-fork.diff
glibc-package/branches/glibc-2.5/debian/patches/mips/cvs-resource.diff
glibc-package/branches/glibc-2.5/debian/patches/powerpc/cvs-procfs.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series
Log:
* Remove mips/cvs-fork.diff (merged upstream).
* Remove mips/cvs-resource.diff (merged upstream).
* Remove powerpc/cvs-procfs.diff (merged upstream).
* Remove any/cvs-argp_h.diff (merged upstream).
* Remove any/cvs-sysctl.diff (merged upstream).
* Remove any/cvs-thread_signals.diff (merged upstream).
* Remove any/cvs-uio_h.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2006-10-01 18:38:17 UTC (rev 1823)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2006-10-01 19:29:36 UTC (rev 1824)
@@ -5,12 +5,19 @@
[ Aurelien Jarno ]
* debian/shlibver: Bump up to 2.5-1.
* debian/copyright: update.
- * Remove locale/iso-3166.def (merged upstream).
+ * Remove locale/cvs-iso3166.diff (merged upstream).
* Remove localedata/locale-ro_RO.diff (merged upstream).
* Remove arm/cvs-portshead.patch (merged upstream).
* Remove hppa/cvs-portshead.patch (merged upstream).
* Remove hppa/submitted-drop-utimes.diff (merged upstream).
* Remove hurd-i386/cvs-machrules-make.diff (merged upstream).
+ * Remove mips/cvs-fork.diff (merged upstream).
+ * Remove mips/cvs-resource.diff (merged upstream).
+ * Remove powerpc/cvs-procfs.diff (merged upstream).
+ * Remove any/cvs-argp_h.diff (merged upstream).
+ * Remove any/cvs-sysctl.diff (merged upstream).
+ * Remove any/cvs-thread_signals.diff (merged upstream).
+ * Remove any/cvs-uio_h.diff (merged upstream).
-- Aurelien Jarno <aurel32@debian.org> Sun, 1 Oct 2006 19:50:37 +0200
Deleted: glibc-package/branches/glibc-2.5/debian/patches/any/cvs-argp_h.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/cvs-argp_h.diff 2006-10-01 18:38:17 UTC (rev 1823)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/cvs-argp_h.diff 2006-10-01 19:29:36 UTC (rev 1824)
@@ -1,21 +0,0 @@
-2005-10-13 Ulrich Drepper <drepper@redhat.com>
-
- [BZ #1373]
- * argp/argp.h: Remove __NTH for __argp_usage inline function.
-
-===================================================================
-RCS file: /cvs/glibc/libc/argp/argp.h,v
-retrieving revision 1.30
-retrieving revision 1.31
-diff -u -r1.30 -r1.31
---- libc/argp/argp.h 2004/09/07 22:23:45 1.30
-+++ libc/argp/argp.h 2005/10/14 05:53:47 1.31
-@@ -561,7 +561,7 @@
- # endif
-
- ARGP_EI void
--__NTH (__argp_usage (__const struct argp_state *__state))
-+__argp_usage (__const struct argp_state *__state)
- {
- __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
- }
Deleted: glibc-package/branches/glibc-2.5/debian/patches/any/cvs-sysctl.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/cvs-sysctl.diff 2006-10-01 18:38:17 UTC (rev 1823)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/cvs-sysctl.diff 2006-10-01 19:29:36 UTC (rev 1824)
@@ -1,119 +0,0 @@
-2006-08-01 Ulrich Drepper <drepper@redhat.com>
-
- * sysdeps/unix/sysv/linux/i386/smp.h: New file. Old Linux-specific
- file. Don't use sysctl.
- * sysdeps/unix/sysv/linux/smp.h: Always assume SMP. Archs can
- overwrite the file if this is likely not true.
-
-===================================================================
-RCS file: /cvs/glibc/libc/nptl/sysdeps/unix/sysv/linux/smp.h,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- libc/nptl/sysdeps/unix/sysv/linux/smp.h 2004/11/03 20:31:12 1.3
-+++ libc/nptl/sysdeps/unix/sysv/linux/smp.h 2006/08/02 04:43:48 1.4
-@@ -1,5 +1,5 @@
- /* Determine whether the host has multiple processors. Linux version.
-- Copyright (C) 1996, 2002, 2004 Free Software Foundation, Inc.
-+ Copyright (C) 1996, 2002, 2004, 2006 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
-@@ -17,36 +17,12 @@
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
--#include <errno.h>
--#include <fcntl.h>
--#include <string.h>
--#include <sys/sysctl.h>
--#include <not-cancel.h>
--
- /* Test whether the machine has more than one processor. This is not the
- best test but good enough. More complicated tests would require `malloc'
- which is not available at that time. */
- static inline int
- is_smp_system (void)
- {
-- static const int sysctl_args[] = { CTL_KERN, KERN_VERSION };
-- char buf[512];
-- size_t reslen = sizeof (buf);
--
-- /* Try reading the number using `sysctl' first. */
-- if (__sysctl ((int *) sysctl_args,
-- sizeof (sysctl_args) / sizeof (sysctl_args[0]),
-- buf, &reslen, NULL, 0) < 0)
-- {
-- /* This was not successful. Now try reading the /proc filesystem. */
-- int fd = open_not_cancel_2 ("/proc/sys/kernel/version", O_RDONLY);
-- if (__builtin_expect (fd, 0) == -1
-- || (reslen = read_not_cancel (fd, buf, sizeof (buf))) <= 0)
-- /* This also didn't work. We give up and say it's a UP machine. */
-- buf[0] = '\0';
--
-- close_not_cancel_no_status (fd);
-- }
--
-- return strstr (buf, "SMP") != NULL;
-+ /* Assume all machines are SMP and/or CMT and/or SMT. */
-+ return 1;
- }
---- libc/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2004/11/03 20:31:12
-+++ libc/nptl/sysdeps/unix/sysv/linux/i386/smp.h 2006/08/02 04:43:48
-@@ -0,0 +1,56 @@
-+/* Determine whether the host has multiple processors. Linux version.
-+ Copyright (C) 1996, 2002, 2004, 2006 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
-+ modify it under the terms of the GNU Library General Public License as
-+ published by the Free Software Foundation; either version 2 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
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public
-+ License along with the GNU C Library; see the file COPYING.LIB. If not,
-+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA. */
-+
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <string.h>
-+#include <sys/utsname.h>
-+#include <not-cancel.h>
-+
-+/* Test whether the machine has more than one processor. This is not the
-+ best test but good enough. More complicated tests would require `malloc'
-+ which is not available at that time. */
-+static inline int
-+is_smp_system (void)
-+{
-+ union
-+ {
-+ struct utsname uts;
-+ char buf[512];
-+ } u;
-+ char *cp;
-+
-+ /* Try reading the number using `sysctl' first. */
-+ if (uname (&u.uts) == 0)
-+ cp = u.uts.version;
-+ else
-+ {
-+ /* This was not successful. Now try reading the /proc filesystem. */
-+ int fd = open_not_cancel_2 ("/proc/sys/kernel/version", O_RDONLY);
-+ if (__builtin_expect (fd, 0) == -1
-+ || read_not_cancel (fd, u.buf, sizeof (u.buf)) <= 0)
-+ /* This also didn't work. We give up and say it's a UP machine. */
-+ u.buf[0] = '\0';
-+
-+ close_not_cancel_no_status (fd);
-+ cp = u.buf;
-+ }
-+
-+ return strstr (cp, "SMP") != NULL;
-+}
Deleted: glibc-package/branches/glibc-2.5/debian/patches/any/cvs-thread_signals.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/cvs-thread_signals.diff 2006-10-01 18:38:17 UTC (rev 1823)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/cvs-thread_signals.diff 2006-10-01 19:29:36 UTC (rev 1824)
@@ -1,47 +0,0 @@
-Status: in upstream as of 2006/07/24
- see http://sourceware.org/bugzilla/show_bug.cgi?id=2383
-
-===================================================================
-RCS file: /cvs/glibc/linuxthreads/linuxthreads/pthread.c,v
-retrieving revision 1.140
-retrieving revision 1.141
-diff -u -r1.140 -r1.141
---- linuxthreads/pthread.c 2006/07/24 15:12:15 1.140
-+++ linuxthreads/pthread.c 2006/07/24 19:20:26 1.141
-@@ -37,7 +37,7 @@
- #include <not-cancel.h>
-
- /* Sanity check. */
--#if !defined __SIGRTMIN || (__SIGRTMAX - __SIGRTMIN) < 3
-+#if !defined PTHREAD_SIGBASE && (!defined __SIGRTMIN || (__SIGRTMAX - __SIGRTMIN) < 3)
- # error "This must not happen"
- #endif
-
-@@ -181,9 +181,15 @@
- platform does not support any real-time signals we will define the
- values to some unreasonable value which will signal failing of all
- the functions below. */
-+#if defined (PTHREAD_SIGBASE)
-+int __pthread_sig_restart = PTHREAD_SIGBASE;
-+int __pthread_sig_cancel = PTHREAD_SIGBASE + 1;
-+int __pthread_sig_debug = PTHREAD_SIGBASE + 2;
-+#else
- int __pthread_sig_restart = __SIGRTMIN;
- int __pthread_sig_cancel = __SIGRTMIN + 1;
- int __pthread_sig_debug = __SIGRTMIN + 2;
-+#endif
-
- extern int __libc_current_sigrtmin_private (void);
-
-@@ -198,9 +204,11 @@
-
- if (__libc_current_sigrtmin_private () == -1)
- {
-+#ifndef PTHREAD_SIGBASE
- __pthread_sig_restart = SIGUSR1;
- __pthread_sig_cancel = SIGUSR2;
- __pthread_sig_debug = 0;
-+#endif
- }
- else
- {
Deleted: glibc-package/branches/glibc-2.5/debian/patches/any/cvs-uio_h.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/cvs-uio_h.diff 2006-10-01 18:38:17 UTC (rev 1823)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/cvs-uio_h.diff 2006-10-01 19:29:36 UTC (rev 1824)
@@ -1,33 +0,0 @@
-2006-04-27 Ulrich Drepper <drepper@redhat.com>
-
- * Protect against multiple inclusion.
-
- * Allow inclusion from <fcntl.h>.
-
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/bits/uio.h,v
-retrieving revision 1.4
-retrieving revision 1.6
-diff -u -r1.4 -r1.6
---- libc/sysdeps/unix/sysv/linux/bits/uio.h 2006/04/26 22:12:30 1.4
-+++ libc/sysdeps/unix/sysv/linux/bits/uio.h 2006/04/27 04:10:30 1.6
-@@ -16,10 +16,12 @@
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
--#ifndef _SYS_UIO_H
-+#if !defined _SYS_UIO_H && !defined _FCNTL_H
- # error "Never include <bits/uio.h> directly; use <sys/uio.h> instead."
- #endif
-
-+#ifndef _BITS_UIO_H
-+#define _BITS_UIO_H 1
-
- #include <sys/types.h>
-
-@@ -44,3 +46,5 @@
- void *iov_base; /* Pointer to data. */
- size_t iov_len; /* Length of data. */
- };
-+
-+#endif
Deleted: glibc-package/branches/glibc-2.5/debian/patches/locale/cvs-iso3166.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/locale/cvs-iso3166.diff 2006-10-01 18:38:17 UTC (rev 1823)
+++ glibc-package/branches/glibc-2.5/debian/patches/locale/cvs-iso3166.diff 2006-10-01 19:29:36 UTC (rev 1824)
@@ -1,23 +0,0 @@
-# DP: Description: Update to latest CVS
-# DP: Date: 2006-09-29
-
-Index: locale/iso-3166.def
-===================================================================
---- locale/iso-3166.def.orig
-+++ locale/iso-3166.def
-@@ -6,6 +6,7 @@
- * http://www.gnu.org/software/libc/bugs.html and follow
- * instructions there to file a bug report.
- */
-+DEFINE_COUNTRY_CODE ("AALAND ISLANDS", AX, ALA, 248)
- DEFINE_COUNTRY_CODE ("AFGHANISTAN", AF, AFG, 4)
- DEFINE_COUNTRY_CODE ("ALBANIA", AL, ALB, 8)
- DEFINE_COUNTRY_CODE ("ALGERIA", DZ, DZA, 12)
-@@ -149,6 +150,7 @@
- DEFINE_COUNTRY_CODE ("MOLDOVA, REPUBLIC OF", MD, MDA, 498)
- DEFINE_COUNTRY_CODE ("MONACO", MC, MCO, 492)
- DEFINE_COUNTRY_CODE ("MONGOLIA", MN, MNG, 496)
-+DEFINE_COUNTRY_CODE ("MONTENEGRO", ME, MNE, 499)
- DEFINE_COUNTRY_CODE ("MONTSERRAT", MS, MSR, 500)
- DEFINE_COUNTRY_CODE ("MOROCCO", MA, MAR, 504)
- DEFINE_COUNTRY_CODE ("MOZAMBIQUE", MZ, MOZ, 508)
Deleted: glibc-package/branches/glibc-2.5/debian/patches/mips/cvs-fork.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/mips/cvs-fork.diff 2006-10-01 18:38:17 UTC (rev 1823)
+++ glibc-package/branches/glibc-2.5/debian/patches/mips/cvs-fork.diff 2006-10-01 19:29:36 UTC (rev 1824)
@@ -1,11 +0,0 @@
-2006-03-11 Daniel Jacobowitz <dan@codesourcery.com>
-
- * sysdeps/unix/sysv/linux/mips/nptl/fork.c: Correct path to
- i386/fork.c.
-
-diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/mips/nptl/fork.c glibc-2.4/ports/sysdeps/unix/sysv/linux/mips/nptl/fork.c
---- glibc-2.4/ports/sysdeps/unix/sysv/linux/mips/nptl/fork.c 2005-03-28 11:21:52.000000000 +0200
-+++ glibc-2.4/ports/sysdeps/unix/sysv/linux/mips/nptl/fork.c 2006-03-11 17:20:03.000000000 +0100
-@@ -1 +1 @@
--#include "../i386/fork.c"
-+#include <sysdeps/unix/sysv/linux/i386/fork.c>
Deleted: glibc-package/branches/glibc-2.5/debian/patches/mips/cvs-resource.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/mips/cvs-resource.diff 2006-10-01 18:38:17 UTC (rev 1823)
+++ glibc-package/branches/glibc-2.5/debian/patches/mips/cvs-resource.diff 2006-10-01 19:29:36 UTC (rev 1824)
@@ -1,17 +0,0 @@
-2006-03-27 Denis Barbier <barbier@linuxfr.org>
-
- * sysdeps/unix/sysv/linux/mips/bits/resource.h (RLIMIT_RTPRIO): Fix
- typo.
-
-diff -Nurd glibc-2.4/ports/sysdeps/unix/sysv/linux/mips/bits/resource.h glibc-2.4/ports/sysdeps/unix/sysv/linux/mips/bits/resource.h
---- glibc-2.4/ports/sysdeps/unix/sysv/linux/mips/bits/resource.h 2005-06-20 17:07:34.000000000 +0200
-+++ glibc-2.4/ports/sysdeps/unix/sysv/linux/mips/bits/resource.h 2006-08-06 09:40:21.000000000 +0200
-@@ -98,7 +98,7 @@
- /* Maximum realtime priority allowed for non-priviledged
- processes. */
- __RLIMIT_RTPRIO = 14,
--#define RLIMIT_RTPRIO _RLIMIT_RTPRIO
-+#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
-
- __RLIMIT_NLIMITS = 15,
- __RLIM_NLIMITS = __RLIMIT_NLIMITS
Deleted: glibc-package/branches/glibc-2.5/debian/patches/powerpc/cvs-procfs.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/powerpc/cvs-procfs.diff 2006-10-01 18:38:17 UTC (rev 1823)
+++ glibc-package/branches/glibc-2.5/debian/patches/powerpc/cvs-procfs.diff 2006-10-01 19:29:36 UTC (rev 1824)
@@ -1,21 +0,0 @@
-2006-04-03 Andreas Schwab <schwab@suse.de>
-
- * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h: Test for <asm/elf.h>
- with [! _ASM_POWERPC_ELF_H] as well as [!__PPC64_ELF_H].
-
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h,v
-retrieving revision 1.13
-retrieving revision 1.14
-diff -u -r1.13 -r1.14
---- libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h 2006/01/13 07:58:57 1.13
-+++ libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h 2006/04/04 06:58:58 1.14
-@@ -35,7 +35,7 @@
- /* These definitions are normally provided by ucontext.h via
- asm/sigcontext.h, asm/ptrace.h, and asm/elf.h. Otherwise we define
- them here. */
--#ifndef __PPC64_ELF_H
-+#if !defined __PPC64_ELF_H && !defined _ASM_POWERPC_ELF_H
- #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */
- #define ELF_NFPREG 33 /* includes fpscr */
- #if __WORDSIZE == 32
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2006-10-01 18:38:17 UTC (rev 1823)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2006-10-01 19:29:36 UTC (rev 1824)
@@ -78,12 +78,10 @@
m68k/local-reloc.diff -p1
m68k/submitted-gcc34-seccomment.diff -p0
-mips/cvs-fork.diff -p1
mips/cvs-resource.diff -p1
mips/local-lazy-eval.diff -p2
mips/submitted-msq.diff -p0
-powerpc/cvs-procfs.diff -p1
powerpc/local-sysconf.diff -p1
sparc/local-fork.diff -p0
@@ -97,9 +95,6 @@
all/submitted-uninitialized-byte-LC_CTYPE.diff
any/cvs-getcwd_c.diff -p1
-any/cvs-uio_h.diff -p1
-any/cvs-sysctl.diff -p1
-any/cvs-thread_signals.diff -p0
any/local-__thread.diff -p0
any/local-asserth-decls.diff -p0
#any/local-base.diff -p0 # g: suspended
Reply to: