git: 392b0b912b70 - main - sysutils/ansible-sshjail: Update to latest upstream commit

The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=392b0b912b7023ae44ceb29395d4a6fe716af22e

commit 392b0b912b7023ae44ceb29395d4a6fe716af22e
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2025-01-26 10:00:26 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2025-01-26 10:00:26 +0000

    sysutils/ansible-sshjail: Update to latest upstream commit
    
    Remove upstreamed patch
---
 sysutils/ansible-sshjail/Makefile               |  5 +--
 sysutils/ansible-sshjail/distinfo               |  6 +--
 sysutils/ansible-sshjail/files/patch-sshjail.py | 56 -------------------------
 3 files changed, 5 insertions(+), 62 deletions(-)

diff --git a/sysutils/ansible-sshjail/Makefile b/sysutils/ansible-sshjail/Makefile
index 4f2e4acedcd1..1fa1e8d2d917 100644
--- a/sysutils/ansible-sshjail/Makefile
+++ b/sysutils/ansible-sshjail/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	ansible-sshjail
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1.0-37
-DISTVERSIONSUFFIX=	-ge712c53
-PORTREVISION=	2
+DISTVERSION=	1.1.0-48
+DISTVERSIONSUFFIX=	-ga7b0076
 CATEGORIES=	sysutils
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/sysutils/ansible-sshjail/distinfo b/sysutils/ansible-sshjail/distinfo
index 7cf72e6d2a04..ba33c4bbbce8 100644
--- a/sysutils/ansible-sshjail/distinfo
+++ b/sysutils/ansible-sshjail/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1737816575
+SHA256 (austinhyde-ansible-sshjail-v1.1.0-48-ga7b0076_GH0.tar.gz) = 7b357655fa4b747d9039c025ce523622bed1115176810f32c83410227e810b2e
+SIZE (austinhyde-ansible-sshjail-v1.1.0-48-ga7b0076_GH0.tar.gz) = 11386
diff --git a/sysutils/ansible-sshjail/files/patch-sshjail.py b/sysutils/ansible-sshjail/files/patch-sshjail.py
deleted file mode 100644
index bf00e40d7bf0..000000000000
--- a/sysutils/ansible-sshjail/files/patch-sshjail.py
+++ /dev/null
@@ -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)