[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs ChangeLog Makefile.in NEWS config.h.in con... [cvs1-11-x-
|
From: |
Mark D. Baushke |
|
Subject: |
[Cvs-cvs] ccvs ChangeLog Makefile.in NEWS config.h.in con... [cvs1-11-x-branch] |
|
Date: |
Mon, 28 Jan 2008 01:23:03 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch: cvs1-11-x-branch
Changes by: Mark D. Baushke <mdb> 08/01/28 01:22:56
Modified files:
. : ChangeLog Makefile.in NEWS config.h.in
configure configure.in
contrib : Makefile.in
diff : Makefile.in
doc : ChangeLog Makefile.in cvs.texinfo stamp-vti
version.texi
lib : Makefile.in
man : Makefile.in
src : ChangeLog Makefile.in client.c filesubr.c
tools : Makefile.in
vms : Makefile.in
windows-NT : ChangeLog Makefile.in config.h config.h.in
windows-NT/SCC : Makefile.in
Log message:
* 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.
* doc/cvs.texinfo: Document use of --with-ssh flag to configure and
how :extssh: uses the CVS_SSH environment variable or "ssh".
* doc/stamp-vti, doc/version.texi: Regenerated.
* src/filesubr.c (xreadlink): s/128/BUFSIZ/ avoid magic numbers.
* src/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.
* windows-NT/config.h.in (RSH_DFLT, SSH_DFLT): Add default values.
* windows-NT/Makefile.in, config.h: Regenerated.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.692.2.260&r2=1.692.2.261
http://cvs.savannah.gnu.org/viewcvs/ccvs/Makefile.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.88.4.17&r2=1.88.4.18
http://cvs.savannah.gnu.org/viewcvs/ccvs/NEWS?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.116.2.167&r2=1.116.2.168
http://cvs.savannah.gnu.org/viewcvs/ccvs/config.h.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.71.4.13&r2=1.71.4.14
http://cvs.savannah.gnu.org/viewcvs/ccvs/configure?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.174.2.81&r2=1.174.2.82
http://cvs.savannah.gnu.org/viewcvs/ccvs/configure.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.176.2.72&r2=1.176.2.73
http://cvs.savannah.gnu.org/viewcvs/ccvs/contrib/Makefile.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.51.4.13&r2=1.51.4.14
http://cvs.savannah.gnu.org/viewcvs/ccvs/diff/Makefile.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.28.4.12&r2=1.28.4.13
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.721.2.131&r2=1.721.2.132
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/Makefile.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.55.4.25&r2=1.55.4.26
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.texinfo?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.545.2.72&r2=1.545.2.73
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/stamp-vti?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.19.2.96&r2=1.19.2.97
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/version.texi?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.20.2.96&r2=1.20.2.97
http://cvs.savannah.gnu.org/viewcvs/ccvs/lib/Makefile.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.61.4.18&r2=1.61.4.19
http://cvs.savannah.gnu.org/viewcvs/ccvs/man/Makefile.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.32.4.13&r2=1.32.4.14
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.2336.2.498&r2=1.2336.2.499
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/Makefile.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.83.4.15&r2=1.83.4.16
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/client.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.318.4.47&r2=1.318.4.48
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/filesubr.c?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.59.4.20&r2=1.59.4.21
http://cvs.savannah.gnu.org/viewcvs/ccvs/tools/Makefile.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.23.4.12&r2=1.23.4.13
http://cvs.savannah.gnu.org/viewcvs/ccvs/vms/Makefile.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.22.4.17&r2=1.22.4.18
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/ChangeLog?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.158.2.43&r2=1.158.2.44
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/Makefile.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.29.4.21&r2=1.29.4.22
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/config.h?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.46.2.39&r2=1.46.2.40
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/config.h.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/windows-NT/SCC/Makefile.in?cvsroot=cvs&only_with_tag=cvs1-11-x-branch&r1=1.18.4.11&r2=1.18.4.12
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/ChangeLog,v
retrieving revision 1.692.2.260
retrieving revision 1.692.2.261
diff -u -b -r1.692.2.260 -r1.692.2.261
--- ChangeLog 25 Jan 2008 00:11:26 -0000 1.692.2.260
+++ ChangeLog 28 Jan 2008 01:22:45 -0000 1.692.2.261
@@ -1,3 +1,9 @@
+2008-01-27 Mark D. Baushke <address@hidden>
+
+ * 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.88.4.17
retrieving revision 1.88.4.18
diff -u -b -r1.88.4.17 -r1.88.4.18
--- Makefile.in 22 Aug 2007 21:24:08 -0000 1.88.4.17
+++ Makefile.in 28 Jan 2008 01:22:45 -0000 1.88.4.18
@@ -189,6 +189,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.116.2.167
retrieving revision 1.116.2.168
diff -u -b -r1.116.2.167 -r1.116.2.168
--- NEWS 25 Jan 2008 00:11:26 -0000 1.116.2.167
+++ NEWS 28 Jan 2008 01:22:45 -0000 1.116.2.168
@@ -8,6 +8,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.71.4.13
retrieving revision 1.71.4.14
diff -u -b -r1.71.4.13 -r1.71.4.14
--- config.h.in 28 Jun 2006 20:49:30 -0000 1.71.4.13
+++ config.h.in 28 Jan 2008 01:22:45 -0000 1.71.4.14
@@ -433,6 +433,10 @@
it. */
#undef SIZE_MAX
+/* The default remote shell to use, if one does not specify the CVS_SSH
+ environment variable. */
+#undef SSH_DFLT
+
/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
#undef STAT_MACROS_BROKEN
Index: configure
===================================================================
RCS file: /cvsroot/cvs/ccvs/configure,v
retrieving revision 1.174.2.81
retrieving revision 1.174.2.82
diff -u -b -r1.174.2.81 -r1.174.2.82
--- configure 14 Dec 2007 17:22:54 -0000 1.174.2.81
+++ configure 28 Jan 2008 01:22:45 -0000 1.174.2.82
@@ -716,6 +716,7 @@
KRB4
includeopt
EDITOR
+with_default_ssh
with_default_rsh
LTLIBOBJS'
ac_subst_files='MKTEMP_SH_FUNCTION'
@@ -1365,6 +1366,8 @@
--with-gssapi GSSAPI directory (default autoselects)
--with-editor The default text editor CVS should use for log
messages (default autoselects)
+ --with-ssh The default remote shell CVS will use for :extssh:
+ transport (default autodetects)
--with-rsh The default remote shell CVS will use for :ext:
transport (default autodetects)
--with-tmpdir The temporary directory CVS should use as a default
@@ -12125,13 +12128,100 @@
+# What remote shell transport should the :extssh: 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 lsh 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
+
+
+
+
# 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;
else
- with_rsh="remsh rsh ssh"
+ with_rsh="remsh rsh ssh lsh ssh2"
fi
@@ -14034,11 +14124,12 @@
KRB4!$KRB4$ac_delim
includeopt!$includeopt$ac_delim
EDITOR!$EDITOR$ac_delim
+with_default_ssh!$with_default_ssh$ac_delim
with_default_rsh!$with_default_rsh$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; 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.176.2.72
retrieving revision 1.176.2.73
diff -u -b -r1.176.2.72 -r1.176.2.73
--- configure.in 14 Dec 2007 17:22:54 -0000 1.176.2.72
+++ configure.in 28 Jan 2008 01:22:48 -0000 1.176.2.73
@@ -495,6 +495,53 @@
dnl
dnl
+dnl begin --with-ssh
+dnl
+
+# What remote shell transport should the :extssh: 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 autodetects)]), ,
+ [with_ssh="ssh lsh 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.])
+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
@@ -511,7 +558,7 @@
dnl and `remsh' is the remote shell, but look for it first since it
dnl probably won't exist on any platform where it shouldn't be preferred
dnl to `rsh'.
- [with_rsh="remsh rsh ssh"])
+ [with_rsh="remsh rsh ssh lsh ssh2"])
if test no = "$with_rsh"; then
AC_MSG_WARN([Failed to find usable remote shell. Using 'rsh'.])
Index: contrib/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/contrib/Makefile.in,v
retrieving revision 1.51.4.13
retrieving revision 1.51.4.14
diff -u -b -r1.51.4.13 -r1.51.4.14
--- contrib/Makefile.in 22 Aug 2007 21:24:55 -0000 1.51.4.13
+++ contrib/Makefile.in 28 Jan 2008 01:22:49 -0000 1.51.4.14
@@ -181,6 +181,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
contribdir = $(pkgdatadir)/contrib
contrib_SCRIPTS = \
check_cvs \
Index: diff/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/diff/Makefile.in,v
retrieving revision 1.28.4.12
retrieving revision 1.28.4.13
diff -u -b -r1.28.4.12 -r1.28.4.13
--- diff/Makefile.in 22 Aug 2007 21:24:55 -0000 1.28.4.12
+++ diff/Makefile.in 28 Jan 2008 01:22:49 -0000 1.28.4.13
@@ -165,6 +165,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
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.721.2.131
retrieving revision 1.721.2.132
diff -u -b -r1.721.2.131 -r1.721.2.132
--- doc/ChangeLog 25 Jan 2008 17:56:14 -0000 1.721.2.131
+++ doc/ChangeLog 28 Jan 2008 01:22:49 -0000 1.721.2.132
@@ -1,6 +1,10 @@
-2008-01-25 Mark D. Baushke <address@hidden>
+2008-01-27 Mark D. Baushke <address@hidden>
- * doc/cvs.texinfo: Update copyright for 2008.
+ * 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>
Index: doc/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/Makefile.in,v
retrieving revision 1.55.4.25
retrieving revision 1.55.4.26
diff -u -b -r1.55.4.25 -r1.55.4.26
--- doc/Makefile.in 22 Aug 2007 21:24:55 -0000 1.55.4.25
+++ doc/Makefile.in 28 Jan 2008 01:22:50 -0000 1.55.4.26
@@ -183,6 +183,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
info_TEXINFOS = cvs.texinfo cvsclient.texi
man_MANS = $(srcdir)/cvs.1
PSS = \
Index: doc/cvs.texinfo
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.texinfo,v
retrieving revision 1.545.2.72
retrieving revision 1.545.2.73
diff -u -b -r1.545.2.72 -r1.545.2.73
--- doc/cvs.texinfo 25 Jan 2008 17:56:14 -0000 1.545.2.72
+++ doc/cvs.texinfo 28 Jan 2008 01:22:50 -0000 1.545.2.73
@@ -2183,13 +2183,24 @@
@ref{Creating a repository}.
@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
operations, so the remote user host needs to have a
@file{.rhosts} file which grants access to the local
-user.
+user. Note that the program that @sc{cvs} uses for this
+purpose may be specified using the @file{--with-rsh}
+flag to configure.
For example, suppose you are the user @samp{mozart} on
the local machine @samp{toe.example.com}, and the
@@ -2208,6 +2219,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
@@ -2229,14 +2247,21 @@
@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} but you may set the
+default this is @code{rsh} (unless otherwise specified
+by the @file{--with-rsh} flag to configure) but you may set the
@code{CVS_RSH} environment variable to invoke another
program which can access the remote server (for
example, @code{remsh} on HP-UX 9 because @code{rsh} is
@@ -2255,8 +2280,8 @@
replacement.
@c FIXME: there should be a way to specify the
@c program in CVSROOT, not CVS_RSH, so that one can use
address@hidden different ones for different roots. e.g. ":ext;rsh=remsh:"
address@hidden instead of ":ext:".
address@hidden different ones for different roots. e.g.
address@hidden ":ext;CVS_RSH=remsh:" instead of ":ext:".
@c See also the comment in src/client.c for rationale
@c concerning "rsh" being the default and never
@c "remsh".
@@ -13891,6 +13916,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
@@ -14285,7 +14316,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.19.2.96
retrieving revision 1.19.2.97
diff -u -b -r1.19.2.96 -r1.19.2.97
--- doc/stamp-vti 25 Jan 2008 00:11:27 -0000 1.19.2.96
+++ doc/stamp-vti 28 Jan 2008 01:22:51 -0000 1.19.2.97
@@ -1,4 +1,4 @@
address@hidden UPDATED 23 January 2008
address@hidden UPDATED 27 January 2008
@set UPDATED-MONTH January 2008
@set EDITION 1.11.22.1
@set VERSION 1.11.22.1
Index: doc/version.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/version.texi,v
retrieving revision 1.20.2.96
retrieving revision 1.20.2.97
diff -u -b -r1.20.2.96 -r1.20.2.97
--- doc/version.texi 25 Jan 2008 00:11:27 -0000 1.20.2.96
+++ doc/version.texi 28 Jan 2008 01:22:52 -0000 1.20.2.97
@@ -1,4 +1,4 @@
address@hidden UPDATED 23 January 2008
address@hidden UPDATED 27 January 2008
@set UPDATED-MONTH January 2008
@set EDITION 1.11.22.1
@set VERSION 1.11.22.1
Index: lib/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/Makefile.in,v
retrieving revision 1.61.4.18
retrieving revision 1.61.4.19
diff -u -b -r1.61.4.18 -r1.61.4.19
--- lib/Makefile.in 22 Aug 2007 21:24:56 -0000 1.61.4.18
+++ lib/Makefile.in 28 Jan 2008 01:22:52 -0000 1.61.4.19
@@ -193,6 +193,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
# For now we need to include $(top_srcdir)/src because some systems
# (at least 'AIX rioscpu2 3 4 000030498200',
Index: man/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/man/Makefile.in,v
retrieving revision 1.32.4.13
retrieving revision 1.32.4.14
diff -u -b -r1.32.4.13 -r1.32.4.14
--- man/Makefile.in 22 Aug 2007 21:24:56 -0000 1.32.4.13
+++ man/Makefile.in 28 Jan 2008 01:22:52 -0000 1.32.4.14
@@ -166,6 +166,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.2336.2.498
retrieving revision 1.2336.2.499
diff -u -b -r1.2336.2.498 -r1.2336.2.499
--- src/ChangeLog 25 Jan 2008 17:56:15 -0000 1.2336.2.498
+++ src/ChangeLog 28 Jan 2008 01:22:52 -0000 1.2336.2.499
@@ -1,4 +1,10 @@
-2008-01-25 Mark D. Baushke <address@hidden>
+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.
Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/Makefile.in,v
retrieving revision 1.83.4.15
retrieving revision 1.83.4.16
diff -u -b -r1.83.4.15 -r1.83.4.16
--- src/Makefile.in 22 Aug 2007 21:24:57 -0000 1.83.4.15
+++ src/Makefile.in 28 Jan 2008 01:22:53 -0000 1.83.4.16
@@ -199,6 +199,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_default_rsh = @with_default_rsh@
+with_default_ssh = @with_default_ssh@
# $(includeopt) is CVS specific and set by configure
# FIXME - This includes line is dependant on its order. This means there is
Index: src/client.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/client.c,v
retrieving revision 1.318.4.47
retrieving revision 1.318.4.48
diff -u -b -r1.318.4.47 -r1.318.4.48
--- src/client.c 25 Jan 2008 00:11:28 -0000 1.318.4.47
+++ src/client.c 28 Jan 2008 01:22:54 -0000 1.318.4.48
@@ -4726,15 +4726,20 @@
/* 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 = getenv ("CVS_RSH");
+ char *env_cvs_rsh = getenv ("CVS_RSH");
+ char *env_cvs_ssh = getenv ("CVS_SSH");
+ char *cvs_rsh;
char *cvs_server = getenv ("CVS_SERVER");
int i = 0;
/* This needs to fit "rsh", "-b", "-l", "USER", "host",
"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 = env_cvs_ssh ? env_cvs_ssh : SSH_DFLT;
+ else
+ cvs_rsh = env_cvs_rsh ? env_cvs_rsh : RSH_DFLT;
+
if (!cvs_server)
cvs_server = "cvs";
@@ -4788,14 +4793,19 @@
/* 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 = getenv ("CVS_RSH");
+ char *env_cvs_rsh = getenv ("CVS_RSH");
+ char *env_cvs_ssh = getenv ("CVS_SSH");
+ char *cvs_rsh;
char *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 = env_cvs_ssh ? env_cvs_ssh : SSH_DFLT;
+ else
+ cvs_rsh = env_cvs_rsh ? env_cvs_rsh : RSH_DFLT;
+
if (!cvs_server)
cvs_server = "cvs";
Index: src/filesubr.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/filesubr.c,v
retrieving revision 1.59.4.20
retrieving revision 1.59.4.21
diff -u -b -r1.59.4.20 -r1.59.4.21
--- src/filesubr.c 4 May 2006 09:53:09 -0000 1.59.4.20
+++ src/filesubr.c 28 Jan 2008 01:22:54 -0000 1.59.4.21
@@ -887,7 +887,7 @@
const char *link;
{
char *file = NULL;
- size_t buflen = 128;
+ size_t buflen = BUFSIZ;
/* Get the name of the file to which `from' is linked. */
while (1)
Index: tools/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/tools/Makefile.in,v
retrieving revision 1.23.4.12
retrieving revision 1.23.4.13
diff -u -b -r1.23.4.12 -r1.23.4.13
--- tools/Makefile.in 22 Aug 2007 21:24:57 -0000 1.23.4.12
+++ tools/Makefile.in 28 Jan 2008 01:22:54 -0000 1.23.4.13
@@ -162,6 +162,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.22.4.17
retrieving revision 1.22.4.18
diff -u -b -r1.22.4.17 -r1.22.4.18
--- vms/Makefile.in 22 Aug 2007 21:24:57 -0000 1.22.4.17
+++ vms/Makefile.in 28 Jan 2008 01:22:55 -0000 1.22.4.18
@@ -165,6 +165,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.158.2.43
retrieving revision 1.158.2.44
diff -u -b -r1.158.2.43 -r1.158.2.44
--- windows-NT/ChangeLog 20 Sep 2005 02:38:02 -0000 1.158.2.43
+++ windows-NT/ChangeLog 28 Jan 2008 01:22:55 -0000 1.158.2.44
@@ -1,3 +1,8 @@
+2008-01-27 Mark D. Baushke <address@hidden>
+
+ * config.h.in (RSH_DFLT, SSH_DFLT): Add default values.
+ * Makefile.in, config.h: Regenerated.
+
2005-09-19 Derek Price <address@hidden>
* Makefile.am (stamp-ch): Sub PACKAGE_STRING rather than reconstructing
Index: windows-NT/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/Makefile.in,v
retrieving revision 1.29.4.21
retrieving revision 1.29.4.22
diff -u -b -r1.29.4.21 -r1.29.4.22
--- windows-NT/Makefile.in 22 Aug 2007 21:24:57 -0000 1.29.4.21
+++ windows-NT/Makefile.in 28 Jan 2008 01:22:55 -0000 1.29.4.22
@@ -179,6 +179,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.46.2.39
retrieving revision 1.46.2.40
diff -u -b -r1.46.2.39 -r1.46.2.40
--- windows-NT/config.h 9 Jun 2006 17:39:38 -0000 1.46.2.39
+++ windows-NT/config.h 28 Jan 2008 01:22:55 -0000 1.46.2.40
@@ -78,6 +78,14 @@
/* The manual says they return void. */
#define RETSIGTYPE void
+/* The default remote shell to use, if one does not specify the CVS_RSH
+ environment variable. */
+#define RSH_DFLT "rsh"
+
+/* The default remote shell to use, if one does not specify the CVS_SSH
+ environment variable. */
+#define SSH_DFLT "putty"
+
/* Define to `unsigned' if <sys/types.h> doesn't define. */
/* sys/types.h doesn't define it, but stdio.h does, which cvs.h
#includes, so things should be okay. */
Index: windows-NT/config.h.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/config.h.in,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- windows-NT/config.h.in 20 Sep 2005 02:38:02 -0000 1.1.2.4
+++ windows-NT/config.h.in 28 Jan 2008 01:22:55 -0000 1.1.2.5
@@ -71,6 +71,14 @@
/* The manual says they return void. */
#define RETSIGTYPE void
+/* The default remote shell to use, if one does not specify the CVS_RSH
+ environment variable. */
+#define RSH_DFLT "rsh"
+
+/* The default remote shell to use, if one does not specify the CVS_SSH
+ environment variable. */
+#define SSH_DFLT "putty"
+
/* Define to `unsigned' if <sys/types.h> doesn't define. */
/* sys/types.h doesn't define it, but stdio.h does, which cvs.h
#includes, so things should be okay. */
Index: windows-NT/SCC/Makefile.in
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/SCC/Makefile.in,v
retrieving revision 1.18.4.11
retrieving revision 1.18.4.12
diff -u -b -r1.18.4.11 -r1.18.4.12
--- windows-NT/SCC/Makefile.in 22 Aug 2007 21:24:57 -0000 1.18.4.11
+++ windows-NT/SCC/Makefile.in 28 Jan 2008 01:22:55 -0000 1.18.4.12
@@ -163,6 +163,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 \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs ChangeLog Makefile.in NEWS config.h.in con... [cvs1-11-x-branch],
Mark D. Baushke <=