aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeneric Rikka <rikka.goering@outlook.de>2026-06-10 20:02:01 +0000
committerVladimir Druzenko <vvd@FreeBSD.org>2026-06-10 20:08:56 +0000
commit8beaafa1d988794ad2ecec04169259a8145091c0 (patch)
tree577eb9b24340370f3d64f010f60e24e6a4cd2917
parenta224b8de3e5a8c65a5c0d258f6115d83acb3e275 (diff)
sysutils/slurm-wlm: Update 25.11.5 → 26.05.1
Changelog: https://github.com/SchedMD/slurm/blob/slurm-26-05-1-1/CHANGELOG/slurm-26.05.md - Remove unnecessary GUI_CONFIGURE_OFF and S2N_CONFIGURE_OFF - GUI_CONFIGURE_ENABLE and S2N_CONFIGURE_WITH cover them. - Fix warnings from portclippy. - Fix detection of the s2n in configure. - Refresh patches. PR: 295969 Sponsored by: UNIS Labs Co-authored-by: Vladimir Druzenko <vvd@FreeBSD.org> MFH: 2026Q2
Diffstat
-rw-r--r--sysutils/slurm-wlm/Makefile6
-rw-r--r--sysutils/slurm-wlm/distinfo6
-rw-r--r--sysutils/slurm-wlm/files/patch-config.h.in20
-rw-r--r--sysutils/slurm-wlm/files/patch-configure62
-rw-r--r--sysutils/slurm-wlm/files/patch-src_common_Makefile.in29
-rw-r--r--sysutils/slurm-wlm/files/patch-src_common_stepd__proxy.c4
-rw-r--r--sysutils/slurm-wlm/files/patch-src_conmgr_con.c24
-rw-r--r--sysutils/slurm-wlm/files/patch-src_plugins_acct__gather__profile_hdf5_Makefile.in4
-rw-r--r--sysutils/slurm-wlm/files/patch-src_plugins_acct__gather__profile_hdf5_sh5util_Makefile.in4
-rw-r--r--sysutils/slurm-wlm/files/patch-src_plugins_auth_slurm_sack.c6
-rw-r--r--sysutils/slurm-wlm/files/patch-src_scrun_anchor.c15
-rw-r--r--sysutils/slurm-wlm/files/patch-src_slurmd_slurmstepd_req.c8
-rw-r--r--sysutils/slurm-wlm/pkg-plist26
13 files changed, 110 insertions, 104 deletions
diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile
index 2436299ec5db..dc8847dd85f6 100644
--- a/sysutils/slurm-wlm/Makefile
+++ b/sysutils/slurm-wlm/Makefile
@@ -1,5 +1,5 @@
PORTNAME= slurm
-DISTVERSION= 25.11.5
+DISTVERSION= 26.05.1
CATEGORIES= sysutils
MASTER_SITES= https://download.schedmd.com/slurm/
PKGNAMESUFFIX= -wlm
@@ -46,10 +46,10 @@ CONFIGURE_ENV= MAKE=${GMAKE}
INSTALL_TARGET= install-strip
TEST_TARGET= check
-TESTING_UNSAFE= yes
CFLAGS+= -I${WRKSRC}/slurm
LDFLAGS+= -lsysinfo -lprocstat -fcommon
+TESTING_UNSAFE= yes
SUB_FILES= pkg-message
@@ -80,7 +80,6 @@ GUI_BUILD_DEPENDS= itstool:textproc/itstool
GUI_USES= gnome
GUI_USE= GNOME=cairo,gdkpixbuf,glib20,gtk20,pango
GUI_CONFIGURE_ENABLE= sview
-GUI_CONFIGURE_OFF= --disable-sview
HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \
libhdf5_hl.so:science/hdf5
@@ -98,7 +97,6 @@ IPMI_CONFIGURE_WITH= freeipmi
S2N_LIB_DEPENDS= libs2n.so:security/s2n-tls
S2N_CONFIGURE_WITH= s2n=${LOCALBASE}
-S2N_CONFIGURE_OFF= --without-s2n
_ARCH= ${ARCH:S|aarch64|aarch64elf|:S|amd64|elf_amd64|:S|powerpc64le|elf64lppc|:S|powerpc64|elf64ppc|:S|riscv64|elf64lriscv|}
diff --git a/sysutils/slurm-wlm/distinfo b/sysutils/slurm-wlm/distinfo
index 65597bcf3232..5b3abd96b9dd 100644
--- a/sysutils/slurm-wlm/distinfo
+++ b/sysutils/slurm-wlm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1776390106
-SHA256 (slurm-25.11.5.tar.bz2) = c95361df00a035571c101834cd3988c224a38c4a3c8c67252aedb7527d447277
-SIZE (slurm-25.11.5.tar.bz2) = 6759068
+TIMESTAMP = 1781053795
+SHA256 (slurm-26.05.1.tar.bz2) = c2de57f0b5cdcb5e50543706ab9cb812263a9366e5152c1e716aaf66d307e07c
+SIZE (slurm-26.05.1.tar.bz2) = 6870131
diff --git a/sysutils/slurm-wlm/files/patch-config.h.in b/sysutils/slurm-wlm/files/patch-config.h.in
deleted file mode 100644
index fa28fb559310..000000000000
--- a/sysutils/slurm-wlm/files/patch-config.h.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- config.h.in.orig 2026-01-29 06:29:02 UTC
-+++ config.h.in
-@@ -1,5 +1,17 @@
- /* config.h.in. Generated from configure.ac by autoheader. */
-
-+/* Define to 1 if 'sa_len' is a member of 'struct sockaddr'. */
-+#undef HAVE_STRUCT_SOCKADDR_SA_LEN
-+
-+/* Define to 1 if 'sin_len' is a member of 'struct sockaddr_in'. */
-+#undef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-+
-+/* Define to 1 if 'sin6_len' is a member of 'struct sockaddr_in6'. */
-+#undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN
-+
-+/* Define to 1 if 'sun_len' is a member of 'struct sockaddr_un'. */
-+#undef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN
-+
- /* Define if building universal (internal helper macro) */
- #undef AC_APPLE_UNIVERSAL_BUILD
-
diff --git a/sysutils/slurm-wlm/files/patch-configure b/sysutils/slurm-wlm/files/patch-configure
index ff3073aa4b2c..4fad52f08440 100644
--- a/sysutils/slurm-wlm/files/patch-configure
+++ b/sysutils/slurm-wlm/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2026-02-19 21:12:55 UTC
+--- configure.orig 2026-06-09 20:26:02 UTC
+++ configure
-@@ -784,6 +784,7 @@ HDF5_LIBS
+@@ -786,6 +786,7 @@ HDF5_LIBS
HDF5_FFLAGS
HDF5_FC
HDF5_LIBS
@@ -8,7 +8,7 @@
HDF5_LDFLAGS
HDF5_CPPFLAGS
HDF5_CFLAGS
-@@ -12827,7 +12828,7 @@ printf %s "checking whether the $compiler linker ($LD)
+@@ -12988,7 +12989,7 @@ printf %s "checking whether the $compiler linker ($LD)
hardcode_minus_L=no
hardcode_shlibpath_var=unsupported
inherit_rpath=no
@@ -17,7 +17,7 @@
module_cmds=
module_expsym_cmds=
old_archive_from_new_cmds=
-@@ -13125,7 +13126,7 @@ _LT_EOF
+@@ -13286,7 +13287,7 @@ _LT_EOF
*-mlibc)
archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@@ -26,7 +26,7 @@
;;
netbsd* | netbsdelf*-gnu)
-@@ -13134,7 +13135,7 @@ _LT_EOF
+@@ -13295,7 +13296,7 @@ _LT_EOF
wlarc=
else
archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@@ -35,7 +35,7 @@
fi
;;
-@@ -13153,7 +13154,7 @@ _LT_EOF
+@@ -13314,7 +13315,7 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@@ -44,7 +44,7 @@
else
ld_shlibs=no
fi
-@@ -13182,7 +13183,7 @@ _LT_EOF
+@@ -13343,7 +13344,7 @@ _LT_EOF
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@@ -53,7 +53,7 @@
else
ld_shlibs=no
fi
-@@ -13200,7 +13201,7 @@ _LT_EOF
+@@ -13361,7 +13362,7 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@@ -62,7 +62,7 @@
else
ld_shlibs=no
fi
-@@ -13865,7 +13866,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
+@@ -14026,7 +14027,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
hardcode_direct_absolute=yes
if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
@@ -71,7 +71,7 @@
hardcode_libdir_flag_spec='$wl-rpath,$libdir'
export_dynamic_flag_spec='$wl-E'
else
-@@ -14734,7 +14735,7 @@ freebsd* | dragonfly* | midnightbsd*)
+@@ -14895,7 +14896,7 @@ freebsd* | dragonfly* | midnightbsd*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -80,7 +80,7 @@
soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
-@@ -16492,7 +16493,7 @@ else
+@@ -16653,7 +16654,7 @@ else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
else
@@ -89,7 +89,7 @@
old_striplib="$STRIP --strip-debug"
striplib="$STRIP --strip-unneeded"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -16506,7 +16507,7 @@ printf "%s\n" "yes" >&6; }
+@@ -16667,7 +16668,7 @@ printf "%s\n" "yes" >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
;;
@@ -98,7 +98,7 @@
if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
old_striplib="$STRIP --strip-debug"
striplib="$STRIP --strip-unneeded"
-@@ -16752,7 +16753,7 @@ module_expsym_cmds_CXX=
+@@ -16913,7 +16914,7 @@ module_expsym_cmds_CXX=
inherit_rpath_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
@@ -107,7 +107,7 @@
old_archive_cmds_CXX=$old_archive_cmds
reload_flag_CXX=$reload_flag
reload_cmds_CXX=$reload_cmds
-@@ -16969,7 +16970,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -17130,7 +17131,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
# archiving commands below assume that GNU ld is being used.
if test yes = "$with_gnu_ld"; then
archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
@@ -116,7 +116,7 @@
hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
export_dynamic_flag_spec_CXX='$wl--export-dynamic'
-@@ -17668,7 +17669,7 @@ fi
+@@ -17829,7 +17830,7 @@ fi
case `$CC -V 2>&1` in
*"Version 7."*)
archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
@@ -125,7 +125,7 @@
;;
*) # Version 8.0 or newer
tmp_idyn=
-@@ -17676,7 +17677,7 @@ fi
+@@ -17837,7 +17838,7 @@ fi
ia64*) tmp_idyn=' -i_dynamic';;
esac
archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
@@ -134,7 +134,7 @@
;;
esac
archive_cmds_need_lc_CXX=no
-@@ -17708,7 +17709,7 @@ fi
+@@ -17869,7 +17870,7 @@ fi
;;
*) # Version 6 and above use weak symbols
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
@@ -143,7 +143,7 @@
;;
esac
-@@ -17719,7 +17720,7 @@ fi
+@@ -17880,7 +17881,7 @@ fi
cxx*)
# Compaq C++
archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
@@ -152,7 +152,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -17753,7 +17754,7 @@ fi
+@@ -17914,7 +17915,7 @@ fi
# Sun C++ 5.9
no_undefined_flag_CXX=' -zdefs'
archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
@@ -161,7 +161,7 @@
hardcode_libdir_flag_spec_CXX='-R$libdir'
whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object_CXX=yes
-@@ -17825,7 +17826,7 @@ fi
+@@ -17986,7 +17987,7 @@ fi
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
@@ -170,7 +170,7 @@
export_dynamic_flag_spec_CXX='$wl-E'
whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
fi
-@@ -19384,7 +19385,7 @@ freebsd* | dragonfly* | midnightbsd*)
+@@ -19545,7 +19546,7 @@ freebsd* | dragonfly* | midnightbsd*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -179,7 +179,7 @@
soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
-@@ -24160,7 +24161,7 @@ case $host_os in
+@@ -24484,7 +24485,7 @@ case $host_os in
case $host_os in
@@ -188,7 +188,7 @@
# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-@@ -25027,6 +25028,7 @@ HDF5_LIBS=""
+@@ -25351,6 +25352,7 @@ HDF5_LIBS=""
HDF5_CPPFLAGS=""
HDF5_LDFLAGS=""
HDF5_LIBS=""
@@ -196,7 +196,7 @@
HDF5_FC=""
HDF5_FFLAGS=""
HDF5_FLIBS=""
-@@ -25416,7 +25418,59 @@ printf "%s\n" "#define H5_USE_18_API 1" >>confdefs.h
+@@ -25740,7 +25742,59 @@ printf "%s\n" "#define H5_USE_18_API 1" >>confdefs.h
fi
@@ -256,7 +256,7 @@
#
# Handle user hints
#
-@@ -27518,6 +27572,133 @@ fi
+@@ -27938,6 +27992,133 @@ fi
fi
fi
@@ -390,3 +390,15 @@
#
+--- configure.orig 2026-06-10 12:48:33 UTC
++++ configure
+@@ -27589,8 +27589,8 @@ else case e in #(
+ if test "$ac_with_rpath" = "yes"; then
+ S2N_LDFLAGS="-Wl,-rpath -Wl,$d/$bit "
+ fi
+- S2N_LDFLAGS+="-L$d/$bit"
++ S2N_LDFLAGS="${S2N_LDFLAGS} -L$d/$bit"
+ LIBS="$S2N_LDFLAGS $S2N_LIBS"
+ CPPFLAGS="$S2N_CPPFLAGS $CPPFLAGS"
+ if test "$cross_compiling" = yes
+ then :
diff --git a/sysutils/slurm-wlm/files/patch-src_common_Makefile.in b/sysutils/slurm-wlm/files/patch-src_common_Makefile.in
index 93f49d1fdc93..a408447e5687 100644
--- a/sysutils/slurm-wlm/files/patch-src_common_Makefile.in
+++ b/sysutils/slurm-wlm/files/patch-src_common_Makefile.in
@@ -1,15 +1,16 @@
---- src/common/Makefile.in.orig 2026-01-15 20:26:01 UTC
+--- src/common/Makefile.in.orig 2026-06-09 20:26:02 UTC
+++ src/common/Makefile.in
-@@ -179,6 +179,7 @@ am_libcommon_la_OBJECTS = assoc_mgr.lo bitstring.lo ca
- slurm_opt.lo slurm_protocol_api.lo slurm_protocol_defs.lo \
- slurm_protocol_pack.lo slurm_protocol_util.lo \
- slurm_protocol_socket.lo slurm_resolv.lo \
-+ slurm_sockaddr.lo \
- slurm_resource_info.lo slurm_rlimits_info.lo \
- slurm_step_layout.lo slurm_time.lo slurmdb_defs.lo \
- slurmdb_pack.lo slurmdbd_defs.lo slurmdbd_pack.lo spank.lo \
-@@ -711,6 +712,8 @@ libcommon_la_SOURCES = \
- slurm_protocol_socket.h \
+@@ -181,7 +181,7 @@ am_libcommon_la_OBJECTS = assoc_mgr.lo atomic.lo bitst
+ setproctitle.lo sluid.lo slurm_errno.lo slurm_opt.lo \
+ slurm_protocol_api.lo slurm_protocol_defs.lo \
+ slurm_protocol_pack.lo slurm_protocol_socket.lo \
+- slurm_protocol_util.lo slurm_resolv.lo slurm_resource_info.lo \
++ slurm_protocol_util.lo slurm_resolv.lo slurm_sockaddr.lo slurm_resource_info.lo \
+ slurm_rlimits_info.lo slurm_step_layout.lo slurm_time.lo \
+ slurmdb_defs.lo slurmdb_pack.lo slurmdbd_defs.lo \
+ slurmdbd_pack.lo spank.lo state_save.lo step_ctx.lo \
+@@ -743,6 +743,8 @@ libcommon_la_SOURCES = \
+ slurm_protocol_util.h \
slurm_resolv.c \
slurm_resolv.h \
+ slurm_sockaddr.c \
@@ -17,7 +18,7 @@
slurm_resource_info.c \
slurm_resource_info.h \
slurm_rlimits_info.c \
-@@ -909,6 +912,7 @@ distclean-compile:
+@@ -957,6 +959,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_protocol_socket.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_protocol_util.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_resolv.Plo@am__quote@ # am--include-marker
@@ -25,7 +26,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_resource_info.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_rlimits_info.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slurm_step_layout.Plo@am__quote@ # am--include-marker
-@@ -1134,6 +1138,7 @@ distclean: distclean-am
+@@ -1195,6 +1198,7 @@ distclean: distclean-am
-rm -f ./$(DEPDIR)/slurm_protocol_socket.Plo
-rm -f ./$(DEPDIR)/slurm_protocol_util.Plo
-rm -f ./$(DEPDIR)/slurm_resolv.Plo
@@ -33,7 +34,7 @@
-rm -f ./$(DEPDIR)/slurm_resource_info.Plo
-rm -f ./$(DEPDIR)/slurm_rlimits_info.Plo
-rm -f ./$(DEPDIR)/slurm_step_layout.Plo
-@@ -1279,6 +1284,7 @@ maintainer-clean: maintainer-clean-am
+@@ -1353,6 +1357,7 @@ maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/slurm_protocol_socket.Plo
-rm -f ./$(DEPDIR)/slurm_protocol_util.Plo
-rm -f ./$(DEPDIR)/slurm_resolv.Plo
diff --git a/sysutils/slurm-wlm/files/patch-src_common_stepd__proxy.c b/sysutils/slurm-wlm/files/patch-src_common_stepd__proxy.c
index d29e60530a2e..31d97b53ea34 100644
--- a/sysutils/slurm-wlm/files/patch-src_common_stepd__proxy.c
+++ b/sysutils/slurm-wlm/files/patch-src_common_stepd__proxy.c
@@ -1,4 +1,4 @@
---- src/common/stepd_proxy.c.orig 2026-01-15 20:26:01 UTC
+--- src/common/stepd_proxy.c.orig 2026-06-09 20:26:02 UTC
+++ src/common/stepd_proxy.c
@@ -40,6 +40,7 @@
#include "src/common/read_config.h"
@@ -8,7 +8,7 @@
#include "src/common/stepd_api.h"
#include "src/common/stepd_proxy.h"
#include "src/common/xmalloc.h"
-@@ -299,13 +300,14 @@ static int _stepd_connect_to_slurmd(void)
+@@ -297,13 +298,14 @@ static int _stepd_connect_to_slurmd(void)
static int _stepd_connect_to_slurmd(void)
{
struct sockaddr_un slurmd_addr = { .sun_family = AF_UNIX };
diff --git a/sysutils/slurm-wlm/files/patch-src_conmgr_con.c b/sysutils/slurm-wlm/files/patch-src_conmgr_con.c
index be3dddecde12..a241f3e89a53 100644
--- a/sysutils/slurm-wlm/files/patch-src_conmgr_con.c
+++ b/sysutils/slurm-wlm/files/patch-src_conmgr_con.c
@@ -1,6 +1,6 @@
---- src/conmgr/con.c.orig 2026-01-15 20:26:01 UTC
+--- src/conmgr/con.c.orig 2026-06-09 20:26:02 UTC
+++ src/conmgr/con.c
-@@ -59,6 +59,7 @@
+@@ -60,6 +60,7 @@
#include "src/common/slurm_protocol_api.h"
#include "src/common/slurm_protocol_defs.h"
#include "src/common/slurm_protocol_socket.h"
@@ -8,7 +8,7 @@
#include "src/common/slurm_time.h"
#include "src/common/util-net.h"
#include "src/common/xmalloc.h"
-@@ -1029,6 +1030,7 @@ static int _add_unix_listener(conmgr_con_type_t type,
+@@ -1132,6 +1133,7 @@ static int _add_unix_listener(const conmgr_timeouts_t
slurm_addr_t addr = { 0 };
int fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
int rc = EINVAL;
@@ -16,7 +16,7 @@
if (fd < 0)
fatal("%s: socket() failed: %m", __func__);
-@@ -1045,9 +1047,11 @@ static int _add_unix_listener(conmgr_con_type_t type,
+@@ -1148,9 +1150,11 @@ static int _add_unix_listener(const conmgr_timeouts_t
if (unlink(unixsock) && (errno != ENOENT))
error("Error unlink(%s): %m", unixsock);
@@ -31,17 +31,17 @@
fatal("%s: [%s] Unable to bind UNIX socket: %m",
__func__, listen_on);
-@@ -1059,7 +1063,7 @@ static int _add_unix_listener(conmgr_con_type_t type,
+@@ -1162,7 +1166,7 @@ static int _add_unix_listener(const conmgr_timeouts_t
__func__, listen_on);
- return add_connection(type, NULL, fd, -1, events, flags, &addr,
-- sizeof(addr), true, unixsock, NULL, arg);
-+ bind_len, true, unixsock, NULL, arg);
+ return add_connection(type, timeouts, NULL, fd, -1, events, flags,
+- &addr, sizeof(addr), true, unixsock, NULL, NULL,
++ &addr, bind_len, true, unixsock, NULL, NULL,
+ arg);
}
- static int _add_socket_listener(conmgr_con_type_t type,
-@@ -1207,16 +1211,14 @@ extern int conmgr_create_connect_socket(conmgr_con_typ
- void *arg)
+@@ -1316,16 +1320,14 @@ extern int conmgr_create_connect_socket(conmgr_con_typ
+ const char *tls_cert, void *arg)
{
int fd = -1, rc = SLURM_ERROR;
- //socklen_t bindlen = 0;
@@ -58,7 +58,7 @@
} else {
return EAFNOSUPPORT;
}
-@@ -1233,9 +1235,12 @@ extern int conmgr_create_connect_socket(conmgr_con_typ
+@@ -1342,9 +1344,12 @@ extern int conmgr_create_connect_socket(conmgr_con_typ
log_flag(CONMGR, "%s: [%pA(fd:%d)] attempting to connect() new socket",
__func__, addr, fd);
diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_acct__gather__profile_hdf5_Makefile.in b/sysutils/slurm-wlm/files/patch-src_plugins_acct__gather__profile_hdf5_Makefile.in
index 9d9088d6a2f8..bc1a9e89785e 100644
--- a/sysutils/slurm-wlm/files/patch-src_plugins_acct__gather__profile_hdf5_Makefile.in
+++ b/sysutils/slurm-wlm/files/patch-src_plugins_acct__gather__profile_hdf5_Makefile.in
@@ -1,4 +1,4 @@
---- src/plugins/acct_gather_profile/hdf5/Makefile.in.orig 2026-01-29 06:44:59 UTC
+--- src/plugins/acct_gather_profile/hdf5/Makefile.in.orig 2026-06-09 20:26:02 UTC
+++ src/plugins/acct_gather_profile/hdf5/Makefile.in
@@ -349,6 +349,7 @@ HDF5_LIBS = @HDF5_LIBS@
HDF5_FLIBS = @HDF5_FLIBS@
@@ -8,7 +8,7 @@
HDF5_TYPE = @HDF5_TYPE@
HDF5_VERSION = @HDF5_VERSION@
HPE_SLINGSHOT_CFLAGS = @HPE_SLINGSHOT_CFLAGS@
-@@ -563,7 +564,7 @@ HDF5_API_SOURCES = hdf5_api.c hdf5_api.h
+@@ -566,7 +567,7 @@ HDF5_API_SOURCES = hdf5_api.c hdf5_api.h
@BUILD_HDF5_TRUE@noinst_LTLIBRARIES = libhdf5_api.la
@BUILD_HDF5_TRUE@libhdf5_api_la_SOURCES = $(HDF5_API_SOURCES)
@BUILD_HDF5_TRUE@libhdf5_api_la_LDFLAGS = $(HDF5_LDFLAGS)
diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_acct__gather__profile_hdf5_sh5util_Makefile.in b/sysutils/slurm-wlm/files/patch-src_plugins_acct__gather__profile_hdf5_sh5util_Makefile.in
index 81a8d4a56659..31c6d6e4badc 100644
--- a/sysutils/slurm-wlm/files/patch-src_plugins_acct__gather__profile_hdf5_sh5util_Makefile.in
+++ b/sysutils/slurm-wlm/files/patch-src_plugins_acct__gather__profile_hdf5_sh5util_Makefile.in
@@ -1,4 +1,4 @@
---- src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in.orig 2026-01-29 06:44:40 UTC
+--- src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in.orig 2026-06-09 20:26:02 UTC
+++ src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.in
@@ -290,6 +290,7 @@ HDF5_LIBS = @HDF5_LIBS@
HDF5_FLIBS = @HDF5_FLIBS@
@@ -8,7 +8,7 @@
HDF5_TYPE = @HDF5_TYPE@
HDF5_VERSION = @HDF5_VERSION@
HPE_SLINGSHOT_CFLAGS = @HPE_SLINGSHOT_CFLAGS@
-@@ -497,11 +498,10 @@ SHDF5_SOURCES = sh5util.c sh5util.h
+@@ -500,11 +501,10 @@ SHDF5_SOURCES = sh5util.c sh5util.h
SHDF5_SOURCES = sh5util.c sh5util.h
@BUILD_HDF5_TRUE@sh5util_SOURCES = $(SHDF5_SOURCES)
@BUILD_HDF5_TRUE@sh5util_LDADD = $(LIB_SLURM) \
diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_auth_slurm_sack.c b/sysutils/slurm-wlm/files/patch-src_plugins_auth_slurm_sack.c
index 720215771968..3a0f4703187e 100644
--- a/sysutils/slurm-wlm/files/patch-src_plugins_auth_slurm_sack.c
+++ b/sysutils/slurm-wlm/files/patch-src_plugins_auth_slurm_sack.c
@@ -1,4 +1,4 @@
---- src/plugins/auth/slurm/sack.c.orig 2026-01-15 20:26:01 UTC
+--- src/plugins/auth/slurm/sack.c.orig 2026-06-09 20:26:02 UTC
+++ src/plugins/auth/slurm/sack.c
@@ -43,6 +43,7 @@
#include "slurm/slurm.h"
@@ -8,7 +8,7 @@
#include "src/common/env.h"
#include "src/common/fd.h"
-@@ -299,6 +300,7 @@ extern void init_sack_conmgr(void)
+@@ -301,6 +302,7 @@ extern void init_sack_conmgr(void)
char *runtime_dir = NULL, *runtime_socket = NULL;
slurm_addr_t addr = {0};
mode_t mask;
@@ -16,7 +16,7 @@
if (running_in_slurmctld()) {
_prepare_run_dir("slurmctld", true);
-@@ -337,9 +339,9 @@ extern void init_sack_conmgr(void)
+@@ -339,9 +341,9 @@ extern void init_sack_conmgr(void)
/* set value of socket path */
mask = umask(0);
diff --git a/sysutils/slurm-wlm/files/patch-src_scrun_anchor.c b/sysutils/slurm-wlm/files/patch-src_scrun_anchor.c
index fb9ed423ed2c..42591fbb9a26 100644
--- a/sysutils/slurm-wlm/files/patch-src_scrun_anchor.c
+++ b/sysutils/slurm-wlm/files/patch-src_scrun_anchor.c
@@ -1,4 +1,4 @@
---- src/scrun/anchor.c.orig 2026-01-15 20:26:01 UTC
+--- src/scrun/anchor.c.orig 2026-06-09 20:26:02 UTC
+++ src/scrun/anchor.c
@@ -63,6 +63,7 @@
#include "src/common/pack.h"
@@ -8,7 +8,7 @@
#include "src/common/spank.h"
#include "src/common/uid.h"
#include "src/common/xassert.h"
-@@ -652,6 +653,7 @@ static void _queue_send_console_socket(void)
+@@ -653,6 +654,7 @@ static void _queue_send_console_socket(void)
struct sockaddr_un addr = {
.sun_family = AF_UNIX,
};
@@ -16,7 +16,7 @@
int fd = socket(AF_UNIX, SOCK_STREAM, 0);
fd_set_nonblocking(fd);
-@@ -662,12 +664,14 @@ static void _queue_send_console_socket(void)
+@@ -663,13 +665,15 @@ static void _queue_send_console_socket(void)
fatal("console socket address too long: %s",
state.console_socket);
@@ -27,9 +27,10 @@
fatal("%s: [%s] Unable to connect() to console socket: %m",
__func__, addr.sun_path);
- if ((rc = conmgr_process_fd(CON_TYPE_RAW, fd, fd, &events, CON_FLAG_NONE,
-- (slurm_addr_t *) &addr, sizeof(addr),
-+ (slurm_addr_t *) &addr, addrlen,
- NULL, NULL)))
+ if ((rc = conmgr_process_fd(CON_TYPE_RAW, &conmgr_timeouts_disabled, fd,
+ fd, &events, CON_FLAG_NONE,
+- (slurm_addr_t *) &addr, sizeof(addr), NULL,
++ (slurm_addr_t *) &addr, addrlen, NULL,
+ NULL)))
fatal("%s: [%s] unable to initialize console socket: %s",
__func__, addr.sun_path, slurm_strerror(rc));
diff --git a/sysutils/slurm-wlm/files/patch-src_slurmd_slurmstepd_req.c b/sysutils/slurm-wlm/files/patch-src_slurmd_slurmstepd_req.c
index b90ed57f30d0..b0a5161ad828 100644
--- a/sysutils/slurm-wlm/files/patch-src_slurmd_slurmstepd_req.c
+++ b/sysutils/slurm-wlm/files/patch-src_slurmd_slurmstepd_req.c
@@ -1,4 +1,4 @@
---- src/slurmd/slurmstepd/req.c.orig 2026-01-15 20:26:01 UTC
+--- src/slurmd/slurmstepd/req.c.orig 2026-06-09 20:26:02 UTC
+++ src/slurmd/slurmstepd/req.c
@@ -58,6 +58,7 @@
#include "src/common/proc_args.h"
@@ -8,7 +8,7 @@
#include "src/common/stepd_api.h"
#include "src/common/stepd_proxy.h"
#include "src/common/strlcpy.h"
-@@ -135,7 +136,7 @@ _create_socket(const char *name)
+@@ -140,7 +141,7 @@ _create_socket(const char *name)
_create_socket(const char *name)
{
int fd;
@@ -17,7 +17,7 @@
struct sockaddr_un addr;
/*
-@@ -156,7 +157,8 @@ _create_socket(const char *name)
+@@ -161,7 +162,8 @@ _create_socket(const char *name)
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX;
strlcpy(addr.sun_path, name, sizeof(addr.sun_path));
@@ -27,7 +27,7 @@
/* bind the name to the descriptor */
if (bind(fd, (struct sockaddr *) &addr, len) < 0) {
-@@ -348,12 +350,12 @@ static int _msg_socket_accept(eio_obj_t *obj, list_t *
+@@ -362,12 +364,12 @@ static int _msg_socket_accept(eio_obj_t *obj, list_t *
{
int fd, *param = NULL;
struct sockaddr_un addr;
diff --git a/sysutils/slurm-wlm/pkg-plist b/sysutils/slurm-wlm/pkg-plist
index 8fefb81d7333..56bafad7768f 100644
--- a/sysutils/slurm-wlm/pkg-plist
+++ b/sysutils/slurm-wlm/pkg-plist
@@ -18,6 +18,7 @@ bin/sshare
bin/sstat
bin/strigger
%%GUI%%bin/sview
+bin/swait
@sample %%ETCDIR%%/slurm.conf.sample
include/slurm/pmi.h
include/slurm/slurm.h
@@ -27,8 +28,8 @@ include/slurm/slurmdb.h
include/slurm/spank.h
lib/libslurm.a
lib/libslurm.so
-lib/libslurm.so.44
-lib/libslurm.so.44.0.0
+lib/libslurm.so.45
+lib/libslurm.so.45.0.0
lib/slurm/accounting_storage_ctld_relay.a
lib/slurm/accounting_storage_ctld_relay.so
lib/slurm/accounting_storage_mysql.a
@@ -79,18 +80,22 @@ lib/slurm/cli_filter_syslog.a
lib/slurm/cli_filter_syslog.so
lib/slurm/cli_filter_user_defaults.a
lib/slurm/cli_filter_user_defaults.so
+lib/slurm/compress_lz4.a
+lib/slurm/compress_lz4.so
+lib/slurm/compress_none.a
+lib/slurm/compress_none.so
lib/slurm/cred_munge.a
lib/slurm/cred_munge.so
lib/slurm/cred_none.a
lib/slurm/cred_none.so
-lib/slurm/data_parser_v0_0_41.a
-lib/slurm/data_parser_v0_0_41.so
lib/slurm/data_parser_v0_0_42.a
lib/slurm/data_parser_v0_0_42.so
lib/slurm/data_parser_v0_0_43.a
lib/slurm/data_parser_v0_0_43.so
lib/slurm/data_parser_v0_0_44.a
lib/slurm/data_parser_v0_0_44.so
+lib/slurm/data_parser_v0_0_45.a
+lib/slurm/data_parser_v0_0_45.so
lib/slurm/gpu_generic.a
lib/slurm/gpu_generic.so
lib/slurm/gpu_nrt.a
@@ -111,6 +116,8 @@ lib/slurm/hash_k12.a
lib/slurm/hash_k12.so
lib/slurm/hash_sha3.a
lib/slurm/hash_sha3.so
+lib/slurm/http_auth_local.a
+lib/slurm/http_auth_local.so
lib/slurm/http_parser_libhttp_parser.a
lib/slurm/http_parser_libhttp_parser.so
lib/slurm/job_submit_all_partitions.a
@@ -205,10 +212,16 @@ lib/slurm/topology_block.a
lib/slurm/topology_block.so
lib/slurm/topology_flat.a
lib/slurm/topology_flat.so
+lib/slurm/topology_ring.a
+lib/slurm/topology_ring.so
+lib/slurm/topology_torus3d.a
+lib/slurm/topology_torus3d.so
lib/slurm/topology_tree.a
lib/slurm/topology_tree.so
-%%S2N%%lib/%%USERS%%/tls_s2n.a
-%%S2N%%lib/%%USERS%%/tls_s2n.so
+%%S2N%%lib/slurm/tls_s2n.a
+%%S2N%%lib/slurm/tls_s2n.so
+lib/slurm/url_parser_internal.a
+lib/slurm/url_parser_internal.so
sbin/sackd
sbin/slurmctld
sbin/slurmd
@@ -236,6 +249,7 @@ share/man/man1/sshare.1.gz
share/man/man1/sstat.1.gz
share/man/man1/strigger.1.gz
%%GUI%%share/man/man1/sview.1.gz
+share/man/man1/swait.1.gz
share/man/man5/acct_gather.conf.5.gz
share/man/man5/burst_buffer.conf.5.gz
share/man/man5/cgroup.conf.5.gz
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-16 05:05:57 +0000