From nobody Wed Oct 13 09:08:17 2021 X-Original-To: dev-commits-ports-main@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 AFE8E17FB1E5; Wed, 13 Oct 2021 09:08:17 +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 4HTmsY4TJZz4pCt; Wed, 13 Oct 2021 09:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 68F0524FD6; Wed, 13 Oct 2021 09:08:17 +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 19D98H3O043835; Wed, 13 Oct 2021 09:08:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19D98HNA043834; Wed, 13 Oct 2021 09:08:17 GMT (envelope-from git) Date: Wed, 13 Oct 2021 09:08:17 GMT Message-Id: <202110130908.19D98HNA043834@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: 508036a7d578 - main - www/shellinabox: fix ssh command line options List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 508036a7d578dee2d4264a039941d10c76b60b6d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=508036a7d578dee2d4264a039941d10c76b60b6d commit 508036a7d578dee2d4264a039941d10c76b60b6d Author: Olivier Cochard AuthorDate: 2021-10-13 09:03:18 +0000 Commit: Olivier Cochard CommitDate: 2021-10-13 09:03:18 +0000 www/shellinabox: fix ssh command line options PR: 258838 Reported by: Felix Palmen --- www/shellinabox/Makefile | 2 +- www/shellinabox/files/patch-shellinabox_service.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/www/shellinabox/Makefile b/www/shellinabox/Makefile index fb7f5c1a58ed..c414a708bec3 100644 --- a/www/shellinabox/Makefile +++ b/www/shellinabox/Makefile @@ -3,7 +3,7 @@ PORTNAME= shellinabox PORTVERSION= 2.20 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MAINTAINER= olivier@FreeBSD.org diff --git a/www/shellinabox/files/patch-shellinabox_service.c b/www/shellinabox/files/patch-shellinabox_service.c index 30c91ccb436c..fd708ab9df11 100644 --- a/www/shellinabox/files/patch-shellinabox_service.c +++ b/www/shellinabox/files/patch-shellinabox_service.c @@ -1,6 +1,14 @@ ---- shellinabox/service.c.orig +--- shellinabox/service.c.orig 2016-11-09 19:40:33 UTC +++ shellinabox/service.c -@@ -175,8 +175,7 @@ void initService(struct Service *service, const char * +@@ -169,14 +169,13 @@ void initService(struct Service *service, const char * + } + + service->cmdline = stringPrintf(NULL, +- "ssh -a -e none -i /dev/null -x -oChallengeResponseAuthentication=no " ++ "ssh -a -e none -i /dev/null -x " + "-oCheckHostIP=no -oClearAllForwardings=yes -oCompression=no " +- "-oControlMaster=no -oGSSAPIAuthentication=no " ++ "-oControlMaster=no " "-oHostbasedAuthentication=no -oIdentitiesOnly=yes " "-oKbdInteractiveAuthentication=yes -oPasswordAuthentication=yes " "-oPreferredAuthentications=keyboard-interactive,password "