version 1.1.11.43.g994d32a-1

3 files changed, 89 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 908462567e7c..fc4084dcef7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed Jan 13 04:28:34 UTC 2016
 pkgbase = xorg-xdm-git
 	pkgdesc = X Display Manager
-	pkgver = 1.1.11.32.gd0e3262
+	pkgver = 1.1.11.43.g994d32a
 	pkgrel = 1
 	url = http://xorg.freedesktop.org/
 	arch = i686
@@ -31,16 +33,10 @@ pkgbase = xorg-xdm-git
 	backup = etc/X11/xdm/Xsetup_0
 	backup = etc/X11/xdm/Xsession
 	source = xorg-xdm-git::git://anongit.freedesktop.org/git/xorg/app/xdm
-	source = Xsession-loginshell.patch
-	source = Xsession-xsm.patch
-	source = xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
-	source = build-fixes.patch
+	source = fixes.patch
 	source = xdm.pam
 	sha256sums = SKIP
-	sha256sums = fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff
-	sha256sums = 77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb
-	sha256sums = 5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a
-	sha256sums = 5da6ed875db3cc07dc1d87d96c92a62f638e1735b22bb365be4b15409af871f7
+	sha256sums = 0aba5f8e58dead488544962376531e1067e7a55a441f62c601645cd31762caf9
 	sha256sums = 7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418
 
 pkgname = xorg-xdm-git
diff --git a/PKGBUILD b/PKGBUILD
index 8928e12d672e..8470fe09d44c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-xdm-git
-pkgver=1.1.11.32.gd0e3262
+pkgver=1.1.11.43.g994d32a
 pkgrel=1
 pkgdesc="X Display Manager"
 arch=(i686 x86_64)
@@ -15,16 +15,10 @@ makedepends=('git' 'pkgconfig' 'xorg-util-macros' '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=("$pkgname::git://anongit.freedesktop.org/git/xorg/app/xdm"
-        Xsession-loginshell.patch
-        Xsession-xsm.patch
-        xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
-	build-fixes.patch
+	fixes.patch
         xdm.pam)
 sha256sums=('SKIP'
-            'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff'
-            '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb'
-            '5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a'
-            '5da6ed875db3cc07dc1d87d96c92a62f638e1735b22bb365be4b15409af871f7'
+            '0aba5f8e58dead488544962376531e1067e7a55a441f62c601645cd31762caf9'
             '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418')
 
 pkgver() {
@@ -34,10 +28,7 @@ pkgver() {
 
 prepare() {
   cd $pkgname
-  patch -Np0 -i "${srcdir}/Xsession-loginshell.patch"
-  patch -Np1 -i "${srcdir}/Xsession-xsm.patch"
-  patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch"
-  patch -Np2 -i "${srcdir}/build-fixes.patch"
+  patch -Np2 -b -z .orig -i ../fixes.patch
   autoreconf -fi
 }
 
diff --git a/fixes.patch b/fixes.patch
new file mode 100644
index 000000000000..8c1e6c930757
--- /dev/null
+++ b/fixes.patch
@@ -0,0 +1,80 @@
+diff -up src/xorg-xdm-git/config/GiveConsole.orig src/xorg-xdm-git/config/GiveConsole
+--- src/xorg-xdm-git/config/GiveConsole.orig	2016-01-12 18:28:15.000000000 -0700
++++ src/xorg-xdm-git/config/GiveConsole	2016-01-12 18:28:31.000000000 -0700
+@@ -7,3 +7,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 -up src/xorg-xdm-git/config/Xsession.cpp.orig src/xorg-xdm-git/config/Xsession.cpp
+--- src/xorg-xdm-git/config/Xsession.cpp.orig	2016-01-12 18:24:23.000000000 -0700
++++ src/xorg-xdm-git/config/Xsession.cpp	2016-01-12 18:27:35.000000000 -0700
+@@ -51,16 +51,17 @@ XCOMM The startup script is not intended
+ 
+ startup=$HOME/.xsession
+ resources=$HOME/.Xresources
++xinitrc=$HOME/.xinitrc
+ 
+ if [ -s "$startup" ]; then
+-	if [ -x "$startup" ]; then
+-		exec "$startup"
+-	else
+-		exec /bin/sh "$startup"
+-	fi
++	exec /bin/sh -ls -c "$startup"
+ else
+ 	if [ -r "$resources" ]; then
+ 		BINDIR/xrdb -load "$resources"
+ 	fi
+-	exec BINDIR/xsm
++	if [ -r "$xinitrc" ]; then
++		exec /bin/sh -ls -c "$xinitrc"
++	else
++		exec /bin/sh -l /etc/X11/xinit/xinitrc
++	fi
+ fi
+diff -up src/xorg-xdm-git/xdm/choose.c.orig src/xorg-xdm-git/xdm/choose.c
+--- src/xorg-xdm-git/xdm/choose.c.orig	2016-01-12 18:34:02.000000000 -0700
++++ src/xorg-xdm-git/xdm/choose.c	2016-01-12 18:34:32.000000000 -0700
+@@ -51,6 +51,11 @@ in this Software without prior written a
+ # include <time.h>
+ # define Time_t time_t
+ 
++# ifdef HAVE_SETPROCTITLE
++#  include <sys/types.h>
++#  include <bsd/unistd.h>
++# endif
++
+ static int
+ FormatBytes (
+     unsigned char *data,
+diff -up src/xorg-xdm-git/xdm/genauth.c.orig src/xorg-xdm-git/xdm/genauth.c
+--- src/xorg-xdm-git/xdm/genauth.c.orig	2016-01-12 18:35:06.000000000 -0700
++++ src/xorg-xdm-git/xdm/genauth.c	2016-01-12 18:35:19.000000000 -0700
+@@ -43,6 +43,10 @@ from The Open Group.
+ #include <time.h>
+ #define Time_t time_t
+ 
++#ifdef HAVE_ARC4RANDOM
++#include <bsd/stdlib.h>
++#endif
++
+ #ifdef HASXDMAUTH
+ static unsigned char	key[8];
+ #endif
+diff -up src/xorg-xdm-git/xdm/session.c.orig src/xorg-xdm-git/xdm/session.c
+--- src/xorg-xdm-git/xdm/session.c.orig	2016-01-12 18:36:15.000000000 -0700
++++ src/xorg-xdm-git/xdm/session.c	2016-01-12 18:36:21.000000000 -0700
+@@ -78,6 +78,11 @@ extern int key_setnet(struct key_netstar
+ #include <systemd/sd-daemon.h>
+ #endif
+ 
++#ifdef HAVE_SETPROCTITLE
++# include <sys/types.h>
++# include <bsd/unistd.h>
++#endif
++
+ #ifdef USE_SELINUX
+ /* This should be run just before we exec the user session. */
+ static int