From 5f3b5bed866b31c7fe4dd46f01a99c0c014ef1e7 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 17:41:28 +0100 Subject: [PATCH] sddm-autologin: remove use of deprecated pam_tally.so [release 0.18.1-3mamba;Thu Oct 15 2020] --- ...a-pam.patch => sddm-0.18.1-openmamba-pam.patch | 15 ++++++++------- sddm.spec | 10 +++++++--- 2 files changed, 15 insertions(+), 10 deletions(-) rename sddm-0.17.0-openmamba-pam.patch => sddm-0.18.1-openmamba-pam.patch (66%) diff --git a/sddm-0.17.0-openmamba-pam.patch b/sddm-0.18.1-openmamba-pam.patch similarity index 66% rename from sddm-0.17.0-openmamba-pam.patch rename to sddm-0.18.1-openmamba-pam.patch index e6e6bd6..000629b 100644 --- a/sddm-0.17.0-openmamba-pam.patch +++ b/sddm-0.18.1-openmamba-pam.patch @@ -1,11 +1,12 @@ -diff -Nru sddm-0.17.0.20180408git.orig/services/sddm-autologin.pam sddm-0.17.0.20180408git/services/sddm-autologin.pam ---- sddm-0.17.0.20180408git.orig/services/sddm-autologin.pam 2018-04-08 13:39:55.388821656 +0200 -+++ sddm-0.17.0.20180408git/services/sddm-autologin.pam 2018-04-08 13:57:08.348376643 +0200 +diff -ru sddm-0.18.1.orig/services/sddm-autologin.pam sddm-0.18.1/services/sddm-autologin.pam +--- sddm-0.18.1.orig/services/sddm-autologin.pam 2019-04-01 08:51:20.000000000 +0200 ++++ sddm-0.18.1/services/sddm-autologin.pam 2020-10-15 20:24:25.497000000 +0200 @@ -1,13 +1,14 @@ #%PAM-1.0 auth required pam_env.so +-auth required pam_tally.so file=/var/log/faillog onerr=succeed +auth required pam_group.so - auth required pam_tally.so file=/var/log/faillog onerr=succeed ++auth required pam_faillock.so file=/var/log/faillog onerr=succeed auth required pam_shells.so auth required pam_nologin.so auth required pam_permit.so @@ -19,9 +20,9 @@ diff -Nru sddm-0.17.0.20180408git.orig/services/sddm-autologin.pam sddm-0.17.0.2 +session include system-auth -session optional pam_gnome_keyring.so auto_start -session optional pam_kwallet5.so auto_start -diff -Nru sddm-0.17.0.20180408git.orig/services/sddm.pam sddm-0.17.0.20180408git/services/sddm.pam ---- sddm-0.17.0.20180408git.orig/services/sddm.pam 2018-04-08 13:40:01.544851819 +0200 -+++ sddm-0.17.0.20180408git/services/sddm.pam 2018-04-08 13:56:57.760332524 +0200 +diff -ru sddm-0.18.1.orig/services/sddm.pam sddm-0.18.1/services/sddm.pam +--- sddm-0.18.1.orig/services/sddm.pam 2019-04-01 08:51:20.000000000 +0200 ++++ sddm-0.18.1/services/sddm.pam 2020-10-15 20:23:28.591000000 +0200 @@ -1,15 +1,16 @@ #%PAM-1.0 diff --git a/sddm.spec b/sddm.spec index 8fb6538..432c7a9 100644 --- a/sddm.spec +++ b/sddm.spec @@ -2,7 +2,7 @@ %define group_sddm 68 Name: sddm Version: 0.18.1 -Release: 2mamba +Release: 3mamba Summary: QML based X11 and Wayland display manager Group: Graphical Desktop/Applications/Environment Vendor: openmamba @@ -12,7 +12,7 @@ URL: https://github.com/sddm/sddm ## GITSOURCE https://github.com/sddm/sddm.git v0.13.0 #Source: https://github.com/sddm/sddm.git/develop/sddm-%{version}.tar.bz2 Source: https://github.com/sddm/sddm.git/v%{version}/sddm-%{version}.tar.bz2 -Patch0: sddm-0.17.0-openmamba-pam.patch +Patch0: sddm-0.18.1-openmamba-pam.patch Patch1: sddm-0.17.0.20180408git-fix-pam-group.patch Patch2: sddm-0.18.0-autorotate.patch License: GPL @@ -38,7 +38,7 @@ QML based X11 and Wayland display manager. %prep %setup -q -%patch0 -p1 +#%patch0 -p1 #%patch1 -p1 %patch2 -p1 @@ -78,6 +78,7 @@ useradd -u %{user_sddm} -g sddm \ %posttrans if [ $1 -ge 1 ]; then + sed -i "/pam_tally.so/d" /etc/pam.d/sddm-autologin [ -e /etc/sddm.conf.rpmsave ] && { eval `grep ^User= /etc/sddm.conf.rpmsave` eval `grep ^Session= /etc/sddm.conf.rpmsave` @@ -135,6 +136,9 @@ fi %doc LICENSE %changelog +* Thu Oct 15 2020 Silvan Calarco 0.18.1-3mamba +- sddm-autologin: remove use of deprecated pam_tally.so + * Sun Oct 20 2019 Silvan Calarco 0.18.1-2mamba - require haveged to fix startup when kernel random generator has not had enough entropy