Hello community,
here is the log from the commit of package slurm for openSUSE:Leap:15.2 checked
in at 2020-02-14 17:58:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/slurm (Old)
and /work/SRC/openSUSE:Leap:15.2/.slurm.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slurm"
Fri Feb 14 17:58:12 2020 rev:59 rq:773202 version:19.05.5
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/slurm/slurm.changes 2020-01-15
16:03:01.319912791 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.slurm.new.26092/slurm.changes 2020-02-14
17:58:19.746835351 +0100
@@ -1,0 +2,111 @@
+Wed Feb 5 15:37:05 UTC 2020 - Christian Goll <cg...@suse.com>
+
+- standard slurm.conf uses now also SlurmctldHost on all build
+ targets (bsc#1162377)
+
+-------------------------------------------------------------------
+Mon Jan 27 08:42:55 UTC 2020 - Egbert Eich <e...@suse.com>
+
+- Fix a missed systemd_requires -> systemd_ordering conversion.
+
+-------------------------------------------------------------------
+Fri Jan 24 17:31:18 UTC 2020 - Egbert Eich <e...@suse.com>
+
+- Remove special OHPC compatibility macro: these settings should
+ be applied univerally.
+- Add a Recommends for mariadb to slurm-slurmdbd: it is recommened
+ to run the database on the same machine as the daemon.
+
+-------------------------------------------------------------------
+Fri Jan 24 11:47:58 UTC 2020 - Dominique Leuenberger <dims...@opensuse.org>
+
+- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to
+ shortcut through the -mini flavors.
+- Use systemd_ordering instead of systemd_requires: systemd is
+ never a strict requirement; but in case the system is scheduled
+ for installation together with systemd, we want systemd to be
+ installed prior to slurm.
+
+-------------------------------------------------------------------
+Thu Jan 23 17:44:29 UTC 2020 - Christian Goll <cg...@suse.com>
+
+- start slurmdbd after mariadb (bsc#1161716)
+
+-------------------------------------------------------------------
+Mon Jan 13 15:41:48 UTC 2020 - Egbert Eich <e...@suse.com>
+
+- Fix base_ver for SLE 15 SP2.
+
+-------------------------------------------------------------------
+Wed Jan 8 20:01:19 UTC 2020 - Egbert Eich <e...@suse.com>
+
+- Update to version 19.05.5 (jsc#SLE-8491)
+ * Check %docdir/NEWS for details.
+ * Includes security fixes CVE-2019-19727, CVE-2019-19728,
+ CVE-2019-12838.
+ * Disable i586 builds as this is no longer supported.
+ * Create libnss_slurm package to support user and group resolution
+ thru slurmstepd.
+ * slurm-2.4.4-rpath.patch -> Remove-rpath-from-build.patch
+ Obsoleted:
+ - pam_slurm_adopt-avoid-running-outside-of-the-sshd-PA.patch
+ - pam_slurm_adopt-send_user_msg-don-t-copy-undefined-d.patch
+ - pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch
+
+-------------------------------------------------------------------
+Thu Jan 2 09:14:56 UTC 2020 - Egbert Eich <e...@suse.com>
+
+- Deprecate "ControlMachine" only for SLURM version upgrades and
+ products newer than 1501. This ensures that the original setting
+ is retained for the SLURM version shipped origianlly with SLE-15-SP1
+ or Leap 15.1.
+
+-------------------------------------------------------------------
+Sat Dec 21 09:07:42 UTC 2019 - Egbert Eich <e...@suse.com>
+
+- Update to v18.08.9 for fixing CVE-2019-19728 (bsc#1159692).
+ * Wrap END_TIMER{,2,3} macro definition in "do {} while (0)" block.
+ * Make sview work with glib2 v2.62.
+ * Make Slurm compile on linux after sys/sysctl.h was deprecated.
+ * Install slurmdbd.conf.example with 0600 permissions to encourage secure
+ use. CVE-2019-19727.
+ * srun - do not continue with job launch if --uid fails. CVE-2019-19728.
+
+-------------------------------------------------------------------
+Wed Dec 11 18:23:46 UTC 2019 - Christian Goll <cg...@suse.com>
+
+- added pmix support jsc#SLE-10800
+
+-------------------------------------------------------------------
+Sun Dec 8 11:33:42 UTC 2019 - Egbert Eich <e...@suse.com>
+
+- Use --with-shared-libslurm to build slurm binaries using libslurm.
+- Make libslurm depend on slurm-config.
+
+-------------------------------------------------------------------
+Fri Dec 6 17:06:32 UTC 2019 - Egbert Eich <e...@suse.com>
+
+- Fix ownership of /var/spool/slurm on new installations
+ and upgrade (boo#1158696).
+
+-------------------------------------------------------------------
+Thu Oct 31 10:18:21 UTC 2019 - Egbert Eich <e...@suse.com>
+
+- Fix permissions of slurmdbd.conf (bsc#1155784, CVE-2019-19727).
+- Fix %posttrans macro _res_update to cope with added newline
+ (bsc#1153259).
+
+-------------------------------------------------------------------
+Mon Oct 21 15:54:43 UTC 2019 - Egbert Eich <e...@suse.com>
+
+- Add package slurm-webdoc which sets up a web server to provide
+ the documentation for the version shipped.
+
+-------------------------------------------------------------------
+Mon Oct 7 15:39:43 UTC 2019 - Egbert Eich <e...@suse.com>
+
+- Move srun from 'slurm' to 'slurm-node': srun is required on the
+ nodes as well so sbatch will work. 'slurm-node' is a requirement
+ when 'slurm' is installed (bsc#1153095).
+
+-------------------------------------------------------------------
Old:
----
pam_slurm_adopt-avoid-running-outside-of-the-sshd-PA.patch
pam_slurm_adopt-send_user_msg-don-t-copy-undefined-d.patch
pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch
slurm-18.08.8.tar.bz2
slurm-2.4.4-rpath.patch
New:
----
Remove-rpath-from-build.patch
slurm-19.05.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ slurm.spec ++++++
--- /var/tmp/diff_new_pack.itIcVZ/_old 2020-02-14 17:58:20.314835691 +0100
+++ /var/tmp/diff_new_pack.itIcVZ/_new 2020-02-14 17:58:20.318835693 +0100
@@ -1,7 +1,7 @@
#
# spec file for package slurm
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,20 @@
# Check file META in sources: update so_version to (API_CURRENT - API_AGE)
-%define so_version 33
-%define ver 18.08.8
-%define _ver _18_08
+%define so_version 34
+%define ver 19.05.5
+%define _ver _19_05
%define dl_ver %{ver}
# so-version is 0 and seems to be stable
%define pmi_so 0
+%define nss_so 2
%define pname slurm
+%ifarch i586
+ExclusiveArch: do_not_build
+%endif
+
%if 0%{?sle_version} == 120200
%define base_ver 1702
%endif
@@ -36,25 +41,34 @@
%define base_ver 1808
%endif
%if 0%{?sle_version} == 150200
-%define base_ver 1808
+%define base_ver 1905
%endif
%if 0%{?base_ver} > 0 && 0%{?base_ver} < %(echo %{_ver} | tr -d _)
%define upgrade 1
%endif
+%if !0%{?is_opensuse} && 0%{!?upgrade:1} && 0%{?sle_version} < 150200
+%define legacy_cray 1
+%endif
-# For anything newer than Leap 42.1 and SLE-12-SP1 build compatible to OpenHPC.
-%if 0%{suse_version} > 1320 || 0%{?sle_version} >= 120200
-%define OHPC_BUILD 1
+# Build with PMIx only for SLE >= 15.2 and TW
+%if 0%{?sle_version} >= 150200 || 0%{suse_version} >= 1550
+%{bcond_without pmix}
+%else
+%{bcond_with pmix}
%endif
%if 0%{?suse_version} >= 1220 || 0%{?sle_version} >= 120000
%define with_systemd 1
%endif
+
%if 0%{?suse_version:1} && 0%{?suse_version} <= 1140
%define comp_at %defattr(-,root,root)
%else
%define have_json_c 1
+ %if 0%{?sle_version} >= 150000 || 0%{?is_opensuse}
+ %define have_apache_rpm_macros 1
+ %endif
%endif
%if 0
@@ -97,10 +111,10 @@
Summary: Simple Linux Utility for Resource Management
License: SUSE-GPL-2.0-with-openssl-exception
Group: Productivity/Clustering/Computing
-Url: https://www.schedmd.com
+URL: https://www.schedmd.com
Source: https://download.schedmd.com/slurm/%{pname}-%{dl_ver}.tar.bz2
Source1: slurm-rpmlintrc
-Patch0: slurm-2.4.4-rpath.patch
+Patch0: Remove-rpath-from-build.patch
Patch1: slurm-2.4.4-init.patch
Patch2: pam_slurm-Initialize-arrays-and-pass-sizes.patch
Patch3: split-xdaemon-in-xdaemon_init-and-xdaemon_finish-for.patch
@@ -110,9 +124,6 @@
Patch7: slurmsmwd-uses-xdaemon_-for-systemd.patch
Patch8: removed-deprecated-xdaemon.patch
Patch9:
slurmctld-rerun-agent_init-when-backup-controller-takes-over.patch
-Patch10: pam_slurm_adopt-avoid-running-outside-of-the-sshd-PA.patch
-Patch11: pam_slurm_adopt-send_user_msg-don-t-copy-undefined-d.patch
-Patch12: pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch
%{?upgrade:Provides: %{pname} = %{version}}
%{?upgrade:Conflicts: %{pname}}
@@ -141,6 +152,7 @@
%endif
BuildRequires: mysql-devel >= 5.0.0
BuildRequires: ncurses-devel
+%{?with_pmix:BuildRequires: pmix-devel}
BuildRequires: openssl-devel >= 0.9.6
BuildRequires: pkgconfig
BuildRequires: postgresql-devel >= 8.0.0
@@ -169,8 +181,8 @@
BuildRequires: libssh2-devel
BuildRequires: rrdtool-devel
%if 0%{?with_systemd}
-%{?systemd_requires}
-BuildRequires: systemd
+%{?systemd_ordering}
+BuildRequires: pkgconfig(systemd)
%else
Requires(post): %insserv_prereq %fillup_prereq
%endif
@@ -190,6 +202,20 @@
%{?upgrade:Provides: %{pname}-doc = %{version}}
%{?upgrade:Conflicts: %{pname}-doc}
+%package webdoc
+Summary: Set up SLURM Documentation Server
+Group: Productivity/Clustering/Computing
+%if 0%{?have_apache_rpm_macros}
+BuildRequires: apache-rpm-macros
+%else
+%define apache_sysconfdir /etc/apache2
+%endif
+Requires: slurm-doc = %{version}
+Requires(pre): apache2
+
+%description webdoc
+Set up HTTP server for SLURM configuration.
+
%description doc
Documentation (HTML) for the SLURM cluster managment software.
@@ -213,6 +239,9 @@
%package -n %{libslurm}
Summary: Libraries for SLURM
Group: System/Libraries
+Requires: %{name}-config = %{version}
+Provides: libslurm = %{version}
+Conflicts: libslurm
%description -n %{libslurm}
This package contains the library needed to run programs dynamically linked
@@ -220,13 +249,21 @@
%package -n libpmi%{pmi_so}
-Summary: Libraries for SLURM
+Summary: SLURM PMI Library
Group: System/Libraries
%description -n libpmi%{pmi_so}
This package contains the library needed to run programs dynamically linked
with SLURM.
+%package -n libnss_%{pname}%{nss_so}
+Summary: NSS Plugin for SLURM
+Group: System/Libraries
+
+%description -n libnss_%{pname}%{nss_so}
+libnss_slurm is an optional NSS plugin that permits password and group
+resolution for a job on a compute node to be serviced through the local
+slurmstepd process.
%package devel
Summary: Development package for SLURM
@@ -240,7 +277,6 @@
%description devel
This package includes the header files for the SLURM API.
-
%package auth-none
Summary: SLURM auth NULL implementation (no authentication)
Group: Productivity/Clustering/Computing
@@ -283,13 +319,16 @@
Requires: %{name}-config = %{version}
Requires: %{name}-plugins = %{version}
Requires: %{name}-sql = %{version}
+%if 0%{?suse_version} > 1310
+Recommends: mariadb
+%endif
%if 0%{?have_boolean_deps}
Recommends: (%{name}-munge = %version if munge)
%else
Recommends: %{name}-munge = %version
%endif
%if 0%{?with_systemd}
-%{?systemd_requires}
+%{?systemd_ordering}
%else
Requires(post): %insserv_prereq %fillup_prereq
%endif
@@ -408,7 +447,7 @@
Recommends: %{name}-munge = %version
%endif
%if 0%{?with_systemd}
-%{?systemd_requires}
+%{?systemd_ordering}
%else
Requires(post): %insserv_prereq %fillup_prereq
%endif
@@ -421,13 +460,14 @@
%package config
Summary: Config files and directories for slurm services
Group: Productivity/Clustering/Computing
+Requires: logrotate
%if 0%{?suse_version} <= 1140
Requires(pre): pwdutils
%else
Requires(pre): shadow
%endif
%if 0%{?with_systemd}
-%{?systemd_requires}
+%{?systemd_ordering}
%endif
%{?upgrade:Provides: %{pname}-config = %{version}}
%{?upgrade:Conflicts: %{pname}-config}
@@ -465,7 +505,7 @@
%prep
%setup -q -n %{pname}-%{dl_ver}
-%patch0 -p1
+%patch0 -p2
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -476,9 +516,6 @@
%patch8 -p1
# Drop this fix as it is considered to be resolved by c1a537dbbe6
##%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
%build
%define _lto_cflags %{nil}
@@ -486,6 +523,7 @@
--disable-static \
--without-rpath \
--without-datawarp \
+ --with-shared-libslurm \
%{!?have_netloc:--without-netloc} \
--sysconfdir=%{_sysconfdir}/%{pname} \
%{!?have_hdf5:--without-hdf5} \
@@ -516,7 +554,7 @@
ln -sf %{_initrddir}/slurm %{buildroot}%{_sbindir}/rcslurm
ln -sf %{_initrddir}/slurmdbd %{buildroot}%{_sbindir}/rcslurmdbd
%endif
-mkdir -p %{buildroot}%{_var}/spool/slurm
+mkdir -p %{buildroot}%{_localstatedir}/spool/slurm
rm -f contribs/cray/opt_modulefiles_slurm
rm -f %{buildroot}%{_sysconfdir}/plugstack.conf.template
@@ -529,15 +567,14 @@
install -D -m644 etc/layouts.d.power.conf.example
%{buildroot}/%{_sysconfdir}/%{pname}/layouts.d/power.conf.example
install -D -m644 etc/layouts.d.power_cpufreq.conf.example
%{buildroot}/%{_sysconfdir}/%{pname}/layouts.d/power_cpufreq.conf.example
install -D -m644 etc/layouts.d.unit.conf.example
%{buildroot}/%{_sysconfdir}/%{pname}/layouts.d/unit.conf.example
-install -D -m644 etc/slurm.conf.example
%{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf%{?OHPC_BUILD:.example}
-install -D -m644 etc/slurmdbd.conf.example
%{buildroot}/%{_sysconfdir}/%{pname}/slurmdbd.conf
-install -D -m644 etc/slurmdbd.conf.example
%{buildroot}%{_sysconfdir}/%{pname}/slurmdbd.conf.example
+install -D -m644 etc/slurm.conf.example
%{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf.example
+install -D -m600 etc/slurmdbd.conf.example
%{buildroot}/%{_sysconfdir}/%{pname}/slurmdbd.conf
+install -D -m600 etc/slurmdbd.conf.example
%{buildroot}%{_sysconfdir}/%{pname}/slurmdbd.conf.example
install -D -m755 contribs/sjstat %{buildroot}%{_bindir}/sjstat
install -D -m755 contribs/sgather/sgather %{buildroot}%{_bindir}/sgather
cp contribs/pam_slurm_adopt/README ../README.pam_slurm_adopt
cp contribs/pam/README ../README.pam_slurm
-%if 0%{?OHPC_BUILD}
# change slurm.conf for our needs
head -n -2 %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf.example | grep -v
ReturnToService > %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf
sed -i 's#\(StateSaveLocation=\).*#\1%_localstatedir/lib/slurm#'
%{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf
@@ -562,12 +599,14 @@
%{buildroot}/%{_sysconfdir}/%{pname}/slurmdbd.conf
# manage local state dir and a remote states save location
mkdir -p %{buildroot}/%_localstatedir/lib/slurm
+%if 0%{?with_systemd}
sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmctld.pid@" \
-e "s@After=.*@After=network.target munge.service remote-fs.target@" \
%{buildroot}/%{_unitdir}/slurmctld.service
sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmd.pid@" \
%{buildroot}/%{_unitdir}/slurmd.service
sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmdbd.pid@" \
+ -e 's@After=\(.*\)@After=\1 mariadb.service@' \
%{buildroot}/%{_unitdir}/slurmdbd.service
%endif
@@ -644,9 +683,33 @@
}
EOF
done
-
+mkdir -p %{buildroot}/%{apache_sysconfdir}/conf.d
+cat > %{buildroot}/%{apache_sysconfdir}/conf.d/slurm.conf <<EOF
+Alias /slurm/ "/usr/share/doc/slurm-%{ver}/html/"
+<Directory "/usr/share/doc/slurm-%{ver}/html/">
+ AllowOverride None
+ DirectoryIndex slurm.html
+ # Controls who can get stuff from this server.
+ <IfModule !mod_access_compat.c>
+ Require all granted
+ </IfModule>
+ <IfModule mod_access_compat.c>
+ Order allow,deny
+ Allow from all
+ </IfModule>
+</Directory>
+EOF
+cat > %{buildroot}/%{_sysconfdir}/%{pname}/nss_slurm.conf <<EOF
+## Optional config for libnss_slurm
+## Specify if different from default
+# SlurmdSpoolDir /var/spool/slurmd
+## Specify if does not match hostname
+# NodeName myname
+EOF
%fdupes -s %{buildroot}
+%define fixperm() [ $1 -eq 1 -a -e %2 ] && /bin/chmod %1 %2
+
%pre
%if 0%{?with_systemd}
%service_add_pre slurmctld.service
@@ -677,6 +740,8 @@
%endif
%post slurmdbd
+%{fixperm 0600 %{_sysconfdir}/%{pname}/slurmdbd.conf}
+%{fixperm 0600 %{_sysconfdir}/%{pname}/slurmdbd.conf.example}
%if 0%{?with_systemd}
%service_add_post slurmdbd.service
%else
@@ -691,6 +756,8 @@
%endif
%postun slurmdbd
+%{fixperm 0600 %{_sysconfdir}/%{pname}/slurmdbd.conf}
+%{fixperm 0600 %{_sysconfdir}/%{pname}/slurmdbd.conf.example}
%if 0%{?with_systemd}
%service_del_postun -n slurmdbd.service
%else
@@ -728,6 +795,7 @@
%define slurmdescr "SLURM workload manager"
getent group %slurm_g >/dev/null || groupadd -r %slurm_g
getent passwd %slurm_u >/dev/null || useradd -r -g %slurm_g -d %slurmdir -s
/bin/false -c %{slurmdescr} %slurm_u
+[ -d %{_localstatedir}/spool/slurm ] && /bin/chown -h %slurm_u:%slurm_g
%{_localstatedir}/spool/slurm
exit 0
%post config
@@ -745,6 +813,9 @@
%post -n libpmi%{pmi_so} -p /sbin/ldconfig
%postun -n libpmi%{pmi_so} -p /sbin/ldconfig
+%post -n libnss_%{pname}%{nss_so} -p /sbin/ldconfig
+%postun -n libnss_%{pname}%{nss_so} -p /sbin/ldconfig
+
%{!?nil:
# On update the %%postun code of the old package restarts the
# service. This breaks in case the ABI between slurm and its
@@ -768,8 +839,12 @@
%define _rest() %{?with_systemd:[ -e /run/%{1}.rst ] && { systemctl status
%{1} &>/dev/null || systemctl restart %{1}; }; rm -f /run/%{1}.rst;}
%{!?nil:
# Until a posttrans macro has been added to macros.systemd, we need this
+# Do NOT delete the line breaks in the macro definition: they help
+# to cope with different versions of the %_restart_on_update.
+}
+%define _res_update() %{?with_systemd:
+ %{expand:%%_restart_on_update %{?*}}
}
-%define _res_update() %{?with_systemd:%{expand:%%_restart_on_update %{?*}};}
%pretrans -p <lua>
%_test_rest slurmctld
@@ -817,7 +892,6 @@
%{_bindir}/sprio
%{_bindir}/squeue
%{_bindir}/sreport
-%{_bindir}/srun
%{_bindir}/smap
%{_bindir}/sshare
%{_bindir}/sstat
@@ -846,7 +920,6 @@
%{_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*
@@ -872,6 +945,10 @@
%dir %{_datadir}/doc/%{pname}-%{dl_ver}
%{_datadir}/doc/%{pname}-%{dl_ver}/*
+%files webdoc
+%{?comp_at}
+%{apache_sysconfdir}/conf.d/slurm.conf
+
%files -n %{libslurm}
%{?comp_at}
%{_libdir}/libslurm*.so.%{so_version}*
@@ -880,13 +957,17 @@
%{?comp_at}
%{_libdir}/libpmi*.so.%{pmi_so}*
+%files -n libnss_%{pname}%{nss_so}
+%{?comp_at}
+%config(noreplace) %{_sysconfdir}/%{pname}/nss_slurm.conf
+%{_libdir}/libnss_slurm.so.%{nss_so}
+
%files devel
%{?comp_at}
%{_prefix}/include/slurm
%{_libdir}/libpmi.so
%{_libdir}/libpmi2.so
%{_libdir}/libslurm.so
-%{_libdir}/libslurmdb.so
%{_libdir}/slurm/src/*
%{_mandir}/man3/slurm_*
%{_libdir}/pkgconfig/slurm.pc
@@ -903,7 +984,7 @@
%files munge
%{?comp_at}
%{_libdir}/slurm/auth_munge.so
-%{_libdir}/slurm/crypto_munge.so
+%{_libdir}/slurm/cred_munge.so
%files -n perl-%{name}
%{?comp_at}
@@ -919,8 +1000,8 @@
%{_sbindir}/slurmdbd
%{_mandir}/man5/slurmdbd.*
%{_mandir}/man8/slurmdbd.*
-%config(noreplace) %{_sysconfdir}/%{pname}/slurmdbd.conf
-%{_sysconfdir}/%{pname}/slurmdbd.conf.example
+%config(noreplace) %attr(0600,%slurm_u,%slurm_g)
%{_sysconfdir}/%{pname}/slurmdbd.conf
+%attr(0600,%slurm_u,%slurm_g) %{_sysconfdir}/%{pname}/slurmdbd.conf.example
%if 0%{?with_systemd}
%{_unitdir}/slurmdbd.service
%else
@@ -949,14 +1030,18 @@
%{_libdir}/slurm/acct_gather_filesystem_none.so
%{_libdir}/slurm/acct_gather_interconnect_none.so
%{_libdir}/slurm/acct_gather_profile_none.so
+%{?have_json_c:%{_libdir}/slurm/burst_buffer_datawarp.so}
%{_libdir}/slurm/burst_buffer_generic.so
%{_libdir}/slurm/checkpoint_none.so
%{_libdir}/slurm/checkpoint_ompi.so
%{_libdir}/slurm/core_spec_none.so
-%{_libdir}/slurm/crypto_openssl.so
+%{_libdir}/slurm/cli_filter_none.so
+%{_libdir}/slurm/cred_none.so
%{_libdir}/slurm/ext_sensors_none.so
+%{_libdir}/slurm/gpu_generic.so
%{_libdir}/slurm/gres_gpu.so
%{_libdir}/slurm/gres_mic.so
+%{_libdir}/slurm/gres_mps.so
%{_libdir}/slurm/gres_nic.so
%{_libdir}/slurm/jobacct_gather_cgroup.so
%{_libdir}/slurm/jobacct_gather_linux.so
@@ -983,6 +1068,10 @@
%{_libdir}/slurm/mpi_none.so
%{_libdir}/slurm/mpi_openmpi.so
%{_libdir}/slurm/mpi_pmi2.so
+%if %{with pmix}
+%{_libdir}/slurm/mpi_pmix.so
+%{_libdir}/slurm/mpi_pmix_v3.so
+%endif
%{_libdir}/slurm/power_none.so
%{_libdir}/slurm/preempt_none.so
%{_libdir}/slurm/preempt_partition_prio.so
@@ -997,10 +1086,10 @@
%{_libdir}/slurm/sched_backfill.so
%{_libdir}/slurm/sched_builtin.so
%{_libdir}/slurm/sched_hold.so
-%{_libdir}/slurm/select_alps.so
%{_libdir}/slurm/select_cons_res.so
+%{_libdir}/slurm/select_cons_tres.so
%{_libdir}/slurm/select_linear.so
-%{_libdir}/slurm/select_serial.so
+%{_libdir}/slurm/site_factor_none.so
%{_libdir}/slurm/slurmctld_nonstop.so
%{_libdir}/slurm/switch_generic.so
%{_libdir}/slurm/switch_none.so
@@ -1025,19 +1114,22 @@
%{_libdir}/slurm/acct_gather_profile_influxdb.so
%{_libdir}/slurm/ext_sensors_rrd.so
%{_libdir}/slurm/jobcomp_elasticsearch.so
-%if !0%{?is_opensuse}
-%{_libdir}/slurm/acct_gather_energy_cray.so
-%{_libdir}/slurm/core_spec_cray.so
-%{_libdir}/slurm/job_submit_cray.so
-%{_libdir}/slurm/select_cray.so
-%{_libdir}/slurm/switch_cray.so
-%{_libdir}/slurm/task_cray.so
+%if 0%{?legacy_cray}
+%{_libdir}/slurm/acct_gather_energy_cray_aries.so
+%{_libdir}/slurm/core_spec_cray_aries.so
+%{_libdir}/slurm/job_submit_cray_aries.so
+%{_libdir}/slurm/select_cray_aries.so
+%{_libdir}/slurm/switch_cray_aries.so
+%{_libdir}/slurm/task_cray_aries.so
+ %if 0%{?have_json_c}
+%{_libdir}/slurm/node_features_knl_cray.so
+%{_libdir}/slurm/power_cray_aries.so
+ %endif
%endif
%files lua
%{?comp_at}
%{_libdir}/slurm/job_submit_lua.so
-%{_libdir}/slurm/proctrack_lua.so
%files torque
%{?comp_at}
@@ -1068,6 +1160,9 @@
%{?comp_at}
%{_sbindir}/slurmd
%{_sbindir}/slurmstepd
+# bsc#1153095
+%{_bindir}/srun
+%{_mandir}/man1/srun.1*
%{_mandir}/man8/slurmd.*
%{_mandir}/man8/slurmstepd*
%if 0%{?with_systemd}
@@ -1083,14 +1178,14 @@
%dir %{_sysconfdir}/%{pname}
%dir %{_sysconfdir}/%{pname}/layouts.d
%config(noreplace) %{_sysconfdir}/%{pname}/slurm.conf
-%{?OHPC_BUILD:%config %{_sysconfdir}/%{pname}/slurm.conf.example}
+%config %{_sysconfdir}/%{pname}/slurm.conf.example
%config(noreplace) %{_sysconfdir}/%{pname}/cgroup.conf
%config(noreplace) %{_sysconfdir}/%{pname}/layouts.d/power.conf.example
%config(noreplace) %{_sysconfdir}/%{pname}/layouts.d/power_cpufreq.conf.example
%config(noreplace) %{_sysconfdir}/%{pname}/layouts.d/unit.conf.example
-%{?OHPC_BUILD:%attr(0755, %slurm_u, %slurm_g) %_localstatedir/lib/slurm}
+%attr(0755, %slurm_u, %slurm_g) %_localstatedir/lib/slurm
%{?with_systemd:%{_tmpfilesdir}/%{pname}.conf}
-%dir %{_var}/spool/slurm
+%dir %attr(0755, %slurm_u, %slurm_g)%{_localstatedir}/spool/slurm
%config(noreplace) %{_sysconfdir}/logrotate.d/slurm*
%files config-man
@@ -1104,7 +1199,7 @@
%{_mandir}/man5/nonstop.conf.5.*
%{_mandir}/man5/topology.*
%{_mandir}/man5/knl.conf.5.*
-%if !0%{?is_opensuse}
+%if 0%{?legacy_cray}
%{_mandir}/man5/cray.*
%endif
@@ -1115,23 +1210,20 @@
%{_mandir}/man1/sh5util.1.gz
%endif
-%if 0%{?is_opensuse} || 0%{?have_json_c}
+%if !0%{?legacy_cray}
%files cray
# do not remove cray sepcific packages from SLES update
- %if 0%{?is_opensuse}
-%{_libdir}/slurm/acct_gather_energy_cray.so
-%{_libdir}/slurm/core_spec_cray.so
-%{_libdir}/slurm/job_submit_cray.so
-%{_libdir}/slurm/select_cray.so
-%{_libdir}/slurm/switch_cray.so
-%{_libdir}/slurm/task_cray.so
+%{_libdir}/slurm/acct_gather_energy_cray_aries.so
+%{_libdir}/slurm/core_spec_cray_aries.so
+%{_libdir}/slurm/job_submit_cray_aries.so
+%{_libdir}/slurm/select_cray_aries.so
+%{_libdir}/slurm/switch_cray_aries.so
+%{_libdir}/slurm/task_cray_aries.so
%{_mandir}/man5/cray.*
- %endif
%if 0%{?have_json_c}
-%{_libdir}/slurm/burst_buffer_cray.so
%{_libdir}/slurm/node_features_knl_cray.so
- %{_libdir}/slurm/power_cray.so
-%endif
+%{_libdir}/slurm/power_cray_aries.so
+ %endif
%endif
%changelog
++++++ Remove-rpath-from-build.patch ++++++
From: Egbert Eich <e...@suse.com>
Date: Wed Jan 8 20:56:25 2020 +0100
Subject: Remove rpath from build
Patch-mainline: never
Git-commit: f79af97c35f38775a7a90cd8e4b98814729d9a9c
References:
Signed-off-by: Egbert Eich <e...@suse.com>
---
slurm-19.05.5/contribs/perlapi/libslurm/perl/Makefile.PL.in | 4 ++--
slurm-19.05.5/contribs/perlapi/libslurmdb/perl/Makefile.PL.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/slurm-19.05.5/contribs/perlapi/libslurm/perl/Makefile.PL.in
b/slurm-19.05.5/contribs/perlapi/libslurm/perl/Makefile.PL.in
index fcae437..797c943 100644
--- a/slurm-19.05.5/contribs/perlapi/libslurm/perl/Makefile.PL.in
+++ b/slurm-19.05.5/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`);
-my $other_ld_flags = "-Wl,-rpath,@top_builddir@/src/api/.libs
-Wl,-rpath,@prefix@/lib";
+my $other_ld_flags = "-L@top_builddir@/src/api/.libs -lslurm";
$other_ld_flags = " -brtl -G -bnoentry -bgcbypass:1000 -bexpfull"
if $os =~ "aix";
@@ -88,7 +88,7 @@ WriteMakefile(
($] >= 5.005 ? ## Add these new keywords supported since 5.005
(ABSTRACT_FROM => 'lib/Slurm.pm', # retrieve abstract from module
AUTHOR => 'Hongjia Cao <hj...@nudt.edu.cn>') : ()),
- LIBS => ["-L@top_builddir@/src/api/.libs -L@prefix@/lib
-lslurm"], # e.g., '-lm'
+ LIBS => ["-L@prefix@/lib -lslurm"], # e.g., '-lm'
DEFINE => '', # e.g., '-DHAVE_SOMETHING'
INC => "-I. -I@top_srcdir@
-I@top_srcdir@/contribs/perlapi/common -I@top_builddir@",
# Un-comment this if you add C files to link with later:
diff --git a/slurm-19.05.5/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
b/slurm-19.05.5/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
index 2db028c..83eb4e2 100644
--- a/slurm-19.05.5/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
+++ b/slurm-19.05.5/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`);
-my $other_ld_flags = "-Wl,-rpath,@top_builddir@/src/db_api/.libs
-Wl,-rpath,@prefix@/lib";
+my $other_ld_flags = "-L@top_builddir@/src/api/.libs -lslurm";
$other_ld_flags = " -brtl -G -bnoentry -bgcbypass:1000 -bexpfull"
if $os =~ "aix";
@@ -87,7 +87,7 @@ WriteMakefile(
($] >= 5.005 ? ## Add these new keywords supported since 5.005
(ABSTRACT_FROM => 'Slurmdb.pm', # retrieve abstract from module
AUTHOR => 'Don Lipari <lip...@llnl.gov>') : ()),
- LIBS => ["-L@top_builddir@/src/api/.libs -L@prefix@/lib
-lslurm"], # e.g., '-lm'
+ LIBS => ["-L@prefix@/lib -lslurmdb"], # e.g., '-lm'
DEFINE => '', # e.g., '-DHAVE_SOMETHING'
INC => "-I. -I@top_srcdir@
-I@top_srcdir@/contribs/perlapi/common -I@top_builddir@",
# Un-comment this if you add C files to link with later:
++++++ slurm-18.08.8.tar.bz2 -> slurm-19.05.5.tar.bz2 ++++++
++++ 289972 lines of diff (skipped)
