From: Mikolaj Kucharski <mikolaj@kucharski.name>
Subject: Re: UPDATE: salt-3007.8
To: Markus Hennecke <markus-hennecke@markus-hennecke.de>
Cc: ports@openbsd.org
Date: Thu, 2 Oct 2025 21:06:46 +0000

On Thu, Oct 02, 2025 at 10:09:34AM +0200, Markus Hennecke wrote:
> On Fri, 19 Sep 2025, Mikolaj Kucharski wrote:
> 
> > Hi.
> > 
> > Tested by running master on OpenBSD 7.7-stable and minions
> > on OpenBSD -current, -stable, and Debian Bookworm and Trixie.
> > 
> > I did very light testing so far. It works here. No issues.
> 
> I ran into an issue at work with OpenBSD 7.7 minions, because the base 
> requirements changed and immutables and contextvars is required for 
> salt-ssh according to the comment in requirements/base.txt. Things like 
> state.apply or salt-call won't work out of the box.
> 
> The question is should we add all dependencies from requirements/base.txt 
> to RUN_DEPENDS? These don't seem to be required for the master setup, but 
> the minion side is broken without them.
> 

I've looked at my minions and I found some of them not able to
communicate to salt master.

I am not sure what is exactly the difference between py-cryptodome and
py-cryptodomex, but file requirements/crypto.txt mentions pycryptodomex
as a requirement. I've added pycryptodomex to both master and that
minion and they started to work. Kinda, as there are still random
timeouts during communication between them, but at least the master
logs `Authentication accepted from <minion-name>`.

Does anyone know the difference between py-cryptodome and
py-cryptodomex?

Empirically below diff makes salt master and salt minion talk to each other:

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/salt/Makefile,v
diff -u -p -u -r1.193 Makefile
--- Makefile	1 Oct 2025 05:19:05 -0000	1.193
+++ Makefile	2 Oct 2025 20:48:34 -0000
@@ -17,6 +17,7 @@ COMMENT =		remote execution and configur
 
 MODPY_DISTV =		3007.8
 DISTNAME =		salt-${MODPY_DISTV}
+REVISION =		0
 
 CATEGORIES =		sysutils net devel
 
@@ -50,7 +51,7 @@ RUN_DEPENDS =		devel/py-looseversion \
 
 # requirements/zeromq.txt
 RUN_DEPENDS +=		net/py-zmq \
-			security/py-cryptodome
+			security/py-cryptodomex
 
 # salt/output/progress.py
 RUN_DEPENDS +=		devel/py-progressbar
Index: patches/patch-requirements_crypto_txt
===================================================================
RCS file: patches/patch-requirements_crypto_txt
diff -N patches/patch-requirements_crypto_txt
--- patches/patch-requirements_crypto_txt	11 Mar 2022 19:58:00 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-Index: requirements/crypto.txt
---- requirements/crypto.txt.orig
-+++ requirements/crypto.txt
-@@ -1 +1 @@
--pycryptodomex>=3.9.8
-+pycryptodome

-- 
Regards,
 Mikolaj