From 6f759593fe681ae99623edcd1c5c6d4c10f1aef6 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 17:41:30 +0100 Subject: [PATCH] fix sddm (normal logn) pam patch for openmamba [release 0.20.0-3mamba;Thu Aug 17 2023] --- ...patch => sddm-0.20.0-openmamba-pam-1.patch | 38 +++++++++++-------- sddm.spec | 7 +++- 2 files changed, 27 insertions(+), 18 deletions(-) rename sddm-0.20.0-openmamba-pam.patch => sddm-0.20.0-openmamba-pam-1.patch (59%) diff --git a/sddm-0.20.0-openmamba-pam.patch b/sddm-0.20.0-openmamba-pam-1.patch similarity index 59% rename from sddm-0.20.0-openmamba-pam.patch rename to sddm-0.20.0-openmamba-pam-1.patch index 12a1424..e9d30c9 100644 --- a/sddm-0.20.0-openmamba-pam.patch +++ b/sddm-0.20.0-openmamba-pam-1.patch @@ -1,6 +1,22 @@ ---- sddm-0.20.0/services/sddm.pam.orig 2023-07-11 09:47:48.307219521 +0200 -+++ sddm-0.20.0/services/sddm.pam 2023-07-11 09:48:31.850997821 +0200 -@@ -1,12 +1,13 @@ +diff -Nru sddm-0.20.0.orig/services/sddm-autologin.pam sddm-0.20.0/services/sddm-autologin.pam +--- sddm-0.20.0.orig/services/sddm-autologin.pam 2023-07-18 19:04:10.000000000 +0200 ++++ sddm-0.20.0/services/sddm-autologin.pam 2023-08-17 12:58:22.794145363 +0200 +@@ -6,8 +6,8 @@ + auth required pam_permit.so + -auth optional pam_gnome_keyring.so + -auth optional pam_kwallet5.so +-account include system-local-login +-password include system-local-login +-session include system-local-login ++account include system-auth ++password include system-auth ++session include system-auth + -session optional pam_gnome_keyring.so auto_start + -session optional pam_kwallet5.so auto_start +diff -Nru sddm-0.20.0.orig/services/sddm.pam sddm-0.20.0/services/sddm.pam +--- sddm-0.20.0.orig/services/sddm.pam 2023-07-18 19:04:10.000000000 +0200 ++++ sddm-0.20.0/services/sddm.pam 2023-08-17 12:58:39.138186200 +0200 +@@ -1,15 +1,16 @@ #%PAM-1.0 -auth include system-login @@ -17,17 +33,7 @@ -password optional pam_gnome_keyring.so use_authtok session optional pam_keyinit.so force revoke ---- sddm-0.20.0/services/sddm-autologin.pam.orig 2023-07-19 10:56:51.983368582 +0200 -+++ sddm-0.20.0/services/sddm-autologin.pam 2023-07-19 10:57:09.578278404 +0200 -@@ -6,8 +6,8 @@ - auth required pam_permit.so - -auth optional pam_gnome_keyring.so - -auth optional pam_kwallet5.so --account include system-local-login --password include system-local-login --session include system-local-login -+account include system-auth -+password include system-auth +-session include system-login +session include system-auth - -session optional pam_gnome_keyring.so auto_start - -session optional pam_kwallet5.so auto_start + -session optional pam_gnome_keyring.so auto_start + -session optional pam_kwallet5.so auto_start diff --git a/sddm.spec b/sddm.spec index 6136a05..3472424 100644 --- a/sddm.spec +++ b/sddm.spec @@ -3,7 +3,7 @@ Name: sddm Epoch: 1 Version: 0.20.0 -Release: 2mamba +Release: 3mamba Summary: QML based X11 and Wayland display manager Group: Graphical Desktop/Applications/Environment Vendor: openmamba @@ -12,7 +12,7 @@ Packager: Silvan Calarco URL: https://github.com/sddm/sddm Source: https://github.com/sddm/sddm.git/v%{version}/sddm-%{version}.tar.bz2 #Source: https://github.com/sddm/sddm.git/develop/sddm-%{version}.tar.bz2 -Patch0: sddm-0.20.0-openmamba-pam.patch +Patch0: sddm-0.20.0-openmamba-pam-1.patch Patch1: sddm-0.17.0.20180408git-fix-pam-group.patch Patch2: sddm-0.18.0-autorotate.patch Patch3: sddm-0.19.0-fix-xorg-autologin.patch @@ -150,6 +150,9 @@ fi %doc LICENSE %changelog +* Thu Aug 17 2023 Silvan Calarco 0.20.0-3mamba +- fix sddm (normal logn) pam patch for openmamba + * Wed Jul 19 2023 Silvan Calarco 0.20.0-2mamba - restore lost patch for sddm-autologin in openmamba-pam patch