From nobody Sun Aug 03 14:03:33 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bw1cj4cZ4z63Q9F; Sun, 03 Aug 2025 14:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bw1cj43tJz4HN7; Sun, 03 Aug 2025 14:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754229813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Agx2393RgKs/Xhc7VnCiyl89jurL76o7RSTSBIrYJx8=; b=RGXCl7zy4k9p47Y3bch+luCNdBL2lFr0gL21Hu4jSa7tb5mYwkIx5adVYxtXYMl8YaZANG /MKTYOKV6CsBG/jvWjwHR5sm/TT8UC0d+tOg1iynqAUHi+vqt+jaD+KCgks3yWSfPrR5lx xz4aQqotbP4rVvRaP4R6PYAkSKKfsijHtuVmJODn8kiGRaa6gLWTrbjEGRAVFs1kdeCNz6 T8Kois7a2/0jar63YX9UIwe43WwD7GVmW2tyDFnlsWXFm4irtUD5QEGNnKW3jUFxsP5/cj +sR0OZnurQncBpNc+Ivx4mjw8nNzj7Wze4VGMBlSBsJGiS/7l+XyJWjTd7Zhsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754229813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Agx2393RgKs/Xhc7VnCiyl89jurL76o7RSTSBIrYJx8=; b=FEZXMe1SdWij2I9dGjiW0ebksLIzhKtX0cQ/VoxHgVzjc8XAUJEuVT/9ixp5Zqh1aOvXIN LHru1TfGpV7FFLHte4kftacIUQsEJRc7rv352UiW49f9GCR8/mo1Eq72rNmq250SnDics3 HKoCAJEHCUylB/AI6BNOXYLtzPfB3Kl9UVtP+cNTf7FyXud/vBMaimZz0OehdhpH6Rd2CZ XHKrCOS1X47a3ELEwzXrOXrBFXEliPnn/akdUOtblEB8GEfNikSyDGt6fiUEKfVZbElekB Ug5EGUlnFiXg2dzanrK8mpU6nJ9dD0R8Jo+3ohfQkTJ9hX3cSsJSWmceiok7/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754229813; a=rsa-sha256; cv=none; b=GsGJ+f16vNlZm7oW4CV/Zg6HHdEX79TcXP2+D4oKg2RGMxYwcpBW6vlbvWK0+42fmP0VJ/ cJHsMoPbMc5dy8rUIG31Zn/GhitERPdDQW+SJptoqoRK/kynsPUBeMT7JfJOk3RF3gl1ws 1ht2tZBs92wz0YsCGpXETotfxBOgqS+W9zeLFtQm1KUkP9bmf36WydbwmhTU2BQ07Buxju DbsmBh5eiVxz1u+MDcadgNN418zVgqtjpqGMW/5KvT8RriD+yr0rxmWkkaAR3vmn8IM64x qK20dYf9QnvmuYllu3LvxN84FYKnQ9ul9a93Nei6SVVg7TKm6pmv1rQaey5zgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bw1cj3f2rz15sS; Sun, 03 Aug 2025 14:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 573E3Xr7045524; Sun, 3 Aug 2025 14:03:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 573E3XvX045521; Sun, 3 Aug 2025 14:03:33 GMT (envelope-from git) Date: Sun, 3 Aug 2025 14:03:33 GMT Message-Id: <202508031403.573E3XvX045521@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 102f62ebb37a - main - sysutils/slurm-wlm: fix slurmctld List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 102f62ebb37a34b8963c0ebf89ccb5877da7f956 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=102f62ebb37a34b8963c0ebf89ccb5877da7f956 commit 102f62ebb37a34b8963c0ebf89ccb5877da7f956 Author: Generic Rikka AuthorDate: 2025-08-02 13:13:34 +0000 Commit: Thierry Thomas CommitDate: 2025-08-03 14:02:33 +0000 sysutils/slurm-wlm: fix slurmctld PR: 288593 --- sysutils/slurm-wlm/Makefile | 2 +- .../patch-src_common_slurm__protocol__socket.c | 43 ++++++++++++++++++++++ .../slurm-wlm/files/patch-src_interfaces_cgroup.c | 6 +-- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile index 4db32cacac65..384df809dcbf 100644 --- a/sysutils/slurm-wlm/Makefile +++ b/sysutils/slurm-wlm/Makefile @@ -1,6 +1,6 @@ PORTNAME= slurm DISTVERSION= 23.11.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= https://download.schedmd.com/slurm/ PKGNAMESUFFIX= -wlm diff --git a/sysutils/slurm-wlm/files/patch-src_common_slurm__protocol__socket.c b/sysutils/slurm-wlm/files/patch-src_common_slurm__protocol__socket.c new file mode 100644 index 000000000000..d5ae5ef84c32 --- /dev/null +++ b/sysutils/slurm-wlm/files/patch-src_common_slurm__protocol__socket.c @@ -0,0 +1,43 @@ +--- src/common/slurm_protocol_socket.c.orig 2024-05-21 17:19:51 UTC ++++ src/common/slurm_protocol_socket.c +@@ -491,6 +491,27 @@ extern int slurm_init_msg_engine(slurm_addr_t *addr, b + extern int slurm_init_msg_engine(slurm_addr_t *addr, bool quiet) + { + int rc; ++ ++ #if defined(__FreeBSD__) ++ /* ++ * FreeBSD requires the sa_len field to be set correctly in ++ * struct sockaddr_in / sockaddr_in6 before calling bind(). ++ * If it is unset, bind() may fail with EINVAL. ++ * ++ * This adjustment ensures the correct length is set based ++ * on the address family before bind() is called. ++ */ ++ if (addr->ss_family == AF_INET) { ++ ((struct sockaddr_in *)addr)->sin_len = sizeof(struct sockaddr_in); ++ } else if (addr->ss_family == AF_INET6) { ++ ((struct sockaddr_in6 *)addr)->sin6_len = sizeof(struct sockaddr_in6); ++ } ++ ++ /* Track the correct length for bind() */ ++ socklen_t bind_len = (addr->ss_family == AF_INET6) ++ ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in); ++ #endif ++ + int fd; + int log_lvl = LOG_LEVEL_ERROR; + const int one = 1; +@@ -511,7 +532,11 @@ extern int slurm_init_msg_engine(slurm_addr_t *addr, b + goto error; + } + +- rc = bind(fd, (struct sockaddr const *) addr, sizeof(*addr)); ++ #if defined(__FreeBSD__) ++ rc = bind(fd, (struct sockaddr const *) addr, bind_len); ++ #else ++ rc = bind(fd, (struct sockaddr const *) addr, sizeof(*addr)); ++ #endif + if (rc < 0) { + format_print(log_lvl, "Error binding slurm stream socket: %m"); + goto error; diff --git a/sysutils/slurm-wlm/files/patch-src_interfaces_cgroup.c b/sysutils/slurm-wlm/files/patch-src_interfaces_cgroup.c index 12bf2f7f5656..4b8616be9ee3 100644 --- a/sysutils/slurm-wlm/files/patch-src_interfaces_cgroup.c +++ b/sysutils/slurm-wlm/files/patch-src_interfaces_cgroup.c @@ -1,6 +1,6 @@ ---- src/interfaces/cgroup.c.orig 2023-11-21 22:33:29 UTC +--- src/interfaces/cgroup.c.orig 2024-05-21 17:19:51 UTC +++ src/interfaces/cgroup.c -@@ -419,6 +419,7 @@ extern char *autodetect_cgroup_version(void) +@@ -421,6 +421,7 @@ extern char *autodetect_cgroup_version(void) struct statfs fs; int cgroup_ver = -1; @@ -8,7 +8,7 @@ if (statfs("/sys/fs/cgroup/", &fs) < 0) { error("cgroup filesystem not mounted in /sys/fs/cgroup/"); return NULL; -@@ -451,6 +452,7 @@ extern char *autodetect_cgroup_version(void) +@@ -453,6 +454,7 @@ extern char *autodetect_cgroup_version(void) error("Unknown filesystem type mounted on /sys/fs/cgroup"); return NULL; }