Skip to content

Commit

Permalink
sysutils/ansible-sshjail: Update, fix with ansible 5.x
Browse files Browse the repository at this point in the history
- Update port to latest upstream commit
- Import upstream Pull Request patch fixing at runtime with recent
  ansible 5.x [1]

Obtained from:	austinhyde/ansible-sshjail#38 [1]
  • Loading branch information
madpilot78 authored and Muhammad Moinur Rahman committed Jan 27, 2022
1 parent 4af011f commit d1e3e39
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 5 deletions.
4 changes: 2 additions & 2 deletions sysutils/ansible-sshjail/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PORTNAME= ansible-sshjail
DISTVERSIONPREFIX= v
DISTVERSION= 1.1.0-35
DISTVERSIONSUFFIX= -g35c3bf6
DISTVERSION= 1.1.0-37
DISTVERSIONSUFFIX= -ge712c53
CATEGORIES= sysutils

MAINTAINER= [email protected]
Expand Down
6 changes: 3 additions & 3 deletions sysutils/ansible-sshjail/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1628281322
SHA256 (austinhyde-ansible-sshjail-v1.1.0-35-g35c3bf6_GH0.tar.gz) = af7da24370e00d7cbc96b7b6873dd7f833b9ccc3b882927c7e12df60ee9fb714
SIZE (austinhyde-ansible-sshjail-v1.1.0-35-g35c3bf6_GH0.tar.gz) = 10896
TIMESTAMP = 1643203963
SHA256 (austinhyde-ansible-sshjail-v1.1.0-37-ge712c53_GH0.tar.gz) = a7c8ef90a1b72aebd65818ab08c175ecf1a4a6d518fdcfff15ce3e61301a073e
SIZE (austinhyde-ansible-sshjail-v1.1.0-37-ge712c53_GH0.tar.gz) = 10892
46 changes: 46 additions & 0 deletions sysutils/ansible-sshjail/files/patch-pr38
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
From 3b6fec58dd3e6b070176e0aafcbfed3cb5a0bd18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Blot?= <[email protected]>
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
@@ -289,6 +289,17 @@
vars:
- name: ansible_ssh_use_tty
version_added: '2.7'
+ pkcs11_provider:
+ version_added: '2.12'
+ default: ''
+ description:
+ - PKCS11 SmartCard provider such as opensc, example: /usr/local/lib/opensc-pkcs11.so
+ - Requires sshpass version 1.06+, sshpass must support the -P option.
+ env: [{name: ANSIBLE_PKCS11_PROVIDER}]
+ ini:
+ - {key: pkcs11_provider, section: ssh_connection}
+ vars:
+ - name: ansible_ssh_pkcs11_provider
timeout:
default: 10
description:
@@ -442,9 +453,11 @@ def _normalize_path(self, path, prefix):
return os.path.join(prefix, normpath[1:])

def _copy_file(self, from_file, to_file, executable='/bin/sh'):
- plugin = self.become
- shell = get_shell_plugin(executable=executable)
- copycmd = plugin.build_become_command(' '.join(['cp', from_file, to_file]), shell)
+ copycmd = ' '.join(['cp', from_file, to_file])
+ if self._play_context.become:
+ plugin = self.become
+ shell = get_shell_plugin(executable=executable)
+ copycmd = plugin.build_become_command(copycmd, shell)

display.vvv(u"REMOTE COPY {0} TO {1}".format(from_file, to_file), host=self.inventory_hostname)
code, stdout, stderr = self._jailhost_command(copycmd)

0 comments on commit d1e3e39

Please sign in to comment.