CVS commit: pkgsrc/sysutils/salt

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Thu Feb 26 17:40:44 UTC 2026

Modified Files:
        pkgsrc/sysutils/salt: Makefile distinfo
Added Files:
        pkgsrc/sysutils/salt/patches: patch-salt_grains_core.py
            patch-salt_utils_network.py

Log Message:
sysutils/salt: fix two crashes starting salt_master on NetBSD

The patch for salt/grains/core.py avoids accessing an undefined element
of the grains dictionary, on both NetBSD and OpenBSD. This matches the
corresponding code for FreeBSD.

The patch for salt/utils/network.py restricts the OS version test to the
part before "_" on NetBSD; this could raise an exception if py-packaging
wasn't aware of the suffix (e.g., "BETA" would work but "STABLE" not).

Bumps PKGREVISION.

Tested on NetBSD/amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/sysutils/salt/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/sysutils/salt/distinfo
cvs rdiff -u -r0 -r1.9 pkgsrc/sysutils/salt/patches/patch-salt_grains_core.py \
    pkgsrc/sysutils/salt/patches/patch-salt_utils_network.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/salt/Makefile
diff -u pkgsrc/sysutils/salt/Makefile:1.90 pkgsrc/sysutils/salt/Makefile:1.91
--- pkgsrc/sysutils/salt/Makefile:1.90  Wed Nov  5 14:37:53 2025
+++ pkgsrc/sysutils/salt/Makefile       Thu Feb 26 17:40:44 2026
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.90 2025/11/05 14:37:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.91 2026/02/26 17:40:44 khorben Exp $
 
 .include "Makefile.common"
 
+PKGREVISION=   1
+
 COMMENT=       Remote execution and configuration management system
 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=78:../../devel/py-setuptools

Index: pkgsrc/sysutils/salt/distinfo
diff -u pkgsrc/sysutils/salt/distinfo:1.54 pkgsrc/sysutils/salt/distinfo:1.55
--- pkgsrc/sysutils/salt/distinfo:1.54  Fri Dec 26 22:02:22 2025
+++ pkgsrc/sysutils/salt/distinfo       Thu Feb 26 17:40:44 2026
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.54 2025/12/26 22:02:22 adam Exp $
+$NetBSD: distinfo,v 1.55 2026/02/26 17:40:44 khorben Exp $
 
 BLAKE2s (salt-3007.10.tar.gz) = dc919d9d38c1933e3a0129355bab1604f008b945ca3f1c4eb789236c0f2f2d5d
 SHA512 (salt-3007.10.tar.gz) = da920672819fe5a9b24a37ec0babdd0776e7ffbeff9cecf0195149f53037f09d81f22335bb54b102c1e4bfff0de8392e3a016eb6f696756b365bf7ce7a6e12a7
 Size (salt-3007.10.tar.gz) = 16223979 bytes
+SHA1 (patch-salt_grains_core.py) = 6b4cf3b776fad497704820b0dbb2d9e165fbcb0d
+SHA1 (patch-salt_utils_network.py) = 1d4aafcfb56594d2ece645df58ee15628b2219c0
 SHA1 (patch-salt_utils_rsax931.py) = 989e24088a55a983f7e404dc29cbffc7ec2f6aa6
 SHA1 (patch-salt_version.py) = 597d01aa77b024d56f1be0cbbad6936eb540bf98

Added files:

Index: pkgsrc/sysutils/salt/patches/patch-salt_grains_core.py
diff -u /dev/null pkgsrc/sysutils/salt/patches/patch-salt_grains_core.py:1.9
--- /dev/null   Thu Feb 26 17:40:44 2026
+++ pkgsrc/sysutils/salt/patches/patch-salt_grains_core.py      Thu Feb 26 17:40:44 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-salt_grains_core.py,v 1.9 2026/02/26 17:40:44 khorben Exp $
+
+Fix starting Salt on NetBSD and OpenBSD.
+
+--- salt/grains/core.py.orig   2026-02-26 17:34:46.201241607 +0000
++++ salt/grains/core.py
+@@ -2784,7 +2784,7 @@ def os_data():
+         grains["osfullname"] = "{} {}".format(grains["kernel"], grains["osrelease"])
+         grains.update(_bsd_cpudata(grains))
+     elif grains["kernel"] in ("OpenBSD", "NetBSD"):
+-        grains["os_family"] = grains["os"] = grains["kernel"]
++        grains["os_family"] = grains["osfullname"] = grains["os"] = grains["kernel"]
+         grains.update(_bsd_cpudata(grains))
+         grains["osrelease"] = grains["kernelrelease"].split("-")[0]
+         grains["osfullname"] = "{} {}".format(grains["kernel"], grains["osrelease"])
Index: pkgsrc/sysutils/salt/patches/patch-salt_utils_network.py
diff -u /dev/null pkgsrc/sysutils/salt/patches/patch-salt_utils_network.py:1.9
--- /dev/null   Thu Feb 26 17:40:44 2026
+++ pkgsrc/sysutils/salt/patches/patch-salt_utils_network.py    Thu Feb 26 17:40:44 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-salt_utils_network.py,v 1.9 2026/02/26 17:40:44 khorben Exp $
+
+Avoid crashes on NetBSD in the OS version check when the part after "_"
+is unknown to Version(). (e.g., "STABLE" as opposed to "BETA")
+
+--- salt/utils/network.py.orig 2025-12-18 09:42:02.000000000 +0000
++++ salt/utils/network.py
+@@ -1099,7 +1099,7 @@ def netbsd_interfaces():
+     address)
+     """
+     # NetBSD versions prior to 8.0 can still use linux_interfaces()
+-    if Version(os.uname()[2]) < Version("8.0"):
++    if Version(os.uname()[2].split('_')[0]) < Version("8.0"):
+         return linux_interfaces()
+ 
+     ifconfig_path = salt.utils.path.which("ifconfig")