pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/parallel/slurm-wlm parallel/slurm-wlm: Upgrade to 19.05.5
details: https://anonhg.NetBSD.org/pkgsrc/rev/dc7c009bb8d6
branches: trunk
changeset: 422676:dc7c009bb8d6
user: bacon <bacon%pkgsrc.org@localhost>
date: Sat Feb 01 00:15:01 2020 +0000
description:
parallel/slurm-wlm: Upgrade to 19.05.5
CVE-2019-6438 resolved upstream
Numerous enhancements and bug fixes
Remove some old patches and hacks
diffstat:
parallel/slurm-wlm/Makefile | 27 ++--
parallel/slurm-wlm/PLIST | 57 ++++-----
parallel/slurm-wlm/PLIST.Linux | 6 +-
parallel/slurm-wlm/distinfo | 18 +-
parallel/slurm-wlm/patches/patch-src_plugins_task_affinity_affinity.h | 17 ++
parallel/slurm-wlm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c | 16 --
parallel/slurm-wlm/patches/patch-src_slurmd_common_task__plugin.c | 20 +-
parallel/slurm-wlm/patches/patch-src_slurmd_slurmd_slurmd.c | 19 +-
parallel/slurm-wlm/patches/patch-src_slurmd_slurmstepd_task.c | 12 +-
9 files changed, 94 insertions(+), 98 deletions(-)
diffs (truncated from 490 to 300 lines):
diff -r c33bd5daf192 -r dc7c009bb8d6 parallel/slurm-wlm/Makefile
--- a/parallel/slurm-wlm/Makefile Fri Jan 31 21:15:13 2020 +0000
+++ b/parallel/slurm-wlm/Makefile Sat Feb 01 00:15:01 2020 +0000
@@ -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@localhost
@@ -15,9 +13,6 @@
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-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|@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 @@
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 -r c33bd5daf192 -r dc7c009bb8d6 parallel/slurm-wlm/PLIST
--- a/parallel/slurm-wlm/PLIST Fri Jan 31 21:15:13 2020 +0000
+++ b/parallel/slurm-wlm/PLIST Sat Feb 01 00:15:01 2020 +0000
@@ -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/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_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_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_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_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_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/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_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/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_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/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/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/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 -r c33bd5daf192 -r dc7c009bb8d6 parallel/slurm-wlm/PLIST.Linux
--- a/parallel/slurm-wlm/PLIST.Linux Fri Jan 31 21:15:13 2020 +0000
+++ b/parallel/slurm-wlm/PLIST.Linux Sat Feb 01 00:15:01 2020 +0000
@@ -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 $
Home |
Main Index |
Thread Index |
Old Index