Date: Sun, 21 Jul 2019 00:10:12 +0000 (UTC) From: "Jason W. Bacon" <jwb@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507030 - in head/sysutils/slurm-wlm: . files Message-ID: <201907210010.x6L0ACt7023654@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jwb Date: Sun Jul 21 00:10:11 2019 New Revision: 507030 URL: https://svnweb.freebsd.org/changeset/ports/507030 Log: sysutils/slurm-wlm: Upgrade to 19.05.1-2 Resolves CVE-2019-12838 Add NOT_FOR_ARCHS since upstream has deprecated 32-bit architectures Added: head/sysutils/slurm-wlm/files/patch-src_common_half__duplex.c (contents, props changed) head/sysutils/slurm-wlm/files/patch-src_common_track__script.c (contents, props changed) head/sysutils/slurm-wlm/files/patch-src_plugins_switch_cray__aries_switch__cray__aries.c (contents, props changed) Deleted: head/sysutils/slurm-wlm/files/patch-src_plugins_switch_cray_switch__cray.c Modified: head/sysutils/slurm-wlm/Makefile head/sysutils/slurm-wlm/distinfo head/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example head/sysutils/slurm-wlm/files/patch-src_common_read__config.h head/sysutils/slurm-wlm/files/patch-src_common_slurm__xlator.h head/sysutils/slurm-wlm/files/patch-src_srun_libsrun_srun__job.c head/sysutils/slurm-wlm/pkg-plist Modified: head/sysutils/slurm-wlm/Makefile ============================================================================== --- head/sysutils/slurm-wlm/Makefile Sat Jul 20 23:31:06 2019 (r507029) +++ head/sysutils/slurm-wlm/Makefile Sun Jul 21 00:10:11 2019 (r507030) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= slurm -DISTVERSION= 18.08.7 +DISTVERSION= 19.05.1-2 CATEGORIES= sysutils python MASTER_SITES= https://download.schedmd.com/slurm/ PKGNAMESUFFIX= -wlm @@ -12,13 +12,16 @@ COMMENT= Simple Linux Utility for Resource Management LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +NOT_FOR_ARCHS= armv6 armv7 i386 powerpc +NOT_FOR_ARCHS_REASON= 32-bit support is deprecated + LIB_DEPENDS= libjson-c.so:devel/json-c \ libsysinfo.so:devel/libsysinfo \ libmunge.so:security/munge \ liblz4.so:archivers/liblz4 USES= compiler:c11 gmake gnome libtool lua pkgconfig python:build \ - readline:port shebangfix ssl tar:bz2 + readline:port shebangfix tar:bz2 USE_LDCONFIG= yes USE_PERL5= configure USE_RC_SUBR= slurmctld slurmd @@ -26,13 +29,12 @@ USE_RC_SUBR= slurmctld slurmd USERS= slurm GROUPS= ${USERS} -LINUX_USES= linux GNU_CONFIGURE= yes INSTALL_TARGET= install-strip PLIST_SUB= PORTVERSION="${PORTVERSION}" SHEBANG_FILES= doc/html/shtml2html.py doc/man/man2html.py -OPTIONS_DEFINE= CURL DOCS GUI HDF5 HWLOC IPMI MYSQL RRD LINUX +OPTIONS_DEFINE= CURL DOCS GUI HDF5 HWLOC IPMI MYSQL RRD OPTIONS_DEFAULT= HDF5 HWLOC OPTIONS_SUB= yes @@ -42,7 +44,6 @@ HDF5_DESC= Job profiling using HDF5 HWLOC_DESC= Portable hardware locality IPMI_DESC= IPMI energy consumption accounting RRD_DESC= RRD external sensor data collection -LINUX_DESC= Support jobacct_gather/linux (requires linprocfs) DOCS_BUILD_DEPENDS= man2html:textproc/man2html @@ -126,17 +127,15 @@ pre-configure: ${WRKSRC}/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c \ ${WRKSRC}/src/plugins/jobacct_gather/common/common_jag.c \ ${WRKSRC}/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c \ - ${WRKSRC}/src/plugins/switch/cray/scaling.c \ - ${WRKSRC}/src/plugins/switch/cray/switch_cray.c \ - ${WRKSRC}/src/plugins/proctrack/cray/proctrack_cray.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 \ ${WRKSRC}/src/plugins/proctrack/linuxproc/kill_tree.c \ - ${WRKSRC}/src/plugins/proctrack/lua/proctrack_lua.c \ ${WRKSRC}/src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c \ ${WRKSRC}/src/plugins/node_features/knl_generic/node_features_knl_generic.c \ - ${WRKSRC}/contribs/cray/pam_job.c \ - ${WRKSRC}/contribs/lua/proctrack.lua + ${WRKSRC}/contribs/cray/pam_job.c @if ${WHICH} sbatch > /dev/null; then \ ${ECHO_CMD} "********************************************"; \ Modified: head/sysutils/slurm-wlm/distinfo ============================================================================== --- head/sysutils/slurm-wlm/distinfo Sat Jul 20 23:31:06 2019 (r507029) +++ head/sysutils/slurm-wlm/distinfo Sun Jul 21 00:10:11 2019 (r507030) @@ -1,3 +1,3 @@ -TIMESTAMP = 1556910143 -SHA256 (slurm-18.08.7.tar.bz2) = 854f922e4147af1ba861988455dbbb53ab5325f1ca138dce0ad553792b888743 -SIZE (slurm-18.08.7.tar.bz2) = 6186006 +TIMESTAMP = 1562858024 +SHA256 (slurm-19.05.1-2.tar.bz2) = e2de7ebd1ae708661b2f473e957eeacd493fb2d5963c33aa31427d80c8fae497 +SIZE (slurm-19.05.1-2.tar.bz2) = 6222111 Modified: head/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example ============================================================================== --- head/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example Sat Jul 20 23:31:06 2019 (r507029) +++ head/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example Sun Jul 21 00:10:11 2019 (r507030) @@ -1,4 +1,4 @@ ---- etc/slurm.conf.example.orig 2018-10-26 20:10:17 UTC +--- etc/slurm.conf.example.orig 2019-07-11 00:40:34 UTC +++ etc/slurm.conf.example @@ -8,8 +8,8 @@ # @@ -52,10 +52,10 @@ # LOGGING SlurmctldDebug=3 -SlurmctldLogFile=/var/log/slurmctld.log -+SlurmctldLogFile=/var/log/slurm/slurmctld.log ++SlurmctldLogFile=/var/log/slurm/slurmctld SlurmdDebug=3 -SlurmdLogFile=/var/log/slurmd.log -+SlurmdLogFile=/var/log/slurm/slurm_accounting.log ++SlurmdLogFile=/var/log/slurm/slurmd JobCompType=jobcomp/none #JobCompLoc= # Added: head/sysutils/slurm-wlm/files/patch-src_common_half__duplex.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/slurm-wlm/files/patch-src_common_half__duplex.c Sun Jul 21 00:10:11 2019 (r507030) @@ -0,0 +1,14 @@ +--- 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" Modified: head/sysutils/slurm-wlm/files/patch-src_common_read__config.h ============================================================================== --- head/sysutils/slurm-wlm/files/patch-src_common_read__config.h Sat Jul 20 23:31:06 2019 (r507029) +++ head/sysutils/slurm-wlm/files/patch-src_common_read__config.h Sun Jul 21 00:10:11 2019 (r507030) @@ -1,14 +1,24 @@ ---- src/common/read_config.h.orig 2018-10-23 14:45:36 UTC +--- src/common/read_config.h.orig 2019-05-28 17:23:14 UTC +++ src/common/read_config.h -@@ -140,8 +140,10 @@ extern uint16_t drop_priv_flag; +@@ -113,7 +113,7 @@ extern uint16_t drop_priv_flag; + #define DEFAULT_KILL_TREE 0 + #define DEFAULT_KILL_WAIT 30 + #define DEFAULT_LAUNCH_TYPE "launch/slurm" +-#define DEFAULT_MAIL_PROG "/bin/mail" ++#define DEFAULT_MAIL_PROG "/usr/bin/mail" + #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" - #if defined HAVE_REAL_CRAY/* ALPS requires cluster-unique job container IDs */ - # define DEFAULT_PROCTRACK_TYPE "proctrack/sgi_job" --#else -+#elif defined __linux__ - # define DEFAULT_PROCTRACK_TYPE "proctrack/cgroup" +-#define DEFAULT_PROCTRACK_TYPE "proctrack/cgroup" ++#if defined __linux__ ++# define DEFAULT_PROCTRACK_TYPE "proctrack/cgroup" +#else +# define DEFAULT_PROCTRACK_TYPE "proctrack/pgid" - #endif ++#endif #define DEFAULT_PREEMPT_TYPE "preempt/none" #define DEFAULT_PRIORITY_DECAY 604800 /* 7 days */ + #define DEFAULT_PRIORITY_CALC_PERIOD 300 /* in seconds */ Modified: head/sysutils/slurm-wlm/files/patch-src_common_slurm__xlator.h ============================================================================== --- head/sysutils/slurm-wlm/files/patch-src_common_slurm__xlator.h Sat Jul 20 23:31:06 2019 (r507029) +++ head/sysutils/slurm-wlm/files/patch-src_common_slurm__xlator.h Sun Jul 21 00:10:11 2019 (r507030) @@ -1,6 +1,6 @@ ---- src/common/slurm_xlator.h.orig 2019-04-12 04:20:25 UTC +--- src/common/slurm_xlator.h.orig 2019-05-28 17:23:14 UTC +++ src/common/slurm_xlator.h -@@ -299,7 +299,9 @@ +@@ -300,7 +300,9 @@ * The header file used only for #define values. */ /* strlcpy.[ch] functions */ Added: head/sysutils/slurm-wlm/files/patch-src_common_track__script.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/slurm-wlm/files/patch-src_common_track__script.c Sun Jul 21 00:10:11 2019 (r507030) @@ -0,0 +1,10 @@ +--- 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" Added: head/sysutils/slurm-wlm/files/patch-src_plugins_switch_cray__aries_switch__cray__aries.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/slurm-wlm/files/patch-src_plugins_switch_cray__aries_switch__cray__aries.c Sun Jul 21 00:10:11 2019 (r507030) @@ -0,0 +1,25 @@ +--- 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 +@@ -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 @@ + #include <fcntl.h> + #include <inttypes.h> + #include <limits.h> ++#ifdef __linux__ + #include <linux/limits.h> ++#endif + #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__) */ Modified: head/sysutils/slurm-wlm/files/patch-src_srun_libsrun_srun__job.c ============================================================================== --- head/sysutils/slurm-wlm/files/patch-src_srun_libsrun_srun__job.c Sat Jul 20 23:31:06 2019 (r507029) +++ head/sysutils/slurm-wlm/files/patch-src_srun_libsrun_srun__job.c Sun Jul 21 00:10:11 2019 (r507030) @@ -1,8 +1,8 @@ ---- src/srun/libsrun/srun_job.c.orig 2018-10-24 20:21:46 UTC +--- src/srun/libsrun/srun_job.c.orig 2019-05-28 17:23:14 UTC +++ src/srun/libsrun/srun_job.c -@@ -113,6 +113,11 @@ static int shepherd_fd = -1; - static pthread_t signal_thread = (pthread_t) 0; - static int pty_sigarray[] = { SIGWINCH, 0 }; +@@ -117,6 +117,11 @@ static int pty_sigarray[] = { SIGWINCH, 0 }; + + extern char **environ; +#ifdef __FreeBSD__ +#define __environ environ Modified: head/sysutils/slurm-wlm/pkg-plist ============================================================================== --- head/sysutils/slurm-wlm/pkg-plist Sat Jul 20 23:31:06 2019 (r507029) +++ head/sysutils/slurm-wlm/pkg-plist Sun Jul 21 00:10:11 2019 (r507030) @@ -24,20 +24,14 @@ include/slurm/smd_ns.h include/slurm/spank.h lib/libslurm.a lib/libslurm.so -lib/libslurm.so.33 -lib/libslurm.so.33.0.0 -lib/libslurmdb.a -lib/libslurmdb.so -lib/libslurmdb.so.33 -lib/libslurmdb.so.33.0.0 +lib/libslurm.so.34 +lib/libslurm.so.34.0.0 lib/slurm/accounting_storage_filetxt.a lib/slurm/accounting_storage_filetxt.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.a -lib/slurm/acct_gather_energy_cray.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 lib/slurm/acct_gather_energy_none.a @@ -56,22 +50,16 @@ lib/slurm/auth_munge.a lib/slurm/auth_munge.so lib/slurm/auth_none.a lib/slurm/auth_none.so -lib/slurm/burst_buffer_cray.a -lib/slurm/burst_buffer_cray.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/core_spec_cray.a -lib/slurm/core_spec_cray.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/crypto_munge.a -lib/slurm/crypto_munge.so -lib/slurm/crypto_openssl.a -lib/slurm/crypto_openssl.so lib/slurm/ext_sensors_none.a lib/slurm/ext_sensors_none.so lib/slurm/gres_gpu.a @@ -86,8 +74,8 @@ lib/slurm/job_container_none.a lib/slurm/job_container_none.so lib/slurm/job_submit_all_partitions.a lib/slurm/job_submit_all_partitions.so -lib/slurm/job_submit_cray.a -lib/slurm/job_submit_cray.so +lib/slurm/job_submit_cray_aries.a +lib/slurm/job_submit_cray_aries.so lib/slurm/job_submit_defaults.a lib/slurm/job_submit_defaults.so lib/slurm/job_submit_logging.a @@ -140,8 +128,8 @@ lib/slurm/node_features_knl_cray.a lib/slurm/node_features_knl_cray.so lib/slurm/node_features_knl_generic.a lib/slurm/node_features_knl_generic.so -lib/slurm/power_cray.a -lib/slurm/power_cray.so +lib/slurm/power_cray_aries.a +lib/slurm/power_cray_aries.so lib/slurm/power_none.a lib/slurm/power_none.so lib/slurm/preempt_none.a @@ -170,24 +158,20 @@ lib/slurm/sched_builtin.a lib/slurm/sched_builtin.so lib/slurm/sched_hold.a lib/slurm/sched_hold.so -lib/slurm/select_alps.a -lib/slurm/select_alps.so lib/slurm/select_cons_res.a lib/slurm/select_cons_res.so -lib/slurm/select_cray.a -lib/slurm/select_cray.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/select_serial.a -lib/slurm/select_serial.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.a -lib/slurm/switch_cray.so +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 @@ -196,8 +180,8 @@ lib/slurm/task_affinity.a lib/slurm/task_affinity.so lib/slurm/task_cgroup.a lib/slurm/task_cgroup.so -lib/slurm/task_cray.a -lib/slurm/task_cray.so +lib/slurm/task_cray_aries.a +lib/slurm/task_cray_aries.so lib/slurm/task_none.a lib/slurm/task_none.so lib/slurm/topology_3d_torus.a @@ -210,10 +194,26 @@ 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/proctrack_lua.a -%%LUA_LIBDIR%%/slurm/proctrack_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 @@ -432,8 +432,9 @@ sbin/slurmstepd %%PORTDOCS%%%%DOCSDIR%%/html/burst_buffer.html %%PORTDOCS%%%%DOCSDIR%%/html/cgroup.conf.html %%PORTDOCS%%%%DOCSDIR%%/html/cgroups.html -%%PORTDOCS%%%%DOCSDIR%%/html/checkpoint_blcr.html %%PORTDOCS%%%%DOCSDIR%%/html/checkpoint_plugins.html +%%PORTDOCS%%%%DOCSDIR%%/html/classic_fair_share.html +%%PORTDOCS%%%%DOCSDIR%%/html/cli_filter_plugins.html %%PORTDOCS%%%%DOCSDIR%%/html/coding_style.pdf %%PORTDOCS%%%%DOCSDIR%%/html/configurator.easy.html %%PORTDOCS%%%%DOCSDIR%%/html/configurator.html @@ -446,7 +447,7 @@ sbin/slurmstepd %%PORTDOCS%%%%DOCSDIR%%/html/cpu_management.html %%PORTDOCS%%%%DOCSDIR%%/html/cray.conf.html %%PORTDOCS%%%%DOCSDIR%%/html/cray.html -%%PORTDOCS%%%%DOCSDIR%%/html/crypto_plugins.html +%%PORTDOCS%%%%DOCSDIR%%/html/cred_plugins.html %%PORTDOCS%%%%DOCSDIR%%/html/disclaimer.html %%PORTDOCS%%%%DOCSDIR%%/html/dist_plane.html %%PORTDOCS%%%%DOCSDIR%%/html/documentation.html @@ -500,6 +501,7 @@ sbin/slurmstepd %%PORTDOCS%%%%DOCSDIR%%/html/news.html %%PORTDOCS%%%%DOCSDIR%%/html/node_features_plugins.html %%PORTDOCS%%%%DOCSDIR%%/html/nonstop.conf.html +%%PORTDOCS%%%%DOCSDIR%%/html/nss_slurm.html %%PORTDOCS%%%%DOCSDIR%%/html/overview.html %%PORTDOCS%%%%DOCSDIR%%/html/pam_slurm_adopt.html %%PORTDOCS%%%%DOCSDIR%%/html/plane_ex1.gif @@ -547,6 +549,7 @@ sbin/slurmstepd %%PORTDOCS%%%%DOCSDIR%%/html/sdiag.html %%PORTDOCS%%%%DOCSDIR%%/html/select_design.html %%PORTDOCS%%%%DOCSDIR%%/html/selectplugins.html +%%PORTDOCS%%%%DOCSDIR%%/html/site_factor.html %%PORTDOCS%%%%DOCSDIR%%/html/sinfo.html %%PORTDOCS%%%%DOCSDIR%%/html/slurm.conf.html %%PORTDOCS%%%%DOCSDIR%%/html/slurm.css
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907210010.x6L0ACt7023654>