git: f5a79cab207c - main - sysutils/ansible-sshjail: Fix warning when used with latest ansible
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 07 Jul 2022 19:56:12 UTC
The branch main has been updated by madpilot:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f5a79cab207c31573ef391e5ca0aad50886bf5e9
commit f5a79cab207c31573ef391e5ca0aad50886bf5e9
Author: Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2022-07-07 19:54:56 +0000
Commit: Guido Falsi <madpilot@FreeBSD.org>
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'):