Package: xdm Version: 6.8.99.900.dfsg.1-0pre1 Severity: important /etc/X11/xdm/xdm-config has path for chooser /usr/X11R6/lib/X11/xdm/chooser, but it was moved to /usr/X11R6/bin/chooser. This breaks querying xdm with -indirect until manually fixed. The attached patches update patches/debian/905_debian_xdm.diff to change chooser path in xdm/Imakefile and xdm/config/Imakefile to generate appropriate xdm-config. -- System Information: Debian Release: testing/unstable APT prefers unstable APT policy: (500, 'unstable'), (500, 'stable') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/dash Kernel: Linux 2.6.12-1-k7xen0 Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8)
Versions of packages xdm depends on: ii cpp 4:4.0.2-1 The GNU C preprocessor (cpp) ii debconf [debconf 1.4.58 Debian configuration management sy ii libc6 2.3.5-6ejka1 GNU C Library: Shared libraries an ii libice6 6.8.99.900.dfsg.1-0pre1 Inter-Client Exchange library ii libpam-modules 0.79-3 Pluggable Authentication Modules f ii libpam-runtime 0.79-3 Runtime support for the PAM librar ii libpam0g 0.79-3 Pluggable Authentication Modules l ii libselinux1 1.26-1 SELinux shared libraries ii libsm6 6.8.99.900.dfsg.1-0pre1 X Window System Session Management ii libxau6 6.8.99.900.dfsg.1-0pre1 X Authentication library ii libxaw8 6.8.99.900.dfsg.1-0pre1 X Athena widget set library ii libxdmcp6 6.8.99.900.dfsg.1-0pre1 X Display Manager Control Protocol ii libxext6 6.8.99.900.dfsg.1-0pre1 X Window System miscellaneous exte ii libxinerama1 6.8.99.900.dfsg.1-0pre1 X Window System multi-head display ii libxmu6 6.8.99.900.dfsg.1-0pre1 X Window System miscellaneous util ii libxp6 6.8.99.900.dfsg.1-0pre1 X Window System printing extension ii libxpm4 6.8.99.900.dfsg.1-0pre1 X pixmap library ii libxt6 6.8.99.900.dfsg.1-0pre1 X Toolkit Intrinsics ii xbase-clients 6.8.99.900.dfsg.1-0pre1 miscellaneous X clients ii xlibs 6.8.99.900.dfsg.1-0pre1 X Window System client libraries m xdm recommends no packages. -- debconf information: xdm/stop_running_server_with_children: false xdm/daemon_name: /usr/bin/X11/xdm * shared/default-x-display-manager: xdm
--- a/debian/patches/debian/905_debian_xdm.diff 2005-07-23 13:27:00.000000000 +0800 +++ b/debian/patches/debian/905_debian_xdm.diff 2005-10-11 22:44:08.000000000 +0800 @@ -23,12 +23,16 @@ - Define a default userPath and systemPath. Again, this smacks of the FHS. -diff -ruN xc-old/programs/xdm/config/Imakefile xc/programs/xdm/config/Imakefile ---- xc-old/programs/xdm/config/Imakefile 2005-07-21 18:03:04.000000000 -0400 -+++ xc/programs/xdm/config/Imakefile 2005-07-21 18:09:54.000000000 -0400 -@@ -25,8 +25,13 @@ +Index: xc/programs/xdm/config/Imakefile +=================================================================== +--- xc/programs/xdm/config/Imakefile.orig 2005-10-11 22:42:41.000000000 +0800 ++++ xc/programs/xdm/config/Imakefile 2005-10-11 22:44:05.000000000 +0800 +@@ -23,10 +23,15 @@ + # define XdmbwPixmap XVendorStdFilePrefix-bw.xpm + #endif - CHOOSERPATH = $(XDMDIR)/chooser +-CHOOSERPATH = $(XDMDIR)/chooser ++CHOOSERPATH = $(BINDIR)/chooser +#if LinuxDistribution && (LinuxDistribution == LinuxDebian) +XPM_DEFINES=-DXPM -DBITMAPDIR=$(XDMDIR)/pixmaps -DXDM_PIXMAP=debian.xpm\ @@\ @@ -40,9 +44,10 @@ XDMLOGDIR = $(LOGDIRECTORY) #ifdef VarRunDirectory -diff -ruN xc-old/programs/xdm/config/xdm-conf.cpp xc/programs/xdm/config/xdm-conf.cpp ---- xc-old/programs/xdm/config/xdm-conf.cpp 2005-05-08 23:28:35.000000000 -0400 -+++ xc/programs/xdm/config/xdm-conf.cpp 2005-07-21 18:09:54.000000000 -0400 +Index: xc/programs/xdm/config/xdm-conf.cpp +=================================================================== +--- xc/programs/xdm/config/xdm-conf.cpp.orig 2005-03-01 00:35:18.000000000 +0700 ++++ xc/programs/xdm/config/xdm-conf.cpp 2005-10-11 22:42:41.000000000 +0800 @@ -10,20 +10,22 @@ DisplayManager.keyFile: XDMDIR/xdm-keys DisplayManager.servers: XDMDIR/Xservers @@ -73,9 +78,10 @@ #ifdef XPM DisplayManager*loginmoveInterval: 10 #endif /* XPM */ -diff -ruN xc-old/programs/xdm/config/Xres.cpp xc/programs/xdm/config/Xres.cpp ---- xc-old/programs/xdm/config/Xres.cpp 2005-07-21 18:03:04.000000000 -0400 -+++ xc/programs/xdm/config/Xres.cpp 2005-07-21 18:09:54.000000000 -0400 +Index: xc/programs/xdm/config/Xres.cpp +=================================================================== +--- xc/programs/xdm/config/Xres.cpp.orig 2005-10-11 22:42:25.000000000 +0800 ++++ xc/programs/xdm/config/Xres.cpp 2005-10-11 22:42:41.000000000 +0800 @@ -20,10 +20,10 @@ Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS <Key>Return: set-session-argument() finish-field() @@ -89,9 +95,10 @@ xlogin*namePrompt: \040\040\040\040\040\040\040Login: #endif /* XPM */ xlogin*fail: Login incorrect -diff -ruN xc-old/programs/xdm/config/Xserv.ws.cpp xc/programs/xdm/config/Xserv.ws.cpp ---- xc-old/programs/xdm/config/Xserv.ws.cpp 2005-05-08 23:28:35.000000000 -0400 -+++ xc/programs/xdm/config/Xserv.ws.cpp 2005-07-21 18:09:54.000000000 -0400 +Index: xc/programs/xdm/config/Xserv.ws.cpp +=================================================================== +--- xc/programs/xdm/config/Xserv.ws.cpp.orig 2005-03-01 00:35:18.000000000 +0700 ++++ xc/programs/xdm/config/Xserv.ws.cpp 2005-10-11 22:42:41.000000000 +0800 @@ -10,4 +10,26 @@ XCOMM look like: XCOMM XTerminalName:0 foreign @@ -120,9 +127,10 @@ +XCOMM :0 local BINDIR/X :0 vt9 -depth 15 -nolisten tcp +XCOMM :1 local BINDIR/X :1 vt10 -depth 8 -nolisten tcp +:0 local BINDIR/X DEFAULTVT -dpi 100 -nolisten tcp -diff -ruN xc-old/programs/xdm/config/Xsession xc/programs/xdm/config/Xsession ---- xc-old/programs/xdm/config/Xsession 2005-05-08 23:28:35.000000000 -0400 -+++ xc/programs/xdm/config/Xsession 2005-07-21 18:09:54.000000000 -0400 +Index: xc/programs/xdm/config/Xsession +=================================================================== +--- xc/programs/xdm/config/Xsession.orig 2005-03-01 00:35:18.000000000 +0700 ++++ xc/programs/xdm/config/Xsession 2005-10-11 22:42:41.000000000 +0800 @@ -7,40 +7,5 @@ # # $XFree86: xc/programs/xdm/config/Xsession,v 1.2 1998/01/11 03:48:32 dawes Exp $ @@ -166,9 +174,19 @@ -fi +# invoke global X session script +. /etc/X11/Xsession -diff -ruN xc-old/programs/xdm/Imakefile xc/programs/xdm/Imakefile ---- xc-old/programs/xdm/Imakefile 2005-07-21 18:03:23.000000000 -0400 -+++ xc/programs/xdm/Imakefile 2005-07-21 18:09:54.000000000 -0400 +Index: xc/programs/xdm/Imakefile +=================================================================== +--- xc/programs/xdm/Imakefile.orig 2005-10-11 22:42:38.000000000 +0800 ++++ xc/programs/xdm/Imakefile 2005-10-11 22:43:44.000000000 +0800 +@@ -253,7 +253,7 @@ + #endif + PROGRAMS = ProgramTargetName(xdm) ProgramTargetName(xdmshell) ProgramTargetName(sessreg) $(CHOOSER) $(XDM_SHADOW) + +- CHOOSERPATH = $(XDMDIR)/chooser ++ CHOOSERPATH = $(BINDIR)/chooser + OSMAJORVERSION = OSMajorVersion + OSMINORVERSION = OSMinorVersion + CONN_DEFINES = $(CONNECTION_FLAGS) @@ -290,9 +290,9 @@ '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \ '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \
--- a/debian/patches/debian/905_debian_xdm.diff 2005-08-03 13:39:28.000000000 +0800 +++ b/debian/patches/debian/905_debian_xdm.diff 2005-10-11 21:09:32.000000000 +0800 @@ -25,11 +25,14 @@ Index: xc/programs/xdm/config/Imakefile =================================================================== ---- xc/programs/xdm/config/Imakefile.orig 2005-08-02 23:27:44.000000000 -0400 -+++ xc/programs/xdm/config/Imakefile 2005-08-03 00:33:22.000000000 -0400 -@@ -25,8 +25,13 @@ +--- xc/programs/xdm/config/Imakefile.orig 2005-10-11 21:07:58.000000000 +0800 ++++ xc/programs/xdm/config/Imakefile 2005-10-11 21:09:29.000000000 +0800 +@@ -23,10 +23,15 @@ + # define XdmbwPixmap XVendorStdFilePrefix-bw.xpm + #endif - CHOOSERPATH = $(XDMDIR)/chooser +-CHOOSERPATH = $(XDMDIR)/chooser ++CHOOSERPATH = $(BINDIR)/chooser +#if LinuxDistribution && (LinuxDistribution == LinuxDebian) +XPM_DEFINES=-DXPM -DBITMAPDIR=$(XDMDIR)/pixmaps -DXDM_PIXMAP=debian.xpm\ @@\ @@ -169,8 +172,17 @@ +. /etc/X11/Xsession Index: xc/programs/xdm/Imakefile =================================================================== ---- xc/programs/xdm/Imakefile.orig 2005-08-03 00:13:37.000000000 -0400 -+++ xc/programs/xdm/Imakefile 2005-08-03 00:33:22.000000000 -0400 +--- xc/programs/xdm/Imakefile.orig 2005-10-11 21:08:02.000000000 +0800 ++++ xc/programs/xdm/Imakefile 2005-10-11 21:08:07.000000000 +0800 +@@ -253,7 +253,7 @@ + #endif + PROGRAMS = ProgramTargetName(xdm) ProgramTargetName(xdmshell) ProgramTargetName(sessreg) $(CHOOSER) $(XDM_SHADOW) + +- CHOOSERPATH = $(XDMDIR)/chooser ++ CHOOSERPATH = $(BINDIR)/chooser + OSMAJORVERSION = OSMajorVersion + OSMINORVERSION = OSMinorVersion + CONN_DEFINES = $(CONNECTION_FLAGS) @@ -290,9 +290,9 @@ '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \ '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \