Patch for out-of-date bug reporting instructions

["Joseph S. Myers" <jsm at polyomino dot org dot uk>]

Various programs in glibc give bug reporting instructions with --help that
still refer to glibcbug.  This patch should fix them and some references
in the manual.  (There are still other references to glibcbug, bug-glibc
and bug-glibc-manual left.)

2004-05-15  Joseph S. Myers  <jsm@polyomino.org.uk>

	* catgets/gencat.c, csu/version.c, debug/catchsegv.sh,
	debug/pcprofiledump.c, debug/xtrace.sh, elf/ldd.bash.in,
	iconv/iconv_prog.c, iconv/iconvconfig.c, locale/programs/locale.c,
	locale/programs/localedef.c, login/programs/pt_chown.c,
	malloc/memusage.sh, malloc/memusagestat.c, malloc/mtrace.pl,
	manual/crypt.texi, manual/install.texi, nss/makedb.c: Update bug
	reporting instructions.

diff -ruN libc.orig/catgets/gencat.c libc/catgets/gencat.c
--- libc.orig/catgets/gencat.c	2004-01-02 11:52:09.000000000 +0000
+++ libc/catgets/gencat.c	2004-05-15 19:25:50.000000000 +0000
@@ -231,7 +231,8 @@
     case ARGP_KEY_HELP_EXTRA:
       /* We print some extra information.  */
       return strdup (gettext ("\
-Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"));
+For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n"));
     default:
       break;
     }
diff -ruN libc.orig/csu/version.c libc/csu/version.c
--- libc.orig/csu/version.c	2004-01-02 11:52:09.000000000 +0000
+++ libc/csu/version.c	2004-05-15 19:26:24.000000000 +0000
@@ -37,7 +37,8 @@
 #ifdef USE_TLS
 "Thread-local storage support included.\n"
 #endif
-"Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n";
+"For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n";
 
 #include <unistd.h>
 
diff -ruN libc.orig/debug/catchsegv.sh libc/debug/catchsegv.sh
--- libc.orig/debug/catchsegv.sh	2003-10-16 00:46:07.000000000 +0000
+++ libc/debug/catchsegv.sh	2004-05-15 19:29:44.000000000 +0000
@@ -33,7 +33,8 @@
       echo 'Usage: catchsegv PROGRAM ARGS...'
       echo '  --help      print this help, then exit'
       echo '  --version   print version number, then exit'
-      echo "Report bugs using the \`glibcbug' script to <bugs@gnu.org>."
+      echo "For bug reporting instructions, please see:"
+      echo "<http://www.gnu.org/software/libc/bugs.html>."
       exit 0
       ;;
     --v | --ve | --ver | --vers | --versi | --versio | --version)
diff -ruN libc.orig/debug/pcprofiledump.c libc/debug/pcprofiledump.c
--- libc.orig/debug/pcprofiledump.c	2002-05-20 07:57:34.000000000 +0000
+++ libc/debug/pcprofiledump.c	2004-05-15 19:26:34.000000000 +0000
@@ -197,7 +197,8 @@
     case ARGP_KEY_HELP_EXTRA:
       /* We print some extra information.  */
       return strdup (gettext ("\
-Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"));
+For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n"));
     default:
       break;
     }
diff -ruN libc.orig/debug/xtrace.sh libc/debug/xtrace.sh
--- libc.orig/debug/xtrace.sh	2004-01-02 11:52:09.000000000 +0000
+++ libc/debug/xtrace.sh	2004-05-15 19:30:49.000000000 +0000
@@ -54,7 +54,8 @@
 Mandatory arguments to long options are also mandatory for any corresponding
 short options.
 
-Report bugs using the \`glibcbug' script to <bugs@gnu.org>.\n"
+For bug reporting instructions, please see:
+<http://www.gnu.org/software/libc/bugs.html>.\n"
   exit 0
 }
 
diff -ruN libc.orig/elf/ldd.bash.in libc/elf/ldd.bash.in
--- libc.orig/elf/ldd.bash.in	2004-01-02 11:52:09.000000000 +0000
+++ libc/elf/ldd.bash.in	2004-05-15 19:31:36.000000000 +0000
@@ -51,7 +51,8 @@
   -d, --data-relocs       process data relocations
   -r, --function-relocs   process data and function relocations
   -v, --verbose           print all information
-Report bugs using the \`glibcbug' script to <bugs@gnu.org>."
+For bug reporting instructions, please see:
+<http://www.gnu.org/software/libc/bugs.html>."
     exit 0
     ;;
   -d | --d | --da | --dat | --data | --data- | --data-r | --data-re | \
diff -ruN libc.orig/iconv/iconv_prog.c libc/iconv/iconv_prog.c
--- libc.orig/iconv/iconv_prog.c	2004-03-05 14:21:29.000000000 +0000
+++ libc/iconv/iconv_prog.c	2004-05-15 19:27:00.000000000 +0000
@@ -406,7 +406,8 @@
     case ARGP_KEY_HELP_EXTRA:
       /* We print some extra information.  */
       return strdup (gettext ("\
-Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"));
+For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n"));
     default:
       break;
     }
diff -ruN libc.orig/iconv/iconvconfig.c libc/iconv/iconvconfig.c
--- libc.orig/iconv/iconvconfig.c	2004-01-02 11:52:09.000000000 +0000
+++ libc/iconv/iconvconfig.c	2004-05-15 19:27:07.000000000 +0000
@@ -355,7 +355,8 @@
     case ARGP_KEY_HELP_EXTRA:
       /* We print some extra information.  */
       return strdup (gettext ("\
-Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"));
+For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n"));
     default:
       break;
     }
diff -ruN libc.orig/locale/programs/locale.c libc/locale/programs/locale.c
--- libc.orig/locale/programs/locale.c	2004-02-13 10:22:26.000000000 +0000
+++ libc/locale/programs/locale.c	2004-05-15 19:27:22.000000000 +0000
@@ -277,7 +277,8 @@
     case ARGP_KEY_HELP_EXTRA:
       /* We print some extra information.  */
       return xstrdup (gettext ("\
-Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"));
+For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n"));
     default:
       break;
     }
diff -ruN libc.orig/locale/programs/localedef.c libc/locale/programs/localedef.c
--- libc.orig/locale/programs/localedef.c	2004-04-12 14:18:13.000000000 +0000
+++ libc/locale/programs/localedef.c	2004-05-15 19:27:28.000000000 +0000
@@ -370,7 +370,8 @@
                        locale path    : %s\n\
 %s"),
 		CHARMAP_PATH, REPERTOIREMAP_PATH, LOCALE_PATH, gettext ("\
-Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"));
+For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n"));
       return cp;
     default:
       break;
diff -ruN libc.orig/login/programs/pt_chown.c libc/login/programs/pt_chown.c
--- libc.orig/login/programs/pt_chown.c	2001-07-06 10:52:53.000000000 +0000
+++ libc/login/programs/pt_chown.c	2004-05-15 19:27:38.000000000 +0000
@@ -86,7 +86,8 @@
  and the access permission is set to `%o'.\n\n\
 %s"),
 		TTY_GROUP, S_IRUSR|S_IWUSR|S_IWGRP, gettext ("\
-Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"));
+For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n"));
       return cp;
     default:
       break;
diff -ruN libc.orig/malloc/memusage.sh libc/malloc/memusage.sh
--- libc.orig/malloc/memusage.sh	2004-01-02 11:52:12.000000000 +0000
+++ libc/malloc/memusage.sh	2004-05-15 19:32:03.000000000 +0000
@@ -61,7 +61,8 @@
 Mandatory arguments to long options are also mandatory for any corresponding
 short options.
 
-Report bugs using the \`glibcbug' script to <bugs@gnu.org>."
+For bug reporting instructions, please see:
+<http://www.gnu.org/software/libc/bugs.html>."
   exit 0
 }
 
diff -ruN libc.orig/malloc/memusagestat.c libc/malloc/memusagestat.c
--- libc.orig/malloc/memusagestat.c	2003-10-16 00:46:16.000000000 +0000
+++ libc/malloc/memusagestat.c	2004-05-15 19:27:59.000000000 +0000
@@ -600,7 +600,8 @@
     case ARGP_KEY_HELP_EXTRA:
       /* We print some extra information.  */
       orig = gettext ("\
-Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n");
+For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n");
       cp = strdup (orig);
       if (cp == NULL)
 	cp = orig;
diff -ruN libc.orig/malloc/mtrace.pl libc/malloc/mtrace.pl
--- libc.orig/malloc/mtrace.pl	2004-01-02 11:52:12.000000000 +0000
+++ libc/malloc/mtrace.pl	2004-05-15 19:32:34.000000000 +0000
@@ -30,7 +30,8 @@
     print "  --help       print this help, then exit\n";
     print "  --version    print version number, then exit\n";
     print "\n";
-    print "Report bugs using the `glibcbug' script to <bugs\@gnu.org>.\n";
+    print "For bug reporting instructions, please see:\n"
+    print "<http://www.gnu.org/software/libc/bugs.html>.\n";
     exit 0;
 }
 
diff -ruN libc.orig/manual/crypt.texi libc/manual/crypt.texi
--- libc.orig/manual/crypt.texi	2002-12-31 18:25:07.000000000 +0000
+++ libc/manual/crypt.texi	2004-05-15 19:32:57.000000000 +0000
@@ -79,8 +79,8 @@
 the source code'' to most countries.
 
 The rules in this area are continuously changing.  If you know of any
-information in this manual that is out-of-date, please report it using
-the @code{glibcbug} script. @xref{Reporting Bugs}.
+information in this manual that is out-of-date, please report it to
+the bug database.  @xref{Reporting Bugs}.
 
 @node getpass
 @section Reading Passwords
diff -ruN libc.orig/manual/install.texi libc/manual/install.texi
--- libc.orig/manual/install.texi	2004-03-04 10:19:37.000000000 +0000
+++ libc/manual/install.texi	2004-05-15 19:34:44.000000000 +0000
@@ -559,7 +559,7 @@
 reported.  Bugs are documented in two places: The file @file{BUGS}
 describes a number of well known bugs and the bug tracking system has a
 WWW interface at
-@url{http://www-gnats.gnu.org:8080/cgi-bin/wwwgnats.pl}.  The WWW
+@url{http://sources.redhat.com/bugzilla/}.  The WWW
 interface gives you access to open and closed reports.  A closed report
 normally includes a patch or a hint on solving the problem.
 
@@ -582,20 +582,13 @@
 function call, if possible.  This should not be too difficult.
 
 The final step when you have a simple test case is to report the bug.
-Do this using the @code{glibcbug} script.  It is installed with libc, or
-if you haven't installed it, will be in your build directory.  Send your
-test case, the results you got, the results you expected, and what you
-think the problem might be (if you've thought of anything).
-@code{glibcbug} will insert the configuration information we need to
-see, and ship the report off to @email{bugs@@gnu.org}.  Don't send
-a message there directly; it is fed to a program that expects mail to be
-formatted in a particular way.  Use the script.
+Do this using the WWW interface to the bug database.
 
 If you are not sure how a function should behave, and this manual
 doesn't tell you, that's a bug in the manual.  Report that too!  If the
 function's behavior disagrees with the manual, then either the library
 or the manual has a bug, so report the disagreement.  If you find any
-errors or omissions in this manual, please report them to the Internet
-address @email{bug-glibc-manual@@gnu.org}.  If you refer to specific
+errors or omissions in this manual, please report them to the
+bug database.  If you refer to specific
 sections of the manual, please include the section names for easier
 identification.
diff -ruN libc.orig/nss/makedb.c libc/nss/makedb.c
--- libc.orig/nss/makedb.c	2001-07-06 10:52:58.000000000 +0000
+++ libc/nss/makedb.c	2004-05-15 19:28:10.000000000 +0000
@@ -229,7 +229,8 @@
     case ARGP_KEY_HELP_EXTRA:
       /* We print some extra information.  */
       return strdup (gettext ("\
-Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"));
+For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n"));
     default:
       break;
     }

-- 
Joseph S. Myers
jsm@polyomino.org.uk