diff options
author | root <root@rshg054.dnsready.net> | 2012-06-14 00:01:48 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-06-14 00:01:48 +0000 |
commit | 35c30674b2b901077a809a6f1d8e5a0115098c8b (patch) | |
tree | bac1c7d0c5b1651fef436eb13be31506b5aa60b1 /extra/xorg-xdm | |
parent | f46e734fbcd0b4cbae2cff1a017b95e4e8e02d53 (diff) |
Thu Jun 14 00:01:48 UTC 2012
Diffstat (limited to 'extra/xorg-xdm')
-rw-r--r-- | extra/xorg-xdm/PKGBUILD | 18 | ||||
-rw-r--r-- | extra/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch | 8 | ||||
-rw-r--r-- | extra/xorg-xdm/xdm-consolekit.patch | 2 | ||||
-rw-r--r-- | extra/xorg-xdm/xdm.pam | 2 |
4 files changed, 22 insertions, 8 deletions
diff --git a/extra/xorg-xdm/PKGBUILD b/extra/xorg-xdm/PKGBUILD index 1edcddd16..4ca16b66e 100644 --- a/extra/xorg-xdm/PKGBUILD +++ b/extra/xorg-xdm/PKGBUILD @@ -1,38 +1,42 @@ -# $Id: PKGBUILD 140275 2011-10-11 21:28:00Z jgc $ +# $Id: PKGBUILD 161610 2012-06-12 11:02:41Z jgc $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@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' 'xtrans') 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 Xsession-loginshell.patch Xsession-xsm.patch xdm-consolekit.patch + xdm-1.0.5-sessreg-utmp-fix-bug177890.patch xdm.pam) md5sums=('64a1af1f7eb69feae12e75d4cc3aaf19' '234ae568e7b22cbc09433bb396ff3d80' '2c30078c50bc653d72eb5114506eb313' - '46b11173b58e2241577d5ffd48ab8f8d' - '419d6289ba6f851135f5c70c0e3cbec4') + '25c6d8adeed0796d432b2bbf1d83a7e9' + '13032add23a0a8d48a638418094bfc00' + '6de9362b1bf0835026270b20d8029909') sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47' 'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff' '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb' - '47190f311c97c0d85b1fcab47ee5a8575013db1200a5e30a57a7ea4ef3e0c23a' - '36cf924a893ef851855ebcdc5468523a9d182c3620698e01dffc35d05d74764b') + '10ce850e6a93c6ba68b5d71104b1fd6680ad9760274068512f43a694b1edda76' + '5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a' + '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418') build() { cd "${srcdir}/xdm-${pkgver}" patch -Np0 -i "${srcdir}/Xsession-loginshell.patch" patch -Np1 -i "${srcdir}/Xsession-xsm.patch" patch -Np1 -i "${srcdir}/xdm-consolekit.patch" + patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch" autoreconf -fi ./configure --prefix=/usr \ diff --git a/extra/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch b/extra/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch new file mode 100644 index 000000000..195858883 --- /dev/null +++ b/extra/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch @@ -0,0 +1,8 @@ +--- config/GiveConsole.sessreg-utmp-fix-bug177890 2006-07-24 04:20:10.000000000 -0400 ++++ config/GiveConsole 2006-07-24 04:21:16.000000000 -0400 +@@ -8,3 +8,5 @@ + # causing serious grief. + # + chown $USER /dev/console ++exec /usr/bin/sessreg -a -w "/var/log/wtmp" -u "/run/utmp" \ ++ -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER diff --git a/extra/xorg-xdm/xdm-consolekit.patch b/extra/xorg-xdm/xdm-consolekit.patch index 7d85b97e0..c52a26138 100644 --- a/extra/xorg-xdm/xdm-consolekit.patch +++ b/extra/xorg-xdm/xdm-consolekit.patch @@ -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, diff --git a/extra/xorg-xdm/xdm.pam b/extra/xorg-xdm/xdm.pam index 862b83fa2..a0b601db6 100644 --- a/extra/xorg-xdm/xdm.pam +++ b/extra/xorg-xdm/xdm.pam @@ -6,3 +6,5 @@ account required pam_unix.so 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 |