Merge rev 1.21: change default from "rsh" to "ssh", rev 1.14: comprehensive

-T CVS/Template support, rev 1.9: new long flag that causes cvs to ignore
the CVSROOT/passwd file, rev 1.3: support for checking out from a read-only
repository, rev. 1.2: support for local $Id$ keyword  into cvs 1.11-20080310.

contrib/cvs/src/cvs.h

@@ -304,9 +304,6 @@ extern int errno;
    command line, the client, etc.  */
 #define MAXDATELEN	50
 
-/* FreeBSD.org default is to use ssh.  */
-#define RSH_DFLT	"ssh"
-
 /* The type of an entnode.  */
 enum ent_type
 {
@@ -928,6 +925,7 @@ char *descramble PROTO ((char *str));
 
 #ifdef AUTH_CLIENT_SUPPORT
 char *get_cvs_password PROTO((void));
+void free_cvs_password PROTO((char *str));
 int get_cvs_port_number PROTO((const cvsroot_t *root));
 char *normalize_cvsroot PROTO((const cvsroot_t *root));
 #endif /* AUTH_CLIENT_SUPPORT */