Update.

	* nscd/Makefile (nscd-modules): Add gai.
	* nscd/gai.c: New file.

5 files changed, 50 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index c6419d6c8d..e2a2088ed7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-04  Ulrich Drepper  <drepper@redhat.com>
 
+	* nscd/Makefile (nscd-modules): Add gai.
+	* nscd/gai.c: New file.
+
 	* assert/assert.h: Give up on using __builtin_expect.
 
 	* elf/rtld.c (dl_main): Only skip => output in ldd mode if both
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 7014099b68..065136e8d7 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/gu_IN: Update various incorrect and missing information.
+	Patch by Ankit Patel <ankit@redhat.com>.
+
 2004-09-28  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/nb_NO: Make language field consistent in form with nn_NO.
diff --git a/localedata/locales/gu_IN b/localedata/locales/gu_IN
index 0e0dc65e57..aaca913f2c 100644
--- a/localedata/locales/gu_IN
+++ b/localedata/locales/gu_IN
@@ -1,11 +1,12 @@
 comment_char    %
 escape_char     /
-% Gurajati language locale for India.
-% Copied fron hi_IN one, G Karunakar <karunakar@freedomink.org>
+% Gurajati Language Locale For India.
+% Copied from hi_IN one, G Karunakar <karunakar@freedomink.org>
 % Gujarati stuff from Tapan Parikh <tap2k@yahoo.com>
+% Gujarati stuff Modified by Ankit Patel <ankit@redhat.com>
 
 LC_IDENTIFICATION
-title      "Gujarati language locale for India"
+title      "Gujarati Language Locale For India"
 source     "IndLinux.org"
 address    ""
 contact    ""
@@ -14,8 +15,8 @@ tel        ""
 fax        ""
 language   "Gujarati"
 territory  "India"
-revision   "0.1"
-date       "2003-01-10"
+revision   "0.2"
+date       "2004-14-09"
 %
 category  "gu_IN:2000";LC_IDENTIFICATION
 category  "gu_IN:2000";LC_CTYPE
@@ -53,7 +54,7 @@ currency_symbol       "<U0AB0><U0AC1>"
 mon_decimal_point     "<U002E>"
 mon_thousands_sep     "<U002C>"
 mon_grouping          3
-positive_sign         ""
+positive_sign         "<U002B>"
 negative_sign         "<U002D>"
 int_frac_digits       2
 frac_digits           2
@@ -79,7 +80,7 @@ LC_TIME
 % Abbreviated weekday names (%a)
 abday		"<U0AB0><U0AB5><U0ABF>";/
 		"<U0AB8><U0ACB><U0AAE>";/
-		"<U0AAE><U0AA8><U0ACD><U0A97><U0AB3>";/
+		"<U0AAE><U0A82><U0A97><U0AB3>";/
 		"<U0AAC><U0AC1><U0AA7>";/
 		"<U0A97><U0AC1><U0AB0><U0AC1>";/
 		"<U0AB6><U0AC1><U0A95><U0ACD><U0AB0>";/
@@ -89,7 +90,7 @@ abday		"<U0AB0><U0AB5><U0ABF>";/
 % Full weekday names (%A)
 day		"<U0AB0><U0AB5><U0ABF><U0AB5><U0ABE><U0AB0>";/
 		"<U0AB8><U0ACB><U0AAE><U0AB5><U0ABE><U0AB0>";/
-		"<U0AAE><U0AA8><U0ACD><U0A97><U0AB3><U0AB5><U0ABE><U0AB0>";/
+		"<U0AAE><U0A82><U0A97><U0AB3><U0AB5><U0ABE><U0AB0>";/
 		"<U0AAC><U0AC1><U0AA7><U0AB5><U0ABE><U0AB0>";/
 		"<U0A97><U0AC1><U0AB0><U0AC1><U0AB5><U0ABE><U0AB0>";/
 		"<U0AB6><U0AC1><U0A95><U0ACD><U0AB0><U0AB5><U0ABE><U0AB0>";/
@@ -104,7 +105,7 @@ abmon 		"<U0A9C><U0ABE><U0AA8>";/
 		"<U0A9C><U0AC1><U0AA8>";/
 		"<U0A9C><U0AC1><U0AB2>";/
 		"<U0A93><U0A97>";/
-		"<U0AB8><U0AC7><U0AAA><U0ACD><U0A9F>";/
+		"<U0AB8><U0AAA><U0ACD><U0A9F>";/
 		"<U0A93><U0A95><U0ACD><U0A9F>";/
 		"<U0AA8><U0ACB><U0AB5>";/
 		"<U0AA1><U0ABF><U0AB8>"
@@ -119,7 +120,7 @@ mon	"<U0A9C><U0ABE><U0AA8><U0ACD><U0AAF><U0AC1><U0A86><U0AB0><U0AC0>";/
 	"<U0A9C><U0AC1><U0AA8>";/
 	"<U0A9C><U0AC1><U0AB2><U0ABE><U0A87>";/
 	"<U0A93><U0A97><U0AB8><U0ACD><U0A9F>";/
-	"<U0AB8><U0AC7><U0AAA><U0ACD><U0A9F><U0AC7><U0AAE><U0ACD><U0AAC><U0AB0>";/
+	"<U0AB8><U0AAA><U0ACD><U0A9F><U0AC7><U0AAE><U0ACD><U0AAC><U0AB0>";/
 	"<U0A93><U0A95><U0ACD><U0A9F><U0ACB><U0AAC><U0AB0>";/
 	"<U0AA8><U0AB5><U0AC7><U0AAE><U0ACD><U0AAC><U0AB0>";/
 	"<U0AA1><U0ABF><U0AB8><U0AC7><U0AAE><U0ACD><U0AAC><U0AB0>"
@@ -127,9 +128,9 @@ mon	"<U0A9C><U0ABE><U0AA8><U0ACD><U0AAF><U0AC1><U0A86><U0AB0><U0AC0>";/
 %
 % Equivalent of AM PM
 am_pm		"<U0AB8><U0AB5><U0ABE><U0AB0><U0AC7>";/
-		"<U0AB8><U0ABE><U0AA8><U0ACD><U0A9C><U0AC7>"
+		"<U0AB8><U0ABE><U0A82><U0A9C><U0AC7>"
 
-% *** There arent any Devanagari characters below, so for time being
+% *** There aren't any Devanagari characters below, so for time being
 % *** maintain same for Gujarati also,  Karunakar
 
 %
@@ -158,10 +159,9 @@ date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 <U0025><U005A><U0020><U0025><U0059>"
 END LC_TIME
 
-
 LC_MESSAGES
-yesexpr "<U005E><U005B><U0079><U0059><U005D><U002E><U002A>"
-noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
+yesexpr "<U005E><U005B><U0079><U0059><U0AB9><U005D>"
+noexpr  "<U005E><U005B><U006E><U004E><U0AA8><U005D>"
 END LC_MESSAGES
 
 
@@ -176,12 +176,11 @@ LC_NAME
 %
 name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074>/
 <U0025><U0067>"
-% ***** We can have Gujarati eqv for below , Karunakar
-name_gen    ""
-name_mr     "<U004D><U0072><U002E>"
-name_mrs    "<U004D><U0072><U0073><U002E>"
-name_miss   "<U004D><U0069><U0073><U0073><U002E>"
-name_ms     "<U004D><U0073><U002E>"
+name_gen    "<U0A9C><U0ABE><U0AA4><U0ABF>"
+name_mr     "<U0AB6><U0ACD><U0AB0><U0AC0><U0AAE><U0ABE><U0AA8>"
+name_mrs    "<U0AB6><U0ACD><U0AB0><U0AC0><U0AAE><U0AA4><U0ABF>"
+name_miss   "<U0A95><U0AC1><U0AAE><U0ABE><U0AB0><U0AC0>"
+name_ms     "<U0AB8><U0AB6><U0ACD><U0AB0><U0AC0>"
 
 END LC_NAME
 
diff --git a/nscd/Makefile b/nscd/Makefile
index 4ccb0c2324..34186241ec 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -32,7 +32,7 @@ vpath %.c ../locale/programs
 nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
 		getgrnam_r getgrgid_r hstcache gethstbyad_r gethstbynm2_r \
 		dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \
-		xmalloc xstrdup aicache initgrcache
+		xmalloc xstrdup aicache initgrcache gai
 
 ifeq ($(have-thread-library),yes)
 
diff --git a/nscd/gai.c b/nscd/gai.c
new file mode 100644
index 0000000000..2279d7176b
--- /dev/null
+++ b/nscd/gai.c
@@ -0,0 +1,21 @@
+/* This file uses the getaddrinfo code but it compiles it without NSCD
+   support.  We just need a few symbol renames.  */
+#define __getservbyname_r getservbyname_r
+#define __inet_aton inet_aton
+#define __getsockname getsockname
+#define __socket socket
+#define __recvmsg recvmsg
+#define __bind bind
+#define __sendto sendto
+#define __strchrnul strchrnul
+
+#include <getaddrinfo.c>
+
+/* Support code.  */
+#include <check_pf.c>
+#ifdef HAVE_LIBIDN
+# include <libidn/idn-stub.c>
+#endif
+
+/* Some variables normally defined in libc.  */
+service_user *__nss_hosts_database;