From 172dc248408426109e7c830ab3c2209652601f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 16 Feb 2022 16:58:47 +0100 Subject: [PATCH] Co-own security directory instead of pulling in pam Requires:pam was added to avoid unowned directories provided by pam (/etc/security and /usr/lib*/security) [1]. Pulling in pam is problematic, because libpwquality is linked into various places where the pam stack might not be needed at all. It also creates an additional ordering dependency, which we don't want either. [1] https://bugzilla.redhat.com/show_bug.cgi?id=742996#c1 --- libpwquality.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libpwquality.spec b/libpwquality.spec index 13d4b4b..8221390 100644 --- a/libpwquality.spec +++ b/libpwquality.spec @@ -15,7 +15,7 @@ Summary: A library for password generation and password quality checking Name: libpwquality Version: 1.4.4 -Release: 7%{?dist} +Release: 8%{?dist} # The package is BSD licensed with option to relicense as GPLv2+ # - this option is redundant as the BSD license allows that anyway. License: BSD or GPLv2+ @@ -27,7 +27,6 @@ Source0: https://github.com/libpwquality/libpwquality/releases/download/libpwqua Requires: (cracklib-dicts >= 2.8 if passwd) Requires: (cracklib-dicts >= 2.8 if cryptsetup) -Requires: pam%{?_isa} BuildRequires: gcc make BuildRequires: cracklib-devel BuildRequires: gettext @@ -152,10 +151,12 @@ mkdir $RPM_BUILD_ROOT%{_secconfdir}/pwquality.conf.d %doc README NEWS AUTHORS %{_bindir}/pwmake %{_bindir}/pwscore +%dir %{_moduledir} %{_moduledir}/pam_pwquality.so %{_pwqlibdir}/libpwquality.so.* +%dir %{_secconfdir} %config(noreplace) %{_secconfdir}/pwquality.conf -%{_secconfdir}/pwquality.conf.d +%dir %{_secconfdir}/pwquality.conf.d %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* @@ -179,6 +180,9 @@ mkdir $RPM_BUILD_ROOT%{_secconfdir}/pwquality.conf.d %endif %changelog +* Wed Feb 16 2022 Zbigniew Jędrzejewski-Szmek - 1.4.4-8 +- Co-own security directory instead of pulling in pam (#2018913) + * Thu Jan 20 2022 Fedora Release Engineering - 1.4.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild