r2610 - in glibc-package/branches/glibc-2.7/debian: . patches patches/any
Author: madcoder
Date: 2007-10-27 08:39:33 +0000 (Sat, 27 Oct 2007)
New Revision: 2610
Modified:
glibc-package/branches/glibc-2.7/debian/changelog
glibc-package/branches/glibc-2.7/debian/patches/any/submitted-rfc3484-sortv4.diff
glibc-package/branches/glibc-2.7/debian/patches/series
Log:
update any/submitted-rfc3484-sortv4.diff
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 08:39:29 UTC (rev 2609)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 08:39:33 UTC (rev 2610)
@@ -2,6 +2,7 @@
* Remove any/local-iconv-fix-trampoline.diff (obsolete).
* Remove any/submitted-strfry.diff (merged).
+ * Update any/submitted-rfc3484-sortv4.diff.
-- Pierre Habouzit <madcoder@debian.org> Sat, 27 Oct 2007 10:32:57 +0200
Modified: glibc-package/branches/glibc-2.7/debian/patches/any/submitted-rfc3484-sortv4.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/any/submitted-rfc3484-sortv4.diff 2007-10-27 08:39:29 UTC (rev 2609)
+++ glibc-package/branches/glibc-2.7/debian/patches/any/submitted-rfc3484-sortv4.diff 2007-10-27 08:39:33 UTC (rev 2610)
@@ -11,22 +11,22 @@
* posix/gai.conf: Add the new sortv4 option.
---- posix/gai.conf 2007-08-16 22:59:03.000000000 +0200
-+++ posix/gai.conf 2007-08-16 22:58:48.000000000 +0200
+--- posix/gai.conf.orig
++++ posix/gai.conf
@@ -15,6 +15,11 @@
# changed and if necessary reload. This option should not really be
# used. There are possible runtime problems. The default is no.
#
+# sortv4 <yes|no>
+# If set to no, getaddrinfo(3) will ignore IPv4 adresses in rule 9. See
-+# section 6 in RFC 3484. The default is yes. Setting this option to
++# section 6 in RFC 3484. The default is yes. Setting this option to
+# no breaks conformance to RFC 3484.
+#
# label <mask> <value>
# Add another rule to the RFC 3484 label table. See section 2.1 in
# RFC 3484. The default is:
---- sysdeps/posix/getaddrinfo.c 2007-08-16 23:02:34.000000000 +0200
-+++ sysdeps/posix/getaddrinfo.c 2007-08-16 22:31:53.000000000 +0200
+--- sysdeps/posix/getaddrinfo.c.orig
++++ sysdeps/posix/getaddrinfo.c
@@ -79,6 +79,16 @@
# define UNIX_PATH_MAX 108
#endif
@@ -44,7 +44,7 @@
struct gaih_service
{
const char *name;
-@@ -1344,7 +1354,7 @@
+@@ -1345,7 +1355,7 @@
int bit1 = 0;
int bit2 = 0;
@@ -53,25 +53,10 @@
{
assert (a1->source_addr.ss_family == PF_INET);
assert (a2->source_addr.ss_family == PF_INET);
-@@ -1422,14 +1432,6 @@
- #define GAICONF_FNAME "/etc/gai.conf"
-
-
--/* Nozero if we are supposed to reload the config file automatically
-- whenever it changed. */
--static int gaiconf_reload_flag;
--
--/* Last modification time. */
--static struct timespec gaiconf_mtime;
--
--
- libc_freeres_fn(fini)
- {
- if (labels != default_labels)
-@@ -1608,6 +1610,8 @@
- case 6:
- if (strcmp (cmd, "reload") == 0)
- gaiconf_reload_flag = strcmp (val1, "yes") == 0;
+@@ -1619,6 +1629,8 @@
+ if (gaiconf_reload_flag)
+ gaiconf_reload_flag_ever_set = 1;
+ }
+ else if (strcmp (cmd, "sortv4") == 0)
+ gaiconf_sortv4_flag = strcmp (val1, "no") != 0;
break;
Modified: glibc-package/branches/glibc-2.7/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27 08:39:29 UTC (rev 2609)
+++ glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27 08:39:33 UTC (rev 2610)
@@ -151,7 +151,7 @@
any/submitted-date-and-unknown-tz.diff -p0
any/submitted-libgcc_s.so.diff -p0
any/submitted-longdouble.diff -p0
-# any/submitted-rfc3484-sortv4.diff -p0
+any/submitted-rfc3484-sortv4.diff -p0
any/local-disable-nscd-host-caching.diff
any/submitted-fileops-and-signals.diff
any/local-missing-linux_types.h.diff
Reply to: