Author: dnusinow Date: 2006-06-29 22:57:50 -0400 (Thu, 29 Jun 2006) New Revision: 2356
Modified: trunk/app/xdm/debian/changelog trunk/app/xdm/debian/control trunk/app/xdm/debian/patches/debian.diff trunk/app/xdm/debian/rules trunk/app/xdm/debian/xdm.README.Debian trunk/app/xdm/debian/xdm.init trunk/app/xdm/debian/xdm.install Log: * New upstream release. Fixes security bug on linux-2.6 kernels. * Don't build-depend on libselinux1-dev on non-linux arches, thanks Michael Banck and Christian Perrier (closes: #369519) * Fix init script reload target, thanks Alexandr Kazda (closes: #365548) * Fix authDir reference in xdm(1), thanks Kevin Ryde (closes: #373138) * Update README.Debian, thanks Kevin Ryde (closes: #373870) * Pass APP_MAN_SUFFIX=1 to configure explicitely. Modified: trunk/app/xdm/debian/changelog =================================================================== --- trunk/app/xdm/debian/changelog 2006-06-30 02:49:44 UTC (rev 2355) +++ trunk/app/xdm/debian/changelog 2006-06-30 02:57:50 UTC (rev 2356) @@ -1,3 +1,15 @@ +xdm (1:1.0.5-1) UNRELEASED; urgency=low + + * New upstream release. Fixes security bug on linux-2.6 kernels. + * Don't build-depend on libselinux1-dev on non-linux arches, thanks + Michael Banck and Christian Perrier (closes: #369519) + * Fix init script reload target, thanks Alexandr Kazda (closes: #365548) + * Fix authDir reference in xdm(1), thanks Kevin Ryde (closes: #373138) + * Update README.Debian, thanks Kevin Ryde (closes: #373870) + * Pass APP_MAN_SUFFIX=1 to configure explicitely. + + -- Eugene Konev <[EMAIL PROTECTED]> Fri, 30 Jun 2006 09:17:28 +0800 + xdm (1:1.0.4-2) unstable; urgency=low * Pre-depend on x11-common. Thanks Eugene Konev. Modified: trunk/app/xdm/debian/control =================================================================== --- trunk/app/xdm/debian/control 2006-06-30 02:49:44 UTC (rev 2355) +++ trunk/app/xdm/debian/control 2006-06-30 02:57:50 UTC (rev 2356) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.0), pkg-config, libxmu-dev (>= 1:1.0.1-1), libx11-dev (>= 2:1.0.0-1), libxau-dev (>= 1:1.0.0-1), libxaw7-dev (>= 1:1.0.1-1), libpam0g-dev, libselinux1-dev, libxinerama-dev (>= 1:1.0.1-1), quilt +Build-Depends: debhelper (>= 5.0.0), pkg-config, libxmu-dev (>= 1:1.0.1-1), libx11-dev (>= 2:1.0.0-1), libxau-dev (>= 1:1.0.0-1), libxaw7-dev (>= 1:1.0.1-1), libpam0g-dev, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], libxinerama-dev (>= 1:1.0.1-1), quilt Standards-Version: 3.7.2.0 Package: xdm Modified: trunk/app/xdm/debian/patches/debian.diff =================================================================== --- trunk/app/xdm/debian/patches/debian.diff 2006-06-30 02:49:44 UTC (rev 2355) +++ trunk/app/xdm/debian/patches/debian.diff 2006-06-30 02:57:50 UTC (rev 2356) @@ -5,10 +5,10 @@ Ported parts of 905_debian_xdm.diff. Some changes are now done through configure flags -Index: xdm/config/Makefile.am +Index: xdm-1.0.5/config/Makefile.am =================================================================== ---- xdm.orig/config/Makefile.am 2006-04-29 15:04:42.000000000 -0400 -+++ xdm/config/Makefile.am 2006-04-29 19:00:02.000000000 -0400 +--- xdm-1.0.5.orig/config/Makefile.am 2006-06-26 13:12:23.000000000 +0800 ++++ xdm-1.0.5/config/Makefile.am 2006-06-26 13:12:43.000000000 +0800 @@ -54,7 +54,7 @@ -DXDMDIR=$(XDMLIBDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \ -DXDMCONFIGDIR=$(XDMCONFIGDIR) -DXDMSCRIPTDIR=$(XDMSCRIPTDIR) \ @@ -18,10 +18,10 @@ Xservers.ws: $(srcdir)/Xservers.ws.cpp $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@ -Index: xdm/config/Xresources.cpp +Index: xdm-1.0.5/config/Xresources.cpp =================================================================== ---- xdm.orig/config/Xresources.cpp 2006-04-29 18:55:26.000000000 -0400 -+++ xdm/config/Xresources.cpp 2006-04-29 18:59:26.000000000 -0400 +--- xdm-1.0.5.orig/config/Xresources.cpp 2006-06-26 13:12:41.000000000 +0800 ++++ xdm-1.0.5/config/Xresources.cpp 2006-06-26 13:12:43.000000000 +0800 @@ -20,10 +20,10 @@ Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS <Key>Return: set-session-argument() finish-field() @@ -35,10 +35,10 @@ xlogin*namePrompt: \040\040\040\040\040\040\040Login: #endif /* XPM */ xlogin*fail: Login incorrect -Index: xdm/config/Xservers.ws.cpp +Index: xdm-1.0.5/config/Xservers.ws.cpp =================================================================== ---- xdm.orig/config/Xservers.ws.cpp 2006-04-29 14:55:31.000000000 -0400 -+++ xdm/config/Xservers.ws.cpp 2006-04-29 18:59:26.000000000 -0400 +--- xdm-1.0.5.orig/config/Xservers.ws.cpp 2006-06-26 13:12:23.000000000 +0800 ++++ xdm-1.0.5/config/Xservers.ws.cpp 2006-06-26 13:12:43.000000000 +0800 @@ -10,4 +10,26 @@ XCOMM look like: XCOMM XTerminalName:0 foreign @@ -67,10 +67,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 -Index: xdm/config/Xsession.cpp +Index: xdm-1.0.5/config/Xsession.cpp =================================================================== ---- xdm.orig/config/Xsession.cpp 2006-04-29 15:04:42.000000000 -0400 -+++ xdm/config/Xsession.cpp 2006-04-29 19:00:46.000000000 -0400 +--- xdm-1.0.5.orig/config/Xsession.cpp 2006-06-26 13:12:23.000000000 +0800 ++++ xdm-1.0.5/config/Xsession.cpp 2006-06-26 13:12:43.000000000 +0800 @@ -4,84 +4,5 @@ XCOMM $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $ XCOMM $XFree86: xc/programs/xdm/config/Xsession,v 1.2 1998/01/11 03:48:32 dawes Exp $ @@ -158,10 +158,10 @@ -fi +# invoke global X session script +. /etc/X11/Xsession -Index: xdm/config/xdm-config.cpp +Index: xdm-1.0.5/config/xdm-config.cpp =================================================================== ---- xdm.orig/config/xdm-config.cpp 2006-04-29 14:55:31.000000000 -0400 -+++ xdm/config/xdm-config.cpp 2006-04-29 18:59:26.000000000 -0400 +--- xdm-1.0.5.orig/config/xdm-config.cpp 2006-06-26 13:12:23.000000000 +0800 ++++ xdm-1.0.5/config/xdm-config.cpp 2006-06-26 13:12:43.000000000 +0800 @@ -17,22 +17,22 @@ DisplayManager.keyFile: XDMCONFIGDIR/xdm-keys DisplayManager.servers: XDMCONFIGDIR/Xservers @@ -191,10 +191,10 @@ #ifdef XPM DisplayManager*loginmoveInterval: 10 #endif /* XPM */ -Index: xdm/configure.ac +Index: xdm-1.0.5/configure.ac =================================================================== ---- xdm.orig/configure.ac 2006-04-29 18:55:59.000000000 -0400 -+++ xdm/configure.ac 2006-04-29 18:59:26.000000000 -0400 +--- xdm-1.0.5.orig/configure.ac 2006-06-26 13:12:42.000000000 +0800 ++++ xdm-1.0.5/configure.ac 2006-06-26 13:12:43.000000000 +0800 @@ -220,6 +220,12 @@ [XDMSCRIPTDIR="$withval"], [XDMSCRIPTDIR="${XDMLIBDIR}"]) AC_SUBST(XDMSCRIPTDIR) @@ -217,3 +217,28 @@ [Define to pathname where authentication cookie files should be stored]) # -DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so" +Index: xdm-1.0.5/xdm.man.cpp +=================================================================== +--- xdm-1.0.5.orig/xdm.man.cpp 2006-06-26 13:12:43.000000000 +0800 ++++ xdm-1.0.5/xdm.man.cpp 2006-06-26 13:12:43.000000000 +0800 +@@ -306,7 +306,7 @@ + This names a directory under which + .I xdm + stores authorization files while initializing the session. The +-default value is \fI XDMDIR.\fP ++default value is \fI XDMAUTHDIR.\fP + Can be overridden for specific displays by + DisplayManager.\fIDISPLAY\fP.authFile. + .IP \fBDisplayManager.autoRescan\fP +Index: xdm-1.0.5/Makefile.am +=================================================================== +--- xdm-1.0.5.orig/Makefile.am 2006-06-26 13:18:08.000000000 +0800 ++++ xdm-1.0.5/Makefile.am 2006-06-26 13:18:38.000000000 +0800 +@@ -115,6 +115,7 @@ + -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ + -DCHOOSERPATH=$(xdmlibdir)/chooser -DXDMLOGDIR=$(XDMLOGDIR) \ + -DXDMDIR=$(XDMCONFIGDIR) -DBINDIR=$(bindir) -DXDMPIDDIR=$(XDMPIDDIR) \ ++ -DXDMAUTHDIR=$(XDMAUTHDIR) \ + -D__appmansuffix__=$(APP_MAN_SUFFIX) \ + -D__filemansuffix__=$(FILE_MAN_SUFFIX) \ + -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ Modified: trunk/app/xdm/debian/rules =================================================================== --- trunk/app/xdm/debian/rules 2006-06-30 02:49:44 UTC (rev 2355) +++ trunk/app/xdm/debian/rules 2006-06-30 02:57:50 UTC (rev 2356) @@ -57,7 +57,7 @@ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ $(confflags) \ - CFLAGS="$(CFLAGS)" + CFLAGS="$(CFLAGS)" APP_MAN_SUFFIX=1 cd $(BUILD_DIR) && $(MAKE) Modified: trunk/app/xdm/debian/xdm.README.Debian =================================================================== --- trunk/app/xdm/debian/xdm.README.Debian 2006-06-30 02:49:44 UTC (rev 2355) +++ trunk/app/xdm/debian/xdm.README.Debian 2006-06-30 02:57:50 UTC (rev 2356) @@ -1,11 +1,6 @@ Debian README for xdm package ============================= -Newcomers to the X Window System should first read the file -/usr/share/doc/x11-common/FAQ.gz. You can view this file with your -favorite pager program after decompressing it. For example: - $ zcat /usr/share/doc/x11-common/FAQ.gz | pager - Upgraders from Debian GNU/Linux 2.0 or earlier should be aware that the /etc/X11/config file is no longer used; its xdm-specific options are now in /etc/X11/xdm/xdm.options. @@ -16,7 +11,7 @@ automatically at boot.) If one does not wish to run a local X server, the following line should be commented out of /etc/X11/xdm/Xservers: -:0 local /usr/bin/X11/X vt7 -deferglyphs 16 +:0 local /usr/bin/X vt7 Several configuration files are shipped with the xdm package; they reside in the /etc/X11/xdm/ directory. Extensive documentation about the xdm @@ -32,10 +27,10 @@ manual page for more information about X resources. The above three files, despite being X resource files, are not placed in the -/etc/X11/Xresources directory (see /usr/share/doc/xbase/README.Debian) because -they should not be used automatically in all X sessions; the /etc/X11/Xsession -script merges in the resources of all files found in /etc/X11/Xresources, and -this action would be inappropriate for these resource files. +/etc/X11/Xresources directory because they should not be used automatically +in all X sessions; the /etc/X11/Xsession script merges in the resources of +all files found in /etc/X11/Xresources, and this action would be inappropriate +for these resource files. Xservers contains entries to start the X server(s) on the local machine, and on any remote X terminals that do not support XDMCP. This file is internally Modified: trunk/app/xdm/debian/xdm.init =================================================================== --- trunk/app/xdm/debian/xdm.init 2006-06-30 02:49:44 UTC (rev 2355) +++ trunk/app/xdm/debian/xdm.init 2006-06-30 02:57:50 UTC (rev 2356) @@ -45,6 +45,7 @@ # Update: --name should prevent signalling innocent processes. SSD_START_ARGS="--pidfile $PIDFILE --name $(basename $DAEMON) --startas $DAEMON" SSD_STOP_ARGS="--pidfile $PIDFILE --name $(basename $DAEMON) --retry TERM/5/TERM/5" +SSD_RELOAD_ARGS="--pidfile $PIDFILE --name $(basename $DAEMON) --signal 1" case "$1" in start) @@ -69,7 +70,7 @@ reload) echo -n "Reloading X display manager configuration..." - if start-stop-daemon --stop --signal 1 --quiet $SSD_STOP_ARGS; then + if start-stop-daemon --stop --quiet $SSD_RELOAD_ARGS; then echo "done." else echo "xdm not running." Modified: trunk/app/xdm/debian/xdm.install =================================================================== --- trunk/app/xdm/debian/xdm.install 2006-06-30 02:49:44 UTC (rev 2355) +++ trunk/app/xdm/debian/xdm.install 2006-06-30 02:57:50 UTC (rev 2356) @@ -16,5 +16,5 @@ usr/share/X11/xdm/pixmaps/xorg-bw.xpm usr/share/X11/xdm/pixmaps/xorg.xpm usr/share/lintian/overrides/xdm -usr/share/man/man1/xdm.1x +usr/share/man/man1/xdm.1 usr/share/man/man5/xdm.options.5 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]