Update for version 1.11-20080310.

Make our changes to CVS_RSH & CVS_SSH settings here instead of
  contrib/cvs/src/cvs.h.

1 files changed, 44 insertions, 5 deletions

diff --git a/gnu/usr.bin/cvs/lib/config.h.proto b/gnu/usr.bin/cvs/lib/config.h.proto
index adea888..b88faa7 100644
--- a/gnu/usr.bin/cvs/lib/config.h.proto
+++ b/gnu/usr.bin/cvs/lib/config.h.proto
@@ -1,5 +1,6 @@
 /* $FreeBSD$ */
-/* config.h.  Generated by configure.  */
+
+/* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
 /* Enable AUTH_CLIENT_SUPPORT to enable pserver as a remote access method in
@@ -45,10 +46,15 @@
 /* Define to enable encryption support. */
 /* #undef ENCRYPTION */
 
+/* Define if this executable will be running on case insensitive file systems.
+   In the client case, this means that it will request that the server pretend
+   to be case insensitive if it isn't already. */
+/* #undef FILENAMES_CASE_INSENSITIVE */
+
 /* When committing or importing files, you must enter a log message. Normally,
    you can do this either via the -m flag on the command line, the -F flag on
    the command line, or an editor will be started for you. If you like to use
-   logging templates (the rcsinfo file within the /CVSROOT directory),
+   logging templates (the rcsinfo file within the $CVSROOT/CVSROOT directory),
    you might want to force people to use the editor even if they specify a
    message with -m or -F. Enabling FORCE_USE_EDITOR will cause the -m or -F
    message to be appended to the temp file when the editor is started. */
@@ -87,7 +93,7 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
-/* Define to 1 if your system has a working `fnmatch' function. */
+/* Define to 1 if your system has a working POSIX `fnmatch' function. */
 #define HAVE_FNMATCH 1
 
 /* Define to 1 if you have the <fnmatch.h> header file. */
@@ -123,6 +129,9 @@
 /* Define to 1 if you have the `getpassphrase' function. */
 /* #undef HAVE_GETPASSPHRASE */
 
+/* Define to 1 if you have the `getpassphrase' function. */
+/* #undef HAVE_GETPASSPHRASE */
+
 /* Define if you have the getspnam function. */
 /* #undef HAVE_GETSPNAM */
 
@@ -159,6 +168,12 @@
 /* Define to 1 if you have the `krb_get_err_text' function. */
 /* #undef HAVE_KRB_GET_ERR_TEXT */
 
+/* Define to 1 if you have the `krb' library (-lkrb). */
+/* #undef HAVE_LIBKRB */
+
+/* Define to 1 if you have the `krb4' library (-lkrb4). */
+/* #undef HAVE_LIBKRB4 */
+
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 /* #undef HAVE_LIBNSL */
 
@@ -375,7 +390,7 @@
 /* #undef NO_MINUS_C_MINUS_O */
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "bug-cvs@gnu.org"
+#define PACKAGE_BUGREPORT "bug-cvs@nongnu.org"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "Concurrent Versions System (CVS)"
@@ -398,6 +413,11 @@
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 
+/* The default remote shell to use, if one does not specify the CVS_RSH
+   environment variable. */
+/* FreeBSD.org default is to use ssh.  */
+#define RSH_DFLT "ssh"
+
 /* If you are working with a large remote repository and a 'cvs checkout' is
    swamping your network and memory, define these to enable flow control. You
    will end up with even less probability of a consistent checkout (see
@@ -421,6 +441,14 @@
    */
 #define SERVER_SUPPORT 1
 
+/* Define as the maximum value of type 'size_t', if the system doesn't define
+   it. */
+/* #undef SIZE_MAX */
+
+/* The default remote shell to use, if one does not specify the CVS_SSH
+   environment variable. */
+#define SSH_DFLT "ssh"
+
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
 /* #undef STAT_MACROS_BROKEN */
 
@@ -474,16 +502,27 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
+/* We want to always use the GNULIB version of getpass which we have in lib,
+   so define getpass to something that won't conflict with any existing system
+   declarations. */
+/* #define getpass cvs_getpass */
+
 /* Define to `int' if <sys/types.h> doesn't define. */
 /* #undef gid_t */
 
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
 /* Define to `int' if <sys/types.h> does not define. */
 /* #undef mode_t */
 
 /* Define to `int' if <sys/types.h> does not define. */
 /* #undef pid_t */
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
 
 /* Define to `int' if <sys/types.h> doesn't define. */