[Cvs-cvs] ccvs ./ChangeLog ./configure ./configure.in src...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/05/26 04:35:57

Modified files:
        .              : ChangeLog configure configure.in 
        src            : ChangeLog rsh-client.c 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/ChangeLog.diff?tr1=1.1307&tr2=1.1308&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/configure.diff?tr1=1.451&tr2=1.452&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/configure.in.diff?tr1=1.367&tr2=1.368&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3431&tr2=1.3432&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/rsh-client.c.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.1307 ccvs/ChangeLog:1.1308
--- ccvs/ChangeLog:1.1307       Tue May 23 00:35:51 2006
+++ ccvs/ChangeLog      Fri May 26 04:35:57 2006
@@ -1,3 +1,8 @@
+2006-05-25  Derek Price  <address@hidden>
+
+       * configure.in: Prefer `remsh' to `rsh' when autodetecting and comment
+       rationale.
+
 2006-05-22  Derek Price  <address@hidden>
 
        * maint-aux/gnulib-update: s/SIGINT/2/ for Solaris 9.
Index: ccvs/configure
diff -u ccvs/configure:1.451 ccvs/configure:1.452
--- ccvs/configure:1.451        Mon May 22 23:58:59 2006
+++ ccvs/configure      Fri May 26 04:35:57 2006
@@ -43802,7 +43802,7 @@
   withval="$with_rsh"
 
 else
-  with_rsh="ssh rsh"
+          with_rsh="ssh remsh rsh"
 fi;
 
 if test no = "$with_rsh"; then
Index: ccvs/configure.in
diff -u ccvs/configure.in:1.367 ccvs/configure.in:1.368
--- ccvs/configure.in:1.367     Tue May 16 01:28:16 2006
+++ ccvs/configure.in   Fri May 26 04:35:57 2006
@@ -706,7 +706,11 @@
     [--with-rsh],
     [The default remote shell CVS will use for :ext: transport
      (default ssh)]), ,
-  [with_rsh="ssh rsh"])
+  dnl `remsh' is only useful on HP-UX, where `rsh' is the `restricted shell'
+  dnl and `remsh' is the remote shell, but prefer it to `rsh' since it
+  dnl probably won't exist on any platform where it shouldn't be preferred
+  dnl to `rsh'.
+  [with_rsh="ssh remsh rsh"])
 
 if test no = "$with_rsh"; then
   AC_MSG_WARN([Failed to find usable remote shell. Using 'rsh'.])
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3431 ccvs/src/ChangeLog:1.3432
--- ccvs/src/ChangeLog:1.3431   Fri May 26 04:03:51 2006
+++ ccvs/src/ChangeLog  Fri May 26 04:35:57 2006
@@ -1,5 +1,8 @@
 2006-05-25  Derek Price  <address@hidden>
 
+       * rsh-client.c (start_rsh_server): Remove verbose comment attempting to
+       justify the pre-configure-supplied-default of `rsh'.
+
        * sign.c: Include <inttypes.h>.
        (sign): Avoid long long.
 
Index: ccvs/src/rsh-client.c
diff -u ccvs/src/rsh-client.c:1.13 ccvs/src/rsh-client.c:1.14
--- ccvs/src/rsh-client.c:1.13  Thu Sep 29 20:20:34 2005
+++ ccvs/src/rsh-client.c       Fri May 26 04:35:57 2006
@@ -58,26 +58,6 @@
     char *rsh_argv[10];
 
     if (!cvs_rsh)
-       /* People sometimes suggest or assume that this should default
-          to "remsh" on systems like HPUX in which that is the
-          system-supplied name for the rsh program.  However, that
-          causes various problems (keep in mind that systems such as
-          HPUX might have non-system-supplied versions of "rsh", like
-          a Kerberized one, which one might want to use).  If we
-          based the name on what is found in the PATH of the person
-          who runs configure, that would make it harder to
-          consistently produce the same result in the face of
-          different people producing binary distributions.  If we
-          based it on "remsh" always being the default for HPUX
-          (e.g. based on uname), that might be slightly better but
-          would require us to keep track of what the defaults are for
-          each system type, and probably would cope poorly if the
-          existence of remsh or rsh varies from OS version to OS
-          version.  Therefore, it seems best to have the default
-          remain "rsh", and tell HPUX users to specify remsh, for
-          example in CVS_RSH or other such mechanisms to be devised,
-          if that is what they want (the manual already tells them
-          that).  */
        cvs_rsh = RSH_DFLT;
     if (!cvs_server)
        cvs_server = "cvs";