[CVS 1.9 has an incompatibility with glibc2 in the way it calls the
system-supplied getopt function (CVS 1.9 assumes that setting the
optind variable to 1 before calling getopt has the same effect as
passing "+" as the first character of the option string to getopt).
This bug is fixed in the interim releases such as CVS 1.9.8 or later.

The enclosed patch for CVS 1.9, from Red Hat Linux 5.0, tells CVS to
use its own version of getopt, rather than the one supplied by libc.

-kingdon]

--- cvs-1.9/lib/getopt.c.opt	Wed Oct  1 21:13:56 1997
+++ cvs-1.9/lib/getopt.c	Wed Oct  1 21:14:49 1997
@@ -59,6 +59,10 @@
    program understand `configure --with-gnu-libc' and omit the object files,
    it is simpler to just do this in the source for each such file.  */
 
+/* We need this particular version of getopt since the libc one doesn't
+ * work for us with the latest glibc.  If this changes, remove this hack.
+ */
+#define _LIBC 1
 #if defined (_LIBC) || !defined (__GNU_LIBRARY__)
 
 
--- cvs-1.9/lib/getopt1.c.opt	Wed Oct  1 21:14:57 1997
+++ cvs-1.9/lib/getopt1.c	Wed Oct  1 21:15:18 1997
@@ -47,6 +47,10 @@
    program understand `configure --with-gnu-libc' and omit the object files,
    it is simpler to just do this in the source for each such file.  */
 
+/* We need this particular version of getopt since the libc one doesn't
+ * work for us with the latest glibc.  If this changes, remove this hack.
+ */
+#define _LIBC 1
 #if defined (_LIBC) || !defined (__GNU_LIBRARY__)