rpm/slurm
SHA256
1
0
Fork 0
forked from pool/slurm
Code Pull Requests Activity

Accepting request 992362 from network:cluster

Browse Source 
- Fix a potential security vulnerability in the test package
  (bsc#1201674, CVE-2022-31251).

- Patch NOFILE Limit in the slurmd.service copy for the testsuite. (forwarded request 992353 from eeich)

OBS-URL: https://build.opensuse.org/request/show/992362
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slurm?expand=0&rev=76
This commit is contained in:
Dominique Leuenberger 2022-08-02 20:09:54 +00:00 committed by Git OBS Bridge
commit d3bcbab808
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
slurm.changes
View File

@ -1,10 +1,20 @@
-------------------------------------------------------------------
Tue Aug 2 12:43:39 UTC 2022 - Egbert Eich <eich@suse.com>
- Fix a potential security vulnerability in the test package
(bsc#1201674, CVE-2022-31251).
-------------------------------------------------------------------
Thu Jul 21 19:20:42 UTC 2022 - Bernhard Wiedemann <bwiedemann@suse.com>
- make slurmtest.tar reproducible
-------------------------------------------------------------------
Thu Jul 14 15:20:46 UTC 2022 - Egbert Eich <eich@suse.com>
- Improve check for mpicc in testsuite package: if binary isn't
found, don't crash.
- Fix a typo which prevented the nproc limit for slurmd to be
up-ed for the test suite.
- Patch NOFILE Limit in the slurmd.service copy for the testsuite.
-------------------------------------------------------------------
Mon Jun 20 09:23:17 UTC 2022 - Christian Goll <cgoll@suse.com>

21
slurm.spec
View File

@ -873,11 +873,18 @@ EOF
mkdir -p %{buildroot}/srv/slurm-testsuite/shared
mkdir -p %{buildroot}%_localstatedir/lib/slurm/shared
cd %{buildroot}/srv/slurm-testsuite
tar --group=%slurm_g --owner=%slurm_u -cjf /tmp/slurmtest.tar.bz2 *
find -type f -name "*.[ao]" -print | while read f; do
# drop non-deterministic lto bits from .o files
strip -p --discard-locals -R .gnu.lto_* -R .gnu.debuglto_* -N __gnu_lto_v1 $f
done
tar --group=%slurm_g --owner=%slurm_u \
--sort=name --mtime="@${SOURCE_DATE_EPOCH:-`date +%%s`}" --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
-cjf /tmp/slurmtest.tar.bz2 *
cd -
rm -rf %{buildroot}/srv/slurm-testsuite
mkdir -p %{buildroot}/srv/slurm-testsuite
mv /tmp/slurmtest.tar.bz2 %{buildroot}/srv/slurm-testsuite
mkdir -p %{buildroot}/%{_datadir}/%{name}
mv /tmp/slurmtest.tar.bz2 %{buildroot}/%{_datadir}/%{name}
mkdir -p %{buildroot}/etc/sudoers.d
echo "slurm ALL=(auser) NOPASSWD:ALL" > %{buildroot}/etc/sudoers.d/slurm
@ -889,7 +896,12 @@ cp %{buildroot}/%_unitdir/slurmd.service $SLURMD_SERVICE
if grep -qE "^LimitNPROC" $SLURMD_SERVICE; then
sed -i -e '/LimitNPROC/s@=.*@=infinity@' $SLURMD_SERVICE
else
sed -i -e '/LimitNPROC/aLimitNPROC=infinity' $SLURMD_SERVICE
sed -i -e '/LimitSTACK/aLimitNPROC=infinity' $SLURMD_SERVICE
fi
if grep -qE "^LimitNOFILE" $SLURMD_SERVICE; then
sed -i -e '/LimitNOFILE/s@=.*@=131072:infinity@' $SLURMD_SERVICE
else
sed -i -e '/LimitSTACK/aLimitNOFILE=131072:infinity' $SLURMD_SERVICE
fi
sed -i -e '/ExecStart/aExecStartPre=/bin/bash -c "for i in 0 1 2 3; do test -e /dev/nvidia$i || mknod /dev/nvidia$i c 10 $((i+2)); done"' $SLURMD_SERVICE
@ -1031,7 +1043,7 @@ exit 0
%post testsuite
rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite /srv/slurm-testsuite/config.h
tar --same-owner -C /srv/slurm-testsuite -xjf /srv/slurm-testsuite/slurmtest.tar.bz2
sudo -u %slurm_u /usr/bin/tar --same-owner -C /srv/slurm-testsuite -xjf %{_datadir}/%{name}/slurmtest.tar.bz2
%preun testsuite
rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite /srv/slurm-testsuite/config.h
@ -1467,6 +1479,7 @@ rm -rf /srv/slurm-testsuite/src /srv/slurm-testsuite/testsuite /srv/slurm-testsu
%files testsuite
%defattr(-, %slurm_u, %slurm_u, -)
%dir %attr(-, %slurm_u, %slurm_u) /srv/slurm-testsuite
%attr(-, root, root) %{_datadir}/%{name}
%if 0%{?sle_version} == 120200
%dir %{_pam_secconfdir}/limits.d
%endif