diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile index 47bc5c19e7bf..c56505723505 100644 --- a/sysutils/slurm-wlm/Makefile +++ b/sysutils/slurm-wlm/Makefile @@ -1,135 +1,135 @@ PORTNAME= slurm -DISTVERSION= 26.05.2 +DISTVERSION= 26.05.4 CATEGORIES= sysutils MASTER_SITES= https://download.schedmd.com/slurm/ PKGNAMESUFFIX= -wlm MAINTAINER= rikka.goering@outlook.de COMMENT= Simple Linux Utility for Resource Management WWW= https://slurm.schedmd.com/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING NOT_FOR_ARCHS= armv6 armv7 i386 powerpc powerpcspe NOT_FOR_ARCHS_REASON= 32-bit support is deprecated LIB_DEPENDS= libhttp_parser.so:www/http-parser \ libjson-c.so:devel/json-c \ libjwt.so:www/libjwt \ libllhttp.so:www/llhttp \ liblz4.so:archivers/liblz4 \ libmunge.so:security/munge \ librdkafka.so:net/librdkafka \ libsysinfo.so:devel/libsysinfo \ libunwind.so:devel/libunwind \ libyaml.so:textproc/libyaml USES= compiler:c11 cpe gmake libtool localbase lua mysql:client perl5 \ pkgconfig python:build readline shebangfix ssl tar:bz2 CPE_VENDOR= schedmd USE_LDCONFIG= yes USE_PERL5= build USE_RC_SUBR= slurmctld slurmd SHEBANG_FILES= doc/html/shtml2html.py doc/man/man2html.py GNU_CONFIGURE= yes # FreeBSD Infiniband support is still experimental # slurmrestd does not build on FreeBSD CONFIGURE_ARGS= --disable-dependency-tracking \ --disable-slurmrestd \ --docdir=${DOCSDIR} \ --htmldir=${DOCSDIR} \ --sysconfdir=${ETCDIR} \ --with-mysql_config=${LOCALBASE}/bin CONFIGURE_ENV= MAKE=${GMAKE} INSTALL_TARGET= install-strip TEST_TARGET= check CFLAGS+= -I${WRKSRC}/slurm LDFLAGS+= -lsysinfo -lprocstat -fcommon TESTING_UNSAFE= yes SUB_FILES= pkg-message USERS= ${PORTNAME} GROUPS= ${PORTNAME} PLIST_SUB= GROUPS=${GROUPS} \ USERS=${USERS} PORTDOCS= * OPTIONS_DEFINE= CURL DOCS GUI HDF5 HWLOC IPMI S2N OPTIONS_DEFAULT= HDF5 HWLOC OPTIONS_SUB= yes CURL_DESC= Require cURL for elasticsearch plugins GUI_DESC= Build sview GUI config tool HDF5_DESC= Job profiling using HDF5 HWLOC_DESC= Portable hardware locality IPMI_DESC= IPMI energy consumption accounting S2N_DESC= Build tls_s2n TLS plugin CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_WITH= libcurl DOCS_BUILD_DEPENDS= man2html:textproc/man2html GUI_BUILD_DEPENDS= itstool:textproc/itstool GUI_USES= gnome GUI_USE= GNOME=cairo,gdkpixbuf,glib20,gtk20,pango GUI_CONFIGURE_ENABLE= sview HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \ libhdf5_hl.so:science/hdf5 HDF5_CONFIGURE_WITH= hdf5 HDF5_CONFIGURE_ENV= H5CC=${LOCALBASE}/bin/h5cc \ H5FC=${LOCALBASE}/bin/h5fc HDF5_LDFLAGS= -lhdf5_hl HWLOC_LIB_DEPENDS= libhwloc.so.15:devel/hwloc2 HWLOC_CONFIGURE_WITH= hwloc IPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi \ libipmimonitoring.so:sysutils/freeipmi IPMI_CONFIGURE_WITH= freeipmi S2N_LIB_DEPENDS= libs2n.so:security/s2n-tls S2N_CONFIGURE_WITH= s2n=${LOCALBASE} _ARCH= ${ARCH:S|aarch64|aarch64elf|:S|amd64|elf_amd64|:S|powerpc64le|elf64lppc|:S|powerpc64|elf64ppc|:S|riscv64|elf64lriscv|} # SLURM's configure enables interactive jobs if pty.h exists. Replacing # #include with appropriate headers will therefore not work, so instead # add a pty.h for the build. pre-configure: ${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure # Make /proc => /compat/linux/proc edits only in files that exist & contain "/proc" (cd ${WRKSRC} && \ ${GREP} -RIl '"/proc' src | ${XARGS} ${REINPLACE_CMD} \ -e 's|"/proc|"/compat/linux/proc|g' \ -e 's|(/proc)|(/compat/linux/proc)|g') @if ${WHICH} sbatch > /dev/null; then \ ${ECHO_CMD} "********************************************"; \ ${ECHO_CMD} "Build may fail while slurm-wlm is installed."; \ ${ECHO_CMD} "Deinstall slurm-wlm and run make again."; \ ${ECHO_CMD} "********************************************"; \ false; \ fi # Fix lld binary-blob rule: add -m ${_ARCH} wherever --format=binary is used ${FIND} ${WRKSRC} -name Makefile.in -print0 | \ ${XARGS} -0 ${GREP} -Il -- '--format=binary' | \ ${XARGS} ${REINPLACE_CMD} -e 's|$$(LD) -r -o|$$(LD) -r -m ${_ARCH} -o|' ${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ ${REINPLACE_CMD} -e 's|htmldir = \$${datadir.*$$|htmldir = @htmldir@|' post-install: @${MKDIR} ${STAGEDIR}/var/spool/slurmctld \ ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/etc/slurm.conf.example \ ${STAGEDIR}${ETCDIR}/slurm.conf.sample .include diff --git a/sysutils/slurm-wlm/distinfo b/sysutils/slurm-wlm/distinfo index 6c7d85b04374..11a5ff36e4cd 100644 --- a/sysutils/slurm-wlm/distinfo +++ b/sysutils/slurm-wlm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1784998023 -SHA256 (slurm-26.05.2.tar.bz2) = 01151f233dde64d95cc4ca96931aea3d4a2cad372ed9ad86a8b9f6b674600c3b -SIZE (slurm-26.05.2.tar.bz2) = 6868915 +TIMESTAMP = 1788665829 +SHA256 (slurm-26.05.4.tar.bz2) = 035f4b193d4de979ba5381beca206a50b6b886b2793b06f68a1ce7e67022b06a +SIZE (slurm-26.05.4.tar.bz2) = 6883455 diff --git a/sysutils/slurm-wlm/files/patch-configure b/sysutils/slurm-wlm/files/patch-configure index 4fad52f08440..75f2c4f988aa 100644 --- a/sysutils/slurm-wlm/files/patch-configure +++ b/sysutils/slurm-wlm/files/patch-configure @@ -1,404 +1,11 @@ ---- configure.orig 2026-06-09 20:26:02 UTC +--- configure.orig 2026-08-28 20:13:24 UTC +++ configure -@@ -786,6 +786,7 @@ HDF5_LIBS - HDF5_FFLAGS - HDF5_FC - HDF5_LIBS -+HDF5_HL_LIBS - HDF5_LDFLAGS - HDF5_CPPFLAGS - HDF5_CFLAGS -@@ -12988,7 +12989,7 @@ printf %s "checking whether the $compiler linker ($LD) - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - inherit_rpath=no -- link_all_deplibs=unknown -+ link_all_deplibs=no - module_cmds= - module_expsym_cmds= - old_archive_from_new_cmds= -@@ -13286,7 +13287,7 @@ _LT_EOF - - *-mlibc) - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - ;; - - netbsd* | netbsdelf*-gnu) -@@ -13295,7 +13296,7 @@ _LT_EOF - wlarc= - else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - fi - ;; - -@@ -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' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - else - ld_shlibs=no - fi -@@ -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' -- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - else - ld_shlibs=no - fi -@@ -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' -- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - else - ld_shlibs=no - fi -@@ -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' -- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' -+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver' - hardcode_libdir_flag_spec='$wl-rpath,$libdir' - export_dynamic_flag_spec='$wl-E' - else -@@ -14895,7 +14896,7 @@ freebsd* | dragonfly* | midnightbsd*) - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' - soname_spec='$libname$release$shared_ext$major' - need_version=no - need_lib_prefix=no -@@ -16653,7 +16654,7 @@ else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 - printf "%s\n" "no" >&6; } - else -- if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then -+ if $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then - old_striplib="$STRIP --strip-debug" - striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -@@ -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; } - ;; -- freebsd*) -+dragonfly* | freebsd*) - if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then - old_striplib="$STRIP --strip-debug" - striplib="$STRIP --strip-unneeded" -@@ -16913,7 +16914,7 @@ module_expsym_cmds_CXX= - inherit_rpath_CXX=no - module_cmds_CXX= - module_expsym_cmds_CXX= --link_all_deplibs_CXX=unknown -+link_all_deplibs_CXX=no - old_archive_cmds_CXX=$old_archive_cmds - reload_flag_CXX=$reload_flag - reload_cmds_CXX=$reload_cmds -@@ -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' -- archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - - hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' - export_dynamic_flag_spec_CXX='$wl--export-dynamic' -@@ -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' -- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - ;; - *) # Version 8.0 or newer - tmp_idyn= -@@ -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' -- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - ;; - esac - archive_cmds_need_lc_CXX=no -@@ -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' -- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' - ;; - esac - -@@ -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' -- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-version-script $wl$lib-ver' - - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' -@@ -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' -- archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script $wl$lib-ver' - 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 -@@ -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 -- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' -+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script,$lib-ver -o $lib' - export_dynamic_flag_spec_CXX='$wl-E' - whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' - fi -@@ -19545,7 +19546,7 @@ freebsd* | dragonfly* | midnightbsd*) - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' - soname_spec='$libname$release$shared_ext$major' - need_version=no - need_lib_prefix=no -@@ -24484,7 +24485,7 @@ case $host_os in - - case $host_os in - -- freebsd*) -+dragonfly* | freebsd*) - - # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) - # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -@@ -25351,6 +25352,7 @@ HDF5_LIBS="" - HDF5_CPPFLAGS="" - HDF5_LDFLAGS="" - HDF5_LIBS="" -+HDF5_HL_LIBS="" - HDF5_FC="" - HDF5_FFLAGS="" - HDF5_FLIBS="" -@@ -25740,7 +25742,59 @@ printf "%s\n" "#define H5_USE_18_API 1" >>confdefs.h - fi - - -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for H5PTopen in -lhdf5_hl" >&5 -+printf %s "checking for H5PTopen in -lhdf5_hl... " >&6; } -+if test ${ac_cv_lib_hdf5_hl_H5PTopen+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+ ac_check_lib_save_LIBS=$LIBS -+ ac_check_lib_save_LDFLAGS=$LDFLAGS -+ # Ensure the test link sees both -L/-Wl flags and libs provided by AX_LIB_HDF5() -+ LDFLAGS="$LDFLAGS $HDF5_LDFLAGS" -+ LIBS="-lhdf5_hl $HDF5_LIBS $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+/* Override any GCC internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char H5PTopen (void); -+int -+main (void) -+{ -+return H5PTopen (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO" -+then : -+ ac_cv_lib_hdf5_hl_H5PTopen=yes -+else case e in #( -+ e) ac_cv_lib_hdf5_hl_H5PTopen=no ;; -+esac -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS=$ac_check_lib_save_LIBS -+ LDFLAGS=$ac_check_lib_save_LDFLAGS -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hdf5_hl_H5PTopen" >&5 -+printf "%s\n" "$ac_cv_lib_hdf5_hl_H5PTopen" >&6; } -+if test "x$ac_cv_lib_hdf5_hl_H5PTopen" = xyes -+then : -+ HDF5_HL_LIBS="-lhdf5_hl" -+else case e in #( -+ e) HDF5_HL_LIBS="" ;; -+esac -+fi -+ -+ - # - # Handle user hints - # -@@ -27938,6 +27992,133 @@ fi - fi - - fi -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct sockaddr has member sa_len" >&5 -+printf %s "checking whether struct sockaddr has member sa_len... " >&6; } -+if test ${ac_cv_member_struct_sockaddr_sa_len+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+int main(void) { (void) ((struct sockaddr *)0)->sa_len; return 0; } -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_member_struct_sockaddr_sa_len=yes -+else case e in #( -+ e) ac_cv_member_struct_sockaddr_sa_len=no ;; -+esac -+fi -+rm -f conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_member_struct_sockaddr_sa_len" >&5 -+printf "%s\n" "$ac_cv_member_struct_sockaddr_sa_len" >&6; } -+if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes -+then : -+ printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_SA_LEN 1" >>confdefs.h -+fi -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct sockaddr_in has member sin_len" >&5 -+printf %s "checking whether struct sockaddr_in has member sin_len... " >&6; } -+if test ${ac_cv_member_struct_sockaddr_in_sin_len+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+#include -+int main(void) { (void) ((struct sockaddr_in *)0)->sin_len; return 0; } -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_member_struct_sockaddr_in_sin_len=yes -+else case e in #( -+ e) ac_cv_member_struct_sockaddr_in_sin_len=no ;; -+esac -+fi -+rm -f conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_member_struct_sockaddr_in_sin_len" >&5 -+printf "%s\n" "$ac_cv_member_struct_sockaddr_in_sin_len" >&6; } -+if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes -+then : -+ printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1" >>confdefs.h -+fi -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct sockaddr_in6 has member sin6_len" >&5 -+printf %s "checking whether struct sockaddr_in6 has member sin6_len... " >&6; } -+if test ${ac_cv_member_struct_sockaddr_in6_sin6_len+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+#include -+int main(void) { (void) ((struct sockaddr_in6 *)0)->sin6_len; return 0; } -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_member_struct_sockaddr_in6_sin6_len=yes -+else case e in #( -+ e) ac_cv_member_struct_sockaddr_in6_sin6_len=no ;; -+esac -+fi -+rm -f conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_member_struct_sockaddr_in6_sin6_len" >&5 -+printf "%s\n" "$ac_cv_member_struct_sockaddr_in6_sin6_len" >&6; } -+if test "x$ac_cv_member_struct_sockaddr_in6_sin6_len" = xyes -+then : -+ printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN 1" >>confdefs.h -+fi -+ -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct sockaddr_un has member sun_len" >&5 -+printf %s "checking whether struct sockaddr_un has member sun_len... " >&6; } -+if test ${ac_cv_member_struct_sockaddr_un_sun_len+y} -+then : -+ printf %s "(cached) " >&6 -+else case e in #( -+ e) -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+#include -+int main(void) { (void) ((struct sockaddr_un *)0)->sun_len; return 0; } -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ ac_cv_member_struct_sockaddr_un_sun_len=yes -+else case e in #( -+ e) ac_cv_member_struct_sockaddr_un_sun_len=no ;; -+esac -+fi -+rm -f conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ;; -+esac -+fi -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_member_struct_sockaddr_un_sun_len" >&5 -+printf "%s\n" "$ac_cv_member_struct_sockaddr_un_sun_len" >&6; } -+if test "x$ac_cv_member_struct_sockaddr_un_sun_len" = xyes -+then : -+ printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1" >>confdefs.h -+fi - - - # ---- configure.orig 2026-06-10 12:48:33 UTC -+++ configure -@@ -27589,8 +27589,8 @@ else case e in #( +@@ -27589,7 +27589,7 @@ 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_conmgr_con.c b/sysutils/slurm-wlm/files/patch-src_conmgr_con.c index a241f3e89a53..2474c3722bd9 100644 --- a/sysutils/slurm-wlm/files/patch-src_conmgr_con.c +++ b/sysutils/slurm-wlm/files/patch-src_conmgr_con.c @@ -1,74 +1,74 @@ ---- src/conmgr/con.c.orig 2026-06-09 20:26:02 UTC +--- src/conmgr/con.c.orig 2026-08-13 17:12:44 UTC +++ src/conmgr/con.c @@ -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" +#include "src/common/slurm_sockaddr.h" #include "src/common/slurm_time.h" #include "src/common/util-net.h" #include "src/common/xmalloc.h" -@@ -1132,6 +1133,7 @@ static int _add_unix_listener(const conmgr_timeouts_t +@@ -1134,6 +1135,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; + socklen_t bind_len = 0; if (fd < 0) fatal("%s: socket() failed: %m", __func__); @@ -1148,9 +1150,11 @@ static int _add_unix_listener(const conmgr_timeouts_t if (unlink(unixsock) && (errno != ENOENT)) error("Error unlink(%s): %m", unixsock); - /* bind() will EINVAL if socklen=sizeof(addr) */ - if ((rc = bind(fd, (const struct sockaddr *) &addr, - sizeof(struct sockaddr_un)))) + /* Ensure correct sockaddr length (and sun_len/sa_len where applicable) */ + bind_len = slurm_sockaddr_fixlen((struct sockaddr *)&addr, + (socklen_t)sizeof(addr)); + + if ((rc = bind(fd, (const struct sockaddr *)&addr, bind_len))) fatal("%s: [%s] Unable to bind UNIX socket: %m", __func__, listen_on); -@@ -1162,7 +1166,7 @@ static int _add_unix_listener(const conmgr_timeouts_t +@@ -1164,7 +1168,7 @@ static int _add_unix_listener(const conmgr_timeouts_t __func__, listen_on); 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); } -@@ -1316,16 +1320,14 @@ extern int conmgr_create_connect_socket(conmgr_con_typ +@@ -1318,16 +1322,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; + socklen_t connect_len = 0; if (addr->ss_family == AF_UNIX) { fd = socket(addr->ss_family, (SOCK_STREAM | SOCK_CLOEXEC), 0); - //bindlen = sizeof(struct sockaddr_un); } else if ((addr->ss_family == AF_INET) || (addr->ss_family == AF_INET6)) { fd = socket(addr->ss_family, (SOCK_STREAM | SOCK_CLOEXEC), IPPROTO_TCP); - //bindlen = addrlen; } else { return EAFNOSUPPORT; } -@@ -1342,9 +1344,12 @@ extern int conmgr_create_connect_socket(conmgr_con_typ +@@ -1344,9 +1346,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); + /* Ensure correct sockaddr length (and sa_len/sin_len/sin6_len where applicable) */ + connect_len = slurm_sockaddr_fixlen((struct sockaddr *)addr, addrlen); + again: - if ((rc = connect(fd, (const struct sockaddr *) addr, addrlen))) { + if ((rc = connect(fd, (const struct sockaddr *) addr, connect_len))) { rc = errno; if (rc == EINTR) { 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 deleted file mode 100644 index bc1a9e89785e..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_plugins_acct__gather__profile_hdf5_Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- 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@ - HDF5_LDFLAGS = @HDF5_LDFLAGS@ - HDF5_LIBS = @HDF5_LIBS@ -+HDF5_HL_LIBS = @HDF5_HL_LIBS@ - HDF5_TYPE = @HDF5_TYPE@ - HDF5_VERSION = @HDF5_VERSION@ - HPE_SLINGSHOT_CFLAGS = @HPE_SLINGSHOT_CFLAGS@ -@@ -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) --@BUILD_HDF5_TRUE@libhdf5_api_la_LIBADD = $(HDF5_LIBS) -+@BUILD_HDF5_TRUE@libhdf5_api_la_LIBADD = $(HDF5_LIBS) $(HDF5_HL_LIBS) - @BUILD_HDF5_TRUE@acct_gather_profile_hdf5_la_SOURCES = $(HDF5_SOURCES) - @BUILD_HDF5_TRUE@acct_gather_profile_hdf5_la_LDFLAGS = \ - @BUILD_HDF5_TRUE@ $(PLUGIN_FLAGS) $(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 deleted file mode 100644 index 31c6d6e4badc..000000000000 --- a/sysutils/slurm-wlm/files/patch-src_plugins_acct__gather__profile_hdf5_sh5util_Makefile.in +++ /dev/null @@ -1,24 +0,0 @@ ---- 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@ - HDF5_LDFLAGS = @HDF5_LDFLAGS@ - HDF5_LIBS = @HDF5_LIBS@ -+HDF5_HL_LIBS = @HDF5_HL_LIBS@ - HDF5_TYPE = @HDF5_TYPE@ - HDF5_VERSION = @HDF5_VERSION@ - HPE_SLINGSHOT_CFLAGS = @HPE_SLINGSHOT_CFLAGS@ -@@ -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) \ --@BUILD_HDF5_TRUE@ ../libhdf5_api.la -+@BUILD_HDF5_TRUE@ ../libhdf5_api.la $(HDF5_HL_LIBS) - - @BUILD_HDF5_TRUE@sh5util_DEPENDENCIES = $(LIB_SLURM_BUILD) ../libhdf5_api.la --@BUILD_HDF5_TRUE@sh5util_LDFLAGS = $(CMD_LDFLAGS) \ --@BUILD_HDF5_TRUE@ $(HDF5_LDFLAGS) $(HDF5_LIBS) -+@BUILD_HDF5_TRUE@sh5util_LDFLAGS = $(CMD_LDFLAGS) $(HDF5_LDFLAGS) - - @BUILD_HDF5_FALSE@EXTRA_sh5util_SOURCES = $(SHDF5_SOURCES) - all: all-am diff --git a/sysutils/slurm-wlm/files/patch-testsuite_slurm__unit_common_slurm__protocol__pack_pack__priority__factors-test.c b/sysutils/slurm-wlm/files/patch-testsuite_slurm__unit_common_slurm__protocol__pack_pack__priority__factors-test.c new file mode 100644 index 000000000000..8a1e0fa15789 --- /dev/null +++ b/sysutils/slurm-wlm/files/patch-testsuite_slurm__unit_common_slurm__protocol__pack_pack__priority__factors-test.c @@ -0,0 +1,8 @@ +--- testsuite/slurm_unit/common/slurm_protocol_pack/pack_priority_factors-test.c.orig 2026-08-28 20:13:59 UTC ++++ testsuite/slurm_unit/common/slurm_protocol_pack/pack_priority_factors-test.c +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include +