sysutils/slurm-wlm: Upgrade to 19.05.5

Fix recent CVEs
Clean up config file example patches

Reported by:    pkgsrc-security
This commit is contained in:
Jason W. Bacon 2020-01-23 01:52:06 +00:00
parent af6117f0ff
commit 90b3a4c206
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=523858
10 changed files with 87 additions and 151 deletions

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= slurm
DISTVERSION= 19.05.1-2
PORTREVISION= 2
DISTVERSION= 19.05.5
CATEGORIES= sysutils python
MASTER_SITES= https://download.schedmd.com/slurm/
PKGNAMESUFFIX= -wlm
@ -22,7 +21,7 @@ LIB_DEPENDS= libjson-c.so:devel/json-c \
liblz4.so:archivers/liblz4
USES= compiler:c11 gmake gnome libtool lua pkgconfig python:build \
readline:port shebangfix tar:bz2
readline:port shebangfix ssl tar:bz2
USE_LDCONFIG= yes
USE_PERL5= configure
USE_RC_SUBR= slurmctld slurmd
@ -105,18 +104,10 @@ pre-configure:
${WRKSRC}/contribs/cray/slurm.conf.template \
${WRKSRC}/doc/man/man1/strigger.1 \
${WRKSRC}/doc/man/man5/slurm.conf.5
@${REINPLACE_CMD} \
-e 's|=linux|=FreeBSD|g' \
-e 's|run/slurmctld.pid|run/slurm/slurmctld.pid|' \
-e 's|run/slurmd.pid|run/slurm/slurd.pid|' \
-e 's|SlurmdSpoolDir=.*|SlurmdSpoolDir=/var/spool/slurmd|' \
-e 's|StateSaveLocation=.*|StateSaveLocation=/var/run/slurm|' \
${WRKSRC}/etc/slurm.conf.example
@${REINPLACE_CMD} -e 's|"/proc|"/compat/linux/proc|g' \
${WRKSRC}/src/slurmd/slurmstepd/req.c \
${WRKSRC}/src/slurmd/slurmstepd/pdebug.c \
${WRKSRC}/src/slurmd/slurmd/get_mach_stat.c \
${WRKSRC}/src/slurmd/common/xcpuinfo.c \
${WRKSRC}/src/slurmd/common/xcgroup.c \
${WRKSRC}/src/slurmd/common/set_oomadj.c \
@ -128,7 +119,6 @@ pre-configure:
${WRKSRC}/src/plugins/jobacct_gather/common/common_jag.c \
${WRKSRC}/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c \
${WRKSRC}/src/plugins/switch/cray_aries/scaling.c \
${WRKSRC}/src/plugins/switch/cray_aries/switch_cray_aries.c \
${WRKSRC}/src/plugins/proctrack/cray_aries/proctrack_cray_aries.c \
${WRKSRC}/src/plugins/proctrack/cgroup/proctrack_cgroup.c \
${WRKSRC}/src/plugins/proctrack/pgid/proctrack_pgid.c \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1562858024
SHA256 (slurm-19.05.1-2.tar.bz2) = e2de7ebd1ae708661b2f473e957eeacd493fb2d5963c33aa31427d80c8fae497
SIZE (slurm-19.05.1-2.tar.bz2) = 6222111
TIMESTAMP = 1579355818
SHA256 (slurm-19.05.5.tar.bz2) = 715be211b7bef80d06df0011ec91c51ab740031bd9ff722a5e60c595feaad282
SIZE (slurm-19.05.5.tar.bz2) = 6232295

View File

@ -1,4 +1,4 @@
--- etc/slurm.conf.example.orig 2019-07-11 00:40:34 UTC
--- etc/slurm.conf.example.orig 2020-01-18 17:40:31 UTC
+++ etc/slurm.conf.example
@@ -8,8 +8,8 @@
#
@ -11,7 +11,7 @@
#ControlAddr=
#BackupController=
#BackupAddr=
@@ -21,12 +21,12 @@ SlurmdPort=6818
@@ -21,20 +21,20 @@ SlurmdPort=6818
AuthType=auth/munge
#JobCredentialPrivateKey=
#JobCredentialPublicCertificate=
@ -28,16 +28,28 @@
ProctrackType=proctrack/pgid
#PluginDir=
#FirstJobId=
@@ -42,7 +42,7 @@ ReturnToService=0
ReturnToService=0
#MaxJobCount=
#PlugStackConfig=
-#PropagatePrioProcess=
-#PropagateResourceLimits=
+#PropagatePrioProcess
+PropagateResourceLimits=none
#PropagateResourceLimitsExcept=
#Prolog=
#Epilog=
@@ -42,7 +42,9 @@ ReturnToService=0
#SrunEpilog=
#TaskProlog=
#TaskEpilog=
-#TaskPlugin=
+TaskPlugin=task/none
+TaskPlugin=task/affinity
+TaskPluginParam=cores
+# For debugging: TaskPluginParam=cores,verbose
#TrackWCKey=no
#TreeWidth=50
#TmpFS=
@@ -57,7 +57,8 @@ KillWait=30
@@ -57,7 +59,8 @@ KillWait=30
Waittime=0
#
# SCHEDULING
@ -46,14 +58,14 @@
+SchedulerParameters=defer
#SchedulerAuth=
#SelectType=select/linear
FastSchedule=1
@@ -72,22 +73,22 @@ FastSchedule=1
#PriorityType=priority/multifactor
@@ -71,22 +74,29 @@ SchedulerType=sched/backfill
#
# LOGGING
SlurmctldDebug=3
SlurmctldDebug=info
-SlurmctldLogFile=/var/log/slurmctld.log
+SlurmctldLogFile=/var/log/slurm/slurmctld
SlurmdDebug=3
SlurmdDebug=info
-SlurmdLogFile=/var/log/slurmd.log
+SlurmdLogFile=/var/log/slurm/slurmd
JobCompType=jobcomp/none
@ -66,13 +78,20 @@
#
-#AccountingStorageType=accounting_storage/slurmdbd
+AccountingStorageType=accounting_storage/filetxt
+AccountingStorageLoc=/home/slurm/Accounting
+AccountingStoreJobComment=YES
#AccountingStorageHost=
-#AccountingStorageLoc=
+AccountingStorageLoc=/var/log/slurm/slurm_accounting.log
#AccountingStorageLoc=
#AccountingStoragePass=
#AccountingStorageUser=
#
# COMPUTE NODES
-NodeName=linux[1-32] Procs=1 State=UNKNOWN
+NodeName=beastie[1-32] Procs=1 State=UNKNOWN
PartitionName=debug Nodes=ALL Default=YES MaxTime=INFINITE State=UP
-PartitionName=debug Nodes=ALL Default=YES MaxTime=INFINITE State=UP
+# Set RealMemory < avail memory in /var/run/dmesg.boot
+# Note that it may change slightly following freebsd-update
+# NodeName=compute-[001-032] Sockets=2 CoresPerSocket=6 RealMemory=30000 State=UNKNOWN
+# NodeName=compute-256g-[001-002] Sockets=2 CoresPerSocket=6 RealMemory=250000 State=UNKNOWN
+# PartitionName=debug Nodes=ALL Default=NO MaxTime=INFINITE State=UP
+# PartitionName=batch Nodes=compute-[001-032] Default=YES MaxTime=INFINITE State=UP
+# PartitionName=256g Nodes=compute-256g-[001-002] Default=NO MaxTime=INFINITE State=UP

View File

@ -1,14 +0,0 @@
--- src/common/half_duplex.c.orig 2019-06-09 17:09:36 UTC
+++ src/common/half_duplex.c
@@ -35,6 +35,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\*****************************************************************************/
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <sys/socket.h>
+#endif
+
#include "src/common/eio.h"
#include "src/common/half_duplex.h"
#include "src/common/list.h"

View File

@ -1,4 +1,4 @@
--- src/common/read_config.h.orig 2019-05-28 17:23:14 UTC
--- src/common/read_config.h.orig 2020-01-18 14:09:19 UTC
+++ src/common/read_config.h
@@ -113,7 +113,7 @@ extern uint16_t drop_priv_flag;
#define DEFAULT_KILL_TREE 0
@ -9,16 +9,3 @@
#define DEFAULT_MAIL_PROG_ALT "/usr/bin/mail"
#define DEFAULT_MAX_ARRAY_SIZE 1001
#define DEFAULT_MAX_JOB_COUNT 10000
@@ -129,7 +129,11 @@ extern uint16_t drop_priv_flag;
#define DEFAULT_MSG_TIMEOUT 10
#define DEFAULT_POWER_PLUGIN ""
#define DEFAULT_CHECKPOINT_TYPE "checkpoint/none"
-#define DEFAULT_PROCTRACK_TYPE "proctrack/cgroup"
+#if defined __linux__
+# define DEFAULT_PROCTRACK_TYPE "proctrack/cgroup"
+#else
+# define DEFAULT_PROCTRACK_TYPE "proctrack/pgid"
+#endif
#define DEFAULT_PREEMPT_TYPE "preempt/none"
#define DEFAULT_PRIORITY_DECAY 604800 /* 7 days */
#define DEFAULT_PRIORITY_CALC_PERIOD 300 /* in seconds */

View File

@ -1,12 +0,0 @@
--- src/common/slurm_xlator.h.orig 2019-05-28 17:23:14 UTC
+++ src/common/slurm_xlator.h
@@ -300,7 +300,9 @@
* The header file used only for #define values. */
/* strlcpy.[ch] functions */
+#if (!HAVE_STRLCPY) // Match this to src/common/strlcpy.c
#define strlcpy slurm_strlcpy
+#endif
/* switch.[ch] functions
* None exported today.

View File

@ -1,10 +0,0 @@
--- src/common/track_script.c.orig 2019-06-10 01:59:00 UTC
+++ src/common/track_script.c
@@ -36,6 +36,7 @@
#include <signal.h>
#include <sys/time.h>
+#include <sys/wait.h>
#include "src/common/macros.h"
#include "src/common/xmalloc.h"

View File

@ -1,10 +1,9 @@
--- src/plugins/jobacct_gather/common/common_jag.c.orig 2019-09-13 13:35:31 UTC
--- src/plugins/jobacct_gather/common/common_jag.c.orig 2020-01-18 14:05:02 UTC
+++ src/plugins/jobacct_gather/common/common_jag.c
@@ -250,6 +250,12 @@ static int _get_sys_interface_freq_line(uint32_t cpu,
@@ -250,6 +250,11 @@ static int _get_sys_interface_freq_line(uint32_t cpu,
return 0;
}
+
+/*
+ * Check for lightweight processes (POSIX threads)
+ * Should be rewritten for FreeBSD so it doesn't depend on /proc
@ -13,7 +12,7 @@
static int _is_a_lwp(uint32_t pid)
{
char *filename = NULL;
@@ -258,6 +264,10 @@ static int _is_a_lwp(uint32_t pid)
@@ -258,6 +263,10 @@ static int _is_a_lwp(uint32_t pid)
ssize_t n;
char *tgids = NULL;
pid_t tgid = -1;

View File

@ -1,14 +1,6 @@
--- src/plugins/switch/cray_aries/switch_cray_aries.c.orig 2019-05-30 01:52:34 UTC
--- src/plugins/switch/cray_aries/switch_cray_aries.c.orig 2020-01-18 14:02:02 UTC
+++ src/plugins/switch/cray_aries/switch_cray_aries.c
@@ -35,7 +35,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\*****************************************************************************/
-#if !(defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__))
#include "config.h"
#define _GNU_SOURCE
@@ -44,7 +43,9 @@
@@ -43,7 +43,9 @@
#include <fcntl.h>
#include <inttypes.h>
#include <limits.h>
@ -18,8 +10,3 @@
#include <math.h>
#include <sched.h>
#include <signal.h>
@@ -1078,4 +1079,3 @@ extern int switch_p_job_step_post_resume(stepd_step_re
#endif
return SLURM_SUCCESS;
}
-#endif /* !defined(__FreeBSD__) */

View File

@ -7,6 +7,7 @@ bin/sbcast
bin/scancel
bin/scontrol
bin/sdiag
%%HDF5%%bin/sh5util
bin/sinfo
bin/smap
bin/sprio
@ -16,6 +17,8 @@ bin/srun
bin/sshare
bin/sstat
bin/strigger
%%GUI%%bin/sview
@sample etc/slurm.conf.sample
include/slurm/pmi.h
include/slurm/slurm.h
include/slurm/slurm_errno.h
@ -28,44 +31,70 @@ lib/libslurm.so.34
lib/libslurm.so.34.0.0
lib/slurm/accounting_storage_filetxt.a
lib/slurm/accounting_storage_filetxt.so
%%MYSQL%%lib/slurm/accounting_storage_mysql.a
%%MYSQL%%lib/slurm/accounting_storage_mysql.so
lib/slurm/accounting_storage_none.a
lib/slurm/accounting_storage_none.so
lib/slurm/accounting_storage_slurmdbd.a
lib/slurm/accounting_storage_slurmdbd.so
lib/slurm/acct_gather_energy_cray_aries.a
lib/slurm/acct_gather_energy_cray_aries.so
lib/slurm/acct_gather_energy_ibmaem.a
lib/slurm/acct_gather_energy_ibmaem.so
%%IPMI%%lib/slurm/acct_gather_energy_ipmi.a
%%IPMI%%lib/slurm/acct_gather_energy_ipmi.so
lib/slurm/acct_gather_energy_none.a
lib/slurm/acct_gather_energy_none.so
lib/slurm/acct_gather_energy_rapl.a
lib/slurm/acct_gather_energy_rapl.so
%%IPMI%%lib/slurm/acct_gather_energy_xcc.a
%%IPMI%%lib/slurm/acct_gather_energy_xcc.so
lib/slurm/acct_gather_filesystem_lustre.a
lib/slurm/acct_gather_filesystem_lustre.so
lib/slurm/acct_gather_filesystem_none.a
lib/slurm/acct_gather_filesystem_none.so
lib/slurm/acct_gather_interconnect_none.a
lib/slurm/acct_gather_interconnect_none.so
%%HDF5%%lib/slurm/acct_gather_profile_hdf5.a
%%HDF5%%lib/slurm/acct_gather_profile_hdf5.so
%%CURL%%lib/slurm/acct_gather_profile_influxdb.a
%%CURL%%lib/slurm/acct_gather_profile_influxdb.so
lib/slurm/acct_gather_profile_none.a
lib/slurm/acct_gather_profile_none.so
lib/slurm/auth_munge.a
lib/slurm/auth_munge.so
lib/slurm/auth_none.a
lib/slurm/auth_none.so
lib/slurm/burst_buffer_datawarp.a
lib/slurm/burst_buffer_datawarp.so
lib/slurm/burst_buffer_generic.a
lib/slurm/burst_buffer_generic.so
lib/slurm/checkpoint_none.a
lib/slurm/checkpoint_none.so
lib/slurm/checkpoint_ompi.a
lib/slurm/checkpoint_ompi.so
lib/slurm/cli_filter_none.a
lib/slurm/cli_filter_none.so
lib/slurm/core_spec_cray_aries.a
lib/slurm/core_spec_cray_aries.so
lib/slurm/core_spec_none.a
lib/slurm/core_spec_none.so
lib/slurm/cred_munge.a
lib/slurm/cred_munge.so
lib/slurm/cred_none.a
lib/slurm/cred_none.so
lib/slurm/ext_sensors_none.a
lib/slurm/ext_sensors_none.so
%%RRD%%lib/slurm/ext_sensors_rrd.a
%%RRD%%lib/slurm/ext_sensors_rrd.so
lib/slurm/gpu_generic.a
lib/slurm/gpu_generic.so
lib/slurm/gres_gpu.a
lib/slurm/gres_gpu.so
lib/slurm/gres_mic.a
lib/slurm/gres_mic.so
lib/slurm/gres_mps.a
lib/slurm/gres_mps.so
lib/slurm/gres_nic.a
lib/slurm/gres_nic.so
lib/slurm/job_container_cncu.a
@ -80,6 +109,8 @@ lib/slurm/job_submit_defaults.a
lib/slurm/job_submit_defaults.so
lib/slurm/job_submit_logging.a
lib/slurm/job_submit_logging.so
lib/slurm/job_submit_lua.a
lib/slurm/job_submit_lua.so
lib/slurm/job_submit_partition.a
lib/slurm/job_submit_partition.so
lib/slurm/job_submit_pbs.a
@ -88,14 +119,16 @@ lib/slurm/job_submit_require_timelimit.a
lib/slurm/job_submit_require_timelimit.so
lib/slurm/job_submit_throttle.a
lib/slurm/job_submit_throttle.so
lib/slurm/jobacct_gather_cgroup.a
lib/slurm/jobacct_gather_cgroup.so
lib/slurm/jobacct_gather_linux.a
lib/slurm/jobacct_gather_linux.so
lib/slurm/jobacct_gather_none.a
lib/slurm/jobacct_gather_none.so
%%CURL%%lib/slurm/jobcomp_elasticsearch.a
%%CURL%%lib/slurm/jobcomp_elasticsearch.so
lib/slurm/jobcomp_filetxt.a
lib/slurm/jobcomp_filetxt.so
%%MYSQL%%lib/slurm/jobcomp_mysql.a
%%MYSQL%%lib/slurm/jobcomp_mysql.so
lib/slurm/jobcomp_none.a
lib/slurm/jobcomp_none.so
lib/slurm/jobcomp_script.a
@ -142,8 +175,6 @@ lib/slurm/priority_basic.a
lib/slurm/priority_basic.so
lib/slurm/priority_multifactor.a
lib/slurm/priority_multifactor.so
lib/slurm/proctrack_cgroup.a
lib/slurm/proctrack_cgroup.so
lib/slurm/proctrack_linuxproc.a
lib/slurm/proctrack_linuxproc.so
lib/slurm/proctrack_pgid.a
@ -160,26 +191,26 @@ lib/slurm/sched_hold.a
lib/slurm/sched_hold.so
lib/slurm/select_cons_res.a
lib/slurm/select_cons_res.so
lib/slurm/select_cons_tres.a
lib/slurm/select_cons_tres.so
lib/slurm/select_cray_aries.a
lib/slurm/select_cray_aries.so
lib/slurm/select_linear.a
lib/slurm/select_linear.so
lib/slurm/site_factor_none.a
lib/slurm/site_factor_none.so
lib/slurm/slurmctld_nonstop.a
lib/slurm/slurmctld_nonstop.so
lib/slurm/spank_pbs.a
lib/slurm/spank_pbs.so
lib/slurm/src/sattach/sattach.wrapper.c
lib/slurm/src/srun/srun.wrapper.c
lib/slurm/switch_cray_aries.a
lib/slurm/switch_cray_aries.so
lib/slurm/switch_generic.a
lib/slurm/switch_generic.so
lib/slurm/switch_none.a
lib/slurm/switch_none.so
lib/slurm/task_affinity.a
lib/slurm/task_affinity.so
lib/slurm/task_cgroup.a
lib/slurm/task_cgroup.so
lib/slurm/task_cray_aries.a
lib/slurm/task_cray_aries.so
lib/slurm/task_none.a
@ -194,26 +225,6 @@ lib/slurm/topology_none.a
lib/slurm/topology_none.so
lib/slurm/topology_tree.a
lib/slurm/topology_tree.so
%%LUA_LIBDIR%%/slurm/accounting_storage_slurmdbd.a
%%LUA_LIBDIR%%/slurm/accounting_storage_slurmdbd.so
%%LUA_LIBDIR%%/slurm/burst_buffer_datawarp.a
%%LUA_LIBDIR%%/slurm/burst_buffer_datawarp.so
%%LUA_LIBDIR%%/slurm/cli_filter_none.a
%%LUA_LIBDIR%%/slurm/cli_filter_none.so
%%LUA_LIBDIR%%/slurm/cred_munge.a
%%LUA_LIBDIR%%/slurm/cred_munge.so
%%LUA_LIBDIR%%/slurm/cred_none.a
%%LUA_LIBDIR%%/slurm/cred_none.so
%%LUA_LIBDIR%%/slurm/gpu_generic.a
%%LUA_LIBDIR%%/slurm/gpu_generic.so
%%LUA_LIBDIR%%/slurm/gres_mps.a
%%LUA_LIBDIR%%/slurm/gres_mps.so
%%LUA_LIBDIR%%/slurm/job_submit_lua.a
%%LUA_LIBDIR%%/slurm/job_submit_lua.so
%%LUA_LIBDIR%%/slurm/select_cons_tres.a
%%LUA_LIBDIR%%/slurm/select_cons_tres.so
%%LUA_LIBDIR%%/slurm/site_factor_none.a
%%LUA_LIBDIR%%/slurm/site_factor_none.so
man/man1/sacct.1.gz
man/man1/sacctmgr.1.gz
man/man1/salloc.1.gz
@ -223,6 +234,7 @@ man/man1/sbcast.1.gz
man/man1/scancel.1.gz
man/man1/scontrol.1.gz
man/man1/sdiag.1.gz
%%HDF5%%man/man1/sh5util.1.gz
man/man1/sinfo.1.gz
man/man1/slurm.1.gz
man/man1/smap.1.gz
@ -233,6 +245,7 @@ man/man1/srun.1.gz
man/man1/sshare.1.gz
man/man1/sstat.1.gz
man/man1/strigger.1.gz
%%GUI%%man/man1/sview.1.gz
man/man3/slurm_allocate_pack_job_blocking.3.gz
man/man3/slurm_allocate_resources.3.gz
man/man3/slurm_allocate_resources_blocking.3.gz
@ -279,7 +292,6 @@ man/man3/slurm_get_end_time.3.gz
man/man3/slurm_get_errno.3.gz
man/man3/slurm_get_job_steps.3.gz
man/man3/slurm_get_rem_time.3.gz
man/man3/slurm_get_select_jobinfo.3.gz
man/man3/slurm_get_triggers.3.gz
man/man3/slurm_hostlist_create.3.gz
man/man3/slurm_hostlist_destroy.3.gz
@ -395,25 +407,6 @@ sbin/slurmctld
sbin/slurmd
sbin/slurmdbd
sbin/slurmstepd
%%CURL%%lib/slurm/jobcomp_elasticsearch.a
%%CURL%%lib/slurm/jobcomp_elasticsearch.so
%%CURL%%lib/slurm/acct_gather_profile_influxdb.a
%%CURL%%lib/slurm/acct_gather_profile_influxdb.so
%%GUI%%bin/sview
%%GUI%%man/man1/sview.1.gz
%%HDF5%%%%PORTDOCS%%%%DOCSDIR%%/html/sh5util.html
%%HDF5%%bin/sh5util
%%HDF5%%lib/slurm/acct_gather_profile_hdf5.a
%%HDF5%%lib/slurm/acct_gather_profile_hdf5.so
%%HDF5%%man/man1/sh5util.1.gz
%%IPMI%%lib/slurm/acct_gather_energy_ipmi.a
%%IPMI%%lib/slurm/acct_gather_energy_ipmi.so
%%IPMI%%lib/slurm/acct_gather_energy_xcc.a
%%IPMI%%lib/slurm/acct_gather_energy_xcc.so
%%MYSQL%%lib/slurm/accounting_storage_mysql.a
%%MYSQL%%lib/slurm/accounting_storage_mysql.so
%%MYSQL%%lib/slurm/jobcomp_mysql.a
%%MYSQL%%lib/slurm/jobcomp_mysql.so
%%PORTDOCS%%%%DOCSDIR%%/html/Slurm_Entity.pdf
%%PORTDOCS%%%%DOCSDIR%%/html/Slurm_Individual.pdf
%%PORTDOCS%%%%DOCSDIR%%/html/accounting.html
@ -549,14 +542,14 @@ sbin/slurmstepd
%%PORTDOCS%%%%DOCSDIR%%/html/sdiag.html
%%PORTDOCS%%%%DOCSDIR%%/html/select_design.html
%%PORTDOCS%%%%DOCSDIR%%/html/selectplugins.html
%%PORTDOCS%%%%DOCSDIR%%/html/site_factor.html
%%HDF5%%%%PORTDOCS%%%%DOCSDIR%%/html/sh5util.html
%%PORTDOCS%%%%DOCSDIR%%/html/sinfo.html
%%PORTDOCS%%%%DOCSDIR%%/html/site_factor.html
%%PORTDOCS%%%%DOCSDIR%%/html/slurm.conf.html
%%PORTDOCS%%%%DOCSDIR%%/html/slurm.css
%%PORTDOCS%%%%DOCSDIR%%/html/slurm.html
%%PORTDOCS%%%%DOCSDIR%%/html/slurm_logo.png
%%PORTDOCS%%%%DOCSDIR%%/html/slurm_ug_agenda.html
%%PORTDOCS%%%%DOCSDIR%%/html/slurm_ug_cfp.html
%%PORTDOCS%%%%DOCSDIR%%/html/slurmctld.html
%%PORTDOCS%%%%DOCSDIR%%/html/slurmctld_plugstack.html
%%PORTDOCS%%%%DOCSDIR%%/html/slurmd.html
@ -574,6 +567,7 @@ sbin/slurmstepd
%%PORTDOCS%%%%DOCSDIR%%/html/sstat.html
%%PORTDOCS%%%%DOCSDIR%%/html/strigger.html
%%PORTDOCS%%%%DOCSDIR%%/html/style.css
%%GUI%%%%PORTDOCS%%%%DOCSDIR%%/html/sview.html
%%PORTDOCS%%%%DOCSDIR%%/html/switchplugins.html
%%PORTDOCS%%%%DOCSDIR%%/html/taskplugins.html
%%PORTDOCS%%%%DOCSDIR%%/html/team.html
@ -590,7 +584,3 @@ sbin/slurmstepd
%%PORTDOCS%%%%DOCSDIR%%/html/usage_pies.gif
%%PORTDOCS%%%%DOCSDIR%%/html/user_permissions.html
%%PORTDOCS%%%%DOCSDIR%%/html/wckey.html
%%PORTDOCS%%%%GUI%%%%DOCSDIR%%/html/sview.html
%%RRD%%lib/slurm/ext_sensors_rrd.a
%%RRD%%lib/slurm/ext_sensors_rrd.so
@sample etc/slurm.conf.sample