From d315fda50bc6d3e867bef565327c82656b45a1ec Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Tue, 5 May 2020 04:21:29 -0400 Subject: [PATCH 01/61] Release of 20.02.2 --- slurm.spec | 19 ++++++++++--------- slurm_to_python3.patch | 30 ------------------------------ slurm_without_cray.patch | 29 ++++++++++++++++++++++------- sources | 2 +- 4 files changed, 33 insertions(+), 47 deletions(-) diff --git a/slurm.spec b/slurm.spec index b70f943..91feb9b 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,7 +15,7 @@ %endif Name: slurm -Version: 19.05.6 +Version: 20.02.2 Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD @@ -64,7 +64,6 @@ BuildRequires: libssh2-devel BuildRequires: lz4-devel BuildRequires: mariadb-devel BuildRequires: munge-devel -BuildRequires: ncurses-devel BuildRequires: numactl-devel BuildRequires: pam-devel BuildRequires: pmix-devel @@ -115,8 +114,8 @@ html-based configuration tools for Slurm. Summary: Slurm gui and visual tools Requires: %{name}%{?_isa} = %{version}-%{release} %description gui -This package contains the Slurm visual tools smap and sview -and their respective man pages. +This package contains the Slurm visual tool sview and +its respective man pages. %package libs Summary: Slurm shared libraries @@ -415,8 +414,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_libdir}/%{name}/acct_gather_profile_{hdf5,influxdb,none}.so %{_libdir}/%{name}/auth_munge.so %{_libdir}/%{name}/burst_buffer_generic.so -%{_libdir}/%{name}/checkpoint_{none,ompi}.so -%{_libdir}/%{name}/cli_filter_none.so +%{_libdir}/%{name}/cli_filter_{lua,none,syslog,user_defaults}.so %{_libdir}/%{name}/core_spec_none.so %{_libdir}/%{name}/cred_{munge,none}.so %{_libdir}/%{name}/ext_sensors_none.so @@ -428,7 +426,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_libdir}/%{name}/job_submit_require_timelimit.so %{_libdir}/%{name}/job_submit_throttle.so %{_libdir}/%{name}/jobacct_gather_{cgroup,linux,none}.so -%{_libdir}/%{name}/jobcomp_{elasticsearch,filetxt,mysql,none,script}.so +%{_libdir}/%{name}/jobcomp_{elasticsearch,filetxt,lua,mysql,none,script}.so %{_libdir}/%{name}/launch_slurm.so %{_libdir}/%{name}/layouts_power_{cpufreq,default}.so %{_libdir}/%{name}/layouts_unit_default.so @@ -437,6 +435,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_libdir}/%{name}/node_features_knl_generic.so %{_libdir}/%{name}/power_none.so %{_libdir}/%{name}/preempt_{job_prio,none,partition_prio,qos}.so +%{_libdir}/%{name}/prep_script.so %{_libdir}/%{name}/priority_{basic,multifactor}.so %{_libdir}/%{name}/proctrack_{cgroup,linuxproc,lua,pgid}.so %{_libdir}/%{name}/route_{default,topology}.so @@ -460,6 +459,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_mandir}/man5/nonstop.conf.5* %{_mandir}/man5/slurm.conf.5* %{_mandir}/man5/topology.conf.5* +%{_mandir}/man8/slurmrestd.8* %{_mandir}/man8/spank.8* %{_sysconfdir}/logrotate.d/%{name} %{_sysconfdir}/%{name}/cgroup*.conf.example @@ -500,11 +500,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod # --------- %files gui -%{_bindir}/smap %{_bindir}/sview %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_mandir}/man1/smap.1* %{_mandir}/man1/sview.1* # ---------- @@ -694,6 +692,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Tue May 5 2020 Philip Kovacs - 20.02.2-1 +- Release of 20.02.2 + * Mon Mar 30 2020 Philip Kovacs - 19.05.6-1 - Release of 19.05.6 diff --git a/slurm_to_python3.patch b/slurm_to_python3.patch index c60e941..e97c1b9 100644 --- a/slurm_to_python3.patch +++ b/slurm_to_python3.patch @@ -18,33 +18,3 @@ index b92aabc731..970c5b4802 100644 # # (c) Copyright 2013 Cray Inc. All Rights Reserved. # -diff --git a/doc/html/shtml2html.py b/doc/html/shtml2html.py -index 0b03182b80..43954a37a9 100755 ---- a/doc/html/shtml2html.py -+++ b/doc/html/shtml2html.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import re - import sys -diff --git a/doc/man/man2html.py b/doc/man/man2html.py -index 54909096b9..93433d6fa3 100755 ---- a/doc/man/man2html.py -+++ b/doc/man/man2html.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - import re - import sys -diff --git a/testsuite/expect/regression.py b/testsuite/expect/regression.py -index 938aecc154..ea64c7cce0 100755 ---- a/testsuite/expect/regression.py -+++ b/testsuite/expect/regression.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ############################################################################ - # Copyright (C) 2006 The Regents of the University of California. - # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). diff --git a/slurm_without_cray.patch b/slurm_without_cray.patch index ce4aa86..5ffdc65 100644 --- a/slurm_without_cray.patch +++ b/slurm_without_cray.patch @@ -9,14 +9,17 @@ index da96aa070d..2a2d1f2c82 100644 EXTRA_DIST = \ make-3.81.slurm.patch \ diff --git a/src/plugins/acct_gather_energy/Makefile.am b/src/plugins/acct_gather_energy/Makefile.am -index 50c4fd36a2..c826387219 100644 +index 937808035f..2abce6efdc 100644 --- a/src/plugins/acct_gather_energy/Makefile.am +++ b/src/plugins/acct_gather_energy/Makefile.am -@@ -1,3 +1,3 @@ +@@ -1,6 +1,6 @@ # Makefile for accounting gather energy plugins -SUBDIRS = cray_aries rapl ibmaem ipmi none xcc +SUBDIRS = rapl ibmaem ipmi none xcc + + if BUILD_RSMI + SUBDIRS += rsmi diff --git a/src/plugins/core_spec/Makefile.am b/src/plugins/core_spec/Makefile.am index 44b1ed67c0..f06bc541d7 100644 --- a/src/plugins/core_spec/Makefile.am @@ -47,6 +50,18 @@ index e393bcfb1c..b98cf2e000 100644 defaults \ logging \ lua \ +diff --git a/src/plugins/mpi/Makefile.am b/src/plugins/mpi/Makefile.am +index 4d055e2030..1a44dfb2ab 100644 +--- a/src/plugins/mpi/Makefile.am ++++ b/src/plugins/mpi/Makefile.am +@@ -1,6 +1,6 @@ + # Makefile for mpi plugins + +-SUBDIRS = cray_shasta none pmi2 ++SUBDIRS = none pmi2 + if HAVE_PMIX + SUBDIRS += pmix + endif diff --git a/src/plugins/node_features/Makefile.am b/src/plugins/node_features/Makefile.am index f5ef036303..d955c51ba1 100644 --- a/src/plugins/node_features/Makefile.am @@ -66,16 +81,16 @@ index ccde44c322..c6171740c1 100644 -SUBDIRS = common cray_aries none +SUBDIRS = common none diff --git a/src/plugins/select/Makefile.am b/src/plugins/select/Makefile.am -index 09fdfd2313..570af23c4a 100644 +index 74606481ff..bebf728529 100644 --- a/src/plugins/select/Makefile.am +++ b/src/plugins/select/Makefile.am @@ -1,7 +1,7 @@ # Makefile for node selection plugins - + # NOTE: other must be in the list before cray_aries lest the build break --SUBDIRS = other cons_res cons_tres cray_aries linear -+SUBDIRS = other cons_res cons_tres linear - +-SUBDIRS = other cons_common cons_res cons_tres cray_aries linear ++SUBDIRS = other cons_common cons_res cons_tres linear + # Each plugin here needs a plugin_id, here are the currect plug_ids # for each plugin. diff --git a/src/plugins/switch/Makefile.am b/src/plugins/switch/Makefile.am diff --git a/sources b/sources index 0cfa84d..72b8439 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-19.05.6.tar.bz2) = 83ee22b763dd27f13fbb372449cd074df2177357812582473c28ecd4dac803365c8814b6f8a0928ac31325d1a0ba439b25c02a92d79132205244506a728fe583 +SHA512 (slurm-20.02.2.tar.bz2) = c7f08e795e1a0ec5803f96c49c53818709b2aac0ddc70540b96f9c0ee6c37d5260aaa4b47c1a369fa1a45f5e95b03c1f2fbca41ba1d82dc3a49453a415f2a4c4 From 47f77f6a67c7c7b48ec5bd692ddc633274c92132 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Mon, 25 May 2020 14:40:18 -0400 Subject: [PATCH 02/61] Release of 20.02.3 --- slurm.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/slurm.spec b/slurm.spec index 91feb9b..544c3fe 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,7 +15,7 @@ %endif Name: slurm -Version: 20.02.2 +Version: 20.02.3 Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD @@ -692,6 +692,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Mon May 25 2020 Philip Kovacs - 20.02.3-1 +- Release of 20.02.3 + * Tue May 5 2020 Philip Kovacs - 20.02.2-1 - Release of 20.02.2 diff --git a/sources b/sources index 72b8439..58bea49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-20.02.2.tar.bz2) = c7f08e795e1a0ec5803f96c49c53818709b2aac0ddc70540b96f9c0ee6c37d5260aaa4b47c1a369fa1a45f5e95b03c1f2fbca41ba1d82dc3a49453a415f2a4c4 +SHA512 (slurm-20.02.3.tar.bz2) = 7732828d436543f27c1c24edb6cdcba4ee01ab4e6e5de0ee386e00c89d8bab62242dd922f1a23cd77537a2974f6b51173ba8386c8ab0c9c58b2ea1b1bd46d026 From c4b762b7eab4c369001fd3864991999675bea599 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 22 Jun 2020 18:15:08 +0200 Subject: [PATCH 03/61] Perl 5.32 rebuild --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 544c3fe..82a87ee 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.02.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -692,6 +692,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Mon Jun 22 2020 Jitka Plesnikova - 20.02.3-2 +- Perl 5.32 rebuild + * Mon May 25 2020 Philip Kovacs - 20.02.3-1 - Release of 20.02.3 From 6dae6b9ea4f81e1d4610355f8d3fe7ea43d61a2c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 25 Jun 2020 14:29:13 -0600 Subject: [PATCH 04/61] Rebuild for hdf5 1.10.6 --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 82a87ee..0f32039 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.02.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -692,6 +692,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Thu Jun 25 2020 Orion Poplawski - 20.02.3-3 +- Rebuild for hdf5 1.10.6 + * Mon Jun 22 2020 Jitka Plesnikova - 20.02.3-2 - Perl 5.32 rebuild From 3c59d35849f56087d9f63d759e309d74f8edcb82 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Sat, 27 Jun 2020 06:57:27 +0200 Subject: [PATCH 05/61] Perl 5.32 re-rebuild updated packages --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 0f32039..1a197b3 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.02.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -692,6 +692,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Sat Jun 27 2020 Jitka Plesnikova - 20.02.3-4 +- Perl 5.32 re-rebuild updated packages + * Thu Jun 25 2020 Orion Poplawski - 20.02.3-3 - Rebuild for hdf5 1.10.6 From 5d72126b9bad02d34062f6ca0cf4d2b2ce6f8c3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:59:15 +0000 Subject: [PATCH 06/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 1a197b3..5589946 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.02.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -692,6 +692,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 20.02.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jun 27 2020 Jitka Plesnikova - 20.02.3-4 - Perl 5.32 re-rebuild updated packages From b8027df36af310b65d801f250ce00cddd6d23945 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Tue, 17 Nov 2020 16:14:34 -0500 Subject: [PATCH 07/61] Release of 20.02.6 Closes security issues CVE-2020-27745 and CVE-2020-27746 --- slurm.spec | 8 +++- slurm_pmix_soname.patch | 85 +++++++++------------------------------- slurm_without_cray.patch | 4 +- sources | 2 +- 4 files changed, 27 insertions(+), 72 deletions(-) diff --git a/slurm.spec b/slurm.spec index 5589946..7c0eb2a 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,8 +15,8 @@ %endif Name: slurm -Version: 20.02.3 -Release: 5%{?dist} +Version: 20.02.6 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -692,6 +692,10 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Tue Nov 17 2020 Philip Kovacs - 20.02.6-1 +- Release of 20.02.6 +- Closes security issues CVE-2020-27745 and CVE-2020-27746 + * Wed Jul 29 2020 Fedora Release Engineering - 20.02.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/slurm_pmix_soname.patch b/slurm_pmix_soname.patch index c6c2449..39ee74f 100644 --- a/slurm_pmix_soname.patch +++ b/slurm_pmix_soname.patch @@ -1,84 +1,35 @@ diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c -index c4bdeafc6b..eda8b39e0a 100644 +index 1bf287ff44..8702a2bd17 100644 --- a/src/plugins/mpi/pmix/mpi_pmix.c +++ b/src/plugins/mpi/pmix/mpi_pmix.c -@@ -89,6 +89,8 @@ const uint32_t plugin_version = SLURM_VERSION_NUMBER; +@@ -109,7 +109,7 @@ static void *_libpmix_open(void) + #elif defined PMIXP_V3_LIBPATH + xstrfmtcat(full_path, "%s/", PMIXP_V3_LIBPATH); + #endif +- xstrfmtcat(full_path, "libpmix.so"); ++ xstrfmtcat(full_path, "libpmix.so.2"); - void *libpmix_plug = NULL; - -+static const char *pmix_libraries[] = { "libpmix.so", "libpmix.so.2" }; -+ - static void _libpmix_close(void *lib_plug) - { - xassert(lib_plug); -@@ -99,6 +101,7 @@ static void *_libpmix_open(void) - { - void *lib_plug = NULL; - char *full_path = NULL; -+ size_t sz = 0; - - #ifdef PMIXP_V1_LIBPATH - xstrfmtcat(full_path, "%s/", PMIXP_V1_LIBPATH); -@@ -112,6 +115,13 @@ static void *_libpmix_open(void) lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); xfree(full_path); - -+ while (!lib_plug && (sz < sizeof(pmix_libraries)/sizeof(pmix_libraries[0]))) { -+ xstrfmtcat(full_path, "%s", pmix_libraries[sz]); -+ lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); -+ xfree(full_path); -+ ++sz; -+ } -+ - if (lib_plug && (HAVE_PMIX_VER != pmixp_lib_get_version())) { - PMIXP_ERROR("pmi/pmix: incorrect PMIx library version loaded %d was loaded, required %d version", - pmixp_lib_get_version(), (int)HAVE_PMIX_VER); diff --git a/src/plugins/mpi/pmix/pmixp_dconn_ucx.c b/src/plugins/mpi/pmix/pmixp_dconn_ucx.c -index f6c91adc93..506a18e3c1 100644 +index f6c91adc93..6021faa01e 100644 --- a/src/plugins/mpi/pmix/pmixp_dconn_ucx.c +++ b/src/plugins/mpi/pmix/pmixp_dconn_ucx.c -@@ -140,6 +140,8 @@ static struct io_operations _progress_ops = { - .handle_read = _progress_read - }; - -+static const char *ucx_libraries[] = { "libucp.so", "libucp.so.0" }; -+ - static void *_ucx_init(int nodeid, pmixp_p2p_data_t direct_hdr); - static void _ucx_fini(void *_priv); - static int _ucx_connect(void *_priv, void *ep_data, size_t ep_len, -@@ -161,6 +163,8 @@ static int _load_ucx_lib() - setenv("UCX_MEM_MALLOC_RELOC", "no", 1); - setenv("UCX_MEM_EVENTS", "no", 1); - -+ size_t sz = 0; -+ - #ifdef PMIXP_UCX_LIBPATH - /* If this Slurm build doesn't allow RPATH's - * try to open library by it's full path that -@@ -170,6 +174,12 @@ static int _load_ucx_lib() - xstrfmtcat(full_path, "%s/libucp.so", PMIXP_UCX_LIBPATH); +@@ -167,7 +167,7 @@ static int _load_ucx_lib() + * we have from autoconf + */ + char *full_path = NULL; +- xstrfmtcat(full_path, "%s/libucp.so", PMIXP_UCX_LIBPATH); ++ xstrfmtcat(full_path, "%s/libucp.so.0", PMIXP_UCX_LIBPATH); _ucx_lib_handler = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); xfree(full_path); -+ while (!_ucx_lib_handler && (sz < sizeof(ucx_libraries)/sizeof(ucx_libraries[0]))) { -+ xstrfmtcat(full_path, "%s/%s", PMIXP_UCX_LIBPATH, ucx_libraries[sz]); -+ _ucx_lib_handler = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); -+ xfree(full_path); -+ ++sz; -+ } if (_ucx_lib_handler) { - /* successful, exit now */ - return SLURM_SUCCESS; -@@ -179,6 +189,13 @@ static int _load_ucx_lib() +@@ -178,7 +178,7 @@ static int _load_ucx_lib() + * known by dynamic linker. */ #endif - _ucx_lib_handler = dlopen("libucp.so", RTLD_LAZY | RTLD_GLOBAL); -+ sz = 0; -+ while (!_ucx_lib_handler && (sz < sizeof(ucx_libraries)/sizeof(ucx_libraries[0]))) { -+ xstrfmtcat(full_path, "%s", ucx_libraries[sz]); -+ _ucx_lib_handler = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); -+ xfree(full_path); -+ ++sz; -+ } +- _ucx_lib_handler = dlopen("libucp.so", RTLD_LAZY | RTLD_GLOBAL); ++ _ucx_lib_handler = dlopen("libucp.so.0", RTLD_LAZY | RTLD_GLOBAL); if (!_ucx_lib_handler) { char *err = dlerror(); PMIXP_ERROR("Cannot open UCX lib: %s", (err) ? err : "unknown"); diff --git a/slurm_without_cray.patch b/slurm_without_cray.patch index 5ffdc65..84c11da 100644 --- a/slurm_without_cray.patch +++ b/slurm_without_cray.patch @@ -91,8 +91,8 @@ index 74606481ff..bebf728529 100644 -SUBDIRS = other cons_common cons_res cons_tres cray_aries linear +SUBDIRS = other cons_common cons_res cons_tres linear - # Each plugin here needs a plugin_id, here are the currect plug_ids - # for each plugin. + # Each plugin here needs a plugin_id. + # Here are the current plugin_ids for each plugin. diff --git a/src/plugins/switch/Makefile.am b/src/plugins/switch/Makefile.am index c58f51329d..39a2b3eb7f 100644 --- a/src/plugins/switch/Makefile.am diff --git a/sources b/sources index 58bea49..d743571 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-20.02.3.tar.bz2) = 7732828d436543f27c1c24edb6cdcba4ee01ab4e6e5de0ee386e00c89d8bab62242dd922f1a23cd77537a2974f6b51173ba8386c8ab0c9c58b2ea1b1bd46d026 +SHA512 (slurm-20.02.6.tar.bz2) = 1ccdd3b26aad3bcab38859f1d0f07f173dba48a454458cd706a90dfe30f9a16d674ed8be9ba879366e2c35285aade772c8a8e86d192e87d2dbef3c48627384a0 From 188ee2f90799b1ad0d658b2bd32f884fae19647b Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Tue, 5 Jan 2021 13:53:36 -0500 Subject: [PATCH 08/61] Release of 20.11.2 --- slurm.conf | 2 +- slurm.spec | 31 ++++++++------------ slurm_libslurmfull_version.patch | 20 +++++++++---- slurm_perlapi_rpaths.patch | 16 ++++++---- slurm_to_python3.patch | 8 ++--- slurm_without_cray.patch | 50 +++++++++----------------------- sources | 2 +- 7 files changed, 56 insertions(+), 73 deletions(-) diff --git a/slurm.conf b/slurm.conf index 06539c9..505b5f2 100644 --- a/slurm.conf +++ b/slurm.conf @@ -91,7 +91,7 @@ Waittime=0 # # SCHEDULING #DefMemPerCPU=0 -FastSchedule=1 +#FastSchedule=1 #MaxMemPerCPU=0 #SchedulerTimeSlice=30 SchedulerType=sched/backfill diff --git a/slurm.spec b/slurm.spec index 7c0eb2a..e34d24f 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,7 +15,7 @@ %endif Name: slurm -Version: 20.02.6 +Version: 20.11.2 Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD @@ -37,8 +37,7 @@ Patch12: slurm_without_cray.patch # Fedora-related patches Patch20: slurm_pmix_soname.patch -Patch21: slurm_service_files.patch -Patch22: slurm_to_python3.patch +Patch21: slurm_to_python3.patch BuildRequires: autoconf BuildRequires: automake @@ -287,18 +286,11 @@ s|^dir_tmpfiles_d=.*|dir_tmpfiles_d="%{_tmpfilesdir}"|g;' \ %make_build DESTDIR=%{buildroot} install-contrib install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name} -install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/layouts.d install -d -m 0755 %{buildroot}%{_unitdir} install -m 0644 -p etc/cgroup.conf.example \ %{buildroot}%{_sysconfdir}/%{name} install -m 0644 -p etc/cgroup.conf.example \ %{buildroot}%{_sysconfdir}/%{name}/cgroup.conf -install -m 0644 -p etc/layouts.d.power.conf.example \ - %{buildroot}%{_sysconfdir}/%{name}/layouts.d/power.conf.example -install -m 0644 -p etc/layouts.d.power_cpufreq.conf.example \ - %{buildroot}%{_sysconfdir}/%{name}/layouts.d/power_cpufreq.conf.example -install -m 0644 -p etc/layouts.d.unit.conf.example \ - %{buildroot}%{_sysconfdir}/%{name}/layouts.d/unit.conf.example install -m 0644 -p etc/slurm.conf %{buildroot}%{_sysconfdir}/%{name} install -m 0644 -p etc/slurm.conf.example %{buildroot}%{_sysconfdir}/%{name} install -m 0600 -p etc/slurmdbd.conf %{buildroot}%{_sysconfdir}/%{name} @@ -368,8 +360,9 @@ install -m 0644 contribs/lua/*.lua %{buildroot}%{_docdir}/%{name}/contribs/lua # remove libtool archives find %{buildroot} -name \*.a -o -name \*.la | xargs rm -f -# remove libslurmfull symlink (non-development, internal library) +# remove libslurmfull, libslurm_pmi symlinks (non-development, internal libraries) rm -rf %{buildroot}%{_libdir}/libslurmfull.so +rm -rf %{buildroot}%{_libdir}/libslurm_pmi.so # remove auth_none plugin rm -f %{buildroot}%{_libdir}/%{name}/auth_none.so # remove example plugins @@ -396,7 +389,6 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %dir %{_libdir}/%{name} %dir %{_rundir}/%{name} %dir %{_sysconfdir}/%{name} -%dir %{_sysconfdir}/%{name}/layouts.d %dir %{_var}/log/%{name} %dir %{_var}/spool/%{name} %dir %{_var}/spool/%{name}/ctld @@ -404,11 +396,11 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %config(noreplace) %{_sysconfdir}/%{name}/cgroup.conf %config(noreplace) %{_sysconfdir}/%{name}/slurm.conf %{_bindir}/{sacct,sacctmgr,salloc,sattach,sbatch,sbcast} -%{_bindir}/{scancel,scontrol,sdiag,sh5util,sinfo,sprio} +%{_bindir}/{scancel,scontrol,scrontab,sdiag,sh5util,sinfo,sprio} %{_bindir}/{squeue,sreport,srun,sshare,sstat,strigger} %{_bindir}/%{name}-setuser %{_libdir}/%{name}/accounting_storage_{filetxt,none,slurmdbd}.so -%{_libdir}/%{name}/acct_gather_energy_{ibmaem,ipmi,none,rapl,xcc}.so +%{_libdir}/%{name}/acct_gather_energy_{ibmaem,ipmi,none,pm_counters,rapl,xcc}.so %{_libdir}/%{name}/acct_gather_filesystem_{lustre,none}.so %{_libdir}/%{name}/acct_gather_interconnect_{none,ofed}.so %{_libdir}/%{name}/acct_gather_profile_{hdf5,influxdb,none}.so @@ -420,7 +412,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_libdir}/%{name}/ext_sensors_none.so %{_libdir}/%{name}/gres_{gpu,mic,mps,nic}.so %{_libdir}/%{name}/gpu_generic.so -%{_libdir}/%{name}/job_container_none.so +%{_libdir}/%{name}/job_container_{cncu,none}.so %{_libdir}/%{name}/job_submit_all_partitions.so %{_libdir}/%{name}/job_submit_lua.so %{_libdir}/%{name}/job_submit_require_timelimit.so @@ -428,8 +420,6 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_libdir}/%{name}/jobacct_gather_{cgroup,linux,none}.so %{_libdir}/%{name}/jobcomp_{elasticsearch,filetxt,lua,mysql,none,script}.so %{_libdir}/%{name}/launch_slurm.so -%{_libdir}/%{name}/layouts_power_{cpufreq,default}.so -%{_libdir}/%{name}/layouts_unit_default.so %{_libdir}/%{name}/mcs_{account,group,none,user}.so %{_libdir}/%{name}/mpi_{none,openmpi,pmi2,pmix*}.so %{_libdir}/%{name}/node_features_knl_generic.so @@ -447,7 +437,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_libdir}/%{name}/task_{affinity,cgroup,none}.so %{_libdir}/%{name}/topology_{3d_torus,hypercube,node_rank,none,tree}.so %{_mandir}/man1/{sacct,sacctmgr,salloc,sattach,sbatch,sbcast}.1* -%{_mandir}/man1/{scancel,scontrol,sdiag,sh5util,sinfo,sprio}.1* +%{_mandir}/man1/{scancel,scontrol,scrontab,sdiag,sh5util,sinfo,sprio}.1* %{_mandir}/man1/{squeue,sreport,srun,sshare,sstat,strigger}.1* %{_mandir}/man1/slurm.1* %{_mandir}/man5/acct_gather.conf.5* @@ -463,7 +453,6 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_mandir}/man8/spank.8* %{_sysconfdir}/logrotate.d/%{name} %{_sysconfdir}/%{name}/cgroup*.conf.example -%{_sysconfdir}/%{name}/layouts.d/*.example %{_sysconfdir}/%{name}/slurm.conf.example %{_tmpfilesdir}/slurm.conf @@ -512,6 +501,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %files libs %{_libdir}/libslurm.so.* %{_libdir}/libslurmfull-*.so +%{_libdir}/libslurm_pmi-*.so # --------- # Slurm-pmi @@ -692,6 +682,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Tue Jan 5 2021 Philip Kovacs - 20.11.2-1 +- Release of 20.11.2 + * Tue Nov 17 2020 Philip Kovacs - 20.02.6-1 - Release of 20.02.6 - Closes security issues CVE-2020-27745 and CVE-2020-27746 diff --git a/slurm_libslurmfull_version.patch b/slurm_libslurmfull_version.patch index 26efdb9..a51e4c6 100644 --- a/slurm_libslurmfull_version.patch +++ b/slurm_libslurmfull_version.patch @@ -1,8 +1,8 @@ diff --git a/src/api/Makefile.am b/src/api/Makefile.am -index d7e9d171cd..93ad848aeb 100644 +index 53af7f8d7f..81d41c1161 100644 --- a/src/api/Makefile.am +++ b/src/api/Makefile.am -@@ -44,12 +44,7 @@ current = $(SLURM_API_CURRENT) +@@ -46,14 +46,7 @@ current = $(SLURM_API_CURRENT) age = $(SLURM_API_AGE) rev = $(SLURM_API_REVISION) @@ -11,12 +11,14 @@ index d7e9d171cd..93ad848aeb 100644 -# The ABI of libslurmfull can easily change from 1 micro version to another. -# To avoid issue we will install this lib alongside the plugins to protect -# from version issues. --pkglib_LTLIBRARIES = libslurmfull.la -+lib_LTLIBRARIES = libslurm.la libslurmfull.la +-# +-# The unversioned libslurm_pmi is hidden there as well. +-pkglib_LTLIBRARIES = libslurmfull.la libslurm_pmi.la ++lib_LTLIBRARIES = libslurm.la libslurmfull.la libslurm_pmi.la # BUILT_SOURCES tells automake that when "make" is called, these targets # need to be built before anything else. -@@ -157,7 +152,7 @@ libslurmfull_la_SOURCES = +@@ -158,14 +151,14 @@ libslurmfull_la_SOURCES = libslurmfull_la_LIBADD = $(convenience_libs) libslurmfull_la_LDFLAGS = \ $(LIB_LDFLAGS) \ @@ -24,4 +26,12 @@ index d7e9d171cd..93ad848aeb 100644 + -release $(SLURM_VERSION_STRING) \ $(FULL_OTHER_FLAGS) + libslurm_pmi_la_SOURCES = + libslurm_pmi_la_LIBADD = $(convenience_libs) + libslurm_pmi_la_LDFLAGS = \ + $(LIB_LDFLAGS) \ +- -avoid-version \ ++ -release $(SLURM_VERSION_STRING) \ + $(SLURM_PMI_OTHER_FLAGS) + # This was made so we could export all symbols from libcommon diff --git a/slurm_perlapi_rpaths.patch b/slurm_perlapi_rpaths.patch index 0da934b..f20bd54 100644 --- a/slurm_perlapi_rpaths.patch +++ b/slurm_perlapi_rpaths.patch @@ -1,6 +1,8 @@ ---- a/contribs/perlapi/libslurm/perl/Makefile.PL.in 2016-11-08 15:11:32.000000000 -0500 -+++ b/contribs/perlapi/libslurm/perl/Makefile.PL.in 2017-08-17 03:06:27.363688978 -0400 -@@ -77,7 +77,7 @@ +diff --git a/contribs/perlapi/libslurm/perl/Makefile.PL.in b/contribs/perlapi/libslurm/perl/Makefile.PL.in +index fcae43796d..34c1ad1411 100644 +--- a/contribs/perlapi/libslurm/perl/Makefile.PL.in ++++ b/contribs/perlapi/libslurm/perl/Makefile.PL.in +@@ -77,7 +77,7 @@ DESTDIR_BUG # AIX has problems with not always having the correct # flags so we have to add some :) my $os = lc(`uname`); @@ -9,9 +11,11 @@ $other_ld_flags = " -brtl -G -bnoentry -bgcbypass:1000 -bexpfull" if $os =~ "aix"; ---- a/contribs/perlapi/libslurmdb/perl/Makefile.PL.in 2017-08-17 03:37:39.689054161 -0400 -+++ b/contribs/perlapi/libslurmdb/perl/Makefile.PL.in 2017-08-17 03:38:07.305780718 -0400 -@@ -76,7 +76,7 @@ +diff --git a/contribs/perlapi/libslurmdb/perl/Makefile.PL.in b/contribs/perlapi/libslurmdb/perl/Makefile.PL.in +index 2db028c113..d143c20190 100644 +--- a/contribs/perlapi/libslurmdb/perl/Makefile.PL.in ++++ b/contribs/perlapi/libslurmdb/perl/Makefile.PL.in +@@ -76,7 +76,7 @@ DESTDIR_BUG # AIX has problems with not always having the correct # flags so we have to add some :) my $os = lc(`uname`); diff --git a/slurm_to_python3.patch b/slurm_to_python3.patch index e97c1b9..841e773 100644 --- a/slurm_to_python3.patch +++ b/slurm_to_python3.patch @@ -1,20 +1,20 @@ diff --git a/contribs/cray/csm/slurmconfgen_smw.py b/contribs/cray/csm/slurmconfgen_smw.py -index cf2bf56f82..013181447f 100644 +index 1d1aadedaf..b2f65c242b 100644 --- a/contribs/cray/csm/slurmconfgen_smw.py +++ b/contribs/cray/csm/slurmconfgen_smw.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # - # Copyright 2015-2016 Cray Inc. All Rights Reserved. + # Copyright 2015-2016 Hewlett Packard Enterprise Development LP """ A script to generate slurm.conf and gres.conf for a diff --git a/contribs/cray/slurmconfgen.py.in b/contribs/cray/slurmconfgen.py.in -index b92aabc731..970c5b4802 100644 +index 31de1a0c28..269b1d55a7 100644 --- a/contribs/cray/slurmconfgen.py.in +++ b/contribs/cray/slurmconfgen.py.in @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # - # (c) Copyright 2013 Cray Inc. All Rights Reserved. + # Copyright 2013 Hewlett Packard Enterprise Development LP # diff --git a/slurm_without_cray.patch b/slurm_without_cray.patch index 84c11da..6ebc6da 100644 --- a/slurm_without_cray.patch +++ b/slurm_without_cray.patch @@ -1,25 +1,10 @@ diff --git a/contribs/Makefile.am b/contribs/Makefile.am -index da96aa070d..2a2d1f2c82 100644 +index 3f6fac0a85..6c466b4eb5 100644 --- a/contribs/Makefile.am +++ b/contribs/Makefile.am -@@ -1,4 +1,4 @@ +@@ -1 +1 @@ -SUBDIRS = cray lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque +SUBDIRS = lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque - - EXTRA_DIST = \ - make-3.81.slurm.patch \ -diff --git a/src/plugins/acct_gather_energy/Makefile.am b/src/plugins/acct_gather_energy/Makefile.am -index 937808035f..2abce6efdc 100644 ---- a/src/plugins/acct_gather_energy/Makefile.am -+++ b/src/plugins/acct_gather_energy/Makefile.am -@@ -1,6 +1,6 @@ - # Makefile for accounting gather energy plugins - --SUBDIRS = cray_aries rapl ibmaem ipmi none xcc -+SUBDIRS = rapl ibmaem ipmi none xcc - - if BUILD_RSMI - SUBDIRS += rsmi diff --git a/src/plugins/core_spec/Makefile.am b/src/plugins/core_spec/Makefile.am index 44b1ed67c0..f06bc541d7 100644 --- a/src/plugins/core_spec/Makefile.am @@ -29,15 +14,6 @@ index 44b1ed67c0..f06bc541d7 100644 -SUBDIRS = cray_aries none +SUBDIRS = none -diff --git a/src/plugins/job_container/Makefile.am b/src/plugins/job_container/Makefile.am -index 8e1960a456..529a9d581d 100644 ---- a/src/plugins/job_container/Makefile.am -+++ b/src/plugins/job_container/Makefile.am -@@ -1,3 +1,3 @@ - # Makefile for job_container plugins - --SUBDIRS = cncu none -+SUBDIRS = none diff --git a/src/plugins/job_submit/Makefile.am b/src/plugins/job_submit/Makefile.am index e393bcfb1c..b98cf2e000 100644 --- a/src/plugins/job_submit/Makefile.am @@ -56,7 +32,7 @@ index 4d055e2030..1a44dfb2ab 100644 +++ b/src/plugins/mpi/Makefile.am @@ -1,6 +1,6 @@ # Makefile for mpi plugins - + -SUBDIRS = cray_shasta none pmi2 +SUBDIRS = none pmi2 if HAVE_PMIX @@ -81,39 +57,39 @@ index ccde44c322..c6171740c1 100644 -SUBDIRS = common cray_aries none +SUBDIRS = common none diff --git a/src/plugins/select/Makefile.am b/src/plugins/select/Makefile.am -index 74606481ff..bebf728529 100644 +index 38bae0ff5c..ca7133f43f 100644 --- a/src/plugins/select/Makefile.am +++ b/src/plugins/select/Makefile.am @@ -1,7 +1,7 @@ # Makefile for node selection plugins - + # NOTE: other must be in the list before cray_aries lest the build break -SUBDIRS = other cons_common cons_res cons_tres cray_aries linear +SUBDIRS = other cons_common cons_res cons_tres linear - + # Each plugin here needs a plugin_id. # Here are the current plugin_ids for each plugin. diff --git a/src/plugins/switch/Makefile.am b/src/plugins/switch/Makefile.am -index c58f51329d..39a2b3eb7f 100644 +index 365f5b8d93..dc56a01a55 100644 --- a/src/plugins/switch/Makefile.am +++ b/src/plugins/switch/Makefile.am @@ -1,7 +1,3 @@ # Makefile for switch plugins - SUBDIRS = generic none + SUBDIRS = none - -if WITH_SWITCH_CRAY_ARIES -SUBDIRS += cray_aries -endif diff --git a/src/plugins/task/Makefile.am b/src/plugins/task/Makefile.am -index 8d2a36eb68..607af1cb7c 100644 +index f79282f3e6..356cdcd500 100644 --- a/src/plugins/task/Makefile.am +++ b/src/plugins/task/Makefile.am @@ -1,6 +1,6 @@ # Makefile for task plugins --SUBDIRS = cray_aries none -+SUBDIRS = none +-SUBDIRS = affinity cray_aries none ++SUBDIRS = affinity none - if HAVE_SCHED_SETAFFINITY - SUBDIRS += affinity + if WITH_CGROUP + SUBDIRS += cgroup diff --git a/sources b/sources index d743571..5231d00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-20.02.6.tar.bz2) = 1ccdd3b26aad3bcab38859f1d0f07f173dba48a454458cd706a90dfe30f9a16d674ed8be9ba879366e2c35285aade772c8a8e86d192e87d2dbef3c48627384a0 +SHA512 (slurm-20.11.2.tar.bz2) = 6743b8125733006e0e5ef0491b950efbeb05af0cf45f54a2c142ddbb57ea639615539bc1bcbd1985a850c20d268b8a995c81c5547a02404f9b6a61fee19f68ed From b42ab1091bee34bd2f775b0f42f50ffd8182f579 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Wed, 6 Jan 2021 14:10:05 -0500 Subject: [PATCH 09/61] Simplify spec; add check package version patch --- slurm.spec | 69 +++---------------- slurm_check_version.patch | 13 ++++ ...rsion.patch => slurm_release_version.patch | 0 3 files changed, 23 insertions(+), 59 deletions(-) create mode 100644 slurm_check_version.patch rename slurm_libslurmfull_version.patch => slurm_release_version.patch (100%) diff --git a/slurm.spec b/slurm.spec index e34d24f..94a7c3c 100644 --- a/slurm.spec +++ b/slurm.spec @@ -27,15 +27,16 @@ Source3: slurm-sview.desktop Source4: slurm-128x128.png Source5: slurm-setuser.in -# Upstream bug #4449: release-style versioning of libslurmfull -Patch0: slurm_libslurmfull_version.patch +# Release-style versioning of libslurmfull/libslurm_pmi +Patch0: slurm_release_version.patch # Build-related patches Patch10: slurm_perlapi_rpaths.patch Patch11: slurm_html_doc_path.patch Patch12: slurm_without_cray.patch +Patch13: slurm_check_version.patch -# Fedora-related patches +# Other patches Patch20: slurm_pmix_soname.patch Patch21: slurm_to_python3.patch @@ -395,62 +396,12 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %dir %{_var}/spool/%{name}/d %config(noreplace) %{_sysconfdir}/%{name}/cgroup.conf %config(noreplace) %{_sysconfdir}/%{name}/slurm.conf -%{_bindir}/{sacct,sacctmgr,salloc,sattach,sbatch,sbcast} -%{_bindir}/{scancel,scontrol,scrontab,sdiag,sh5util,sinfo,sprio} -%{_bindir}/{squeue,sreport,srun,sshare,sstat,strigger} +%{_bindir}/s* %{_bindir}/%{name}-setuser -%{_libdir}/%{name}/accounting_storage_{filetxt,none,slurmdbd}.so -%{_libdir}/%{name}/acct_gather_energy_{ibmaem,ipmi,none,pm_counters,rapl,xcc}.so -%{_libdir}/%{name}/acct_gather_filesystem_{lustre,none}.so -%{_libdir}/%{name}/acct_gather_interconnect_{none,ofed}.so -%{_libdir}/%{name}/acct_gather_profile_{hdf5,influxdb,none}.so -%{_libdir}/%{name}/auth_munge.so -%{_libdir}/%{name}/burst_buffer_generic.so -%{_libdir}/%{name}/cli_filter_{lua,none,syslog,user_defaults}.so -%{_libdir}/%{name}/core_spec_none.so -%{_libdir}/%{name}/cred_{munge,none}.so -%{_libdir}/%{name}/ext_sensors_none.so -%{_libdir}/%{name}/gres_{gpu,mic,mps,nic}.so -%{_libdir}/%{name}/gpu_generic.so -%{_libdir}/%{name}/job_container_{cncu,none}.so -%{_libdir}/%{name}/job_submit_all_partitions.so -%{_libdir}/%{name}/job_submit_lua.so -%{_libdir}/%{name}/job_submit_require_timelimit.so -%{_libdir}/%{name}/job_submit_throttle.so -%{_libdir}/%{name}/jobacct_gather_{cgroup,linux,none}.so -%{_libdir}/%{name}/jobcomp_{elasticsearch,filetxt,lua,mysql,none,script}.so -%{_libdir}/%{name}/launch_slurm.so -%{_libdir}/%{name}/mcs_{account,group,none,user}.so -%{_libdir}/%{name}/mpi_{none,openmpi,pmi2,pmix*}.so -%{_libdir}/%{name}/node_features_knl_generic.so -%{_libdir}/%{name}/power_none.so -%{_libdir}/%{name}/preempt_{job_prio,none,partition_prio,qos}.so -%{_libdir}/%{name}/prep_script.so -%{_libdir}/%{name}/priority_{basic,multifactor}.so -%{_libdir}/%{name}/proctrack_{cgroup,linuxproc,lua,pgid}.so -%{_libdir}/%{name}/route_{default,topology}.so -%{_libdir}/%{name}/sched_{backfill,builtin,hold}.so -%{_libdir}/%{name}/select_{cons_res,cons_tres,linear,serial}.so -%{_libdir}/%{name}/site_factor_none.so -%{_libdir}/%{name}/slurmctld_nonstop.so -%{_libdir}/%{name}/switch_{generic,none}.so -%{_libdir}/%{name}/task_{affinity,cgroup,none}.so -%{_libdir}/%{name}/topology_{3d_torus,hypercube,node_rank,none,tree}.so -%{_mandir}/man1/{sacct,sacctmgr,salloc,sattach,sbatch,sbcast}.1* -%{_mandir}/man1/{scancel,scontrol,scrontab,sdiag,sh5util,sinfo,sprio}.1* -%{_mandir}/man1/{squeue,sreport,srun,sshare,sstat,strigger}.1* -%{_mandir}/man1/slurm.1* -%{_mandir}/man5/acct_gather.conf.5* -%{_mandir}/man5/burst_buffer.conf.5* -%{_mandir}/man5/cgroup.conf.5* -%{_mandir}/man5/ext_sensors.conf.5* -%{_mandir}/man5/gres.conf.5* -%{_mandir}/man5/knl.conf.5* -%{_mandir}/man5/nonstop.conf.5* -%{_mandir}/man5/slurm.conf.5* -%{_mandir}/man5/topology.conf.5* -%{_mandir}/man8/slurmrestd.8* -%{_mandir}/man8/spank.8* +%{_libdir}/%{name}/*.so +%{_mandir}/man1/*.1* +%{_mandir}/man5/*.5* +%{_mandir}/man8/*.8* %{_sysconfdir}/logrotate.d/%{name} %{_sysconfdir}/%{name}/cgroup*.conf.example %{_sysconfdir}/%{name}/slurm.conf.example @@ -470,7 +421,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_includedir}/%{name}/slurmdb.h %{_includedir}/%{name}/smd_ns.h %{_includedir}/%{name}/spank.h -%{_libdir}/lib{slurm,slurmdb}.so +%{_libdir}/libslurm*.so %{_libdir}/%{name}/src/sattach/sattach.wrapper.c %{_libdir}/%{name}/src/srun/srun.wrapper.c %{_mandir}/man3/*.3.* diff --git a/slurm_check_version.patch b/slurm_check_version.patch new file mode 100644 index 0000000..5b13045 --- /dev/null +++ b/slurm_check_version.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index d69d47348a..90f82536ce 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -240,7 +240,7 @@ X_AC_CGROUP + # Tests for Check + # + +-PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"]) ++PKG_CHECK_MODULES([CHECK], [check >= 0.9.10], [ac_have_check="yes"], [ac_have_check="no"]) + AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes") + + # diff --git a/slurm_libslurmfull_version.patch b/slurm_release_version.patch similarity index 100% rename from slurm_libslurmfull_version.patch rename to slurm_release_version.patch From b97d231f988ce359fd86e70a65124a4ed2c10f06 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Wed, 6 Jan 2021 14:42:14 -0500 Subject: [PATCH 10/61] remove unneeded patch file --- slurm_service_files.patch | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 slurm_service_files.patch diff --git a/slurm_service_files.patch b/slurm_service_files.patch deleted file mode 100644 index fc328c4..0000000 --- a/slurm_service_files.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/etc/slurmctld.service.in b/etc/slurmctld.service.in -index 6f175ad651..82a128ac0a 100644 ---- a/etc/slurmctld.service.in -+++ b/etc/slurmctld.service.in -@@ -8,7 +8,7 @@ Type=forking - EnvironmentFile=-/etc/sysconfig/slurmctld - ExecStart=@sbindir@/slurmctld $SLURMCTLD_OPTIONS - ExecReload=/bin/kill -HUP $MAINPID --PIDFile=/var/run/slurmctld.pid -+PIDFile=/var/run/slurm/slurmctld.pid - LimitNOFILE=65536 - @SYSTEMD_TASKSMAX_OPTION@ - -diff --git a/etc/slurmd.service.in b/etc/slurmd.service.in -index b36433dd7d..146b6574d2 100644 ---- a/etc/slurmd.service.in -+++ b/etc/slurmd.service.in -@@ -8,7 +8,7 @@ Type=forking - EnvironmentFile=-/etc/sysconfig/slurmd - ExecStart=@sbindir@/slurmd $SLURMD_OPTIONS - ExecReload=/bin/kill -HUP $MAINPID --PIDFile=/var/run/slurmd.pid -+PIDFile=/var/run/slurm/slurmd.pid - KillMode=process - LimitNOFILE=131072 - LimitMEMLOCK=infinity -diff --git a/etc/slurmdbd.service.in b/etc/slurmdbd.service.in -index c80feb9d7c..97a95c0e57 100644 ---- a/etc/slurmdbd.service.in -+++ b/etc/slurmdbd.service.in -@@ -8,7 +8,7 @@ Type=forking - EnvironmentFile=-/etc/sysconfig/slurmdbd - ExecStart=@sbindir@/slurmdbd $SLURMDBD_OPTIONS - ExecReload=/bin/kill -HUP $MAINPID --PIDFile=/var/run/slurmdbd.pid -+PIDFile=/var/run/slurm/slurmdbd.pid - LimitNOFILE=65536 - @SYSTEMD_TASKSMAX_OPTION@ - From 2baafbcbc6d37d15b0c7072507de73c53ca8d9e6 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Wed, 6 Jan 2021 20:46:35 -0500 Subject: [PATCH 11/61] Minor spec adjustments --- slurm.spec | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 86 insertions(+), 7 deletions(-) diff --git a/slurm.spec b/slurm.spec index 94a7c3c..b627f31 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -396,12 +396,88 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %dir %{_var}/spool/%{name}/d %config(noreplace) %{_sysconfdir}/%{name}/cgroup.conf %config(noreplace) %{_sysconfdir}/%{name}/slurm.conf -%{_bindir}/s* +%{_bindir}/sacct +%{_bindir}/sacctmgr +%{_bindir}/salloc +%{_bindir}/sattach +%{_bindir}/sbatch +%{_bindir}/sbcast +%{_bindir}/scancel +%{_bindir}/scontrol +%{_bindir}/scrontab +%{_bindir}/sdiag +%{_bindir}/sh5util +%{_bindir}/sinfo +%{_bindir}/sprio +%{_bindir}/squeue +%{_bindir}/sreport +%{_bindir}/srun +%{_bindir}/sshare +%{_bindir}/sstat +%{_bindir}/strigger %{_bindir}/%{name}-setuser -%{_libdir}/%{name}/*.so -%{_mandir}/man1/*.1* -%{_mandir}/man5/*.5* -%{_mandir}/man8/*.8* +%{_libdir}/%{name}/accounting_storage_*.so +%{_libdir}/%{name}/acct_gather_*.so +%{_libdir}/%{name}/auth_munge.so +%{_libdir}/%{name}/burst_buffer_generic.so +%{_libdir}/%{name}/cli_filter_*.so +%{_libdir}/%{name}/core_spec_none.so +%{_libdir}/%{name}/cred_*.so +%{_libdir}/%{name}/ext_sensors_none.so +%{_libdir}/%{name}/gres_*.so +%{_libdir}/%{name}/gpu_generic.so +%{_libdir}/%{name}/job_container_*.so +%{_libdir}/%{name}/job_submit_*.so +%{_libdir}/%{name}/jobacct_gather_*.so +%{_libdir}/%{name}/jobcomp_*.so +%{_libdir}/%{name}/launch_slurm.so +%{_libdir}/%{name}/mcs_*.so +%{_libdir}/%{name}/mpi_*.so +%{_libdir}/%{name}/node_features_knl_generic.so +%{_libdir}/%{name}/power_none.so +%{_libdir}/%{name}/preempt_*.so +%{_libdir}/%{name}/prep_script.so +%{_libdir}/%{name}/priority_*.so +%{_libdir}/%{name}/proctrack_*.so +%{_libdir}/%{name}/route_*.so +%{_libdir}/%{name}/sched_*.so +%{_libdir}/%{name}/select_*.so +%{_libdir}/%{name}/site_factor_none.so +%{_libdir}/%{name}/slurmctld_nonstop.so +%{_libdir}/%{name}/switch_*.so +%{_libdir}/%{name}/task_*.so +%{_libdir}/%{name}/topology_*.so +%{_mandir}/man1/sacct.1* +%{_mandir}/man1/sacctmgr.1* +%{_mandir}/man1/salloc.1* +%{_mandir}/man1/sattach.1* +%{_mandir}/man1/sbatch.1* +%{_mandir}/man1/sbcast.1* +%{_mandir}/man1/scancel.1* +%{_mandir}/man1/scontrol.1* +%{_mandir}/man1/scrontab.1* +%{_mandir}/man1/sdiag.1* +%{_mandir}/man1/sh5util.1* +%{_mandir}/man1/sinfo.1* +%{_mandir}/man1/slurm.1* +%{_mandir}/man1/sprio.1* +%{_mandir}/man1/squeue.1* +%{_mandir}/man1/sreport.1* +%{_mandir}/man1/srun.1* +%{_mandir}/man1/sshare.1* +%{_mandir}/man1/sstat.1* +%{_mandir}/man1/strigger.1* +%{_mandir}/man5/acct_gather.conf.5* +%{_mandir}/man5/burst_buffer.conf.5* +%{_mandir}/man5/cgroup.conf.5* +%{_mandir}/man5/ext_sensors.conf.5* +%{_mandir}/man5/gres.conf.5* +%{_mandir}/man5/knl.conf.5* +%{_mandir}/man5/nonstop.conf.5* +%{_mandir}/man5/slurm.conf.5* +%{_mandir}/man5/topology.conf.5* +%{_mandir}/man8/slurmrestd.8* +%{_mandir}/man8/spank.8* %{_sysconfdir}/logrotate.d/%{name} %{_sysconfdir}/%{name}/cgroup*.conf.example %{_sysconfdir}/%{name}/slurm.conf.example @@ -421,7 +497,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_includedir}/%{name}/slurmdb.h %{_includedir}/%{name}/smd_ns.h %{_includedir}/%{name}/spank.h -%{_libdir}/libslurm*.so +%{_libdir}/libslurm.so %{_libdir}/%{name}/src/sattach/sattach.wrapper.c %{_libdir}/%{name}/src/srun/srun.wrapper.c %{_mandir}/man3/*.3.* @@ -633,6 +709,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Wed Jan 6 2021 Philip Kovacs - 20.11.2-2 +- Minor spec adjustments + * Tue Jan 5 2021 Philip Kovacs - 20.11.2-1 - Release of 20.11.2 From 8748811741ae037fcd7f6bc022b193cfade642a7 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:37:47 +0000 Subject: [PATCH 12/61] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- slurm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/slurm.spec b/slurm.spec index b627f31..abf867e 100644 --- a/slurm.spec +++ b/slurm.spec @@ -40,6 +40,7 @@ Patch13: slurm_check_version.patch Patch20: slurm_pmix_soname.patch Patch21: slurm_to_python3.patch +BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: desktop-file-utils From 44b9f7fd3819efe0ccc82d9722375a0f4e2ee053 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Tue, 19 Jan 2021 21:53:56 -0500 Subject: [PATCH 13/61] Release of 20.11.3 --- slurm.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/slurm.spec b/slurm.spec index abf867e..9b6e254 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,8 +15,8 @@ %endif Name: slurm -Version: 20.11.2 -Release: 2%{?dist} +Version: 20.11.3 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -40,11 +40,11 @@ Patch13: slurm_check_version.patch Patch20: slurm_pmix_soname.patch Patch21: slurm_to_python3.patch -BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: desktop-file-utils BuildRequires: gcc +BuildRequires: make BuildRequires: perl-devel BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: perl-interpreter @@ -710,6 +710,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Tue Jan 19 2021 Philip Kovacs - 20.11.3-1 +- Release of 20.11.3 + * Wed Jan 6 2021 Philip Kovacs - 20.11.2-2 - Minor spec adjustments diff --git a/sources b/sources index 5231d00..9fdd8f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-20.11.2.tar.bz2) = 6743b8125733006e0e5ef0491b950efbeb05af0cf45f54a2c142ddbb57ea639615539bc1bcbd1985a850c20d268b8a995c81c5547a02404f9b6a61fee19f68ed +SHA512 (slurm-20.11.3.tar.bz2) = 5d5c702d49677778c4d81fe84b3bdfcd3cbea5881d6750b56d23fa338eb8730c43df15a1fb3467c1e017a4dc37770d9e8db089b25fc40397721ca843bbb577da From 1661d453f5e07809b5e123269016acb887f89c03 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:36:39 +0000 Subject: [PATCH 14/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 9b6e254..677e9c4 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.11.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -710,6 +710,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 20.11.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jan 19 2021 Philip Kovacs - 20.11.3-1 - Release of 20.11.3 From 06589a53c424388cecce491ef0fde9cd472ba8f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:19 +0100 Subject: [PATCH 15/61] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- slurm.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 677e9c4..05084c7 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.11.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -710,6 +710,10 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 20.11.3-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Wed Jan 27 2021 Fedora Release Engineering - 20.11.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 948cbb17481242b9a24a5a1a92bd211838a6f04b Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Fri, 26 Mar 2021 19:56:17 -0400 Subject: [PATCH 16/61] Release of 20.11.5 --- slurm.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/slurm.spec b/slurm.spec index 05084c7..31938fc 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,8 +15,8 @@ %endif Name: slurm -Version: 20.11.3 -Release: 3%{?dist} +Version: 20.11.5 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -473,6 +473,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_mandir}/man5/cgroup.conf.5* %{_mandir}/man5/ext_sensors.conf.5* %{_mandir}/man5/gres.conf.5* +%{_mandir}/man5/job_container.conf.5* %{_mandir}/man5/knl.conf.5* %{_mandir}/man5/nonstop.conf.5* %{_mandir}/man5/slurm.conf.5* @@ -710,6 +711,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Fri Mar 26 2021 Philip Kovacs - 20.11.5-1 +- Release of 20.11.5 + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 20.11.3-3 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. diff --git a/sources b/sources index 9fdd8f8..4b4d573 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-20.11.3.tar.bz2) = 5d5c702d49677778c4d81fe84b3bdfcd3cbea5881d6750b56d23fa338eb8730c43df15a1fb3467c1e017a4dc37770d9e8db089b25fc40397721ca843bbb577da +SHA512 (slurm-20.11.5.tar.bz2) = 99a59797f860c4042f99ad5b9850159c4d5df11bd4cb6a63359370e51a475f550f32033eeaf7537b2bcd6a6e62ccc6f0378028f2e136f8d6d0191376e3cf8512 From 1f0342a057d9c4f532a3210d2a5ff23e0438f3e8 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Mon, 12 Apr 2021 14:17:59 -0400 Subject: [PATCH 17/61] Add subpackage slurm-slurmrestd (Slurm REST API daemon) --- slurm.spec | 53 ++++++++++++++++++++++++++++++++-------- slurm_without_cray.patch | 11 +++++++++ 2 files changed, 54 insertions(+), 10 deletions(-) diff --git a/slurm.spec b/slurm.spec index 31938fc..6459e8e 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.11.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -77,6 +77,14 @@ BuildRequires: zlib-devel BuildRequires: ucx-devel %endif +# create slurm-slurmrestd package for Fedora >= 34 +%if 0%{fedora} >= 34 +BuildRequires: http-parser-devel +BuildRequires: pkgconfig(json-c) +BuildRequires: pkgconfig(libjwt) +BuildRequires: pkgconfig(yaml-0.1) +%endif + # exclude upstream-deprecated 32-bit architectures ExcludeArch: armv7hl ExcludeArch: i686 @@ -168,6 +176,13 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Slurm database daemon. Used to accept and process database RPCs and upload database changes to slurmctld daemons on each cluster. +%package slurmrestd +Summary: Slurm REST API deamon +Requires: %{name}%{?_isa} = %{version}-%{release} +%description slurmrestd +Slurm REST API daemon. The slurmrestd daemon is designed to allow clients +to communicate with Slurm via a REST API. + # ----------------- # Contribs Packages # ----------------- @@ -300,6 +315,7 @@ install -m 0600 -p etc/slurmdbd.conf.example %{buildroot}%{_sysconfdir}/%{name} install -m 0644 -p etc/slurmctld.service %{buildroot}%{_unitdir} install -m 0644 -p etc/slurmd.service %{buildroot}%{_unitdir} install -m 0644 -p etc/slurmdbd.service %{buildroot}%{_unitdir} +install -m 0644 -p etc/slurmrestd.service %{buildroot}%{_unitdir} # tmpfiles.d file for creating /run/slurm dir after reboot install -d -m 0755 %{buildroot}%{_tmpfilesdir} @@ -556,9 +572,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %files rrdtool %{_libdir}/%{name}/ext_sensors_rrd.so -# --------- -# Slurmctld -# --------- +# --------------- +# Slurm-slurmctld +# --------------- %files slurmctld %{_mandir}/man8/slurmctld.8* @@ -566,9 +582,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_unitdir}/slurmctld.service %ghost %{_rundir}/%{name}/slurmctld.pid -# ------ -# Slurmd -# ------ +# ------------ +# Slurm-slurmd +# ------------ %files slurmd %{_mandir}/man8/slurmd.8* @@ -578,9 +594,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_unitdir}/slurmd.service %ghost %{_rundir}/%{name}/slurmd.pid -# -------- -# Slurmdbd -# -------- +# -------------- +# Slurm-slurmdbd +# -------------- %files slurmdbd %config(noreplace) %{_sysconfdir}/%{name}/slurmdbd.conf @@ -592,6 +608,20 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_unitdir}/slurmdbd.service %ghost %{_rundir}/%{name}/slurmdbd.pid +# ---------------- +# Slurm-slurmrestd +# ---------------- + +%files slurmrestd +%{_libdir}/%{name}/auth_jwt.so +%{_libdir}/%{name}/openapi_dbv0_0_36.so +%{_libdir}/%{name}/openapi_v0_0_36.so +%{_libdir}/%{name}/openapi_v0_0_35.so +%{_libdir}/%{name}/rest_auth_jwt.so +%{_libdir}/%{name}/rest_auth_local.so +%{_sbindir}/slurmrestd +%{_unitdir}/slurmrestd.service + # -------------- # Slurm-contribs # -------------- @@ -711,6 +741,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Mon Apr 12 2021 Philip Kovacs - 20.11.5-2 +- Add subpackage slurm-slurmrestd (Slurm REST API daemon) + * Fri Mar 26 2021 Philip Kovacs - 20.11.5-1 - Release of 20.11.5 diff --git a/slurm_without_cray.patch b/slurm_without_cray.patch index 6ebc6da..c05191a 100644 --- a/slurm_without_cray.patch +++ b/slurm_without_cray.patch @@ -5,6 +5,17 @@ index 3f6fac0a85..6c466b4eb5 100644 @@ -1 +1 @@ -SUBDIRS = cray lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque +SUBDIRS = lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque +diff --git a/src/plugins/burst_buffer/Makefile.am b/src/plugins/burst_buffer/Makefile.am +index c187bb83bd..aabd7f3fe8 100644 +--- a/src/plugins/burst_buffer/Makefile.am ++++ b/src/plugins/burst_buffer/Makefile.am +@@ -2,6 +2,3 @@ + + SUBDIRS = generic + +-if WITH_JSON_PARSER +-SUBDIRS += datawarp +-endif diff --git a/src/plugins/core_spec/Makefile.am b/src/plugins/core_spec/Makefile.am index 44b1ed67c0..f06bc541d7 100644 --- a/src/plugins/core_spec/Makefile.am From 2b29bd330af906bd16c57dd916ea8649a5ac572d Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Tue, 4 May 2021 19:02:46 -0400 Subject: [PATCH 18/61] Release of 20.11.6 --- slurm.spec | 49 +++++++++++++++++++++++++++++++++++++++---------- sources | 2 +- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/slurm.spec b/slurm.spec index 6459e8e..b1dbfab 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,8 +15,8 @@ %endif Name: slurm -Version: 20.11.5 -Release: 2%{?dist} +Version: 20.11.6 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -50,7 +50,11 @@ BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: perl-interpreter BuildRequires: perl-macros BuildRequires: perl-podlators +%if !0%{?el7} BuildRequires: pkgconf +%else +BuildRequires: pkgconfig +%endif BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(lua) BuildRequires: python3 @@ -73,16 +77,16 @@ BuildRequires: readline-devel BuildRequires: rrdtool-devel BuildRequires: zlib-devel -%if %{with ucx} +%if 0%{?fedora} && %{with ucx} BuildRequires: ucx-devel %endif -# create slurm-slurmrestd package for Fedora >= 34 -%if 0%{fedora} >= 34 +# create slurm-slurmrestd package for Fedora >= 34 and EPEL7/8 +%if (0%{?fedora} >= 34) || 0%{?el7} || 0%{?el8} BuildRequires: http-parser-devel -BuildRequires: pkgconfig(json-c) -BuildRequires: pkgconfig(libjwt) -BuildRequires: pkgconfig(yaml-0.1) +BuildRequires: json-c-devel +BuildRequires: libjwt-devel +BuildRequires: libyaml-devel %endif # exclude upstream-deprecated 32-bit architectures @@ -91,7 +95,7 @@ ExcludeArch: i686 Requires: munge Requires: pmix -%if %{with ucx} +%if 0%{?fedora} && %{with ucx} Requires: ucx %endif %{?systemd_requires} @@ -176,12 +180,14 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Slurm database daemon. Used to accept and process database RPCs and upload database changes to slurmctld daemons on each cluster. +%if (0%{?fedora} >= 34) || 0%{?el7} || 0%{?el8} %package slurmrestd Summary: Slurm REST API deamon Requires: %{name}%{?_isa} = %{version}-%{release} %description slurmrestd Slurm REST API daemon. The slurmrestd daemon is designed to allow clients to communicate with Slurm via a REST API. +%endif # ----------------- # Contribs Packages @@ -259,7 +265,7 @@ export LDFLAGS="%{build_ldflags} -Wl,-z,lazy" --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir}/%{name} \ --with-pam_dir=%{_libdir}/security \ -%if %{with ucx} +%if 0%{?fedora} && %{with ucx} --with-ucx=%{_prefix} \ %endif --enable-shared \ @@ -393,6 +399,10 @@ rm -f %{buildroot}%{_mandir}/man5/cray* rm -f %{buildroot}%{perl_vendorarch}/auto/Slurm*/.packlist rm -f %{buildroot}%{perl_vendorarch}/auto/Slurm*/Slurm*.bs rm -f %{buildroot}%{perl_archlib}/perllocal.pod +%if 0%{?fedora} && (0%{?fedora} < 34) +# remove unused slurmrestd service file +rm -f %{buildroot}%{_unitdir}/slurmrestd.service +%endif %ldconfig_scriptlets devel %ldconfig_scriptlets libs @@ -539,6 +549,20 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/sview.1* +%if 0%{?el7} +%post gui +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun gui +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans gui +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +%endif + # ---------- # Slurm-libs # ---------- @@ -612,6 +636,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod # Slurm-slurmrestd # ---------------- +%if (0%{?fedora} >= 34) || 0%{?el7} || 0%{?el8} %files slurmrestd %{_libdir}/%{name}/auth_jwt.so %{_libdir}/%{name}/openapi_dbv0_0_36.so @@ -621,6 +646,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_libdir}/%{name}/rest_auth_local.so %{_sbindir}/slurmrestd %{_unitdir}/slurmrestd.service +%endif # -------------- # Slurm-contribs @@ -741,6 +767,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Tue May 4 2021 Philip Kovacs - 20.11.6-1 +- Release of 20.11.6 + * Mon Apr 12 2021 Philip Kovacs - 20.11.5-2 - Add subpackage slurm-slurmrestd (Slurm REST API daemon) diff --git a/sources b/sources index 4b4d573..522e559 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-20.11.5.tar.bz2) = 99a59797f860c4042f99ad5b9850159c4d5df11bd4cb6a63359370e51a475f550f32033eeaf7537b2bcd6a6e62ccc6f0378028f2e136f8d6d0191376e3cf8512 +SHA512 (slurm-20.11.6.tar.bz2) = b7c6ac205e5c1077a7f5d337e92906d738f274e210079ec002f0f56d129f46d27f33d0caae6065d7b04c88b3f3069d0a2abeb4c42affe7c8afe86212af1581e1 From 15c019954dcce21da05aee025e0e7d86d5bff1d5 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Sat, 15 May 2021 20:30:08 -0400 Subject: [PATCH 19/61] Update to 20.11.7 Closes security issue CVE-2021-31215 --- slurm.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/slurm.spec b/slurm.spec index b1dbfab..d674010 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,7 +15,7 @@ %endif Name: slurm -Version: 20.11.6 +Version: 20.11.7 Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD @@ -767,6 +767,10 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Sat May 15 2021 Philip Kovacs - 20.11.7-1 +- Update to 20.11.7 +- Closes security issue CVE-2021-31215 + * Tue May 4 2021 Philip Kovacs - 20.11.6-1 - Release of 20.11.6 diff --git a/sources b/sources index 522e559..8f575d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-20.11.6.tar.bz2) = b7c6ac205e5c1077a7f5d337e92906d738f274e210079ec002f0f56d129f46d27f33d0caae6065d7b04c88b3f3069d0a2abeb4c42affe7c8afe86212af1581e1 +SHA512 (slurm-20.11.7.tar.bz2) = 8a37fdb3701e80a1ebad2360a3586d6877164dbe8bf17a85862057fdd404e649128b1cb5f2d800b13a595340b75e1d04ceb4cbe5612b5f0101549914cce9c0aa From 74f404b6595e5d0ff9c5273fcb21639c253ded2f Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 12:15:18 +0200 Subject: [PATCH 20/61] Perl 5.34 rebuild --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index d674010..03e5053 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.11.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -767,6 +767,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Fri May 21 2021 Jitka Plesnikova - 20.11.7-2 +- Perl 5.34 rebuild + * Sat May 15 2021 Philip Kovacs - 20.11.7-1 - Update to 20.11.7 - Closes security issue CVE-2021-31215 From 90d638313546dcb5ed81c66dfdd36132edfced7c Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Mon, 24 May 2021 20:14:55 -0400 Subject: [PATCH 21/61] Move auth_jwt.so plugin to base package (#1947878) --- slurm.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/slurm.spec b/slurm.spec index 03e5053..ceeda7c 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.11.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -445,6 +445,9 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %{_bindir}/%{name}-setuser %{_libdir}/%{name}/accounting_storage_*.so %{_libdir}/%{name}/acct_gather_*.so +%if (0%{?fedora} >= 34) || 0%{?el7} || 0%{?el8} +%{_libdir}/%{name}/auth_jwt.so +%endif %{_libdir}/%{name}/auth_munge.so %{_libdir}/%{name}/burst_buffer_generic.so %{_libdir}/%{name}/cli_filter_*.so @@ -638,7 +641,6 @@ fi %if (0%{?fedora} >= 34) || 0%{?el7} || 0%{?el8} %files slurmrestd -%{_libdir}/%{name}/auth_jwt.so %{_libdir}/%{name}/openapi_dbv0_0_36.so %{_libdir}/%{name}/openapi_v0_0_36.so %{_libdir}/%{name}/openapi_v0_0_35.so @@ -767,6 +769,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Mon May 24 2021 Philip Kovacs - 20.11.7-3 +- Move auth_jwt.so plugin to base package (#1947878) + * Fri May 21 2021 Jitka Plesnikova - 20.11.7-2 - Perl 5.34 rebuild From 09979d7b0a7b0e401247bb288538ae8618f7791c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 25 May 2021 10:56:58 +0200 Subject: [PATCH 22/61] Perl 5.34 re-rebuild updated packages --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index ceeda7c..1398a32 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.11.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -769,6 +769,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Tue May 25 2021 Jitka Plesnikova - 20.11.7-4 +- Perl 5.34 re-rebuild updated packages + * Mon May 24 2021 Philip Kovacs - 20.11.7-3 - Move auth_jwt.so plugin to base package (#1947878) From 5819d4ac6460940bfe2f86da8504e49b7796c47b Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Sat, 3 Jul 2021 20:13:10 -0400 Subject: [PATCH 23/61] Update to 20.11.8 --- slurm.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/slurm.spec b/slurm.spec index 1398a32..87a7c7a 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,8 +15,8 @@ %endif Name: slurm -Version: 20.11.7 -Release: 4%{?dist} +Version: 20.11.8 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -769,6 +769,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Sat Jul 3 2021 Philip Kovacs - 20.11.8-1 +- Update to 20.11.8 + * Tue May 25 2021 Jitka Plesnikova - 20.11.7-4 - Perl 5.34 re-rebuild updated packages diff --git a/sources b/sources index 8f575d9..1d786b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-20.11.7.tar.bz2) = 8a37fdb3701e80a1ebad2360a3586d6877164dbe8bf17a85862057fdd404e649128b1cb5f2d800b13a595340b75e1d04ceb4cbe5612b5f0101549914cce9c0aa +SHA512 (slurm-20.11.8.tar.bz2) = f67e6ebafef07eda9776a4545f0bf28a926f3c2e1269ce22a422a708d6d743df93e5fd87fa454f652f1e933ff9e233a49b8c27afa04d5717266d690098d88a06 From 5cc0c93bfc3d54499931eac2eddb9c19db6e0c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 10 Jul 2021 11:57:45 +0200 Subject: [PATCH 24/61] Rebuild for versioned symbols in json-c --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 87a7c7a..4c77da0 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.11.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -769,6 +769,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Sat Jul 10 2021 Björn Esser - 20.11.8-2 +- Rebuild for versioned symbols in json-c + * Sat Jul 3 2021 Philip Kovacs - 20.11.8-1 - Update to 20.11.8 From 762a2a77f671c9246ac264e85ed1cd9e20cf8012 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:47:45 +0000 Subject: [PATCH 25/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 4c77da0..946c13c 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.11.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -769,6 +769,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 20.11.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jul 10 2021 Björn Esser - 20.11.8-2 - Rebuild for versioned symbols in json-c From 330c3dca522fcdec673cbb9d4d133aac27f03d6d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Aug 2021 20:13:32 -0600 Subject: [PATCH 26/61] Rebuild for hdf5 1.10.7 --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 946c13c..f7c17ce 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 20.11.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -769,6 +769,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Tue Aug 10 2021 Orion Poplawski - 20.11.8-4 +- Rebuild for hdf5 1.10.7 + * Fri Jul 23 2021 Fedora Release Engineering - 20.11.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 1c41f4b3021a567512c9b1335f90aa82c875bece Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Fri, 8 Oct 2021 14:59:02 -0400 Subject: [PATCH 27/61] Update to 21.08.2 Added Fedora patches to support pmix v4 Remove slurm-pmi(-devel) subpackages --- slurm.conf | 2 +- slurm.spec | 58 +++++++++++++------------------------- slurm_detect_pmix_v4.patch | 14 +++++++++ slurm_pmix_soname.patch | 22 +++++++++++---- slurm_without_cray.patch | 26 ++++++++--------- sources | 2 +- 6 files changed, 66 insertions(+), 58 deletions(-) create mode 100644 slurm_detect_pmix_v4.patch diff --git a/slurm.conf b/slurm.conf index 505b5f2..f575826 100644 --- a/slurm.conf +++ b/slurm.conf @@ -122,7 +122,7 @@ SelectType=select/linear #AccountingStoragePort= AccountingStorageType=accounting_storage/none #AccountingStorageUser= -AccountingStoreJobComment=YES +AccountingStoreFlags=job_comment ClusterName=cluster #DebugFlags= #JobCompHost= diff --git a/slurm.spec b/slurm.spec index f7c17ce..494e73a 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,8 +15,8 @@ %endif Name: slurm -Version: 20.11.8 -Release: 4%{?dist} +Version: 21.08.2 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -35,6 +35,7 @@ Patch10: slurm_perlapi_rpaths.patch Patch11: slurm_html_doc_path.patch Patch12: slurm_without_cray.patch Patch13: slurm_check_version.patch +Patch14: slurm_detect_pmix_v4.patch # Other patches Patch20: slurm_pmix_soname.patch @@ -135,22 +136,6 @@ Summary: Slurm shared libraries %description libs Slurm shared libraries. -%package pmi -Summary: The %{name} implementation of libpmi and libpmi2 -Requires: %{name}%{?_isa} = %{version}-%{release} -Conflicts: pmix-pmi -%description pmi -The %{name}-pmi package contains the %{name} implementation of -the libpmi and libpmi2 libraries. - -%package pmi-devel -Summary: Development files for %{name}-pmi -Requires: %{name}-pmi%{?_isa} = %{version}-%{release} -Conflicts: pmix-pmi-devel -%description pmi-devel -The %{name}-pmi-devel package contains the development files for -the libpmi and libpmi2 libraries. - %package rrdtool Summary: Slurm rrdtool external sensor plugin Requires: %{name}%{?_isa} = %{version}-%{release} @@ -449,7 +434,8 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %{_libdir}/%{name}/auth_jwt.so %endif %{_libdir}/%{name}/auth_munge.so -%{_libdir}/%{name}/burst_buffer_generic.so +%{_libdir}/%{name}/burst_buffer_lua.so +%{_libdir}/%{name}/cgroup_v1.so %{_libdir}/%{name}/cli_filter_*.so %{_libdir}/%{name}/core_spec_none.so %{_libdir}/%{name}/cred_*.so @@ -463,7 +449,8 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %{_libdir}/%{name}/launch_slurm.so %{_libdir}/%{name}/mcs_*.so %{_libdir}/%{name}/mpi_*.so -%{_libdir}/%{name}/node_features_knl_generic.so +%{_libdir}/%{name}/node_features_*.so +%{_libdir}/%{name}/openapi_*.so %{_libdir}/%{name}/power_none.so %{_libdir}/%{name}/preempt_*.so %{_libdir}/%{name}/prep_script.so @@ -472,6 +459,7 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %{_libdir}/%{name}/route_*.so %{_libdir}/%{name}/sched_*.so %{_libdir}/%{name}/select_*.so +%{_libdir}/%{name}/serializer_*.so %{_libdir}/%{name}/site_factor_none.so %{_libdir}/%{name}/slurmctld_nonstop.so %{_libdir}/%{name}/switch_*.so @@ -505,6 +493,7 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %{_mandir}/man5/job_container.conf.5* %{_mandir}/man5/knl.conf.5* %{_mandir}/man5/nonstop.conf.5* +%{_mandir}/man5/oci.conf.5* %{_mandir}/man5/slurm.conf.5* %{_mandir}/man5/topology.conf.5* %{_mandir}/man8/slurmrestd.8* @@ -523,15 +512,18 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %dir %{_libdir}/%{name}/src %dir %{_libdir}/%{name}/src/sattach %dir %{_libdir}/%{name}/src/srun +%{_includedir}/%{name}/pmi*.h %{_includedir}/%{name}/slurm.h %{_includedir}/%{name}/slurm_errno.h +%{_includedir}/%{name}/slurm_version.h %{_includedir}/%{name}/slurmdb.h %{_includedir}/%{name}/smd_ns.h %{_includedir}/%{name}/spank.h +%{_libdir}/libpmi.so +%{_libdir}/libpmi2.so %{_libdir}/libslurm.so %{_libdir}/%{name}/src/sattach/sattach.wrapper.c %{_libdir}/%{name}/src/srun/srun.wrapper.c -%{_mandir}/man3/*.3.* # --------- # Slurm-doc @@ -571,27 +563,12 @@ fi # ---------- %files libs +%{_libdir}/libpmi.so.0* +%{_libdir}/libpmi2.so.0* %{_libdir}/libslurm.so.* %{_libdir}/libslurmfull-*.so %{_libdir}/libslurm_pmi-*.so -# --------- -# Slurm-pmi -# --------- - -%files pmi -%{_libdir}/libpmi.so.0* -%{_libdir}/libpmi2.so.0* - -# --------------- -# Slurm-pmi-devel -# --------------- - -%files pmi-devel -%{_includedir}/%{name}/pmi*.h -%{_libdir}/libpmi.so -%{_libdir}/libpmi2.so - # ------------- # Slurm-rrdtool # ------------- @@ -769,6 +746,11 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Fri Oct 8 2021 Philip Kovacs - 21.08.2-1 +- Update to 21.08.2 +- Added Fedora patches to support pmix v4 +- Remove slurm-pmi(-devel) subpackages + * Tue Aug 10 2021 Orion Poplawski - 20.11.8-4 - Rebuild for hdf5 1.10.7 diff --git a/slurm_detect_pmix_v4.patch b/slurm_detect_pmix_v4.patch new file mode 100644 index 0000000..032fb79 --- /dev/null +++ b/slurm_detect_pmix_v4.patch @@ -0,0 +1,14 @@ +diff --git a/auxdir/x_ac_pmix.m4 b/auxdir/x_ac_pmix.m4 +index f40d39fa8e..f5221bf8cf 100755 +--- a/auxdir/x_ac_pmix.m4 ++++ b/auxdir/x_ac_pmix.m4 +@@ -188,7 +188,8 @@ AC_DEFUN([X_AC_PMIX], + + AM_CONDITIONAL(HAVE_PMIX, [test $_x_ac_pmix_v1_found = "1"] || + [test $_x_ac_pmix_v2_found = "1"] || +- [test $_x_ac_pmix_v3_found = "1"] ) ++ [test $_x_ac_pmix_v3_found = "1"] || ++ [test $_x_ac_pmix_v4_found = "1"]) + AM_CONDITIONAL(HAVE_PMIX_V1, [test $_x_ac_pmix_v1_found = "1"]) + AM_CONDITIONAL(HAVE_PMIX_V2, [test $_x_ac_pmix_v2_found = "1"]) + AM_CONDITIONAL(HAVE_PMIX_V3, [test $_x_ac_pmix_v3_found = "1"]) diff --git a/slurm_pmix_soname.patch b/slurm_pmix_soname.patch index 39ee74f..633dd81 100644 --- a/slurm_pmix_soname.patch +++ b/slurm_pmix_soname.patch @@ -1,10 +1,22 @@ diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c -index 1bf287ff44..8702a2bd17 100644 +index 69c5191112..1d0080dd77 100644 --- a/src/plugins/mpi/pmix/mpi_pmix.c +++ b/src/plugins/mpi/pmix/mpi_pmix.c -@@ -109,7 +109,7 @@ static void *_libpmix_open(void) +@@ -87,6 +87,8 @@ const char plugin_type[] = "mpi/pmix_v1"; + const char plugin_type[] = "mpi/pmix_v2"; + #elif (HAVE_PMIX_VER == 3) + const char plugin_type[] = "mpi/pmix_v3"; ++#elif (HAVE_PMIX_VER == 4) ++const char plugin_type[] = "mpi/pmix_v4"; + #endif + + const uint32_t plugin_version = SLURM_VERSION_NUMBER; +@@ -112,8 +114,10 @@ static void *_libpmix_open(void) + xstrfmtcat(full_path, "%s/", PMIXP_V2_LIBPATH); #elif defined PMIXP_V3_LIBPATH xstrfmtcat(full_path, "%s/", PMIXP_V3_LIBPATH); ++#elif defined PMIXP_V4_LIBPATH ++ xstrfmtcat(full_path, "%s/", PMIXP_V4_LIBPATH); #endif - xstrfmtcat(full_path, "libpmix.so"); + xstrfmtcat(full_path, "libpmix.so.2"); @@ -12,10 +24,10 @@ index 1bf287ff44..8702a2bd17 100644 lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); xfree(full_path); diff --git a/src/plugins/mpi/pmix/pmixp_dconn_ucx.c b/src/plugins/mpi/pmix/pmixp_dconn_ucx.c -index f6c91adc93..6021faa01e 100644 +index 44013246e3..96c40b5c3a 100644 --- a/src/plugins/mpi/pmix/pmixp_dconn_ucx.c +++ b/src/plugins/mpi/pmix/pmixp_dconn_ucx.c -@@ -167,7 +167,7 @@ static int _load_ucx_lib() +@@ -169,7 +169,7 @@ static int _load_ucx_lib() * we have from autoconf */ char *full_path = NULL; @@ -24,7 +36,7 @@ index f6c91adc93..6021faa01e 100644 _ucx_lib_handler = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); xfree(full_path); if (_ucx_lib_handler) { -@@ -178,7 +178,7 @@ static int _load_ucx_lib() +@@ -180,7 +180,7 @@ static int _load_ucx_lib() * known by dynamic linker. */ #endif diff --git a/slurm_without_cray.patch b/slurm_without_cray.patch index c05191a..f917445 100644 --- a/slurm_without_cray.patch +++ b/slurm_without_cray.patch @@ -1,21 +1,21 @@ diff --git a/contribs/Makefile.am b/contribs/Makefile.am -index 3f6fac0a85..6c466b4eb5 100644 +index f08b1b0440..110dd03757 100644 --- a/contribs/Makefile.am +++ b/contribs/Makefile.am @@ -1 +1 @@ --SUBDIRS = cray lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque -+SUBDIRS = lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque +-SUBDIRS = cray lua nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque ++SUBDIRS = lua nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque diff --git a/src/plugins/burst_buffer/Makefile.am b/src/plugins/burst_buffer/Makefile.am -index c187bb83bd..aabd7f3fe8 100644 +index e55b18af47..3c4cf98f2c 100644 --- a/src/plugins/burst_buffer/Makefile.am +++ b/src/plugins/burst_buffer/Makefile.am -@@ -2,6 +2,3 @@ +@@ -3,5 +3,5 @@ + SUBDIRS = common - SUBDIRS = generic - --if WITH_JSON_PARSER --SUBDIRS += datawarp --endif + if WITH_JSON_PARSER +-SUBDIRS += datawarp lua ++SUBDIRS += lua + endif diff --git a/src/plugins/core_spec/Makefile.am b/src/plugins/core_spec/Makefile.am index 44b1ed67c0..f06bc541d7 100644 --- a/src/plugins/core_spec/Makefile.am @@ -50,14 +50,14 @@ index 4d055e2030..1a44dfb2ab 100644 SUBDIRS += pmix endif diff --git a/src/plugins/node_features/Makefile.am b/src/plugins/node_features/Makefile.am -index f5ef036303..d955c51ba1 100644 +index b065610c2b..c3745f42b6 100644 --- a/src/plugins/node_features/Makefile.am +++ b/src/plugins/node_features/Makefile.am @@ -1,3 +1,3 @@ # Makefile for node_features plugins --SUBDIRS = knl_cray knl_generic -+SUBDIRS = knl_generic +-SUBDIRS = helpers knl_cray knl_generic ++SUBDIRS = helpers knl_generic diff --git a/src/plugins/power/Makefile.am b/src/plugins/power/Makefile.am index ccde44c322..c6171740c1 100644 --- a/src/plugins/power/Makefile.am diff --git a/sources b/sources index 1d786b3..fbefb25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-20.11.8.tar.bz2) = f67e6ebafef07eda9776a4545f0bf28a926f3c2e1269ce22a422a708d6d743df93e5fd87fa454f652f1e933ff9e233a49b8c27afa04d5717266d690098d88a06 +SHA512 (slurm-21.08.2.tar.bz2) = cb65093a0ac1587b95deb17096bad108d16c4aaae29008deb037a36ef929035cc3b866d68ef0a54dc8d14f777402846919b5616c1b31f32c6c7cd82eb3ef99e7 From 08b8e5edbaeb5924a45512693c14200342f07dbf Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Sun, 31 Oct 2021 19:27:15 -0400 Subject: [PATCH 28/61] Correct log rotation problems (#2016683, #2018508) --- slurm.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/slurm.spec b/slurm.spec index 494e73a..f4b847a 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 21.08.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -318,7 +318,7 @@ EOF install -d -m 0755 %{buildroot}%{_var}/log/%{name} install -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d cat >%{buildroot}%{_sysconfdir}/logrotate.d/%{name} < - 21.08.2-2 +- Correct log rotation problems (#2016683, #2018508) + * Fri Oct 8 2021 Philip Kovacs - 21.08.2-1 - Update to 21.08.2 - Added Fedora patches to support pmix v4 From 4fdcae63455c5e2224d64e27a9ec16e84d954213 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Wed, 17 Nov 2021 22:55:02 -0500 Subject: [PATCH 29/61] Update to 21.08.4 Closes security issue CVE-2021-43337 --- slurm.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/slurm.spec b/slurm.spec index f4b847a..2e076fd 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,8 +15,8 @@ %endif Name: slurm -Version: 21.08.2 -Release: 2%{?dist} +Version: 21.08.4 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -746,6 +746,10 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Wed Nov 17 2021 Philip Kovacs - 21.08.4-1 +- Update to 21.08.4 +- Closes security issue CVE-2021-43337 + * Sun Oct 31 2021 Philip Kovacs - 21.08.2-2 - Correct log rotation problems (#2016683, #2018508) diff --git a/sources b/sources index fbefb25..ea1e813 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-21.08.2.tar.bz2) = cb65093a0ac1587b95deb17096bad108d16c4aaae29008deb037a36ef929035cc3b866d68ef0a54dc8d14f777402846919b5616c1b31f32c6c7cd82eb3ef99e7 +SHA512 (slurm-21.08.4.tar.bz2) = 34c5db2aa98311d10d23554243b590849c7af24a2fa5161853d85b40e68c0ca2e2d2c3df2664367db1893077a6eabdb44f92eacd67a624e488e62f361d58b0c8 From e8d131e9e18da24fc1ead921010f15c31dc4b39b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 20 Nov 2021 21:43:09 -0700 Subject: [PATCH 30/61] Rebuild for hdf5 1.12.1 --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 2e076fd..33462c7 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 21.08.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -746,6 +746,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Sun Nov 21 2021 Orion Poplawski - 21.08.4-2 +- Rebuild for hdf5 1.12.1 + * Wed Nov 17 2021 Philip Kovacs - 21.08.4-1 - Update to 21.08.4 - Closes security issue CVE-2021-43337 From 7519167b3a188f0f47649b268b49c348d38a3877 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Fri, 14 Jan 2022 06:43:28 -0500 Subject: [PATCH 31/61] Update to 21.08.5 --- slurm.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/slurm.spec b/slurm.spec index 33462c7..7be568d 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,8 +15,8 @@ %endif Name: slurm -Version: 21.08.4 -Release: 2%{?dist} +Version: 21.08.5 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -491,6 +491,7 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %{_mandir}/man5/cgroup.conf.5* %{_mandir}/man5/ext_sensors.conf.5* %{_mandir}/man5/gres.conf.5* +%{_mandir}/man5/helpers.conf.5* %{_mandir}/man5/job_container.conf.5* %{_mandir}/man5/knl.conf.5* %{_mandir}/man5/nonstop.conf.5* @@ -746,6 +747,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Fri Jan 14 2022 Philip Kovacs - 21.08.5-1 +- Update to 21.08.5 + * Sun Nov 21 2021 Orion Poplawski - 21.08.4-2 - Rebuild for hdf5 1.12.1 diff --git a/sources b/sources index ea1e813..688a773 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-21.08.4.tar.bz2) = 34c5db2aa98311d10d23554243b590849c7af24a2fa5161853d85b40e68c0ca2e2d2c3df2664367db1893077a6eabdb44f92eacd67a624e488e62f361d58b0c8 +SHA512 (slurm-21.08.5.tar.bz2) = fb83d72da401f2abb4a33287aefa7309af6a5071e8fd18fecc5d9794cc2a7010ac40ebaa3785855f80260d5bfc3dda634730f5522765ef73ae2d6a4a602c7251 From e1f3111a97f96a759c51fc6986aaad13fc03c297 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 01:08:56 +0000 Subject: [PATCH 32/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 7be568d..419f68d 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 21.08.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -747,6 +747,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 21.08.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jan 14 2022 Philip Kovacs - 21.08.5-1 - Update to 21.08.5 From 85fdf9736df1c89a83c4287f7be8ef6d056d776a Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Sun, 3 Apr 2022 14:34:32 -0400 Subject: [PATCH 33/61] Update to 21.08.6 --- slurm.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/slurm.spec b/slurm.spec index 419f68d..0014b81 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,8 +15,8 @@ %endif Name: slurm -Version: 21.08.5 -Release: 2%{?dist} +Version: 21.08.6 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -443,6 +443,7 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %{_libdir}/%{name}/ext_sensors_none.so %{_libdir}/%{name}/gres_*.so %{_libdir}/%{name}/gpu_generic.so +%{_libdir}/%{name}/hash_k12.so %{_libdir}/%{name}/job_container_*.so %{_libdir}/%{name}/job_submit_*.so %{_libdir}/%{name}/jobacct_gather_*.so @@ -747,6 +748,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Sat Apr 2 2022 Philip Kovacs - 21.08.6-1 +- Update to 21.08.6 + * Sat Jan 22 2022 Fedora Release Engineering - 21.08.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 688a773..ddfd2b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-21.08.5.tar.bz2) = fb83d72da401f2abb4a33287aefa7309af6a5071e8fd18fecc5d9794cc2a7010ac40ebaa3785855f80260d5bfc3dda634730f5522765ef73ae2d6a4a602c7251 +SHA512 (slurm-21.08.6.tar.bz2) = 7b190444fcba7cdb5fe93bac9127febc30178c45642a8c870a33a4e6104c97746b95398b34b8243ccb39e17ba04709ae7cc650b7453950c20fa27599b2fefb0e From 3dcc9758ce208b45d3f83b0c9c72aff60d031aec Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 5 May 2022 15:52:55 -0500 Subject: [PATCH 34/61] Update to 21.08.8, resolves: rhbz#2082276 - Fix CVE-2022-29500, resolves: rhbz#2082286 - Fix CVE-2022-29501, resolves: rhbz#2082289 - Fix CVE-2022-29502, resolves: rhbz#2082293 --- slurm.spec | 8 +++++++- sources | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/slurm.spec b/slurm.spec index 0014b81..5211215 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,7 +15,7 @@ %endif Name: slurm -Version: 21.08.6 +Version: 21.08.8 Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD @@ -748,6 +748,12 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Thu May 05 2022 Carl George - 21.08.8-1 +- Update to 21.08.8, resolves: rhbz#2082276 +- Fix CVE-2022-29500, resolves: rhbz#2082286 +- Fix CVE-2022-29501, resolves: rhbz#2082289 +- Fix CVE-2022-29502, resolves: rhbz#2082293 + * Sat Apr 2 2022 Philip Kovacs - 21.08.6-1 - Update to 21.08.6 diff --git a/sources b/sources index ddfd2b2..7580b63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-21.08.6.tar.bz2) = 7b190444fcba7cdb5fe93bac9127febc30178c45642a8c870a33a4e6104c97746b95398b34b8243ccb39e17ba04709ae7cc650b7453950c20fa27599b2fefb0e +SHA512 (slurm-21.08.8.tar.bz2) = 780b64760b32b10ecdec5ebd8d97ee354527e8052b37cd1a3e9dfb85933bb89298d4cf902fd0beb6e8d54aa3f151f735e6fbae01fb5213d0de2de4c384083f7c From ce7f5589371076b13e65ca22179718f038db3173 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Mon, 9 May 2022 19:42:09 -0400 Subject: [PATCH 35/61] Update to 21.08.8-2 (upstream re-release) --- slurm.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/slurm.spec b/slurm.spec index 5211215..4c822b4 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,5 +1,5 @@ # Upstream tarballs use an additional release number -%global ups_rel 1 +%global ups_rel 2 %if "%{ups_rel}" == "1" %global name_version %{name}-%{version} @@ -16,7 +16,7 @@ Name: slurm Version: 21.08.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -748,6 +748,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Mon May 9 2022 Philip Kovacs - 21.08.8-2 +- Update to 21.08.8-2 (upstream re-release) + * Thu May 05 2022 Carl George - 21.08.8-1 - Update to 21.08.8, resolves: rhbz#2082276 - Fix CVE-2022-29500, resolves: rhbz#2082286 diff --git a/sources b/sources index 7580b63..b969990 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-21.08.8.tar.bz2) = 780b64760b32b10ecdec5ebd8d97ee354527e8052b37cd1a3e9dfb85933bb89298d4cf902fd0beb6e8d54aa3f151f735e6fbae01fb5213d0de2de4c384083f7c +SHA512 (slurm-21.08.8-2.tar.bz2) = 04f28ed007548367b065ced9da7dc633043974980f0a0593d9e0bb0a2058e81ab34c4a5da8161f04af9209f8968df5b859621008e72d20406f674be9c91cf06c From 54d91f7e746828a45b04959b520f0b3564d086e7 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 30 May 2022 19:52:52 +0200 Subject: [PATCH 36/61] Perl 5.36 rebuild --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 4c822b4..91d8be8 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 21.08.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -748,6 +748,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Mon May 30 2022 Jitka Plesnikova - 21.08.8-3 +- Perl 5.36 rebuild + * Mon May 9 2022 Philip Kovacs - 21.08.8-2 - Update to 21.08.8-2 (upstream re-release) From 462f733af9cdb45270f8c57681fa2c4901af89fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:52:01 +0000 Subject: [PATCH 37/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 91d8be8..a103b66 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 21.08.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -748,6 +748,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 21.08.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon May 30 2022 Jitka Plesnikova - 21.08.8-3 - Perl 5.36 rebuild From 9ce5ef6046d733a597498005830723097b978eb1 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Mon, 5 Sep 2022 22:01:58 -0400 Subject: [PATCH 38/61] Thanks Cristian Le (fedora@lecris.me) for his contributions Update to 22.05.3 --- slurm.spec | 53 +++++---- slurm_detect_pmix_v4.patch | 14 --- ...oname.patch => slurm_runtime_linking.patch | 20 +--- slurm_without_cray.patch | 106 ------------------ sources | 2 +- 5 files changed, 34 insertions(+), 161 deletions(-) delete mode 100644 slurm_detect_pmix_v4.patch rename slurm_pmix_soname.patch => slurm_runtime_linking.patch (66%) delete mode 100644 slurm_without_cray.patch diff --git a/slurm.spec b/slurm.spec index a103b66..44912b8 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,5 +1,5 @@ # Upstream tarballs use an additional release number -%global ups_rel 2 +%global ups_rel 1 %if "%{ups_rel}" == "1" %global name_version %{name}-%{version} @@ -15,12 +15,12 @@ %endif Name: slurm -Version: 21.08.8 -Release: 4%{?dist} +Version: 22.05.3 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ -Source0: http://www.schedmd.com/download/latest/%{name_version}.tar.bz2 +Source0: https://download.schedmd.com/slurm/%{name_version}.tar.bz2 Source1: slurm.conf Source2: slurmdbd.conf Source3: slurm-sview.desktop @@ -31,27 +31,27 @@ Source5: slurm-setuser.in Patch0: slurm_release_version.patch # Build-related patches -Patch10: slurm_perlapi_rpaths.patch +Patch10: slurm_check_version.patch Patch11: slurm_html_doc_path.patch -Patch12: slurm_without_cray.patch -Patch13: slurm_check_version.patch -Patch14: slurm_detect_pmix_v4.patch +Patch12: slurm_perlapi_rpaths.patch # Other patches -Patch20: slurm_pmix_soname.patch +Patch20: slurm_runtime_linking.patch Patch21: slurm_to_python3.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: dbus-devel BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: make +BuildRequires: man2html BuildRequires: perl-devel BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: perl-interpreter BuildRequires: perl-macros BuildRequires: perl-podlators -%if !0%{?el7} +%if 0%{?epel} != 7 BuildRequires: pkgconf %else BuildRequires: pkgconfig @@ -83,7 +83,7 @@ BuildRequires: ucx-devel %endif # create slurm-slurmrestd package for Fedora >= 34 and EPEL7/8 -%if (0%{?fedora} >= 34) || 0%{?el7} || 0%{?el8} +%if (0%{?fedora} >= 34) || (0%{?epel} >= 7) BuildRequires: http-parser-devel BuildRequires: json-c-devel BuildRequires: libjwt-devel @@ -165,7 +165,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Slurm database daemon. Used to accept and process database RPCs and upload database changes to slurmctld daemons on each cluster. -%if (0%{?fedora} >= 34) || 0%{?el7} || 0%{?el8} +%if (0%{?fedora} >= 34) || (0%{?epel} >= 7) %package slurmrestd Summary: Slurm REST API deamon Requires: %{name}%{?_isa} = %{version}-%{release} @@ -253,14 +253,15 @@ export LDFLAGS="%{build_ldflags} -Wl,-z,lazy" %if 0%{?fedora} && %{with ucx} --with-ucx=%{_prefix} \ %endif + --enable-pam \ + --enable-really-no-cray \ --enable-shared \ --enable-x11 \ --disable-static \ --disable-debug \ - --disable-developer \ --disable-salloc-background \ - --disable-multiple-slurmd \ --disable-partial_attach \ + --with-oneapi=no \ --with-shared-libslurm \ --without-rpath # patch libtool to remove rpaths @@ -379,7 +380,11 @@ rm -f %{buildroot}%{_libdir}/%{name}/job_submit_defaults.so rm -f %{buildroot}%{_libdir}/%{name}/job_submit_logging.so rm -f %{buildroot}%{_libdir}/%{name}/job_submit_partition.so # remove cray files +rm -f %{buildroot}%{_libdir}/%{name}/*datawarp*.so +rm -f %{buildroot}%{_libdir}/%{name}/*cray*.so rm -f %{buildroot}%{_mandir}/man5/cray* +rm -f %{buildroot}%{_sbindir}/capmc* +rm -f %{buildroot}%{_sbindir}/slurmsmwd* # remove perl cruft rm -f %{buildroot}%{perl_vendorarch}/auto/Slurm*/.packlist rm -f %{buildroot}%{perl_vendorarch}/auto/Slurm*/Slurm*.bs @@ -431,12 +436,13 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %{_bindir}/%{name}-setuser %{_libdir}/%{name}/accounting_storage_*.so %{_libdir}/%{name}/acct_gather_*.so -%if (0%{?fedora} >= 34) || 0%{?el7} || 0%{?el8} +%if (0%{?fedora} >= 34) || (0%{?epel} >= 7) %{_libdir}/%{name}/auth_jwt.so %endif %{_libdir}/%{name}/auth_munge.so %{_libdir}/%{name}/burst_buffer_lua.so %{_libdir}/%{name}/cgroup_v1.so +%{_libdir}/%{name}/cgroup_v2.so %{_libdir}/%{name}/cli_filter_*.so %{_libdir}/%{name}/core_spec_none.so %{_libdir}/%{name}/cred_*.so @@ -452,7 +458,6 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %{_libdir}/%{name}/mcs_*.so %{_libdir}/%{name}/mpi_*.so %{_libdir}/%{name}/node_features_*.so -%{_libdir}/%{name}/openapi_*.so %{_libdir}/%{name}/power_none.so %{_libdir}/%{name}/preempt_*.so %{_libdir}/%{name}/prep_script.so @@ -495,6 +500,7 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %{_mandir}/man5/helpers.conf.5* %{_mandir}/man5/job_container.conf.5* %{_mandir}/man5/knl.conf.5* +%{_mandir}/man5/mpi.conf.5* %{_mandir}/man5/nonstop.conf.5* %{_mandir}/man5/oci.conf.5* %{_mandir}/man5/slurm.conf.5* @@ -532,9 +538,7 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service # --------- %files doc -%dir %{_docdir}/%{name} -%dir %{_docdir}/%{name}/html -%{_docdir}/%{name}/html/* +%{_docdir} # --------- # Slurm-gui @@ -620,11 +624,8 @@ fi %if (0%{?fedora} >= 34) || 0%{?el7} || 0%{?el8} %files slurmrestd -%{_libdir}/%{name}/openapi_dbv0_0_36.so -%{_libdir}/%{name}/openapi_v0_0_36.so -%{_libdir}/%{name}/openapi_v0_0_35.so -%{_libdir}/%{name}/rest_auth_jwt.so -%{_libdir}/%{name}/rest_auth_local.so +%{_libdir}/%{name}/openapi*.so +%{_libdir}/%{name}/rest*.so %{_sbindir}/slurmrestd %{_unitdir}/slurmrestd.service %endif @@ -748,6 +749,10 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Mon Sep 5 2022 Philip Kovacs - 22.05.3-1 +- Thanks Cristian Le (fedora@lecris.me) for his contributions +- Update to 22.05.3 + * Sat Jul 23 2022 Fedora Release Engineering - 21.08.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/slurm_detect_pmix_v4.patch b/slurm_detect_pmix_v4.patch deleted file mode 100644 index 032fb79..0000000 --- a/slurm_detect_pmix_v4.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/auxdir/x_ac_pmix.m4 b/auxdir/x_ac_pmix.m4 -index f40d39fa8e..f5221bf8cf 100755 ---- a/auxdir/x_ac_pmix.m4 -+++ b/auxdir/x_ac_pmix.m4 -@@ -188,7 +188,8 @@ AC_DEFUN([X_AC_PMIX], - - AM_CONDITIONAL(HAVE_PMIX, [test $_x_ac_pmix_v1_found = "1"] || - [test $_x_ac_pmix_v2_found = "1"] || -- [test $_x_ac_pmix_v3_found = "1"] ) -+ [test $_x_ac_pmix_v3_found = "1"] || -+ [test $_x_ac_pmix_v4_found = "1"]) - AM_CONDITIONAL(HAVE_PMIX_V1, [test $_x_ac_pmix_v1_found = "1"]) - AM_CONDITIONAL(HAVE_PMIX_V2, [test $_x_ac_pmix_v2_found = "1"]) - AM_CONDITIONAL(HAVE_PMIX_V3, [test $_x_ac_pmix_v3_found = "1"]) diff --git a/slurm_pmix_soname.patch b/slurm_runtime_linking.patch similarity index 66% rename from slurm_pmix_soname.patch rename to slurm_runtime_linking.patch index 633dd81..e4435e9 100644 --- a/slurm_pmix_soname.patch +++ b/slurm_runtime_linking.patch @@ -1,22 +1,10 @@ diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c -index 69c5191112..1d0080dd77 100644 +index 626065f269..d2623695be 100644 --- a/src/plugins/mpi/pmix/mpi_pmix.c +++ b/src/plugins/mpi/pmix/mpi_pmix.c -@@ -87,6 +87,8 @@ const char plugin_type[] = "mpi/pmix_v1"; - const char plugin_type[] = "mpi/pmix_v2"; - #elif (HAVE_PMIX_VER == 3) - const char plugin_type[] = "mpi/pmix_v3"; -+#elif (HAVE_PMIX_VER == 4) -+const char plugin_type[] = "mpi/pmix_v4"; - #endif - - const uint32_t plugin_version = SLURM_VERSION_NUMBER; -@@ -112,8 +114,10 @@ static void *_libpmix_open(void) - xstrfmtcat(full_path, "%s/", PMIXP_V2_LIBPATH); - #elif defined PMIXP_V3_LIBPATH - xstrfmtcat(full_path, "%s/", PMIXP_V3_LIBPATH); -+#elif defined PMIXP_V4_LIBPATH -+ xstrfmtcat(full_path, "%s/", PMIXP_V4_LIBPATH); +@@ -137,7 +137,7 @@ static void *_libpmix_open(void) + #elif defined PMIXP_V4_LIBPATH + xstrfmtcat(full_path, "%s/", PMIXP_V4_LIBPATH); #endif - xstrfmtcat(full_path, "libpmix.so"); + xstrfmtcat(full_path, "libpmix.so.2"); diff --git a/slurm_without_cray.patch b/slurm_without_cray.patch deleted file mode 100644 index f917445..0000000 --- a/slurm_without_cray.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/contribs/Makefile.am b/contribs/Makefile.am -index f08b1b0440..110dd03757 100644 ---- a/contribs/Makefile.am -+++ b/contribs/Makefile.am -@@ -1 +1 @@ --SUBDIRS = cray lua nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque -+SUBDIRS = lua nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque -diff --git a/src/plugins/burst_buffer/Makefile.am b/src/plugins/burst_buffer/Makefile.am -index e55b18af47..3c4cf98f2c 100644 ---- a/src/plugins/burst_buffer/Makefile.am -+++ b/src/plugins/burst_buffer/Makefile.am -@@ -3,5 +3,5 @@ - SUBDIRS = common - - if WITH_JSON_PARSER --SUBDIRS += datawarp lua -+SUBDIRS += lua - endif -diff --git a/src/plugins/core_spec/Makefile.am b/src/plugins/core_spec/Makefile.am -index 44b1ed67c0..f06bc541d7 100644 ---- a/src/plugins/core_spec/Makefile.am -+++ b/src/plugins/core_spec/Makefile.am -@@ -1,3 +1,3 @@ - # Makefile for core specialization plugins - --SUBDIRS = cray_aries none -+SUBDIRS = none -diff --git a/src/plugins/job_submit/Makefile.am b/src/plugins/job_submit/Makefile.am -index e393bcfb1c..b98cf2e000 100644 ---- a/src/plugins/job_submit/Makefile.am -+++ b/src/plugins/job_submit/Makefile.am -@@ -2,7 +2,6 @@ - - SUBDIRS = \ - all_partitions \ -- cray_aries \ - defaults \ - logging \ - lua \ -diff --git a/src/plugins/mpi/Makefile.am b/src/plugins/mpi/Makefile.am -index 4d055e2030..1a44dfb2ab 100644 ---- a/src/plugins/mpi/Makefile.am -+++ b/src/plugins/mpi/Makefile.am -@@ -1,6 +1,6 @@ - # Makefile for mpi plugins - --SUBDIRS = cray_shasta none pmi2 -+SUBDIRS = none pmi2 - if HAVE_PMIX - SUBDIRS += pmix - endif -diff --git a/src/plugins/node_features/Makefile.am b/src/plugins/node_features/Makefile.am -index b065610c2b..c3745f42b6 100644 ---- a/src/plugins/node_features/Makefile.am -+++ b/src/plugins/node_features/Makefile.am -@@ -1,3 +1,3 @@ - # Makefile for node_features plugins - --SUBDIRS = helpers knl_cray knl_generic -+SUBDIRS = helpers knl_generic -diff --git a/src/plugins/power/Makefile.am b/src/plugins/power/Makefile.am -index ccde44c322..c6171740c1 100644 ---- a/src/plugins/power/Makefile.am -+++ b/src/plugins/power/Makefile.am -@@ -1,3 +1,3 @@ - # Makefile for power management plugins - --SUBDIRS = common cray_aries none -+SUBDIRS = common none -diff --git a/src/plugins/select/Makefile.am b/src/plugins/select/Makefile.am -index 38bae0ff5c..ca7133f43f 100644 ---- a/src/plugins/select/Makefile.am -+++ b/src/plugins/select/Makefile.am -@@ -1,7 +1,7 @@ - # Makefile for node selection plugins - - # NOTE: other must be in the list before cray_aries lest the build break --SUBDIRS = other cons_common cons_res cons_tres cray_aries linear -+SUBDIRS = other cons_common cons_res cons_tres linear - - # Each plugin here needs a plugin_id. - # Here are the current plugin_ids for each plugin. -diff --git a/src/plugins/switch/Makefile.am b/src/plugins/switch/Makefile.am -index 365f5b8d93..dc56a01a55 100644 ---- a/src/plugins/switch/Makefile.am -+++ b/src/plugins/switch/Makefile.am -@@ -1,7 +1,3 @@ - # Makefile for switch plugins - - SUBDIRS = none -- --if WITH_SWITCH_CRAY_ARIES --SUBDIRS += cray_aries --endif -diff --git a/src/plugins/task/Makefile.am b/src/plugins/task/Makefile.am -index f79282f3e6..356cdcd500 100644 ---- a/src/plugins/task/Makefile.am -+++ b/src/plugins/task/Makefile.am -@@ -1,6 +1,6 @@ - # Makefile for task plugins - --SUBDIRS = affinity cray_aries none -+SUBDIRS = affinity none - - if WITH_CGROUP - SUBDIRS += cgroup diff --git a/sources b/sources index b969990..9067673 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-21.08.8-2.tar.bz2) = 04f28ed007548367b065ced9da7dc633043974980f0a0593d9e0bb0a2058e81ab34c4a5da8161f04af9209f8968df5b859621008e72d20406f674be9c91cf06c +SHA512 (slurm-22.05.3.tar.bz2) = a500fb657f7d4d3d063307e176e26e537962434ff73ad8d13e16c34c70e94916fdab4e08e23d40aedec7edd86be996d2366e82fcb952c83f5498e59ca47c3f21 From acac118b28663b3c1ed0587dda8e77dc7e7537d0 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Tue, 6 Sep 2022 22:13:46 -0400 Subject: [PATCH 39/61] local build --- changelog | 305 +++++++++++++++++++++++++++++++++++++++++++++++++++ slurm.spec | 312 ++--------------------------------------------------- 2 files changed, 312 insertions(+), 305 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..0e11e1a --- /dev/null +++ b/changelog @@ -0,0 +1,305 @@ +* Tues Sep 6 2022 Philip Kovacs - 22.05.3-2 +- Add slurm to epel9 (#2072632) +- Update spec for epel 7/8/9 +- Use %autochangelog macro; add changelog file + +* Mon Sep 5 2022 Philip Kovacs - 22.05.3-1 +- Update to 22.05.3 +- Thanks Cristian Le (fedora@lecris.me) for his contributions + +* Sat Jul 23 2022 Fedora Release Engineering - 21.08.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon May 30 2022 Jitka Plesnikova - 21.08.8-3 +- Perl 5.36 rebuild + +* Mon May 9 2022 Philip Kovacs - 21.08.8-2 +- Update to 21.08.8-2 (upstream re-release) + +* Thu May 05 2022 Carl George - 21.08.8-1 +- Update to 21.08.8, resolves: rhbz#2082276 +- Fix CVE-2022-29500, resolves: rhbz#2082286 +- Fix CVE-2022-29501, resolves: rhbz#2082289 +- Fix CVE-2022-29502, resolves: rhbz#2082293 + +* Sat Apr 2 2022 Philip Kovacs - 21.08.6-1 +- Update to 21.08.6 + +* Sat Jan 22 2022 Fedora Release Engineering - 21.08.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jan 14 2022 Philip Kovacs - 21.08.5-1 +- Update to 21.08.5 + +* Sun Nov 21 2021 Orion Poplawski - 21.08.4-2 +- Rebuild for hdf5 1.12.1 + +* Wed Nov 17 2021 Philip Kovacs - 21.08.4-1 +- Update to 21.08.4 +- Closes security issue CVE-2021-43337 + +* Sun Oct 31 2021 Philip Kovacs - 21.08.2-2 +- Correct log rotation problems (#2016683, #2018508) + +* Fri Oct 8 2021 Philip Kovacs - 21.08.2-1 +- Update to 21.08.2 +- Added Fedora patches to support pmix v4 +- Remove slurm-pmi(-devel) subpackages + +* Tue Aug 10 2021 Orion Poplawski - 20.11.8-4 +- Rebuild for hdf5 1.10.7 + +* Fri Jul 23 2021 Fedora Release Engineering - 20.11.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 10 2021 Björn Esser - 20.11.8-2 +- Rebuild for versioned symbols in json-c + +* Sat Jul 3 2021 Philip Kovacs - 20.11.8-1 +- Update to 20.11.8 + +* Tue May 25 2021 Jitka Plesnikova - 20.11.7-4 +- Perl 5.34 re-rebuild updated packages + +* Mon May 24 2021 Philip Kovacs - 20.11.7-3 +- Move auth_jwt.so plugin to base package (#1947878) + +* Fri May 21 2021 Jitka Plesnikova - 20.11.7-2 +- Perl 5.34 rebuild + +* Sat May 15 2021 Philip Kovacs - 20.11.7-1 +- Update to 20.11.7 +- Closes security issue CVE-2021-31215 + +* Tue May 4 2021 Philip Kovacs - 20.11.6-1 +- Release of 20.11.6 + +* Mon Apr 12 2021 Philip Kovacs - 20.11.5-2 +- Add subpackage slurm-slurmrestd (Slurm REST API daemon) + +* Fri Mar 26 2021 Philip Kovacs - 20.11.5-1 +- Release of 20.11.5 + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 20.11.3-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Wed Jan 27 2021 Fedora Release Engineering - 20.11.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 19 2021 Philip Kovacs - 20.11.3-1 +- Release of 20.11.3 + +* Wed Jan 6 2021 Philip Kovacs - 20.11.2-2 +- Minor spec adjustments + +* Tue Jan 5 2021 Philip Kovacs - 20.11.2-1 +- Release of 20.11.2 + +* Tue Nov 17 2020 Philip Kovacs - 20.02.6-1 +- Release of 20.02.6 +- Closes security issues CVE-2020-27745 and CVE-2020-27746 + +* Wed Jul 29 2020 Fedora Release Engineering - 20.02.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jun 27 2020 Jitka Plesnikova - 20.02.3-4 +- Perl 5.32 re-rebuild updated packages + +* Thu Jun 25 2020 Orion Poplawski - 20.02.3-3 +- Rebuild for hdf5 1.10.6 + +* Mon Jun 22 2020 Jitka Plesnikova - 20.02.3-2 +- Perl 5.32 rebuild + +* Mon May 25 2020 Philip Kovacs - 20.02.3-1 +- Release of 20.02.3 + +* Tue May 5 2020 Philip Kovacs - 20.02.2-1 +- Release of 20.02.2 + +* Mon Mar 30 2020 Philip Kovacs - 19.05.6-1 +- Release of 19.05.6 + +* Thu Jan 30 2020 Fedora Release Engineering - 19.05.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 22 2020 Philip Kovacs - 19.05.5-2 +- Use cflag -fcommon to allow for building with gcc 10 + +* Mon Dec 23 2019 Philip Kovacs - 19.05.5-1 +- Release of 19.05.5 +- Closes security issues CVE-2019-19727, CVE-2019-19728 + +* Mon Nov 18 2019 Philip Kovacs - 19.05.4-1 +- Release of 19.05.4 + +* Mon Oct 7 2019 Philip Kovacs - 19.05.3-1 +- Release of 19.05.3 + +* Sun Aug 25 2019 Zbigniew Jędrzejewski-Szmek - 19.05.2-2 +- Rebuilt for hwloc-2.0 + +* Tue Aug 13 2019 Philip Kovacs - 19.05.2-1 +- Release of 19.05.2 + +* Fri Jul 26 2019 Fedora Release Engineering - 19.05.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jul 21 2019 Philip Kovacs - 19.05.1-2 +- Create slurm-pmi and slurm-pmi-devel subpackages for pmi/pmi2 libs +- Remove rpm-generated pkgconfig files until upstream provides them +- Do not pull dependencies with pkgconfig unless package uses it + +* Mon Jul 15 2019 Philip Kovacs - 19.05.1-1 +- Release of 19.05.1 +- Closes security issue (CVE-2019-12838) +- Configure for UCX support on supported arches + +* Tue Jul 2 2019 Philip Kovacs - 19.05.0-5 +- Do not install slurm implementation of libpmi/pmi2 libraries +- in favor of the faster implementation provided by pmix +- Remove pmi environment module formerly used to select the slurm +- vs pmix implementations of libpmi/pmi2 + +* Wed Jun 19 2019 Philip Kovacs - 19.05.0-4 +- Correct the configure for pmix +- Correct the slurm_pmix_soname patch + +* Wed Jun 19 2019 Philip Kovacs - 19.05.0-3 +- Stop using autotools macros that were removed from rpm + +* Sun Jun 9 2019 Philip Kovacs - 19.05.0-2 +- Exclude upstream-deprecated 32-bit architectures + +* Sun Jun 9 2019 Philip Kovacs - 19.05.0-1 +- Release of 19.05.0 +- Added nss_plugin subpackage for optional nss plugin +- Added patch to fix 19.05.0 testsuite +- Adjusted cray patch to remove all cray, cray_aries plugins +- Reflect all upstream plugin additions/deletions +- Remove openssl build dependency + +* Thu May 30 2019 Jitka Plesnikova - 18.08.7-2 +- Perl 5.30 rebuild + +* Fri Apr 12 2019 Philip Kovacs - 18.08.7-1 +- Release of 18.08.7 + +* Sat Mar 16 2019 Orion Poplawski - 18.08.6-2 +- Rebuild for hdf5 1.10.5 + +* Thu Mar 7 2019 Philip Kovacs - 18.08.6-1 +- Release of 18.08.6 + +* Sun Feb 17 2019 Igor Gnatenko - 18.08.5-2 +- Rebuild for readline 8.0 + +* Thu Jan 31 2019 Philip Kovacs - 18.08.5-1 +- Release of 18.08.5 + +* Thu Jan 31 2019 Philip Kovacs - 17.11.13-2 +- Fix build issue on 32-bit architectures + +* Wed Jan 30 2019 Philip Kovacs - 17.11.13-1 +- Release of 17.11.13 +- Closes security issue CVE-2019-6438 + +* Wed Oct 24 2018 Philip Kovacs - 17.11.12-1 +- Release of 17.11.12 + +* Sat Oct 20 2018 Philip Kovacs - 17.11.11-1 +- Release of 17.11.11 + +* Thu Oct 11 2018 Yu Watanabe - 17.11.10-1 +- Release of 17.11.10 + +* Fri Sep 28 2018 Philip Kovacs - 17.11.9-2 +- Release of 17.11.9-2 (new upstream tarball) + +* Fri Aug 10 2018 Philip Kovacs - 17.11.9-1 +- Release of 17.11.9 + +* Fri Jul 20 2018 Philip Kovacs - 17.11.8-1 +- Release of 17.11.8 + +* Sat Jul 14 2018 Fedora Release Engineering - 17.11.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jun 27 2018 Jitka Plesnikova - 17.11.7-2 +- Perl 5.28 rebuild + +* Fri Jun 1 2018 Philip Kovacs - 17.11.7-1 +- Release of 17.11.7 +- Closes security issue CVE-2018-10995 + +* Sat May 12 2018 Philip Kovacs - 17.11.6-1 +- Release of 17.11.6 +- Added patch to avoid building contribs/cray (Yu Watanabe) +- Added lz4 support via new BuildRequires (Yu Watanabe) +- Replaced obsolete packages libibmad-devel and libibumad-devel + with rdma-core-devel (Yu Watanabe) +- Updated package descriptions (Yu Watanabe) + +* Fri Mar 16 2018 Philip Kovacs - 17.11.5-1 +- Release of 17.11.5 +- Closes security issue CVE-2018-7033 + +* Sat Mar 3 2018 Philip Kovacs - 17.11.4-1 +- Release of 17.11.4 +- Add perl-devel, python3 to build requirements +- Add patch to convert python references to python3 +- Use LDFLAGS to disable -z now instaed of _hardened_ldflags + +* Thu Feb 15 2018 Philip Kovacs - 17.11.3-3 +- Add perl-interpreter to BuildRequires + +* Thu Feb 15 2018 Philip Kovacs - 17.11.3-2 +- Rebuild for libevent soname bump + +* Sat Feb 10 2018 Philip Kovacs - 17.11.3-1 +- Release of 17.11 series +- Re-aligned rpm packaging to be closer to upstream +- Enabled new slurm native X11 support using ssh2 +- Enabled new shared libslurm for smaller code size +- Enabled `check` unit testing via check-devel +- Added environment module support for pmi/slurm +- Add dependency to pmix +- Removed gtk-update-icon-cache scriptlets +- Use new ldconfig_scriptlets macro + +* Fri Feb 09 2018 Fedora Release Engineering - 17.02.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Nov 16 2017 Philip Kovacs - 17.02.9-3 +- Added patch to enable full relro builds and operation +- Added patch to link knl_generic plugin to libnuma if available +- Remove the following cray or bluegene-only plugins +- job_container/cncu, select/alps, select/bluegene +- Rename slurm_setuser to slurm-setuser +- Minor corrections to slurm.conf + +* Wed Nov 1 2017 Philip Kovacs - 17.02.9-2 +- Correct desktop categories for rpmgrill.desktop-lint + +* Wed Nov 1 2017 Philip Kovacs - 17.02.9-1 +- Version bump to close CVE-2017-15566 +- Adjusted patches per closure of upstream bug #3942 +- Added desktop categories per rpmgrill.desktop-lint + +* Wed Oct 25 2017 Philip Kovacs - 17.02.8-1 +- Version bump, patches adjusted + +* Thu Oct 5 2017 Philip Kovacs - 17.02.7-4 +- Patch changes per resolution of upstream bug #4101: +- salloc/sbatch/srun: must be root to use --uid/--gid options +- salloc: supplemental groups dropped after setuid + +* Thu Oct 5 2017 Philip Kovacs - 17.02.7-3 +- Added BuildRequires gcc and minor packaging conformance items + +* Sat Sep 16 2017 Philip Kovacs - 17.02.7-2 +- Removed unneeded Requires(pre) + +* Thu Sep 14 2017 Philip Kovacs - 17.02.7-1 +- Packaging for Fedora diff --git a/slurm.spec b/slurm.spec index 44912b8..7d102fa 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 22.05.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -36,6 +36,7 @@ Patch11: slurm_html_doc_path.patch Patch12: slurm_perlapi_rpaths.patch # Other patches +# https://bugs.schedmd.com/show_bug.cgi?id=14868 Patch20: slurm_runtime_linking.patch Patch21: slurm_to_python3.patch @@ -51,7 +52,7 @@ BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: perl-interpreter BuildRequires: perl-macros BuildRequires: perl-podlators -%if 0%{?epel} != 7 +%if (0%{?epel} != 7) BuildRequires: pkgconf %else BuildRequires: pkgconfig @@ -82,7 +83,7 @@ BuildRequires: zlib-devel BuildRequires: ucx-devel %endif -# create slurm-slurmrestd package for Fedora >= 34 and EPEL7/8 +# create slurm-slurmrestd package for Fedora >= 34 and EPEL7/8/9 %if (0%{?fedora} >= 34) || (0%{?epel} >= 7) BuildRequires: http-parser-devel BuildRequires: json-c-devel @@ -550,7 +551,7 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/sview.1* -%if 0%{?el7} +%if (0%{?epel} == 7) %post gui /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -622,7 +623,7 @@ fi # Slurm-slurmrestd # ---------------- -%if (0%{?fedora} >= 34) || 0%{?el7} || 0%{?el8} +%if (0%{?fedora} >= 34) || (0%{?epel} >= 7) %files slurmrestd %{_libdir}/%{name}/openapi*.so %{_libdir}/%{name}/rest*.so @@ -749,303 +750,4 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog -* Mon Sep 5 2022 Philip Kovacs - 22.05.3-1 -- Thanks Cristian Le (fedora@lecris.me) for his contributions -- Update to 22.05.3 - -* Sat Jul 23 2022 Fedora Release Engineering - 21.08.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon May 30 2022 Jitka Plesnikova - 21.08.8-3 -- Perl 5.36 rebuild - -* Mon May 9 2022 Philip Kovacs - 21.08.8-2 -- Update to 21.08.8-2 (upstream re-release) - -* Thu May 05 2022 Carl George - 21.08.8-1 -- Update to 21.08.8, resolves: rhbz#2082276 -- Fix CVE-2022-29500, resolves: rhbz#2082286 -- Fix CVE-2022-29501, resolves: rhbz#2082289 -- Fix CVE-2022-29502, resolves: rhbz#2082293 - -* Sat Apr 2 2022 Philip Kovacs - 21.08.6-1 -- Update to 21.08.6 - -* Sat Jan 22 2022 Fedora Release Engineering - 21.08.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jan 14 2022 Philip Kovacs - 21.08.5-1 -- Update to 21.08.5 - -* Sun Nov 21 2021 Orion Poplawski - 21.08.4-2 -- Rebuild for hdf5 1.12.1 - -* Wed Nov 17 2021 Philip Kovacs - 21.08.4-1 -- Update to 21.08.4 -- Closes security issue CVE-2021-43337 - -* Sun Oct 31 2021 Philip Kovacs - 21.08.2-2 -- Correct log rotation problems (#2016683, #2018508) - -* Fri Oct 8 2021 Philip Kovacs - 21.08.2-1 -- Update to 21.08.2 -- Added Fedora patches to support pmix v4 -- Remove slurm-pmi(-devel) subpackages - -* Tue Aug 10 2021 Orion Poplawski - 20.11.8-4 -- Rebuild for hdf5 1.10.7 - -* Fri Jul 23 2021 Fedora Release Engineering - 20.11.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 10 2021 Björn Esser - 20.11.8-2 -- Rebuild for versioned symbols in json-c - -* Sat Jul 3 2021 Philip Kovacs - 20.11.8-1 -- Update to 20.11.8 - -* Tue May 25 2021 Jitka Plesnikova - 20.11.7-4 -- Perl 5.34 re-rebuild updated packages - -* Mon May 24 2021 Philip Kovacs - 20.11.7-3 -- Move auth_jwt.so plugin to base package (#1947878) - -* Fri May 21 2021 Jitka Plesnikova - 20.11.7-2 -- Perl 5.34 rebuild - -* Sat May 15 2021 Philip Kovacs - 20.11.7-1 -- Update to 20.11.7 -- Closes security issue CVE-2021-31215 - -* Tue May 4 2021 Philip Kovacs - 20.11.6-1 -- Release of 20.11.6 - -* Mon Apr 12 2021 Philip Kovacs - 20.11.5-2 -- Add subpackage slurm-slurmrestd (Slurm REST API daemon) - -* Fri Mar 26 2021 Philip Kovacs - 20.11.5-1 -- Release of 20.11.5 - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 20.11.3-3 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Wed Jan 27 2021 Fedora Release Engineering - 20.11.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jan 19 2021 Philip Kovacs - 20.11.3-1 -- Release of 20.11.3 - -* Wed Jan 6 2021 Philip Kovacs - 20.11.2-2 -- Minor spec adjustments - -* Tue Jan 5 2021 Philip Kovacs - 20.11.2-1 -- Release of 20.11.2 - -* Tue Nov 17 2020 Philip Kovacs - 20.02.6-1 -- Release of 20.02.6 -- Closes security issues CVE-2020-27745 and CVE-2020-27746 - -* Wed Jul 29 2020 Fedora Release Engineering - 20.02.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jun 27 2020 Jitka Plesnikova - 20.02.3-4 -- Perl 5.32 re-rebuild updated packages - -* Thu Jun 25 2020 Orion Poplawski - 20.02.3-3 -- Rebuild for hdf5 1.10.6 - -* Mon Jun 22 2020 Jitka Plesnikova - 20.02.3-2 -- Perl 5.32 rebuild - -* Mon May 25 2020 Philip Kovacs - 20.02.3-1 -- Release of 20.02.3 - -* Tue May 5 2020 Philip Kovacs - 20.02.2-1 -- Release of 20.02.2 - -* Mon Mar 30 2020 Philip Kovacs - 19.05.6-1 -- Release of 19.05.6 - -* Thu Jan 30 2020 Fedora Release Engineering - 19.05.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jan 22 2020 Philip Kovacs - 19.05.5-2 -- Use cflag -fcommon to allow for building with gcc 10 - -* Mon Dec 23 2019 Philip Kovacs - 19.05.5-1 -- Release of 19.05.5 -- Closes security issues CVE-2019-19727, CVE-2019-19728 - -* Mon Nov 18 2019 Philip Kovacs - 19.05.4-1 -- Release of 19.05.4 - -* Mon Oct 7 2019 Philip Kovacs - 19.05.3-1 -- Release of 19.05.3 - -* Sun Aug 25 2019 Zbigniew Jędrzejewski-Szmek - 19.05.2-2 -- Rebuilt for hwloc-2.0 - -* Tue Aug 13 2019 Philip Kovacs - 19.05.2-1 -- Release of 19.05.2 - -* Fri Jul 26 2019 Fedora Release Engineering - 19.05.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Jul 21 2019 Philip Kovacs - 19.05.1-2 -- Create slurm-pmi and slurm-pmi-devel subpackages for pmi/pmi2 libs -- Remove rpm-generated pkgconfig files until upstream provides them -- Do not pull dependencies with pkgconfig unless package uses it - -* Mon Jul 15 2019 Philip Kovacs - 19.05.1-1 -- Release of 19.05.1 -- Closes security issue (CVE-2019-12838) -- Configure for UCX support on supported arches - -* Tue Jul 2 2019 Philip Kovacs - 19.05.0-5 -- Do not install slurm implementation of libpmi/pmi2 libraries -- in favor of the faster implementation provided by pmix -- Remove pmi environment module formerly used to select the slurm -- vs pmix implementations of libpmi/pmi2 - -* Wed Jun 19 2019 Philip Kovacs - 19.05.0-4 -- Correct the configure for pmix -- Correct the slurm_pmix_soname patch - -* Wed Jun 19 2019 Philip Kovacs - 19.05.0-3 -- Stop using autotools macros that were removed from rpm - -* Sun Jun 9 2019 Philip Kovacs - 19.05.0-2 -- Exclude upstream-deprecated 32-bit architectures - -* Sun Jun 9 2019 Philip Kovacs - 19.05.0-1 -- Release of 19.05.0 -- Added nss_plugin subpackage for optional nss plugin -- Added patch to fix 19.05.0 testsuite -- Adjusted cray patch to remove all cray, cray_aries plugins -- Reflect all upstream plugin additions/deletions -- Remove openssl build dependency - -* Thu May 30 2019 Jitka Plesnikova - 18.08.7-2 -- Perl 5.30 rebuild - -* Fri Apr 12 2019 Philip Kovacs - 18.08.7-1 -- Release of 18.08.7 - -* Sat Mar 16 2019 Orion Poplawski - 18.08.6-2 -- Rebuild for hdf5 1.10.5 - -* Thu Mar 7 2019 Philip Kovacs - 18.08.6-1 -- Release of 18.08.6 - -* Sun Feb 17 2019 Igor Gnatenko - 18.08.5-2 -- Rebuild for readline 8.0 - -* Thu Jan 31 2019 Philip Kovacs - 18.08.5-1 -- Release of 18.08.5 - -* Thu Jan 31 2019 Philip Kovacs - 17.11.13-2 -- Fix build issue on 32-bit architectures - -* Wed Jan 30 2019 Philip Kovacs - 17.11.13-1 -- Release of 17.11.13 -- Closes security issue CVE-2019-6438 - -* Wed Oct 24 2018 Philip Kovacs - 17.11.12-1 -- Release of 17.11.12 - -* Sat Oct 20 2018 Philip Kovacs - 17.11.11-1 -- Release of 17.11.11 - -* Thu Oct 11 2018 Yu Watanabe - 17.11.10-1 -- Release of 17.11.10 - -* Fri Sep 28 2018 Philip Kovacs - 17.11.9-2 -- Release of 17.11.9-2 (new upstream tarball) - -* Fri Aug 10 2018 Philip Kovacs - 17.11.9-1 -- Release of 17.11.9 - -* Fri Jul 20 2018 Philip Kovacs - 17.11.8-1 -- Release of 17.11.8 - -* Sat Jul 14 2018 Fedora Release Engineering - 17.11.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jun 27 2018 Jitka Plesnikova - 17.11.7-2 -- Perl 5.28 rebuild - -* Fri Jun 1 2018 Philip Kovacs - 17.11.7-1 -- Release of 17.11.7 -- Closes security issue CVE-2018-10995 - -* Sat May 12 2018 Philip Kovacs - 17.11.6-1 -- Release of 17.11.6 -- Added patch to avoid building contribs/cray (Yu Watanabe) -- Added lz4 support via new BuildRequires (Yu Watanabe) -- Replaced obsolete packages libibmad-devel and libibumad-devel - with rdma-core-devel (Yu Watanabe) -- Updated package descriptions (Yu Watanabe) - -* Fri Mar 16 2018 Philip Kovacs - 17.11.5-1 -- Release of 17.11.5 -- Closes security issue CVE-2018-7033 - -* Sat Mar 3 2018 Philip Kovacs - 17.11.4-1 -- Release of 17.11.4 -- Add perl-devel, python3 to build requirements -- Add patch to convert python references to python3 -- Use LDFLAGS to disable -z now instaed of _hardened_ldflags - -* Thu Feb 15 2018 Philip Kovacs - 17.11.3-3 -- Add perl-interpreter to BuildRequires - -* Thu Feb 15 2018 Philip Kovacs - 17.11.3-2 -- Rebuild for libevent soname bump - -* Sat Feb 10 2018 Philip Kovacs - 17.11.3-1 -- Release of 17.11 series -- Re-aligned rpm packaging to be closer to upstream -- Enabled new slurm native X11 support using ssh2 -- Enabled new shared libslurm for smaller code size -- Enabled `check` unit testing via check-devel -- Added environment module support for pmi/slurm -- Add dependency to pmix -- Removed gtk-update-icon-cache scriptlets -- Use new ldconfig_scriptlets macro - -* Fri Feb 09 2018 Fedora Release Engineering - 17.02.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Nov 16 2017 Philip Kovacs - 17.02.9-3 -- Added patch to enable full relro builds and operation -- Added patch to link knl_generic plugin to libnuma if available -- Remove the following cray or bluegene-only plugins -- job_container/cncu, select/alps, select/bluegene -- Rename slurm_setuser to slurm-setuser -- Minor corrections to slurm.conf - -* Wed Nov 1 2017 Philip Kovacs - 17.02.9-2 -- Correct desktop categories for rpmgrill.desktop-lint - -* Wed Nov 1 2017 Philip Kovacs - 17.02.9-1 -- Version bump to close CVE-2017-15566 -- Adjusted patches per closure of upstream bug #3942 -- Added desktop categories per rpmgrill.desktop-lint - -* Wed Oct 25 2017 Philip Kovacs - 17.02.8-1 -- Version bump, patches adjusted - -* Thu Oct 5 2017 Philip Kovacs - 17.02.7-4 -- Patch changes per resolution of upstream bug #4101: -- salloc/sbatch/srun: must be root to use --uid/--gid options -- salloc: supplemental groups dropped after setuid - -* Thu Oct 5 2017 Philip Kovacs - 17.02.7-3 -- Added BuildRequires gcc and minor packaging conformance items - -* Sat Sep 16 2017 Philip Kovacs - 17.02.7-2 -- Removed unneeded Requires(pre) - -* Thu Sep 14 2017 Philip Kovacs - 17.02.7-1 -- Packaging for Fedora +%autochangelog From 5cd6f3dbdee37fa268e98bf1414bacfb26705784 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Tue, 6 Sep 2022 22:17:58 -0400 Subject: [PATCH 40/61] Add slurm to epel9 --- changelog | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/changelog b/changelog index 0e11e1a..b7cef84 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,5 @@ * Tues Sep 6 2022 Philip Kovacs - 22.05.3-2 -- Add slurm to epel9 (#2072632) -- Update spec for epel 7/8/9 +- Add slurm to epel9 (#2072632); update spec for epel 7/8/9 - Use %autochangelog macro; add changelog file * Mon Sep 5 2022 Philip Kovacs - 22.05.3-1 From b927c61c01e98c9fb94d8e0aedf43a91b90997ef Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Sun, 27 Nov 2022 15:57:34 -0500 Subject: [PATCH 41/61] Update to 22.05.6 --- changelog | 6 +++++- slurm.conf | 44 ++++++++++++++++---------------------------- slurm.spec | 9 +++++++-- sources | 2 +- 4 files changed, 29 insertions(+), 32 deletions(-) diff --git a/changelog b/changelog index b7cef84..0f02372 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,8 @@ -* Tues Sep 6 2022 Philip Kovacs - 22.05.3-2 +* Sun Nov 27 2022 Philip Kovacs - 22.05.6-1 +- Update to 22.05.6 (#2131112) +- Update deprecated vars in slurm.conf (#2133159) + +* Tue Sep 6 2022 Philip Kovacs - 22.05.3-2 - Add slurm to epel9 (#2072632); update spec for epel 7/8/9 - Use %autochangelog macro; add changelog file diff --git a/slurm.conf b/slurm.conf index f575826..e344e1a 100644 --- a/slurm.conf +++ b/slurm.conf @@ -1,36 +1,30 @@ -# +# slurm.conf file generated by configurator.html. +# Put this file on all nodes of your cluster. # See the slurm.conf man page for more information. # -ControlMachine=localhost -ControlAddr=127.0.0.1 -#BackupController= -#BackupAddr= +ClusterName=cluster +SlurmctldHost=localhost +#SlurmctldHost= # -AuthType=auth/munge -#CheckpointType=checkpoint/none -CryptoType=crypto/munge #DisableRootJobs=NO #EnforcePartLimits=NO #Epilog= #EpilogSlurmctld= #FirstJobId=1 -#MaxJobId=999999 +#MaxJobId=67043328 #GresTypes= #GroupUpdateForce=0 #GroupUpdateTime=600 -#JobCheckpointDir=/var/slurm/checkpoint -#JobCredentialPrivateKey= -#JobCredentialPublicCertificate= #JobFileAppend=0 #JobRequeue=1 -#JobSubmitPlugins= +#JobSubmitPlugins=lua #KillOnBadExit=0 #LaunchType=launch/slurm #Licenses=foo*4,bar -#MailProg=/bin/true -#MaxJobCount=5000 +#MailProg=/bin/mail +#MaxJobCount=10000 #MaxStepCount=40000 -#MaxTasksPerNode=128 +#MaxTasksPerNode=512 MpiDefault=pmix #MpiParams=ports=#-# #PluginDir= @@ -45,7 +39,6 @@ ProctrackType=proctrack/cgroup #PropagateResourceLimitsExcept= #RebootProgram= ReturnToService=1 -#SallocDefaultCommand= SlurmctldPidFile=/var/run/slurm/slurmctld.pid SlurmctldPort=6817 SlurmdPidFile=/var/run/slurm/slurmd.pid @@ -59,7 +52,6 @@ StateSaveLocation=/var/spool/slurm/ctld SwitchType=switch/none #TaskEpilog= TaskPlugin=task/none -#TaskPluginParam= #TaskProlog= #TopologyPlugin=topology/tree #TmpFS=/tmp @@ -91,12 +83,10 @@ Waittime=0 # # SCHEDULING #DefMemPerCPU=0 -#FastSchedule=1 #MaxMemPerCPU=0 #SchedulerTimeSlice=30 SchedulerType=sched/backfill SelectType=select/linear -#SelectTypeParameters= # # # JOB PRIORITY @@ -117,14 +107,11 @@ SelectType=select/linear # LOGGING AND ACCOUNTING #AccountingStorageEnforce=0 #AccountingStorageHost= -#AccountingStorageLoc= #AccountingStoragePass= #AccountingStoragePort= AccountingStorageType=accounting_storage/none #AccountingStorageUser= AccountingStoreFlags=job_comment -ClusterName=cluster -#DebugFlags= #JobCompHost= #JobCompLoc= #JobCompPass= @@ -134,12 +121,13 @@ JobCompType=jobcomp/none #JobContainerType=job_container/none JobAcctGatherFrequency=30 JobAcctGatherType=jobacct_gather/none -SlurmctldDebug=3 -#SlurmctldLogFile= -SlurmdDebug=3 -#SlurmdLogFile= +SlurmctldDebug=info +SlurmctldLogFile=/var/log/slurm/slurmctld.log +SlurmdDebug=info +SlurmdLogFile=/var/log/slurm/slurmd.log #SlurmSchedLogFile= #SlurmSchedLogLevel= +#DebugFlags= # # # POWER SAVE SUPPORT FOR IDLE NODES (optional) @@ -156,4 +144,4 @@ SlurmdDebug=3 # # COMPUTE NODES NodeName=localhost CPUs=1 State=UNKNOWN -PartitionName=debug Nodes=localhost Default=YES MaxTime=INFINITE State=UP +PartitionName=debug Nodes=ALL Default=YES MaxTime=INFINITE State=UP diff --git a/slurm.spec b/slurm.spec index 7d102fa..743651d 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,8 +15,8 @@ %endif Name: slurm -Version: 22.05.3 -Release: 2%{?dist} +Version: 22.05.6 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -71,7 +71,11 @@ BuildRequires: libssh2-devel BuildRequires: lz4-devel BuildRequires: mariadb-devel BuildRequires: munge-devel +# numctl-devel not available in el9 for arch s390x (#2099483); +# task/affinity plugin won't be available in el9 for arch s390x +%if (0%{?epel} != 9) || ("%{_arch}" != "s390x") BuildRequires: numactl-devel +%endif BuildRequires: pam-devel BuildRequires: pmix-devel BuildRequires: rdma-core-devel @@ -95,6 +99,7 @@ BuildRequires: libyaml-devel ExcludeArch: armv7hl ExcludeArch: i686 +Requires: mailx Requires: munge Requires: pmix %if 0%{?fedora} && %{with ucx} diff --git a/sources b/sources index 9067673..38fd61a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-22.05.3.tar.bz2) = a500fb657f7d4d3d063307e176e26e537962434ff73ad8d13e16c34c70e94916fdab4e08e23d40aedec7edd86be996d2366e82fcb952c83f5498e59ca47c3f21 +SHA512 (slurm-22.05.6.tar.bz2) = d5ea2e4160f7fad746183cead52aa1bb7d9cf35f7a8e25ae6e042f9d2e1f6bbd5de0c8dcb273edd92a504fe8a5a57c15e5d50d74fd13f0d4cf065be7f2d89148 From 4cbbdc9f29f293fa8f1b2e7841d5fb9619e0025a Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 12 Dec 2022 08:51:09 +0100 Subject: [PATCH 42/61] Add BR perl-generators to generates run-time deps Add BR perl-generators to automatically generates run-time dependencies for installed Perl files --- changelog | 3 +++ slurm.spec | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changelog b/changelog index 0f02372..882352a 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +* Mon Dec 12 2022 Jitka Plesnikova - 22.05.6-2 +- Add BR perl-generators to generates run-time deps + * Sun Nov 27 2022 Philip Kovacs - 22.05.6-1 - Update to 22.05.6 (#2131112) - Update deprecated vars in slurm.conf (#2133159) diff --git a/slurm.spec b/slurm.spec index 743651d..db894f3 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 22.05.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -50,7 +50,7 @@ BuildRequires: man2html BuildRequires: perl-devel BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: perl-interpreter -BuildRequires: perl-macros +BuildRequires: perl-generators BuildRequires: perl-podlators %if (0%{?epel} != 7) BuildRequires: pkgconf From 60dbeaf1f575caac8eed1f51b9b6afd98be8d4b5 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Sat, 17 Dec 2022 17:57:15 -0500 Subject: [PATCH 43/61] Change mailx runtime requirement to /bin/mailx --- changelog | 3 +++ slurm.spec | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changelog b/changelog index 882352a..461264e 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +* Sat Dec 17 2022 Philip Kovacs - 22.05.6-3 +- Change mailx runtime requirement to /bin/mailx + * Mon Dec 12 2022 Jitka Plesnikova - 22.05.6-2 - Add BR perl-generators to generates run-time deps diff --git a/slurm.spec b/slurm.spec index db894f3..4067fac 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 22.05.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -99,7 +99,7 @@ BuildRequires: libyaml-devel ExcludeArch: armv7hl ExcludeArch: i686 -Requires: mailx +Requires: /bin/mailx Requires: munge Requires: pmix %if 0%{?fedora} && %{with ucx} From b61eb13358d67be1115e1fca6560e27a39659731 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 21:14:27 +0100 Subject: [PATCH 44/61] Remove perl(MODULE_COMPAT), it will be replaced by generators --- slurm.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 4067fac..294516e 100644 --- a/slurm.spec +++ b/slurm.spec @@ -218,7 +218,6 @@ on the node according to Slurm. %package perlapi Summary: Perl API to Slurm -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description perlapi Perl API package for Slurm. This package includes the perl API to provide a From f908bf908dcbecdd250885901f17f2b750598615 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:31:09 +0000 Subject: [PATCH 45/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 294516e..9f12b3a 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 22.05.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -754,4 +754,7 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 22.05.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + %autochangelog From f05537d510a8a033606c814865300a4b65c66d4a Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Tue, 9 May 2023 23:17:12 -0400 Subject: [PATCH 46/61] Update to 22.05.9 --- changelog | 6 ++++++ slurm.spec | 6 ++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changelog b/changelog index 461264e..62507fe 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,9 @@ +* Tue May 9 2023 Philip Kovacs - 22.05.9-1 +- Update to 22.05.9 + +* Sat Jan 21 2023 Fedora Release Engineering - 22.05.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 17 2022 Philip Kovacs - 22.05.6-3 - Change mailx runtime requirement to /bin/mailx diff --git a/slurm.spec b/slurm.spec index 9f12b3a..553182b 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,8 +15,8 @@ %endif Name: slurm -Version: 22.05.6 -Release: 4%{?dist} +Version: 22.05.9 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -754,7 +754,5 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog -* Sat Jan 21 2023 Fedora Release Engineering - 22.05.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild %autochangelog diff --git a/sources b/sources index 38fd61a..72c26a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-22.05.6.tar.bz2) = d5ea2e4160f7fad746183cead52aa1bb7d9cf35f7a8e25ae6e042f9d2e1f6bbd5de0c8dcb273edd92a504fe8a5a57c15e5d50d74fd13f0d4cf065be7f2d89148 +SHA512 (slurm-22.05.9.tar.bz2) = 1800603d7c71552576717688e640358ee7e7d67eefe9fdd252456146b0c91c408d63ffab391ba68ecab6476159c9aa0dd8e32f04a89ebbb71f30d516015dcaea From 740dcb1ec2fc7873548b09fa061f8e9ccbf9ff33 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jul 2023 16:32:22 +0200 Subject: [PATCH 47/61] Perl 5.38 rebuild --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 553182b..781b333 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 22.05.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -754,5 +754,8 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Tue Jul 11 2023 Jitka Plesnikova - 22.05.9-2 +- Perl 5.38 rebuild + %autochangelog From ce1211e881b5ec22bbdd482824b6472a1259225e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:57:00 +0000 Subject: [PATCH 48/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- slurm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/slurm.spec b/slurm.spec index 781b333..06cef1a 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,7 +16,7 @@ Name: slurm Version: 22.05.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -754,6 +754,9 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 22.05.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Jitka Plesnikova - 22.05.9-2 - Perl 5.38 rebuild From 6b89c441f7051f8d46220b2033ad7a99867e69d7 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Fri, 15 Sep 2023 15:21:28 -0500 Subject: [PATCH 49/61] Consistently use rpmautospec by using %autorelease - Fix license: GPLv2 should be GPLv2 or later - Use SPDX license identifiers Signed-off-by: Michel Lind --- changelog | 11 +++++++++++ slurm.spec | 14 +++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/changelog b/changelog index 62507fe..057c2bb 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,14 @@ +* Fri Sep 15 2023 Michel Lind - 22.05.9-4 +- Consistently use rpmautospec by using %%autorelease +- Fix license: GPLv2 should be GPLv2 or later +- Use SPDX license identifiers + +* Sat Jul 22 2023 Fedora Release Engineering - 22.05.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Jitka Plesnikova - 22.05.9-2 +- Perl 5.38 rebuild + * Tue May 9 2023 Philip Kovacs - 22.05.9-1 - Update to 22.05.9 diff --git a/slurm.spec b/slurm.spec index 06cef1a..7816575 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,9 +16,12 @@ Name: slurm Version: 22.05.9 -Release: 3%{?dist} +Release: %autorelease Summary: Simple Linux Utility for Resource Management -License: GPLv2 and BSD +# ./src/common/log.c: BSD 2-Clause License +# ./src/common/log.h: BSD 2-Clause License +# ./src/common/uthash.h: BSD 1-Clause License +License: GPL-2.0-or-later AND BSD-2-Clause AND BSD-1-Clause URL: https://slurm.schedmd.com/ Source0: https://download.schedmd.com/slurm/%{name_version}.tar.bz2 Source1: slurm.conf @@ -754,11 +757,4 @@ fi %systemd_postun_with_restart slurmdbd.service %changelog -* Sat Jul 22 2023 Fedora Release Engineering - 22.05.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 11 2023 Jitka Plesnikova - 22.05.9-2 -- Perl 5.38 rebuild - - %autochangelog From bb41b88be1d75bae75c1f88827aa16a695c6f36a Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Fri, 15 Sep 2023 15:43:19 -0500 Subject: [PATCH 50/61] Use 0%{?rhel} rather than 0%{?epel} since that works on Koji and CBS - Remove references to Fedora 34, which went EOL over a year ago Signed-off-by: Michel Lind --- slurm.spec | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/slurm.spec b/slurm.spec index 7816575..ab2d98a 100644 --- a/slurm.spec +++ b/slurm.spec @@ -55,7 +55,7 @@ BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: perl-interpreter BuildRequires: perl-generators BuildRequires: perl-podlators -%if (0%{?epel} != 7) +%if (0%{?rhel} != 7) BuildRequires: pkgconf %else BuildRequires: pkgconfig @@ -76,7 +76,7 @@ BuildRequires: mariadb-devel BuildRequires: munge-devel # numctl-devel not available in el9 for arch s390x (#2099483); # task/affinity plugin won't be available in el9 for arch s390x -%if (0%{?epel} != 9) || ("%{_arch}" != "s390x") +%if (0%{?rhel} != 9) || ("%{_arch}" != "s390x") BuildRequires: numactl-devel %endif BuildRequires: pam-devel @@ -90,8 +90,8 @@ BuildRequires: zlib-devel BuildRequires: ucx-devel %endif -# create slurm-slurmrestd package for Fedora >= 34 and EPEL7/8/9 -%if (0%{?fedora} >= 34) || (0%{?epel} >= 7) +# create slurm-slurmrestd package for Fedora and EPEL7/8/9 +%if 0%{?fedora} || (0%{?rhel} >= 7) BuildRequires: http-parser-devel BuildRequires: json-c-devel BuildRequires: libjwt-devel @@ -174,7 +174,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Slurm database daemon. Used to accept and process database RPCs and upload database changes to slurmctld daemons on each cluster. -%if (0%{?fedora} >= 34) || (0%{?epel} >= 7) +%if 0%{?fedora} || (0%{?rhel} >= 7) %package slurmrestd Summary: Slurm REST API deamon Requires: %{name}%{?_isa} = %{version}-%{release} @@ -397,10 +397,6 @@ rm -f %{buildroot}%{_sbindir}/slurmsmwd* rm -f %{buildroot}%{perl_vendorarch}/auto/Slurm*/.packlist rm -f %{buildroot}%{perl_vendorarch}/auto/Slurm*/Slurm*.bs rm -f %{buildroot}%{perl_archlib}/perllocal.pod -%if 0%{?fedora} && (0%{?fedora} < 34) -# remove unused slurmrestd service file -rm -f %{buildroot}%{_unitdir}/slurmrestd.service -%endif %ldconfig_scriptlets devel %ldconfig_scriptlets libs @@ -444,7 +440,7 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %{_bindir}/%{name}-setuser %{_libdir}/%{name}/accounting_storage_*.so %{_libdir}/%{name}/acct_gather_*.so -%if (0%{?fedora} >= 34) || (0%{?epel} >= 7) +%if 0%{?fedora} || (0%{?rhel} >= 7) %{_libdir}/%{name}/auth_jwt.so %endif %{_libdir}/%{name}/auth_munge.so @@ -558,7 +554,7 @@ rm -f %{buildroot}%{_unitdir}/slurmrestd.service %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/sview.1* -%if (0%{?epel} == 7) +%if (0%{?rhel} == 7) %post gui /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -630,7 +626,7 @@ fi # Slurm-slurmrestd # ---------------- -%if (0%{?fedora} >= 34) || (0%{?epel} >= 7) +%if 0%{?fedora} || (0%{?rhel} >= 7) %files slurmrestd %{_libdir}/%{name}/openapi*.so %{_libdir}/%{name}/rest*.so From 6829d075996ea95d3f2c9ba9968c9617eb169e4e Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Sat, 21 Oct 2023 18:02:04 -0400 Subject: [PATCH 51/61] Update to 22.05.10 --- changelog | 4 ++++ slurm.spec | 4 ++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changelog b/changelog index 057c2bb..8694ffe 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,7 @@ +* Sat Oct 21 2023 Philip Kovacs - 22.05.10-1 +- Update to 22.05.10 +- Use mariadb-connector-c-devel not mariadb-devel for builds + * Fri Sep 15 2023 Michel Lind - 22.05.9-4 - Consistently use rpmautospec by using %%autorelease - Fix license: GPLv2 should be GPLv2 or later diff --git a/slurm.spec b/slurm.spec index ab2d98a..f7398e3 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,7 +15,7 @@ %endif Name: slurm -Version: 22.05.9 +Version: 22.05.10 Release: %autorelease Summary: Simple Linux Utility for Resource Management # ./src/common/log.c: BSD 2-Clause License @@ -72,7 +72,7 @@ BuildRequires: hwloc-devel BuildRequires: libcurl-devel BuildRequires: libssh2-devel BuildRequires: lz4-devel -BuildRequires: mariadb-devel +BuildRequires: mariadb-connector-c-devel BuildRequires: munge-devel # numctl-devel not available in el9 for arch s390x (#2099483); # task/affinity plugin won't be available in el9 for arch s390x diff --git a/sources b/sources index 72c26a4..af4dd75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-22.05.9.tar.bz2) = 1800603d7c71552576717688e640358ee7e7d67eefe9fdd252456146b0c91c408d63ffab391ba68ecab6476159c9aa0dd8e32f04a89ebbb71f30d516015dcaea +SHA512 (slurm-22.05.10.tar.bz2) = a1746e749c1ff703076fc9e02d2b73d9e5ab23e0d503164dfa01011d24f37a1f7fa01170cc7ec526c82082fe9766aeceb2be14067293967e69daca502e8e549a From 2a8de352d89cbc1bb84c00a3c2498fe7939ba2e0 Mon Sep 17 00:00:00 2001 From: Neil Hanlon Date: Fri, 22 Dec 2023 12:35:54 -0500 Subject: [PATCH 52/61] update to 22.05.11 --- changelog | 3 +++ slurm.spec | 2 +- slurm_check_version.patch | 2 +- sources | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changelog b/changelog index 8694ffe..0c2bc40 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,6 @@ +* Fri Dec 22 2023 Neil Hanlon - 22.05.11-1 +- Update to 22.05.11 + * Sat Oct 21 2023 Philip Kovacs - 22.05.10-1 - Update to 22.05.10 - Use mariadb-connector-c-devel not mariadb-devel for builds diff --git a/slurm.spec b/slurm.spec index f7398e3..e72c624 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,7 +15,7 @@ %endif Name: slurm -Version: 22.05.10 +Version: 22.05.11 Release: %autorelease Summary: Simple Linux Utility for Resource Management # ./src/common/log.c: BSD 2-Clause License diff --git a/slurm_check_version.patch b/slurm_check_version.patch index 5b13045..925af5a 100644 --- a/slurm_check_version.patch +++ b/slurm_check_version.patch @@ -2,7 +2,7 @@ diff --git a/configure.ac b/configure.ac index d69d47348a..90f82536ce 100644 --- a/configure.ac +++ b/configure.ac -@@ -240,7 +240,7 @@ X_AC_CGROUP +@@ -240,7 +240,7 @@ X_AC_DBUS # Tests for Check # diff --git a/sources b/sources index af4dd75..0657161 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-22.05.10.tar.bz2) = a1746e749c1ff703076fc9e02d2b73d9e5ab23e0d503164dfa01011d24f37a1f7fa01170cc7ec526c82082fe9766aeceb2be14067293967e69daca502e8e549a +SHA512 (slurm-22.05.11.tar.bz2) = ebe82f6ad6dec45ba611a294d1d19e8ad7853322190bf4be1f8175cd89e35120b26c349d45a1048aca802e96795a61d9ab432a9b4106c757835b7044bcbe459b From 3ce01a8648afb43c8d767828f93dda212ed8e7b2 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Mon, 25 Dec 2023 11:05:14 -0500 Subject: [PATCH 53/61] update changelog --- changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index 0c2bc40..d94dfb2 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,7 @@ * Fri Dec 22 2023 Neil Hanlon - 22.05.11-1 -- Update to 22.05.11 +- Update to 22.05.11 (#2155310) +- Closes CVE-2023-49933 through CVE-2023-49938; RHBZ bugs: +- #2254496, #2254499, #2254502, #2254505, #2254507, #2254509 * Sat Oct 21 2023 Philip Kovacs - 22.05.10-1 - Update to 22.05.10 From 9b5df69ab86bba349054d0f173a4696eb5edff01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 03:34:29 +0000 Subject: [PATCH 54/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From da428711b18f1c18ce93e582dc5751d7e78c7d3c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jun 2024 12:14:58 +0200 Subject: [PATCH 55/61] Perl 5.40 rebuild From d7535e34af4c484f5c6da60e0f870065c3b32b14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:51:57 +0000 Subject: [PATCH 56/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9400c274872381984fdeed68ded790f58f27f377 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Thu, 15 Aug 2024 14:22:21 +0200 Subject: [PATCH 57/61] Update to 24.05.2 Signed-off-by: Cristian Le --- ...m-24.05.2-perlapi_vendor_installpath.patch | 38 ++++++ slurm.spec | 118 +++++++----------- slurm_check_version.patch | 13 -- slurm_perlapi_rpaths.patch | 8 +- slurm_runtime_linking.patch | 35 ------ slurm_to_python3.patch | 20 --- sources | 2 +- 7 files changed, 89 insertions(+), 145 deletions(-) create mode 100644 slurm-24.05.2-perlapi_vendor_installpath.patch delete mode 100644 slurm_check_version.patch delete mode 100644 slurm_runtime_linking.patch delete mode 100644 slurm_to_python3.patch diff --git a/slurm-24.05.2-perlapi_vendor_installpath.patch b/slurm-24.05.2-perlapi_vendor_installpath.patch new file mode 100644 index 0000000..a17d9e5 --- /dev/null +++ b/slurm-24.05.2-perlapi_vendor_installpath.patch @@ -0,0 +1,38 @@ +Subject: [PATCH] Switch perl site install path to vendor +--- +Index: contribs/perlapi/libslurm/Makefile.am +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/contribs/perlapi/libslurm/Makefile.am b/contribs/perlapi/libslurm/Makefile.am +--- a/contribs/perlapi/libslurm/Makefile.am (revision ca885c43cd9c6deae7800619282573c421933bc1) ++++ b/contribs/perlapi/libslurm/Makefile.am (revision 8dd9898e73e3c890092e133068d143e842ab40ba) +@@ -62,8 +62,7 @@ + fi + @cd $(perl_dir) && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) \ + prefix=${prefix} libdir=${libdir} INSTALL_BASE= PERL_MM_OPT= \ +- INSTALLDIRS=site INSTALLSITELIB=${_perlsitedir} \ +- INSTALLSITEARCH=${_perlsitedir} \ ++ INSTALLDIRS=vendor \ + INSTALLSITEMAN1DIR=$(mandir)/man1 \ + INSTALLSITEMAN3DIR=$(mandir)/man3 + +Index: contribs/perlapi/libslurmdb/Makefile.am +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/contribs/perlapi/libslurmdb/Makefile.am b/contribs/perlapi/libslurmdb/Makefile.am +--- a/contribs/perlapi/libslurmdb/Makefile.am (revision ca885c43cd9c6deae7800619282573c421933bc1) ++++ b/contribs/perlapi/libslurmdb/Makefile.am (revision 8dd9898e73e3c890092e133068d143e842ab40ba) +@@ -34,8 +34,7 @@ + fi + @cd $(perl_dir) && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) \ + prefix=${prefix} INSTALL_BASE= PERL_MM_OPT= \ +- INSTALLDIRS=site INSTALLSITELIB=${_perlsitedir} \ +- INSTALLSITEARCH=${_perlsitedir} \ ++ INSTALLDIRS=vendor \ + INSTALLSITEMAN1DIR=$(mandir)/man1 \ + INSTALLSITEMAN3DIR=$(mandir)/man3 + diff --git a/slurm.spec b/slurm.spec index e72c624..16261b5 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,7 +15,7 @@ %endif Name: slurm -Version: 22.05.11 +Version: 24.05.2 Release: %autorelease Summary: Simple Linux Utility for Resource Management # ./src/common/log.c: BSD 2-Clause License @@ -34,14 +34,9 @@ Source5: slurm-setuser.in Patch0: slurm_release_version.patch # Build-related patches -Patch10: slurm_check_version.patch Patch11: slurm_html_doc_path.patch Patch12: slurm_perlapi_rpaths.patch - -# Other patches -# https://bugs.schedmd.com/show_bug.cgi?id=14868 -Patch20: slurm_runtime_linking.patch -Patch21: slurm_to_python3.patch +Patch13: slurm-24.05.2-perlapi_vendor_installpath.patch BuildRequires: autoconf BuildRequires: automake @@ -55,11 +50,7 @@ BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: perl-interpreter BuildRequires: perl-generators BuildRequires: perl-podlators -%if (0%{?rhel} != 7) BuildRequires: pkgconf -%else -BuildRequires: pkgconfig -%endif BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(lua) BuildRequires: python3 @@ -83,20 +74,16 @@ BuildRequires: pam-devel BuildRequires: pmix-devel BuildRequires: rdma-core-devel BuildRequires: readline-devel -BuildRequires: rrdtool-devel BuildRequires: zlib-devel %if 0%{?fedora} && %{with ucx} BuildRequires: ucx-devel %endif -# create slurm-slurmrestd package for Fedora and EPEL7/8/9 -%if 0%{?fedora} || (0%{?rhel} >= 7) BuildRequires: http-parser-devel BuildRequires: json-c-devel BuildRequires: libjwt-devel BuildRequires: libyaml-devel -%endif # exclude upstream-deprecated 32-bit architectures ExcludeArch: armv7hl @@ -145,14 +132,6 @@ Summary: Slurm shared libraries %description libs Slurm shared libraries. -%package rrdtool -Summary: Slurm rrdtool external sensor plugin -Requires: %{name}%{?_isa} = %{version}-%{release} -%description rrdtool -Slurm external sensor plugin for rrdtool. This package is separated from -the base plugins package due to gui dependencies which are unneeded if not -using this plugin. - %package slurmctld Summary: Slurm controller daemon Requires: %{name}%{?_isa} = %{version}-%{release} @@ -174,14 +153,19 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Slurm database daemon. Used to accept and process database RPCs and upload database changes to slurmctld daemons on each cluster. -%if 0%{?fedora} || (0%{?rhel} >= 7) %package slurmrestd Summary: Slurm REST API deamon Requires: %{name}%{?_isa} = %{version}-%{release} %description slurmrestd Slurm REST API daemon. The slurmrestd daemon is designed to allow clients to communicate with Slurm via a REST API. -%endif + +%package sackd +Summary: Slurm Auth and Cred Kiosk daemon +Requires: %{name}%{?_isa} = %{version}-%{release} +%description sackd +Slurm Auth and Cred Kiosk daemon. It can be used on login nodes that are not +running slurmd daemons to allow authentication to the cluster. # ----------------- # Contribs Packages @@ -233,6 +217,7 @@ Requires: %{name}-perlapi%{?_isa} = %{version}-%{release} %description torque Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm. + %prep %autosetup -p1 -n %{name_version} cp %SOURCE1 etc/slurm.conf @@ -246,6 +231,7 @@ cp %SOURCE4 share/icons/hicolor/128x128/apps/%{name}.png mkdir -p extras cp %SOURCE5 extras/%{name}-setuser.in + %build aclocal -I auxdir autoconf @@ -255,12 +241,8 @@ export CFLAGS="%{build_cflags} -fcommon" # use -z lazy to allow dlopen with unresolved symbols export LDFLAGS="%{build_ldflags} -Wl,-z,lazy" %configure \ - --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir}/%{name} \ --with-pam_dir=%{_libdir}/security \ -%if 0%{?fedora} && %{with ucx} - --with-ucx=%{_prefix} \ -%endif --enable-pam \ --enable-really-no-cray \ --enable-shared \ @@ -270,6 +252,7 @@ export LDFLAGS="%{build_ldflags} -Wl,-z,lazy" --disable-salloc-background \ --disable-partial_attach \ --with-oneapi=no \ + --with-pmix=%{_prefix} \ --with-shared-libslurm \ --without-rpath # patch libtool to remove rpaths @@ -286,17 +269,15 @@ s|^dir_spool=.*|dir_spool="%{_var}/spool/%{name}"|g; s|^dir_tmpfiles_d=.*|dir_tmpfiles_d="%{_tmpfilesdir}"|g;' \ extras/%{name}-setuser.in > extras/%{name}-setuser +# patch the test files +sed -i 's|"PluginDir=" SLURM_PREFIX "/lib/slurm/\\n"|"PluginDir=%{buildroot}%{_libdir}/%{name}/\\n"|g' testsuite/slurm_unit/common/serializer-test.c + # build base packages %make_build # build contribs packages -# INSTALLDIRS=vendor so perlapi goes to vendor_perl directory -%make_build PERL_MM_PARAMS="INSTALLDIRS=vendor" contrib +%make_build contrib -%check -# The test binaries need LD_LIBRARY_PATH to find the compiled slurm library -# in the build tree. -%make_build LD_LIBRARY_PATH="%{buildroot}%{_libdir};%{_libdir}" check %install %make_install @@ -397,10 +378,19 @@ rm -f %{buildroot}%{_sbindir}/slurmsmwd* rm -f %{buildroot}%{perl_vendorarch}/auto/Slurm*/.packlist rm -f %{buildroot}%{perl_vendorarch}/auto/Slurm*/Slurm*.bs rm -f %{buildroot}%{perl_archlib}/perllocal.pod +# remove other example stuff +rm -f %{buildroot}%{_libdir}/%{name}/site_factor_example.so %ldconfig_scriptlets devel %ldconfig_scriptlets libs + +%check +# The test binaries need LD_LIBRARY_PATH to find the compiled slurm library +# in the build tree. +%make_build LD_LIBRARY_PATH="%{buildroot}%{_libdir}" check + + # ----- # Slurm # ----- @@ -427,6 +417,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_bindir}/scancel %{_bindir}/scontrol %{_bindir}/scrontab +%{_bindir}/scrun %{_bindir}/sdiag %{_bindir}/sh5util %{_bindir}/sinfo @@ -440,41 +431,35 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_bindir}/%{name}-setuser %{_libdir}/%{name}/accounting_storage_*.so %{_libdir}/%{name}/acct_gather_*.so -%if 0%{?fedora} || (0%{?rhel} >= 7) %{_libdir}/%{name}/auth_jwt.so -%endif %{_libdir}/%{name}/auth_munge.so +%{_libdir}/%{name}/auth_slurm.so %{_libdir}/%{name}/burst_buffer_lua.so %{_libdir}/%{name}/cgroup_v1.so %{_libdir}/%{name}/cgroup_v2.so %{_libdir}/%{name}/cli_filter_*.so -%{_libdir}/%{name}/core_spec_none.so %{_libdir}/%{name}/cred_*.so -%{_libdir}/%{name}/ext_sensors_none.so +%{_libdir}/%{name}/data_parser_*.so +%{_libdir}/%{name}/gpu_*.so %{_libdir}/%{name}/gres_*.so -%{_libdir}/%{name}/gpu_generic.so -%{_libdir}/%{name}/hash_k12.so +%{_libdir}/%{name}/hash_*.so %{_libdir}/%{name}/job_container_*.so %{_libdir}/%{name}/job_submit_*.so %{_libdir}/%{name}/jobacct_gather_*.so %{_libdir}/%{name}/jobcomp_*.so -%{_libdir}/%{name}/launch_slurm.so %{_libdir}/%{name}/mcs_*.so %{_libdir}/%{name}/mpi_*.so %{_libdir}/%{name}/node_features_*.so -%{_libdir}/%{name}/power_none.so %{_libdir}/%{name}/preempt_*.so %{_libdir}/%{name}/prep_script.so %{_libdir}/%{name}/priority_*.so %{_libdir}/%{name}/proctrack_*.so -%{_libdir}/%{name}/route_*.so %{_libdir}/%{name}/sched_*.so %{_libdir}/%{name}/select_*.so %{_libdir}/%{name}/serializer_*.so -%{_libdir}/%{name}/site_factor_none.so -%{_libdir}/%{name}/slurmctld_nonstop.so %{_libdir}/%{name}/switch_*.so %{_libdir}/%{name}/task_*.so +%{_libdir}/%{name}/tls_none.so %{_libdir}/%{name}/topology_*.so %{_mandir}/man1/sacct.1* %{_mandir}/man1/sacctmgr.1* @@ -485,6 +470,7 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_mandir}/man1/scancel.1* %{_mandir}/man1/scontrol.1* %{_mandir}/man1/scrontab.1* +%{_mandir}/man1/scrun.1* %{_mandir}/man1/sdiag.1* %{_mandir}/man1/sh5util.1* %{_mandir}/man1/sinfo.1* @@ -499,13 +485,11 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_mandir}/man5/acct_gather.conf.5* %{_mandir}/man5/burst_buffer.conf.5* %{_mandir}/man5/cgroup.conf.5* -%{_mandir}/man5/ext_sensors.conf.5* %{_mandir}/man5/gres.conf.5* %{_mandir}/man5/helpers.conf.5* %{_mandir}/man5/job_container.conf.5* %{_mandir}/man5/knl.conf.5* %{_mandir}/man5/mpi.conf.5* -%{_mandir}/man5/nonstop.conf.5* %{_mandir}/man5/oci.conf.5* %{_mandir}/man5/slurm.conf.5* %{_mandir}/man5/topology.conf.5* @@ -529,7 +513,6 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_includedir}/%{name}/slurm_errno.h %{_includedir}/%{name}/slurm_version.h %{_includedir}/%{name}/slurmdb.h -%{_includedir}/%{name}/smd_ns.h %{_includedir}/%{name}/spank.h %{_libdir}/libpmi.so %{_libdir}/libpmi2.so @@ -543,6 +526,12 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %files doc %{_docdir} +%exclude %{_docdir}/%{name}/CONTRIBUTING.md +%exclude %{_docdir}/%{name}/DISCLAIMER +%exclude %{_docdir}/%{name}/META +%exclude %{_docdir}/%{name}/NEWS +%exclude %{_docdir}/%{name}/README.rst +%exclude %{_docdir}/%{name}/RELEASE_NOTES # --------- # Slurm-gui @@ -554,20 +543,6 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/sview.1* -%if (0%{?rhel} == 7) -%post gui -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun gui -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans gui -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%endif - # ---------- # Slurm-libs # ---------- @@ -579,13 +554,6 @@ fi %{_libdir}/libslurmfull-*.so %{_libdir}/libslurm_pmi-*.so -# ------------- -# Slurm-rrdtool -# ------------- - -%files rrdtool -%{_libdir}/%{name}/ext_sensors_rrd.so - # --------------- # Slurm-slurmctld # --------------- @@ -626,13 +594,19 @@ fi # Slurm-slurmrestd # ---------------- -%if 0%{?fedora} || (0%{?rhel} >= 7) %files slurmrestd %{_libdir}/%{name}/openapi*.so %{_libdir}/%{name}/rest*.so %{_sbindir}/slurmrestd %{_unitdir}/slurmrestd.service -%endif + +# ---------------- +# Slurm-sackd +# ---------------- + +%files sackd +%{_sbindir}/sackd +%{_mandir}/man8/sackd.8* # -------------- # Slurm-contribs diff --git a/slurm_check_version.patch b/slurm_check_version.patch deleted file mode 100644 index 925af5a..0000000 --- a/slurm_check_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index d69d47348a..90f82536ce 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -240,7 +240,7 @@ X_AC_DBUS - # Tests for Check - # - --PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"]) -+PKG_CHECK_MODULES([CHECK], [check >= 0.9.10], [ac_have_check="yes"], [ac_have_check="no"]) - AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes") - - # diff --git a/slurm_perlapi_rpaths.patch b/slurm_perlapi_rpaths.patch index f20bd54..88b42b4 100644 --- a/slurm_perlapi_rpaths.patch +++ b/slurm_perlapi_rpaths.patch @@ -2,11 +2,11 @@ diff --git a/contribs/perlapi/libslurm/perl/Makefile.PL.in b/contribs/perlapi/li index fcae43796d..34c1ad1411 100644 --- a/contribs/perlapi/libslurm/perl/Makefile.PL.in +++ b/contribs/perlapi/libslurm/perl/Makefile.PL.in -@@ -77,7 +77,7 @@ DESTDIR_BUG +@@ -68,7 +68,7 @@ DESTDIR_BUG # AIX has problems with not always having the correct # flags so we have to add some :) my $os = lc(`uname`); --my $other_ld_flags = "-Wl,-rpath,@top_builddir@/src/api/.libs -Wl,-rpath,@prefix@/lib"; +-my $other_ld_flags = '-Wl,-rpath,@top_builddir@/src/api/.libs -Wl,-rpath,@libdir@'; +my $other_ld_flags = ""; $other_ld_flags = " -brtl -G -bnoentry -bgcbypass:1000 -bexpfull" if $os =~ "aix"; @@ -15,11 +15,11 @@ diff --git a/contribs/perlapi/libslurmdb/perl/Makefile.PL.in b/contribs/perlapi/ index 2db028c113..d143c20190 100644 --- a/contribs/perlapi/libslurmdb/perl/Makefile.PL.in +++ b/contribs/perlapi/libslurmdb/perl/Makefile.PL.in -@@ -76,7 +76,7 @@ DESTDIR_BUG +@@ -68,7 +68,7 @@ DESTDIR_BUG # AIX has problems with not always having the correct # flags so we have to add some :) my $os = lc(`uname`); --my $other_ld_flags = "-Wl,-rpath,@top_builddir@/src/db_api/.libs -Wl,-rpath,@prefix@/lib"; +-my $other_ld_flags = '-Wl,-rpath,@top_builddir@/src/db_api/.libs -Wl,-rpath,@libdir@'; +my $other_ld_flags = ""; $other_ld_flags = " -brtl -G -bnoentry -bgcbypass:1000 -bexpfull" if $os =~ "aix"; diff --git a/slurm_runtime_linking.patch b/slurm_runtime_linking.patch deleted file mode 100644 index e4435e9..0000000 --- a/slurm_runtime_linking.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c -index 626065f269..d2623695be 100644 ---- a/src/plugins/mpi/pmix/mpi_pmix.c -+++ b/src/plugins/mpi/pmix/mpi_pmix.c -@@ -137,7 +137,7 @@ static void *_libpmix_open(void) - #elif defined PMIXP_V4_LIBPATH - xstrfmtcat(full_path, "%s/", PMIXP_V4_LIBPATH); - #endif -- xstrfmtcat(full_path, "libpmix.so"); -+ xstrfmtcat(full_path, "libpmix.so.2"); - - lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); - xfree(full_path); -diff --git a/src/plugins/mpi/pmix/pmixp_dconn_ucx.c b/src/plugins/mpi/pmix/pmixp_dconn_ucx.c -index 44013246e3..96c40b5c3a 100644 ---- a/src/plugins/mpi/pmix/pmixp_dconn_ucx.c -+++ b/src/plugins/mpi/pmix/pmixp_dconn_ucx.c -@@ -169,7 +169,7 @@ static int _load_ucx_lib() - * we have from autoconf - */ - char *full_path = NULL; -- xstrfmtcat(full_path, "%s/libucp.so", PMIXP_UCX_LIBPATH); -+ xstrfmtcat(full_path, "%s/libucp.so.0", PMIXP_UCX_LIBPATH); - _ucx_lib_handler = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL); - xfree(full_path); - if (_ucx_lib_handler) { -@@ -180,7 +180,7 @@ static int _load_ucx_lib() - * known by dynamic linker. - */ - #endif -- _ucx_lib_handler = dlopen("libucp.so", RTLD_LAZY | RTLD_GLOBAL); -+ _ucx_lib_handler = dlopen("libucp.so.0", RTLD_LAZY | RTLD_GLOBAL); - if (!_ucx_lib_handler) { - char *err = dlerror(); - PMIXP_ERROR("Cannot open UCX lib: %s", (err) ? err : "unknown"); diff --git a/slurm_to_python3.patch b/slurm_to_python3.patch deleted file mode 100644 index 841e773..0000000 --- a/slurm_to_python3.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/contribs/cray/csm/slurmconfgen_smw.py b/contribs/cray/csm/slurmconfgen_smw.py -index 1d1aadedaf..b2f65c242b 100644 ---- a/contribs/cray/csm/slurmconfgen_smw.py -+++ b/contribs/cray/csm/slurmconfgen_smw.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Copyright 2015-2016 Hewlett Packard Enterprise Development LP - """ A script to generate slurm.conf and gres.conf for a -diff --git a/contribs/cray/slurmconfgen.py.in b/contribs/cray/slurmconfgen.py.in -index 31de1a0c28..269b1d55a7 100644 ---- a/contribs/cray/slurmconfgen.py.in -+++ b/contribs/cray/slurmconfgen.py.in -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # - # Copyright 2013 Hewlett Packard Enterprise Development LP - # diff --git a/sources b/sources index 0657161..821f3fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-22.05.11.tar.bz2) = ebe82f6ad6dec45ba611a294d1d19e8ad7853322190bf4be1f8175cd89e35120b26c349d45a1048aca802e96795a61d9ab432a9b4106c757835b7044bcbe459b +SHA512 (slurm-24.05.2.tar.bz2) = d00b7420690f0067a53e6c52cf9ec103411766437d9677f9968fdb81859ad4c839ba7d3dbfa046f6b06b753262a25d12ff7e8e019b14fc8f7b1e1cbbe60ed819 From ca783cc4af63bd26c7df598f795e24e8054e67f4 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 25 Oct 2024 17:32:18 -0600 Subject: [PATCH 58/61] Rebuild for hdf5 1.14.5 From 52cf4022f375e2537f9f9fb0c2a8bfd4dd528094 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:59:46 +0000 Subject: [PATCH 59/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From d996362190dae7f1535ac08144187f061977aa65 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 7 Jul 2025 15:39:08 +0200 Subject: [PATCH 60/61] Perl 5.42 rebuild From 7d8b4cbcc882c36ce61b0f0514a3d9d40fbdf781 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:26:17 +0000 Subject: [PATCH 61/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild