From 8fc7e5f8a3e2cb541250f5d0bb8783eb59a13fb1 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 22 Oct 2017 16:10:48 -0500
Subject: user/sddm: do *not* use SUID, fix PAM instead
---
user/sddm/APKBUILD | 6 +++---
user/sddm/pam-path-fix.patch | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 3 deletions(-)
create mode 100644 user/sddm/pam-path-fix.patch
diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD
index c60b77411..a70a73421 100644
--- a/user/sddm/APKBUILD
+++ b/user/sddm/APKBUILD
@@ -2,12 +2,11 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=sddm
pkgver=0.16.0
-pkgrel=0
+pkgrel=1
pkgdesc="Simple Desktop Display Manager"
url="https://github.com/sddm/sddm/"
arch="all"
license="GPL-2.0"
-options="suid" # needed to drop from sddm user to logged in user
depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev upower-dev
consolekit2-dev linux-pam-dev qt5-qtdeclarative-dev qt5-qttools-dev"
@@ -17,6 +16,7 @@ pkggroups="sddm"
subpackages="$pkgname-lang $pkgname-xdm::noarch"
langdir="/usr/share/sddm/translations"
source="https://github.com/sddm/sddm/releases/download/v$pkgver/sddm-$pkgver.tar.xz
+ pam-path-fix.patch
xdm.confd"
build() {
@@ -46,7 +46,6 @@ check() {
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
- chmod u+s "$pkgdir"/usr/libexec/sddm-helper
}
xdm() {
@@ -56,4 +55,5 @@ xdm() {
}
sha512sums="114848909d3910e686f1cd0e0059a6804f7fdb45d391cdb63ce9fc319b395399bf3971534072e351fdcf525a9d2c0ed042e2b8d07679a72fa98bece9685652ca sddm-0.16.0.tar.xz
+f0b4eb7ef0581701157f9decc637629156f36f6711b9a4bae517f94d7a1df614c81bbd891c918f07ac50e2a3d1519c43ccb9eefd80282c95dd79eca0e8d90904 pam-path-fix.patch
5a03b3211e9d84ee762523631859a26b869aee2189f6845dc780c7a1e60a6658e2240e9ef9be05858708d2552ae77b594509dabe49794538f88d2ad6578d1fdf xdm.confd"
diff --git a/user/sddm/pam-path-fix.patch b/user/sddm/pam-path-fix.patch
new file mode 100644
index 000000000..3d589bac2
--- /dev/null
+++ b/user/sddm/pam-path-fix.patch
@@ -0,0 +1,36 @@
+--- sddm-0.16.0/services/sddm-autologin.pam.old 2017-10-03 00:43:19.000000000 -0500
++++ sddm-0.16.0/services/sddm-autologin.pam 2017-10-22 16:09:27.582687306 -0500
+@@ -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 base-account
++password include base-password
++session include base-session
+ -session optional pam_gnome_keyring.so auto_start
+ -session optional pam_kwallet5.so auto_start
+--- sddm-0.16.0/services/sddm.pam.old 2017-10-03 00:43:19.000000000 -0500
++++ sddm-0.16.0/services/sddm.pam 2017-10-22 16:08:55.012773018 -0500
+@@ -1,15 +1,15 @@
+ #%PAM-1.0
+
+-auth include system-login
++auth include base-auth
+ -auth optional pam_gnome_keyring.so
+ -auth optional pam_kwallet5.so
+
+-account include system-login
++account include base-account
+
+-password include system-login
++password include base-password
+ -password optional pam_gnome_keyring.so use_authtok
+
+ session optional pam_keyinit.so force revoke
+-session include system-login
++session include base-session
+ -session optional pam_gnome_keyring.so auto_start
+ -session optional pam_kwallet5.so auto_start
--
cgit v1.2.3-70-g09d2