Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e1017439034aaa72d54057a9f61c77f2ba635895
commit e1017439034aaa72d54057a9f61c77f2ba635895 Author: crazy <[email protected]> Date: Sun Jul 9 04:34:33 2017 +0200 sddm-0.14.0-9-x86_64 * revert PR #714 .. well adding support for pam kwallet there && twice * broke it.. We get lots errors also it just dosn't work. * with that reverted we have working pam_kwallet5 again with our own files diff --git a/source/x11/sddm/FrugalBuild b/source/x11/sddm/FrugalBuild index 3f7a8d3..d6c14f6 100644 --- a/source/x11/sddm/FrugalBuild +++ b/source/x11/sddm/FrugalBuild @@ -5,7 +5,7 @@ pkgname=sddm pkgver=0.14.0 -pkgrel=8 +pkgrel=9 pkgdesc='QML based X11 display manager' archs=('x86_64') groups=('x11') @@ -29,14 +29,15 @@ backup=('etc/sddm.conf') options+=('scriptlet') source=(sddm.conf \ #X-scripts-stop-using-files-from-users-HOME.patch \ - https://github.com/sddm/sddm/archive/develop.zip) + https://github.com/sddm/sddm/archive/develop.zip revert-PR-#714.patch) #add_highdpi_option.patch \ #https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.diff \ #https://github.com/sddm/sddm/commit/86f81eae93aa32e87081fa4691ea127cf3616fa2.diff \ #https://github.com/sddm/sddm/commit/7196c7ebb423b258febed24937b6dd01b59db134.diff \ #https://github.com/sddm/sddm/commit/1ba30952b942050fe55a9d9c76c615f72f6fcd04.diff) sha1sums=('c29fc983f33899f358dfc6fc11f83201d8c62a7f' \ - 'eaddf8e0bd2c41591dae7d8503d8921b1d18229b') + '34cd42d601fcca33ee0d2b6ccef4434e8378ad69' \ + '1d859129838ca99cbc79c40a58c9b15529d02239') options+=('noversrc') diff --git a/source/x11/sddm/revert-PR-#714.patch b/source/x11/sddm/revert-PR-#714.patch new file mode 100644 index 0000000..5d6c5d0 --- /dev/null +++ b/source/x11/sddm/revert-PR-#714.patch @@ -0,0 +1,43 @@ +diff -Naur sddm-develop/services/sddm-autologin.pam sddm-develop-p/services/sddm-autologin.pam +--- sddm-develop/services/sddm-autologin.pam 2017-06-12 17:32:18.000000000 +0200 ++++ sddm-develop-p/services/sddm-autologin.pam 2017-07-09 04:27:04.428378005 +0200 +@@ -4,10 +4,6 @@ + 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 -Naur sddm-develop/services/sddm-greeter.pam sddm-develop-p/services/sddm-greeter.pam +--- sddm-develop/services/sddm-greeter.pam 2017-06-12 17:32:18.000000000 +0200 ++++ sddm-develop-p/services/sddm-greeter.pam 2017-07-09 04:28:13.171239045 +0200 +@@ -15,4 +15,5 @@ + # Setup session + session required pam_unix.so + session optional pam_systemd.so +-session optional pam_elogind.so ++#enable once we remove ^ ++#session optional pam_elogind.so +diff -Naur sddm-develop/services/sddm.pam sddm-develop-p/services/sddm.pam +--- sddm-develop/services/sddm.pam 2017-06-12 17:32:18.000000000 +0200 ++++ sddm-develop-p/services/sddm.pam 2017-07-09 04:29:12.448843952 +0200 +@@ -1,15 +1,7 @@ + #%PAM-1.0 + + auth include system-login +--auth optional pam_gnome_keyring.so +--auth optional pam_kwallet5.so +- + account include system-login +- + password include system-login +--password optional pam_gnome_keyring.so use_authtok +- + session optional pam_keyinit.so force revoke + session include system-login +--session optional pam_gnome_keyring.so auto_start +--session optional pam_kwallet5.so auto_start _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
