r2624 - in glibc-package/branches/glibc-2.7/debian: . patches patches/hurd-i386
Author: aurel32
Date: 2007-10-27 13:37:03 +0000 (Sat, 27 Oct 2007)
New Revision: 2624
Modified:
glibc-package/branches/glibc-2.7/debian/changelog
glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/submitted-libc_once.diff
glibc-package/branches/glibc-2.7/debian/patches/series
Log:
* Update hurd-i386/submitted-libc_once.diff.
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 13:22:24 UTC (rev 2623)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 13:37:03 UTC (rev 2624)
@@ -12,12 +12,13 @@
[ Aurelien Jarno ]
* Improve any/submitted-rfc3484-sortv4.diff.
* Update hurd-i386/submitted-trivial.diff.
- * any/local-strfry.diff: new patch to fix strfry(), as Ulrich Drepper
+ * any/local-strfry.diff: new patch to fix strfry(), as Ulrich Drepper
has still not managed to commit a correct version.
* Remove hppa/submitted-threaddb.diff (merged).
* Update hppa/submitted-nptl-carlos.diff.
+ * Update hurd-i386/submitted-libc_once.diff.
- -- Aurelien Jarno <aurel32@debian.org> Sat, 27 Oct 2007 13:30:26 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 27 Oct 2007 15:36:20 +0200
glibc (2.7-0exp1) experimental; urgency=low
@@ -58,7 +59,6 @@
- Remove hppa/submitted-ustat.diff (merged).
- Disable hurd-i386/local-tls-support.diff.
- Remove hurd-i386/cvs-sigsuspend-nocancel.diff (merged).
- - Disable hurd-i386/submitted-libc_once.diff.
- Remove hurd-i386/cvs-lock-intern.diff (merged).
- Disable hurd-i386/cvs-ioctl-delay.diff.
- Remove sparc/local-undefined-registers.diff (obsolete).
Modified: glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/submitted-libc_once.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/submitted-libc_once.diff 2007-10-27 13:22:24 UTC (rev 2623)
+++ glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/submitted-libc_once.diff 2007-10-27 13:37:03 UTC (rev 2624)
@@ -18,24 +18,22 @@
--- sysdeps/posix/getaddrinfo.c.orig
+++ sysdeps/posix/getaddrinfo.c
-@@ -1927,11 +1927,13 @@
+@@ -1950,9 +1950,13 @@
if (naddrs > 1)
{
/* Read the config file. */
-+ void _gaiconf_reload (void)
-+ {
-+ if (gaiconf_reload_flag)
-+ gaiconf_reload ();
-+ }
++ void _gaiconf_reload (void)
++ {
++ if (gaiconf_reload_flag)
++ gaiconf_reload ();
++ }
__libc_once_define (static, once);
- __typeof (once) old_once = once;
- __libc_once (once, gaiconf_init);
-- if (old_once && gaiconf_reload_flag)
-- gaiconf_reload ();
+ __libc_once_else (once, gaiconf_init, _gaiconf_reload);
-
/* Sort results according to RFC 3484. */
struct sort_result results[nresults];
+ struct addrinfo *q;
--- bits/libc-lock.h.orig
+++ bits/libc-lock.h
@@ -89,7 +89,7 @@
Modified: glibc-package/branches/glibc-2.7/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27 13:22:24 UTC (rev 2623)
+++ glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27 13:37:03 UTC (rev 2624)
@@ -73,7 +73,7 @@
hurd-i386/local-tls.diff
# hurd-i386/local-tls-support.diff -p0
hurd-i386/submitted-ioctl-decode-argument.diff -p0
-# hurd-i386/submitted-libc_once.diff -p0
+hurd-i386/submitted-libc_once.diff -p0
hurd-i386/submitted-stat.diff -p0
hurd-i386/submitted-sysvshm.diff
hurd-i386/submitted-trivial.diff -p0
Reply to: