From nobody Mon Mar 07 18:33:46 2022 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 778F41A0BE10; Mon, 7 Mar 2022 18:33:47 +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 4KC6Y66BCZz3mQs; Mon, 7 Mar 2022 18:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646678027; 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=bSzaUfEnvzRbWk/52i30kgccWSQwWWqk6a20jOwZ1g0=; b=v+bsDlaxZ87zefamSj2F7aBu7eE+uyQOM1fDNiSrTtBG152T/4azZr2Po3bdmOZ9IH7O5S 4JJwnU+dFCdlmaRe9cAKmODaTkVQzJs/SyGV3LuGSWyJfIgj24fvgtuVOQ9gUzxJsSJsAu 4EfFKN6uQuxn/pV8VlxfDHS8Ft1AqtizOIdKTE3MxtqOkPB6jOoXysDRlmm40Mw7fnmFfB NE3O+sA0KW5pUGbWzNPIOvnXcPx5CQiM6h8Zzs4gGq1YukKJsQY5CIoCKnuYEV5u5N5AYJ ekcg2aFAaKfpd6cArb4WQAvcpDnsd2Ya7PW0Yhn+B0VH6Ru+/jyOrJaoW4F4XQ== 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 962095A70; Mon, 7 Mar 2022 18:33:46 +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 227IXksD003235; Mon, 7 Mar 2022 18:33:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227IXkx6003234; Mon, 7 Mar 2022 18:33:46 GMT (envelope-from git) Date: Mon, 7 Mar 2022 18:33:46 GMT Message-Id: <202203071833.227IXkx6003234@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: f6949eb9b50f - main - sysutils/ansible-sshjail: Fix runtime issue with py-ansible-core 2.12.3 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6949eb9b50f5d161dd959270451d93db5268146 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646678027; 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=bSzaUfEnvzRbWk/52i30kgccWSQwWWqk6a20jOwZ1g0=; b=hddJvGfvzMAb46/oHCR6OnFdHEJmmdHISkwgj7T//Ab/oK93JHkPDtLu5e9qrY+lEUn/Up aRW/hEbtu5SNIAneDrFNNT2mF0tjRCHcAzm3oKQzMeQ+l4XkTFn3gufah7S/okcX7bmfdo kfXlW5BfM0AvsOvawHltwWZPgusJiQ9ymCdCBBfOSrAmIhF9GEmqnOh/7KGpQHi0OPFvgk QjJYFTD2x2zg6uZlAWUz4Oigdsf9LLf6wVnw7kzcwbMca5S/EMOYXa9++OdeXlNk1QnWE1 xO5jvQNSVxfvGd1vKAeAmf/HCbBP9yYikq6n5OaLbcIfmithJ4dAdkm4d/TsZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646678027; a=rsa-sha256; cv=none; b=KPt4B/tCqPMLSUDYJsG/yo+JMh+ZBh/SfRfUxK/BJaeCxXr4kz0k05XNeZLVd+Fz2WvXTC WUd5T0vpBksdYOWQRrTWnfwUB0ruugMyBTdzl4V1dKdxqDfMZHVHx9SB0K0PjB2CViZqEI eaddPe9FXXcxQkPqYXPvJbC/mF7G3XgRUsUsh545q4hKPTSWGqP3x+71VU18ftJmMSYywi hnej7zcVEgnh1zd9Chj2edSfk6WMcbRGDuXGDYn3KONM3N7XAgkibw7RbhSzuXcmzdx8jV OlwjRioxgpuY/M0Thaqz5g3L/XFtRoBImz53A5Y9KN8BJysWwQSQCRBOA904IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=f6949eb9b50f5d161dd959270451d93db5268146 commit f6949eb9b50f5d161dd959270451d93db5268146 Author: Guido Falsi AuthorDate: 2022-03-07 18:30:12 +0000 Commit: Guido Falsi CommitDate: 2022-03-07 18:30:12 +0000 sysutils/ansible-sshjail: Fix runtime issue with py-ansible-core 2.12.3 Changes in recent py-ansible-core 2.12.3 cause connection falures in ansible-sshjail. Apply suggested fix from upstream issue report. While here rename patch file. Obtained from: https://github.com/austinhyde/ansible-sshjail/issues/40 --- sysutils/ansible-sshjail/Makefile | 1 + .../files/{patch-pr38 => patch-sshjail.py} | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sysutils/ansible-sshjail/Makefile b/sysutils/ansible-sshjail/Makefile index 94eac87dc146..8806d55507df 100644 --- a/sysutils/ansible-sshjail/Makefile +++ b/sysutils/ansible-sshjail/Makefile @@ -1,4 +1,5 @@ PORTNAME= ansible-sshjail +PORTREVISION= 1 DISTVERSIONPREFIX= v DISTVERSION= 1.1.0-37 DISTVERSIONSUFFIX= -ge712c53 diff --git a/sysutils/ansible-sshjail/files/patch-pr38 b/sysutils/ansible-sshjail/files/patch-sshjail.py similarity index 75% rename from sysutils/ansible-sshjail/files/patch-pr38 rename to sysutils/ansible-sshjail/files/patch-sshjail.py index 62ea8f53f789..b0c8b6cc43e1 100644 --- a/sysutils/ansible-sshjail/files/patch-pr38 +++ b/sysutils/ansible-sshjail/files/patch-sshjail.py @@ -3,15 +3,9 @@ From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Sat, 18 Dec 2021 11:16:53 +0100 Subject: [PATCH] fix: ansible 2.12 and + compat + become fix ---- - sshjail.py | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) - -diff --git a/sshjail.py b/sshjail.py -index 7987d39..118f96f 100644 ---- sshjail.py +--- sshjail.py.orig 2021-08-15 18:02:16 UTC +++ sshjail.py -@@ -289,6 +289,17 @@ +@@ -289,6 +289,17 @@ DOCUMENTATION = ''' vars: - name: ansible_ssh_use_tty version_added: '2.7' @@ -29,7 +23,15 @@ index 7987d39..118f96f 100644 timeout: default: 10 description: -@@ -442,9 +453,11 @@ def _normalize_path(self, path, prefix): +@@ -420,6 +431,7 @@ class Connection(ConnectionBase): + if 'sudo' in cmd: + cmd = self._strip_sudo(executable, cmd) + ++ self.set_option('host', self.host) + cmd = ' '.join([executable, '-c', pipes.quote(cmd)]) + if slpcmd: + cmd = '%s %s %s %s' % (self.get_jail_connector(), self.get_jail_id(), cmd, '&& sleep 0') +@@ -442,9 +454,11 @@ class Connection(ConnectionBase): return os.path.join(prefix, normpath[1:]) def _copy_file(self, from_file, to_file, executable='/bin/sh'):