[rpms/slurm] epel10: Release of 20.11.2

[Philip Kovacs <pkfed@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/slurm
Branch : epel10
Commit : 188ee2f90799b1ad0d658b2bd32f884fae19647b
Author : Philip Kovacs <pkfed@fedoraproject.org>
Date   : 2021-01-05T13:53:36-05:00
Stats  : +56/-73 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/slurm/c/188ee2f90799b1ad0d658b2bd32f884fae19647b?branch=epel10

Log:
Release of 20.11.2

---
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 <pkfed@fedoraproject.org> - 20.11.2-1
+- Release of 20.11.2
+
 * Tue Nov 17 2020 Philip Kovacs <pkfed@fedoraproject.org> - 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