[BZ #560, BZ #573]

Update.
2004-12-19  Andreas Jaeger  <aj@suse.de>

	[BZ #560]
	* inet/netinet/in.h: Use __interface_addr instead of __interface.

	[BZ #573]
	* sunrpc/xcrypt.c (passwd2des_internal): Make it hidden instead of
	internal linkage.

5 files changed, 164 insertions, 48 deletions

diff --git a/ChangeLog b/ChangeLog
index 7db9612f04..1005ff5b2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-19  Andreas Jaeger  <aj@suse.de>
+
+	[BZ #560]
+	* inet/netinet/in.h: Use __interface_addr instead of __interface.
+
+	[BZ #573]
+	* sunrpc/xcrypt.c (passwd2des_internal): Make it hidden instead of
+	internal linkage.
+
 2004-12-19  Roland McGrath  <roland@frob.com>
 
 	* version.h (VERSION): 2.3.4.
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 9d30314564..42ce0637ae 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,18 @@
+2004-10-02  Petter Reinholdtsen  <pere@hungry.com>
+
+	[BZ #82]
+	* locales/bn_BD: Remove duplicate LC_MESSAGES block. Correct the
+	remaining block.  Change contact info as this locale is now
+	maintained by Jamil Ahmed.  Patch from Jamil Ahmed.
+
+	* locales/bn_BD: Change category entries to look more like
+	standard references.
+
+	[BZ #26]
+	* locales/ta_IN: Correct sorting order.  Corrected day and month
+	abbrevations.  Corrected name strings for mr., mrs. and miss.
+	Patch from Thuraiappah Vaseeharan.
+
 2004-12-17  GOTO Masanori  <gotom@debian.or.jp>
 
 	* locales/te_IN: Fix language name spelling.
diff --git a/localedata/locales/bn_BD b/localedata/locales/bn_BD
index 52ea20499f..85641dc855 100644
--- a/localedata/locales/bn_BD
+++ b/localedata/locales/bn_BD
@@ -5,29 +5,29 @@ comment_char %
 
 LC_IDENTIFICATION
 title "Bengali language locale for Bangladesh"
-source "Bangladesh Linux User Group http://www.bdlug.org"
+source "Ankur Group, http://www.ankurbangla.org http://www.bengalinux.org"
 address "Dhaka, Bangladesh"
-contact "Taneem Ahmed"
-email "taneem@poribar.org"
+contact "Taneem Ahmed, Jamil Ahmed"
+email "taneem@bengalinux.org, jamil@bengalinux.org"
 tel ""
 fax ""
-language "Bengali"
-territory "BD"
-revision "0.1"
-date "2001-11-01"
-
-category bn_BD:2001;LC_IDENTIFICATION
-category bn_BD:2001;LC_COLLATE
-category bn_BD:2001;LC_CTYPE
-category bn_BD:2001;LC_MESSAGES
-category bn_BD:2001;LC_MONETARY
-category bn_BD:2001;LC_NUMERIC
-category bn_BD:2001;LC_TIME
-category bn_BD:2001;LC_PAPER
-category bn_BD:2001;LC_MEASUREMENT
-category bn_BD:2001;LC_TELEPHONE
-category bn_BD:2001;LC_ADDRESS
-category bn_BD:2001;LC_NAME
+language "Bengali/Bangla"
+territory "Bangladesh"
+revision "0.2"
+date "2004-07-14"
+
+category "i18n:2001";LC_IDENTIFICATION
+category "i18n:2001";LC_COLLATE
+category "i18n:2001";LC_CTYPE
+category "i18n:2001";LC_MESSAGES
+category "i18n:2001";LC_MONETARY
+category "i18n:2001";LC_NUMERIC
+category "i18n:2001";LC_TIME
+category "i18n:2001";LC_PAPER
+category "i18n:2001";LC_MEASUREMENT
+category "i18n:2001";LC_TELEPHONE
+category "i18n:2001";LC_ADDRESS
+category "i18n:2001";LC_NAME
 
 END LC_IDENTIFICATION
 
@@ -119,19 +119,12 @@ t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U00
 END LC_TIME
 
 LC_MESSAGES
-yesexpr     "<U005E><U005B><U09B9><U09CD><U09AF><U09BE><U005D>"
+yesexpr     "<U005E><U005B><U09B9><U09CD><U09AF><U09BE><U0981><U005D>"
 noexpr      "<U005E><U005B><U09A8><U09BE><U005D>"
-yesstr      "<U09B9><U09CD><U09AF><U09BE>"
+yesstr      "<U09B9><U09CD><U09AF><U09BE><U0981>"
 nostr        "<U09A8><U09BE>"
 END LC_MESSAGES
 
-LC_MESSAGES
-yesstr      "<U0561><U0575><U0578>"
-nostr       "<U0578><U0579>"
-yesexpr     "<U005E><U005B><U0079><U0059><U0073><U0053><U0561><U0531><U005D><U002E><U002A>"
-noexpr      "<U005E><U005B><U006E><U004E><U0578><U0548><U005D><U002E><U002A>"
-END LC_MESSAGES
-
 % Metric Measurement system (ISO 1000)
 LC_MEASUREMENT
 measurement 1
diff --git a/localedata/locales/ta_IN b/localedata/locales/ta_IN
index d1a03ea8e4..0b9840fe20 100644
--- a/localedata/locales/ta_IN
+++ b/localedata/locales/ta_IN
@@ -3,6 +3,8 @@ escape_char     /
 % Tamil language locale for India.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
+% Fixed day and month abbr & LC_NAME <sivaraj_d@hotmail.com>
+% Added Madras Tamil Lexicon Collation Order: T. Vaseeharan <t_vasee@yahoo.com>
 
 LC_IDENTIFICATION
 title      "Tamil language locale for India"
@@ -20,14 +22,15 @@ date        "2000,October,27 (XML source:2000,July,20)"
 category  "ta_IN:2000";LC_IDENTIFICATION
 category  "ta_IN:2000";LC_CTYPE
 category  "ta_IN:2000";LC_COLLATE
-category  "ta_IN:2000";LC_TIME
-category  "ta_IN:2000";LC_NUMERIC
 category  "ta_IN:2000";LC_MONETARY
+category  "ta_IN:2000";LC_NUMERIC
+category  "ta_IN:2000";LC_TIME
 category  "ta_IN:2000";LC_MESSAGES
 category  "ta_IN:2000";LC_PAPER
 category  "ta_IN:2000";LC_NAME
 category  "ta_IN:2000";LC_ADDRESS
 category  "ta_IN:2000";LC_TELEPHONE
+category  "ta_IN:2000";LC_MEASUREMENT
 
 END LC_IDENTIFICATION
 
@@ -39,8 +42,101 @@ LC_COLLATE
 
 % Copy the template from ISO/IEC 14651
 copy "iso14651_t1"
+% Tamil Collation Order as defined in The Madras Tamil Lexicon
+% Ref: http://www.uni-koeln.de/phil-fak/indologie/tamil/otl.html
+% Contact: T. Vaseehran <t_vasee@yahoo.com>
+% Last Updated:  Feb. 12, 2004
+% ChangeLog:
+%  - Added split forms of o, oo, au
+%  - Moved Tamil Symbols above numbers
+%  - Added TAMIL LETTER SHA (U0BB6)
+%    Ref: http://wwwold.dkuug.dk/JTC1/SC2/WG2/docs/n2617
+%       : http://wwwold.dkuug.dk/JTC1/SC2/WG2/docs/n2618
+% Initial version: Feb. 10, 2004.
 
-END LC_COLLATE
+collating-element <split_o> from "<U0BC6><U0BBE>"
+collating-element <split_oo> from "<U0BC7><U0BBE>"
+collating-element <split_au> from "<U0BC6><U0BD7>"
+collating-element <tagl_KSHA> from "<U0B95><U0BCD><U0BB7>"
+collating-element <tagl_SHRI> from "<U0BB8><U0BCD><U0BB0><U0BC0>"
+
+reorder-after <U00DE>
+<U0BF3> % TAMIL SIGN DAY
+<U0BF4> % TAMIL SIGN MONTH
+<U0BF5> % TAMIL SIGN YEAR
+<U0BF6> % TAMIL SIGN DEBIT
+<U0BF7> % TAMIL SIGN CREDIT
+<U0BF8> % TAMIL SIGN AS ABOVE
+<U0BF9> % TAMIL SIGN RUPEE
+<U0BE6> % TAMIL DIGIT ZERO
+<U0BE7> % TAMIL DIGIT ONE
+<U0BE8> % TAMIL DIGIT TWO
+<U0BE9> % TAMIL DIGIT THREE
+<U0BEA> % TAMIL DIGIT FOUR
+<U0BEB> % TAMIL DIGIT FIVE
+<U0BEC> % TAMIL DIGIT SIX
+<U0BED> % TAMIL DIGIT SEVEN
+<U0BEE> % TAMIL DIGIT EIGHT
+<U0BEF> % TAMIL DIGIT NINE
+<U0BF0> % TAMIL NUMBER TEN
+<U0BF1> % TAMIL NUMBER ONE HUNDRED
+<U0BF2> % TAMIL NUMBER ONE THOUSAND
+<U0B85> % TAMIL LETTER A
+<U0B86> % TAMIL LETTER AA
+<U0B87> % TAMIL LETTER I
+<U0B88> % TAMIL LETTER II
+<U0B89> % TAMIL LETTER U
+<U0B8A> % TAMIL LETTER UU
+<U0B8E> % TAMIL LETTER E
+<U0B8F> % TAMIL LETTER EE
+<U0B90> % TAMIL LETTER AI
+<U0B92> % TAMIL LETTER O
+<U0B93> % TAMIL LETTER OO
+<U0B94> % TAMIL LETTER AU
+<U0B83> % TAMIL SIGN VISARGA (AYTHAM)
+<U0B95> % TAMIL LETTER K
+<U0B99> % TAMIL LETTER NG
+<U0B9A> % TAMIL LETTER C
+<U0B9E> % TAMIL LETTER NY
+<U0B9F> % TAMIL LETTER TT
+<U0BA3> % TAMIL LETTER NNN
+<U0BA4> % TAMIL LETTER T
+<U0BA8> % TAMIL LETTER N
+<U0BAA> % TAMIL LETTER P
+<U0BAE> % TAMIL LETTER M
+<U0BAF> % TAMIL LETTER Y
+<U0BB0> % TAMIL LETTER R
+<U0BB2> % TAMIL LETTER L
+<U0BB5> % TAMIL LETTER V
+<U0BB4> % TAMIL LETTER LLL
+<U0BB3> % TAMIL LETTER LL
+<U0BB1> % TAMIL LETTER RR
+<U0BA9> % TAMIL LETTER NN
+<U0B9C> % TAMIL LETTER JA
+<U0BB6> % TAMIL LETTER SHA
+<U0BB7> % TAMIL LETTER SSA
+<U0BB8> % TAMIL LETTER SA
+<U0BB9> % TAMIL LETTER HA
+<tagl_KSHA>
+<U0BCD> % TAMIL SIGN VIRAMA (PULLI)
+<U0BBE> % TAMIL VOWEL SIGN AA
+<U0BBF> % TAMIL VOWEL SIGN I
+<U0BC0> % TAMIL VOWEL SIGN II
+<U0BC1> % TAMIL VOWEL SIGN U
+<U0BC2> % TAMIL VOWEL SIGN UU
+<U0BC6> % TAMIL VOWEL SIGN E
+<U0BC7> % TAMIL VOWEL SIGN EE
+<U0BC8> % TAMIL VOWEL SIGN AI
+<U0BCA> % TAMIL VOWEL SIGN O
+<U0BCB> % TAMIL VOWEL SIGN OO
+<U0BCC> % TAMIL VOWEL SIGN AU
+<U0BD7> % TAMIL AU LENGTH MARK
+<tagl_SHRI> "<U0BB6><U0BCD><U0BB0><U0BC0>"
+<split_o>  <U0BCA>
+<split_oo> <U0BCB>
+<split_au> <U0BCC>
+reorder-end
+END LC_COLLATE 
 
 
 LC_MONETARY
@@ -85,9 +181,9 @@ LC_TIME
 % for IBM Class for Unicode.
 %
 % Abbreviated weekday names (%a)
-abday       "<U0B9E>";"<U0BA4>";/
-            "<U0B9A>";"<U0BAA>";/
-            "<U0BB5>";"<U0BB5>";/
+abday       "<U0B9E><U0BBE>";"<U0BA4><U0BBF>";/
+            "<U0B9A><U0BC6>";"<U0BAA><U0BC1>";/
+            "<U0BB5><U0BBF>";"<U0BB5><U0BC6>";/
             "<U0B9A>"
 %
 % Full weekday names (%A)
@@ -97,20 +193,20 @@ day         "<U0B9E><U0BBE><U0BAF><U0BBF><U0BB1><U0BC1>";"<U0BA4><U0BBF><U0B99><
             "<U0B9A><U0BA9><U0BBF>"
 %
 % Abbreviated month names (%b)
-abmon       "<U0B9C><U0BA9><U0BB5><U0BB0><U0BBF>";"<U0BAA><U0BC6><U0BAA><U0BCD><U0BB0><U0BB5><U0BB0><U0BBF>";/
-            "<U0BAE><U0BBE><U0BB0><U0BCD><U0B9A><U0BCD>";"<U0B8F><U0BAA><U0BCD><U0BB0><U0BB2><U0BCD>";/
+abmon       "<U0B9C><U0BA9>";"<U0BAA><U0BBF><U0BAA><U0BCD>";/
+            "<U0BAE><U0BBE><U0BB0><U0BCD>";"<U0B8F><U0BAA><U0BCD>";/
             "<U0BAE><U0BC7>";"<U0B9C><U0BC2><U0BA9><U0BCD>";/
-            "<U0B9C><U0BC2><U0BB2><U0BC8>";"<U0B86><U0B95><U0BB8><U0BCD><U0B9F><U0BCD>";/
-            "<U0B9A><U0BC6><U0BAA><U0BCD><U0B9F><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD>";"<U0B85><U0B95><U0BCD><U0B9F><U0BCB><U0BAA><U0BB0><U0BCD>";/
-            "<U0BA8><U0BB5><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD>";"<U0B9F><U0BBF><U0B9A><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD><U0072>"
+            "<U0B9C><U0BC2><U0BB2><U0BC8>";"<U0B86><U0B95>";/
+            "<U0B9A><U0BC6><U0BAA><U0BCD>";"<U0B85><U0B95><U0BCD>";/
+            "<U0BA8><U0BB5>";"<U0B9F><U0BBF><U0B9A>"
 %
 % Full month names (%B)
-mon         "<U0B9C><U0BA9><U0BB5><U0BB0><U0BBF>";"<U0BAA><U0BC6><U0BAA><U0BCD><U0BB0><U0BB5><U0BB0><U0BBF>";/
+mon         "<U0B9C><U0BA9><U0BB5><U0BB0><U0BBF>";"<U0BAA><U0BBF><U0BAA><U0BCD><U0BB0><U0BB5><U0BB0><U0BBF>";/
             "<U0BAE><U0BBE><U0BB0><U0BCD><U0B9A><U0BCD>";"<U0B8F><U0BAA><U0BCD><U0BB0><U0BB2><U0BCD>";/
             "<U0BAE><U0BC7>";"<U0B9C><U0BC2><U0BA9><U0BCD>";/
             "<U0B9C><U0BC2><U0BB2><U0BC8>";"<U0B86><U0B95><U0BB8><U0BCD><U0B9F><U0BCD>";/
             "<U0B9A><U0BC6><U0BAA><U0BCD><U0B9F><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD>";"<U0B85><U0B95><U0BCD><U0B9F><U0BCB><U0BAA><U0BB0><U0BCD>";/
-            "<U0BA8><U0BB5><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD>";"<U0B9F><U0BBF><U0B9A><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD><U0072>"
+            "<U0BA8><U0BB5><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD>";"<U0B9F><U0BBF><U0B9A><U0BAE><U0BCD><U0BAA><U0BB0><U0BCD>"
 %
 % Equivalent of AM PM
 am_pm       "<U0B95><U0BBE><U0BB2><U0BC8>";"<U0BAE><U0BBE><U0BB2><U0BC8>"
@@ -174,9 +270,9 @@ LC_NAME
 %
 name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>"
 name_gen    ""
-name_mr     "<U004D><U0072><U002E>"
-name_mrs    "<U004D><U0072><U0073><U002E>"
-name_miss   "<U004D><U0069><U0073><U0073><U002E>"
+name_mr     "<U0BA4><U0BBF><U0BB0><U0BC1><U0020>"
+name_mrs    "<U0BA4><U0BBF><U0BB0><U0BC1><U0BAE><U0BA4><U0BBF><U0020>"
+name_miss   "<U0B9A><U0BC6><U0BB2><U0BCD><U0BB5><U0BBF><U0020>"
 name_ms     "<U004D><U0073><U002E>"
 
 END LC_NAME
diff --git a/sunrpc/xcrypt.c b/sunrpc/xcrypt.c
index 9f8c142649..ea8ff45105 100644
--- a/sunrpc/xcrypt.c
+++ b/sunrpc/xcrypt.c
@@ -69,13 +69,15 @@ static char hexval (char) internal_function;
 
 static void hex2bin (int, char *, char *) internal_function;
 static void bin2hex (int, unsigned char *, char *) internal_function;
-static void passwd2des_internal (char *pw, char *key);
-
+void passwd2des_internal (char *pw, char *key);
+#ifdef _LIBC
+libc_hidden_proto (passwd2des_internal)
+#endif
 
 /*
  * Turn password into DES key
  */
-static void
+void
 passwd2des_internal (char *pw, char *key)
 {
   int i;
@@ -88,6 +90,7 @@ passwd2des_internal (char *pw, char *key)
 }
 
 #ifdef _LIBC
+libc_hidden_def (passwd2des_internal)
 strong_alias (passwd2des_internal, passwd2des)
 #else
 void passwd2des (char *pw, char *key)