r1452 - in glibc-package/branches/glibc-2.4/debian/patches: . amd64 any hppa hurd-i386
Author: schizo
Date: 2006-04-22 23:35:56 +0000 (Sat, 22 Apr 2006)
New Revision: 1452
Added:
glibc-package/branches/glibc-2.4/debian/patches/amd64/local-biarch.diff
glibc-package/branches/glibc-2.4/debian/patches/any/cvs-argp_h.diff
glibc-package/branches/glibc-2.4/debian/patches/any/cvs-getcwd_c.diff
glibc-package/branches/glibc-2.4/debian/patches/any/cvs-resource_h.diff
glibc-package/branches/glibc-2.4/debian/patches/any/local-ld-multiarch.diff
glibc-package/branches/glibc-2.4/debian/patches/any/local-ldconfig-multiarch.diff
glibc-package/branches/glibc-2.4/debian/patches/any/local-rtld.diff
glibc-package/branches/glibc-2.4/debian/patches/any/submitted-nis-netgrp.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa/cvs-no-ldbl-128.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa/cvs-pie-relocs.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa/local-inlining.diff
glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/cvs-getresuid-dyslexia.diff
glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/cvs-machrules-make.diff
glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/submitted-ioctl-decode-argument.diff
Removed:
glibc-package/branches/glibc-2.4/debian/patches/amd64-i386-biarch.diff
glibc-package/branches/glibc-2.4/debian/patches/argp_h.diff
glibc-package/branches/glibc-2.4/debian/patches/getcwd_c.diff
glibc-package/branches/glibc-2.4/debian/patches/glibc235-nis-netgrp.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa-inlining.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa-no-ldbl-128.diff
glibc-package/branches/glibc-2.4/debian/patches/hppa-pie-relocs.diff
glibc-package/branches/glibc-2.4/debian/patches/hurd-getresuid-dyslexia.diff
glibc-package/branches/glibc-2.4/debian/patches/hurd-ioctl-decode-argument.diff
glibc-package/branches/glibc-2.4/debian/patches/hurd-machrules-make.diff
glibc-package/branches/glibc-2.4/debian/patches/ld-multiarch.diff
glibc-package/branches/glibc-2.4/debian/patches/ldconfig-multiarch.diff
glibc-package/branches/glibc-2.4/debian/patches/resource_h.diff
glibc-package/branches/glibc-2.4/debian/patches/rtld.diff
Log:
mirror some of the renames from trunk
Copied: glibc-package/branches/glibc-2.4/debian/patches/amd64/local-biarch.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/amd64-i386-biarch.diff)
Deleted: glibc-package/branches/glibc-2.4/debian/patches/amd64-i386-biarch.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/amd64-i386-biarch.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/amd64-i386-biarch.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -1,30 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Allow ldconfig to work on x86-64/i386 biarch systems
-
---- libc/sysdeps/unix/sysv/linux/x86_64/dl-cache.h.orig 2006-03-27 00:08:28.219686388 +0200
-+++ libc/sysdeps/unix/sysv/linux/x86_64/dl-cache.h 2006-03-27 00:09:23.199203246 +0200
-@@ -22,4 +22,23 @@
- #define _dl_cache_check_flags(flags) \
- ((flags) == _DL_CACHE_DEFAULT_ID)
-
--#include <sysdeps/unix/sysv/linux/sparc/dl-cache.h>
-+#define add_system_dir(dir) \
-+ do \
-+ { \
-+ size_t len = strlen (dir); \
-+ char path[len + 3]; \
-+ memcpy (path, dir, len + 1); \
-+ if (len >= 6 && ! memcmp (path + len - 6, "/lib32", 6)) \
-+ { \
-+ len -= 2; \
-+ path[len] = '\0'; \
-+ } \
-+ add_dir (path); \
-+ if (len >= 4 && ! memcmp (path + len - 4, "/lib", 4)) \
-+ { \
-+ memcpy (path + len, "32", 3); \
-+ add_dir (path); \
-+ } \
-+ } while (0)
-+
-+#include <sysdeps/generic/dl-cache.h>
Copied: glibc-package/branches/glibc-2.4/debian/patches/any/cvs-argp_h.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/argp_h.diff)
Copied: glibc-package/branches/glibc-2.4/debian/patches/any/cvs-getcwd_c.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/getcwd_c.diff)
Copied: glibc-package/branches/glibc-2.4/debian/patches/any/cvs-resource_h.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/resource_h.diff)
Copied: glibc-package/branches/glibc-2.4/debian/patches/any/local-ld-multiarch.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/ld-multiarch.diff)
Copied: glibc-package/branches/glibc-2.4/debian/patches/any/local-ldconfig-multiarch.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/ldconfig-multiarch.diff)
Copied: glibc-package/branches/glibc-2.4/debian/patches/any/local-rtld.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/rtld.diff)
Copied: glibc-package/branches/glibc-2.4/debian/patches/any/submitted-nis-netgrp.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/glibc235-nis-netgrp.diff)
Deleted: glibc-package/branches/glibc-2.4/debian/patches/argp_h.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/argp_h.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/argp_h.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -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.4/debian/patches/getcwd_c.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/getcwd_c.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/getcwd_c.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -1,19 +0,0 @@
-Use larger of PATH_MAX and page size when allocating buffer.
-See BZ2418
-Note: CVS 1.24 does not build, MAX macro is undefined
-
-Index: glibc-2.3.6/sysdeps/unix/sysv/linux/getcwd.c
-===================================================================
---- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/getcwd.c
-+++ glibc-2.3.6/sysdeps/unix/sysv/linux/getcwd.c
-@@ -86,7 +86,9 @@
- return NULL;
- }
-
-- alloc_size = PATH_MAX;
-+ alloc_size = __getpagesize ();
-+ if (alloc_size < PATH_MAX)
-+ alloc_size = PATH_MAX;
- }
-
- if (buf == NULL)
Deleted: glibc-package/branches/glibc-2.4/debian/patches/glibc235-nis-netgrp.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/glibc235-nis-netgrp.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/glibc235-nis-netgrp.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -1,27 +0,0 @@
-This assertion breaks applications if they redefine malloc/free functions,
-malloc_usable_size may then report wrong values. This is true for instance
-with bash, whereas bash-static works fine because it does not use its own
-wrapper functions. See #322011 and merged bugs.
-
-# DP: Dpatch author: Denis Barbier
-# DP: Patch author: Denis Barbier
-# DP: Upstream status: BZ692
-# DP: Date: 2006-01-12
-
-
-Index: glibc-2.3.5/nis/nss_nis/nis-netgrp.c
-===================================================================
---- glibc-2.3.5.orig/nis/nss_nis/nis-netgrp.c
-+++ glibc-2.3.5/nis/nss_nis/nis-netgrp.c
-@@ -76,7 +76,10 @@
- and the last byte is filled with NUL. So we can simply
- use that buffer. */
- assert (len > 0);
-- assert (malloc_usable_size (netgrp->data) >= len + 1);
-+ /* Call to malloc_usable_size disabled, this breaks if applications
-+ redefine malloc/free with a different implementation.
-+ This assert is always true, see yp_match. */
-+ /* assert (malloc_usable_size (netgrp->data) >= len + 1);*/
- assert (netgrp->data[len] == '\0');
-
- netgrp->data_size = len;
Copied: glibc-package/branches/glibc-2.4/debian/patches/hppa/cvs-no-ldbl-128.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/hppa-no-ldbl-128.diff)
Copied: glibc-package/branches/glibc-2.4/debian/patches/hppa/cvs-pie-relocs.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/hppa-pie-relocs.diff)
Copied: glibc-package/branches/glibc-2.4/debian/patches/hppa/local-inlining.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/hppa-inlining.diff)
Deleted: glibc-package/branches/glibc-2.4/debian/patches/hppa-inlining.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa-inlining.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa-inlining.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -1,14 +0,0 @@
-Increase the maximal overall growth of the compilation unit caused
-by inlining for dl-reloc.c on hppa. This remove some warnings and
-strangely it reduces the size of the final binary.
-
---- glibc-2.3.6/sysdeps/hppa/Makefile 2006-02-14 17:28:55.000000000 +0100
-+++ glibc-2.3.6/sysdeps/hppa/Makefile 2006-02-14 17:29:29.000000000 +0100
-@@ -24,6 +24,7 @@
-
- ifeq ($(subdir),elf)
- CFLAGS-rtld.c += -mdisable-fpregs
-+CFLAGS-dl-reloc.c += --param inline-unit-growth=100
- sysdep-dl-routines += dl-symaddr dl-fptr
- sysdep_routines += $(sysdep-dl-routines)
- sysdep-rtld-routines += $(sysdep-dl-routines)
Deleted: glibc-package/branches/glibc-2.4/debian/patches/hppa-no-ldbl-128.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa-no-ldbl-128.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa-no-ldbl-128.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -1,20 +0,0 @@
-We do not have a 128-bit long double implementation for PA, so do
-not imply that we need the 128-bit long double support in glibc.
-We will likely define long double equivalent to double.
-
-2005-06-18 Carlos O'Donell <carlos@systemhalted.org>
-
- * sysdeps/hppa/hppa1.1/Implies: Remove ldbl-128.
-
-===================================================================
-RCS file: /var/lib/cvs/glibc/sysdeps/hppa/hppa1.1/Implies,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- glibc/sysdeps/hppa/hppa1.1/Implies 2005/06/08 20:32:10 1.2
-+++ glibc/sysdeps/hppa/hppa1.1/Implies 2005/07/18 04:32:31 1.3
-@@ -1,4 +1,3 @@
- wordsize-32
- ieee754/flt-32
- ieee754/dbl-64
--ieee754/ldbl-128
Deleted: glibc-package/branches/glibc-2.4/debian/patches/hppa-pie-relocs.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hppa-pie-relocs.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/hppa-pie-relocs.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -1,120 +0,0 @@
-2005-06-10 Randolph Chung <tausq@debian.org>
-
- * elf/elf.h (R_PARISC_PLABEL21L, R_PARISC_PLABEL14R): Define.
- * sysdeps/hppa/dl-machine.h (reassemble_21, reassemble_14): Define.
- (elf_machine_rela): Handle R_PARISC_DIR21L/14R and
- R_PARISC_PLABEL21L/14R relocations.
-
-===================================================================
-RCS file: /var/lib/cvs/glibc/elf/elf.h,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- glibc/elf/elf.h 2005/06/09 01:14:04 1.3
-+++ glibc/elf/elf.h 2005/06/10 23:41:20 1.4
-@@ -1703,6 +1703,8 @@
- #define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */
- #define R_PARISC_FPTR64 64 /* 64 bits function address. */
- #define R_PARISC_PLABEL32 65 /* 32 bits function address. */
-+#define R_PARISC_PLABEL21L 66 /* Left 21 bits of fct ptr. */
-+#define R_PARISC_PLABEL14R 70 /* Left 21 bits of fct ptr. */
- #define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */
- #define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */
- #define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */
-
-===================================================================
-RCS file: /var/lib/cvs/glibc/sysdeps/hppa/dl-machine.h,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- glibc/sysdeps/hppa/dl-machine.h 2005/06/09 04:27:13 1.3
-+++ glibc/sysdeps/hppa/dl-machine.h 2005/06/10 23:41:20 1.4
-@@ -223,7 +223,8 @@
- }
- else
- {
-- if (_dl_name_match_p (GLRO(dl_profile), l))
-+ if (GLRO(dl_profile) != NULL
-+ && _dl_name_match_p (GLRO(dl_profile), l))
- {
- /* This is the object we are looking for. Say that
- we really want profiling and the timers are
-@@ -514,6 +515,18 @@
- /* These are only actually used where RESOLVE_MAP is defined, anyway. */
- #ifdef RESOLVE_MAP
-
-+
-+#define reassemble_21(as21) \
-+ ( (((as21) & 0x100000) >> 20) \
-+ | (((as21) & 0x0ffe00) >> 8) \
-+ | (((as21) & 0x000180) << 7) \
-+ | (((as21) & 0x00007c) << 14) \
-+ | (((as21) & 0x000003) << 12))
-+
-+#define reassemble_14(as14) \
-+ ( (((as14) & 0x1fff) << 1) \
-+ | (((as14) & 0x2000) >> 13))
-+
- auto void __attribute__((always_inline))
- elf_machine_rela (struct link_map *map,
- const Elf32_Rela *reloc,
-@@ -573,6 +586,27 @@
- }
- break;
-
-+ case R_PARISC_DIR21L:
-+ {
-+ unsigned int insn = *(unsigned int *)reloc_addr;
-+ value = sym_map->l_addr + sym->st_value
-+ + ((reloc->r_addend + 0x1000) & -0x2000);
-+ value = value >> 11;
-+ insn = (insn &~ 0x1fffff) | reassemble_21 (value);
-+ *(unsigned int *)reloc_addr = insn;
-+ }
-+ return;
-+
-+ case R_PARISC_DIR14R:
-+ {
-+ unsigned int insn = *(unsigned int *)reloc_addr;
-+ value = ((sym_map->l_addr + sym->st_value) & 0x7ff)
-+ + (((reloc->r_addend & 0x1fff) ^ 0x1000) - 0x1000);
-+ insn = (insn &~ 0x3fff) | reassemble_14 (value);
-+ *(unsigned int *)reloc_addr = insn;
-+ }
-+ return;
-+
- case R_PARISC_PLABEL32:
- /* Easy rule: If there is a symbol and it is global, then we
- need to make a dynamic function descriptor. Otherwise we
-@@ -591,6 +625,31 @@
- value = (Elf32_Addr)((unsigned int)_dl_make_fptr (sym_map, sym, value) | 2);
- break;
-
-+ case R_PARISC_PLABEL21L:
-+ case R_PARISC_PLABEL14R:
-+ {
-+ unsigned int insn = *(unsigned int *)reloc_addr;
-+
-+ if (__builtin_expect (sym == NULL, 0))
-+ break;
-+
-+ value = (Elf32_Addr)((unsigned int)_dl_make_fptr (sym_map, sym, value) | 2);
-+
-+ if (r_type == R_PARISC_PLABEL21L)
-+ {
-+ value >>= 11;
-+ insn = (insn &~ 0x1fffff) | reassemble_21 (value);
-+ }
-+ else
-+ {
-+ value &= 0x7ff;
-+ insn = (insn &~ 0x3fff) | reassemble_14 (value);
-+ }
-+
-+ *(unsigned int *)reloc_addr = insn;
-+ }
-+ return;
-+
- case R_PARISC_IPLT:
- if (__builtin_expect (sym_map != NULL, 1))
- {
Deleted: glibc-package/branches/glibc-2.4/debian/patches/hurd-getresuid-dyslexia.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hurd-getresuid-dyslexia.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/hurd-getresuid-dyslexia.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -1,341 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: [rs]etres[gu]id have misordered arguments
-# DP: This patch has been grabbed from BZ2329 and backported to 2.3.6
-# DP: Related bugs: #352500 BZ2329
-# DP: Dpatch author: Denis Barbier <barbier@debian.org>
-# DP: Patch author: Thomas Schwinge
-# DP: Upstream status: BZ2329
-# DP: Date: 2006-02-16
-
-2006-02-15 Thomas Schwinge <tschwinge@gnu.org>
-
- * include/unistd.h (__getresuid, __getresgid, __setresuid)
- (__setresgid): Correct prototypes.
- * posix/unistd.h (getresuid, getresgid, setresuid, setresgid):
- Likewise.
- * posix/getresuid.c (__getresuid): Correct definition.
- * posix/getresgid.c (__getresgid): Likewise.
- * posix/setresuid.c (__setresuid): Likewise.
- * posix/setresgid.c (__setresgid): Likewise.
- * sysdeps/mach/hurd/getresuid.c (__getresuid): Likewise.
- * sysdeps/mach/hurd/getresgid.c (__getresgid): Likewise.
- * sysdeps/mach/hurd/setresuid.c (__setresuid): Likewise.
- * sysdeps/mach/hurd/setresgid.c (__setresgid): Likewise.
-
- Reported by Samuel Thibault <samuel.thibault@ens-lyon.org>.
-
-Index: include/unistd.h
-===================================================================
-RCS file: /cvs/glibc/libc/include/unistd.h,v
-retrieving revision 1.45
-diff -u -r1.45 unistd.h
---- include/unistd.h 30 Jun 2004 07:35:39 -0000 1.45
-+++ include/unistd.h 15 Feb 2006 16:21:40 -0000
-@@ -96,10 +96,10 @@
- extern int __setpgid (__pid_t __pid, __pid_t __pgid);
- libc_hidden_proto (__setpgid)
- extern int __setregid (__gid_t __rgid, __gid_t __egid);
--extern int __getresuid (__uid_t *__euid, __uid_t *__ruid, __uid_t *__suid);
--extern int __getresgid (__gid_t *__egid, __gid_t *__rgid, __gid_t *__sgid);
--extern int __setresuid (__uid_t __euid, __uid_t __ruid, __uid_t __suid);
--extern int __setresgid (__gid_t __egid, __gid_t __rgid, __gid_t __sgid);
-+extern int __getresuid (__uid_t *__ruid, __uid_t *__euid, __uid_t *__suid);
-+extern int __getresgid (__gid_t *__rgid, __gid_t *__egid, __gid_t *__sgid);
-+extern int __setresuid (__uid_t __ruid, __uid_t __euid, __uid_t __suid);
-+extern int __setresgid (__gid_t __rgid, __gid_t __egid, __gid_t __sgid);
- libc_hidden_proto (__getresuid)
- libc_hidden_proto (__getresgid)
- libc_hidden_proto (__setresuid)
-Index: posix/unistd.h
---- posix/unistd.h 6 Jan 2006 12:14:05 -0000
-+++ posix/unistd.h 15 Feb 2006 16:21:41 -0000
-@@ -693,21 +693,21 @@
- #endif /* Use BSD. */
-
- #ifdef __USE_GNU
--/* Fetch the effective user ID, real user ID, and saved-set user ID,
-+/* Fetch the real user ID, effective user ID, and saved-set user ID,
- of the calling process. */
--extern int getresuid (__uid_t *__euid, __uid_t *__ruid, __uid_t *__suid);
-+extern int getresuid (__uid_t *__ruid, __uid_t *__euid, __uid_t *__suid);
-
--/* Fetch the effective group ID, real group ID, and saved-set group ID,
-+/* Fetch the real group ID, effective group ID, and saved-set group ID,
- of the calling process. */
--extern int getresgid (__gid_t *__egid, __gid_t *__rgid, __gid_t *__sgid);
-+extern int getresgid (__gid_t *__rgid, __gid_t *__egid, __gid_t *__sgid);
-
--/* Set the effective user ID, real user ID, and saved-set user ID,
-- of the calling process to EUID, RUID, and SUID, respectively. */
--extern int setresuid (__uid_t __euid, __uid_t __ruid, __uid_t __suid);
-+/* Set the real user ID, effective user ID, and saved-set user ID,
-+ of the calling process to RUID, EUID, and SUID, respectively. */
-+extern int setresuid (__uid_t __ruid, __uid_t __euid, __uid_t __suid);
-
--/* Set the effective group ID, real group ID, and saved-set group ID,
-- of the calling process to EGID, RGID, and SGID, respectively. */
--extern int setresgid (__gid_t __egid, __gid_t __rgid, __gid_t __sgid);
-+/* Set the real group ID, effective group ID, and saved-set group ID,
-+ of the calling process to RGID, EGID, and SGID, respectively. */
-+extern int setresgid (__gid_t __rgid, __gid_t __egid, __gid_t __sgid);
- #endif
-
-
-Index: sysdeps/generic/getresuid.c
---- sysdeps/generic/getresgid.c 14 Dec 2005 09:14:13 -0000
-+++ sysdeps/generic/getresgid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,4 +1,5 @@
--/* Copyright (C) 1991,1995,1996,1997,1998,2002 Free Software Foundation, Inc.
-+/* Copyright (C) 1991,1995,1996,1997,1998,2002,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
-@@ -19,10 +20,10 @@
- #include <errno.h>
- #include <unistd.h>
-
--/* Fetch the effective group ID, real group ID, and saved-set group ID,
-+/* Fetch the real group ID, effective group ID, and saved-set group ID,
- of the calling process. */
- int
--__getresgid (gid_t *egid, gid_t *rgid, gid_t *sgid)
-+__getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid)
- {
- __set_errno (ENOSYS);
- return -1;
-Index: sysdeps/generic/getresuid.c
---- sysdeps/generic/getresuid.c 14 Dec 2005 09:14:28 -0000
-+++ sysdeps/generic/getresuid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,4 +1,5 @@
--/* Copyright (C) 1991,1995,1996,1997,1998,2002 Free Software Foundation, Inc.
-+/* Copyright (C) 1991,1995,1996,1997,1998,2002,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
-@@ -19,10 +20,10 @@
- #include <errno.h>
- #include <unistd.h>
-
--/* Fetch the effective user ID, real user ID, and saved-set user ID,
-+/* Fetch the real user ID, effective user ID, and saved-set user ID,
- of the calling process. */
- int
--__getresuid (uid_t *euid, uid_t *ruid, uid_t *suid)
-+__getresuid (uid_t *ruid, uid_t *euid, uid_t *suid)
- {
- __set_errno (ENOSYS);
- return -1;
-Index: sysdeps/generic/setresgid.c
---- sysdeps/generic/setresgid.c 14 Dec 2005 10:48:25 -0000
-+++ sysdeps/generic/setresgid.c 15 Feb 2006 16:21:41 -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.
-+/* setresgid -- set real group ID, effective group ID, and saved-set group ID
-+ Copyright (C) 2002, 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
-@@ -20,10 +20,10 @@
- #include <errno.h>
- #include <unistd.h>
-
--/* Set the effective group ID, real group ID, and saved-set group ID,
-- of the calling process to EGID, RGID, and SGID, respectively. */
-+/* Set the real group ID, effective group ID, and saved-set group ID,
-+ of the calling process to RGID, EGID, and SGID, respectively. */
- int
--__setresgid (gid_t egid, gid_t rgid, gid_t sgid)
-+__setresgid (gid_t rgid, gid_t egid, gid_t sgid)
- {
- __set_errno (ENOSYS);
- return -1;
-Index: sysdeps/generic/setresuid.c
---- sysdeps/generic/setresuid.c 14 Dec 2005 10:48:41 -0000
-+++ sysdeps/generic/setresuid.c 15 Feb 2006 16:21:41 -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.
-+/* setresuid -- set real user ID, effective user ID, and saved-set user ID
-+ Copyright (C) 2002, 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
-@@ -20,10 +20,10 @@
- #include <errno.h>
- #include <unistd.h>
-
--/* Set the effective user ID, real user ID, and saved-set user ID,
-- of the calling process to EUID, RUID, and SUID, respectively. */
-+/* Set the real user ID, effective user ID, and saved-set user ID,
-+ of the calling process to RUID, EUID, and SUID, respectively. */
- int
--__setresuid (uid_t euid, uid_t ruid, uid_t suid)
-+__setresuid (uid_t ruid, uid_t euid, uid_t suid)
- {
- __set_errno (ENOSYS);
- return -1;
-Index: sysdeps/mach/hurd/getresgid.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/getresgid.c,v
-retrieving revision 1.1
-diff -u -r1.1 getresgid.c
---- sysdeps/mach/hurd/getresgid.c 14 Oct 2002 01:03:11 -0000 1.1
-+++ sysdeps/mach/hurd/getresgid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,5 +1,5 @@
--/* getresgid -- fetch effective group ID, real group ID, and saved-set group ID
-- Copyright (C) 2002 Free Software Foundation, Inc.
-+/* getresgid -- fetch real group ID, effective group ID, and saved-set group ID
-+ Copyright (C) 2002, 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
-@@ -22,13 +22,13 @@
- #include <hurd.h>
- #include <hurd/id.h>
-
--/* Fetch the effective group ID, real group ID, and saved-set group ID,
-+/* Fetch the real group ID, effective group ID, and saved-set group ID,
- of the calling process. */
- int
--__getresgid (gid_t *egid, gid_t *rgid, gid_t *sgid)
-+__getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid)
- {
- error_t err;
-- gid_t eff, real, saved;
-+ gid_t real, eff, saved;
-
- HURD_CRITICAL_BEGIN;
- __mutex_lock (&_hurd_id.lock);
-@@ -42,8 +42,8 @@
- else
- {
- real = _hurd_id.aux.gids[0];
-- saved = _hurd_id.aux.ngids < 2 ? real :_hurd_id.aux.gids[1];
- eff = _hurd_id.gen.ngids < 1 ? real : _hurd_id.gen.gids[0];
-+ saved = _hurd_id.aux.ngids < 2 ? real : _hurd_id.aux.gids[1];
- }
- }
-
-@@ -53,8 +53,8 @@
- if (err)
- return __hurd_fail (err);
-
-- *egid = eff;
- *rgid = real;
-+ *egid = eff;
- *sgid = saved;
- return 0;
- }
-Index: sysdeps/mach/hurd/getresuid.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/getresuid.c,v
-retrieving revision 1.1
-diff -u -r1.1 getresuid.c
---- sysdeps/mach/hurd/getresuid.c 14 Oct 2002 01:03:11 -0000 1.1
-+++ sysdeps/mach/hurd/getresuid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,5 +1,5 @@
--/* getresuid -- fetch effective user ID, real user ID, and saved-set user ID
-- Copyright (C) 2002 Free Software Foundation, Inc.
-+/* getresuid -- fetch real user ID, effective user ID, and saved-set user ID
-+ Copyright (C) 2002, 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
-@@ -22,13 +22,13 @@
- #include <hurd.h>
- #include <hurd/id.h>
-
--/* Fetch the effective user ID, real user ID, and saved-set user ID,
-+/* Fetch the real user ID, effective user ID, and saved-set user ID,
- of the calling process. */
- int
--__getresuid (uid_t *euid, uid_t *ruid, uid_t *suid)
-+__getresuid (uid_t *ruid, uid_t *euid, uid_t *suid)
- {
- error_t err;
-- uid_t eff, real, saved;
-+ uid_t real, eff, saved;
-
- HURD_CRITICAL_BEGIN;
- __mutex_lock (&_hurd_id.lock);
-@@ -42,8 +42,8 @@
- else
- {
- real = _hurd_id.aux.uids[0];
-- saved = _hurd_id.aux.nuids < 2 ? real :_hurd_id.aux.uids[1];
- eff = _hurd_id.gen.nuids < 1 ? real : _hurd_id.gen.uids[0];
-+ saved = _hurd_id.aux.nuids < 2 ? real : _hurd_id.aux.uids[1];
- }
- }
-
-@@ -53,8 +53,8 @@
- if (err)
- return __hurd_fail (err);
-
-- *euid = eff;
- *ruid = real;
-+ *euid = eff;
- *suid = saved;
- return 0;
- }
-Index: sysdeps/mach/hurd/setresgid.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/setresgid.c,v
-retrieving revision 1.2
-diff -u -r1.2 setresgid.c
---- sysdeps/mach/hurd/setresgid.c 15 Feb 2005 03:08:38 -0000 1.2
-+++ sysdeps/mach/hurd/setresgid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,5 +1,5 @@
--/* setresgid -- set effective group ID, real group ID, and saved-set group ID
-- Copyright (C) 2002, 2005 Free Software Foundation, Inc.
-+/* setresgid -- set real group ID, effective group ID, and saved-set group ID
-+ Copyright (C) 2002, 2005, 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
-@@ -22,10 +22,10 @@
- #include <hurd.h>
- #include <hurd/id.h>
-
--/* Set the effective group ID, real group ID, and saved-set group ID,
-- of the calling process to EGID, RGID, and SGID, respectively. */
-+/* Set the real group ID, effective group ID, and saved-set group ID,
-+ of the calling process to RGID, EGID, and SGID, respectively. */
- int
--__setresgid (gid_t egid, gid_t rgid, gid_t sgid)
-+__setresgid (gid_t rgid, gid_t egid, gid_t sgid)
- {
- auth_t newauth;
- error_t err;
-Index: sysdeps/mach/hurd/setresuid.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/setresuid.c,v
-retrieving revision 1.2
-diff -u -r1.2 setresuid.c
---- sysdeps/mach/hurd/setresuid.c 15 Feb 2005 03:08:38 -0000 1.2
-+++ sysdeps/mach/hurd/setresuid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,5 +1,5 @@
--/* setresuid -- set effective user ID, real user ID, and saved-set user ID
-- Copyright (C) 2002, 2005 Free Software Foundation, Inc.
-+/* setresuid -- set real user ID, effective user ID, and saved-set user ID
-+ Copyright (C) 2002, 2005, 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
-@@ -22,10 +22,10 @@
- #include <hurd.h>
- #include <hurd/id.h>
-
--/* Set the effective user ID, real user ID, and saved-set user ID,
-- of the calling process to EUID, RUID, and SUID, respectively. */
-+/* Set the real user ID, effective user ID, and saved-set user ID,
-+ of the calling process to RUID, EUID, and SUID, respectively. */
- int
--__setresuid (uid_t euid, uid_t ruid, uid_t suid)
-+__setresuid (uid_t ruid, uid_t euid, uid_t suid)
- {
- auth_t newauth;
- error_t err;
Copied: glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/cvs-getresuid-dyslexia.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/hurd-getresuid-dyslexia.diff)
Copied: glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/cvs-machrules-make.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/hurd-machrules-make.diff)
Copied: glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/submitted-ioctl-decode-argument.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/hurd-ioctl-decode-argument.diff)
Deleted: glibc-package/branches/glibc-2.4/debian/patches/hurd-ioctl-decode-argument.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hurd-ioctl-decode-argument.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/hurd-ioctl-decode-argument.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -1,58 +0,0 @@
-2005-07-28 Samuel Thibault <samuel.thibault@ens-lyon.org>
-
- * ioctl.c (__ioctl): Add handling of parameter-less ioctls.
-
-2005-07-28 Samuel Thibault <samuel.thibault@ens-lyon.org>
-
- * ioctls.h (_IOIW): New macro for immediate-write ioctls.
-
---- sysdeps/mach/hurd/ioctl.c 2005-07-26 23:26:28.000000000 +0200
-+++ sysdeps/mach/hurd/ioctl.c 2005-07-26 23:24:07.000000000 +0200
-@@ -79,7 +79,7 @@ __ioctl (int fd, unsigned long int reque
- void *p;
- #endif
-
-- void *arg;
-+ void *arg = NULL;
-
- error_t err;
-
-@@ -130,7 +130,7 @@ __ioctl (int fd, unsigned long int reque
- in (_IOT_COUNT1 (type), _IOT_TYPE1 (type));
- in (_IOT_COUNT2 (type), _IOT_TYPE2 (type));
- }
-- else if (_IOC_INOUT (request) == IOC_VOID)
-+ else if ((_IOC_INOUT (request) == IOC_VOID) && _IOT_COUNT0 (type))
- {
- /* The RPC takes a single integer_t argument.
- Rather than pointing to the value, ARG is the value itself. */
-@@ -197,11 +197,15 @@ __ioctl (int fd, unsigned long int reque
- return msg.header.RetCode;
- }
-
-- va_list ap;
-+ if (_IOT_COUNT0 (type))
-+ {
-+ /* Data need either be sent, received, or even both. */
-+ va_list ap;
-
-- va_start (ap, request);
-- arg = va_arg (ap, void *);
-- va_end (ap);
-+ va_start (ap, request);
-+ arg = va_arg (ap, void *);
-+ va_end (ap);
-+ }
-
- {
- /* Check for a registered handler for REQUEST. */
---- sysdeps/mach/hurd/bits/ioctls.h 2005-07-26 23:29:54.000000000 +0200
-+++ sysdeps/mach/hurd/bits/ioctls.h 2005-07-26 23:19:56.000000000 +0200
-@@ -118,6 +118,7 @@
- _IOT_foobar is defined either in this file,
- or where struct foobar is defined. */
- #define _IO(g, n) _IOC (IOC_VOID, (g), (n), 0)
-+#define _IOIW(g, n, t) _IOC (IOC_VOID, (g), (n), _IOC_ENCODE_TYPE (t))
- #define _IOR(g, n, t) _IOC (IOC_OUT, (g), (n), _IOC_ENCODE_TYPE (t))
- #define _IOW(g, n, t) _IOC (IOC_IN, (g), (n), _IOC_ENCODE_TYPE (t))
- #define _IOWR(g, n, t) _IOC (IOC_INOUT, (g), (n), _IOC_ENCODE_TYPE (t))
Deleted: glibc-package/branches/glibc-2.4/debian/patches/hurd-machrules-make.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hurd-machrules-make.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/hurd-machrules-make.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -1,35 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix GNU/Hurd build with make-3.81.
-# DP: Dpatch author: Michael Banck <mbanck@debian.org>
-# DP: Patch author: Roland McGrath
-# DP: Upstream status: Committed to HEAD, BZ #2507
-# DP: Date: 2006-04-04
-
-2006-04-03 Roland McGrath <roland@frob.com>
-
- [BZ #2507]
- * mach/Machrules (.udeps-targets): New variable.
- ($(objpfx)%.udeps static pattern rule): Use it to avoid \ inside
- quoted string.
-
-===================================================================
-RCS file: /cvs/glibc/libc/mach/Machrules,v
-retrieving revision 1.76
-retrieving revision 1.77
-diff -u -r1.76 -r1.77
---- libc/mach/Machrules 2006/02/01 22:44:28 1.76
-+++ libc/mach/Machrules 2006/04/04 00:22:05 1.77
-@@ -138,10 +138,11 @@
- # We must use $(CFLAGS) to get -O flags that affect #if's in header files.
- $(include-%.defs) | \
- $(CC) $(CFLAGS) $(CPPFLAGS) -M -x c - | \
-- sed -e 's,- *:,$@ $(@:.udeps=.ustamp) $(@:.udeps=.uh) $(@:.udeps=.__h)\
-- $(@:.udeps=_server.c) $(@:.udeps=_server.h):,' \
-+ sed -e 's,- *:,$(.udeps-targets):,' \
- $(sed-remove-objpfx) > $@.new
- mv -f $@.new $@
-+.udeps-targets = $@ $(@:.udeps=.ustamp) $(@:.udeps=.uh) $(@:.udeps=.__h) \
-+ $(@:.udeps=_server.c) $(@:.udeps=_server.h)
- endif
-
- # Look for the server stub files where they will be written.
Deleted: glibc-package/branches/glibc-2.4/debian/patches/ld-multiarch.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/ld-multiarch.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/ld-multiarch.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -1,29 +0,0 @@
-2005-01-20 Tollef Fog Heen <tfheen@debian.org>
-
- * Makeconfig: add multiarch support
-
---- glibc-2.3.6/Makeconfig 2006-02-22 12:44:52.424091146 +0100
-+++ glibc-2.3.6/Makeconfig 2006-02-22 12:45:52.161604171 +0100
-@@ -176,6 +176,11 @@
- endif
- inst_libdir = $(install_root)$(libdir)
-
-+# Extra places to look for libraries
-+ifndef extra_libdir
-+extra_libdir = /lib/$(config-machine)-$(config-os):$(exec_prefix)/lib/$(config-machine)-$(config-os)
-+endif
-+
- # Where to install the shared library and dynamic linker.
- ifndef slibdir
- slibdir = $(exec_prefix)/lib
-@@ -479,6 +484,10 @@
- default-rpath = $(libdir)
- endif
-
-+ifdef extra_libdir
-+default-rpath += :$(extra_libdir)
-+endif
-+
- ifndef link-extra-libs
- link-extra-libs = $(LDLIBS-$(@F))
- link-extra-libs-static = $(link-extra-libs)
Deleted: glibc-package/branches/glibc-2.4/debian/patches/ldconfig-multiarch.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/ldconfig-multiarch.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/ldconfig-multiarch.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -1,138 +0,0 @@
---- glibc-2.3.6/elf/ldconfig.c.orig 2005-02-16 11:29:34.000000000 +0100
-+++ glibc-2.3.6/elf/ldconfig.c 2006-03-26 23:37:33.665182082 +0200
-@@ -1027,6 +1027,125 @@
- fclose (file);
- }
-
-+static void
-+add_multiarch_dirs (const char *path)
-+{
-+ DIR *dir;
-+ struct dirent64 *direntry;
-+ char *file_name, *dir_name, *real_file_name, *link_path;
-+ int file_name_len, real_file_name_len, link_path_len, len;
-+ struct stat64 lstat_buf, stat_buf;
-+ int is_link, is_dir;
-+
-+ file_name_len = PATH_MAX;
-+ file_name = alloca (file_name_len);
-+
-+ link_path_len = PATH_MAX;
-+ link_path = alloca (link_path_len);
-+
-+ if (opt_chroot)
-+ {
-+ dir_name = chroot_canon (opt_chroot, path);
-+ real_file_name_len = PATH_MAX;
-+ real_file_name = alloca (real_file_name_len);
-+ }
-+ else
-+ {
-+ dir_name = xstrdup(path);
-+ real_file_name_len = 0;
-+ real_file_name = file_name;
-+ }
-+
-+ if (dir_name == NULL || (dir = opendir (dir_name)) == NULL)
-+ {
-+ if (opt_verbose)
-+ error (0, errno, _("Can't open directory %s"), path);
-+ if (opt_chroot && dir_name)
-+ free (dir_name);
-+ return;
-+ }
-+
-+ while ((direntry = readdir64 (dir)) != NULL)
-+ {
-+#ifdef _DIRENT_HAVE_D_TYPE
-+ /* We only look at links. */
-+ if (direntry->d_type != DT_UNKNOWN && direntry->d_type != DT_LNK)
-+ continue;
-+#endif /* _DIRENT_HAVE_D_TYPE */
-+
-+ len = strlen (path) + strlen (direntry->d_name);
-+ if (len > file_name_len)
-+ {
-+ file_name_len = len + 1;
-+ file_name = alloca (file_name_len);
-+ if (!opt_chroot)
-+ real_file_name = file_name;
-+ }
-+ sprintf (file_name, "%s/%s", path, direntry->d_name);
-+ if (opt_chroot)
-+ {
-+ len = strlen (dir_name) + strlen (direntry->d_name);
-+ if (len > real_file_name_len)
-+ {
-+ real_file_name_len = len + 1;
-+ real_file_name = alloca (real_file_name_len);
-+ }
-+ sprintf (real_file_name, "%s/%s", dir_name, direntry->d_name);
-+ }
-+
-+ if (__builtin_expect (lstat64 (real_file_name, &lstat_buf), 0))
-+ {
-+ error (0, errno, _("Cannot lstat %s"), file_name);
-+ continue;
-+ }
-+
-+ /* We only look at links. */
-+ is_link = S_ISLNK (lstat_buf.st_mode);
-+ if (!is_link)
-+ continue;
-+
-+ /* Check the symlink refers to a directory. */
-+ if (__builtin_expect (stat64 (real_file_name, &stat_buf), 0))
-+ {
-+ if (opt_verbose)
-+ error (0, errno, _("Cannot stat %s"), file_name);
-+ continue;
-+ }
-+
-+ is_dir = S_ISDIR (stat_buf.st_mode);
-+ if (!is_dir)
-+ {
-+ if (opt_verbose)
-+ error (0, errno, _("%s is not a directory"), file_name);
-+ continue;
-+ }
-+
-+ /* Read the link. */
-+ if (realpath(real_file_name, link_path) == NULL)
-+ {
-+ if (opt_verbose)
-+ error (0, errno, _("Cannot read link %s"), file_name);
-+ continue;
-+ }
-+
-+ if (opt_chroot)
-+ {
-+ len = strlen(opt_chroot);
-+ if (strncmp(opt_chroot, link_path, len) == 0)
-+ add_dir(link_path + len);
-+ else
-+ error (0, errno, _("Link %s refers to outside of the chroot"), file_name);
-+ }
-+ else
-+ {
-+ add_dir(link_path);
-+ }
-+ }
-+
-+ closedir (dir);
-+ free (dir_name);
-+}
-+
- /* Handle one word in an `include' line, a glob pattern of additional
- config files to read. */
- static void
-@@ -1215,6 +1334,9 @@
- add_system_dir (SLIBDIR);
- if (strcmp (SLIBDIR, LIBDIR))
- add_system_dir (LIBDIR);
-+
-+ /* Add multiarch directories. */
-+ add_multiarch_dirs("/lib/ldconfig");
- }
-
- search_dirs ();
Deleted: glibc-package/branches/glibc-2.4/debian/patches/resource_h.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/resource_h.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/resource_h.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -1,151 +0,0 @@
-Modified files:
- sysdeps/unix/sysv/linux/bits: resource.h
- sysdeps/unix/sysv/linux/alpha/bits: resource.h
- sysdeps/unix/sysv/linux/sparc/bits: resource.h
- sysdeps/unix/sysv/linux/mips/bits: resource.h
-
-Log message:
- (RLIMIT_NICE, RLIMIT_RTPRIO): Add.
- (RLIMIT_NLIMITS): Adjust.
-
-2006-03-18: Denis Barbier
- There is a typo in CVS in the last chunk of sysdeps/unix/sysv/linux/mips/bits/resource.h
- s/_RLIMIT_RTPRIO/__RLIMIT_RTPRIO/
-
-libc/sysdeps/unix/sysv/linux/mips/bits/resource.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/bits/resource.h,v
-retrieving revision 1.17
-retrieving revision 1.19
-diff -u -r1.17 -r1.19
---- libc/sysdeps/unix/sysv/linux/bits/resource.h 2004/08/16 08:51:45 1.17
-+++ libc/sysdeps/unix/sysv/linux/bits/resource.h 2005/06/21 18:38:46 1.19
-@@ -1,5 +1,5 @@
- /* Bit values & structures for resource limits. Linux version.
-- Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004
-+ Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005
- Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
-@@ -89,7 +89,18 @@
- __RLIMIT_MSGQUEUE = 12,
- #define RLIMIT_MSGQUEUE __RLIMIT_MSGQUEUE
-
-- __RLIMIT_NLIMITS = 13,
-+ /* Maximum nice priority allowed to raise to.
-+ Nice levels 19 .. -20 correspond to 0 .. 39
-+ values of this resource limit. */
-+ __RLIMIT_NICE = 13,
-+#define RLIMIT_NICE __RLIMIT_NICE
-+
-+ /* Maximum realtime priority allowed for non-priviledged
-+ processes. */
-+ __RLIMIT_RTPRIO = 14,
-+#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
-+
-+ __RLIMIT_NLIMITS = 15,
- __RLIM_NLIMITS = __RLIMIT_NLIMITS
- #define RLIMIT_NLIMITS __RLIMIT_NLIMITS
- #define RLIM_NLIMITS __RLIM_NLIMITS
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h,v
-retrieving revision 1.6
-retrieving revision 1.8
-diff -u -r1.6 -r1.8
---- libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h 2004/08/16 08:51:46 1.6
-+++ libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h 2005/06/21 18:38:49 1.8
-@@ -1,5 +1,5 @@
- /* Bit values & structures for resource limits. Alpha/Linux version.
-- Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004
-+ Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005
- Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
-@@ -89,7 +89,18 @@
- __RLIMIT_MSGQUEUE = 12,
- #define RLIMIT_MSGQUEUE __RLIMIT_MSGQUEUE
-
-- __RLIMIT_NLIMITS = 13,
-+ /* Maximum nice priority allowed to raise to.
-+ Nice levels 19 .. -20 correspond to 0 .. 39
-+ values of this resource limit. */
-+ __RLIMIT_NICE = 13,
-+#define RLIMIT_NICE __RLIMIT_NICE
-+
-+ /* Maximum realtime priority allowed for non-priviledged
-+ processes. */
-+ __RLIMIT_RTPRIO = 14,
-+#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
-+
-+ __RLIMIT_NLIMITS = 15,
- __RLIM_NLIMITS = __RLIMIT_NLIMITS
- #define RLIMIT_NLIMITS __RLIMIT_NLIMITS
- #define RLIM_NLIMITS __RLIM_NLIMITS
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h,v
-retrieving revision 1.7
-retrieving revision 1.9
-diff -u -r1.7 -r1.9
---- libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h 2004/08/16 08:51:46 1.7
-+++ libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h 2005/06/21 18:38:50 1.9
-@@ -1,5 +1,5 @@
- /* Bit values & structures for resource limits. Linux/SPARC version.
-- Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004
-+ Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005
- Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
-@@ -89,7 +89,18 @@
- __RLIMIT_MSGQUEUE = 12,
- #define RLIMIT_MSGQUEUE __RLIMIT_MSGQUEUE
-
-- __RLIMIT_NLIMITS = 13,
-+ /* Maximum nice priority allowed to raise to.
-+ Nice levels 19 .. -20 correspond to 0 .. 39
-+ values of this resource limit. */
-+ __RLIMIT_NICE = 13,
-+#define RLIMIT_NICE __RLIMIT_NICE
-+
-+ /* Maximum realtime priority allowed for non-priviledged
-+ processes. */
-+ __RLIMIT_RTPRIO = 14,
-+#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
-+
-+ __RLIMIT_NLIMITS = 15,
- __RLIM_NLIMITS = __RLIMIT_NLIMITS
- #define RLIMIT_NLIMITS __RLIMIT_NLIMITS
- #define RLIM_NLIMITS __RLIM_NLIMITS
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/mips/bits/resource.h,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -r1.7 -r1.8
---- libc/sysdeps/unix/sysv/linux/mips/bits/resource.h 2004/08/16 08:51:46 1.7
-+++ libc/sysdeps/unix/sysv/linux/mips/bits/resource.h 2005/06/20 15:07:34 1.8
-@@ -1,5 +1,5 @@
- /* Bit values & structures for resource limits. Linux/MIPS version.
-- Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004
-+ Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005
- Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
-@@ -89,7 +89,18 @@
- __RLIMIT_MSGQUEUE = 12,
- #define RLIMIT_MSGQUEUE __RLIMIT_MSGQUEUE
-
-- __RLIMIT_NLIMITS = 13,
-+ /* Maximum nice priority allowed to raise to.
-+ Nice levels 19 .. -20 correspond to 0 .. 39
-+ values of this resource limit. */
-+ __RLIMIT_NICE = 13,
-+#define RLIMIT_NICE __RLIMIT_NICE
-+
-+ /* Maximum realtime priority allowed for non-priviledged
-+ processes. */
-+ __RLIMIT_RTPRIO = 14,
-+#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
-+
-+ __RLIMIT_NLIMITS = 15,
- __RLIM_NLIMITS = __RLIMIT_NLIMITS
- #define RLIMIT_NLIMITS __RLIMIT_NLIMITS
- #define RLIM_NLIMITS __RLIM_NLIMITS
Deleted: glibc-package/branches/glibc-2.4/debian/patches/rtld.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/rtld.diff 2006-04-22 15:37:51 UTC (rev 1451)
+++ glibc-package/branches/glibc-2.4/debian/patches/rtld.diff 2006-04-22 23:35:56 UTC (rev 1452)
@@ -1,55 +0,0 @@
-2006-01-21 Aurelien Jarno <aurel32@debian.org>
-
- * Makeconfig: new configuration variable rtlddir to change the
- dynamic linker in the ELF binaries, which defaults to slibdir
-
-2005-08-30 Andreas Jochen <Andreas Jochens>
- * Makeconfig: use rtlddir instead of slibdir
- * dlfcn/Makefile: likewise
- * elf/Makefile: likewise
-
---- glibc-2.3.6/Makeconfig 2005-08-30 17:48:26.000000000 +0000
-+++ glibc-2.3.6/Makeconfig 2005-08-30 18:38:37.000000000 +0000
-@@ -187,6 +187,11 @@
- endif
- inst_slibdir = $(install_root)$(slibdir)
-
-+# Directory of the dynamic linker in the ELF binaries
-+ifndef rtlddir
-+rtlddir := $(slibdir)
-+endif
-+
- # Prefix to put on files installed in $(libdir). For libraries `libNAME.a',
- # the prefix is spliced between `lib' and the name, so the linker switch
- # `-l$(libprefix)NAME' finds the library; for other files the prefix is
-@@ -438,7 +443,7 @@
- endif
- ifndef config-LDFLAGS
- ifeq (yesyes,$(build-shared)$(elf))
--config-LDFLAGS = -Wl,-dynamic-linker=$(slibdir)/$(rtld-installed-name)
-+config-LDFLAGS = -Wl,-dynamic-linker=$(rtlddir)/$(rtld-installed-name)
- endif
- endif
- ifndef link-libc
---- glibc-2.3.6/dlfcn/Makefile 2004-10-18 23:08:31.000000000 +0000
-+++ glibc-2.3.6/dlfcn/Makefile 2005-08-30 18:38:37.000000000 +0000
-@@ -65,7 +65,7 @@
-
- include ../Rules
-
--LDFLAGS-dl.so = -Wl,-dynamic-linker,$(slibdir)/$(rtld-installed-name)
-+LDFLAGS-dl.so = -Wl,-dynamic-linker,$(rtlddir)/$(rtld-installed-name)
-
- test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
- $(test-modules): $(objpfx)%.so: $(objpfx)%.os $(common-objpfx)shlib.lds
---- glibc-2.3.6/elf/Makefile 2005-08-30 17:48:26.000000000 +0000
-+++ glibc-2.3.6/elf/Makefile 2005-08-30 18:38:37.000000000 +0000
-@@ -296,7 +296,7 @@
- rm -f $@.lds
-
- # interp.c exists just to get this string into the libraries.
--CFLAGS-interp.c = -D'RUNTIME_LINKER="$(slibdir)/$(rtld-installed-name)"' \
-+CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"' \
- -DNOT_IN_libc=1
- $(objpfx)interp.os: $(common-objpfx)config.make
-
Reply to: