From 728a1b3c1ee16944c4116eac49c6587213e4cce7ceceaa7211cb213638d0c4e2 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Tue, 28 Sep 2021 15:54:50 +0000 Subject: [PATCH 1/3] updated major version OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=187 --- slurm.changes | 5 +++++ slurm.spec | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/slurm.changes b/slurm.changes index 32ebb86..4c2b998 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 28 15:53:38 UTC 2021 - Christian Goll + +- moved pam module from /lib64 to /usr/lib64 which fixes boo#1191095 + ------------------------------------------------------------------- Fri Sep 17 07:22:44 UTC 2021 - Christian Goll diff --git a/slurm.spec b/slurm.spec index d603adf..3c4208b 100644 --- a/slurm.spec +++ b/slurm.spec @@ -560,6 +560,7 @@ autoreconf --without-rpath \ --without-datawarp \ --with-shared-libslurm \ + --with-pam_dir=%{_libdir}/security \ %{?with_pmix:--with-pmix=/usr/} \ %if 0%{?build_slurmrestd} --enable-slurmrestd \ @@ -613,6 +614,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{pname}/plugstack.conf.d cp contribs/pam_slurm_adopt/README ../README.pam_slurm_adopt cp contribs/pam/README ../README.pam_slurm +# remove static pam libs +rm -v %{buildroot}%{_libdir}/security/*la # 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 @@ -1179,8 +1182,8 @@ exit 0 %files pam_slurm %{?comp_at} %doc ../README.pam_slurm ../README.pam_slurm_adopt -/%_lib/security/pam_slurm.so -/%_lib/security/pam_slurm_adopt.so +%{_libdir}/security/pam_slurm.so +%{_libdir}/security/pam_slurm_adopt.so %if 0%{?build_slurmrestd} %files rest From 1b26b8910b3bb43107ed4a97e240afc18356dca6c98731c77962b593517a7696 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Wed, 29 Sep 2021 07:08:48 +0000 Subject: [PATCH 2/3] via the macro %_pam_moduledir OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=188 --- slurm.changes | 1 + slurm.spec | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/slurm.changes b/slurm.changes index 4c2b998..5dd263a 100644 --- a/slurm.changes +++ b/slurm.changes @@ -2,6 +2,7 @@ Tue Sep 28 15:53:38 UTC 2021 - Christian Goll - moved pam module from /lib64 to /usr/lib64 which fixes boo#1191095 + via the macro %_pam_moduledir ------------------------------------------------------------------- Fri Sep 17 07:22:44 UTC 2021 - Christian Goll diff --git a/slurm.spec b/slurm.spec index 3c4208b..caa009e 100644 --- a/slurm.spec +++ b/slurm.spec @@ -560,7 +560,7 @@ autoreconf --without-rpath \ --without-datawarp \ --with-shared-libslurm \ - --with-pam_dir=%{_libdir}/security \ + --with-pam_dir=%_pam_moduledir \ %{?with_pmix:--with-pmix=/usr/} \ %if 0%{?build_slurmrestd} --enable-slurmrestd \ @@ -615,7 +615,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{pname}/plugstack.conf.d cp contribs/pam_slurm_adopt/README ../README.pam_slurm_adopt cp contribs/pam/README ../README.pam_slurm # remove static pam libs -rm -v %{buildroot}%{_libdir}/security/*la +rm -v %{buildroot}%{_pam_moduledir}/*la # 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 @@ -1182,8 +1182,8 @@ exit 0 %files pam_slurm %{?comp_at} %doc ../README.pam_slurm ../README.pam_slurm_adopt -%{_libdir}/security/pam_slurm.so -%{_libdir}/security/pam_slurm_adopt.so +%{_pam_moduledir}/pam_slurm.so +%{_pam_moduledir}/pam_slurm_adopt.so %if 0%{?build_slurmrestd} %files rest From 64b9f7f60a17bef693085117ada8e63bfd1fc27903678aa7acc7cb3e42f9e78d Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Wed, 29 Sep 2021 07:35:03 +0000 Subject: [PATCH 3/3] macro fixed OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=189 --- slurm.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/slurm.spec b/slurm.spec index caa009e..8a8a3c5 100644 --- a/slurm.spec +++ b/slurm.spec @@ -122,6 +122,10 @@ ExclusiveArch: do_not_build %define libslurm libslurm%{so_version} %{!?_rundir:%define _rundir /var/run} +%if !0%{?_pam_moduledir:1} +%define _pam_moduledir /%_lib +%endif + Name: %{pname}%{?upgrade:%{_ver}} Version: %{ver} Release: 0