From nobody Thu Jul 07 19:56:12 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 75FEE12ACF4F; Thu, 7 Jul 2022 19:56:13 +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 4Lf6bx0bBlz420q; Thu, 7 Jul 2022 19:56:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657223773; 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=1bAUrWztA4UnwtfgAO2kzHleeeUDWfSWkyCDCLnRfPA=; b=ak7NyeCfhkzMhLEpmryyJrWMPg7BqJMOOmNdz2cNZIFDuSwlKAXKM4USbDtzNM5Dao1n7/ iJFCtX/fWISrDzCFodbGgc3ceWtdq4UQE6+vtpQr+moioi7BOKXFsVurgCI8GeZdRSwnAI jmap0li4Ts1v9vhdeD+/+2N2dilbV/kbe4JzFd+aHyXjTw/D0uuw0XhHxepLziQW67Wvbc AyxxXsWJG6sC8T0KACVq9otGdcjM21tjVUTEL1jOrkVp9vGFAR9KxrcU3ZyXY52nmhljsC EIsrpsqUjlVYmcT4UnGTZD72ucz92Pj1gllz3DzVz2Xvj8PPRADAZIES7Lvd3w== 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 4Lf6bw6T0hzvGD; Thu, 7 Jul 2022 19:56:12 +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 267JuCpm074432; Thu, 7 Jul 2022 19:56:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 267JuCoe074431; Thu, 7 Jul 2022 19:56:12 GMT (envelope-from git) Date: Thu, 7 Jul 2022 19:56:12 GMT Message-Id: <202207071956.267JuCoe074431@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: f5a79cab207c - main - sysutils/ansible-sshjail: Fix warning when used with latest ansible 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: f5a79cab207c31573ef391e5ca0aad50886bf5e9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657223773; 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=1bAUrWztA4UnwtfgAO2kzHleeeUDWfSWkyCDCLnRfPA=; b=TXgj4xsnrdcdl1GX5oQCNb9vRfL08cFgxie+pqNC+gjpckv44DSleqS53HddJuCrhLcHaV Xi6oVJaPPdaF51wfHnG+XiYaDobgzLwlV68eKQ99K1FdvmOhjvmmBOkREXid78a4yiFQLf SV/hi8IcnEF2VJYdA0hFpKEz54CTz/nDZ/YdnrXVte2yd7TclMdPZeylhkdCSTEmF1+4Gl W9buw/Ofx6Jvz381AluCOidMZvcdELwwKakHYLjkZBssXPCbbt6SNmFWEe84U0RP2NM47b xcTicGNl4GiKK7qnDFt6h7Vl1+bIETeevtiYlo5m7CD/J1BHmCVlRnn2REEQEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657223773; a=rsa-sha256; cv=none; b=YIUe2JzTm60eqD4IB9v9Z/bkEKZoJsrdGl2TdXjZzzpTQhWsH1rKgVBCFckbbX9+M9DtM4 ah32Y0NzHFgjK/Lub2bpcDOyrbxrTmaJ2KYZgSPul2lioTAoA46q2jblu05MLwQmdR07Rd 0npmlckJBWXXr6ZCctov3Yh43sj6yvtVLxGPKalFppB0cZ16GDHPoPyAf3ugKAsIOg72/F EEgOG4GNfJP0OYagp//zZ4AUeizvdbIrmGWPiTIlemPlFPIqZR6BKDb+Hi/z+2EY6Zu2C3 ZbnsfWQ3QVMs73ZDeq3Uh1a320+bXgJE8OVOZbFSJMOhnXPH+fIk2ZQTrvYM2A== 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=f5a79cab207c31573ef391e5ca0aad50886bf5e9 commit f5a79cab207c31573ef391e5ca0aad50886bf5e9 Author: Guido Falsi AuthorDate: 2022-07-07 19:54:56 +0000 Commit: Guido Falsi CommitDate: 2022-07-07 19:56:05 +0000 sysutils/ansible-sshjail: Fix warning when used with latest ansible Patch submitted upstream: https://github.com/austinhyde/ansible-sshjail/pull/41 --- sysutils/ansible-sshjail/Makefile | 2 +- sysutils/ansible-sshjail/files/patch-sshjail.py | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sysutils/ansible-sshjail/Makefile b/sysutils/ansible-sshjail/Makefile index 8806d55507df..f3d306e6c248 100644 --- a/sysutils/ansible-sshjail/Makefile +++ b/sysutils/ansible-sshjail/Makefile @@ -1,8 +1,8 @@ PORTNAME= ansible-sshjail -PORTREVISION= 1 DISTVERSIONPREFIX= v DISTVERSION= 1.1.0-37 DISTVERSIONSUFFIX= -ge712c53 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= madpilot@FreeBSD.org diff --git a/sysutils/ansible-sshjail/files/patch-sshjail.py b/sysutils/ansible-sshjail/files/patch-sshjail.py index b0c8b6cc43e1..bf00e40d7bf0 100644 --- a/sysutils/ansible-sshjail/files/patch-sshjail.py +++ b/sysutils/ansible-sshjail/files/patch-sshjail.py @@ -5,7 +5,15 @@ Subject: [PATCH] fix: ansible 2.12 and + compat + become fix --- sshjail.py.orig 2021-08-15 18:02:16 UTC +++ sshjail.py -@@ -289,6 +289,17 @@ DOCUMENTATION = ''' +@@ -24,6 +24,7 @@ DOCUMENTATION = ''' + description: Hostname/ip to connect to. + default: inventory_hostname + vars: ++ - name: inventory_hostname + - name: ansible_host + - name: ansible_ssh_host + host_key_checking: +@@ -289,6 +290,17 @@ DOCUMENTATION = ''' vars: - name: ansible_ssh_use_tty version_added: '2.7' @@ -23,7 +31,7 @@ Subject: [PATCH] fix: ansible 2.12 and + compat + become fix timeout: default: 10 description: -@@ -420,6 +431,7 @@ class Connection(ConnectionBase): +@@ -420,6 +432,7 @@ class Connection(ConnectionBase): if 'sudo' in cmd: cmd = self._strip_sudo(executable, cmd) @@ -31,7 +39,7 @@ Subject: [PATCH] fix: ansible 2.12 and + compat + become fix 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): +@@ -442,9 +455,11 @@ class Connection(ConnectionBase): return os.path.join(prefix, normpath[1:]) def _copy_file(self, from_file, to_file, executable='/bin/sh'):