From nobody Sun Jan 26 10:01:05 2025 X-Original-To: dev-commits-ports-all@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 4YgnBB1L2Sz5lYQN; Sun, 26 Jan 2025 10:01:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YgnB941qZz3kwP; Sun, 26 Jan 2025 10:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737885665; 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=dkSwzIgWmPJwQFxYx14tN9FbKmhARA8l6zZf12XT9ls=; b=b8eflTNszT6mAtxydSAcWVNzUrNZ7s49xSnWmWVrQCu2K6LW0JqkMP/pxjxCg8Dwj2Qwnw vcOWLMUTTMW284NPI1LxGD6NQhSJN1zaa30jJYok0UCoHFifqdGCNjuZO2C+Aew0AlA+sF ZwuXyMW5nuV0BWg/tHT/7E3WAtQmzMMtoL0zglXggIQxaQaw+kJBD30Nk/V6tgA/p5XfIL LghdKsSOWG/fPTCjyiNEvDNGzRSlAvdXUfn31COS3LyUErnKzLwHuqB4FF/Ggh47pfroPh 2s7g72eVoNJRmSO7HKrlWsQz1dfeod5DFLFBr1HtHVAitHy8u2vV+EPJ+1MOCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737885665; 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=dkSwzIgWmPJwQFxYx14tN9FbKmhARA8l6zZf12XT9ls=; b=w31EHrdTzRuxPWorp4L/5boLFpZJn9k6X/fG4PGn2cl8GZZK4lmXMbJjoqO/6X2voyhMxt H8B0F8YXFj+SrXSHhz1JuVT8nBfvA1w4J9KAlY1Qk/qHuY/j2fkY2uN3EVSUmVBGLeBs2S riAV3z2ahdS0iZOORqJ8Bd2EnoBBsX6Y5iAPEETXX/8NNQVhv4FC7gmyzy3tuXTPYEDk9Y vjH+dToJU2qM5sci6lPBbviGZVgejfcyO676qbu7pWUDK2TTddbjcGnMZgf6/qGfzyvmyv XYVdmW5yXpTaknBsIIzkPCPVEKI3fPreTW+INFs3l4LxxtxAJwN6ZpNV3O3UNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737885665; a=rsa-sha256; cv=none; b=mVRpD4gbYyBFlOUIuL5hkl14y0CV2SqQ+cG6B7WfMwoXXsHdvzxKZi88vRfjiRL41gxnvm Kj/wKGwitKqyU7X5tWHkpvc4povtWQjIGSzp2PEIMbslT1aUZcTam91RberN/aN0So9u4+ VDQP+l71LgBe1tw1BRoxXLTxwgVPBSBGbWZUH7+n4QlN8prTP32zSxaTzp9xxWa5wC3GzZ 8fZdVHIkZC6E9ZxZILF58bAZisgLKxywO2Go3wlwlcTsoVPIMufqnpWNBwUwgN7AiMCaPf reSSxGDE4TsGOzYKSU7DepvIsVmRyQ2Ex1Ppye0dVTYBoNFbWJ5uDGnED2+OUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YgnB92psgzdfv; Sun, 26 Jan 2025 10:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50QA15U2086789; Sun, 26 Jan 2025 10:01:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50QA15hW086786; Sun, 26 Jan 2025 10:01:05 GMT (envelope-from git) Date: Sun, 26 Jan 2025 10:01:05 GMT Message-Id: <202501261001.50QA15hW086786@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: 392b0b912b70 - main - sysutils/ansible-sshjail: Update to latest upstream commit List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 392b0b912b7023ae44ceb29395d4a6fe716af22e Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=392b0b912b7023ae44ceb29395d4a6fe716af22e commit 392b0b912b7023ae44ceb29395d4a6fe716af22e Author: Guido Falsi AuthorDate: 2025-01-26 10:00:26 +0000 Commit: Guido Falsi 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?= -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)