From b025ee55c120c3a8f92438d4dde19f2e6764dd8f Mon Sep 17 00:00:00 2001 From: Iker Pedrosa Date: Tue, 21 Sep 2021 10:35:14 +0200 Subject: [PATCH] - Remove the /etc/motd.d directory to exclude its ownership from pam (#1968131) - pam_timestamp: enable openssl hmac authentication (#1947294) - Clean spec file: organize dependencies and move URL location Signed-off-by: Iker Pedrosa --- pam.spec | 66 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/pam.spec b/pam.spec index 58632c4..cfe585f 100644 --- a/pam.spec +++ b/pam.spec @@ -4,11 +4,12 @@ Summary: An extensible library which provides authentication for applications Name: pam Version: 1.5.2 -Release: 3%{?dist} +Release: 4%{?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+. License: BSD and GPLv2+ +URL: http://www.linux-pam.org/ Source0: https://github.com/linux-pam/linux-pam/releases/download/v%{version}/Linux-PAM-%{version}.tar.xz Source1: https://github.com/linux-pam/linux-pam/releases/download/v%{version}/Linux-PAM-%{version}.tar.xz.asc Source2: https://releases.pagure.org/pam-redhat/pam-redhat-%{pam_redhat_version}.tar.bz2 @@ -42,33 +43,43 @@ Patch5: pam-1.5.2-pam_console-fix_setgroups_not_defined.patch %endif %global _performance_build 1 +### Dependencies ### +Requires: libeconf >= 0.3.5 Requires: libpwquality >= 0.9.9 -BuildRequires: make -BuildRequires: autoconf >= 2.60 -BuildRequires: automake, libtool -BuildRequires: bison, flex, sed -BuildRequires: perl-interpreter, pkgconfig, gettext-devel -BuildRequires: libtirpc-devel, libnsl2-devel +Requires: openssl >= 3.0.0 +Requires: setup %if %{WITH_AUDIT} -BuildRequires: audit-libs-devel >= 1.0.8 Requires: audit-libs >= 1.0.8 %endif %if %{WITH_SELINUX} -BuildRequires: libselinux-devel >= 1.33.2 Requires: libselinux >= 1.33.2 %endif -BuildRequires: libeconf-devel >= 0.3.5 -Requires: libeconf >= 0.3.5 -Requires: glibc >= 2.3.90-37 -BuildRequires: libxcrypt-devel >= 4.3.3-2 -BuildRequires: libdb-devel -# Following deps are necessary only to build the pam library documentation. -BuildRequires: linuxdoc-tools, elinks, libxslt -BuildRequires: docbook-style-xsl, docbook-dtds -BuildRequires: gcc -BuildRequires: systemd -URL: http://www.linux-pam.org/ +### Build Dependencies ### +BuildRequires: autoconf >= 2.60 +BuildRequires: automake +BuildRequires: bison +BuildRequires: flex +BuildRequires: gcc +BuildRequires: gettext-devel +BuildRequires: libdb-devel +BuildRequires: libeconf-devel >= 0.3.5 +BuildRequires: libnsl2-devel +BuildRequires: libtirpc-devel +BuildRequires: libtool +BuildRequires: libxcrypt-devel >= 4.3.3-2 +BuildRequires: make +BuildRequires: openssl-devel >= 3.0.0 +BuildRequires: perl-interpreter +BuildRequires: pkgconfig +BuildRequires: sed +BuildRequires: systemd +%if %{WITH_AUDIT} +BuildRequires: audit-libs-devel >= 1.0.8 +%endif +%if %{WITH_SELINUX} +BuildRequires: libselinux-devel >= 1.33.2 +%endif %description PAM (Pluggable Authentication Modules) is a system security tool that @@ -89,6 +100,11 @@ and modules for use with the PAM system. %package docs Summary: Extra documentation for PAM. Requires: pam%{?_isa} = %{version}-%{release} +BuildRequires: docbook-dtds +BuildRequires: docbook-style-xsl +BuildRequires: elinks +BuildRequires: libxslt +BuildRequires: linuxdoc-tools %description docs PAM (Pluggable Authentication Modules) is a system security tool that @@ -128,7 +144,8 @@ autoreconf -i --disable-audit \ %endif --disable-static \ - --disable-prelude + --disable-prelude \ + --enable-openssl %make_build -C po update-gmo %make_build @@ -167,7 +184,6 @@ install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_pam_confdir}/postlogin install -m 600 /dev/null $RPM_BUILD_ROOT%{_pam_secconfdir}/opasswd install -d -m 755 $RPM_BUILD_ROOT/var/log install -d -m 755 $RPM_BUILD_ROOT/var/run/faillock -install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/motd.d install -d -m 755 $RPM_BUILD_ROOT/usr/lib/motd.d install -d -m 755 $RPM_BUILD_ROOT/run/motd.d @@ -349,7 +365,6 @@ done %dir /var/run/sepermit %endif %dir /var/run/faillock -%dir %{_sysconfdir}/motd.d %dir /run/motd.d %dir /usr/lib/motd.d %{_prefix}/lib/tmpfiles.d/pam.conf @@ -389,6 +404,11 @@ test "$FILE" != %{_sysconfdir}/authselect/fingerprint-auth && \ exit 0 %changelog +* Thu Sep 23 2021 Iker Pedrosa - 1.5.2-4 +- Remove the /etc/motd.d directory to exclude its ownership from pam (#1968131) +- pam_timestamp: enable openssl hmac authentication (#1947294) +- Clean spec file: organize dependencies and move URL location + * Thu Sep 23 2021 Björn Esser - 1.5.2-3 - Update patch for parallel build