xdm: Changes to 'upstream-unstable'
Chooser.ad | 51 ------------------------------------------------
Makefile.am | 7 ++++--
README | 1
app-defaults/Chooser.ad | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 9 ++++++--
greet.h | 2 -
session.c | 4 +++
7 files changed, 68 insertions(+), 57 deletions(-)
New commits:
commit c9cdec25130bc957b584ec15187e068f9c08862d
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 14:24:58 2008 -0400
xdm 1.1.8
diff --git a/configure.ac b/configure.ac
index 1110525..329c8e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
dnl $XdotOrg: app/xdm/configure.ac,v 1.42 2006/06/03 01:01:21 alanc Exp $
AC_PREREQ([2.57])
-AC_INIT(xdm,[1.1.7],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
+AC_INIT(xdm,[1.1.8],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 5f94cf40697145678c96e9899df69ad2550a4509
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 15 16:52:09 2008 +0200
$(builddir) is the current directory
Apparently automake doesn't always export the builddir variable.
This fixes the previous commit.
diff --git a/Makefile.am b/Makefile.am
index 4aa22fa..0edca97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -160,7 +160,7 @@ APPDEFAULTFILES = app-defaults/Chooser
SUFFIXES += .ad
.ad:
- [ -d "$(builddir)/app-defaults" ] || mkdir "$(builddir)/app-defaults"
+ [ -d app-defaults ] || mkdir app-defaults
cp $< $@
appdefault_DATA = $(APPDEFAULTFILES)
commit 46d72e82f4069d281f61a9fdbae11157241f3553
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue May 6 17:57:22 2008 -0700
Bug 10145: xdm passes file descriptors to children
X.Org Bugzilla #10145 <https://bugs.freedesktop.org/show_bug.cgi?id=10145>
Patch #14644 <https://bugs.freedesktop.org/attachment.cgi?id=14644>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/session.c b/session.c
index 195c26f..b48a3ef 100644
--- a/session.c
+++ b/session.c
@@ -846,6 +846,10 @@ runAndWait (char **args, char **environ)
switch (pid = fork ()) {
case 0:
CleanUpChild ();
+#ifdef XDMCP
+ /* The chooser socket is not closed by CleanUpChild() */
+ DestroyWellKnownSockets();
+#endif
execute (args, environ);
LogError ("can't execute \"%s\" (err %d)\n", args[0], errno);
exit (1);
commit b4ac133b92e08a34054d0af9481ab59b03571818
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 20 19:32:12 2008 +0200
Fix build with builddir != srcdir
diff --git a/Makefile.am b/Makefile.am
index 7b5e3ed..4aa22fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -160,6 +160,7 @@ APPDEFAULTFILES = app-defaults/Chooser
SUFFIXES += .ad
.ad:
+ [ -d "$(builddir)/app-defaults" ] || mkdir "$(builddir)/app-defaults"
cp $< $@
appdefault_DATA = $(APPDEFAULTFILES)
commit 1b14e9391500d06dd0b61967db8099c3cf27f90c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Mar 27 19:57:08 2008 -0700
Build fix for case-insensitive file systems
diff --git a/Chooser.ad b/Chooser.ad
deleted file mode 100644
index e7a6126..0000000
--- a/Chooser.ad
+++ /dev/null
@@ -1,51 +0,0 @@
-! $XFree86$
-!
-*ShapeStyle: Oval
-*cursor: left_ptr
-*allowShellResize: true
-*label.label: XDMCP Host Menu
-*label.borderWidth: 0
-*label.skipAdjust: true
-*paned*showGrip: false
-!*viewport.horizDistance: 20
-!*viewport.height: 200
-*viewport.width: 400
-*viewport.height: 50
-*viewport.allowVert: true
-*viewport.fromVert: label
-*viewport.resizeable: true
-*viewport.allowResize: true
-
-*list.translations: #override \
- <Key>Return: Accept() \n\
- <Key>: KeySwitch() \n\
- <Btn1Down>: Store() Set() CheckWilling() Setold() \n\
- <Btn1Up>(2): Accept() \n\
- <Btn4Down>: BtnSwitch() \n\
- <Btn5Down>: BtnSwitch()
-
-*list.defaultColumns: 1
-*list.forceColumns: true
-
-*box.skipAdjust: true
-*cancel.fromHoriz: viewport
-*cancel.fromVert: label
-*cancel.vertDistance: 100
-*cancel.bottom: ChainBottom
-*cancel.top: ChainBottom
-*cancel.left: ChainRight
-*cancel.right: ChainRight
-
-*accept.fromHoriz: viewport
-*accept.fromVert: cancel
-*accept.bottom: ChainBottom
-*accept.top: ChainBottom
-*accept.left: ChainRight
-*accept.right: ChainRight
-
-*cancel.translations: #override \
- <BtnUp>: Cancel() unset()
-*accept.translations: #override \
- <BtnUp>: Accept() unset()
-*ping.translations: #override \
- <BtnUp>: Ping() unset()
diff --git a/Makefile.am b/Makefile.am
index dee897d..7b5e3ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,7 +155,7 @@ DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
appdefaultdir = @appdefaultdir@
-APPDEFAULTFILES = Chooser
+APPDEFAULTFILES = app-defaults/Chooser
SUFFIXES += .ad
diff --git a/app-defaults/Chooser.ad b/app-defaults/Chooser.ad
new file mode 100644
index 0000000..e7a6126
--- /dev/null
+++ b/app-defaults/Chooser.ad
@@ -0,0 +1,51 @@
+! $XFree86$
+!
+*ShapeStyle: Oval
+*cursor: left_ptr
+*allowShellResize: true
+*label.label: XDMCP Host Menu
+*label.borderWidth: 0
+*label.skipAdjust: true
+*paned*showGrip: false
+!*viewport.horizDistance: 20
+!*viewport.height: 200
+*viewport.width: 400
+*viewport.height: 50
+*viewport.allowVert: true
+*viewport.fromVert: label
+*viewport.resizeable: true
+*viewport.allowResize: true
+
+*list.translations: #override \
+ <Key>Return: Accept() \n\
+ <Key>: KeySwitch() \n\
+ <Btn1Down>: Store() Set() CheckWilling() Setold() \n\
+ <Btn1Up>(2): Accept() \n\
+ <Btn4Down>: BtnSwitch() \n\
+ <Btn5Down>: BtnSwitch()
+
+*list.defaultColumns: 1
+*list.forceColumns: true
+
+*box.skipAdjust: true
+*cancel.fromHoriz: viewport
+*cancel.fromVert: label
+*cancel.vertDistance: 100
+*cancel.bottom: ChainBottom
+*cancel.top: ChainBottom
+*cancel.left: ChainRight
+*cancel.right: ChainRight
+
+*accept.fromHoriz: viewport
+*accept.fromVert: cancel
+*accept.bottom: ChainBottom
+*accept.top: ChainBottom
+*accept.left: ChainRight
+*accept.right: ChainRight
+
+*cancel.translations: #override \
+ <BtnUp>: Cancel() unset()
+*accept.translations: #override \
+ <BtnUp>: Accept() unset()
+*ping.translations: #override \
+ <BtnUp>: Ping() unset()
commit c0f0d3adebb9b133e26a6e25738cfe38b36e5314
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Mar 27 19:52:33 2008 -0700
Added include of pwd.h so we build correctly on OS-X - see xorg mailing list
diff --git a/greet.h b/greet.h
index 3854328..18f487d 100644
--- a/greet.h
+++ b/greet.h
@@ -31,7 +31,7 @@ from The Open Group.
/*
* greet.h - interface to xdm's dynamically-loadable modular greeter
*/
-
+#include <pwd.h>
#include <X11/Xlib.h>
/*
commit c2de936fe580d82da3c5b3590a1acb9e28ec68c1
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Mar 8 06:40:14 2008 +0100
Fix installation of app-defaults
Add a configure option for appdefaultdir, and use it for
make distcheck, because it wants everything under $prefix.
By default, still use `pkg-config --variable=appdefaultdir xt'.
diff --git a/Makefile.am b/Makefile.am
index dacdefd..dee897d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,7 +151,9 @@ chooser_SOURCES = \
# App default files (*.ad)
-appdefaultdir = @DESTDIR@@appdefaultdir@
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
+
+appdefaultdir = @appdefaultdir@
APPDEFAULTFILES = Chooser
diff --git a/configure.ac b/configure.ac
index 3cd11be..1110525 100644
--- a/configure.ac
+++ b/configure.ac
@@ -518,8 +518,13 @@ AC_DEFINE_DIR(DEF_GREETER_LIB, XDMLIBDIR/libXdmGreet.so,
[Define to pathname where greeter shared object is installed (if used)])
PKG_CHECK_MODULES(APPDEFS, xt)
-appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+AC_ARG_WITH(appdefaultdir,
+ AC_HELP_STRING([--with-appdefaultdir=<pathname>],
+ [specify directory for app-defaults files (default is autodetected)]),
+ [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
AC_SUBST(appdefaultdir)
+
AC_SUBST(MKTEMP_COMMAND)
XORG_WITH_LINT
commit f2f2eed7c284ced3ddc3fe3451ec7a8af9dfdbb4
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
Date: Sat Mar 8 22:21:57 2008 +0100
README: nuke RCS Id
diff --git a/README b/README
index d5f885e..d5521d3 100644
--- a/README
+++ b/README
@@ -19,4 +19,3 @@ For instance, some packagers/sites may prefer:
--with-xdmconfigdir=/etc/X11/xdm --with-xdmlibdir=$(prefix)/lib/xdm
--with-xdmscriptdir=/etc/X11/xdm
-$Id$
Reply to: