rpms/sddm
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert to stable version (bump epoch); remove obsolete requirement for haveged [release 0.19.0-2mamba;Fri Dec 03 2021]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 17:41:28 +01:00
parent f1221bd116
commit 74b13107cb
3 changed files with 62 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sddm-0.19.0-openmamba-pam.patch Normal file
View File

@ -0,0 +1,45 @@
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 file=/var/log/tallylog onerr=succeed
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

87
sddm-0.19.0.20210906git-openmamba-pam.patch
View File

@ -1,87 +0,0 @@
diff -Nru sddm-0.19.0.20210906git/services.orig/sddm-autologin.pam sddm-0.19.0.20210906git/services/sddm-autologin.pam
--- sddm-0.19.0.20210906git/services.orig/sddm-autologin.pam 2021-09-06 20:28:07.000000000 +0200
+++ sddm-0.19.0.20210906git/services/sddm-autologin.pam 2021-09-06 20:34:16.427806591 +0200
@@ -1,13 +1,14 @@
#%PAM-1.0
auth required pam_env.so
+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
diff -Nru sddm-0.19.0.20210906git/services.orig/sddm-autologin.pam.orig sddm-0.19.0.20210906git/services/sddm-autologin.pam.orig
--- sddm-0.19.0.20210906git/services.orig/sddm-autologin.pam.orig 1970-01-01 01:00:00.000000000 +0100
+++ sddm-0.19.0.20210906git/services/sddm-autologin.pam.orig 2021-09-06 20:32:09.191529393 +0200
@@ -0,0 +1,13 @@
+#%PAM-1.0
+auth required pam_env.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
+-session optional pam_gnome_keyring.so auto_start
+-session optional pam_kwallet5.so auto_start
diff -Nru sddm-0.19.0.20210906git/services.orig/sddm-autologin.pam.rej sddm-0.19.0.20210906git/services/sddm-autologin.pam.rej
--- sddm-0.19.0.20210906git/services.orig/sddm-autologin.pam.rej 1970-01-01 01:00:00.000000000 +0100
+++ sddm-0.19.0.20210906git/services/sddm-autologin.pam.rej 2021-09-06 20:32:09.191529393 +0200
@@ -0,0 +1,21 @@
+--- services/sddm-autologin.pam.orig 2020-11-10 10:01:26.923000000 +0100
++++ 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 file=/var/log/tallylog onerr=succeed
+ 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
diff -Nru sddm-0.19.0.20210906git/services.orig/sddm.pam sddm-0.19.0.20210906git/services/sddm.pam
--- sddm-0.19.0.20210906git/services.orig/sddm.pam 2021-09-06 20:28:07.000000000 +0200
+++ sddm-0.19.0.20210906git/services/sddm.pam 2021-09-06 20:32:08.996525967 +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

29
sddm.spec
View File

@ -1,17 +1,18 @@
%define user_sddm 68
%define group_sddm 68
Name: sddm
Version: 0.19.0.20210906git
Release: 1mamba
Epoch: 1
Version: 0.19.0
Release: 2mamba
Summary: QML based X11 and Wayland display manager
Group: Graphical Desktop/Applications/Environment
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://github.com/sddm/sddm
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.19.0.20210906git-openmamba-pam.patch
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
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
@ -20,20 +21,18 @@ Patch5: sddm-0.19.0-upstream-retry-starting-the-xserver.patch
Patch6: sddm-0.19.0-upstream-only_use_the_basename_for_desktop_session.patch
License: GPL
## AUTOBUILDREQ-BEGIN
#libdl.so.2()(64bit): /usr/lib64/libdl.so: file not owned by any package
BuildRequires: glibc-devel
BuildRequires: libgcc
BuildRequires: libpam-devel
BuildRequires: libqt5-devel
BuildRequires: libstdc++6-devel
BuildRequires: libsystemd-devel
BuildRequires: libxcb-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtdeclarative-devel
## AUTOBUILDREQ-END
BuildRequires: cmake
Requires: surface-tools
Requires: haveged
%systemd_requires
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
QML based X11 and Wayland display manager.
@ -44,9 +43,9 @@ QML based X11 and Wayland display manager.
%setup -q
%patch0 -p1
%patch2 -p1
#%patch4 -p1
#%patch5 -p1
#%patch6 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
%cmake -d build
@ -142,6 +141,12 @@ fi
%doc LICENSE
%changelog
* Fri Dec 03 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 0.19.0-2mamba
- revert to stable version (bump epoch); remove obsolete requirement for haveged
* Fri Dec 03 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 0.19.0-1mamba
- update to 0.19.0
* Mon Sep 06 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 0.19.0.20210906git-1mamba
- update to 0.19.0.20210906git