parallel/slurm-wlm: Upgrade to 19.05.5

CVE-2019-6438 resolved upstream
Numerous enhancements and bug fixes
Remove some old patches and hacks

9 files changed, 94 insertions, 98 deletions

diff --git a/parallel/slurm-wlm/Makefile b/parallel/slurm-wlm/Makefile
index 7b2fb997a94..1d2d7d8159e 100644
--- a/parallel/slurm-wlm/Makefile
+++ b/parallel/slurm-wlm/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2020/01/26 17:31:59 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2020/02/01 00:15:01 bacon Exp $
 
-DISTNAME=	slurm-17.11.5
-PKGNAME=	slurm-wlm-17.11.5
-PKGREVISION=	11
+DISTNAME=	slurm-19.05.5
+PKGNAME=	${DISTNAME:S/-/-wlm-/}
 CATEGORIES=	parallel
-MASTER_SITES=	http://www.schedmd.com/download/archive/
+MASTER_SITES=	http://download.schedmd.com/slurm/
 MASTER_SITES+=	http://www.schedmd.com/download/latest/
-MASTER_SITES+=	http://www.schedmd.com/download/development/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	bacon@NetBSD.org
@@ -15,9 +13,6 @@ COMMENT=	Simple Linux Utility for Resource Management
 
 LICENSE=	gnu-gpl-v2
 
-SUPERSEDES+=	slurm-2.6.4*
-
-BUILD_DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
 BUILD_DEPENDS+=	man2html-[0-9]*:../../textproc/man2html
 
 GNU_CONFIGURE=	yes
@@ -32,8 +27,8 @@ CONFIGURE_ARGS+=	--with-munge=${BUILDLINK_PREFIX.munge}
 CONFIGURE_ARGS+=	--with-hwloc=${PREFIX}
 CONFIGURE_ARGS+=	--with-json=${PREFIX}
 CONFIGURE_ARGS+=	--with-libssh2=${PREFIX}
-
-LDFLAGS+=		-llz4
+# Future: Enable task affinity code is fully patched for NetBSD
+# CONFIGURE_ARGS.NetBSD+=	ac_cv_func_sched_setaffinity=yes
 
 REPLACE_PYTHON=		doc/html/shtml2html.py
 REPLACE_PYTHON+=	doc/man/man2html.py
@@ -59,12 +54,18 @@ SUBST_SED.linuxinit+=	-e 's|@sbindir@|$${exec_prefix}/sbin|'
 SUBST_SED.linuxinit+=	-e 's|@libdir@|$${exec_prefix}/lib|'
 SUBST_SED.linuxinit+=	-e 's|@sysconfdir@|$${prefix}/etc|'
 
-# Configure flag to disable gtk does not work, so set an impossible requirement
+# Config flag for disabling gtk does not work, so set an impossible requirement
 SUBST_CLASSES+=		gtk
 SUBST_STAGE.gtk=	pre-configure
 SUBST_SED.gtk=		-e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|'
 SUBST_FILES.gtk=	configure
 
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	pre-configure
+SUBST_SED.prefix=	-e 's|/usr/local|${PREFIX}|g'
+SUBST_SED.prefix+=	-e 's|/opt/local /sw||g'
+SUBST_FILES.prefix=	configure
+
 SUBST_CLASSES+=		make-ex
 SUBST_STAGE.make-ex=	post-install
 SUBST_FILES.make-ex=	etc/Makefile
@@ -73,8 +74,8 @@ SUBST_SED.make-ex=	-e 's|${WRKDIR}|<build-prefix>|g'
 INSTALLATION_DIRS+=	share/examples/slurm
 
 post-install:
-	${RM} -f ${WRKSRC}/etc/init.d.slurm.in.orig
 	${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 "../../lang/python/tool.mk"
diff --git a/parallel/slurm-wlm/PLIST b/parallel/slurm-wlm/PLIST
index 4a366646067..c88cbf56ba1 100644
--- a/parallel/slurm-wlm/PLIST
+++ b/parallel/slurm-wlm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/04/22 21:31:09 bacon Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/02/01 00:15:01 bacon Exp $
 bin/sacct
 bin/sacctmgr
 bin/salloc
@@ -24,14 +24,12 @@ include/slurm/slurm_errno.h
 include/slurm/slurmdb.h
 include/slurm/smd_ns.h
 include/slurm/spank.h
-lib/libpmi.la
 lib/libslurm.la
-lib/libslurmdb.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.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_rapl.la
@@ -39,25 +37,29 @@ lib/slurm/acct_gather_filesystem_lustre.la
 lib/slurm/acct_gather_filesystem_none.la
 lib/slurm/acct_gather_interconnect_none.la
 lib/slurm/acct_gather_profile_hdf5.la
+lib/slurm/acct_gather_profile_influxdb.la
 lib/slurm/acct_gather_profile_none.la
 lib/slurm/auth_munge.la
 lib/slurm/auth_none.la
-lib/slurm/burst_buffer_cray.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/core_spec_cray.la
+lib/slurm/cli_filter_none.la
+lib/slurm/core_spec_cray_aries.la
 lib/slurm/core_spec_none.la
-lib/slurm/crypto_munge.la
-lib/slurm/crypto_openssl.la
+lib/slurm/cred_munge.la
+lib/slurm/cred_none.la
 lib/slurm/ext_sensors_none.la
+lib/slurm/gpu_generic.la
 lib/slurm/gres_gpu.la
 lib/slurm/gres_mic.la
+lib/slurm/gres_mps.la
 lib/slurm/gres_nic.la
 lib/slurm/job_container_cncu.la
 lib/slurm/job_container_none.la
 lib/slurm/job_submit_all_partitions.la
-lib/slurm/job_submit_cray.la
+lib/slurm/job_submit_cray_aries.la
 lib/slurm/job_submit_defaults.la
 lib/slurm/job_submit_logging.la
 lib/slurm/job_submit_lua.la
@@ -65,7 +67,6 @@ lib/slurm/job_submit_partition.la
 lib/slurm/job_submit_pbs.la
 lib/slurm/job_submit_require_timelimit.la
 lib/slurm/job_submit_throttle.la
-lib/slurm/jobacct_gather_cgroup.la
 lib/slurm/jobacct_gather_linux.la
 lib/slurm/jobacct_gather_none.la
 lib/slurm/jobcomp_elasticsearch.la
@@ -87,37 +88,32 @@ lib/slurm/mpi_openmpi.la
 lib/slurm/mpi_pmi2.la
 lib/slurm/node_features_knl_cray.la
 lib/slurm/node_features_knl_generic.la
-lib/slurm/power_cray.la
+lib/slurm/power_cray_aries.la
 lib/slurm/power_none.la
-lib/slurm/preempt_job_prio.la
 lib/slurm/preempt_none.la
 lib/slurm/preempt_partition_prio.la
 lib/slurm/preempt_qos.la
 lib/slurm/priority_basic.la
 lib/slurm/priority_multifactor.la
-lib/slurm/proctrack_cgroup.la
 lib/slurm/proctrack_linuxproc.la
-lib/slurm/proctrack_lua.la
 lib/slurm/proctrack_pgid.la
 lib/slurm/route_default.la
 lib/slurm/route_topology.la
 lib/slurm/sched_backfill.la
 lib/slurm/sched_builtin.la
 lib/slurm/sched_hold.la
-lib/slurm/select_alps.la
 lib/slurm/select_cons_res.la
-lib/slurm/select_cray.la
+lib/slurm/select_cons_tres.la
+lib/slurm/select_cray_aries.la
 lib/slurm/select_linear.la
-lib/slurm/select_serial.la
+lib/slurm/site_factor_none.la
 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_cray.la
 lib/slurm/switch_generic.la
 lib/slurm/switch_none.la
-lib/slurm/task_cgroup.la
-lib/slurm/task_cray.la
+lib/slurm/task_cray_aries.la
 lib/slurm/task_none.la
 lib/slurm/topology_3d_torus.la
 lib/slurm/topology_hypercube.la
@@ -190,7 +186,6 @@ man/man3/slurm_get_end_time.3
 man/man3/slurm_get_errno.3
 man/man3/slurm_get_job_steps.3
 man/man3/slurm_get_rem_time.3
-man/man3/slurm_get_select_jobinfo.3
 man/man3/slurm_get_triggers.3
 man/man3/slurm_hostlist_create.3
 man/man3/slurm_hostlist_destroy.3
@@ -287,7 +282,6 @@ man/man3/slurm_update_partition.3
 man/man3/slurm_update_reservation.3
 man/man3/slurm_update_step.3
 man/man5/acct_gather.conf.5
-man/man5/bluegene.conf.5
 man/man5/burst_buffer.conf.5
 man/man5/cgroup.conf.5
 man/man5/cray.conf.5
@@ -321,32 +315,32 @@ share/doc/slurm-${PKGVERSION}/html/arch.gif
 share/doc/slurm-${PKGVERSION}/html/authplugins.html
 share/doc/slurm-${PKGVERSION}/html/bb_plugins.html
 share/doc/slurm-${PKGVERSION}/html/big_sys.html
-share/doc/slurm-${PKGVERSION}/html/bluegene.conf.html
-share/doc/slurm-${PKGVERSION}/html/bluegene.html
 share/doc/slurm-${PKGVERSION}/html/burst_buffer.conf.html
 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_blcr.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/configurator.easy.html
 share/doc/slurm-${PKGVERSION}/html/configurator.html
 share/doc/slurm-${PKGVERSION}/html/cons_res.html
 share/doc/slurm-${PKGVERSION}/html/cons_res_share.html
+share/doc/slurm-${PKGVERSION}/html/containers.html
 share/doc/slurm-${PKGVERSION}/html/contributor.html
 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/cray_alps.html
-share/doc/slurm-${PKGVERSION}/html/crypto_plugins.html
+share/doc/slurm-${PKGVERSION}/html/cred_plugins.html
 share/doc/slurm-${PKGVERSION}/html/disclaimer.html
 share/doc/slurm-${PKGVERSION}/html/dist_plane.html
 share/doc/slurm-${PKGVERSION}/html/documentation.html
 share/doc/slurm-${PKGVERSION}/html/download.html
 share/doc/slurm-${PKGVERSION}/html/elastic_computing.html
+share/doc/slurm-${PKGVERSION}/html/elasticsearch.html
 share/doc/slurm-${PKGVERSION}/html/entities.gif
 share/doc/slurm-${PKGVERSION}/html/example_usage.gif
 share/doc/slurm-${PKGVERSION}/html/ext_sensors.conf.html
@@ -366,7 +360,6 @@ share/doc/slurm-${PKGVERSION}/html/hdf5_profile_user_guide.html
 share/doc/slurm-${PKGVERSION}/html/hdf5_task_attr.png
 share/doc/slurm-${PKGVERSION}/html/heterogeneous_jobs.html
 share/doc/slurm-${PKGVERSION}/html/high_throughput.html
-share/doc/slurm-${PKGVERSION}/html/ibm-pe.html
 share/doc/slurm-${PKGVERSION}/html/ibm_pe_fig1.png
 share/doc/slurm-${PKGVERSION}/html/ibm_pe_fig2.png
 share/doc/slurm-${PKGVERSION}/html/intel_knl.html
@@ -395,6 +388,7 @@ share/doc/slurm-${PKGVERSION}/html/multi_cluster.html
 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/overview.html
 share/doc/slurm-${PKGVERSION}/html/pam_slurm_adopt.html
 share/doc/slurm-${PKGVERSION}/html/plane_ex1.gif
@@ -423,6 +417,7 @@ share/doc/slurm-${PKGVERSION}/html/quickstart.html
 share/doc/slurm-${PKGVERSION}/html/quickstart_admin.html
 share/doc/slurm-${PKGVERSION}/html/reservations.html
 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/rosetta.html
 share/doc/slurm-${PKGVERSION}/html/route_plugin.html
@@ -443,12 +438,12 @@ share/doc/slurm-${PKGVERSION}/html/select_design.html
 share/doc/slurm-${PKGVERSION}/html/selectplugins.html
 share/doc/slurm-${PKGVERSION}/html/sh5util.html
 share/doc/slurm-${PKGVERSION}/html/sinfo.html
+share/doc/slurm-${PKGVERSION}/html/site_factor.html
 share/doc/slurm-${PKGVERSION}/html/slurm.conf.html
 share/doc/slurm-${PKGVERSION}/html/slurm.css
 share/doc/slurm-${PKGVERSION}/html/slurm.html
 share/doc/slurm-${PKGVERSION}/html/slurm_logo.png
 share/doc/slurm-${PKGVERSION}/html/slurm_ug_agenda.html
-share/doc/slurm-${PKGVERSION}/html/slurm_ug_cfp.html
 share/doc/slurm-${PKGVERSION}/html/slurmctld.html
 share/doc/slurm-${PKGVERSION}/html/slurmctld_plugstack.html
 share/doc/slurm-${PKGVERSION}/html/slurmd.html
@@ -485,9 +480,7 @@ share/doc/slurm-${PKGVERSION}/html/wckey.html
 share/examples/slurm/Makefile
 share/examples/slurm/Makefile.am
 share/examples/slurm/Makefile.in
-share/examples/slurm/bluegene.conf.example
 share/examples/slurm/cgroup.conf.example
-share/examples/slurm/cgroup_allowed_devices_file.conf.example
 share/examples/slurm/init.d.slurm
 share/examples/slurm/init.d.slurm.in
 share/examples/slurm/init.d.slurmdbd
@@ -495,8 +488,8 @@ 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/prolog.example
 share/examples/slurm/slurm.conf.example
-share/examples/slurm/slurm.epilog.clean
 share/examples/slurm/slurmctld.service
 share/examples/slurm/slurmctld.service.in
 share/examples/slurm/slurmd.service
diff --git a/parallel/slurm-wlm/PLIST.Linux b/parallel/slurm-wlm/PLIST.Linux
index 96e5944ffcf..645399d0b23 100644
--- a/parallel/slurm-wlm/PLIST.Linux
+++ b/parallel/slurm-wlm/PLIST.Linux
@@ -1,2 +1,6 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2018/04/22 21:31:09 bacon Exp $
+@comment $NetBSD: PLIST.Linux,v 1.2 2020/02/01 00:15:01 bacon Exp $
+lib/slurm/jobacct_gather_cgroup.la
+lib/slurm/proctrack_cgroup.la
+lib/slurm/switch_cray_aries.la
 lib/slurm/task_affinity.la
+lib/slurm/task_cgroup.la
diff --git a/parallel/slurm-wlm/distinfo b/parallel/slurm-wlm/distinfo
index ea142e99872..b95c51756c5 100644
--- a/parallel/slurm-wlm/distinfo
+++ b/parallel/slurm-wlm/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.1 2018/04/22 21:31:09 bacon Exp $
+$NetBSD: distinfo,v 1.2 2020/02/01 00:15:01 bacon Exp $
 
-SHA1 (slurm-17.11.5.tar.bz2) = fe29758ca8d81492e18d59b84968cedf17a6161b
-RMD160 (slurm-17.11.5.tar.bz2) = 8d393e7ddf545ac1e8c81e8ddd9160a5e76d9311
-SHA512 (slurm-17.11.5.tar.bz2) = cb82e192bf0ab57fbc810fc3c9b32e90d4c28926b4a959514e3df51b63556b13d01057938d73da5bc0bea157bbd7712b1aad0712a913ad912bd7e6089fc0bd21
-Size (slurm-17.11.5.tar.bz2) = 6248551 bytes
+SHA1 (slurm-19.05.5.tar.bz2) = 055adca91e555cc124b1ecac5f3c45e66c17a8ba
+RMD160 (slurm-19.05.5.tar.bz2) = 3f94274277a714e7b4bc4f89aa7b246316c4a732
+SHA512 (slurm-19.05.5.tar.bz2) = 4a0055a268b3765dbb2fa7510b27d694516e77716d857acea4509702e88b4739c9fff7590b80e33b7a62a5ebd38a748fd4ddf625f7c431b2beccb002d05df6c1
+Size (slurm-19.05.5.tar.bz2) = 6232295 bytes
 SHA1 (patch-etc_init.d.slurm.in) = beaedd5385b4aad04583d2bc5a23557519f74ec5
-SHA1 (patch-src_plugins_task_cgroup_task__cgroup__memory.c) = 1accc4ebb9456699db477557ddc783e136fdff00
-SHA1 (patch-src_slurmd_common_task__plugin.c) = 0d6680b10b45648703fe7a57411e605992fd9040
+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) = 67cac6d8b4545c9053b655a4da77db63f5de7e63
+SHA1 (patch-src_slurmd_slurmd_slurmd.c) = 93f2da51d2a766a5817cc51e7de40e4ab2306649
 SHA1 (patch-src_slurmd_slurmd_slurmd.h) = a610b0bbe5b6b04be70eb2f8eac2a231139e6d1a
 SHA1 (patch-src_slurmd_slurmstepd_io.c) = b56782887621edb539be70d53dff8029a89e90ed
-SHA1 (patch-src_slurmd_slurmstepd_task.c) = 7948c76ce65b0e5211486d2e7b1901664c1f7016
+SHA1 (patch-src_slurmd_slurmstepd_task.c) = 756dd8eb7201d003a6a7f01aa84b699f9a3ce11b
diff --git a/parallel/slurm-wlm/patches/patch-src_plugins_task_affinity_affinity.h b/parallel/slurm-wlm/patches/patch-src_plugins_task_affinity_affinity.h
new file mode 100644
index 00000000000..c3ba9fe3c57
--- /dev/null
+++ b/parallel/slurm-wlm/patches/patch-src_plugins_task_affinity_affinity.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_plugins_task_affinity_affinity.h,v 1.1 2020/02/01 00:15:02 bacon Exp $
+
+# Portability
+
+--- src/plugins/task/affinity/affinity.h.orig	2020-01-26 20:44:58.750715619 +0000
++++ src/plugins/task/affinity/affinity.h
+@@ -52,6 +52,10 @@
+    typedef cpuset_t cpu_set_t;
+ #endif
+ 
++#ifdef __NetBSD__
++#define	CPU_SETSIZE	MAXCPUS
++#endif
++
+ #ifdef HAVE_SYS_PRCTL_H
+ #  include <sys/prctl.h>
+ #endif
diff --git a/parallel/slurm-wlm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c b/parallel/slurm-wlm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c
deleted file mode 100644
index b9c49a0dfe5..00000000000
--- a/parallel/slurm-wlm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_plugins_task_cgroup_task__cgroup__memory.c,v 1.1 2018/04/22 21:31:09 bacon Exp $
-
-# Guard Linuxism?
---- src/plugins/task/cgroup/task_cgroup_memory.c.orig	2018-03-15 18:57:29.000000000 +0000
-+++ src/plugins/task/cgroup/task_cgroup_memory.c
-@@ -39,7 +39,10 @@
- #include <poll.h>
- #include <signal.h>
- #include <stdlib.h>		/* getenv */
-+// Should this be defined(__Linux__)?
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <sys/eventfd.h>
-+#endif
- #include <sys/types.h>
- #include <unistd.h>
- 
diff --git a/parallel/slurm-wlm/patches/patch-src_slurmd_common_task__plugin.c b/parallel/slurm-wlm/patches/patch-src_slurmd_common_task__plugin.c
index d3c7e9d0d59..4b3605fec80 100644
--- a/parallel/slurm-wlm/patches/patch-src_slurmd_common_task__plugin.c
+++ b/parallel/slurm-wlm/patches/patch-src_slurmd_common_task__plugin.c
@@ -1,29 +1,31 @@
-$NetBSD: patch-src_slurmd_common_task__plugin.c,v 1.1 2018/04/22 21:31:09 bacon Exp $
+$NetBSD: patch-src_slurmd_common_task__plugin.c,v 1.2 2020/02/01 00:15:02 bacon Exp $
 
-# cpuset functions not standardized across platforms
+# NetBSD specifics
 
---- src/slurmd/common/task_plugin.c.orig	2018-01-05 18:03:10.000000000 +0000
+--- src/slurmd/common/task_plugin.c.orig	2020-01-19 02:41:02.593115935 +0000
 +++ src/slurmd/common/task_plugin.c
-@@ -542,7 +542,11 @@ extern void task_slurm_chkaffinity(cpu_s
- 				   int statval)
- {
+@@ -514,7 +514,11 @@ extern void task_slurm_chkaffinity(cpu_s
+ 	fatal("%s: not supported on macOS", __func__);
+ #else
  	char *bind_type, *action, *status, *units;
+-	char mstr[1 + CPU_SETSIZE / 4];
 +#ifdef __NetBSD__
 +	char mstr[1 + cpuset_size(mask) / 4];
 +#else
- 	char mstr[1 + CPU_SETSIZE / 4];
++ 	char mstr[1 + CPU_SETSIZE / 4];
 +#endif
  	int task_gid = job->envtp->procid;
  	int task_lid = job->envtp->localid;
  	pid_t mypid = job->envtp->task_pid;
-@@ -609,7 +613,11 @@ extern char *task_cpuset_to_str(const cp
+@@ -585,7 +589,11 @@ extern char *task_cpuset_to_str(const cp
  	char *ptr = str;
  	char *ret = NULL;
  
+-	for (base = CPU_SETSIZE - 4; base >= 0; base -= 4) {
 +#ifdef __NetBSD__
 +	for (base = cpuset_size(mask) - 4; base >= 0; base -= 4) {
 +#else
- 	for (base = CPU_SETSIZE - 4; base >= 0; base -= 4) {
++ 	for (base = CPU_SETSIZE - 4; base >= 0; base -= 4) {
 +#endif
  		char val = 0;
  		if (CPU_ISSET(base, mask))
diff --git a/parallel/slurm-wlm/patches/patch-src_slurmd_slurmd_slurmd.c b/parallel/slurm-wlm/patches/patch-src_slurmd_slurmd_slurmd.c
index c2e3e316f1d..66fd0d52f01 100644
--- a/parallel/slurm-wlm/patches/patch-src_slurmd_slurmd_slurmd.c
+++ b/parallel/slurm-wlm/patches/patch-src_slurmd_slurmd_slurmd.c
@@ -1,29 +1,30 @@
-$NetBSD: patch-src_slurmd_slurmd_slurmd.c,v 1.1 2018/04/22 21:31:09 bacon Exp $
+$NetBSD: patch-src_slurmd_slurmd_slurmd.c,v 1.2 2020/02/01 00:15:02 bacon Exp $
 
-# cpuset functions not standardized across platforms
+# NetBSD syntax
 
---- src/slurmd/slurmd/slurmd.c.orig	2018-01-04 21:15:01.000000000 +0000
+--- src/slurmd/slurmd/slurmd.c.orig	2020-01-19 02:36:16.111141994 +0000
 +++ src/slurmd/slurmd/slurmd.c
-@@ -2067,7 +2067,13 @@ static int _core_spec_init(void)
+@@ -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;
++ 	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 "
-@@ -2165,7 +2171,7 @@ static int _core_spec_init(void)
+@@ -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);
- #elif defined(SCHED_GETAFFINITY_THREE_ARGS)
+ #else
 -		rval = sched_setaffinity(pid, sizeof(cpu_set_t), &mask);
 +		rval = sched_setaffinity(pid, CPU_SET_SIZE, &mask);
- #else
- 		rval = sched_setaffinity(pid, &mask);
  #endif
+ 
+ 		if (rval != 0) {
diff --git a/parallel/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c b/parallel/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c
index 85a25355c09..468ed6de48b 100644
--- a/parallel/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c
+++ b/parallel/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.1 2018/04/22 21:31:09 bacon Exp $
+$NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.2 2020/02/01 00:15:02 bacon Exp $
 
 # Linux compat
 
---- src/slurmd/slurmstepd/task.c.orig	2016-05-03 22:41:59.000000000 +0000
+--- src/slurmd/slurmstepd/task.c.orig	2019-12-20 20:44:51.000000000 +0000
 +++ src/slurmd/slurmstepd/task.c
-@@ -558,6 +558,18 @@ _make_tmpdir(stepd_step_rec_t *job)
+@@ -573,6 +573,12 @@ _make_tmpdir(stepd_step_rec_t *job)
  		 * still work with older systems we include this check.
  		 */
  
@@ -14,12 +14,6 @@ $NetBSD: patch-src_slurmd_slurmstepd_task.c,v 1.1 2018/04/22 21:31:09 bacon Exp
 +#define HAVE_EACCESS 1
 +#endif
 +  
-+// Unsure about the reason for this patch, but it dates back to SLURM 2.6.4
-+//#if defined(__FreeBSD__) || defined(__NetBSD__)
-+//#define __GLIBC__               (1) 
-+//#define __GLIBC_PREREQ(a,b)     (1) 
-+//#endif
-+
  #if defined(HAVE_FACCESSAT)
  		else if (faccessat(AT_FDCWD, tmpdir, X_OK|W_OK, AT_EACCESS))
  #elif defined(HAVE_EACCESS)