From owner-svn-ports-all@freebsd.org Sun Aug 2 17:16:31 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CDC273A300D; Sun, 2 Aug 2020 17:16:31 +0000 (UTC) (envelope-from dvl@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BKSNb540jz3SJN; Sun, 2 Aug 2020 17:16:31 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 916DA26D44; Sun, 2 Aug 2020 17:16:31 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 072HGVjH028103; Sun, 2 Aug 2020 17:16:31 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 072HGVbU028102; Sun, 2 Aug 2020 17:16:31 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <202008021716.072HGVbU028102@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Sun, 2 Aug 2020 17:16:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543980 - in head/security/acme.sh: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dvl X-SVN-Commit-Paths: in head/security/acme.sh: . files X-SVN-Commit-Revision: 543980 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Aug 2020 17:16:31 -0000 Author: dvl Date: Sun Aug 2 17:16:30 2020 New Revision: 543980 URL: https://svnweb.freebsd.org/changeset/ports/543980 Log: Enable acme.sh to recognize sane sudo commands besides /bin/su and /bin/bash PR: 248434 Submitted by: John W. O'Brien Added: head/security/acme.sh/files/patch-acme.sh (contents, props changed) Modified: head/security/acme.sh/Makefile Modified: head/security/acme.sh/Makefile ============================================================================== --- head/security/acme.sh/Makefile Sun Aug 2 16:59:02 2020 (r543979) +++ head/security/acme.sh/Makefile Sun Aug 2 17:16:30 2020 (r543980) @@ -2,7 +2,7 @@ PORTNAME= acme.sh PORTVERSION= 2.8.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= dvl@FreeBSD.org Added: head/security/acme.sh/files/patch-acme.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/acme.sh/files/patch-acme.sh Sun Aug 2 17:16:30 2020 (r543980) @@ -0,0 +1,19 @@ +Fix sudo issue +https://github.com/acmesh-official/acme.sh/pull/2574 + +--- acme.sh.orig 2020-08-02 05:02:04 UTC ++++ acme.sh +@@ -6415,10 +6415,10 @@ _checkSudo() { + #it's root using sudo, no matter it's using sudo or not, just fine + return 0 + fi +- if [ "$SUDO_COMMAND" = "/bin/su" ] || [ "$SUDO_COMMAND" = "/bin/bash" ]; then ++ if [ -n "$SUDO_COMMAND" ]; then + #it's a normal user doing "sudo su", or `sudo -i` or `sudo -s` +- #fine +- return 0 ++ _endswith "$SUDO_COMMAND" /bin/su || grep "^$SUDO_COMMAND\$" /etc/shells >/dev/null 2>&1 ++ return $? + fi + #otherwise + return 1