From nobody Mon Apr 13 16:39:49 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fvY6F52f2z6ZPfL for ; Mon, 13 Apr 2026 16:39:49 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvY6F4KlDz3F89 for ; Mon, 13 Apr 2026 16:39:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776098389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=90P1jgd9c6FSSVKBAIa2fMRmRC8JGqwMvF/jZnsTT+8=; b=UCLwJBg94lPnjv9cXnHgJIJORECQQi80B9AyOF7rJVN9x5jb+zFP+1KHB6PHeqOTqZfOi+ krC0BEz1S9fq4NvT0muuvWwmir4y0MVrTBc+spHfdDhnaxBUiRx6WApsx9hbB4tByuFsxs hDDDfjYOeS133b3EBLpwjzhVW7SP0qNme4l/K9zLZZ81H/rS6+qYQKP80JkyGmYEs5PMui 3xCdLK1f/JzH/dJjNSZXDhEuvJirMrqF3ZJz6/tUr74avYwW9DdRXV3JbY8gV6eNDC+reO aOTNIZmYyc59RjicTi6ssOFs2DOehmORiS981YBgbnOMJEcFvfiLpwqQndF6VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776098389; a=rsa-sha256; cv=none; b=VVXdz8Npnwqia/4zErJrnzqCyX7FxxnBfxgDkh9lEJzV6cIEWkSfH+3bCtUjzZeIt8a0Cl IEM0r3VPTFe6e2pO1TB8a9pkOj9RUAqeklHAULbKdMZL/H4vN5G0rCvzggyJkFWmN89L60 0f6AP6EH87XYw68rATBg+hTUPhrouZfAr9fn+LzMV5bkFyaFAJ0s6EpMk0VoBHuR4XLb4q 12Em90EtMndDPHklPwUtddOM4t3xE0k5txlfKh+Iu9rnGXulpRaOk068sH60oMWQcguppA U8byvGPdUCwqMGUzge5j+DKI7K7YWL7IY9g8Cr/WVrXCL1t2Z2NVnDuApZx2Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776098389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=90P1jgd9c6FSSVKBAIa2fMRmRC8JGqwMvF/jZnsTT+8=; b=psJ0/431VDPHS6yzJmRtJ+M3qZCKwRbe3ha672AvrRdcYhlOOnR67KmBWJCje74Cq8SvJY P7W6R6yLc1xrJvXd7kY9SO5hLiZQblVLDPhSKEg4GFT9i6IWmpHBKCz5DZ2K90OqNsBDIZ Sb+fwxOhfaUkSKbkT9ki/U4D3ahm0Cgq9LlaN4BxJ/VtqvP2tllms1IkunJKv8aMth3fZb PlhtAiQJiKJLJYmLw6gPa8Iw9Pa6FL3ebzElauGku4mce7H60yDFZ2LAEEWK5wUtwnKA3Q AsYUZMLIeHnzYE2io5PGUvEiIZNWZnHe4TcdBaGOAS3EvqrOsISOj/K+VwnJFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvY6F3FBzz19nY for ; Mon, 13 Apr 2026 16:39:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26c01 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 16:39:49 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: b36cd4de4306 - main - sysutils/ansible-sshjail: Fix at runtime with latest ansible List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org 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: b36cd4de43061b1dd87048aaa56cf886e07b71e6 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 16:39:49 +0000 Message-Id: <69dd1c55.26c01.6d896f0e@gitrepo.freebsd.org> The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=b36cd4de43061b1dd87048aaa56cf886e07b71e6 commit b36cd4de43061b1dd87048aaa56cf886e07b71e6 Author: Guido Falsi AuthorDate: 2026-04-13 16:38:37 +0000 Commit: Guido Falsi CommitDate: 2026-04-13 16:38:37 +0000 sysutils/ansible-sshjail: Fix at runtime with latest ansible Import patch from upstream Pull request to allow it to work properly with new ansible release. Obtained from: https://github.com/austinhyde/ansible-sshjail/pull/46 --- sysutils/ansible-sshjail/Makefile | 1 + sysutils/ansible-sshjail/files/patch-sshjail.py | 96 +++++++++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/sysutils/ansible-sshjail/Makefile b/sysutils/ansible-sshjail/Makefile index 1fa1e8d2d917..d972fae6ffc1 100644 --- a/sysutils/ansible-sshjail/Makefile +++ b/sysutils/ansible-sshjail/Makefile @@ -2,6 +2,7 @@ PORTNAME= ansible-sshjail DISTVERSIONPREFIX= v DISTVERSION= 1.1.0-48 DISTVERSIONSUFFIX= -ga7b0076 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= madpilot@FreeBSD.org diff --git a/sysutils/ansible-sshjail/files/patch-sshjail.py b/sysutils/ansible-sshjail/files/patch-sshjail.py new file mode 100644 index 000000000000..62873721b8a3 --- /dev/null +++ b/sysutils/ansible-sshjail/files/patch-sshjail.py @@ -0,0 +1,96 @@ +From ed8a73bae935f851111241e34338bcc708888ad4 Mon Sep 17 00:00:00 2001 +From: Geoffroy Desvernay +Date: Sun, 15 Feb 2026 15:28:19 +0100 +Subject: [PATCH] add missing parameters definitions + +Fix errors with ansible 2.19 + +should fix #45 +--- + sshjail.py | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 50 insertions(+), 2 deletions(-) + +diff --git a/sshjail.py b/sshjail.py +index 3938a5c..b16a9cc 100644 +--- sshjail.py ++++ sshjail.py +@@ -54,6 +54,21 @@ + vars: + - name: ansible_password + - name: ansible_ssh_pass ++ password_mechanism: ++ description: Mechanism to use for handling ssh password prompt ++ type: string ++ default: ssh_askpass ++ choices: ++ - ssh_askpass ++ - sshpass ++ - disable ++ version_added: '2.19' ++ env: ++ - name: ANSIBLE_SSH_PASSWORD_MECHANISM ++ ini: ++ - {key: password_mechanism, section: ssh_connection} ++ vars: ++ - name: ansible_ssh_password_mechanism + sshpass_prompt: + description: Password prompt that sshpass should search for. Supported by sshpass 1.06 and up + default: '' +@@ -225,7 +240,30 @@ + vars: + - name: ansible_private_key_file + - name: ansible_ssh_private_key_file +- ++ cli: ++ - name: private_key_file ++ option: --private-key ++ private_key: ++ description: ++ - Private key contents in PEM format. Requires the C(SSH_AGENT) configuration to be enabled. ++ type: string ++ env: ++ - name: ANSIBLE_PRIVATE_KEY ++ vars: ++ - name: ansible_private_key ++ - name: ansible_ssh_private_key ++ version_added: '2.19' ++ private_key_passphrase: ++ description: ++ - Private key passphrase, dependent on O(private_key). ++ - This does NOT have any effect when used with O(private_key_file). ++ type: string ++ env: ++ - name: ANSIBLE_PRIVATE_KEY_PASSPHRASE ++ vars: ++ - name: ansible_private_key_passphrase ++ - name: ansible_ssh_private_key_passphrase ++ version_added: '2.19' + control_path: + description: + - This is the location to save ssh's ControlPath sockets, it uses ssh's variable substitution. +@@ -302,7 +340,6 @@ + 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} +@@ -329,6 +366,17 @@ + cli: + - name: timeout + type: integer ++ verbosity: ++ version_added: '2.19' ++ default: 0 ++ type: int ++ description: ++ - Requested verbosity level for the SSH CLI. ++ env: [{name: ANSIBLE_SSH_VERBOSITY}] ++ ini: ++ - {key: verbosity, section: ssh_connection} ++ vars: ++ - name: ansible_ssh_verbosity + ''' + + try: