Date: Monday, June 11, 2012 @ 15:01:29 Author: jgc Revision: 161473 Add systemd unit files, add required lines to pam config. Change consolekit patch to fallback to a non-consolekit configuration instead of throwing you back at the login screen when dbus is not running or consolekit is not installed
Modified: xorg-xdm/trunk/PKGBUILD xorg-xdm/trunk/xdm-consolekit.patch xorg-xdm/trunk/xdm.pam ----------------------+ PKGBUILD | 12 ++++++------ xdm-consolekit.patch | 2 +- xdm.pam | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-06-11 18:34:18 UTC (rev 161472) +++ PKGBUILD 2012-06-11 19:01:29 UTC (rev 161473) @@ -3,13 +3,13 @@ # Contributor: Jan de Groot <j...@archlinux.org> pkgname=xorg-xdm pkgver=1.1.11 -pkgrel=1 +pkgrel=2 pkgdesc="X Display Manager" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'consolekit') -makedepends=('pkgconfig' 'xorg-util-macros') +makedepends=('pkgconfig' 'xorg-util-macros' 'systemd') backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession) options=('!libtool') source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2 @@ -20,13 +20,13 @@ md5sums=('64a1af1f7eb69feae12e75d4cc3aaf19' '234ae568e7b22cbc09433bb396ff3d80' '2c30078c50bc653d72eb5114506eb313' - '46b11173b58e2241577d5ffd48ab8f8d' - '419d6289ba6f851135f5c70c0e3cbec4') + '25c6d8adeed0796d432b2bbf1d83a7e9' + '6de9362b1bf0835026270b20d8029909') sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47' 'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff' '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb' - '47190f311c97c0d85b1fcab47ee5a8575013db1200a5e30a57a7ea4ef3e0c23a' - '36cf924a893ef851855ebcdc5468523a9d182c3620698e01dffc35d05d74764b') + '10ce850e6a93c6ba68b5d71104b1fd6680ad9760274068512f43a694b1edda76' + '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418') build() { cd "${srcdir}/xdm-${pkgver}" Modified: xdm-consolekit.patch =================================================================== --- xdm-consolekit.patch 2012-06-11 18:34:18 UTC (rev 161472) +++ xdm-consolekit.patch 2012-06-11 19:01:29 UTC (rev 161473) @@ -97,7 +97,7 @@ + LogError("console-kit-daemon not running?\n"); + ck_connector_unref(connector); + connector = NULL; -+ return 0; ++ return 1; + } + + verify->userEnviron = setEnv(verify->userEnviron, Modified: xdm.pam =================================================================== --- xdm.pam 2012-06-11 18:34:18 UTC (rev 161472) +++ xdm.pam 2012-06-11 19:01:29 UTC (rev 161473) @@ -6,3 +6,5 @@ password required pam_unix.so session required pam_unix.so session required pam_limits.so +session required pam_loginuid.so +-session optional pam_systemd.so