From owner-cvs-all Mon Feb 26 1: 6:10 2001 Delivered-To: cvs-all@freebsd.org Received: from mail.musha.org (daemon.musha.org [61.122.44.178]) by hub.freebsd.org (Postfix) with ESMTP id D15C237B401; Mon, 26 Feb 2001 01:05:44 -0800 (PST) (envelope-from knu@iDaemons.org) Received: from archon.local.idaemons.org (archon.local.idaemons.org [192.168.1.32]) by mail.musha.org (Postfix) with ESMTP id 57AB14DFF3; Mon, 26 Feb 2001 18:05:56 +0900 (JST) Date: Mon, 26 Feb 2001 18:05:53 +0900 Message-ID: <86k86d6cge.wl@archon.local.idaemons.org> From: "Akinori MUSHA" To: Kris Kennaway Cc: obrien@FreeBSD.org, Hajimu UMEMOTO , cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/gnu/usr.bin/tar Makefile rtapelib.c tar.1 In-Reply-To: <20010226002530.A21297@hub.freebsd.org> References: <200102260748.f1Q7me520862@freefall.freebsd.org> <86lmqt6ekc.wl@archon.local.idaemons.org> <20010226002530.A21297@hub.freebsd.org> User-Agent: Wanderlust/2.5.4 (Smooth) SEMI/1.14.2 (=?ISO-8859-1?Q?Daish=F2?= =?ISO-8859-1?Q?ji?=) FLIM/1.14.2 (Yagi-Nishiguchi) APEL/10.2 MULE XEmacs/21.1 (patch 14) (Cuyahoga Valley) (i386--freebsd) Organization: Associated I. Daemons X-PGP-Public-Key: finger knu@FreeBSD.org X-PGP-Fingerprint: 081D 099C 1705 861D 4B70 B04A 920B EFC7 9FD9 E1EE MIME-Version: 1.0 (generated by SEMI 1.14.2 - =?ISO-8859-1?Q?=22Daish=F2ji=22?=) Content-Type: text/plain; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG At Mon, 26 Feb 2001 00:25:30 -0800, kkenn wrote: > On Mon, Feb 26, 2001 at 05:20:19PM +0900, Akinori MUSHA wrote: > > > Now that CVS_RSH is defaulted to ssh, could it be better to set > > TAR_RSH to ssh by default too? (I'm talking about CURRENT here) > > Sounds fine to me! We've enabled sshd by default for about 6 months now > (since 4.1.1-RELEASE) What about net/rsync then? Its README already recommends ssh over rsh. :) (CC'ed to the port maintainer for review) -- / /__ __ Akinori.org / MUSHA.org / ) ) ) ) / FreeBSD.org / Ruby-lang.org Akinori MUSHA aka / (_ / ( (__( @ iDaemons.org / and.or.jp "We're only at home when we're on the run, on the wing, on the fly" M Makefile A files/ssh-patch-README A files/ssh-patch-options.c A files/ssh-patch-rsync.1 A files/ssh-patch-rsync.h Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/rsync/Makefile,v retrieving revision 1.54 diff -u -r1.54 Makefile --- Makefile 2001/02/07 14:51:15 1.54 +++ Makefile 2001/02/26 09:00:40 @@ -8,6 +8,7 @@ PORTNAME= rsync PORTVERSION= 2.4.6 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= ftp://samba.anu.edu.au/pub/rsync/ \ ftp://sunsite.auc.dk/pub/unix/rsync/ \ @@ -24,6 +25,16 @@ GNU_CONFIGURE= yes .include + +.if ${OSVERSION} >= 400016 +USE_SSH?= yes +.else +USE_SSH?= no +.endif + +.if ${USE_SSH:U} == YES +EXTRA_PATCHES= ${FILESDIR}/ssh-patch-* +.endif .if ${OSVERSION} >= 400014 CONFIGURE_ARGS= --enable-ipv6 Index: files/ssh-patch-README =================================================================== RCS file: ssh-patch-README diff -N ssh-patch-README --- /dev/null Mon Feb 26 18:00:00 2001 +++ ssh-patch-README Mon Feb 26 17:54:35 2001 @@ -0,0 +1,24 @@ +--- README.orig Wed Sep 6 11:46:43 2000 ++++ README Mon Feb 26 17:54:31 2001 +@@ -57,7 +57,7 @@ + -W, --whole-file copy whole files, no incremental checks + -x, --one-file-system don't cross filesystem boundaries + -B, --block-size=SIZE checksum blocking size (default 700) +- -e, --rsh=COMMAND specify rsh replacement ++ -e, --rsh=COMMAND specify rsh replacement (default ssh) + --rsync-path=PATH specify path to rsync on the remote machine + -C, --cvs-exclude auto ignore files in the same way CVS does + --delete delete files that don't exist on the sending side +@@ -90,10 +90,10 @@ + SETUP + ----- + +-Rsync uses rsh or ssh for communication. It does not need to be setuid ++Rsync uses ssh or rsh for communication. It does not need to be setuid + and requires no special privileges for installation. It does not + require a inetd entry or a daemon. You must, however, have a working +-rsh or ssh system. Using ssh is recommended for its security ++ssh or rsh system. Using rsh is discouraged for lack of security + features. + + To install rsync, first run the "configure" script. This will create a Index: files/ssh-patch-options.c =================================================================== RCS file: ssh-patch-options.c diff -N ssh-patch-options.c --- /dev/null Mon Feb 26 18:00:00 2001 +++ ssh-patch-options.c Mon Feb 26 17:46:47 2001 @@ -0,0 +1,11 @@ +--- options.c.orig Mon Feb 26 17:37:19 2001 ++++ options.c Mon Feb 26 17:46:28 2001 +@@ -138,7 +138,7 @@ + rprintf(F," -W, --whole-file copy whole files, no incremental checks\n"); + rprintf(F," -x, --one-file-system don't cross filesystem boundaries\n"); + rprintf(F," -B, --block-size=SIZE checksum blocking size (default %d)\n",BLOCK_SIZE); +- rprintf(F," -e, --rsh=COMMAND specify rsh replacement\n"); ++ rprintf(F," -e, --rsh=COMMAND specify rsh replacement (default %s)\n", RSYNC_RSH); + rprintf(F," --rsync-path=PATH specify path to rsync on the remote machine\n"); + rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n"); + rprintf(F," --existing only update files that already exist\n"); Index: files/ssh-patch-rsync.1 =================================================================== RCS file: ssh-patch-rsync.1 diff -N ssh-patch-rsync.1 --- /dev/null Mon Feb 26 18:00:00 2001 +++ ssh-patch-rsync.1 Mon Feb 26 17:50:02 2001 @@ -0,0 +1,82 @@ +--- rsync.1.orig Wed Sep 6 11:46:43 2000 ++++ rsync.1 Mon Feb 26 17:49:56 2001 +@@ -36,7 +36,7 @@ + .IP o + a CVS exclude mode for ignoring the same files that CVS would ignore + .IP o +-can use any transparent remote shell, including rsh or ssh ++can use any transparent remote shell, including ssh or rsh + .IP o + does not require root privileges + .IP o +@@ -55,8 +55,8 @@ + .IP + .IP o + for copying from the local machine to a remote machine using +-a remote shell program as the transport (such as rsh or +-ssh)\&. This is invoked when the destination path contains a ++a remote shell program as the transport (such as ssh or ++rsh)\&. This is invoked when the destination path contains a + single : separator\&. + .IP + .IP o +@@ -86,11 +86,11 @@ + .PP + See the file README for installation instructions\&. + .PP +-Once installed you can use rsync to any machine that you can use rsh +-to\&. rsync uses rsh for its communications, unless both the source and ++Once installed you can use rsync to any machine that you can use ssh ++to\&. rsync uses ssh for its communications, unless both the source and + destination are local\&. + .PP +-You can also specify an alternative to rsh, by either using the -e ++You can also specify an alternative to ssh, by either using the -e + command line option, or by setting the RSYNC_RSH environment variable\&. + .PP + One common substitute is to use ssh, which offers a high degree of +@@ -151,7 +151,7 @@ + .PP + .SH "CONNECTING TO AN RSYNC SERVER" + .PP +-It is also possible to use rsync without using rsh or ssh as the ++It is also possible to use rsync without using ssh or rsh as the + transport\&. In this case you will connect to a remote rsync server + running on TCP port 873\&. + .PP +@@ -160,7 +160,7 @@ + your web proxy\&. Note that your web proxy must allow proxying to port + 873, this must be configured in your proxy servers ruleset\&. + .PP +-Using rsync in this way is the same as using it with rsh or ssh except ++Using rsync in this way is the same as using it with ssh or rsh except + that: + .PP + .IP o +@@ -270,7 +270,7 @@ + -W, --whole-file copy whole files, no incremental checks + -x, --one-file-system don\'t cross filesystem boundaries + -B, --block-size=SIZE checksum blocking size (default 700) +- -e, --rsh=COMMAND specify rsh replacement ++ -e, --rsh=COMMAND specify rsh replacement (default ssh) + --rsync-path=PATH specify path to rsync on the remote machine + -C, --cvs-exclude auto ignore files in the same way CVS does + --existing only update files that already exist +@@ -563,7 +563,7 @@ + .IP "\fB-e, --rsh=COMMAND\fP" + This option allows you to choose an alternative + remote shell program to use for communication between the local and +-remote copies of rsync\&. By default, rsync will use rsh, but you may ++remote copies of rsync\&. By default, rsync will use ssh, but you may + like to instead use ssh because of its high security\&. + .IP + You can also choose the remote shell program using the RSYNC_RSH +@@ -887,7 +887,7 @@ + .DS + + +- rsh remotehost /bin/true > out\&.dat ++ ssh remotehost /bin/true > out\&.dat + + .DE + Index: files/ssh-patch-rsync.h =================================================================== RCS file: ssh-patch-rsync.h diff -N ssh-patch-rsync.h --- /dev/null Mon Feb 26 18:00:00 2001 +++ ssh-patch-rsync.h Mon Feb 26 17:47:40 2001 @@ -0,0 +1,11 @@ +--- rsync.h.orig Sat Aug 19 22:10:39 2000 ++++ rsync.h Mon Feb 26 17:47:15 2001 +@@ -72,7 +72,7 @@ + #if HAVE_REMSH + #define RSYNC_RSH "remsh" + #else +-#define RSYNC_RSH "rsh" ++#define RSYNC_RSH "ssh" + #endif + + #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message