cvs-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Cvs-cvs] ccvs ChangeLog Makefile.in NEWS config.h.in con...


From: Mark D. Baushke
Subject: [Cvs-cvs] ccvs ChangeLog Makefile.in NEWS config.h.in con...
Date: Mon, 28 Jan 2008 05:33:01 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Mark D. Baushke <mdb>   08/01/28 05:33:01

Modified files:
        .              : ChangeLog Makefile.in NEWS config.h.in 
                         configure configure.in 
        contrib        : Makefile.in 
        contrib/pam    : Makefile.in 
        diff           : Makefile.in 
        doc            : ChangeLog Makefile.in cvs.texinfo stamp-vti 
                         version.texi 
        doc/i18n       : Makefile.in 
        doc/i18n/pt_BR : Makefile.in 
        lib            : Makefile.in 
        maint-aux      : Makefile.in 
        man            : Makefile.in 
        src            : ChangeLog Makefile.in client.h log.c main.c 
                         recurse.c root.c rsh-client.c 
        tools          : Makefile.in 
        vms            : Makefile.in 
        windows-NT     : ChangeLog Makefile.in config.h config.h.in 
        windows-NT/SCC : Makefile.in 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&r1=1.1363&r2=1.1364
http://cvs.savannah.gnu.org/viewcvs/ccvs/Makefile.in?cvsroot=cvs&r1=1.208&r2=1.209
http://cvs.savannah.gnu.org/viewcvs/ccvs/NEWS?cvsroot=cvs&r1=1.376&r2=1.377
http://cvs.savannah.gnu.org/viewcvs/ccvs/config.h.in?cvsroot=cvs&r1=1.230&r2=1.231
http://cvs.savannah.gnu.org/viewcvs/ccvs/configure?cvsroot=cvs&r1=1.487&r2=1.488
http://cvs.savannah.gnu.org/viewcvs/ccvs/configure.in?cvsroot=cvs&r1=1.384&r2=1.385
http://cvs.savannah.gnu.org/viewcvs/ccvs/contrib/Makefile.in?cvsroot=cvs&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/ccvs/contrib/pam/Makefile.in?cvsroot=cvs&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/ccvs/diff/Makefile.in?cvsroot=cvs&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/ChangeLog?cvsroot=cvs&r1=1.984&r2=1.985
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/Makefile.in?cvsroot=cvs&r1=1.163&r2=1.164
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.texinfo?cvsroot=cvs&r1=1.704&r2=1.705
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/stamp-vti?cvsroot=cvs&r1=1.207&r2=1.208
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/version.texi?cvsroot=cvs&r1=1.209&r2=1.210
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/i18n/Makefile.in?cvsroot=cvs&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/i18n/pt_BR/Makefile.in?cvsroot=cvs&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.in?cvsroot=cvs&r1=1.232&r2=1.233
http://cvs.savannah.gnu.org/viewcvs/ccvs/maint-aux/Makefile.in?cvsroot=cvs&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/ccvs/man/Makefile.in?cvsroot=cvs&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3556&r2=1.3557
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/Makefile.in?cvsroot=cvs&r1=1.190&r2=1.191
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.h?cvsroot=cvs&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/log.c?cvsroot=cvs&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/main.c?cvsroot=cvs&r1=1.276&r2=1.277
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.c?cvsroot=cvs&r1=1.129&r2=1.130
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/root.c?cvsroot=cvs&r1=1.131&r2=1.132
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/rsh-client.c?cvsroot=cvs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/ccvs/tools/Makefile.in?cvsroot=cvs&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/ccvs/vms/Makefile.in?cvsroot=cvs&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/ChangeLog?cvsroot=cvs&r1=1.395&r2=1.396
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/Makefile.in?cvsroot=cvs&r1=1.142&r2=1.143
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/config.h?cvsroot=cvs&r1=1.218&r2=1.219
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/config.h.in?cvsroot=cvs&r1=1.146&r2=1.147
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/SCC/Makefile.in?cvsroot=cvs&r1=1.102&r2=1.103

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.1363
retrieving revision 1.1364
diff -u -b -r1.1363 -r1.1364
--- ChangeLog   25 Jan 2008 07:17:29 -0000      1.1363
+++ ChangeLog   28 Jan 2008 05:32:56 -0000      1.1364
@@ -1,3 +1,13 @@
+2008-01-27  Mark D. Baushke  <address@hidden>
+
+       * configure.in: Look for lshc rather than lsh to avoid problems
+       under Debian GNU/Linux.
+       * configure: Regenerated.
+
+       * configure.in: Add support for --with-ssh and CVS_SSH.
+       * NEWS: Note that :extssh: looks to CVS_SSH rather tha CVS_RSH.
+       * Makefile.in, config.h.in, configure: Regenerated.
+
 2008-01-24  Mark D. Baushke  <address@hidden>
 
        * NEWS: Note that :extssh: method was fixed. New `cvs blame' as an

Index: Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/Makefile.in,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -b -r1.208 -r1.209
--- Makefile.in 27 Aug 2007 02:13:22 -0000      1.208
+++ Makefile.in 28 Jan 2008 05:32:56 -0000      1.209
@@ -430,6 +430,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -503,6 +504,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 
 # Unix source subdirs, where we'll want to run lint and etags:
 # This is a legacy variable from b4 Automake

Index: NEWS
===================================================================
RCS file: /cvsroot/cvs/ccvs/NEWS,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -b -r1.376 -r1.377
--- NEWS        25 Jan 2008 07:17:29 -0000      1.376
+++ NEWS        28 Jan 2008 05:32:56 -0000      1.377
@@ -38,6 +38,10 @@
 
 * The `cvs blame' command is now a synonym for the `cvs annotate' command.
 
+* The :extssh: method will use $CVS_SSH if set, or fall back on "ssh"
+  by default (but may be explicitly set using the --with-ssh flag to
+  configure).
+
 BUG FIXES
 
 * `cvs add' checks more thoroughly for `CVS' directories in the argument list.

Index: config.h.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/config.h.in,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -b -r1.230 -r1.231
--- config.h.in 14 Dec 2007 21:38:49 -0000      1.230
+++ config.h.in 28 Jan 2008 05:32:56 -0000      1.231
@@ -1217,6 +1217,10 @@
    'size_t'. */
 #undef SIZE_T_SUFFIX
 
+/* The default remote shell to use, if one does not specify the CVS_SSH
+   environment variable. */
+#undef SSH_DFLT
+
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at runtime.

Index: configure
===================================================================
RCS file: /cvsroot/cvs/ccvs/configure,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -b -r1.487 -r1.488
--- configure   14 Dec 2007 21:38:49 -0000      1.487
+++ configure   28 Jan 2008 05:32:56 -0000      1.488
@@ -953,6 +953,8 @@
 ZLIB_SUBDIRS
 ZLIB_CPPFLAGS
 ZLIB_LIBS
+with_default_ssh
+SSH_DFLT
 with_default_rsh
 RSH_DFLT
 EDITOR
@@ -1658,6 +1660,8 @@
   --with-gssapi           GSSAPI directory (default autoselects)
   --with-external-zlib    Use the specified ZLIB library (defaults to the
                           version distributed with the CVS source)
+  --with-ssh              The default remote shell CVS will use for :extssh:
+                          transport (default ssh)
   --with-rsh              The default remote shell CVS will use for :ext:
                           transport (default ssh)
   --with-editor           The default text editor CVS should use for log
@@ -43528,6 +43532,94 @@
 
 # What remote shell transport should our client cvs default to using?
 
+# Check whether --with-ssh was given.
+if test "${with_ssh+set}" = set; then
+  withval=$with_ssh;
+else
+  with_ssh="ssh lshc ssh2"
+fi
+
+
+if test no = "$with_ssh"; then
+  { echo "$as_me:$LINENO: WARNING: Failed to find usable remote shell. Using 
'ssh'." >&5
+echo "$as_me: WARNING: Failed to find usable remote shell. Using 'ssh'." >&2;}
+  with_ssh=ssh
+elif test yes = "$with_ssh"; then
+  # Make --with-ssh mean the same thing as --with-ssh=ssh
+  with_ssh=ssh
+fi
+
+if echo $with_ssh |grep ^/ >/dev/null; then
+  # If $with_ssh is an absolute path, issue a warning if the executable
+  # doesn't exist or isn't usable, but then trust the user and use it
+  # regardless
+  with_default_ssh=$with_ssh
+  { echo "$as_me:$LINENO: checking for a remote shell" >&5
+echo $ECHO_N "checking for a remote shell... $ECHO_C" >&6; }
+  if ! test -f $with_ssh \
+      || ! test -x $with_ssh; then
+    # warn the user that they may encounter problems
+    { echo "$as_me:$LINENO: WARNING: $with_ssh is not a path to an executable 
file" >&5
+echo "$as_me: WARNING: $with_ssh is not a path to an executable file" >&2;}
+  fi
+else
+  # Search for a remote shell
+  for ac_prog in $with_ssh
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with 
args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_with_default_ssh+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$with_default_ssh"; then
+  ac_cv_prog_with_default_ssh="$with_default_ssh" # Let the user override the 
test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_with_default_ssh="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+with_default_ssh=$ac_cv_prog_with_default_ssh
+if test -n "$with_default_ssh"; then
+  { echo "$as_me:$LINENO: result: $with_default_ssh" >&5
+echo "${ECHO_T}$with_default_ssh" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  test -n "$with_default_ssh" && break
+done
+test -n "$with_default_ssh" || with_default_ssh=""ssh""
+
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define SSH_DFLT "$with_default_ssh"
+_ACEOF
+
+SSH_DFLT=$with_default_ssh
+
+
+
+# What remote shell transport should our client cvs default to using?
+
 # Check whether --with-rsh was given.
 if test "${with_rsh+set}" = set; then
   withval=$with_rsh;
@@ -46449,6 +46541,8 @@
 ZLIB_SUBDIRS!$ZLIB_SUBDIRS$ac_delim
 ZLIB_CPPFLAGS!$ZLIB_CPPFLAGS$ac_delim
 ZLIB_LIBS!$ZLIB_LIBS$ac_delim
+with_default_ssh!$with_default_ssh$ac_delim
+SSH_DFLT!$SSH_DFLT$ac_delim
 with_default_rsh!$with_default_rsh$ac_delim
 RSH_DFLT!$RSH_DFLT$ac_delim
 EDITOR!$EDITOR$ac_delim
@@ -46458,7 +46552,7 @@
 gl_LTLIBOBJS!$gl_LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Index: configure.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/configure.in,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -b -r1.384 -r1.385
--- configure.in        14 Dec 2007 21:38:49 -0000      1.384
+++ configure.in        28 Jan 2008 05:32:56 -0000      1.385
@@ -641,6 +641,56 @@
 ACX_WITH_EXTERNAL_ZLIB
 
 dnl
+dnl begin --with-ssh
+dnl
+dnl Many sites no longer desire the use of "ssh" as the default
+dnl remote shell program. They typically favor "ssh" as the default
+
+# What remote shell transport should our client cvs default to using?
+AC_ARG_WITH(
+  [ssh],
+  AC_HELP_STRING(
+    [--with-ssh],
+    [The default remote shell CVS will use for :extssh: transport
+     (default ssh)]), ,
+  [with_ssh="ssh lshc ssh2"])
+
+if test no = "$with_ssh"; then
+  AC_MSG_WARN([Failed to find usable remote shell. Using 'ssh'.])
+  with_ssh=ssh
+elif test yes = "$with_ssh"; then
+  # Make --with-ssh mean the same thing as --with-ssh=ssh
+  with_ssh=ssh
+fi
+
+if echo $with_ssh |grep ^/ >/dev/null; then
+  # If $with_ssh is an absolute path, issue a warning if the executable
+  # doesn't exist or isn't usable, but then trust the user and use it
+  # regardless
+  with_default_ssh=$with_ssh
+  AC_MSG_CHECKING([for a remote shell])
+  if ! test -f $with_ssh \
+      || ! test -x $with_ssh; then
+    # warn the user that they may encounter problems
+    AC_MSG_WARN([$with_ssh is not a path to an executable file])
+  fi
+else
+  # Search for a remote shell
+  AC_CHECK_PROGS([with_default_ssh], [$with_ssh], "ssh")
+fi
+
+AC_DEFINE_UNQUOTED(
+  [SSH_DFLT], ["$with_default_ssh"],
+  [The default remote shell to use, if one does not specify the
+   CVS_SSH environment variable.])
+SSH_DFLT=$with_default_ssh
+AC_SUBST(SSH_DFLT)
+dnl done with finding a default CVS_SSH value
+dnl
+dnl end --with-ssh
+dnl
+
+dnl
 dnl begin --with-rsh
 dnl
 dnl Many sites no longer desire the use of "rsh" as the default

Index: contrib/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/contrib/Makefile.in,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- contrib/Makefile.in 27 Aug 2007 02:13:23 -0000      1.147
+++ contrib/Makefile.in 28 Jan 2008 05:32:57 -0000      1.148
@@ -432,6 +432,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -505,6 +506,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 SUBDIRS = pam
 contribdir = $(pkgdatadir)/contrib
 contrib_SCRIPTS = \

Index: contrib/pam/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/contrib/pam/Makefile.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- contrib/pam/Makefile.in     27 Aug 2007 02:13:23 -0000      1.68
+++ contrib/pam/Makefile.in     28 Jan 2008 05:32:57 -0000      1.69
@@ -395,6 +395,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -468,6 +469,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

Index: diff/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/diff/Makefile.in,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- diff/Makefile.in    27 Aug 2007 02:13:23 -0000      1.116
+++ diff/Makefile.in    28 Jan 2008 05:32:57 -0000      1.117
@@ -404,6 +404,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -477,6 +478,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 INCLUDES = -I$(top_srcdir)/lib -I$(top_builddir)/lib
 noinst_LIBRARIES = libdiff.a
 libdiff_a_SOURCES = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c \

Index: doc/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/ChangeLog,v
retrieving revision 1.984
retrieving revision 1.985
diff -u -b -r1.984 -r1.985
--- doc/ChangeLog       25 Jan 2008 07:17:30 -0000      1.984
+++ doc/ChangeLog       28 Jan 2008 05:32:57 -0000      1.985
@@ -1,3 +1,11 @@
+2008-01-27  Mark D. Baushke  <address@hidden>
+
+       * cvs.texinfo: Document use of --with-ssh flag to configure and
+       how :extssh: uses the CVS_SSH environment variable or "ssh".
+       * stamp-vti, version.texi: Regenerated.
+       
+       * cvs.texinfo: Update copyright for 2008.
+
 2008-01-24  Mark D. Baushke  <address@hidden>
 
        * cvs.texinfo (log options): Document the new cvs log -n

Index: doc/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/Makefile.in,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- doc/Makefile.in     27 Aug 2007 02:13:24 -0000      1.163
+++ doc/Makefile.in     28 Jan 2008 05:32:57 -0000      1.164
@@ -434,6 +434,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -507,6 +508,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 SUBDIRS = i18n
 info_TEXINFOS = cvs.texinfo cvsclient.texi
 man_MANS = $(srcdir)/cvs.1

Index: doc/cvs.texinfo
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.texinfo,v
retrieving revision 1.704
retrieving revision 1.705
diff -u -b -r1.704 -r1.705
--- doc/cvs.texinfo     25 Jan 2008 07:17:31 -0000      1.704
+++ doc/cvs.texinfo     28 Jan 2008 05:32:57 -0000      1.705
@@ -4,7 +4,7 @@
 @macro copyleftnotice
 @noindent
 Copyright @copyright{} 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                       2001, 2002, 2003, 2004, 2005, 2006, 2007
+                       2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
                        Free Software Foundation, Inc.
 
 @multitable @columnfractions .12 .88
@@ -2282,6 +2282,23 @@
 This method option first appeared in @sc{cvs} version 1.12.11 and is valid only
 as a modification to the @code{ext} connection method.
 
address@hidden CVS_SSH method option
address@hidden address@hidden
+This method option can be used with the @code{extssh} method to specify the 
path
+the @sc{cvs} client will use to find the remote shell used to contact the
address@hidden server and takes precedence over any path specified in the
address@hidden environment variable (@pxref{Connecting via rsh}).  For
+example, to connect to a @sc{cvs} server via the local
address@hidden/path/to/ssh/command} command, you could choose to specify the 
following
address@hidden via the @code{CVS_SSH} method option:
+
address@hidden
+:extssh;CVS_SSH=/path/to/ssh/command:@var{ext_connection_string}
address@hidden example
+
+This method option first appeared in @sc{cvs} version 1.12.14 and is valid only
+as a modification to the @code{extssh} connection method.
+
 @cindex CVS_SERVER method option
 @item address@hidden
 This method option can be used with the @code{ext} and @code{fork} methods to
@@ -2433,7 +2450,16 @@
 these environment variables.
 
 @node Connecting via rsh
address@hidden Connecting with rsh
address@hidden Connecting with rsh or ssh
+
address@hidden ssh
address@hidden may use the @samp{ssh} protocol to perform
+these operations, so the remote user host needs to have
+a either an agent like @code{ssh-agent} to hold
+credentials or a @file{.shosts} file which grants
+access to the local user. Note that the program that
address@hidden uses for this purpose may be specified using
+the @file{--with-ssh} flag to configure.
 
 @cindex rsh
 @sc{cvs} uses the @samp{rsh} protocol to perform these
@@ -2460,6 +2486,13 @@
 rsh -l bach faun.example.org 'echo $PATH'
 @end example
 
address@hidden
+To test that @samp{ssh} is working use
+
address@hidden
+ssh -l bach faun.example.org 'echo $PATH'
address@hidden example
+
 @cindex CVS_SERVER, environment variable
 Next you have to make sure that @code{rsh} will be able
 to find the server.  Make sure that the path which
@@ -2471,7 +2504,7 @@
 environment variable @code{CVS_SERVER} on the client
 machine to the filename of the server you want to use,
 for example @file{/usr/local/bin/cvs-1.6}.
-For the @code{ext} and @code{fork} methods, you may
+For the @code{ext}, @code{extssh} and @code{fork} methods, you may
 also specify @var{CVS_SERVER} as an option in the
 @var{CVSROOT} so that you may use different servers for
 different roots. See @ref{Remote repositories} for more
@@ -2482,12 +2515,18 @@
 
 @cindex :server:, setting up
 @cindex :ext:, setting up
address@hidden :extssh:, setting up
 @cindex Kerberos, using kerberized rsh
 @cindex SSH (rsh replacement)
 @cindex rsh replacements (Kerberized, SSH, &c)
-There are two access methods that you use in @code{CVSROOT}
-for rsh.  @code{:server:} specifies an internal rsh
+There are three access methods that you use in @code{CVSROOT}
+for rsh or ssh.  @code{:server:} specifies an internal rsh
 client, which is supported only by some @sc{cvs} ports.
address@hidden:extssh:} specifies an external ssh program. By
+default this is @code{ssh} (unless otherwise specified
+by the @file{--with-ssh} flag to configure) but you may set the
address@hidden environment variable to invoke another
+program or wrapper script.
 @code{:ext:} specifies an external rsh program.  By
 default this is @code{rsh} (unless otherwise specified
 by the @file{--with-rsh} flag to configure) but you may set the
@@ -2514,6 +2553,13 @@
 some roots to use @code{CVS_RSH=remsh} and some to use
 @code{CVS_RSH=ssh} for the @code{ext} method.  See also
 the @ref{Remote repositories} for more details.
+
+You may choose to specify the @var{CVS_SSH} option as a method option
+in the @var{CVSROOT} string to allow you to use different connection tools
+for different roots (@pxref{The connection method}).  For example, allowing
+some roots to use @code{CVS_SSH=/path/to/wrapper/ssh} and some to use
address@hidden for the @code{extssh} method.  See also
+the @ref{Remote repositories} for more details.
 @c See also the comment in src/client.c for rationale
 @c concerning "rsh" being the default and never
 @c "remsh".
@@ -15745,6 +15791,12 @@
 when @code{:ext:} access method is specified.
 @pxref{Connecting via rsh}.
 
address@hidden CVS_SSH, environment variable
address@hidden $CVS_SSH
+Specifies the external program which @sc{cvs} connects with,
+when @code{:extssh:} access method is specified.
address@hidden via rsh}.
+
 @item $CVS_SERVER
 Used in client-server mode when accessing a remote
 repository using @sc{rsh}.  It specifies the name of
@@ -16164,7 +16216,7 @@
 
 @item end of file from server (consult above messages if any)
 The most common cause for this message is if you are
-using an external @code{rsh} program and it exited with
+using an external @code{rsh} or @code{ssh} program and it exited with
 an error.  In this case the @code{rsh} program should
 have printed a message, which will appear before the
 above message.  For more information on setting up a

Index: doc/stamp-vti
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/stamp-vti,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -b -r1.207 -r1.208
--- doc/stamp-vti       25 Jan 2008 07:17:31 -0000      1.207
+++ doc/stamp-vti       28 Jan 2008 05:32:58 -0000      1.208
@@ -1,4 +1,4 @@
address@hidden UPDATED 23 January 2008
address@hidden UPDATED 27 January 2008
 @set UPDATED-MONTH January 2008
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1

Index: doc/version.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/version.texi,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -b -r1.209 -r1.210
--- doc/version.texi    25 Jan 2008 07:17:31 -0000      1.209
+++ doc/version.texi    28 Jan 2008 05:32:58 -0000      1.210
@@ -1,4 +1,4 @@
address@hidden UPDATED 23 January 2008
address@hidden UPDATED 27 January 2008
 @set UPDATED-MONTH January 2008
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1

Index: doc/i18n/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/i18n/Makefile.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- doc/i18n/Makefile.in        27 Aug 2007 02:13:24 -0000      1.51
+++ doc/i18n/Makefile.in        28 Jan 2008 05:32:58 -0000      1.52
@@ -406,6 +406,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -479,6 +480,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

Index: doc/i18n/pt_BR/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/i18n/pt_BR/Makefile.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- doc/i18n/pt_BR/Makefile.in  27 Aug 2007 02:13:24 -0000      1.52
+++ doc/i18n/pt_BR/Makefile.in  28 Jan 2008 05:32:58 -0000      1.53
@@ -394,6 +394,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -467,6 +468,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

Index: lib/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.in,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -b -r1.232 -r1.233
--- lib/Makefile.in     29 Aug 2007 16:20:25 -0000      1.232
+++ lib/Makefile.in     28 Jan 2008 05:32:58 -0000      1.233
@@ -437,6 +437,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -510,6 +511,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
 noinst_LIBRARIES = libcvs.a libcvs.a
 

Index: maint-aux/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/maint-aux/Makefile.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- maint-aux/Makefile.in       27 Aug 2007 02:13:24 -0000      1.49
+++ maint-aux/Makefile.in       28 Jan 2008 05:32:59 -0000      1.50
@@ -397,6 +397,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -470,6 +471,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 EXTRA_DIST = \
        gnulib-filelist.txt \
        gnulib-update \

Index: man/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/man/Makefile.in,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- man/Makefile.in     27 Aug 2007 02:13:25 -0000      1.118
+++ man/Makefile.in     28 Jan 2008 05:32:59 -0000      1.119
@@ -404,6 +404,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -477,6 +478,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 man_MANS = cvs.5 cvsbug.8
 EXTRA_DIST = \
        .cvsignore \

Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3556
retrieving revision 1.3557
diff -u -b -r1.3556 -r1.3557
--- src/ChangeLog       25 Jan 2008 07:17:32 -0000      1.3556
+++ src/ChangeLog       28 Jan 2008 05:32:59 -0000      1.3557
@@ -1,3 +1,14 @@
+2008-01-27  Mark D. Baushke  <address@hidden>
+
+       * filesubr.c (xreadlink): s/128/BUFSIZ/ avoid magic numbers.
+
+       * client.c (start_rsh_server): Use CVS_SSH for the :extssh:
+       method or fall back to "ssh" as set using the --with-ssh flag to
+       configure.
+
+       * client.h, log.c, main.c, recurse.c, root.c: Update copyright for
+       2008.
+
 2008-01-24  Mark D. Baushke  <address@hidden>
 
        * recurse.c (do_recursion): s/cvs_notfiy_check/cvs_notify_check/

Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/Makefile.in,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -b -r1.190 -r1.191
--- src/Makefile.in     27 Aug 2007 02:11:04 -0000      1.190
+++ src/Makefile.in     28 Jan 2008 05:32:59 -0000      1.191
@@ -441,6 +441,7 @@
 SHELL = /bin/sh
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -514,6 +515,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib \
               -I$(top_srcdir)/diff $(ZLIB_CPPFLAGS)
 

Index: src/client.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- src/client.h        25 Jan 2008 07:17:33 -0000      1.65
+++ src/client.h        28 Jan 2008 05:32:59 -0000      1.66
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1994-2006 The Free Software Foundation, Inc.
+ * Copyright (C) 1994-2008 The Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

Index: src/log.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/log.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- src/log.c   25 Jan 2008 07:17:34 -0000      1.112
+++ src/log.c   28 Jan 2008 05:32:59 -0000      1.113
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1986-2006 The Free Software Foundation, Inc.
+ * Copyright (C) 1986-2008 The Free Software Foundation, Inc.
  *
  * Portions Copyright (C) 1998-2005 Derek Price, Ximbiot <http://ximbiot.com>,
  *                                  and others.

Index: src/main.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/main.c,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -b -r1.276 -r1.277
--- src/main.c  25 Jan 2008 07:17:35 -0000      1.276
+++ src/main.c  28 Jan 2008 05:32:59 -0000      1.277
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1986-2007 The Free Software Foundation, Inc.
+ * Copyright (C) 1986-2008 The Free Software Foundation, Inc.
  *
  * Portions Copyright (C) 1998-2007 Derek Price,
  *                                  Ximbiot LLC <http://ximbiot.com>,

Index: src/recurse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- src/recurse.c       25 Jan 2008 07:17:35 -0000      1.129
+++ src/recurse.c       28 Jan 2008 05:33:00 -0000      1.130
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1986-2007 The Free Software Foundation, Inc.
+ * Copyright (C) 1986-2008 The Free Software Foundation, Inc.
  *
  * Portions Copyright (C) 1998-2007 Derek Price,
  *                                  Ximbiot LLC <http://ximbiot.com>,

Index: src/root.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/root.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- src/root.c  25 Jan 2008 07:17:35 -0000      1.131
+++ src/root.c  28 Jan 2008 05:33:00 -0000      1.132
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1986-2007 The Free Software Foundation, Inc.
+ * Copyright (C) 1986-2008 The Free Software Foundation, Inc.
  *
  * Portions Copyright (C) 1998-2007 Derek Price,
  *                                  Ximbiot LLC <http://ximbiot.com>,
@@ -789,6 +789,12 @@
                newroot->verify_template = xstrdup (q);
            else if (!strcasecmp (p, "verify-arg"))
                push_string (newroot->verify_args, q);
+           else if (!strcasecmp (p, "CVS_SSH"))
+           {
+               /* override CVS_RSH environment variable */
+               if (newroot->method == extssh_method)
+                   newroot->cvs_rsh = xstrdup (q);
+           }
            else if (!strcasecmp (p, "CVS_RSH"))
            {
                /* override CVS_RSH environment variable */

Index: src/rsh-client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/rsh-client.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/rsh-client.c    26 May 2006 04:35:57 -0000      1.14
+++ src/rsh-client.c    28 Jan 2008 05:33:00 -0000      1.15
@@ -48,8 +48,11 @@
     /* If you're working through firewalls, you can set the
        CVS_RSH environment variable to a script which uses rsh to
        invoke another rsh on a proxy machine.  */
-    char *cvs_rsh = (root->cvs_rsh != NULL
+    char *cvs_dflt_rsh = (root->cvs_rsh != NULL
                     ? root->cvs_rsh : getenv ("CVS_RSH"));
+    char *cvs_dflt_ssh = (root->cvs_rsh != NULL
+                         ? root->cvs_rsh : getenv ("CVS_SSH"));
+    char *cvs_rsh;
     char *cvs_server = (root->cvs_server != NULL
                        ? root->cvs_server : getenv ("CVS_SERVER"));
     int i = 0;
@@ -57,8 +60,11 @@
        "cmd (w/ args)", and NULL.  We leave some room to grow. */
     char *rsh_argv[10];
 
-    if (!cvs_rsh)
-       cvs_rsh = RSH_DFLT;
+    if (root->method == extssh_method)
+       cvs_rsh = cvs_dflt_ssh ? cvs_dflt_ssh : SSH_DFLT;
+    else
+       cvs_rsh = cvs_dflt_rsh ? cvs_dflt_rsh : RSH_DFLT;
+
     if (!cvs_server)
        cvs_server = "cvs";
 
@@ -111,16 +117,22 @@
     /* If you're working through firewalls, you can set the
        CVS_RSH environment variable to a script which uses rsh to
        invoke another rsh on a proxy machine.  */
-    char *cvs_rsh = (root->cvs_rsh != NULL
+    char *cvs_dflt_rsh = (root->cvs_rsh != NULL
                     ? root->cvs_rsh : getenv ("CVS_RSH"));
+    char *cvs_dflt_ssh = (root->cvs_rsh != NULL
+                         ? root->cvs_rsh : getenv ("CVS_SSH"));
+    char *cvs_rsh;
     char *cvs_server = (root->cvs_server != NULL
                        ? root->cvs_server : getenv ("CVS_SERVER"));
     char *command;
     int tofd, fromfd;
     int child_pid;
 
-    if (!cvs_rsh)
-       cvs_rsh = RSH_DFLT;
+    if (root->method == extssh_method)
+       cvs_rsh = cvs_dflt_ssh ? cvs_dflt_ssh : SSH_DFLT;
+    else
+       cvs_rsh = cvs_dflt_rsh ? cvs_dflt_rsh : RSH_DFLT;
+
     if (!cvs_server)
        cvs_server = "cvs";
 

Index: tools/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/tools/Makefile.in,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- tools/Makefile.in   27 Aug 2007 02:13:25 -0000      1.108
+++ tools/Makefile.in   28 Jan 2008 05:33:00 -0000      1.109
@@ -400,6 +400,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -473,6 +474,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 EXTRA_DIST = \
        README .cvsignore
 

Index: vms/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/Makefile.in,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- vms/Makefile.in     27 Aug 2007 02:13:25 -0000      1.112
+++ vms/Makefile.in     28 Jan 2008 05:33:00 -0000      1.113
@@ -403,6 +403,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -476,6 +477,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 EXTRA_DIST = \
        .cvsignore \
        ChangeLog \

Index: windows-NT/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/ChangeLog,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -b -r1.395 -r1.396
--- windows-NT/ChangeLog        25 Aug 2007 03:26:01 -0000      1.395
+++ windows-NT/ChangeLog        28 Jan 2008 05:33:00 -0000      1.396
@@ -1,3 +1,8 @@
+2008-01-27  Mark D. Baushke  <address@hidden>
+
+       * config.h.in (SSH_DFLT): Add default value.
+       * Makefile.in, config.h: Regenerated.
+       
 2007-08-24  Derek Price  <address@hidden>
 
        * Makefile.am (sys/stat.h, stamp-sh3): Create sys/stat.h.

Index: windows-NT/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/Makefile.in,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- windows-NT/Makefile.in      27 Aug 2007 02:13:25 -0000      1.142
+++ windows-NT/Makefile.in      28 Jan 2008 05:33:00 -0000      1.143
@@ -416,6 +416,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -489,6 +490,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 EXTRA_DIST = \
        JmgStat.c \
        JmgStat.h \

Index: windows-NT/config.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -b -r1.218 -r1.219
--- windows-NT/config.h 27 Aug 2007 02:13:25 -0000      1.218
+++ windows-NT/config.h 28 Jan 2008 05:33:00 -0000      1.219
@@ -1236,6 +1236,10 @@
    'size_t'. */
 #undef SIZE_T_SUFFIX
 
+/* The default remote shell to use, if one does not specify the CVS_SSH
+   environment variable. */
+#define SSH_DFLT "putty"
+
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at runtime.

Index: windows-NT/config.h.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h.in,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- windows-NT/config.h.in      27 Aug 2007 02:13:25 -0000      1.146
+++ windows-NT/config.h.in      28 Jan 2008 05:33:00 -0000      1.147
@@ -1229,6 +1229,10 @@
    'size_t'. */
 #undef SIZE_T_SUFFIX
 
+/* The default remote shell to use, if one does not specify the CVS_SSH
+   environment variable. */
+#define SSH_DFLT "putty"
+
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at runtime.

Index: windows-NT/SCC/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/SCC/Makefile.in,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- windows-NT/SCC/Makefile.in  27 Aug 2007 02:13:26 -0000      1.102
+++ windows-NT/SCC/Makefile.in  28 Jan 2008 05:33:00 -0000      1.103
@@ -401,6 +401,7 @@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+SSH_DFLT = @SSH_DFLT@
 STDBOOL_H = @STDBOOL_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
@@ -474,6 +475,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
 EXTRA_DIST = \
        .cvsignore \
        README.txt \




reply via email to

[Prev in Thread] Current Thread [Next in Thread]