Updated to fedora-glibc-20041219T2331

14 files changed, 266 insertions, 441 deletions

diff --git a/ChangeLog b/ChangeLog
index cd23e7a09c..8bd99f21f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2004-12-19  Roland McGrath  <roland@redhat.com>
+
+	* iconv/iconvconfig.c (nostdlib, output_file, output_file_len):
+	New variables.
+	(options, parse_opt, main): Take new options --nostdlib and
+	--output/-o to set them.  Under --nostdlib, skip GCONV_PATH dirs.
+	(write_output): If output_file is set, write the output there.
+
+2004-12-19  Andreas Jaeger  <aj@suse.de>NULL
+
+	[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.
+	* README.template: Various updates.
+	* README: Regenerated.
+	* NEWS: Mention ports.
+	* README-alpha: File removed.
+
+	[BZ #416]
+	* locale/langinfo.h: Comment fixes.
+
 2004-12-17  Ulrich Drepper  <drepper@redhat.com>
 
 	* po/ja.po: Update from translation team.
diff --git a/NEWS b/NEWS
index 236c4378f8..f73d3287c4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2004-10-19
+GNU C Library NEWS -- history of user-visible changes.  2004-12-19
 Copyright (C) 1992-2002,2003,2004 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -40,7 +40,13 @@ Version 2.3.4
 * Low-overhead boundary checking variants of string and some stdio functions
   were added.  These are to be used in conjunction with a gcc patch by
   Jakub Jelinek which adds calls to these functions if possible.
-  Patch by Jakub Jelinek and Ulrich Drepper.
+  Implemented by Jakub Jelinek and Ulrich Drepper.
+
+* Old code for several operating systems and machine architectures that
+  have not been in working condition in a long time have been removed from
+  the main source tree maintained by the GNU C Library's maintainers.
+  These files are now reside in the separate `ports' source module
+  that is usable as an add-on when building the library.
 
 Version 2.3.3
 
diff --git a/README b/README
index 69a712a6cf..36a2af9129 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This directory contains the version 2.3.3 release of the GNU C Library.
+This directory contains the version 2.3.4 release of the GNU C Library.
 Many bugs have been fixed since the last release.
 Some bugs surely remain.
 
@@ -21,39 +21,12 @@ configurations:
 		s390-*-linux-gnu	Linux-2.x on IBM S/390
 		s390x-*-linux-gnu	Linux-2.4+ on IBM S/390 64-bit
 		sh-*-linux-gnu		Linux-2.x on Super Hitachi
-		cris-*-linux-gnu	Linux-2.4+ on CRIS
 		x86-64-*-linux-gnu	Linux-2.4+ on x86-64
 
-Former releases of this library (version 1.09.1 and perhaps earlier
-versions) used to run on the following configurations:
-
-		alpha-dec-osf1
-		i[3456]86-*-bsd4.3
-		i[3456]86-*-isc2.2
-		i[3456]86-*-isc3
-		i[3456]86-*-sco3.2
-		i[3456]86-*-sco3.2v4
-		i[3456]86-*-sysv
-		i[3456]86-*-sysv4
-		i[3456]86-force_cpu386-none
-		i[3456]86-sequent-bsd
-		i960-nindy960-none
-		m68k-hp-bsd4.3
-		m68k-mvme135-none
-		m68k-mvme136-none
-		m68k-sony-newsos3
-		m68k-sony-newsos4
-		m68k-sun-sunos4
-		mips-dec-ultrix4
-		mips-sgi-irix4
-		sparc-sun-solaris2
-		sparc-sun-sunos4
-
-Since no one has volunteered to test and fix the above configurations,
-these are not supported at the moment.  It's expected that these don't
-work anymore.  Porting the library is not hard.  If you are interested
-in doing a port, please contact the glibc maintainers by sending
-electronic mail to <bug-glibc@gnu.org>.
+Past releases of this library ran on a variety of configurations that are
+no longer supported.  Porting the library is not hard.  If you are
+interested in doing a port, please contact the glibc maintainers;
+see http://www.gnu.org/software/libc/ for more information.
 
 There are some add-ons which can be used together with GNU libc.  They
 are designed in a way to ease the installation by integrating them in
@@ -76,11 +49,9 @@ The file NOTES contains a description of the feature-test macros used
 in the GNU C library, explaining how you can tell the library what
 facilities you want it to make available.
 
-We prefer to get bug reports sent using the `glibcbug' shell script which
-is installed together with the rest of the GNU libc to <bugs@gnu.org>.
-Simply run this shell script and fill in the information.  Nevertheless
-you can still send bug reports to <bug-glibc@gnu.org> as normal electronic
-mails.
+Please see http://www.gnu.org/software/libc/bugs.html for bug reporting
+information.  We are now using the Bugzilla system to track all bug reports.
+This web page gives detailed information on how to report bugs properly.
 
 The GNU C Library is free software.  See the file COPYING.LIB for copying
 conditions, and LICENSES for notices about a few contributions that require
diff --git a/README-alpha b/README-alpha
deleted file mode 100644
index a2a15ddb23..0000000000
--- a/README-alpha
+++ /dev/null
@@ -1,287 +0,0 @@
-			 GNU libc SNAPSHOT SYSTEM
-			    (general info)
-			   Updated 1997-9-26
-
-WHAT ARE GNU libc SNAPSHOTS
----------------------------
-
-Snapshots are an "image" of the main glibc development tree, captured at a
-particular random instant in time.  When you use the snapshots, you should be
-able to maintain a local copy of libc that is no more than one day older than
-the official source tree used by the libc maintainers.
-
-The primary purpose of providing snapshots is to widen the group of motivated
-developers that would like to help test, debug, and enhance glibc, by providing
-you with access to the "latest and greatest" source.  This has several
-advantages, and several disadvantages.
-
-    First the advantages:
-
-    o	Once we have a large base of motivated testers using the snapshots,
-	this should provide good coverage across all currently supported
-	glibc hosts and targets.  If a new bug is introduced in glibc due to
-	fixing another bug or ongoing development, it should become
-	obvious much more quickly and get fixed before the next general
-	net release.  This should help to reduce the chances of glibc being
-	released to the general public with a major bug that went unnoticed
-	during the release cycle testing because they are machine dependent.
-	We hope to greatly improve glibc's stability and reliability by
-	involving more people and more execution environments in the
-	prerelease testing.
-
-    o	With access to the latest source, any diffs that you send to fix
-	bugs or add new features should be much easier for the glibc team
-	to merge into the official source base (after suitable review
-	of course).  This encourages us to merge your changes quicker,
-	while they are still "fresh".
-
-    o	Once your diffs are merged, you can obtain a new copy of glibc
-	containing your changes almost immediately.  Thus you do not
-	have to maintain local copies of your changes for any longer
-	than it takes to get them merged into the official source base.
-	This encourages you to send in changes quicker.
-
-    And the disadvantages:
-
-    o	The snapshot you get will be largely untested and of unknown quality.
-	It may fail to configure or compile.  It may have serious bugs.
-	You should always keep a copy of the last known working version
-	before updating to the current snapshot, or at least be able to
-	regenerate a working version if the latest snapshot is unusable
-	in your environment for some reason.
-
-	If a production version of glibc has a bug and a snapshot has the fix,
-	and you care about stability, you should put only the fix for that
-	particular problem into your production version.  Of course, if you
-	are eager to test glibc, you can use the snapshot versions in your
-	daily work, but users who have not been consulted about whether they
-	feel like testing glibc should generally have something which is at
-	least as bug free as the last released version.
-
-    o	Providing timely response to your questions, bug reports, and
-	submitted patches will require the glibc development team to allocate
-	time from an already thin time budget.  Please try to help us make
-	this time as productive as possible.  See the section below about
-	how to submit changes.
-
-
-WHO SHOULD TRY THE SNAPSHOTS
-----------------------------
-
-Remember, these are snapshots not tested versions.  So if you use
-these versions you should be able to
-
-    o	make sure your system stays usable
-
-    o	locate and hopefully fix problems
-
-    o	to port glibc to a new target yourself
-
-You should not use the snapshots if
-
-    o	your system is needed in a production environment which needs
-	stability
-
-    o	you expect us to fix your problems since you somehow depend on them.
-	You must be willing to fix the problems yourself, we don't want to
-	see "I have problems, fix this" messages.
-
-
-HOW TO GET THE SNAPSHOTS
-------------------------
-
-At the moment we provide a full snapshot weekly (every sunday), so
-that users getting a snapshot for the first time, or updating after
-a long period of not updating, can get the latest version in a single
-operation.  Along with the full snapshot, we will provide incremental
-diffs on a nearly daily basis (whenever code changes).  Each daily
-diff will be relative to the source tree after applying all previous
-daily diffs.  The daily diffs are for people who have relatively low
-bandwidth ftp or uucp connections.
-
-The files will be available via anonymous ftp from alpha.gnu.org, in
-directory /gnu/libc and on linux.kernel.org in /pub/software/libs/glibc.  The
-directories should look something like:
-
-	libc-970921.tar.gz
-	libc-970917-970922.diff.gz
-	libc-970922-970925.diff.gz
-	.
-	.
-	.
-
-Please note that the snapshots on alpha.gnu.org and on
-linux.kernel.org are not always in sync. Patches to some files might
-appear a day a diff earlier or later on alpha than on kernel.
-Use always alpha or always kernel but don't mix them.
-
-There are sometimes additionally test releases of the add-ons available in
-these directories.  If a new version of an add-on is available it is normally
-required for the corresponding snapshot so always pay attention for these.
-
-Note that we provide GNU gzip compressed files only.  You can ftp gzip
-from ftp.gnu.org in directory pub/gnu.
-
-In some cases the dates for diffs and snapshots do not match like in the
-example above.  The full release is for 970921 but the patch is for
-970917-970922.  This only means that nothing changed between 970917 and 970922
-and that you have to use this patch on top of the 970921 snapshot since the
-patch is made on 970922.
-
-Also, as the gcc developers did with their gcc snapshot system, even though we
-will make the snapshots available on a publically accessible ftp area, we ask
-that recipients not widely publicise their availability.  The motivation for
-this request is not to hoard them, but to avoid the situation where the
-general glibc user base naively attempts to use the snapshots, has trouble with
-them, complains publically, and the reputation of glibc declines because of a
-perception of instability or lack of quality control.
-
-
-GLIBC TEST SUITE
-----------------
-
-A test suite is distributed as an integral part of the snapshots.  A simple
-"make check" in your build directory is sufficient to run the tests.  glibc
-should pass all tests and if any fails, please report it.  A failure might not
-originate from a bug in glibc but also from bugs in the tools, e.g. with gcc
-2.7.2.x the math tests fail some of the tests because of compiler bugs.
-
-Note that the test suite is still in its infancy.  The tests themselves only
-cover a small portion of libc features, and where tests do exist for a feature
-they are not exhaustive.  New tests are welcome.
-
-
-GETTING HELP, GLIBC DISCUSSIONS, etc
-------------------------------------
-
-People who want to help with glibc and who test out snapshots
-regularly should get on the libc-alpha@sourceware.cygnus.com mailing
-list by sending an email to libc-alpha-subscribe@sourceware.cygnus.com.
-This list is meant (as the name suggests) for the discussion of test
-releases and also reports for them.  People who are on this list are
-welcome to post questions of general interest.
-
-People who are not only willing to test the snapshots but instead
-really want to help developing glibc should contact
-libc-hacker-subscribe@sourceware.cygnus.com.org to be put on the developers
-mailing list.  This list is really only meant for developers.  No
-questions about installation problems or other simple topics are
-wanted nor will they be answered.
-
-Do *not* send any questions about the snapshots or patches specific to the
-snapshots to bug-glibc@gnu.org.  Nobody there will have any idea what
-you are talking about and it will just cause confusion.
-
-
-BUG REPORTS
------------
-
-Send bug reports directly to Ulrich Drepper <drepper@gnu.org>.  Please
-do *not* use the glibcbug script for reporting bugs in the snapshots.
-glibcbug should only be used for problems with the official released versions.
-We don't like bug reports in the bug database because otherwise the impression
-of instability or lack of quality control of glibc as a whole might manifest
-in people's mind.
-
-Note that since no testing is done on the snapshots, and snapshots may even be
-made when glibc is in an inconsistent state, it may not be unusual for an
-occasional snapshot to have a very obvious bug, such as failure to compile on
-*any* machine.  It is likely that such bugs will be fixed by the next
-snapshot, so it really isn't necessary to report them unless they persist for
-a couple of days.
-
-Missing files should always be reported, since they usually mean there is a
-problem with the snapshot-generating process and we won't know about them
-unless someone tells us.
-
-Bugs which are non-obvious, such as failure to compile on only a specific
-machine, a new machine dependent or obscure bug (particularly one not detected
-by the testsuite), etc should be reported when you discover them, or have a
-suggested patch to fix them.
-
-
-FORMAT FOR PATCHES
-------------------
-
-If you have a fix for a bug, or an enhancement to submit, send your patch to
-Ulrich Drepper <drepper@gnu.org>.  Here are some simple guidelines for
-submitting patches:
-
-    o	Use "unified diffs" for patches.  A typical command for generating
-	context diffs is "diff -ru glibc-old glibc-patched".
-
-    o	Use the "minimalist approach" for patches.  That is, each patch
-	should address only one particular bug, new feature, etc.  Do not
-	save up many unrelated changes and submit them all in one big
-	patch, since in general, the larger the patch the more difficult
-	it is for us to decide if the patch is either correct or
-	desirable.  And if we find something about the patch that needs
-	to be corrected before it can be installed, we would have to reject
-	the entire patch, which might contain changes which otherwise would
-	be accepted if submitted separately.
-
-    o	Submit a sample ChangeLog entry with your patch.  See the existing
-	glibc ChangeLog for examples of what a ChangeLog entry should look
-	like.  The emacs command ^X4A will create a ChangeLog entry header
-	for you.
-
-
-BUILDING SNAPSHOTS
-------------------
-
-The `best' way to build glibc is to use an extra directory, e.g.:
-tar xzf libc-970921.tar.gz
-mkdir build-glibc
-cd build-glibc
-../libc-970921/configure ...
-
-In this way you can easily clean up (since `make clean' doesn't work at
-the moment) and rebuild glibc.
-
-
-NECESSARY TOOLS
----------------
-
-For the recommended versions of gcc, binutils, make, texinfo, gettext,
-autoconf and other tools which might be especially needed when using patches,
-please read the file INSTALL.
-
-
-HOW CAN YOU HELP
-----------------
-
-It helps already a lot if you just install glibc on your system and try to
-solve any problems.  You might want to look at the file `PROJECTS' and help
-with one of those projects, fix some bugs (see `BUGS' or the bug database),
-port to an unsupported platform, ...
-
-
-FURTHER DOCUMENTATION
----------------------
-
-A lot of questions are answered in the FAQ.  The files `INSTALL', `README' and
-`NOTES' contain the most important documentation.  Furthermore glibc has its
-own 700+ pages info documentation, ...
-
-
-
-And finally a word of caution: The libc is one of the most fundamental parts
-of your system - and these snapshots are untested and come without any
-guarantee or warranty.  You might be lucky and everything works or you might
-crash your system.  If you install a glibc snapshot as primary library, you
-should have a backup somewhere.
-
-On many systems it is also a problem to replace the libc while the system is
-running.  In the worst case on broken OSes some systems crash.  On better
-systems you can move the old libc aside but removing it will cause problems
-since there are still processes using this libc image and so you might have to
-check the filesystem to get rid of the libc data.  One good alternative (which
-is also safer) is to use a chroot'ed environment.
-
-Thanks for your help and support.
-
-Thanks to Fred Fish from Cygnus for the original version of this text
-(for GDB).
-
-
-Ulrich Drepper
diff --git a/README.template b/README.template
index 9b300a9226..d501d718df 100644
--- a/README.template
+++ b/README.template
@@ -21,39 +21,12 @@ configurations:
 		s390-*-linux-gnu	Linux-2.x on IBM S/390
 		s390x-*-linux-gnu	Linux-2.4+ on IBM S/390 64-bit
 		sh-*-linux-gnu		Linux-2.x on Super Hitachi
-		cris-*-linux-gnu	Linux-2.4+ on CRIS
 		x86-64-*-linux-gnu	Linux-2.4+ on x86-64
 
-Former releases of this library (version 1.09.1 and perhaps earlier
-versions) used to run on the following configurations:
-
-		alpha-dec-osf1
-		i[3456]86-*-bsd4.3
-		i[3456]86-*-isc2.2
-		i[3456]86-*-isc3
-		i[3456]86-*-sco3.2
-		i[3456]86-*-sco3.2v4
-		i[3456]86-*-sysv
-		i[3456]86-*-sysv4
-		i[3456]86-force_cpu386-none
-		i[3456]86-sequent-bsd
-		i960-nindy960-none
-		m68k-hp-bsd4.3
-		m68k-mvme135-none
-		m68k-mvme136-none
-		m68k-sony-newsos3
-		m68k-sony-newsos4
-		m68k-sun-sunos4
-		mips-dec-ultrix4
-		mips-sgi-irix4
-		sparc-sun-solaris2
-		sparc-sun-sunos4
-
-Since no one has volunteered to test and fix the above configurations,
-these are not supported at the moment.  It's expected that these don't
-work anymore.  Porting the library is not hard.  If you are interested
-in doing a port, please contact the glibc maintainers by sending
-electronic mail to <bug-glibc@gnu.org>.
+Past releases of this library ran on a variety of configurations that are
+no longer supported.  Porting the library is not hard.  If you are
+interested in doing a port, please contact the glibc maintainers;
+see http://www.gnu.org/software/libc/ for more information.
 
 There are some add-ons which can be used together with GNU libc.  They
 are designed in a way to ease the installation by integrating them in
@@ -76,11 +49,9 @@ The file NOTES contains a description of the feature-test macros used
 in the GNU C library, explaining how you can tell the library what
 facilities you want it to make available.
 
-We prefer to get bug reports sent using the `glibcbug' shell script which
-is installed together with the rest of the GNU libc to <bugs@gnu.org>.
-Simply run this shell script and fill in the information.  Nevertheless
-you can still send bug reports to <bug-glibc@gnu.org> as normal electronic
-mails.
+Please see http://www.gnu.org/software/libc/bugs.html for bug reporting
+information.  We are now using the Bugzilla system to track all bug reports.
+This web page gives detailed information on how to report bugs properly.
 
 The GNU C Library is free software.  See the file COPYING.LIB for copying
 conditions, and LICENSES for notices about a few contributions that require
diff --git a/fedora/branch.mk b/fedora/branch.mk
index d8ddab0af2..20986645ab 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -1,5 +1,5 @@
 # This file is updated automatically by Makefile.
 glibc-branch := fedora
 glibc-base := HEAD
-fedora-sync-date := 2004-12-18 23:12 UTC
-fedora-sync-tag := fedora-glibc-20041218T2312
+fedora-sync-date := 2004-12-19 23:31 UTC
+fedora-sync-tag := fedora-glibc-20041219T2331
diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index e95d073a22..0ed210b794 100644
--- a/iconv/iconvconfig.c
+++ b/iconv/iconvconfig.c
@@ -28,6 +28,7 @@
 #include <mcheck.h>
 #include <search.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdio_ext.h>
 #include <stdlib.h>
@@ -121,16 +122,21 @@ static char *more_help (int key, const char *text, void *input);
 
 /* Definitions of arguments for argp functions.  */
 #define OPT_PREFIX 300
+#define OPT_NOSTDLIB 301
 static const struct argp_option options[] =
 {
   { "prefix", OPT_PREFIX, "PATH", 0, N_("Prefix used for all file accesses") },
+  { "output", 'o', "FILE", 0, N_("\
+Put output in FILE instead of installed location\
+ (--prefix does not apply to FILE)") },
+  { "nostdlib", OPT_NOSTDLIB, NULL, 0,
+    N_("Do not search standard directories, only those on the command line") },
   { NULL, 0, NULL, 0, NULL }
 };
 
 /* Data structure to communicate with argp functions.  */
 static struct argp argp =
 {
-
   options, parse_opt, args_doc, doc, NULL, more_help
 };
 
@@ -162,6 +168,14 @@ static const char *prefix = "";
 /* Its length.  */
 static size_t prefix_len;
 
+/* Directory to place output file in.  */
+static const char *output_file;
+/* Its length.  */
+static size_t output_file_len;
+
+/* If true, omit the GCONV_PATH directories and require some arguments.  */
+static bool nostdlib;
+
 /* Search tree of the modules we know.  */
 static void *modules;
 
@@ -270,8 +284,6 @@ main (int argc, char *argv[])
 {
   int remaining;
   int status = 0;
-  char *path;
-  char *tp;
 
   /* Enable memory use testing.  */
   /* mcheck_pedantic (NULL); */
@@ -286,6 +298,9 @@ main (int argc, char *argv[])
   /* Parse and process arguments.  */
   argp_parse (&argp, argc, argv, 0, &remaining, NULL);
 
+  if (nostdlib && remaining == argc)
+    error (2, 0, _("Directory arguments required when using --nostdlib"));
+
   /* Initialize the string table.  */
   strtab = strtabinit ();
 
@@ -293,14 +308,16 @@ main (int argc, char *argv[])
   while (remaining < argc)
     status |= handle_dir (argv[remaining++]);
 
-  /* In any case also handle the standard directory.  */
-  path = strdupa (GCONV_PATH);
-  tp = strtok (path, ":");
-  while (tp != NULL)
+  if (! nostdlib)
     {
-      status |= handle_dir (tp);
+      /* In any case also handle the standard directory.  */
+      char *path = strdupa (GCONV_PATH), *tp = strsep (&path, ":");
+      while (tp != NULL)
+	{
+	  status |= handle_dir (tp);
 
-      tp = strtok (NULL, ":");
+	  tp = strsep (&path, ":");
+	}
     }
 
   /* Add the builtin transformations and aliases without overwriting
@@ -340,6 +357,13 @@ parse_opt (int key, char *arg, struct argp_state *state)
       prefix = arg;
       prefix_len = strlen (prefix);
       break;
+    case 'o':
+      output_file = arg;
+      output_file_len = strlen (output_file);
+      break;
+    case OPT_NOSTDLIB:
+      nostdlib = true;
+      break;
     default:
       return ARGP_ERR_UNKNOWN;
     }
@@ -626,7 +650,6 @@ add_module (char *rp, const char *directory)
 static int
 handle_dir (const char *dir)
 {
-  char *infile;
   char *cp;
   FILE *fp;
   char *line = NULL;
@@ -641,7 +664,8 @@ handle_dir (const char *dir)
       newp[dirlen] = '\0';
     }
 
-  cp = infile = (char *) alloca (prefix_len + dirlen + sizeof "gconv-modules");
+  char infile[prefix_len + dirlen + sizeof "gconv-modules"];
+  cp = infile;
   if (dir[0] == '/')
     cp = mempcpy (cp, prefix, prefix_len);
   strcpy (mempcpy (cp, dir, dirlen), "gconv-modules");
@@ -1032,20 +1056,25 @@ write_output (void)
   struct iovec iov[6];
   static const gidx_t null_word;
   size_t total;
-  char tmpfname[prefix_len + sizeof (GCONV_MODULES_CACHE)
+  char finalname[prefix_len + sizeof GCONV_MODULES_CACHE];
+  char tmpfname[(output_file == NULL ? sizeof finalname : output_file_len + 1)
 		+ strlen (".XXXXXX")];
-  char finalname[prefix_len + sizeof (GCONV_MODULES_CACHE)];
 
   /* Open the output file.  */
-  assert (GCONV_MODULES_CACHE[0] == '/');
-  strcpy (stpcpy (mempcpy (tmpfname, prefix, prefix_len), GCONV_MODULES_CACHE),
-	  ".XXXXXX");
+  if (output_file == NULL)
+    {
+      assert (GCONV_MODULES_CACHE[0] == '/');
+      strcpy (stpcpy (mempcpy (tmpfname, prefix, prefix_len),
+		      GCONV_MODULES_CACHE),
+	      ".XXXXXX");
+      strcpy (mempcpy (finalname, prefix, prefix_len), GCONV_MODULES_CACHE);
+    }
+  else
+    strcpy (mempcpy (tmpfname, output_file, output_file_len), ".XXXXXX");
   fd = mkstemp (tmpfname);
   if (fd == -1)
     return 1;
 
-  strcpy (mempcpy (finalname, prefix, prefix_len), GCONV_MODULES_CACHE);
-
   /* Create the string table.  */
   string_table = strtabfinalize (strtab, &string_table_size);
 
@@ -1198,7 +1227,7 @@ write_output (void)
       /* The file was created with mode 0600.  Make it world-readable.  */
       || fchmod (fd, 0644) != 0
       /* Rename the file, possibly replacing an old one.  */
-      || rename (tmpfname, finalname) != 0)
+      || rename (tmpfname, output_file ?: finalname) != 0)
     {
       int save_errno = errno;
       close (fd);
diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index 5034db1206..8898be3664 100644
--- a/inet/netinet/in.h
+++ b/inet/netinet/in.h
@@ -479,13 +479,13 @@ extern int inet6_option_find (__const struct cmsghdr *__cmsg,
 /* Multicast source filter support.  */
 
 /* Get IPv4 source filter.  */
-extern int getipv4sourcefilter (int __s, struct in_addr __interface,
+extern int getipv4sourcefilter (int __s, struct in_addr __interface_addr,
 				struct in_addr __group, uint32_t *__fmode,
 				uint32_t *__numsrc, struct in_addr *__slist)
      __THROW;
 
 /* Set IPv4 source filter.  */
-extern int setipv4sourcefilter (int __s, struct in_addr __interface,
+extern int setipv4sourcefilter (int __s, struct in_addr __interface_addr,
 				struct in_addr __group, uint32_t __fmode,
 				uint32_t __numsrc,
 				__const struct in_addr *__slist)
@@ -493,14 +493,14 @@ extern int setipv4sourcefilter (int __s, struct in_addr __interface,
 
 
 /* Get source filter.  */
-extern int getsourcefilter (int __s, uint32_t __interface,
+extern int getsourcefilter (int __s, uint32_t __interface_addr,
 			    __const struct sockaddr *__group,
 			    socklen_t __grouplen, uint32_t *__fmode,
 			    uint32_t *__numsrc,
 			    struct sockaddr_storage *__slist) __THROW;
 
 /* Set source filter.  */
-extern int setsourcefilter (int __s, uint32_t __interface,
+extern int setsourcefilter (int __s, uint32_t __interface_addr,
 			    __const struct sockaddr *__group,
 			    socklen_t __grouplen, uint32_t __fmode,
 			    uint32_t __numsrc,
diff --git a/locale/langinfo.h b/locale/langinfo.h
index 6d7c25c6c2..15ff950bd5 100644
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -1,5 +1,5 @@
 /* Access to locale-dependent parameters.
-   Copyright (C) 1995-2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -128,9 +128,9 @@ enum
   MON_12,
 #define MON_12			MON_12
 
-  AM_STR,			/* Ante meridian string.  */
+  AM_STR,			/* Ante meridiem string.  */
 #define AM_STR			AM_STR
-  PM_STR,			/* Post meridian string.  */
+  PM_STR,			/* Post meridiem string.  */
 #define PM_STR			PM_STR
 
   D_T_FMT,			/* Date and time format for strftime.  */
@@ -205,8 +205,8 @@ enum
   _NL_WMON_11,
   _NL_WMON_12,
 
-  _NL_WAM_STR,		/* Ante meridian string.  */
-  _NL_WPM_STR,		/* Post meridian string.  */
+  _NL_WAM_STR,		/* Ante meridiem string.  */
+  _NL_WPM_STR,		/* Post meridiem string.  */
 
   _NL_WD_T_FMT,		/* Date and time format for strftime.  */
   _NL_WD_FMT,		/* Date format for strftime.  */
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)
diff --git a/version.h b/version.h
index 07d0ac72f6..4eeb1cceb3 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
 #define RELEASE "stable"
-#define VERSION "2.3.3"
+#define VERSION "2.3.4"