r3938 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2009-11-08 14:25:53 +0000 (Sun, 08 Nov 2009)
New Revision: 3938
Added:
glibc-package/trunk/debian/patches/any/submitted-etc-resolv.conf.diff
Removed:
glibc-package/trunk/debian/patches/any/submitted-missing-etc-resolv.conf.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/any/submitted-etc-resolv.conf.diff: also handle case when the file
is present, but a nameserver entry is missing. Closes: #552010.
* set urgency to high as it fixes a bug in testing.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-11-08 14:25:29 UTC (rev 3937)
+++ glibc-package/trunk/debian/changelog 2009-11-08 14:25:53 UTC (rev 3938)
@@ -1,4 +1,4 @@
-eglibc (2.10.1-6) UNRELEASED; urgency=low
+eglibc (2.10.1-6) UNRELEASED; urgency=high
[ Aurelien Jarno ]
* Don't ask to stop gdm before an upgrade, but run reload in the postint
@@ -9,6 +9,8 @@
* patches/any/submitted-sched_h.2.diff: allow const argument to CPU_ISSET()
Closes: #554901.
* kfreebsd/local-sysdeps.diff: update to revision 2819 (from glibc-bsd).
+ * patches/any/submitted-etc-resolv.conf.diff: also handle case when the file
+ is present, but a nameserver entry is missing. Closes: #552010.
-- Aurelien Jarno <aurel32@debian.org> Sun, 08 Nov 2009 14:58:38 +0100
Copied: glibc-package/trunk/debian/patches/any/submitted-etc-resolv.conf.diff (from rev 3934, glibc-package/trunk/debian/patches/any/submitted-missing-etc-resolv.conf.diff)
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-etc-resolv.conf.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/submitted-etc-resolv.conf.diff 2009-11-08 14:25:53 UTC (rev 3938)
@@ -0,0 +1,39 @@
+2009-11-08 Aurelien Jarno <aurelien@aurel32.net>
+
+ * resolv/res_init.c (__res_vinit): Initialize nameserver to the
+ loopback address if none specified.
+
+--- a/resolv/res_init.c
++++ b/resolv/res_init.c
+@@ -176,13 +176,6 @@ __res_vinit(res_state statp, int preinit) {
+ statp->id = res_randomid();
+ }
+
+-#ifdef USELOOPBACK
+- statp->nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
+-#else
+- statp->nsaddr.sin_addr.s_addr = INADDR_ANY;
+-#endif
+- statp->nsaddr.sin_family = AF_INET;
+- statp->nsaddr.sin_port = htons(NAMESERVER_PORT);
+ statp->nscount = 0;
+ statp->ndots = 1;
+ statp->pfcode = 0;
+@@ -433,6 +426,16 @@ __res_vinit(res_state statp, int preinit) {
+ #endif
+ (void) fclose(fp);
+ }
++ if (statp->nscount == 0) {
++ statp->nscount = 1;
++#ifdef USELOOPBACK
++ statp->nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
++#else
++ statp->nsaddr.sin_addr.s_addr = INADDR_ANY;
++#endif
++ statp->nsaddr.sin_family = AF_INET;
++ statp->nsaddr.sin_port = htons(NAMESERVER_PORT);
++ }
+ if (statp->defdname[0] == 0 &&
+ __gethostname(buf, sizeof(statp->defdname) - 1) == 0 &&
+ (cp = strchr(buf, '.')) != NULL)
+
Deleted: glibc-package/trunk/debian/patches/any/submitted-missing-etc-resolv.conf.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-missing-etc-resolv.conf.diff 2009-11-08 14:25:29 UTC (rev 3937)
+++ glibc-package/trunk/debian/patches/any/submitted-missing-etc-resolv.conf.diff 2009-11-08 14:25:53 UTC (rev 3938)
@@ -1,15 +0,0 @@
-2009-10-26 Aurelien Jarno <aurelien@aurel32.net>
-
- * resolv/res_init.c (__res_vinit): Initialize nscount to one.
-
---- a/resolv/res_init.c
-+++ b/resolv/res_init.c
-@@ -183,7 +183,7 @@ __res_vinit(res_state statp, int preinit) {
- #endif
- statp->nsaddr.sin_family = AF_INET;
- statp->nsaddr.sin_port = htons(NAMESERVER_PORT);
-- statp->nscount = 0;
-+ statp->nscount = 1;
- statp->ndots = 1;
- statp->pfcode = 0;
- statp->_vcsock = -1;
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-11-08 14:25:29 UTC (rev 3937)
+++ glibc-package/trunk/debian/patches/series 2009-11-08 14:25:53 UTC (rev 3938)
@@ -206,7 +206,7 @@
any/submitted-getent-gshadow.diff
any/cvs-getaddrinfo-nss-notfound.diff
any/submitted-missing-etc-hosts.diff
-any/submitted-missing-etc-resolv.conf.diff
+any/submitted-etc-resolv.conf.diff
any/submitted-localedef-mmap.diff
any/submitted-confname.h.diff
any/cvs-getutmpx-compat.diff
Reply to: