sysutils/ansible-sshjail: Update to latest upstream commit

Remove upstreamed patch
This commit is contained in:
Guido Falsi 2025-01-26 11:00:26 +01:00
parent 3da7852f0a
commit 392b0b912b
3 changed files with 5 additions and 62 deletions

View file

@ -1,8 +1,7 @@
PORTNAME= ansible-sshjail PORTNAME= ansible-sshjail
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 1.1.0-37 DISTVERSION= 1.1.0-48
DISTVERSIONSUFFIX= -ge712c53 DISTVERSIONSUFFIX= -ga7b0076
PORTREVISION= 2
CATEGORIES= sysutils CATEGORIES= sysutils
MAINTAINER= madpilot@FreeBSD.org MAINTAINER= madpilot@FreeBSD.org

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1643203963 TIMESTAMP = 1737816575
SHA256 (austinhyde-ansible-sshjail-v1.1.0-37-ge712c53_GH0.tar.gz) = a7c8ef90a1b72aebd65818ab08c175ecf1a4a6d518fdcfff15ce3e61301a073e SHA256 (austinhyde-ansible-sshjail-v1.1.0-48-ga7b0076_GH0.tar.gz) = 7b357655fa4b747d9039c025ce523622bed1115176810f32c83410227e810b2e
SIZE (austinhyde-ansible-sshjail-v1.1.0-37-ge712c53_GH0.tar.gz) = 10892 SIZE (austinhyde-ansible-sshjail-v1.1.0-48-ga7b0076_GH0.tar.gz) = 11386

View file

@ -1,56 +0,0 @@
From 3b6fec58dd3e6b070176e0aafcbfed3cb5a0bd18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Blot?= <nerzhul@users.noreply.github.com>
Date: Sat, 18 Dec 2021 11:16:53 +0100
Subject: [PATCH] fix: ansible 2.12 and + compat + become fix
--- sshjail.py.orig 2021-08-15 18:02:16 UTC
+++ sshjail.py
@@ -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'
+ 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:
@@ -420,6 +432,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 +455,11 @@ class Connection(ConnectionBase):
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)