r1552 - in glibc-package/branches/glibc-2.4/debian: . patches patches/any
Author: aurel32
Date: 2006-05-28 11:18:58 +0000 (Sun, 28 May 2006)
New Revision: 1552
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/any/local-ldso-disable-hwcap.diff
glibc-package/branches/glibc-2.4/debian/patches/any/local-rtld.diff
glibc-package/branches/glibc-2.4/debian/patches/any/local-version-sanity.diff
glibc-package/branches/glibc-2.4/debian/patches/any/submitted-nis-netgrp.diff
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
* Update any/local-ldso-disable-hwcap.diff.
* Update any/local-rtld.diff.
* Update any/local-version-sanity.diff.
* Update any/submitted-nis-netgrp.diff.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-05-28 10:16:42 UTC (rev 1551)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-05-28 11:18:58 UTC (rev 1552)
@@ -61,6 +61,10 @@
* Remove any/cvs-resource_h.diff (merged upstream).
* Remove any/cvs-tls-crashfix.diff (merged upstream).
* Remove any/local-kernel-features.diff (merged upstream).
+ * Update any/local-ldso-disable-hwcap.diff.
+ * Update any/local-rtld.diff.
+ * Update any/local-version-sanity.diff.
+ * Update any/submitted-nis-netgrp.diff.
* Remove hppa/cvs-linesep.diff (merged upstream).
* Update hppa/submitted-fenv-align.diff to reflect the new port add-on.
* Remove hurd-i386/cvs-ioctl-pfinet.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.4/debian/patches/any/local-ldso-disable-hwcap.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/local-ldso-disable-hwcap.diff 2006-05-28 10:16:42 UTC (rev 1551)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/local-ldso-disable-hwcap.diff 2006-05-28 11:18:58 UTC (rev 1552)
@@ -7,14 +7,14 @@
# DP: only need it because we support in-place upgrades.
# DP: Date: 2003-10-28, (Updated 2005-01-02 gotom)
-Index: sysdeps/generic/dl-sysdep.c
+Index: elf/dl-sysdep.c
===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/generic/dl-sysdep.c,v
+RCS file: /cvs/glibc/libc/elf/dl-sysdep.c,v
retrieving revision 1.113
diff -u -r1.113 dl-sysdep.c
---- sysdeps/generic/dl-sysdep.c 6 Nov 2004 00:24:47 -0000 1.113
-+++ sysdeps/generic/dl-sysdep.c 2 Jan 2005 10:24:13 -0000
-@@ -360,7 +360,11 @@
+--- elf/dl-sysdep.c 6 Nov 2004 00:24:47 -0000 1.113
++++ elf/dl-sysdep.c 2 Jan 2005 10:24:13 -0000
+@@ -408,7 +408,11 @@
#ifdef USE_TLS
/* For TLS enabled builds always add 'tls'. */
++cnt;
@@ -26,8 +26,8 @@
+
if (cnt == 0)
{
- /* If we have platform name and no important capability we only have
-@@ -375,7 +379,6 @@
+ /* If we no have platform name and no important capability we only
+@@ -423,7 +427,6 @@
*sz = 1;
return result;
}
@@ -35,7 +35,7 @@
/* Create temporary data structure to generate result table. */
temp = (struct r_strlenpair *) alloca (cnt * sizeof (*temp));
-@@ -417,9 +420,7 @@
+@@ -488,9 +491,7 @@
result = (struct r_strlenpair *) malloc (*sz * sizeof (*result) + total);
if (result == NULL)
{
@@ -45,13 +45,13 @@
_dl_signal_error (ENOMEM, NULL, NULL,
N_("cannot create capability list"));
}
-Index: sysdeps/generic/dl-cache.c
+Index: elf/dl-cache.c
===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/generic/dl-cache.c,v
+RCS file: /cvs/glibc/libc/elf/dl-cache.c,v
retrieving revision 1.46
diff -u -r1.46 dl-cache.c
---- sysdeps/generic/dl-cache.c 19 Mar 2004 00:36:32 -0000 1.46
-+++ sysdeps/generic/dl-cache.c 2 Jan 2005 10:23:42 -0000
+--- elf/dl-cache.c 19 Mar 2004 00:36:32 -0000 1.46
++++ elf/dl-cache.c 2 Jan 2005 10:23:42 -0000
@@ -244,6 +244,7 @@
if (cache_new != (void *) -1)
{
Modified: glibc-package/branches/glibc-2.4/debian/patches/any/local-rtld.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/local-rtld.diff 2006-05-28 10:16:42 UTC (rev 1551)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/local-rtld.diff 2006-05-28 11:18:58 UTC (rev 1552)
@@ -5,7 +5,6 @@
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
@@ -31,17 +30,6 @@
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 @@
Modified: glibc-package/branches/glibc-2.4/debian/patches/any/local-version-sanity.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/local-version-sanity.diff 2006-05-28 10:16:42 UTC (rev 1551)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/local-version-sanity.diff 2006-05-28 11:18:58 UTC (rev 1552)
@@ -13,12 +13,12 @@
--- glibc-2.3.2/sysdeps/unix/sysv/linux/dl-osinfo.h.orig 2003-11-01 14:20:45.000000000 -0500
+++ glibc-2.3.2/sysdeps/unix/sysv/linux/dl-osinfo.h 2003-11-01 14:21:32.000000000 -0500
-@@ -91,7 +91,7 @@
- version <<= 8; \
- version |= here; \
- \
-- if (*cp++ != '.') \
-+ if (*cp++ != '.' || parts == 3) \
- /* Another part following? */ \
- break; \
- } \
+@@ -127,7 +127,7 @@
+ version <<= 8;
+ version |= here;
+
+- if (*cp++ != '.')
++ if (*cp++ != '.' || parts == 3)
+ /* Another part following? */
+ break;
+ }
Modified: glibc-package/branches/glibc-2.4/debian/patches/any/submitted-nis-netgrp.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/submitted-nis-netgrp.diff 2006-05-28 10:16:42 UTC (rev 1551)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/submitted-nis-netgrp.diff 2006-05-28 11:18:58 UTC (rev 1552)
@@ -13,15 +13,15 @@
===================================================================
--- 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 @@
+@@ -71,7 +71,10 @@
and the last byte is filled with NUL. So we can simply
use that buffer. */
- assert (len > 0);
+ 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);*/
++ 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;
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-28 10:16:42 UTC (rev 1551)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-28 11:18:58 UTC (rev 1552)
@@ -101,7 +101,6 @@
all/submitted-new-brf-encoding.diff -p0
any/cvs-getcwd_c.diff -p1
-#any/cvs-tls-crashfix.diff -p1
any/local-asserth-decls.diff -p0
#any/local-base.diff -p0 # g: suspended
any/local-bashisms.diff
@@ -112,7 +111,7 @@
#any/local-globfree-clear.diff -p1 # g: suspended
any/local-ld-multiarch.diff -p1
any/local-ldd.diff -p0
-#any/local-ldso-disable-hwcap.diff -p0
+any/local-ldso-disable-hwcap.diff -p0
any/local-ldconfig.diff -p0
any/local-ldconfig-multiarch.diff -p1
any/local-ldconfig-tls.diff -p1
@@ -123,10 +122,10 @@
any/local-localedef-fix-trampoline.diff -p1
any/local-makeconfig.diff -p0
any/local-nss-upgrade.diff -p1
-#any/local-rtld.diff -p1
+any/local-rtld.diff -p1
any/local-tcsetaddr.diff -p1
any/local-ttyname-devfs.diff -p0
-#any/local-version-sanity.diff -p1
+any/local-version-sanity.diff -p1
#any/submitted-eh-frame-terminator.diff -p1
-#any/submitted-nis-netgrp.diff
+any/submitted-nis-netgrp.diff
any/submitted-strfmon.diff
Reply to: