From nobody Wed Jan 26 13:56:26 2022 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 7EEB219727C5; Wed, 26 Jan 2022 13:56:26 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JkQHZ3BWdz3kjN; Wed, 26 Jan 2022 13:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643205386; 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=sNBs5XDyg1p/wB5DTj7ihA2JmiQmvVCslzbVnj6ak60=; b=LfB9NYiKJpGmYLwjNK8MWrROgvTVkPK42AkrUen+wSFrN80XP9mZVn6zNsXZP2a9I/KpiH t7PN976fvezec0EXE+2snzAPlXc2BjL2miXysQaZfYWAFQs8KK7kWkEON1sXCXX01dxdPG nda5KJs0lQztJtWCWJBHNmFQ6+cCiBTX3SrXG3bAOeDOSzb2BKHq7ZtmREQUcpK1QcbKE4 RfDGgA28ZuvEK2mJqnPbjaVcmyCYOkN8jlKmmQl+iFF+45xKM8P0Oipv8LbsxiXWNRDTBQ qjy93EJDl0lrkWhNIquCzNXr514pbx20iGIneoHRSr09DKhb5bLsa1AlYDe6YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 49C4A1DDFF; Wed, 26 Jan 2022 13:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20QDuQFo069914; Wed, 26 Jan 2022 13:56:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20QDuQAX069913; Wed, 26 Jan 2022 13:56:26 GMT (envelope-from git) Date: Wed, 26 Jan 2022 13:56:26 GMT Message-Id: <202201261356.20QDuQAX069913@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: f3e2dd3b4459 - main - sysutils/ansible-sshjail: Update, fix with ansible 5.x 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: f3e2dd3b4459e477f6a05b2553aa684629a6ad41 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643205386; 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=sNBs5XDyg1p/wB5DTj7ihA2JmiQmvVCslzbVnj6ak60=; b=Bm/63qy+JTw9ooJSq2mI4Nfo0tFaUgDbxSwRJuvD8xQsCQ9jqOKi7qd29KuxzRPsIUkzYY Cp0nQseF/QFzboRCQEBbTeGDA4bwoIosvsahYsRojY/A/faStZlCIkehK436D9UKZ4jNcj xAO1KDYpIukkinvp61keRGTixfLyxASXN9/9wMX7E8DfcI/MZ59Yrp2ovvff7u6BP+6y5E tKW1PjGwTs0AtHJ8rypYuVnYeGNj7MsMfHR8ixvGDZe+Glhi38EcTWCImppw8ew3a7x9dY XBqBE048WhVYKdlJhc3uqE7s1X4AzYbSwYAipyzrsLJj07z2TDYE0TTi7XNW5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643205386; a=rsa-sha256; cv=none; b=WO4f52tds8vgL0EyQrb9RwpORtANIbdPXtbvXJlzYRABywm8sl9nvM5sWBXadOm+gUsnwo b7S04+A0bw+GippGp+G6Kq02XUP23V1bfBSJJB8w95ZS8doJ+05/4Bws6ml072D1Ov6UPf ZCWkcu4qnCiGjPDfgxsnPatxLmY2+erMewUsbBVJtvMa/J7Ia5sHAaL2dx6PUFLfzW9LdO O52h2yw1KLFy7fpqfQiJBFEKvhP3mHJxmOPymbtywdre5uH0gB1bzcRaU8Ea+5J1ui3fiE /e8r39XE1q3wcdkjnysF59ExoiK5bxouLhDCs8eUsMdYoJLVHkkQOGp7p90eSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3e2dd3b4459e477f6a05b2553aa684629a6ad41 commit f3e2dd3b4459e477f6a05b2553aa684629a6ad41 Author: Guido Falsi AuthorDate: 2022-01-26 13:54:41 +0000 Commit: Guido Falsi CommitDate: 2022-01-26 13:56:21 +0000 sysutils/ansible-sshjail: Update, fix with ansible 5.x - Update port to latest upstream commit - Import upstream Pull Request patch fixing at runtime with recent ansible 5.x [1] Obtained from: https://github.com/austinhyde/ansible-sshjail/pull/38 [1] --- sysutils/ansible-sshjail/Makefile | 4 +-- sysutils/ansible-sshjail/distinfo | 6 ++-- sysutils/ansible-sshjail/files/patch-pr38 | 46 +++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/sysutils/ansible-sshjail/Makefile b/sysutils/ansible-sshjail/Makefile index e0bf03dfcaa3..94eac87dc146 100644 --- a/sysutils/ansible-sshjail/Makefile +++ b/sysutils/ansible-sshjail/Makefile @@ -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= madpilot@FreeBSD.org diff --git a/sysutils/ansible-sshjail/distinfo b/sysutils/ansible-sshjail/distinfo index b4c06a1e174b..7cf72e6d2a04 100644 --- a/sysutils/ansible-sshjail/distinfo +++ b/sysutils/ansible-sshjail/distinfo @@ -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 diff --git a/sysutils/ansible-sshjail/files/patch-pr38 b/sysutils/ansible-sshjail/files/patch-pr38 new file mode 100644 index 000000000000..62ea8f53f789 --- /dev/null +++ b/sysutils/ansible-sshjail/files/patch-pr38 @@ -0,0 +1,46 @@ +From 3b6fec58dd3e6b070176e0aafcbfed3cb5a0bd18 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Blot?= +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)