Update.

1998-12-13  Andreas Jaeger  <aj@arthur.rhein-neckar.de> 
 
	* sunrpc/svc_udp.c (svcudp_bufcreate): Declare len as socklen_t. 
	(svcudp_recv): Likewise. 
 
1998-12-13  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de> 
 
	* nis/nss-nisplus.h: Change some mappings of NIS+ errors to 
	NSS error codes to avoid endless loops. 
 
1998-12-13  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/gconv-modules: Correct aliases for ISO-8859-13 and add
	aliases for ISO-8859-14.

8 files changed, 37 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 2295b5d741..2134bf674a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+1998-12-13  Andreas Jaeger  <aj@arthur.rhein-neckar.de> 
+ 
+	* sunrpc/svc_udp.c (svcudp_bufcreate): Declare len as socklen_t. 
+	(svcudp_recv): Likewise. 
+ 
+1998-12-13  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de> 
+ 
+	* nis/nss-nisplus.h: Change some mappings of NIS+ errors to 
+	NSS error codes to avoid endless loops. 
+ 
+1998-12-13  Ulrich Drepper  <drepper@cygnus.com>
+
+	* iconvdata/gconv-modules: Correct aliases for ISO-8859-13 and add
+	aliases for ISO-8859-14.
+
 1998-12-12  Geoff Keating  <geoffk@ozemail.com.au> 
  
 	* posix/fnmatch.c (fnmatch): Arguments to FOLD must not have 
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index b5d0492676..2658f3cd99 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -304,12 +304,14 @@ module	INTERNAL		ISO-8859-11//		ISO8859-11	1
 
 #	from			to			module		cost
 alias	ISO-IR-179//		ISO-8859-13//
-alias	LATIN8//		ISO-8859-13//
-alias	L8//			ISO-8859-13//
+alias	LATIN7//		ISO-8859-13//
+alias	L7//			ISO-8859-13//
 module	ISO-8859-13//		INTERNAL		ISO8859-13	1
 module	INTERNAL		ISO-8859-13//		ISO8859-13	1
 
 #	from			to			module		cost
+alias	LATIN8//		ISO-8859-13//
+alias	L8//			ISO-8859-13//
 alias	ISO_8859-14:1998//	ISO-8859-14//
 module	ISO-8859-14//		INTERNAL		ISO8859-14	1
 module	INTERNAL		ISO-8859-14//		ISO8859-14	1
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index a15d6decfc..93bc0b723a 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,10 @@
+1998-12-13  Ulrich Drepper  <drepper@cygnus.com>
+
+	* charmaps/ISO-8859-13: Correct alias name (LATIN8 -> LATIN7).
+	* charmaps/ISO-8859-14: Add alias names.
+
+	* repertoiremaps/mnemonics.ds: Remove duplicates.
+
 1998-12-12  Ulrich Drepper  <drepper@cygnus.com>
 
 	* charmaps/ISO-8859-13: New file.
diff --git a/localedata/charmaps/ISO-8859-13 b/localedata/charmaps/ISO-8859-13
index 6ad854d3ff..699e52944e 100644
--- a/localedata/charmaps/ISO-8859-13
+++ b/localedata/charmaps/ISO-8859-13
@@ -4,8 +4,8 @@
 % automatically generated from the charDB
 
 % alias ISO-IR-179
-% alias LATIN8    
-% alias L8        
+% alias LATIN7
+% alias L7
 CHARMAP
 <NU>                   /x00     <U0000> NULL
 <NUL>                  /x00     <U0000> NULL
diff --git a/localedata/charmaps/ISO-8859-14 b/localedata/charmaps/ISO-8859-14
index 404b2d97fb..5e07e7a168 100644
--- a/localedata/charmaps/ISO-8859-14
+++ b/localedata/charmaps/ISO-8859-14
@@ -3,6 +3,8 @@
 <escape_char> /
 % automatically generated from the charDB
 
+% alias LATIN8
+% alias L8
 CHARMAP
 <NU>                   /x00     <U0000> NULL
 <NUL>                  /x00     <U0000> NULL
diff --git a/localedata/repertoiremaps/mnemonic.ds b/localedata/repertoiremaps/mnemonic.ds
index 7d6f0c61fe..3cc6fa36b7 100644
--- a/localedata/repertoiremaps/mnemonic.ds
+++ b/localedata/repertoiremaps/mnemonic.ds
@@ -260,17 +260,14 @@ escape_char /
 <BB>                   <U00A6> BROKEN BAR
 <!B>                   <U00A6> BROKEN BAR
 <SE>                   <U00A7> SECTION SIGN
-<So>                   <U00A7> SECTION SIGN
 <':>                   <U00A8> DIAERESIS
 <Co>                   <U00A9> COPYRIGHT SIGN
-<OC>                   <U00A9> COPYRIGHT SIGN
 <-a>                   <U00AA> FEMININE ORDINAL INDICATOR
 <<<>                   <U00AB> LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
 <NO>                   <U00AC> NOT SIGN
 <7!>                   <U00AC> NOT SIGN
 <-->                   <U00AD> SOFT HYPHEN
 <Rg>                   <U00AE> REGISTERED SIGN
-<OR>                   <U00AE> REGISTERED SIGN
 <'m>                   <U00AF> MACRON
 <DG>                   <U00B0> DEGREE SIGN
 <+->                   <U00B1> PLUS-MINUS SIGN
@@ -2257,7 +2254,6 @@ escape_char /
 <q+;>                  <UFED8> ARABIC LETTER QAF MEDIAL FORM
 <k+->                  <UFED9> ARABIC LETTER KAF ISOLATED FORM
 <k+.>                  <UFEDA> ARABIC LETTER KAF FINAL FORM
-<k+.>                  <UFEDA> ARABIC LETTER KAF FINAL FORM
 <k+,>                  <UFEDB> ARABIC LETTER KAF INITIAL FORM
 <k+;>                  <UFEDC> ARABIC LETTER KAF MEDIAL FORM
 <l+->                  <UFEDD> ARABIC LETTER LAM ISOLATED FORM
diff --git a/nis/nss-nisplus.h b/nis/nss-nisplus.h
index ff497f1ca4..f2247c7eb4 100644
--- a/nis/nss-nisplus.h
+++ b/nis/nss-nisplus.h
@@ -31,12 +31,12 @@ static enum nss_status niserr2nss_tab[] =
   [NIS_SUCCESS] = NSS_STATUS_SUCCESS,
   [NIS_S_SUCCESS] = NSS_STATUS_SUCCESS,
   [NIS_NOTFOUND] = NSS_STATUS_NOTFOUND,
-  [NIS_S_NOTFOUND] = NSS_STATUS_TRYAGAIN,
+  [NIS_S_NOTFOUND] = NSS_STATUS_NOTFOUND,
   [NIS_CACHEEXPIRED] = NSS_STATUS_UNAVAIL,
-  [NIS_NAMEUNREACHABLE] = NSS_STATUS_TRYAGAIN,
+  [NIS_NAMEUNREACHABLE] = NSS_STATUS_UNAVAIL,
   [NIS_UNKNOWNOBJ] = NSS_STATUS_NOTFOUND,
   [NIS_TRYAGAIN] = NSS_STATUS_TRYAGAIN,
-  [NIS_SYSTEMERROR] = NSS_STATUS_UNAVAIL,	/* Maybe TRYAGAIN ? */
+  [NIS_SYSTEMERROR] = NSS_STATUS_UNAVAIL,
   [NIS_CHAINBROKEN] = NSS_STATUS_UNAVAIL,
   [NIS_PERMISSION] = NSS_STATUS_UNAVAIL,
   [NIS_NOTOWNER] = NSS_STATUS_UNAVAIL,
@@ -74,7 +74,7 @@ static enum nss_status niserr2nss_tab[] =
   [NIS_SRVAUTH] = NSS_STATUS_UNAVAIL,
   [NIS_CLNTAUTH] = NSS_STATUS_UNAVAIL,
   [NIS_NOFILESPACE] = NSS_STATUS_UNAVAIL,
-  [NIS_NOPROC] = NSS_STATUS_TRYAGAIN,
+  [NIS_NOPROC] = NSS_STATUS_UNAVAIL,
   [NIS_DUMPLATER] = NSS_STATUS_UNAVAIL
 };
 #define NISERR_COUNT (sizeof (niserr2nss_tab) / sizeof (niserr2nss_tab[0]))
diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c
index 4ea421a7b2..3d95f4bc70 100644
--- a/sunrpc/svc_udp.c
+++ b/sunrpc/svc_udp.c
@@ -112,7 +112,7 @@ svcudp_bufcreate (sock, sendsz, recvsz)
   SVCXPRT *xprt;
   struct svcudp_data *su;
   struct sockaddr_in addr;
-  size_t len = sizeof (struct sockaddr_in);
+  socklen_t len = sizeof (struct sockaddr_in);
 
   if (sock == RPC_ANYSOCK)
     {
@@ -192,11 +192,11 @@ svcudp_recv (xprt, msg)
   int rlen;
   char *reply;
   u_long replylen;
-  size_t len;
+  socklen_t len;
 
 again:
   /* FIXME -- should xp_addrlen be a size_t?  */
-  len = sizeof(struct sockaddr_in);
+  len = (socklen_t) sizeof(struct sockaddr_in);
   rlen = recvfrom (xprt->xp_sock, rpc_buffer (xprt), (int) su->su_iosz, 0,
 		   (struct sockaddr *) &(xprt->xp_raddr), &len);
   xprt->xp_addrlen = len;