diff options
Diffstat (limited to 'fixes.patch')
| -rw-r--r-- | fixes.patch | 53 |
1 files changed, 39 insertions, 14 deletions
diff --git a/fixes.patch b/fixes.patch index 8c1e6c930757..b207e108c332 100644 --- a/fixes.patch +++ b/fixes.patch @@ -1,15 +1,40 @@ 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 +--- src/xorg-xdm-git/config/GiveConsole.orig 2019-08-13 00:10:29.000000000 -0600 ++++ src/xorg-xdm-git/config/GiveConsole 2019-08-13 00:10:30.000000000 -0600 @@ -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 +diff -up src/xorg-xdm-git/configure.ac.orig src/xorg-xdm-git/configure.ac +--- src/xorg-xdm-git/configure.ac.orig 2019-08-13 00:10:29.000000000 -0600 ++++ src/xorg-xdm-git/configure.ac 2019-08-13 00:10:30.000000000 -0600 +@@ -173,10 +173,10 @@ AC_ARG_WITH([systemd-daemon], AS_HELP_ST + [Add support for systemd startup notification (default is autodetected)]), + [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto]) + AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [ +- PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], ++ PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd], + [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])], + [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"], +- [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])] ++ [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])] + )] + ) + ]) +diff -up src/xorg-xdm-git/config/Xservers.ws.in.orig src/xorg-xdm-git/config/Xservers.ws.in +--- src/xorg-xdm-git/config/Xservers.ws.in.orig 2019-08-13 00:10:29.000000000 -0600 ++++ src/xorg-xdm-git/config/Xservers.ws.in 2019-08-13 00:10:31.000000000 -0600 +@@ -9,4 +9,4 @@ XCOMM you can add them here as well. Ea + XCOMM look like: + XCOMM XTerminalName:0 foreign + XCOMM +-:0 local BINDIR/X :0 DEFAULTVT ++:0 local BINDIR/X :0 DEFAULTVT -nolisten tcp +diff -up src/xorg-xdm-git/config/Xsession.in.orig src/xorg-xdm-git/config/Xsession.in +--- src/xorg-xdm-git/config/Xsession.in.orig 2019-08-13 00:10:29.000000000 -0600 ++++ src/xorg-xdm-git/config/Xsession.in 2019-08-13 00:10:30.000000000 -0600 @@ -51,16 +51,17 @@ XCOMM The startup script is not intended startup=$HOME/.xsession @@ -35,9 +60,9 @@ diff -up src/xorg-xdm-git/config/Xsession.cpp.orig src/xorg-xdm-git/config/Xsess + 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 +--- src/xorg-xdm-git/xdm/choose.c.orig 2019-08-13 00:10:30.000000000 -0600 ++++ src/xorg-xdm-git/xdm/choose.c 2019-08-13 00:10:30.000000000 -0600 +@@ -59,6 +59,11 @@ in this Software without prior written a # include <time.h> # define Time_t time_t @@ -50,9 +75,9 @@ diff -up src/xorg-xdm-git/xdm/choose.c.orig src/xorg-xdm-git/xdm/choose.c 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. +--- src/xorg-xdm-git/xdm/genauth.c.orig 2019-08-13 00:10:30.000000000 -0600 ++++ src/xorg-xdm-git/xdm/genauth.c 2019-08-13 00:10:30.000000000 -0600 +@@ -51,6 +51,10 @@ from The Open Group. #include <time.h> #define Time_t time_t @@ -64,9 +89,9 @@ diff -up src/xorg-xdm-git/xdm/genauth.c.orig src/xorg-xdm-git/xdm/genauth.c 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 +--- src/xorg-xdm-git/xdm/session.c.orig 2019-08-13 00:10:30.000000000 -0600 ++++ src/xorg-xdm-git/xdm/session.c 2019-08-13 00:10:30.000000000 -0600 +@@ -87,6 +87,11 @@ extern int key_setnet(struct key_netstar #include <systemd/sd-daemon.h> #endif |