From owner-dev-commits-ports-all@freebsd.org Fri Jul 30 23:12:48 2021 Return-Path: Delivered-To: dev-commits-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 9BAB466F8FC; Fri, 30 Jul 2021 23:12:48 +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 4Gc38c3zr8z3vX6; Fri, 30 Jul 2021 23:12:48 +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 70C335C41; Fri, 30 Jul 2021 23:12:48 +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 16UNCmKZ057739; Fri, 30 Jul 2021 23:12:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16UNCmBC057738; Fri, 30 Jul 2021 23:12:48 GMT (envelope-from git) Date: Fri, 30 Jul 2021 23:12:48 GMT Message-Id: <202107302312.16UNCmBC057738@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: f5d4043b88ce - main - sysutils/ansible-sshjail: Patch to work with newer ansible-core 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: f5d4043b88ceef0d12cc0b1ff34667d6a48ca463 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jul 2021 23:12:48 -0000 The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=f5d4043b88ceef0d12cc0b1ff34667d6a48ca463 commit f5d4043b88ceef0d12cc0b1ff34667d6a48ca463 Author: Guido Falsi AuthorDate: 2021-07-30 23:10:03 +0000 Commit: Guido Falsi CommitDate: 2021-07-30 23:11:59 +0000 sysutils/ansible-sshjail: Patch to work with newer ansible-core Commit ce62d904fbb3 updated sysutils/py-ansible-core to 2.11.3, changes in this version require this patch to allow ansible-sshjail to work with it. --- sysutils/ansible-sshjail/Makefile | 2 +- sysutils/ansible-sshjail/files/patch-sshjail.py | 38 ++++++++++++++++++------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/sysutils/ansible-sshjail/Makefile b/sysutils/ansible-sshjail/Makefile index b40cf6d8eb7c..698d0a95cf34 100644 --- a/sysutils/ansible-sshjail/Makefile +++ b/sysutils/ansible-sshjail/Makefile @@ -1,7 +1,7 @@ PORTNAME= ansible-sshjail DISTVERSIONPREFIX= v DISTVERSION= 1.1.0-30 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= -g981674f CATEGORIES= sysutils diff --git a/sysutils/ansible-sshjail/files/patch-sshjail.py b/sysutils/ansible-sshjail/files/patch-sshjail.py index f2b5b7d9d0c8..e27ec1ad5eef 100644 --- a/sysutils/ansible-sshjail/files/patch-sshjail.py +++ b/sysutils/ansible-sshjail/files/patch-sshjail.py @@ -3,15 +3,9 @@ From: Mohamad Safadieh Date: Wed, 5 May 2021 12:38:26 -0400 Subject: [PATCH] added sshpass_prompt, ssh_transfer_method, timeout ---- - sshjail.py | 42 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 42 insertions(+) - -diff --git a/sshjail.py b/sshjail.py -index 5973380..0e26c68 100644 ---- sshjail.py +--- sshjail.py.orig 2021-01-07 19:31:49 UTC +++ sshjail.py -@@ -49,6 +49,17 @@ +@@ -49,6 +49,17 @@ DOCUMENTATION = ''' vars: - name: ansible_password - name: ansible_ssh_pass @@ -29,7 +23,31 @@ index 5973380..0e26c68 100644 ssh_args: description: Arguments to pass to all ssh cli tools default: '-C -o ControlMaster=auto -o ControlPersist=60s' -@@ -247,6 +258,16 @@ +@@ -140,10 +151,9 @@ DOCUMENTATION = ''' + - key: ssh_extra_args + section: ssh_connection + version_added: '2.7' +- retries: +- # constant: ANSIBLE_SSH_RETRIES ++ reconnection_retries: + description: Number of attempts to connect. +- default: 3 ++ default: 0 + type: integer + env: + - name: ANSIBLE_SSH_RETRIES +@@ -153,8 +163,8 @@ DOCUMENTATION = ''' + - section: ssh_connection + key: retries + vars: +- - name: ansible_ssh_retries +- version_added: '2.7' ++ - name: ansible_ssh_retries ++ version_added: '2.7' + port: + description: Remote port to connect to. + type: int +@@ -247,6 +257,16 @@ DOCUMENTATION = ''' vars: - name: ansible_sftp_batch_mode version_added: '2.7' @@ -46,7 +64,7 @@ index 5973380..0e26c68 100644 scp_if_ssh: default: smart description: -@@ -270,6 +291,27 @@ +@@ -270,6 +290,27 @@ DOCUMENTATION = ''' vars: - name: ansible_ssh_use_tty version_added: '2.7'