From nobody Sat Mar 25 03:20:13 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pk48G1zjDz41XQB; Sat, 25 Mar 2023 03:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pk48G1RjVz4FWG; Sat, 25 Mar 2023 03:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679714414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yIV8vx/qMHKXqDu0LwaRa3hOOcl0lQ+0YBWayvD1H0I=; b=taWROlL9a+R6GBcKQeDFwwklxGTdybfpn1UWu/XjWmDdmyxRuJ+Vqv28DZSyQp5v9YOL9g unaNPjWhBkSFCQVEmHvRczkzs2A3T3KenqqxF6M8225w7ygPsZuEXTMmNi8/hAUFY68Ds1 gCrzlCWew3ma1KmQAtxveeWvwgAPkd72e3l28MyqeQYzc3lGsMD3KGiDAkeXE5NEQ/sSJ3 2IYT1YMIXFD5iUZG/zIfjrKwRG9QNpODVQAbOSQQxILfzG1fmzu1F7u7fwXQs+A6fCd/A2 RAujPhHihnAFPs1bNZ2IltyRkT3zfe/Lszudo7W/CnsYtWLEircEQTIRYsX+ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679714414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yIV8vx/qMHKXqDu0LwaRa3hOOcl0lQ+0YBWayvD1H0I=; b=FYalCos+qivrgLM1Ll1+Q8YrTT/ZBZ3PUWLfqlrWssqg9stHV2nT6aTd5hKSwM1fP0oFXu etqRa1vLRgt4smYqE2s75ikLfpqjzW2GOvwMT7dM7UkHXFG0jp2J+hQuIA9u58qnMuT5a3 TJAGwubtrey8VgD1Gi14ItJh72J214R6AyWU76nkSOBsBVvXqxMVAuILhpze/fMF1Si/eC MbCFrQmmIt+q4RaN6JuYa00C/8KaJ4b4jzmsM2gJleha5+KEFFjdwX/fyFjAUd9KIrUkK1 nyD7rzjSF3kG+oDJpFKwrcznhxGB/n5dAPfMT4xm2fqqkriOuxHsYQRohsEYKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679714414; a=rsa-sha256; cv=none; b=NnINXChCyLI9KkiD6SDW6HcYMjg5/vM7NU3iWhhMeAsFRes3pqa0FVkGJjt6XxJG222cQz ale2wYizCBDpu5Fx/dO0YXnv6NsDZ9DgknF/XIm9XntGfkG60XYSOBeiRe/fR6n+jCM//K b4K8BJAF3ixByHYtpjuecjOPgx77bdPVtJF5psfmLnmkU7tn8uPGtXhRvuTqsOvogtCmma Ov7fhE76C+/UhbOaMI1ZhH/DOHa9G4IdkSYqHAjms9NhvECtT8KxHSD0bOJWxMzNutVWbz 4hsLfs74F7gCw5FmK45GdRCV7Hv5Nmtcog4OqOVdx1X/Qt3HF79UyBnN1jUIAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pk48G0WWSzkHD; Sat, 25 Mar 2023 03:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32P3KD1Q022455; Sat, 25 Mar 2023 03:20:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32P3KDfQ022444; Sat, 25 Mar 2023 03:20:13 GMT (envelope-from git) Date: Sat, 25 Mar 2023 03:20:13 GMT Message-Id: <202303250320.32P3KDfQ022444@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 9a405f699dc0 - main - x11/xrsh: Replace rsh/rlogin calls with ssh/slogin List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a405f699dc0fd7f990a5a06c8de290cda8bb347 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a405f699dc0fd7f990a5a06c8de290cda8bb347 commit 9a405f699dc0fd7f990a5a06c8de290cda8bb347 Author: Cy Schubert AuthorDate: 2023-03-25 03:18:39 +0000 Commit: Cy Schubert CommitDate: 2023-03-25 03:18:39 +0000 x11/xrsh: Replace rsh/rlogin calls with ssh/slogin Modernize xrsh, replacing rsh and rlogin with ssh and slogin. While at it assume maintainership. --- x11/xrsh/Makefile | 4 +-- x11/xrsh/files/patch-xrlogin.sh | 13 ++++++++ x11/xrsh/files/patch-xrsh.sh | 66 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 2 deletions(-) diff --git a/x11/xrsh/Makefile b/x11/xrsh/Makefile index eea802669597..6c48679c2aab 100644 --- a/x11/xrsh/Makefile +++ b/x11/xrsh/Makefile @@ -1,12 +1,12 @@ PORTNAME= xrsh PORTVERSION= 5.92 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://jjd.com/ DISTNAME= ${PORTNAME} EXTRACT_SUFX= .shar -MAINTAINER= ports@FreeBSD.org +MAINTAINER= cy@FreeBSD.org COMMENT= Launcher which starts an X program on a remote machine WWW= https://jjd.com/ diff --git a/x11/xrsh/files/patch-xrlogin.sh b/x11/xrsh/files/patch-xrlogin.sh new file mode 100644 index 000000000000..9f75adb33543 --- /dev/null +++ b/x11/xrsh/files/patch-xrlogin.sh @@ -0,0 +1,13 @@ +--- xrlogin.sh.orig 2023-03-24 19:02:31.747534000 -0700 ++++ xrlogin.sh 2023-03-24 20:15:16.514036000 -0700 +@@ -23,8 +23,8 @@ + # Set some defaults. + progname=`basename $0` + usage="usage: $progname [-l logname] [-telnet] [emulator options] host" +-netprog="rlogin" +-netprogopts="-8" ++netprog="slogin" ++netprogopts="" + termprog=xterm + termprogopts= + telnet= diff --git a/x11/xrsh/files/patch-xrsh.sh b/x11/xrsh/files/patch-xrsh.sh new file mode 100644 index 000000000000..6b7d1a298f3d --- /dev/null +++ b/x11/xrsh/files/patch-xrsh.sh @@ -0,0 +1,66 @@ +--- xrsh.sh.orig 2023-03-24 19:02:31.751499000 -0700 ++++ xrsh.sh 2023-03-24 20:10:01.927030000 -0700 +@@ -3,7 +3,7 @@ + # Some System V systems don't understand the #! construct. + # If your system does understand it, put ": " at the beginning of the line. + # +-XRSH_VER='xrsh version 5.92' ++XRSH_VER='xesh version 5.92' + XRSH_RCS='$Header: /usr/home/jjd/xrsh/RCS/xrsh.sh,v 1.16 1996/06/27 15:59:48 jjd Exp $' + XRSH_TIME='Time-stamp: <1998-01-31 12:08:36 jjd>' + # +@@ -233,8 +233,11 @@ + command="$command $xcmdargs" + fi + ++rsh=`which ssh` ++if [ -x $rsh ]; then ++ rsh=ssh + # Some System V hosts have rsh as "restricted shell" and ucb rsh is remsh +-if [ -r /usr/bin/remsh ]; then ++elif [ -r /usr/bin/remsh ]; then + rsh=remsh + elif [ -f /usr/bin/rcmd ]; then # SCO Unix uses "rcmd" instead of rsh + rsh=rcmd +@@ -244,6 +247,7 @@ + + # Construct the new $DISPLAY for the remote client + ++ + # The following paragraph of IFS based code replaces sed and + # runs faster because it doesn't fork. It also handles the arp stuff. + # newdisplay="`echo $DISPLAY | sed \"s/^[^:]*:/${localhost}:/\"`" +@@ -300,7 +304,7 @@ + done + + +- ++test $rsh != ssh && + # Use $XRSH_AUTH_TYPE to determine whether to run xhost, xauth, + # propagate $XAUTHORITY to the remote host, or do nothing + case ${XRSH_AUTH_TYPE-$default_auth_type} in +@@ -390,8 +394,13 @@ + # Don't use -n to rsh because SG IRIX doesn't support it. + # Use < /dev/null instead. + if [ "$debug" ]; then ++ if [ $rsh = ssh ]; then ++ echo "Executing \"$command\" on $clienthost" ++ $rsh $clienthost $rshoptions /bin/csh -cf "\"$authenv $xhostvar $passenvs $command\"" < /dev/null ++ else + echo "Executing \"$command\" on $clienthost with DISPLAY=$newdisplay" + $rsh $clienthost $rshoptions /bin/csh -cf "\"setenv DISPLAY $newdisplay; $authenv $xhostvar $passenvs $command\"" < /dev/null ++ fi + else + # + # The redirection inside the innermost quotes is done by csh. The outer +@@ -408,6 +417,10 @@ + # We would like the last '>' to be '>&' or equivalent, but that would make this + # code dependent on what flavor of shell the user uses on the remote host + # ++ if [ $rsh = ssh ]; then ++ exec $rsh $clienthost $rshoptions exec /bin/csh -cf "\"$authenv $xhostvar $passenvs exec $command < /dev/null >>& $XRSH_RSH_ERRORS \" < /dev/null > /dev/null " < /dev/null & ++ else + exec $rsh $clienthost $rshoptions exec /bin/csh -cf "\"setenv DISPLAY $newdisplay; $authenv $xhostvar $passenvs exec $command < /dev/null >>& $XRSH_RSH_ERRORS \" < /dev/null > /dev/null " < /dev/null & ++ fi + + fi