r2983 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2008-07-07 04:54:27 +0000 (Mon, 07 Jul 2008)
New Revision: 2983
Added:
glibc-package/trunk/debian/patches/any/cvs-getaddrinfo.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/any/cvs-getaddrinfo.diff: new patch from CVS to correctly
initialize internal resolver structures in getaddrinfo(). Closes:
#489586.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-07-07 00:49:29 UTC (rev 2982)
+++ glibc-package/trunk/debian/changelog 2008-07-07 04:54:27 UTC (rev 2983)
@@ -3,6 +3,9 @@
[ Aurelien Jarno ]
* Update Brazilian Portuguese debconf translation, by Felipe Augusto van de
Wiel. Closes: #485381.
+ * patches/any/cvs-getaddrinfo.diff: new patch from CVS to correctly
+ initialize internal resolver structures in getaddrinfo(). Closes:
+ #489586.
[ Petr Salinger]
* debian/sysdeps/kfreebsd.mk: also use the bsm/ directory from kernel
@@ -20,7 +23,7 @@
* patches/hurd-i386/cvs-open_2.diff: New patch to implement __open_2
and __openat_2.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 24 Jun 2008 11:36:17 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 07 Jul 2008 06:52:43 +0200
glibc (2.7-12) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/cvs-getaddrinfo.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-getaddrinfo.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-getaddrinfo.diff 2008-07-07 04:54:27 UTC (rev 2983)
@@ -0,0 +1,60 @@
+2008-06-13 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/posix/getaddrinfo.c: Move _res_hconf_init call to a
+ better place so it is not called when nscd is used.
+
+2008-05-14 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/posix/getaddrinfo.c (getaddrinfo): Call _res_hconf_init
+ if necessary.
+ * posix/tst-rfc3484.c: Add dummy definition of _res_hconf_init.
+ * posix/tst-rfc3484-2.c: Likewise.
+
+--- a/posix/tst-rfc3484-2.c 2008-07-07 06:20:38.000000000 +0200
++++ b/posix/tst-rfc3484-2.c 2008-07-07 06:22:43.000000000 +0200
+@@ -29,6 +29,11 @@
+ *output = NULL;
+ return 0;
+ }
++void
++attribute_hidden
++_res_hconf_init (void)
++{
++}
+
+ #include "../sysdeps/posix/getaddrinfo.c"
+
+--- a/posix/tst-rfc3484.c 2008-07-07 06:20:38.000000000 +0200
++++ b/posix/tst-rfc3484.c 2008-07-07 06:23:58.000000000 +0200
+@@ -29,6 +29,11 @@
+ *output = NULL;
+ return 0;
+ }
++void
++attribute_hidden
++_res_hconf_init (void)
++{
++}
+
+ #include "../sysdeps/posix/getaddrinfo.c"
+
+--- a/sysdeps/posix/getaddrinfo.c 2008-07-07 06:20:38.000000000 +0200
++++ b/sysdeps/posix/getaddrinfo.c 2008-07-07 06:23:27.000000000 +0200
+@@ -60,6 +60,7 @@
+ #include <not-cancel.h>
+ #include <nscd/nscd-client.h>
+ #include <nscd/nscd_proto.h>
++#include <resolv/res_hconf.h>
+
+ #ifdef HAVE_NETLINK_ROUTE
+ # include <kernel-features.h>
+@@ -674,6 +675,9 @@
+ "dns [!UNAVAIL=return] files",
+ &nip);
+
++ /* Initialize configurations. */
++ if (__builtin_expect (!_res_hconf.initialized, 0))
++ _res_hconf_init ();
+ if (__res_maybe_init (&_res, 0) == -1)
+ no_more = 1;
+
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2008-07-07 00:49:29 UTC (rev 2982)
+++ glibc-package/trunk/debian/patches/series 2008-07-07 04:54:27 UTC (rev 2983)
@@ -146,6 +146,7 @@
any/cvs-ether_line.diff -p0
any/cvs-fchmodat.diff -p1
any/cvs-gcc-4.3.diff -p1
+any/cvs-getaddrinfo.diff -p1
any/cvs-iconv-braces.diff
any/cvs-iconv-iso2022jp-loop-bug.diff
any/cvs-rfc3484.diff -p1
Reply to: