From 95e7fc073988418725b03f4ba7839a30864c73db Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Mon, 10 Jan 2022 20:56:52 +0100 Subject: [PATCH] Remove conflicting ownership of motd.d directories They are owned by the `setup` package [1], which `pam` requires, so owning these directories by `pam` is wrong and unnecessary. Also remove the /run/motd.d line from pamtmp.conf, which is also already present in the `setup` package's tmpfiles config file. Should fix warnings like this during package updates: ``` Running scriptlet: libsepol-3.3-2.fc35.x86_64 16/16 /usr/lib/tmpfiles.d/pam.conf:4: Duplicate line for path "/run/motd.d", ignoring. /usr/lib/tmpfiles.d/setup.conf:2: Duplicate line for path "/run/motd.d", ignoring. ``` Signed-off-by: Ondrej Mosnacek --- pam.spec | 9 ++++----- pamtmp.conf | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pam.spec b/pam.spec index 2978e7a..167de71 100644 --- a/pam.spec +++ b/pam.spec @@ -4,7 +4,7 @@ Summary: An extensible library which provides authentication for applications Name: pam Version: 1.5.2 -Release: 8%{?dist} +Release: 9%{?dist} # The library is BSD licensed with option to relicense as GPLv2+ # - this option is redundant as the BSD license allows that anyway. # pam_timestamp, pam_loginuid, and pam_console modules are GPLv2+. @@ -150,8 +150,6 @@ install -m 644 %{SOURCE10} %{buildroot}%{_pam_confdir}/config-util install -m 600 /dev/null %{buildroot}%{_pam_secconfdir}/opasswd install -d -m 755 %{buildroot}/var/log install -d -m 755 %{buildroot}/var/run/faillock -install -d -m 755 %{buildroot}/usr/lib/motd.d -install -d -m 755 %{buildroot}/run/motd.d # Install man pages. install -m 644 %{SOURCE12} %{SOURCE13} %{SOURCE17} %{buildroot}%{_mandir}/man5/ @@ -324,8 +322,6 @@ done %config(noreplace) %{_pam_secconfdir}/sepermit.conf %dir /var/run/sepermit %dir /var/run/faillock -%dir /run/motd.d -%dir /usr/lib/motd.d %{_prefix}/lib/tmpfiles.d/pam.conf %{_mandir}/man5/* %{_mandir}/man8/* @@ -346,6 +342,9 @@ done %doc %{_pkgdocdir} %changelog +* Mon Jan 10 2022 Ondrej Mosnacek - 1.5.2-9 +- Remove conflicting ownership of motd.d directories + * Tue Nov 16 2021 Pavel Březina - 1.5.2-8 - systemd-auth, smartcard-auth, fingerprint-auth, password-auth and postlogin are now owned by authselect (#2023738) diff --git a/pamtmp.conf b/pamtmp.conf index ab2237f..f980a4a 100644 --- a/pamtmp.conf +++ b/pamtmp.conf @@ -1,5 +1,4 @@ d /run/console 0755 root root - d /run/faillock 0755 root root - d /run/sepermit 0755 root root - -d /run/motd.d 0755 root root - f /var/log/tallylog 0600 root root -