sddm-consolekit-0.13.0-2: add kwallet patch & sddm.conf

3 files changed, 127 insertions, 5 deletions

diff --git a/pcr/sddm-consolekit/PKGBUILD b/pcr/sddm-consolekit/PKGBUILD
index e2c3ca2f8..7bc46b27d 100644
--- a/pcr/sddm-consolekit/PKGBUILD
+++ b/pcr/sddm-consolekit/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=sddm
 
 pkgname=sddm-consolekit
 pkgver=0.13.0
-pkgrel=1
+pkgrel=2
 pkgdesc='QML based X11 display manager'
 arch=('i686' 'x86_64')
 url='http://github.com/sddm/sddm'
@@ -14,18 +14,24 @@ license=('GPL')
 depends=('qt5-declarative')
 makedepends=('cmake' 'python-docutils' 'qt5-tools')
 install="${_pkgname}.install"
-backup=('usr/share/sddm/scripts/Xsetup')
+backup=('usr/share/sddm/scripts/Xsetup'
+	'etc/sddm.conf')
 conflicts=('display-manager' 'sddm')
 provides=('display-manager' 'sddm')
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/v${pkgver}.tar.gz"
-        "${_pkgname}-consolekit.patch")
+        "${_pkgname}-consolekit.patch"
+        "${_pkgname}-pam_kwallet.patch"
+        'sddm.conf')
 sha256sums=('26dee7e59859b5cbd5ec26b0050ef31c32b43be304e4042119819ab9779c26bd'
-            '4cbe522c84956d13d751856b8c66f2beca210c9ec65712e261bfe2bf94fb0da5')
+            '4cbe522c84956d13d751856b8c66f2beca210c9ec65712e261bfe2bf94fb0da5'
+            'dc46a0132cf0ea722a69cff45ed1ded3c93ade008e22fc90d1b797ca85ed535a'
+            'ffcb9885cb41da54a97f62c2538975fbb9dc80c2b58326d479a87ea0f56f02cf')
 
 prepare() {
 	mkdir -p build
 	cd ${_pkgname}-${pkgver}
 	patch -p1 -i ${srcdir}/${_pkgname}-consolekit.patch
+	patch -p1 -i ${srcdir}/${_pkgname}-pam_kwallet.patch
 }
 
 build() {
@@ -42,5 +48,6 @@ build() {
 package() {
 	cd build
 	make DESTDIR="${pkgdir}" install
-	sed -e 's|pam_systemd.so|pam_ck_connector.so nox11|' -i ${pkgdir}/etc/pam.d/sddm-greeter
+# 	sed -e 's|pam_systemd.so|pam_ck_connector.so nox11|' -i ${pkgdir}/etc/pam.d/sddm-greeter
+	install -m 755 ${srcdir}/sddm.conf ${pkgdir}/etc
 }
diff --git a/pcr/sddm-consolekit/sddm-pam_kwallet.patch b/pcr/sddm-consolekit/sddm-pam_kwallet.patch
new file mode 100644
index 000000000..ff1c4d2dd
--- /dev/null
+++ b/pcr/sddm-consolekit/sddm-pam_kwallet.patch
@@ -0,0 +1,10 @@
+--- a/services/sddm.pam	2015-08-17 18:06:19.000000000 +0200
++++ b/services/sddm.pam	2016-02-21 19:54:08.654091951 +0100
+@@ -4,3 +4,7 @@
+ account		include		system-login
+ password	include		system-login
+ session		include		system-login
++-auth		optional	pam_kwallet.so kdehome=.kde4
++-auth		optional	pam_kwallet5.so
++-session	optional	pam_kwallet.so
++-session	optional	pam_kwallet5.so auto_start
diff --git a/pcr/sddm-consolekit/sddm.conf b/pcr/sddm-consolekit/sddm.conf
new file mode 100644
index 000000000..78118cf56
--- /dev/null
+++ b/pcr/sddm-consolekit/sddm.conf
@@ -0,0 +1,105 @@
+[Autologin]
+# Autologin again on session exit
+Relogin=false
+
+# Autologin session
+Session=
+
+# Autologin user
+User=
+
+
+[General]
+# Halt command
+HaltCommand=/usr/bin/shutdown -h -P
+
+# Initial NumLock state
+# Valid values: on|off|none
+# If property is set to none, numlock won't be changed
+Numlock=none
+
+# Reboot command
+RebootCommand=/usr/bin/shutdown -r now
+
+
+[Theme]
+# Current theme name
+Current=breeze
+
+# Cursor theme
+CursorTheme=breeze_cursors
+
+# Face icon directory
+# The files should be in username.face.icon format
+FacesDir=/usr/share/sddm/faces
+
+# Theme directory path
+ThemeDir=/usr/share/sddm/themes
+
+
+[Users]
+# Default $PATH
+DefaultPath=/bin:/usr/bin:/usr/local/bin
+
+# Hidden shells
+# Users with these shells as their default won't be listed
+HideShells=
+
+# Hidden users
+HideUsers=
+
+# Maximum user id for displayed users
+MaximumUid=60000
+
+# Minimum user id for displayed users
+MinimumUid=1000
+
+# Remember the session of the last successfully logged in user
+RememberLastSession=true
+
+# Remember the last successfully logged in user
+RememberLastUser=true
+
+
+[WaylandDisplay]
+# Wayland session script path
+# A script to execute when starting the desktop session
+SessionCommand=/usr/share/sddm/scripts/wayland-session
+
+# Session description directory
+SessionDir=/usr/share/wayland-sessions
+
+
+[XDisplay]
+# Xsetup script path
+# A script to execute when starting the display server
+DisplayCommand=/usr/share/sddm/scripts/Xsetup
+
+# Xstop script path
+# A script to execute when stopping the display server
+DisplayStopCommand=/usr/share/sddm/scripts/Xstop
+
+# Minimum VT
+# The lowest virtual terminal number that will be used.
+MinimumVT=7
+
+# X server arguments
+ServerArguments=-nolisten tcp
+
+# X server path
+ServerPath=/usr/bin/X
+
+# Xsession script path
+# A script to execute when starting the desktop session
+SessionCommand=/usr/share/sddm/scripts/Xsession
+
+# Session description directory
+SessionDir=/usr/share/xsessions
+
+# Xauth path
+XauthPath=/usr/bin/xauth
+
+# Xephyr path
+XephyrPath=/usr/bin/Xephyr
+
+