Hi naddy@
I know you guys are busy with the release, but I would appreciate if
that could go in for 7.8 release.
The diff has an okay from Stuart.
Diff inlined again at the end of this email.
On Fri, Oct 03, 2025 at 08:51:17AM +0100, Stuart Henderson wrote:
> On 2025/10/02 21:06, Mikolaj Kucharski wrote:
> > I am not sure what is exactly the difference between py-cryptodome and
> > py-cryptodomex,
>
> $ diff -u0 py-cryptodome{,x}/pkg/DESCR
> --- py-cryptodome/pkg/DESCR Sun Apr 29 09:55:50 2018
> +++ py-cryptodomex/pkg/DESCR Thu Oct 17 11:52:00 2024
> @@ -11,0 +12,3 @@ ciphers) are implemented as C extensions.
> +PyCryptodomeX provides the same library as PyCryptodome but under the
> +Cryptodome module name rather than Crypto.
> +
>
> There seem to be fallbacks to the Crypto namespace in salt, but
> I didn't check everything, and obviously they're listing CryptodomeX
> in requirements which we're patching away without changing any code
> that might need it.
>
> Your diff is OK sthen@ and I think it should go in for release
>
> > 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
> >
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
