Author: aurel32
Date: 2011-02-26 14:30:32 +0000 (Sat, 26 Feb 2011)
New Revision: 4539
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-config_h_in.patch
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-ftw.diff
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-grantpt.diff
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-linuxthreads29.diff
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-memusage_no_mremap.diff
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-nosavesse.diff
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-readdir_r.diff
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-scripts.diff
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-undef-glibc.diff
Log:
Refresh kfreebsd specific patches
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-config_h_in.patch
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-config_h_in.patch
2011-02-26 14:22:32 UTC (rev 4538)
+++
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-config_h_in.patch
2011-02-26 14:30:32 UTC (rev 4539)
@@ -2,9 +2,13 @@
* config.h.in (__KFREEBSD_KERNEL_VERSION): Add.
+---
+ config.h.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
--- a/config.h.in
+++ b/config.h.in
-@@ -150,6 +150,9 @@
+@@ -159,6 +159,9 @@
/* Linux specific: minimum supported kernel version. */
#undef __LINUX_KERNEL_VERSION
@@ -14,4 +18,3 @@
/* Override abi-tags ABI version if necessary. */
#undef __ABI_TAG_VERSION
-
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-ftw.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-ftw.diff
2011-02-26 14:22:32 UTC (rev 4538)
+++ glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-ftw.diff
2011-02-26 14:30:32 UTC (rev 4539)
@@ -57,7 +57,7 @@
flag = FTW_SLN;
--- a/posix/glob.c
+++ b/posix/glob.c
-@@ -1222,42 +1222,21 @@
+@@ -1232,42 +1232,21 @@
allocated with alloca to be recycled. */
#if !defined _LIBC || !defined GLOB_ONLY_P
static int
@@ -102,7 +102,7 @@
#endif
-@@ -1332,10 +1311,6 @@
+@@ -1342,10 +1321,6 @@
}
else
{
@@ -113,7 +113,7 @@
int fnm_flags = ((!(flags & GLOB_PERIOD) ? FNM_PERIOD : 0)
| ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)
#if defined _AMIGA || defined VMS
-@@ -1394,7 +1369,7 @@
+@@ -1404,7 +1379,7 @@
/* If the file we found is a symlink we have to
make sure the target file exists. */
if (!DIRENT_MIGHT_BE_SYMLINK (d)
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-grantpt.diff
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-grantpt.diff
2011-02-26 14:22:32 UTC (rev 4538)
+++
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-grantpt.diff
2011-02-26 14:30:32 UTC (rev 4539)
@@ -1,6 +1,10 @@
+---
+ sysdeps/unix/grantpt.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
--- a/sysdeps/unix/grantpt.c
+++ b/sysdeps/unix/grantpt.c
-@@ -200,9 +200,13 @@
+@@ -201,9 +201,13 @@
else
{
int w;
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-linuxthreads29.diff
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-linuxthreads29.diff
2011-02-26 14:22:32 UTC (rev 4538)
+++
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-linuxthreads29.diff
2011-02-26 14:30:32 UTC (rev 4539)
@@ -1,9 +1,17 @@
some of these hacks should be solved properly by upstream ...
---- glibc-2.9.orig/nscd/connections.c
-+++ glibc-2.9/nscd/connections.c
-@@ -873,6 +873,7 @@
+---
+ linuxthreads/sysdeps/pthread/bits/libc-tsd.h | 12 ++++++------
+ linuxthreads/sysdeps/pthread/malloc-machine.h | 6 +++---
+ nscd/connections.c | 4 ++++
+ sysdeps/i386/tlsdesc.sym | 4 ++++
+ sysdeps/x86_64/tlsdesc.sym | 5 ++++-
+ 5 files changed, 21 insertions(+), 10 deletions(-)
+
+--- a/nscd/connections.c
++++ b/nscd/connections.c
+@@ -876,6 +876,7 @@
#endif
}
@@ -11,7 +19,7 @@
/* Create the socket. */
#ifndef __ASSUME_SOCK_CLOEXEC
sock = -1;
-@@ -885,6 +886,9 @@
+@@ -888,6 +889,9 @@
have_sock_cloexec = sock != -1 || errno != EINVAL ? 1 : -1;
#endif
}
@@ -21,8 +29,8 @@
#ifndef __ASSUME_SOCK_CLOEXEC
if (have_sock_cloexec < 0)
sock = socket (AF_UNIX, SOCK_STREAM, 0);
---- glibc-2.9.orig/sysdeps/i386/tlsdesc.sym
-+++ glibc-2.9/sysdeps/i386/tlsdesc.sym
+--- a/sysdeps/i386/tlsdesc.sym
++++ b/sysdeps/i386/tlsdesc.sym
@@ -8,7 +8,11 @@
-- Abuse tls.h macros to derive offsets relative to the thread register.
@@ -35,8 +43,8 @@
TLSDESC_ARG offsetof(struct tlsdesc, arg)
---- glibc-2.9.orig/sysdeps/x86_64/tlsdesc.sym
-+++ glibc-2.9/sysdeps/x86_64/tlsdesc.sym
+--- a/sysdeps/x86_64/tlsdesc.sym
++++ b/sysdeps/x86_64/tlsdesc.sym
@@ -5,10 +5,13 @@
#include <dl-tlsdesc.h>
@@ -52,8 +60,8 @@
TLSDESC_ARG offsetof(struct tlsdesc, arg)
---- glibc-2.9.orig/linuxthreads/sysdeps/pthread/malloc-machine.h
-+++ glibc-2.9/linuxthreads/sysdeps/pthread/malloc-machine.h
+--- a/linuxthreads/sysdeps/pthread/malloc-machine.h
++++ b/linuxthreads/sysdeps/pthread/malloc-machine.h
@@ -57,10 +57,10 @@
#include <bits/libc-tsd.h>
@@ -68,8 +76,8 @@
#include <sysdeps/generic/malloc-machine.h>
---- glibc-2.9.orig/linuxthreads/sysdeps/pthread/bits/libc-tsd.h
-+++ glibc-2.9/linuxthreads/sysdeps/pthread/bits/libc-tsd.h
+--- a/linuxthreads/sysdeps/pthread/bits/libc-tsd.h
++++ b/linuxthreads/sysdeps/pthread/bits/libc-tsd.h
@@ -42,14 +42,14 @@
weak_extern (__pthread_internal_tsd_set)
# endif
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-memusage_no_mremap.diff
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-memusage_no_mremap.diff
2011-02-26 14:22:32 UTC (rev 4538)
+++
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-memusage_no_mremap.diff
2011-02-26 14:30:32 UTC (rev 4539)
@@ -4,7 +4,7 @@
--- a/malloc/memusage.c
+++ b/malloc/memusage.c
-@@ -665,6 +665,8 @@
+@@ -674,6 +674,8 @@
return result;
}
@@ -13,7 +13,7 @@
/* `mmap' replacement. We do not have to keep track of the sizesince
`munmap' will get it as a parameter. */
-@@ -730,6 +732,7 @@
+@@ -739,6 +741,7 @@
/* Return the pointer to the user buffer. */
return result;
}
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-nosavesse.diff
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-nosavesse.diff
2011-02-26 14:22:32 UTC (rev 4538)
+++
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-nosavesse.diff
2011-02-26 14:30:32 UTC (rev 4539)
@@ -1,6 +1,10 @@
similar to 2.10 code
+---
+ sysdeps/x86_64/dl-trampoline.S | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/sysdeps/x86_64/dl-trampoline.S
+++ b/sysdeps/x86_64/dl-trampoline.S
@@ -163,7 +163,7 @@
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-readdir_r.diff
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-readdir_r.diff
2011-02-26 14:22:32 UTC (rev 4538)
+++
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-readdir_r.diff
2011-02-26 14:30:32 UTC (rev 4539)
@@ -1,6 +1,6 @@
---
- sysdeps/unix/readdir_r.c | 30 +++++++++++++++++++++++++++++-
- 1 file changed, 29 insertions(+), 1 deletion(-)
+ sysdeps/unix/readdir_r.c | 33 +++++++++++++++++++++++++--------
+ 1 file changed, 25 insertions(+), 8 deletions(-)
--- a/sysdeps/unix/readdir_r.c
+++ b/sysdeps/unix/readdir_r.c
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-scripts.diff
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-scripts.diff
2011-02-26 14:22:32 UTC (rev 4538)
+++
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-scripts.diff
2011-02-26 14:30:32 UTC (rev 4539)
@@ -1,10 +1,11 @@
---
- abi-tags | 2 +-
- configure | 6 +++---
- configure.in | 6 +++---
- linuxthreads/shlib-versions | 3 ++-
- shlib-versions | 4 ++++
- 5 files changed, 13 insertions(+), 8 deletions(-)
+ abi-tags | 2 +-
+ configure | 6 +++---
+ configure.in | 6 +++---
+ linuxthreads/shlib-versions | 3 ++-
+ linuxthreads_db/shlib-versions | 1 +
+ shlib-versions | 4 ++++
+ 6 files changed, 14 insertions(+), 8 deletions(-)
--- a/abi-tags
+++ b/abi-tags
@@ -19,7 +20,7 @@
--- a/configure
+++ b/configure
-@@ -2282,7 +2282,7 @@
+@@ -4021,7 +4021,7 @@
# i586-linuxaout is mangled into i586-pc-linux-gnuaout
linux*ecoff* | linux*aout* | gnu*aout* | gnu*ecoff*)
;;
@@ -28,7 +29,7 @@
# These systems (almost) always use the ELF format.
elf=yes
;;
-@@ -2489,7 +2489,7 @@
+@@ -4241,7 +4241,7 @@
###
if test -z "$enable_hacker_mode" && test x"$libc_config_ok" != xyes; then
case "$machine-$host_os" in
@@ -37,7 +38,7 @@
;;
*)
echo "*** The GNU C library is currently not available for this platform."
-@@ -2563,7 +2563,7 @@
+@@ -4448,7 +4448,7 @@
test "x$base_os" != x || case "$os" in
gnu*)
base_os=mach/hurd ;;
@@ -48,7 +49,7 @@
base_os=unix/bsd ;;
--- a/configure.in
+++ b/configure.in
-@@ -283,7 +283,7 @@
+@@ -348,7 +348,7 @@
# i586-linuxaout is mangled into i586-pc-linux-gnuaout
linux*ecoff* | linux*aout* | gnu*aout* | gnu*ecoff*)
;;
@@ -57,7 +58,7 @@
# These systems (almost) always use the ELF format.
elf=yes
;;
-@@ -469,7 +469,7 @@
+@@ -543,7 +543,7 @@
###
if test -z "$enable_hacker_mode" && test x"$libc_config_ok" != xyes; then
case "$machine-$host_os" in
@@ -66,7 +67,7 @@
;;
*)
echo "*** The GNU C library is currently not available for this platform."
-@@ -544,7 +544,7 @@
+@@ -701,7 +701,7 @@
test "x$base_os" != x || case "$os" in
gnu*)
base_os=mach/hurd ;;
@@ -85,7 +86,7 @@
# Configuration WORDSIZE[32|64] Alternate configuration
# ------------- ---------- -----------------------
-@@ -53,6 +54,7 @@
+@@ -58,6 +59,7 @@
sh.*-.*-linux.* libm=6 GLIBC_2.2
.*-.*-linux.* libm=6
.*-.*-gnu-gnu.* libm=6
@@ -93,7 +94,7 @@
# We provide libc.so.6 for Linux kernel versions 2.0 and later.
alpha.*-.*-linux.* libc=6.1
-@@ -60,6 +62,7 @@
+@@ -65,6 +67,7 @@
sh.*-.*-linux.* libc=6 GLIBC_2.2
sparc64.*-.*-linux.* libc=6 GLIBC_2.2
.*-.*-linux.* libc=6
@@ -101,7 +102,7 @@
# libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release.
.*-.*-gnu-gnu.* libmachuser=1
-@@ -81,6 +84,7 @@
+@@ -86,6 +89,7 @@
powerpc64.*-.*-linux.* ld=ld64.so.1 GLIBC_2.3
cris-.*-linux.* ld=ld.so.1 GLIBC_2.2
x86_64-.*-linux.* ld=ld-linux-x86-64.so.2 GLIBC_2.2.5
Modified:
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-undef-glibc.diff
===================================================================
---
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-undef-glibc.diff
2011-02-26 14:22:32 UTC (rev 4538)
+++
glibc-package/branches/eglibc-2.13/debian/patches/kfreebsd/local-undef-glibc.diff
2011-02-26 14:30:32 UTC (rev 4539)
@@ -8,11 +8,11 @@
--- a/include/features.h
+++ b/include/features.h
-@@ -310,6 +310,7 @@
+@@ -336,6 +336,7 @@
/* Major and minor version number of the GNU C library package. Use
these macros to test for features in specific releases. */
+#undef __GLIBC__
#define __GLIBC__ 2
- #define __GLIBC_MINOR__ 8
+ #define __GLIBC_MINOR__ 13
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ptlak-0005kh...@alioth.debian.org
