CVS commit: pkgsrc/parallel/slurm-wlm

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/parallel/slurm-wlm
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 12 Mar 2025 18:54:24 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Mar 12 18:54:24 UTC 2025

Modified Files:
        pkgsrc/parallel/slurm-wlm: Makefile PLIST distinfo
        pkgsrc/parallel/slurm-wlm/patches:
            patch-src_slurmd_common_task__plugin.h
            patch-src_slurmd_slurmd_slurmd.c patch-src_slurmd_slurmstepd_task.c
Added Files:
        pkgsrc/parallel/slurm-wlm/patches: patch-src_common_gres.c
            patch-src_plugins_job__container_Makefile.in
            patch-src_plugins_task_Makefile.in

Log Message:
slurm-wlm: updated to 20.11.9

Changes in Slurm 20.11.9

- burst_buffer - add missing common directory to the Makefile SUBDIRS.
- sacct - fix truncation when printing jobidraw field.
- GRES - Fix loading state of jobs using --gpus to request gpus.
- Fix minor logic error in health check node state output
- Fix GCC 11.1 compiler warnings.
- Delay steps when memory already used instead of rejecting step request.
- Fix memory leak in the slurmdbd when requesting wckeys from all clusters.
- Fix determining if a reservation is used or not.
- openapi/v0.0.35 - Honor kill_on_invalid_dependency as job parameter.
- openapi/v0.0.36 - Honor kill_on_invalid_dependency as job parameter.
- Fix various issues dealing with updates on magnetic reservations that could
  lead to abort slurmctld.
- openapi/v0.0.36 - Avoid setting default values of min_cpus, job name, cwd,
  mail_type, and contiguous on job update.
- openapi/v0.0.36 - Clear user hold on job update if hold=false.
- Fix slurmctld segfault due to a bit_test() call with a MAINT+ANY_NODES
  reservation NULL node_bitmap.
- Fix slurmctld segfault due to a bit_copy() call with a REPLACE+ANY_NODES
  reservation NULL node_bitmap.
- Fix error in GPU frequency validation logic.
- Fix error in pmix logic dealing with the incorrect size of buffer.
- PMIx v1.1.4 and below are no longer supported.
- Fix shutdown of slurmdbd plugin to correctly notice when the agent thread
  finishes.
- Fix slurmctld segfault due to job array --batch features double free.
- CVE-2022-29500 - Prevent credential abuse.
- CVE-2022-29501 - Prevent abuse of REQUEST_FORWARD_DATA.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/parallel/slurm-wlm/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/parallel/slurm-wlm/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/parallel/slurm-wlm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/parallel/slurm-wlm/patches/patch-src_common_gres.c \
    pkgsrc/parallel/slurm-wlm/patches/patch-src_plugins_job__container_Makefile.in \
    pkgsrc/parallel/slurm-wlm/patches/patch-src_plugins_task_Makefile.in
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_common_task__plugin.h
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_slurmd_slurmd.c \
    pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c

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

Modified files:

Index: pkgsrc/parallel/slurm-wlm/Makefile
diff -u pkgsrc/parallel/slurm-wlm/Makefile:1.44 pkgsrc/parallel/slurm-wlm/Makefile:1.45
--- pkgsrc/parallel/slurm-wlm/Makefile:1.44     Thu Nov 14 22:21:21 2024
+++ pkgsrc/parallel/slurm-wlm/Makefile  Wed Mar 12 18:54:23 2025
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2024/11/14 22:21:21 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2025/03/12 18:54:23 adam Exp $
 
-DISTNAME=      slurm-19.05.5
+DISTNAME=      slurm-20.11.9
 PKGNAME=       ${DISTNAME:S/-/-wlm-/}
-PKGREVISION=   26
 CATEGORIES=    parallel
-MASTER_SITES=  http://download.schedmd.com/slurm/
+MASTER_SITES=  https://download.schedmd.com/slurm/
 MASTER_SITES+= http://www.schedmd.com/download/latest/
 EXTRACT_SUFX=  .tar.bz2
 
@@ -16,20 +15,19 @@ LICENSE=    gnu-gpl-v2
 
 TOOL_DEPENDS+= man2html-[0-9]*:../../textproc/man2html
 
-GNU_CONFIGURE= yes
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
-USE_TOOLS+=    bash perl pkg-config
+USE_TOOLS+=    bash gmake perl pkg-config
+GNU_CONFIGURE= yes
 
 CONFIG_SHELL=          bash
 CONFIGURE_ARGS+=       --bindir=${PREFIX}/bin
+CONFIGURE_ARGS+=       --disable-debug
 CONFIGURE_ARGS+=       --htmldir=${PREFIX}/share/doc/${PKGNAME_NOREV}/html
-CONFIGURE_ARGS+=       --with-munge=${BUILDLINK_PREFIX.munge}
 CONFIGURE_ARGS+=       --with-hwloc=${PREFIX}
 CONFIGURE_ARGS+=       --with-json=${PREFIX}
 CONFIGURE_ARGS+=       --with-libssh2=${PREFIX}
-# Future: Enable task affinity code is fully patched for NetBSD
-# CONFIGURE_ARGS.NetBSD+=      ac_cv_func_sched_setaffinity=yes
+CONFIGURE_ARGS+=       --with-munge=${BUILDLINK_PREFIX.munge}
 
 REPLACE_PYTHON=                doc/html/shtml2html.py
 REPLACE_PYTHON+=       doc/man/man2html.py
@@ -78,19 +76,19 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/etc/* ${DESTDIR}${PREFIX}/share/examples/slurm
        ${RM} -f ${DESTDIR}${PREFIX}/share/examples/slurm/init.d.slurm.in.orig
 
-.include "../../www/curl/buildlink3.mk"
+.include "../../archivers/lz4/buildlink3.mk"
+.include "../../devel/hdf5/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
 .include "../../lang/python/tool.mk"
-.include "../../security/munge/buildlink3.mk" # optional
 .include "../../parallel/hwloc/buildlink3.mk"
+.include "../../security/libssh2/buildlink3.mk"
+.include "../../security/munge/buildlink3.mk" # optional
 .include "../../security/openssl/buildlink3.mk"
-.include "../../devel/hdf5/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../archivers/lz4/buildlink3.mk"
 .include "../../textproc/json-c/buildlink3.mk"
-.include "../../security/libssh2/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
-.include "../../mk/mysql.buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/parallel/slurm-wlm/PLIST
diff -u pkgsrc/parallel/slurm-wlm/PLIST:1.2 pkgsrc/parallel/slurm-wlm/PLIST:1.3
--- pkgsrc/parallel/slurm-wlm/PLIST:1.2 Sat Feb  1 00:15:01 2020
+++ pkgsrc/parallel/slurm-wlm/PLIST     Wed Mar 12 18:54:23 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/02/01 00:15:01 bacon Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/03/12 18:54:23 adam Exp $
 bin/sacct
 bin/sacctmgr
 bin/salloc
@@ -7,10 +7,10 @@ bin/sbatch
 bin/sbcast
 bin/scancel
 bin/scontrol
+bin/scrontab
 bin/sdiag
 bin/sh5util
 bin/sinfo
-bin/smap
 bin/sprio
 bin/squeue
 bin/sreport
@@ -25,13 +25,12 @@ include/slurm/slurmdb.h
 include/slurm/smd_ns.h
 include/slurm/spank.h
 lib/libslurm.la
-lib/slurm/accounting_storage_filetxt.la
 lib/slurm/accounting_storage_mysql.la
 lib/slurm/accounting_storage_none.la
 lib/slurm/accounting_storage_slurmdbd.la
-lib/slurm/acct_gather_energy_cray_aries.la
 lib/slurm/acct_gather_energy_ibmaem.la
 lib/slurm/acct_gather_energy_none.la
+lib/slurm/acct_gather_energy_pm_counters.la
 lib/slurm/acct_gather_energy_rapl.la
 lib/slurm/acct_gather_filesystem_lustre.la
 lib/slurm/acct_gather_filesystem_none.la
@@ -43,9 +42,10 @@ lib/slurm/auth_munge.la
 lib/slurm/auth_none.la
 lib/slurm/burst_buffer_datawarp.la
 lib/slurm/burst_buffer_generic.la
-lib/slurm/checkpoint_none.la
-lib/slurm/checkpoint_ompi.la
+lib/slurm/cli_filter_lua.la
 lib/slurm/cli_filter_none.la
+lib/slurm/cli_filter_syslog.la
+lib/slurm/cli_filter_user_defaults.la
 lib/slurm/core_spec_cray_aries.la
 lib/slurm/core_spec_none.la
 lib/slurm/cred_munge.la
@@ -71,20 +71,19 @@ lib/slurm/jobacct_gather_linux.la
 lib/slurm/jobacct_gather_none.la
 lib/slurm/jobcomp_elasticsearch.la
 lib/slurm/jobcomp_filetxt.la
+lib/slurm/jobcomp_lua.la
 lib/slurm/jobcomp_mysql.la
 lib/slurm/jobcomp_none.la
 lib/slurm/jobcomp_script.la
 lib/slurm/launch_slurm.la
-lib/slurm/layouts_power_cpufreq.la
-lib/slurm/layouts_power_default.la
-lib/slurm/layouts_unit_default.la
+lib/slurm/libslurm_pmi.la
 lib/slurm/libslurmfull.la
 lib/slurm/mcs_account.la
 lib/slurm/mcs_group.la
 lib/slurm/mcs_none.la
 lib/slurm/mcs_user.la
+lib/slurm/mpi_cray_shasta.la
 lib/slurm/mpi_none.la
-lib/slurm/mpi_openmpi.la
 lib/slurm/mpi_pmi2.la
 lib/slurm/node_features_knl_cray.la
 lib/slurm/node_features_knl_generic.la
@@ -93,6 +92,7 @@ lib/slurm/power_none.la
 lib/slurm/preempt_none.la
 lib/slurm/preempt_partition_prio.la
 lib/slurm/preempt_qos.la
+lib/slurm/prep_script.la
 lib/slurm/priority_basic.la
 lib/slurm/priority_multifactor.la
 lib/slurm/proctrack_linuxproc.la
@@ -111,13 +111,11 @@ lib/slurm/slurmctld_nonstop.la
 lib/slurm/spank_pbs.la
 lib/slurm/src/sattach/sattach.wrapper.c
 lib/slurm/src/srun/srun.wrapper.c
-lib/slurm/switch_generic.la
 lib/slurm/switch_none.la
 lib/slurm/task_cray_aries.la
 lib/slurm/task_none.la
 lib/slurm/topology_3d_torus.la
 lib/slurm/topology_hypercube.la
-lib/slurm/topology_node_rank.la
 lib/slurm/topology_none.la
 lib/slurm/topology_tree.la
 man/man1/sacct.1
@@ -128,11 +126,11 @@ man/man1/sbatch.1
 man/man1/sbcast.1
 man/man1/scancel.1
 man/man1/scontrol.1
+man/man1/scrontab.1
 man/man1/sdiag.1
 man/man1/sh5util.1
 man/man1/sinfo.1
 man/man1/slurm.1
-man/man1/smap.1
 man/man1/sprio.1
 man/man1/squeue.1
 man/man1/sreport.1
@@ -140,25 +138,13 @@ man/man1/srun.1
 man/man1/sshare.1
 man/man1/sstat.1
 man/man1/strigger.1
-man/man3/slurm_allocate_pack_job_blocking.3
+man/man3/slurm_allocate_het_job_blocking.3
 man/man3/slurm_allocate_resources.3
 man/man3/slurm_allocate_resources_blocking.3
 man/man3/slurm_allocation_lookup.3
 man/man3/slurm_allocation_msg_thr_create.3
 man/man3/slurm_allocation_msg_thr_destroy.3
 man/man3/slurm_api_version.3
-man/man3/slurm_checkpoint.3
-man/man3/slurm_checkpoint_able.3
-man/man3/slurm_checkpoint_complete.3
-man/man3/slurm_checkpoint_create.3
-man/man3/slurm_checkpoint_disable.3
-man/man3/slurm_checkpoint_enable.3
-man/man3/slurm_checkpoint_error.3
-man/man3/slurm_checkpoint_failed.3
-man/man3/slurm_checkpoint_restart.3
-man/man3/slurm_checkpoint_task_complete.3
-man/man3/slurm_checkpoint_tasks.3
-man/man3/slurm_checkpoint_vacate.3
 man/man3/slurm_clear_trigger.3
 man/man3/slurm_complete_job.3
 man/man3/slurm_confirm_allocation.3
@@ -187,6 +173,8 @@ man/man3/slurm_get_errno.3
 man/man3/slurm_get_job_steps.3
 man/man3/slurm_get_rem_time.3
 man/man3/slurm_get_triggers.3
+man/man3/slurm_het_job_lookup.3
+man/man3/slurm_het_job_will_run.3
 man/man3/slurm_hostlist_create.3
 man/man3/slurm_hostlist_destroy.3
 man/man3/slurm_hostlist_shift.3
@@ -219,8 +207,6 @@ man/man3/slurm_load_partitions.3
 man/man3/slurm_load_reservations.3
 man/man3/slurm_load_slurmd_status.3
 man/man3/slurm_notify_job.3
-man/man3/slurm_pack_job_lookup.3
-man/man3/slurm_pack_job_will_run.3
 man/man3/slurm_perror.3
 man/man3/slurm_pid2jobid.3
 man/man3/slurm_ping.3
@@ -284,9 +270,9 @@ man/man3/slurm_update_step.3
 man/man5/acct_gather.conf.5
 man/man5/burst_buffer.conf.5
 man/man5/cgroup.conf.5
-man/man5/cray.conf.5
 man/man5/ext_sensors.conf.5
 man/man5/gres.conf.5
+man/man5/job_container.conf.5
 man/man5/knl.conf.5
 man/man5/nonstop.conf.5
 man/man5/slurm.conf.5
@@ -295,6 +281,7 @@ man/man5/topology.conf.5
 man/man8/slurmctld.8
 man/man8/slurmd.8
 man/man8/slurmdbd.8
+man/man8/slurmrestd.8
 man/man8/slurmstepd.8
 man/man8/spank.8
 sbin/slurmctld
@@ -319,10 +306,10 @@ share/doc/slurm-${PKGVERSION}/html/burst
 share/doc/slurm-${PKGVERSION}/html/burst_buffer.html
 share/doc/slurm-${PKGVERSION}/html/cgroup.conf.html
 share/doc/slurm-${PKGVERSION}/html/cgroups.html
-share/doc/slurm-${PKGVERSION}/html/checkpoint_plugins.html
 share/doc/slurm-${PKGVERSION}/html/classic_fair_share.html
 share/doc/slurm-${PKGVERSION}/html/cli_filter_plugins.html
 share/doc/slurm-${PKGVERSION}/html/coding_style.pdf
+share/doc/slurm-${PKGVERSION}/html/configless_slurm.html
 share/doc/slurm-${PKGVERSION}/html/configurator.easy.html
 share/doc/slurm-${PKGVERSION}/html/configurator.html
 share/doc/slurm-${PKGVERSION}/html/cons_res.html
@@ -332,7 +319,6 @@ share/doc/slurm-${PKGVERSION}/html/contr
 share/doc/slurm-${PKGVERSION}/html/core_spec.html
 share/doc/slurm-${PKGVERSION}/html/core_spec_plugins.html
 share/doc/slurm-${PKGVERSION}/html/cpu_management.html
-share/doc/slurm-${PKGVERSION}/html/cray.conf.html
 share/doc/slurm-${PKGVERSION}/html/cray.html
 share/doc/slurm-${PKGVERSION}/html/cred_plugins.html
 share/doc/slurm-${PKGVERSION}/html/disclaimer.html
@@ -364,6 +350,7 @@ share/doc/slurm-${PKGVERSION}/html/ibm_p
 share/doc/slurm-${PKGVERSION}/html/ibm_pe_fig2.png
 share/doc/slurm-${PKGVERSION}/html/intel_knl.html
 share/doc/slurm-${PKGVERSION}/html/job_array.html
+share/doc/slurm-${PKGVERSION}/html/job_container.conf.html
 share/doc/slurm-${PKGVERSION}/html/job_container_plugins.html
 share/doc/slurm-${PKGVERSION}/html/job_exit_code.html
 share/doc/slurm-${PKGVERSION}/html/job_launch.html
@@ -371,6 +358,7 @@ share/doc/slurm-${PKGVERSION}/html/job_s
 share/doc/slurm-${PKGVERSION}/html/jobacct_gatherplugins.html
 share/doc/slurm-${PKGVERSION}/html/jobcompplugins.html
 share/doc/slurm-${PKGVERSION}/html/jquery.min.js
+share/doc/slurm-${PKGVERSION}/html/jwt.html
 share/doc/slurm-${PKGVERSION}/html/k_function.gif
 share/doc/slurm-${PKGVERSION}/html/knl.conf.html
 share/doc/slurm-${PKGVERSION}/html/launch_plugins.html
@@ -385,10 +373,17 @@ share/doc/slurm-${PKGVERSION}/html/meeti
 share/doc/slurm-${PKGVERSION}/html/mpi_guide.html
 share/doc/slurm-${PKGVERSION}/html/mpiplugins.html
 share/doc/slurm-${PKGVERSION}/html/multi_cluster.html
+share/doc/slurm-${PKGVERSION}/html/network.html
+share/doc/slurm-${PKGVERSION}/html/network_failover.gif
+share/doc/slurm-${PKGVERSION}/html/network_federation.gif
+share/doc/slurm-${PKGVERSION}/html/network_multi_cluster.gif
+share/doc/slurm-${PKGVERSION}/html/network_srun.gif
+share/doc/slurm-${PKGVERSION}/html/network_standard.gif
 share/doc/slurm-${PKGVERSION}/html/news.html
 share/doc/slurm-${PKGVERSION}/html/node_features_plugins.html
 share/doc/slurm-${PKGVERSION}/html/nonstop.conf.html
 share/doc/slurm-${PKGVERSION}/html/nss_slurm.html
+share/doc/slurm-${PKGVERSION}/html/openapi.css
 share/doc/slurm-${PKGVERSION}/html/overview.html
 share/doc/slurm-${PKGVERSION}/html/pam_slurm_adopt.html
 share/doc/slurm-${PKGVERSION}/html/plane_ex1.gif
@@ -405,6 +400,7 @@ share/doc/slurm-${PKGVERSION}/html/power
 share/doc/slurm-${PKGVERSION}/html/power_save.html
 share/doc/slurm-${PKGVERSION}/html/preempt.html
 share/doc/slurm-${PKGVERSION}/html/preemption_plugins.html
+share/doc/slurm-${PKGVERSION}/html/prep_plugins.html
 share/doc/slurm-${PKGVERSION}/html/priority_multifactor.html
 share/doc/slurm-${PKGVERSION}/html/priority_multifactor3.html
 share/doc/slurm-${PKGVERSION}/html/priority_plugins.html
@@ -419,9 +415,10 @@ share/doc/slurm-${PKGVERSION}/html/reser
 share/doc/slurm-${PKGVERSION}/html/reset.css
 share/doc/slurm-${PKGVERSION}/html/resource_binding.html
 share/doc/slurm-${PKGVERSION}/html/resource_limits.html
+share/doc/slurm-${PKGVERSION}/html/rest.html
+share/doc/slurm-${PKGVERSION}/html/rest_api.html
 share/doc/slurm-${PKGVERSION}/html/rosetta.html
 share/doc/slurm-${PKGVERSION}/html/route_plugin.html
-share/doc/slurm-${PKGVERSION}/html/rpc.html
 share/doc/slurm-${PKGVERSION}/html/sacct.html
 share/doc/slurm-${PKGVERSION}/html/sacctmgr.html
 share/doc/slurm-${PKGVERSION}/html/salloc.html
@@ -433,6 +430,7 @@ share/doc/slurm-${PKGVERSION}/html/sched
 share/doc/slurm-${PKGVERSION}/html/schedmd.png
 share/doc/slurm-${PKGVERSION}/html/schedplugins.html
 share/doc/slurm-${PKGVERSION}/html/scontrol.html
+share/doc/slurm-${PKGVERSION}/html/scrontab.html
 share/doc/slurm-${PKGVERSION}/html/sdiag.html
 share/doc/slurm-${PKGVERSION}/html/select_design.html
 share/doc/slurm-${PKGVERSION}/html/selectplugins.html
@@ -449,8 +447,8 @@ share/doc/slurm-${PKGVERSION}/html/slurm
 share/doc/slurm-${PKGVERSION}/html/slurmd.html
 share/doc/slurm-${PKGVERSION}/html/slurmdbd.conf.html
 share/doc/slurm-${PKGVERSION}/html/slurmdbd.html
+share/doc/slurm-${PKGVERSION}/html/slurmrestd.html
 share/doc/slurm-${PKGVERSION}/html/slurmstepd.html
-share/doc/slurm-${PKGVERSION}/html/smap.html
 share/doc/slurm-${PKGVERSION}/html/spank.html
 share/doc/slurm-${PKGVERSION}/html/sprio.html
 share/doc/slurm-${PKGVERSION}/html/squeue.html
@@ -481,13 +479,12 @@ share/examples/slurm/Makefile
 share/examples/slurm/Makefile.am
 share/examples/slurm/Makefile.in
 share/examples/slurm/cgroup.conf.example
+share/examples/slurm/cli_filter.lua.example
 share/examples/slurm/init.d.slurm
 share/examples/slurm/init.d.slurm.in
 share/examples/slurm/init.d.slurmdbd
 share/examples/slurm/init.d.slurmdbd.in
-share/examples/slurm/layouts.d.power.conf.example
-share/examples/slurm/layouts.d.power_cpufreq.conf.example
-share/examples/slurm/layouts.d.unit.conf.example
+share/examples/slurm/job_submit.lua.example
 share/examples/slurm/prolog.example
 share/examples/slurm/slurm.conf.example
 share/examples/slurm/slurmctld.service
@@ -497,3 +494,5 @@ share/examples/slurm/slurmd.service.in
 share/examples/slurm/slurmdbd.conf.example
 share/examples/slurm/slurmdbd.service
 share/examples/slurm/slurmdbd.service.in
+share/examples/slurm/slurmrestd.service
+share/examples/slurm/slurmrestd.service.in

Index: pkgsrc/parallel/slurm-wlm/distinfo
diff -u pkgsrc/parallel/slurm-wlm/distinfo:1.4 pkgsrc/parallel/slurm-wlm/distinfo:1.5
--- pkgsrc/parallel/slurm-wlm/distinfo:1.4      Tue Oct 26 11:10:38 2021
+++ pkgsrc/parallel/slurm-wlm/distinfo  Wed Mar 12 18:54:23 2025
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:10:38 nia Exp $
+$NetBSD: distinfo,v 1.5 2025/03/12 18:54:23 adam Exp $
 
-BLAKE2s (slurm-19.05.5.tar.bz2) = 60115fc8d7cb4b60a7ea83a933ca47671cc5c989ca112aa77ba797e0ed82ed74
-SHA512 (slurm-19.05.5.tar.bz2) = 4a0055a268b3765dbb2fa7510b27d694516e77716d857acea4509702e88b4739c9fff7590b80e33b7a62a5ebd38a748fd4ddf625f7c431b2beccb002d05df6c1
-Size (slurm-19.05.5.tar.bz2) = 6232295 bytes
+BLAKE2s (slurm-20.11.9.tar.bz2) = 724b8a5aa9e7437e5d56e3e87e918ddd70bce418ce83c4e283d77a29eea1e6a2
+SHA512 (slurm-20.11.9.tar.bz2) = 5f54f61eebcf8acad073d6d46b019db00c431f35a5f945bbb35ee593fa90348af06383370c17fc3b9cf4c1bf838502abe9910fca05f508100e14703af7f36e21
+Size (slurm-20.11.9.tar.bz2) = 6629247 bytes
 SHA1 (patch-etc_init.d.slurm.in) = beaedd5385b4aad04583d2bc5a23557519f74ec5
-SHA1 (patch-src_plugins_task_affinity_affinity.h) = a8fbc6182f1d7160addadadfcb174afa30c8ba80
-SHA1 (patch-src_slurmd_common_task__plugin.c) = 6049977521da86db4a437f1e76e26b3731eeef55
-SHA1 (patch-src_slurmd_common_task__plugin.h) = d4ad9f350efe1e873809adfe9dc4f559634e9ba2
-SHA1 (patch-src_slurmd_slurmd_slurmd.c) = 93f2da51d2a766a5817cc51e7de40e4ab2306649
+SHA1 (patch-src_common_gres.c) = 5eb64fa3567efe42e763801002fa4a4d185f4fa3
+SHA1 (patch-src_plugins_job__container_Makefile.in) = bc356f74093cee425937524cafd38626602e787f
+SHA1 (patch-src_plugins_task_Makefile.in) = 5d16e430bfc8b1a06347299aa2166e0a3d45a255
+SHA1 (patch-src_slurmd_common_task__plugin.h) = 4a651116b7941fb1287636a5878b49a78ca1c433
+SHA1 (patch-src_slurmd_slurmd_slurmd.c) = 512d7871b343327798922d6a23af24ccdfec5c77
 SHA1 (patch-src_slurmd_slurmd_slurmd.h) = a610b0bbe5b6b04be70eb2f8eac2a231139e6d1a
 SHA1 (patch-src_slurmd_slurmstepd_io.c) = b56782887621edb539be70d53dff8029a89e90ed
 SHA1 (patch-src_slurmd_slurmstepd_task.c) = 756dd8eb7201d003a6a7f01aa84b699f9a3ce11b

Index: pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_common_task__plugin.h
diff -u pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_common_task__plugin.h:1.1 pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_common_task__plugin.h:1.2
--- pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_common_task__plugin.h:1.1        Sun Apr 22 21:31:09 2018
+++ pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_common_task__plugin.h    Wed Mar 12 18:54:24 2025
@@ -1,15 +1,16 @@
-$NetBSD: patch-src_slurmd_common_task__plugin.h,v 1.1 2018/04/22 21:31:09 bacon Exp $
+$NetBSD: patch-src_slurmd_common_task__plugin.h,v 1.2 2025/03/12 18:54:24 adam Exp $
 
 # cpuset functions not standardized across platforms
 
---- src/slurmd/common/task_plugin.h.orig       2018-01-04 21:15:01.000000000 +0000
+--- src/slurmd/common/task_plugin.h.orig       2022-05-04 19:32:38.000000000 +0000
 +++ src/slurmd/common/task_plugin.h
-@@ -42,6 +42,16 @@
+@@ -48,6 +48,17 @@ typedef cpuset_t cpu_set_t;
  
  #include "src/slurmd/slurmstepd/slurmstepd_job.h"
  
 +// Keep in sync with slurmd/slurmd.h
 +#ifdef __NetBSD__    
++#define CPU_SETSIZE   MAXCPUS
 +#define       cpu_set_t       cpuset_t
 +#define CPU_ZERO(c)   cpuset_zero((c))   
 +#define CPU_SET(i,c)  cpuset_set((i),(c))

Index: pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_slurmd_slurmd.c
diff -u pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_slurmd_slurmd.c:1.2 pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_slurmd_slurmd.c:1.3
--- pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_slurmd_slurmd.c:1.2      Sat Feb  1 00:15:02 2020
+++ pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_slurmd_slurmd.c  Wed Mar 12 18:54:24 2025
@@ -1,30 +1,16 @@
-$NetBSD: patch-src_slurmd_slurmd_slurmd.c,v 1.2 2020/02/01 00:15:02 bacon Exp $
+$NetBSD: patch-src_slurmd_slurmd_slurmd.c,v 1.3 2025/03/12 18:54:24 adam Exp $
 
-# NetBSD syntax
+NetBSD is also not supported.
 
---- src/slurmd/slurmd/slurmd.c.orig    2020-01-19 02:36:16.111141994 +0000
+--- src/slurmd/slurmd/slurmd.c.orig    2025-03-12 16:19:09.514607833 +0000
 +++ src/slurmd/slurmd/slurmd.c
-@@ -2295,7 +2295,13 @@ static int _core_spec_init(void)
-       uint32_t task_params;
-       bool slurmd_off_spec;
-       bitstr_t *res_mac_bitmap;
--      cpu_set_t mask;
-+#ifdef __NetBSD__
-+      cpuset_t *mask = cpuset_create();
-+#define       CPU_SET_SIZE    cpuset_size(mask)
-+#else
-+      cpu_set_t mask;
-+#define       CPU_SET_SIZE    sizeof(cpu_set_t)
-+#endif
- 
-       if ((conf->core_spec_cnt == 0) && (conf->cpu_spec_list == NULL)) {
-               debug("Resource spec: No specialized cores configured by "
-@@ -2393,7 +2399,7 @@ static int _core_spec_init(void)
-               rval = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID,
-                                         pid, sizeof(cpu_set_t), &mask);
+@@ -2310,6 +2310,9 @@ static int _core_spec_init(void)
+ #if defined(__APPLE__)
+       error("%s: not supported on macOS", __func__);
+       return SLURM_SUCCESS;
++#elif defined(__NetBSD__)
++      error("%s: not supported on NetBSD", __func__);
++      return SLURM_SUCCESS;
  #else
--              rval = sched_setaffinity(pid, sizeof(cpu_set_t), &mask);
-+              rval = sched_setaffinity(pid, CPU_SET_SIZE, &mask);
- #endif
- 
-               if (rval != 0) {
+       int i, rval;
+       pid_t pid;
Index: pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c
diff -u pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c:1.2 pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c:1.3
--- pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c:1.2    Sat Feb  1 00:15:02 2020
+++ pkgsrc/parallel/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c        Wed Mar 12 18:54:24 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.2 2020/02/01 00:15:02 bacon Exp $
+$NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.3 2025/03/12 18:54:24 adam Exp $
 
 # Linux compat
 

Added files:

Index: pkgsrc/parallel/slurm-wlm/patches/patch-src_common_gres.c
diff -u /dev/null pkgsrc/parallel/slurm-wlm/patches/patch-src_common_gres.c:1.1
--- /dev/null   Wed Mar 12 18:54:24 2025
+++ pkgsrc/parallel/slurm-wlm/patches/patch-src_common_gres.c   Wed Mar 12 18:54:23 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_common_gres.c,v 1.1 2025/03/12 18:54:23 adam Exp $
+
+qsort_r() is not implemented on NetBSD.
+
+--- src/common/gres.c.orig     2022-05-04 19:32:38.000000000 +0000
++++ src/common/gres.c
+@@ -8299,8 +8299,10 @@ extern void gres_plugin_job_core_filter3
+               sufficient_gres = false;
+               for (s = 0; s < sockets; s++)
+                       socket_index[s] = s;
++#if !defined(__NetBSD__)
+               qsort_r(socket_index, sockets, sizeof(int),
+                       _sort_sockets_by_avail_cores, avail_cores_per_sock);
++#endif
+ 
+               for (j = 0; j < sockets; j++) {
+                       /*
Index: pkgsrc/parallel/slurm-wlm/patches/patch-src_plugins_job__container_Makefile.in
diff -u /dev/null pkgsrc/parallel/slurm-wlm/patches/patch-src_plugins_job__container_Makefile.in:1.1
--- /dev/null   Wed Mar 12 18:54:24 2025
+++ pkgsrc/parallel/slurm-wlm/patches/patch-src_plugins_job__container_Makefile.in      Wed Mar 12 18:54:23 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_plugins_job__container_Makefile.in,v 1.1 2025/03/12 18:54:23 adam Exp $
+
+tmpfs is not portable; disable it for the time being.
+
+--- src/plugins/job_container/Makefile.in.orig 2025-03-11 07:26:20.933426624 +0000
++++ src/plugins/job_container/Makefile.in
+@@ -455,7 +455,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = cncu none tmpfs
++SUBDIRS = cncu none #tmpfs
+ all: all-recursive
+ 
+ .SUFFIXES:
Index: pkgsrc/parallel/slurm-wlm/patches/patch-src_plugins_task_Makefile.in
diff -u /dev/null pkgsrc/parallel/slurm-wlm/patches/patch-src_plugins_task_Makefile.in:1.1
--- /dev/null   Wed Mar 12 18:54:24 2025
+++ pkgsrc/parallel/slurm-wlm/patches/patch-src_plugins_task_Makefile.in        Wed Mar 12 18:54:23 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_plugins_task_Makefile.in,v 1.1 2025/03/12 18:54:23 adam Exp $
+
+affinity is not portable.
+
+--- src/plugins/task/Makefile.in.orig  2025-03-12 16:04:58.510187749 +0000
++++ src/plugins/task/Makefile.in
+@@ -456,7 +456,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = affinity cray_aries none $(am__append_1)
++SUBDIRS = cray_aries none $(am__append_1)
+ all: all-recursive
+ 
+ .SUFFIXES:

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/parallel/slurm-wlm/patches
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/parallel/slurm-wlm/patches
Indexes:

Home | Main Index | Thread Index | Old Index