Re: Patch: sysutils/py-ansible-libssh, stability backports from GitHub

On 2025/03/31 01:42, Mikolaj Kucharski wrote:
> Hi Denis, Stuart.
>
> On Fri, Mar 28, 2025 at 01:51:38PM +0000, Mikolaj Kucharski wrote:
> > On Fri, Mar 28, 2025 at 09:53:17AM +0000, Stuart Henderson wrote:
> > > On 2025/03/27 20:59, Mikolaj Kucharski wrote:
> > > > @@ -0,0 +1,13 @@
> > > > +git -P diff 041d447a94e9dc4aead5aaed1296bdb7dffc5017^ HEAD -- src/
> > > > +
> > > > +Index: src/pylibsshext/channel.pxd
> > >
> > > that's not an ideal format of comment, normally we use the header from
> > > the relevant commit, or url to a fetchable patch
> > >
> > > though I wonder if it would make more sense to switch to a GH_COMMIT
> > > distfile from head for now...
> > >
> >
> > What do you think about this, Stuart? I prefer below approach actually.
>
>
> I belive it would be good to get this version in, so it can be shipped
> with 7.7 release.

I think this probably makes sense. Denis?


>
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/sysutils/py-ansible-libssh/Makefile,v
> > diff -u -p -u -r1.3 Makefile
> > --- Makefile 26 Dec 2024 16:15:11 -0000 1.3
> > +++ Makefile 28 Mar 2025 13:49:09 -0000
> > @@ -1,9 +1,8 @@
> > -MODPY_DISTV = 1.2.2
> > +MODPY_DISTV = 1.2.3
> > COMMENT = Python bindings for libssh specific to Ansible use case
> > -DISTNAME = ansible-pylibssh-${MODPY_DISTV}
> > -PKGNAME = py-ansible-libssh-${MODPY_DISTV}
> > +DIST_TUPLE = github ansible pylibssh baa2ab830d44760c95348081603fbde3e23507a4 .
> > +PKGNAME = py-ansible-libssh-${MODPY_DISTV}pre20250327
> > CATEGORIES = sysutils
> > -REVISION = 0
> >
> > MAINTAINER = Denis Fondras <denis@openbsd.org>
> >
> > @@ -16,6 +15,8 @@ MODULES = lang/python
> > MODPY_PI = Yes
> > # uses own in-tree backend which wraps setuptools
> > MODPY_PYBUILD = setuptools_scm
> > +
> > +DEBUG_PACKAGES = ${BUILD_PACKAGES}
> >
> > CFLAGS += -I${LOCALBASE}/include
> > BUILD_DEPENDS = sysutils/py-expandvars \
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/sysutils/py-ansible-libssh/distinfo,v
> > diff -u -p -u -r1.1.1.1 distinfo
> > --- distinfo 20 Aug 2024 08:09:57 -0000 1.1.1.1
> > +++ distinfo 28 Mar 2025 13:49:09 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (ansible-pylibssh-1.2.2.tar.gz) = dT5XDc3OtquONi6RzA1Zk77ryT0oe4gXjbVVCfZCOrU=
> > -SIZE (ansible-pylibssh-1.2.2.tar.gz) = 135490
> > +SHA256 (ansible-pylibssh-baa2ab830d44760c95348081603fbde3e23507a4.tar.gz) = nWtAfCRL93Ji7QFELGKs7n41G8x16OREbVk7k7/oDT4=
> > +SIZE (ansible-pylibssh-baa2ab830d44760c95348081603fbde3e23507a4.tar.gz) = 119971
> > Index: pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/sysutils/py-ansible-libssh/pkg/PLIST,v
> > diff -u -p -u -r1.2 PLIST
> > --- pkg/PLIST 21 Dec 2024 11:38:52 -0000 1.2
> > +++ pkg/PLIST 28 Mar 2025 13:49:09 -0000
> > @@ -1,10 +1,10 @@
> > @pkgpath sysutils/py-ansible-libssh,python3
> > -lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_DISTV}.dist-info/
> > -lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_DISTV}.dist-info/LICENSE.rst
> > -lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_DISTV}.dist-info/METADATA
> > -lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_DISTV}.dist-info/RECORD
> > -lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_DISTV}.dist-info/WHEEL
> > -lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_DISTV}.dist-info/top_level.txt
> > +lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_DISTV}.dev167+gbaa2ab830.dist-info/
> > +lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_DISTV}.dev167+gbaa2ab830.dist-info/LICENSE.rst
> > +lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_DISTV}.dev167+gbaa2ab830.dist-info/METADATA
> > +lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_DISTV}.dev167+gbaa2ab830.dist-info/RECORD
> > +lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_DISTV}.dev167+gbaa2ab830.dist-info/WHEEL
> > +lib/python${MODPY_VERSION}/site-packages/ansible_pylibssh-${MODPY_DISTV}.dev167+gbaa2ab830.dist-info/top_level.txt
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/.gitignore
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/__init__.py
> > @@ -15,13 +15,16 @@ lib/python${MODPY_VERSION}/site-packages
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/${MODPY_PYCACHE}_scm_version.${MODPY_PYC_MAGIC_TAG}pyc
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/pylibsshext/_libssh_version.c
> > @so lib/python${MODPY_VERSION}/site-packages/pylibsshext/_libssh_version.${MODPY_PYC_MAGIC_TAG}so
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/_libssh_version.pyx
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/_scm_version.py
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/_version.py
> > +lib/python${MODPY_VERSION}/site-packages/pylibsshext/channel.c
> > @so lib/python${MODPY_VERSION}/site-packages/pylibsshext/channel.${MODPY_PYC_MAGIC_TAG}so
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/channel.pxd
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/channel.pyx
> > +lib/python${MODPY_VERSION}/site-packages/pylibsshext/errors.c
> > @so lib/python${MODPY_VERSION}/site-packages/pylibsshext/errors.${MODPY_PYC_MAGIC_TAG}so
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/errors.pxd
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/errors.pyx
> > @@ -33,12 +36,15 @@ lib/python${MODPY_VERSION}/site-packages
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/includes/callbacks.pxd
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/includes/libssh.pxd
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/includes/sftp.pxd
> > +lib/python${MODPY_VERSION}/site-packages/pylibsshext/scp.c
> > @so lib/python${MODPY_VERSION}/site-packages/pylibsshext/scp.${MODPY_PYC_MAGIC_TAG}so
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/scp.pxd
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/scp.pyx
> > +lib/python${MODPY_VERSION}/site-packages/pylibsshext/session.c
> > @so lib/python${MODPY_VERSION}/site-packages/pylibsshext/session.${MODPY_PYC_MAGIC_TAG}so
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/session.pxd
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/session.pyx
> > +lib/python${MODPY_VERSION}/site-packages/pylibsshext/sftp.c
> > @so lib/python${MODPY_VERSION}/site-packages/pylibsshext/sftp.${MODPY_PYC_MAGIC_TAG}so
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/sftp.pxd
> > lib/python${MODPY_VERSION}/site-packages/pylibsshext/sftp.pyx
> >
>
> --
> Regards,
> Mikolaj
>