From nobody Sat Sep 30 00:56:57 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 4Ry81k3MQ3z4v1JR; Sat, 30 Sep 2023 00:56:58 +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 4Ry81j6NH4z3b8J; Sat, 30 Sep 2023 00:56:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696035417; 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=gKN4cc8EZ+4QbIj7iL7z0vUYKoCImEfC9Tcd4/jWm60=; b=WXSCX6Mn0dI/HZ2iUQ+3O8TJVy6YO8xuEs6JooRk573gB6LekKJyxYv9xL4VDpq7M7SKiw GYqeNL/SudK2w9lfqc4qnLCUiCRVwIsYQWCc8kyBY8J2r+SmRQbKAucgg4id8zSOX9hFkI XBiH7KQDutdeClMko+u1n/FdBlEfm7thw91DbiLyCrJm4Fe5T06UTzAV6ag2agztegI/7x oFFO2axbqMAR+b24lbUxD9UPpwwZ7SWDVX9NuO1S9UNDFj8TGIMIqNr6gL2SFyEcUzY2JI ZwhmwWwc7qZRdsw/C697kpDNGVHA8gRowd7eWoQhlcZnkjyZ0O6gGQNNVVMxvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696035417; a=rsa-sha256; cv=none; b=LoIlSghJ4Db6Il5l2JeQbJKm3agmNZ84ddj9+nMG0SV3YZyeT3PEeHmNGxTrhSX6DSBLoX zIcqLJ9w0ywK5gyc+pn+GKxfwIGElOnpwEbb21u7o3n/zeh0ec0qmLiFyf/O/1JZRKxE2v Dx6WkQaoF/JwJhnSDtMG8YDzfOwmyHym3tgMFtv7n00FKGYVT79r8JdIczGnDZDPBrhvgu gOdMzbfcsIAMVdTVXD+s6YkrY/Vngjc4QC3Brt7TvmgbAR9iPwJbvfrz1jgr6BvOL3RPLo 2to0hQE2K4U8VrA+/80oR6XZG9PtRj+B+9W1qsxAeeqn/CihjFXmxrJsvP6bCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696035417; 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=gKN4cc8EZ+4QbIj7iL7z0vUYKoCImEfC9Tcd4/jWm60=; b=l3qiAlZX0xYu9IUMJ9oIbzypF7DpIprzzYAor5umJyCt5A8mi5UfyGeIvy2UZBV6guIPOb 0mw2eBQkKAKrjQ+/Y2c3gYVNdB4IoShSBqOEUo91sDQFZlVEGu3L6BMzO108QCMrn7V7pB uD45ERqLg6waQzdMp4oOzEEOuMYsrSjmt/u0vXs98AgECSHCrxL+sT7uOpR2SPWOc4zApA kAHNP5Ktv/8x45Cw/OummiQ7B1qXH+S1swv2DDEl1ZK48/yN4fO6uwvEUIjJxRO0jD1IJ4 cqoLfeghZUnCq/C8fXFincKBbFwwvcH8doeo5jaa/yznTxcXMD0J6kTUfz5uMA== 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 4Ry81j5NfRzBss; Sat, 30 Sep 2023 00:56:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38U0uv7I040841; Sat, 30 Sep 2023 00:56:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38U0uvDK040838; Sat, 30 Sep 2023 00:56:57 GMT (envelope-from git) Date: Sat, 30 Sep 2023 00:56:57 GMT Message-Id: <202309300056.38U0uvDK040838@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: aebb0cb4a827 - main - devel/py-invoke: Change default shell from bash to sh 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aebb0cb4a8273d786504dc28027200ebd71a42ac Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=aebb0cb4a8273d786504dc28027200ebd71a42ac commit aebb0cb4a8273d786504dc28027200ebd71a42ac Author: Po-Chuan Hsieh AuthorDate: 2023-09-30 00:33:29 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-30 00:46:34 +0000 devel/py-invoke: Change default shell from bash to sh - Add SUDO option - Bump PORTREVISION for package change PR: 273666 Reported by: Jesus Daniel Colmenares Oviedo --- devel/py-invoke/Makefile | 6 +++++ devel/py-invoke/files/patch-bash | 55 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/devel/py-invoke/Makefile b/devel/py-invoke/Makefile index 75bb7cf7cc8c..f41270c056b5 100644 --- a/devel/py-invoke/Makefile +++ b/devel/py-invoke/Makefile @@ -1,5 +1,6 @@ PORTNAME= invoke PORTVERSION= 2.2.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,4 +18,9 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes +OPTIONS_DEFINE= SUDO +SUDO_DESC= Run shell commands via sudo + +SUDO_RUN_DEPENDS= sudo:security/sudo + .include diff --git a/devel/py-invoke/files/patch-bash b/devel/py-invoke/files/patch-bash new file mode 100644 index 000000000000..28f539d0b49f --- /dev/null +++ b/devel/py-invoke/files/patch-bash @@ -0,0 +1,55 @@ +--- invoke/config.py.orig 2023-07-12 18:04:20 UTC ++++ invoke/config.py +@@ -440,16 +440,16 @@ class Config(DataProxy): + + .. versionadded:: 1.0 + """ +- # On Windows, which won't have /bin/bash, check for a set COMSPEC env ++ # On Windows, which won't have /bin/sh, check for a set COMSPEC env + # var (https://en.wikipedia.org/wiki/COMSPEC) or fallback to an + # unqualified cmd.exe otherwise. + if WINDOWS: + shell = os.environ.get("COMSPEC", "cmd.exe") +- # Else, assume Unix, most distros of which have /bin/bash available. ++ # Else, assume Unix, most distros of which have /bin/sh available. + # TODO: consider an automatic fallback to /bin/sh for systems lacking + # /bin/bash; however users may configure run.shell quite easily, so... + else: +- shell = "/bin/bash" ++ shell = "/bin/sh" + + return { + # TODO: we document 'debug' but it's not truly implemented outside +--- invoke/runners.py.orig 2023-05-23 15:52:36 UTC ++++ invoke/runners.py +@@ -335,7 +335,7 @@ class Runner: + Default: ``False``. + + :param str shell: +- Which shell binary to use. Default: ``/bin/bash`` (on Unix; ++ Which shell binary to use. Default: ``/bin/sh`` (on Unix; + ``COMSPEC`` or ``cmd.exe`` on Windows.) + + :param timeout: +--- tests/config.py.orig 2023-07-12 18:04:20 UTC ++++ tests/config.py +@@ -107,7 +107,7 @@ class Config_: + "out_stream": None, + "pty": False, + "replace_env": False, +- "shell": "/bin/bash", ++ "shell": "/bin/sh", + "warn": False, + "watchers": [], + }, +--- tests/runners.py.orig 2023-05-02 02:12:54 UTC ++++ tests/runners.py +@@ -81,7 +81,7 @@ def _expect_platform_shell(shell): + if WINDOWS: + assert shell.endswith("cmd.exe") + else: +- assert shell == "/bin/bash" ++ assert shell == "/bin/sh" + + + def _make_tcattrs(cc_is_ints=True, echo=False):