restore lost patch for sddm-autologin in openmamba-pam patch [release 0.20.0-2mamba;Wed Jul 19 2023]
This commit is contained in:
parent
44388d6c3a
commit
f047cb33d6
@ -1,45 +0,0 @@
|
||||
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
|
||||
|
||||
-auth include system-login
|
||||
+auth required pam_group.so
|
||||
+auth include system-auth
|
||||
-auth optional pam_gnome_keyring.so
|
||||
-auth optional pam_kwallet5.so
|
||||
|
||||
-account include system-login
|
||||
+account include system-auth
|
||||
|
||||
-password include system-login
|
||||
+password include system-auth
|
||||
-password optional pam_gnome_keyring.so use_authtok
|
||||
|
||||
session optional pam_keyinit.so force revoke
|
||||
-session include system-login
|
||||
+session include system-auth
|
||||
-session optional pam_gnome_keyring.so auto_start
|
||||
-session optional pam_kwallet5.so auto_start
|
||||
--- sddm-0.19.0/services/sddm-autologin.pam.orig 2020-11-10 10:01:26.923000000 +0100
|
||||
+++ sddm-0.19.0/services/sddm-autologin.pam 2020-11-10 10:03:03.797000000 +0100
|
||||
@@ -1,13 +1,14 @@
|
||||
#%PAM-1.0
|
||||
auth required pam_env.so
|
||||
-auth required pam_tally2.so file=/var/log/tallylog onerr=succeed
|
||||
+auth required pam_group.so
|
||||
+auth required pam_faillock.so preauth
|
||||
auth required pam_shells.so
|
||||
auth required pam_nologin.so
|
||||
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
|
||||
33
sddm-0.20.0-openmamba-pam.patch
Normal file
33
sddm-0.20.0-openmamba-pam.patch
Normal file
@ -0,0 +1,33 @@
|
||||
--- 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 @@
|
||||
#%PAM-1.0
|
||||
|
||||
-auth include system-login
|
||||
+auth include system-auth
|
||||
+auth required pam_group.so
|
||||
-auth optional pam_gnome_keyring.so
|
||||
-auth optional pam_kwallet5.so
|
||||
|
||||
-account include system-login
|
||||
+account include system-auth
|
||||
|
||||
-password include system-login
|
||||
+password include system-auth
|
||||
-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-auth
|
||||
-session optional pam_gnome_keyring.so auto_start
|
||||
-session optional pam_kwallet5.so auto_start
|
||||
33
sddm.spec
33
sddm.spec
@ -2,8 +2,8 @@
|
||||
%define group_sddm 68
|
||||
Name: sddm
|
||||
Epoch: 1
|
||||
Version: 0.19.0
|
||||
Release: 4mamba
|
||||
Version: 0.20.0
|
||||
Release: 2mamba
|
||||
Summary: QML based X11 and Wayland display manager
|
||||
Group: Graphical Desktop/Applications/Environment
|
||||
Vendor: openmamba
|
||||
@ -12,7 +12,7 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
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.19.0-openmamba-pam.patch
|
||||
Patch0: sddm-0.20.0-openmamba-pam.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
|
||||
@ -25,6 +25,7 @@ Patch9: sddm-0.19.0-revert-prefer_wayland_sessions_over_X11_ones.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: libXau-devel
|
||||
BuildRequires: libgcc
|
||||
BuildRequires: libpam-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
@ -44,14 +45,14 @@ QML based X11 and Wayland display manager.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch2 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1 -b .fix-sessions-being-started-as-the-wrong-type-on-autologin
|
||||
%patch8 -p1 -b .fix-build
|
||||
%patch9 -p1 -R -b .revert-prefer_wayland_sessions_over_X11_ones
|
||||
%patch 0 -p1
|
||||
%patch 2 -p1
|
||||
#%patch 4 -p1
|
||||
#%patch 5 -p1
|
||||
#%patch 6 -p1
|
||||
#%patch 7 -p1 -b .fix-sessions-being-started-as-the-wrong-type-on-autologin
|
||||
#%patch 8 -p1 -b .fix-build
|
||||
#%patch 9 -p1 -R -b .revert-prefer_wayland_sessions_over_X11_ones
|
||||
|
||||
%build
|
||||
%cmake -d build
|
||||
@ -120,13 +121,15 @@ fi
|
||||
%{_sysconfdir}/pam.d/sddm-greeter
|
||||
#%config(noreplace) %{_sysconfdir}/sddm.conf
|
||||
%{_unitdir}/sddm.service
|
||||
%{_sysusersdir}/sddm.conf
|
||||
%{_tmpfilesdir}/sddm.conf
|
||||
%{_bindir}/sddm
|
||||
%{_bindir}/sddm-greeter
|
||||
%dir %{_prefix}/lib/sddm/sddm.conf.d
|
||||
%{_prefix}/lib/sddm/sddm.conf.d/default.conf
|
||||
%dir %{_libdir}/qt5/qml/SddmComponents
|
||||
%{_libdir}/qt5/qml/SddmComponents/*
|
||||
%{_prefix}/libexec/sddm-helper
|
||||
%{_prefix}/libexec/sddm-helper*
|
||||
%{_datadir}/sddm/faces/.face.icon
|
||||
%{_datadir}/sddm/faces/root.face.icon
|
||||
%dir %{_datadir}/sddm/flags
|
||||
@ -147,6 +150,12 @@ fi
|
||||
%doc LICENSE
|
||||
|
||||
%changelog
|
||||
* Wed Jul 19 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 0.20.0-2mamba
|
||||
- restore lost patch for sddm-autologin in openmamba-pam patch
|
||||
|
||||
* Tue Jul 18 2023 Automatic Build System <autodist@mambasoft.it> 0.20.0-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Jan 27 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 0.19.0-4mamba
|
||||
- revert upstream commit that makes Wayland the default session
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user