Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
Re: [NEW] sysutils/py-ansible-libssh v1.2.2
To:
Denis Fondras <denis@openbsd.org>
Cc:
ports@openbsd.org
Date:
Mon, 19 Aug 2024 16:09:58 +0100

Download raw body.

Thread
On 2024/08/17 19:00, Denis Fondras wrote:
> Ansible-libssh is a new LibSSH Connection Plugin for Ansible Network
> that replaces Paramiko.  Since most network appliances don't support
> or have limited capability for the local execution of a third party
> software, the Ansible network modules are not copied to the remote
> host unlike linux hosts; instead, they run on the control node
> itself. Hence, Ansible network can't use the typical Ansible SSH
> connection plugin that is used with linux host. Furthermore, due
> to this behavior, performance of the underlying SSH subsystem is
> critical. Not only is the new LibSSH connection plugin enabling
> FIPS readiness, but it was also designed to be more performant than
> the existing Paramiko SSH subsystem.
> 
> OK ?

ok with these changes

diff --git a/sysutils/py-ansible-libssh/Makefile b/sysutils/py-ansible-libssh/Makefile
index 6e40168..e4a76b4 100644
--- a/sysutils/py-ansible-libssh/Makefile
+++ b/sysutils/py-ansible-libssh/Makefile
@@ -1,5 +1,5 @@
 MODPY_EGG_VERSION =	1.2.2
-COMMENT =		python bindings for libssh specific to Ansible use case
+COMMENT =		Python bindings for libssh specific to Ansible use case
 DISTNAME =		ansible-pylibssh-${MODPY_EGG_VERSION}
 PKGNAME =		py-ansible-libssh-${MODPY_EGG_VERSION}
 CATEGORIES =		sysutils
@@ -9,20 +9,22 @@ MAINTAINER =		Denis Fondras <denis@openbsd.org>
 # MIT
 PERMIT_PACKAGE =	Yes
 
+WANTLIB += ssh
+
 FLAVORS =		python3
 FLAVOR =		python3
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_PYBUILD =		setuptools
+MODPY_PYBUILD =		setuptools_scm
 
-CFLAGS +=		"-I${LOCALBASE}/include"
-BUILD_DEPENDS =		sysutils/py-expandvars	\
-			devel/py-setuptools_scm	\
-			lang/cython		\
-			security/libssh
+CFLAGS +=		-I${LOCALBASE}/include
+BUILD_DEPENDS =		sysutils/py-expandvars${MODPY_FLAVOR} \
+			lang/cython${MODPY_FLAVOR}
+LIB_DEPENDS =		security/libssh
 
-# Broken tests
+TEST_DEPENDS =		devel/py-test-cov${MODPY_FLAVOR}
+# XXX needs fixing to find newly built extension
 NO_TEST =		Yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-ansible-libssh/pkg/PLIST b/sysutils/py-ansible-libssh/pkg/PLIST
index 249542e..fd59041 100644
--- a/sysutils/py-ansible-libssh/pkg/PLIST
+++ b/sysutils/py-ansible-libssh/pkg/PLIST
@@ -1,6 +1,3 @@
-@conflict ${MODPY_PY_PREFIX}libmagic-*
-@pkgpath devel/py-magic
-@pkgpath devel/py-libmagic${MODPY_FLAVOR}
 lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_EGG_VERSION}.dist-info/
 lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_EGG_VERSION}.dist-info/LICENSE.rst
 lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_EGG_VERSION}.dist-info/METADATA