- rediffed

[packages/xorg-app-xdm.git] / xorg-app-xdm-config.patch

diff --git a/xorg-app-xdm-config.patch b/xorg-app-xdm-config.patch
index 5b15270adc0fb309d2aaa9b737079b99a6e89fa5..ce595c54e65b61f67b1d4ce14572c617196b7a71 100644 (file)
--- a/xorg-app-xdm-config.patch
+++ b/xorg-app-xdm-config.patch
@@ -1,23 +1,8 @@
---- xdm-1.1.1/config/Xreset.cpp.orig   2006-11-06 22:02:49.000000000 +0000
-+++ xdm-1.1.1/config/Xreset.cpp        2006-11-15 08:45:26.669505000 +0000
-@@ -2,4 +2,4 @@
- XCOMM Deregister a login. (Derived from TakeConsole as follows:)
- XCOMM
- BINDIR/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \
--      -x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER
-+      -x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER
---- xdm-1.1.1/config/Xstartup.cpp.orig 2006-11-06 22:02:40.000000000 +0000
-+++ xdm-1.1.1/config/Xstartup.cpp      2006-11-15 08:45:34.609505000 +0000
-@@ -2,4 +2,4 @@
- XCOMM Register a login (derived from GiveConsole as follows:)
- XCOMM
- BINDIR/sessreg  -a -w "/var/log/wtmp" -u "/var/run/utmp" \
--      -x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER
-+      -x XDMCONFIGDIR/Xservers -l $DISPLAY -h "" $USER
---- xdm-1.1.0/config/Xresources.cpp.orig       2006-08-14 20:12:34.000000000 +0200
-+++ xdm-1.1.0/config/Xresources.cpp    2006-10-15 02:18:19.860305500 +0200
-@@ -78,7 +78,7 @@
- #endif /* XPM */
+diff -urNp -x '*.orig' xdm-1.1.12.org/config/Xresources.in xdm-1.1.12/config/Xresources.in
+--- xdm-1.1.12.org/config/Xresources.in        2019-03-02 22:06:13.000000000 +0000
++++ xdm-1.1.12/config/Xresources.in    2022-04-06 18:24:57.852216768 +0000
+@@ -58,7 +58,7 @@ xlogin*shdColor: black
+ xlogin*hiColor: black
  XHASHendif
  #ifdef XPM
 -XHASHif PLANES >= 8
@@ -25,42 +10,21 @@
  xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
  XHASHelse
  xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
---- xdm-1.1.0/xdm-xinitrc-0.2/GiveConsole.orig 2000-10-29 20:59:44.000000000 +0100
-+++ xdm-1.1.0/xdm-xinitrc-0.2/GiveConsole      2006-10-15 02:18:00.359086750 +0200
+diff -urNp -x '*.orig' xdm-1.1.12.org/xdm-xinitrc-0.2/GiveConsole xdm-1.1.12/xdm-xinitrc-0.2/GiveConsole
+--- xdm-1.1.12.org/xdm-xinitrc-0.2/GiveConsole 2000-10-29 19:59:44.000000000 +0000
++++ xdm-1.1.12/xdm-xinitrc-0.2/GiveConsole     2022-04-06 18:24:57.852216768 +0000
 @@ -8,4 +8,4 @@
  # causing serious grief.
  #
  chown $USER /dev/console
 -/usr/X11R6/bin/sessreg  -a -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
 +/usr/bin/sessreg  -a -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
---- xdm-1.1.0/xdm-xinitrc-0.2/TakeConsole.orig 2000-10-29 20:59:44.000000000 +0100
-+++ xdm-1.1.0/xdm-xinitrc-0.2/TakeConsole      2006-10-15 02:18:07.591538750 +0200
+diff -urNp -x '*.orig' xdm-1.1.12.org/xdm-xinitrc-0.2/TakeConsole xdm-1.1.12/xdm-xinitrc-0.2/TakeConsole
+--- xdm-1.1.12.org/xdm-xinitrc-0.2/TakeConsole 2000-10-29 19:59:44.000000000 +0000
++++ xdm-1.1.12/xdm-xinitrc-0.2/TakeConsole     2022-04-06 18:24:57.852216768 +0000
 @@ -5,4 +5,4 @@
  #
  chmod 622 /dev/console
  chown root /dev/console
 -/usr/X11R6/bin/sessreg -d -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
 +/usr/bin/sessreg -d -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
---- xdm-1.1.0/configure.ac.orig        2006-10-04 03:11:27.000000000 +0200
-+++ xdm-1.1.0/configure.ac     2006-10-15 02:17:10.495970500 +0200
-@@ -216,6 +216,11 @@
-       [XDMPIDDIR="$withval"], [XDMPIDDIR="/var/run"])
- AC_SUBST(XDMPIDDIR)
- 
-+AC_ARG_WITH(xdmauthdir,
-+      AC_HELP_STRING([--with-xdmauthdir=<pathname>],
-+        [specify directory for authentication cookie files (default=configdir)]),
-+      [XDMAUTHDIR="$withval"], [XDMAUTHDIR="$XDMCONFIGDIR"])
-+
- AC_ARG_WITH(default-vt,
-       AC_HELP_STRING([--with-default-vt=<vtname>],
-         [specify default vt to start xdm on (default=none)]),
-@@ -494,7 +499,7 @@
- 
- # -DDEF_AUTH_DIR="$(XDMDIR)"
- 
--AC_DEFINE_DIR(DEF_AUTH_DIR, XDMCONFIGDIR, 
-+AC_DEFINE_DIR(DEF_AUTH_DIR, XDMAUTHDIR, 
-       [Define to pathname where authentication cookie files should be stored])
- 
- # -DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"