Hello community, here is the log from the commit of package sudo for openSUSE:Factory checked in at 2019-12-18 14:43:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sudo (Old) and /work/SRC/openSUSE:Factory/.sudo.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sudo" Wed Dec 18 14:43:05 2019 rev:105 rq:756015 version:1.8.28p1 Changes: -------- --- /work/SRC/openSUSE:Factory/sudo/sudo.changes 2019-10-30 14:42:18.777830997 +0100 +++ /work/SRC/openSUSE:Factory/.sudo.new.4691/sudo.changes 2019-12-18 14:45:36.101864060 +0100 @@ -1,0 +2,5 @@ +Fri Dec 6 08:38:45 UTC 2019 - Thorsten Kukuk <[email protected]> + +- Move pam.d/sudo* files to /usr/etc + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sudo.spec ++++++ --- /var/tmp/diff_new_pack.4lyDzG/_old 2019-12-18 14:45:38.045864949 +0100 +++ /var/tmp/diff_new_pack.4lyDzG/_new 2019-12-18 14:45:38.057864955 +0100 @@ -1,7 +1,7 @@ # # spec file for package sudo # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,12 @@ # +%if ! %{defined _distconfdir} +%define _distconfdir %{_sysconfdir} +%else +%define use_usretc 1 +%endif + Name: sudo Version: 1.8.28p1 Release: 0 @@ -109,9 +115,9 @@ %install %make_install install_uid=`id -u` install_gid=`id -g` -install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d -install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/sudo -install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/sudo-i +install -d -m 755 %{buildroot}%{_distconfdir}/pam.d +install -m 644 %{SOURCE3} %{buildroot}%{_distconfdir}/pam.d/sudo +install -m 644 %{SOURCE4} %{buildroot}%{_distconfdir}/pam.d/sudo-i rm -f %{buildroot}%{_bindir}/sudoedit ln -sf %{_bindir}/sudo %{buildroot}%{_bindir}/sudoedit install -d -m 755 %{buildroot}%{_sysconfdir}/openldap/schema @@ -133,6 +139,21 @@ install -m 644 %{buildroot}%{_docdir}/%{name}/LICENSE %{buildroot}%{_docdir}/%{name}-test/LICENSE rm -fv %{buildroot}%{_docdir}/%{name}/LICENSE +%if %{defined use_usretc} +%pre +# move outdated pam.d/*.rpmsave files away +for i in sudo sudo-i ; do + test -f /etc/pam.d/${i}.rpmsave && mv -v /etc/pam.d/${i}.rpmsave /etc/pam.d/${i}.rpmsave.old ||: +done + +%posttrans +# Migration to /usr/etc. +for i in sudo sudo-i ; do + test -f /etc/pam.d/${i}.rpmsave && mv -v /etc/pam.d/${i}.rpmsave /etc/pam.d/${i} ||: +done + +%endif + %post chmod 0440 %{_sysconfdir}/sudoers %if 0%{?suse_version} <= 1130 @@ -160,8 +181,13 @@ %config(noreplace) %attr(0440,root,root) %{_sysconfdir}/sudoers %dir %{_sysconfdir}/sudoers.d +%if %{defined use_usretc} +%{_distconfdir}/pam.d/sudo +%{_distconfdir}/pam.d/sudo-i +%else %config(noreplace) %{_sysconfdir}/pam.d/sudo %config(noreplace) %{_sysconfdir}/pam.d/sudo-i +%endif %attr(4755,root,root) %{_bindir}/sudo %dir %{_sysconfdir}/openldap %dir %{_sysconfdir}/openldap/schema
