slurm-wlm: Upgrade to 19.05.5 (CVE resolution)
This commit is contained in:
Jason Bacon
parent
98ced6acc9
commit
06bfc5418f
|
|
@ -1,7 +1,7 @@
|
|||
# $NetBSD: Makefile,v 1.6 2018/08/22 09:46:10 wiz Exp $
|
||||
|
||||
DISTNAME= slurm-18.08.8
|
||||
PKGNAME= slurm-wlm-18.08.8
|
||||
DISTNAME= slurm-19.05.5
|
||||
PKGNAME= slurm-wlm-19.05.5
|
||||
CATEGORIES= parallel
|
||||
MASTER_SITES= http://download.schedmd.com/slurm/
|
||||
MASTER_SITES+= http://www.schedmd.com/download/latest/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.1 2018/04/22 21:31:09 bacon Exp $
|
||||
@comment $NetBSD$
|
||||
bin/sacct
|
||||
bin/sacctmgr
|
||||
bin/salloc
|
||||
|
|
@ -25,12 +25,11 @@ include/slurm/slurmdb.h
|
|||
include/slurm/smd_ns.h
|
||||
include/slurm/spank.h
|
||||
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
|
||||
|
|
@ -42,22 +41,25 @@ 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
|
||||
|
|
@ -87,7 +89,7 @@ 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_none.la
|
||||
lib/slurm/preempt_partition_prio.la
|
||||
|
|
@ -96,27 +98,27 @@ 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_cray_aries.la
|
||||
lib/slurm/switch_generic.la
|
||||
lib/slurm/switch_none.la
|
||||
lib/slurm/task_affinity.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
|
||||
|
|
@ -189,7 +191,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
|
||||
|
|
@ -323,8 +324,9 @@ 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
|
||||
|
|
@ -337,7 +339,7 @@ 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/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
|
||||
|
|
@ -391,6 +393,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
|
||||
|
|
@ -440,12 +443,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
|
||||
|
|
@ -482,7 +485,6 @@ 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/init.d.slurm
|
||||
share/examples/slurm/init.d.slurm.in
|
||||
|
|
@ -491,6 +493,7 @@ 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/slurmctld.service
|
||||
share/examples/slurm/slurmctld.service.in
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
@comment $NetBSD: PLIST.Linux,v 1.1 2018/04/22 21:31:09 bacon Exp $
|
||||
lib/slurm/task_affinity.la
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
$NetBSD$
|
||||
|
||||
SHA1 (slurm-18.08.8.tar.bz2) = 4a2c176b54a56763704bcc7abfd9b8a4f91c82b8
|
||||
RMD160 (slurm-18.08.8.tar.bz2) = dd8c069e2ed45dc577e462a58ef19d6530be392f
|
||||
SHA512 (slurm-18.08.8.tar.bz2) = a5557cd043c2a48e652cbbca993420a756ecda80e40ed4ca2f55733050cf4b04477cfb5c8059db67168f5fa6d3fb93ac2c92f8b52b079971f634bd1956173ea0
|
||||
Size (slurm-18.08.8.tar.bz2) = 6208426 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_slurmd_common_task__plugin.c) = 0d6680b10b45648703fe7a57411e605992fd9040
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,29 +1,31 @@
|
|||
$NetBSD: patch-src_slurmd_common_task__plugin.c,v 1.1 2018/04/22 21:31:09 bacon Exp $
|
||||
$NetBSD$
|
||||
|
||||
# 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))
|
||||
|
|
|
|||
|
|
@ -1,29 +1,30 @@
|
|||
$NetBSD: patch-src_slurmd_slurmd_slurmd.c,v 1.1 2018/04/22 21:31:09 bacon Exp $
|
||||
$NetBSD$
|
||||
|
||||
# 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) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue