xdm: Changes to 'debian-unstable'
ChangeLog | 60 +++++++++++++
Chooser.ad | 51 -----------
Makefile.am | 5 -
Makefile.in | 8 +
README | 1
aclocal.m4 | 20 +++-
app-defaults/Chooser.ad | 51 +++++++++++
config.h.in | 3
configure | 168 +++++++++++++++++++++++++++++----------
configure.ac | 9 +-
debian/changelog | 8 +
debian/control | 2
debian/xdm.install | 1
debian/xsfbs/xsfbs-autoreconf.mk | 150 ----------------------------------
debian/xsfbs/xsfbs.mk | 80 ------------------
greet.h | 2
ltmain.sh | 2
session.c | 4
18 files changed, 285 insertions(+), 340 deletions(-)
New commits:
commit 8a289462bd53c983895ca7e42d695fc7f08c473b
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 22 18:28:16 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 5328e49..7ce3f21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xdm (1:1.1.8-1) UNRELEASED; urgency=low
+xdm (1:1.1.8-1) unstable; urgency=low
* Drop lintian overrides, they're unused anyway.
* Remove “-1” debian revision from Build-Depends (thanks to lintian).
@@ -7,7 +7,7 @@ xdm (1:1.1.8-1) UNRELEASED; urgency=low
* Change 'xbase-clients | xmessage' dependency to 'x11-utils | xbase-clients
| xmessage'.
- -- Julien Cristau <jcristau@debian.org> Wed, 12 Mar 2008 15:24:45 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 22 May 2008 18:28:13 +0200
xdm (1:1.1.7-1) unstable; urgency=low
commit 616060b602ee4429c8fd574baca3b6a359fcd92b
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 22 18:28:04 2008 +0200
Change 'xbase-clients | xmessage' dependency to 'x11-utils | xbase-clients | xmessage'.
diff --git a/debian/changelog b/debian/changelog
index 912b725..5328e49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xdm (1:1.1.8-1) UNRELEASED; urgency=low
* Remove “-1” debian revision from Build-Depends (thanks to lintian).
* New upstream release.
+ doesn't pass the chooser socket to children (closes: #67086)
+ * Change 'xbase-clients | xmessage' dependency to 'x11-utils | xbase-clients
+ | xmessage'.
-- Julien Cristau <jcristau@debian.org> Wed, 12 Mar 2008 15:24:45 +0100
diff --git a/debian/control b/debian/control
index 71c2009..d9b4f7f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xdm.git
Package: xdm
Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, xbase-clients | xmessage, cpp, lsb-base (>= 3.0-6)
+Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, x11-utils | xbase-clients | xmessage, cpp, lsb-base (>= 3.0-6)
Pre-Depends: x11-common (>= 1:7.0.0)
Provides: x-display-manager
Suggests: sessreg | xutils
commit 78c19b666f550b01b3fe053fc6b64c574bea06c4
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 22 17:02:45 2008 +0200
Don't try to install the lintian overrides, they are gone
diff --git a/debian/xdm.install b/debian/xdm.install
index ae3272c..b6b967c 100644
--- a/debian/xdm.install
+++ b/debian/xdm.install
@@ -15,6 +15,5 @@ usr/share/X11/xdm/pixmaps/debianbw.xpm
usr/share/X11/xdm/pixmaps/debian.xpm
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.1
usr/share/man/man5/xdm.options.5
commit 43e113486427c80dd16858999af84346c364a339
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 22 17:02:00 2008 +0200
Update changelogs
diff --git a/ChangeLog b/ChangeLog
index 90f673b..01730fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+commit c9cdec25130bc957b584ec15187e068f9c08862d
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed May 21 14:24:58 2008 -0400
+
+ xdm 1.1.8
+
+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.
+
+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>
+
+commit b4ac133b92e08a34054d0af9481ab59b03571818
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Apr 20 19:32:12 2008 +0200
+
+ Fix build with builddir != srcdir
+
+commit 1b14e9391500d06dd0b61967db8099c3cf27f90c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Thu Mar 27 19:57:08 2008 -0700
+
+ Build fix for case-insensitive file systems
+
+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
+
+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'.
+
+commit f2f2eed7c284ced3ddc3fe3451ec7a8af9dfdbb4
+Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
+Date: Sat Mar 8 22:21:57 2008 +0100
+
+ README: nuke RCS Id
+
commit 576861d7e6158790e18ae79b8d566919b88d0cae
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 7 17:12:33 2008 -0500
diff --git a/debian/changelog b/debian/changelog
index fde742a..912b725 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-xdm (1:1.1.7-2) UNRELEASED; urgency=low
+xdm (1:1.1.8-1) UNRELEASED; urgency=low
* Drop lintian overrides, they're unused anyway.
* Remove “-1” debian revision from Build-Depends (thanks to lintian).
+ * New upstream release.
+ + doesn't pass the chooser socket to children (closes: #67086)
-- Julien Cristau <jcristau@debian.org> Wed, 12 Mar 2008 15:24:45 +0100
commit 8b0f1b4a3940b8695fc2b68249241f30a2c8c226
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 22 16:59:35 2008 +0200
autoreconf
diff --git a/Makefile.in b/Makefile.in
index 28add58..a839170 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -332,8 +332,6 @@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
-
-# App default files (*.ad)
appdefaultdir = @appdefaultdir@
bindir = @bindir@
build = @build@
@@ -447,7 +445,10 @@ chooser_LDADD = $(CHOOSER_LIBS)
chooser_SOURCES = \
chooser.c
-APPDEFAULTFILES = Chooser
+
+# App default files (*.ad)
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
+APPDEFAULTFILES = app-defaults/Chooser
appdefault_DATA = $(APPDEFAULTFILES)
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
@@ -1505,6 +1506,7 @@ uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \
$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
.ad:
+ [ -d app-defaults ] || mkdir app-defaults
cp $< $@
@LINT_TRUE@lint:
diff --git a/aclocal.m4 b/aclocal.m4
index a1d4a98..1c67121 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -7437,6 +7437,12 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
#include <sys/socket.h>
#include <netinet/in.h>
])
+
+ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
+ AC_CHECK_TYPES([socklen_t], [], [], [
+AC_INCLUDES_DEFAULT
+#include <sys/socket.h>])
+
]) # XTRANS_TCP_FLAGS
# XTRANS_CONNECTION_FLAGS()
@@ -7446,17 +7452,21 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([AC_TYPE_SIGNAL])
+ [case $host_os in
+ mingw*) unixdef="no" ;;
+ *) unixdef="yes" ;;
+ esac]
AC_ARG_ENABLE(unix-transport,
AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]),
- [UNIXCONN=$enableval], [UNIXCONN=yes])
- AC_ARG_ENABLE(tcp-transport,
- AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
- [TCPCONN=$enableval], [TCPCONN=yes])
+ [UNIXCONN=$enableval], [UNIXCONN=$unixdef])
AC_MSG_CHECKING([if Xtrans should support UNIX socket connections])
if test "$UNIXCONN" = "yes"; then
AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
fi
AC_MSG_RESULT($UNIXCONN)
+ AC_ARG_ENABLE(tcp-transport,
+ AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
+ [TCPCONN=$enableval], [TCPCONN=yes])
AC_MSG_CHECKING([if Xtrans should support TCP socket connections])
AC_MSG_RESULT($TCPCONN)
if test "$TCPCONN" = "yes"; then
diff --git a/config.h.in b/config.h.in
index e146029..e110cb5 100644
--- a/config.h.in
+++ b/config.h.in
@@ -84,6 +84,9 @@
/* Define to 1 if you have the `sigaction' function. */
#undef HAVE_SIGACTION
+/* Define to 1 if the system has the type `socklen_t'. */
+#undef HAVE_SOCKLEN_T
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
diff --git a/configure b/configure
index 189378b..e196be1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xdm 1.1.7.
+# Generated by GNU Autoconf 2.61 for xdm 1.1.8.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xdm'
PACKAGE_TARNAME='xdm'
-PACKAGE_VERSION='1.1.7'
-PACKAGE_STRING='xdm 1.1.7'
+PACKAGE_VERSION='1.1.8'
+PACKAGE_STRING='xdm 1.1.8'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1510,7 +1510,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xdm 1.1.7 to adapt to many kinds of systems.
+\`configure' configures xdm 1.1.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1580,7 +1580,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xdm 1.1.7:";;
+ short | recursive ) echo "Configuration of xdm 1.1.8:";;
esac
cat <<\_ACEOF
@@ -1658,6 +1658,9 @@ Optional Packages:
--with-default-session=command
Use command for default session (default:
bindir/xterm -ls)
+ --with-appdefaultdir=<pathname>
+ specify directory for app-defaults files (default is
+ autodetected)
--with-lint Use a lint-style source code checker (default:
disabled)
--with-release-version=STRING
@@ -1773,7 +1776,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xdm configure 1.1.7
+xdm configure 1.1.8
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1787,7 +1790,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xdm $as_me 1.1.7, which was
+It was created by xdm $as_me 1.1.8, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2477,7 +2480,7 @@ fi
# Define the identity of the package.
PACKAGE='xdm'
- VERSION='1.1.7'
+ VERSION='1.1.8'
cat >>confdefs.h <<_ACEOF
@@ -4743,7 +4746,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4746 "configure"' > conftest.$ac_ext
+ echo '#line 4749 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8090,11 +8093,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8093: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8096: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8097: \$? = $ac_status" >&5
+ echo "$as_me:8100: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8380,11 +8383,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8383: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8386: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8387: \$? = $ac_status" >&5
+ echo "$as_me:8390: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8484,11 +8487,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8487: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8490: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8491: \$? = $ac_status" >&5
+ echo "$as_me:8494: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10861,7 +10864,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10864 "configure"
+#line 10867 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10961,7 +10964,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10964 "configure"
+#line 10967 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13362,11 +13365,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13365: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13368: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13369: \$? = $ac_status" >&5
+ echo "$as_me:13372: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13466,11 +13469,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13469: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13472: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13473: \$? = $ac_status" >&5
+ echo "$as_me:13476: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15064,11 +15067,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15067: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15070: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15071: \$? = $ac_status" >&5
+ echo "$as_me:15074: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15168,11 +15171,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15171: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15174: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15175: \$? = $ac_status" >&5
+ echo "$as_me:15178: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17388,11 +17391,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17391: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17394: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17395: \$? = $ac_status" >&5
+ echo "$as_me:17398: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17678,11 +17681,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17681: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17684: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17685: \$? = $ac_status" >&5
+ echo "$as_me:17688: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17782,11 +17785,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17785: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17788: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17789: \$? = $ac_status" >&5
+ echo "$as_me:17792: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -22146,18 +22149,15 @@ _ACEOF
+ case $host_os in
+ mingw*) unixdef="no" ;;
+ *) unixdef="yes" ;;
+ esac
# Check whether --enable-unix-transport was given.
if test "${enable_unix_transport+set}" = set; then
enableval=$enable_unix_transport; UNIXCONN=$enableval
else
- UNIXCONN=yes
-fi
-
- # Check whether --enable-tcp-transport was given.
-if test "${enable_tcp_transport+set}" = set; then
- enableval=$enable_tcp_transport; TCPCONN=$enableval
-else
- TCPCONN=yes
+ UNIXCONN=$unixdef
fi
{ echo "$as_me:$LINENO: checking if Xtrans should support UNIX socket connections" >&5
@@ -22171,6 +22171,13 @@ _ACEOF
fi
{ echo "$as_me:$LINENO: result: $UNIXCONN" >&5
echo "${ECHO_T}$UNIXCONN" >&6; }
+ # Check whether --enable-tcp-transport was given.
+if test "${enable_tcp_transport+set}" = set; then
+ enableval=$enable_tcp_transport; TCPCONN=$enableval
+else
+ TCPCONN=yes
+fi
+
{ echo "$as_me:$LINENO: checking if Xtrans should support TCP socket connections" >&5
echo $ECHO_N "checking if Xtrans should support TCP socket connections... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: result: $TCPCONN" >&5
@@ -22569,6 +22576,74 @@ _ACEOF
fi
+ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
+ { echo "$as_me:$LINENO: checking for socklen_t" >&5
+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_socklen_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+$ac_includes_default
+#include <sys/socket.h>
+
+typedef socklen_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_socklen_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_socklen_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
+echo "${ECHO_T}$ac_cv_type_socklen_t" >&6; }
+if test $ac_cv_type_socklen_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SOCKLEN_T 1
+_ACEOF
+
+
+fi
+
+
+
fi
case $host_os in
solaris*|sco*|sysv4*) localdef="yes" ;;
@@ -25695,7 +25770,16 @@ else
echo "${ECHO_T}yes" >&6; }
:
fi
-appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+
+# Check whether --with-appdefaultdir was given.
+if test "${with_appdefaultdir+set}" = set; then
+ withval=$with_appdefaultdir; appdefaultdir="$withval"
+else
+ appdefaultdir="${xt_appdefaultdir}"
+fi
+
+
@@ -26339,7 +26423,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xdm $as_me 1.1.7, which was
+This file was extended by xdm $as_me 1.1.8, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26392,7 +26476,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xdm config.status 1.1.7
+xdm config.status 1.1.8
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/ltmain.sh b/ltmain.sh
index 5def351..0bf3848 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-1"
+VERSION="1.5.26 Debian 1.5.26-4"
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
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 c87ea43906787791a87a659c0a9d6312945ffb32
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 13 03:12:18 2008 +0200
Remove xsfbs-autoreconf.mk
It has never been used, and that doesn't look likely to change.
diff --git a/debian/xsfbs/xsfbs-autoreconf.mk b/debian/xsfbs/xsfbs-autoreconf.mk
deleted file mode 100644
index dce8fc8..0000000
--- a/debian/xsfbs/xsfbs-autoreconf.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/make -f
-# $Id$
-
-# Automagical conversion of autoreconf results into quilt patches.
-
-# Copyright 2006 Eugene Konev
-#
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-# The idea behind this is storing changes produced by autoreconf as a
-# separate patch on quilt stack (on top of stack actually).
-# The only usable target here is 'autoreconf`. Other targets are not
-# supposed to be called directly. DO NOT invoke them, unless you know what
-# you are doing.
-# The autoreconf target will check if files with names in $(RECONF_CHECKFILES)
-# were changed during patching (from upstream version or from previously
-# autoreconfed version) and call actual autoreconfing if they were.
-# The actual autoreconfing target (doautoreconf) WILL FAIL after
-# calling autoreconf and pushing changes into quilt stack by design. It
-# should never be invoked by automatic build process.
-# The proposed use is adding autoreconf into clean's prerequisites before
-# xsfclean like:
-# - clean: xsfclean
-# + clean: autoreconf xsfclean
-# This will ensure it is called when you build package with dpkg-buildpackage.
-
-# This dir will be used for producing diff of autoreconfed tree
-RECONF_DIR := xsfautoreconf
-
-# This files will be checked for changes
-RECONF_CHECKFILES += configure.ac Makefile.am
-
-# This files will not be hardlinked but copied
-RECONF_NOLINKFILES += aclocal.m4
-
-# This files/dirs will be pruned after autoreconf run
-RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~
-
-# Internal target. Never invoke directly.
-stampdir_target+=check.md5sum
-$(STAMP_DIR)/check.md5sum:
- dh_testdir
- $(MAKE) -f debian/rules prepare
- for F in $(RECONF_CHECKFILES); do \
- find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \
- LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \
- done
-
-# Internal target. Never invoke directly.
-$(STAMP_DIR)/clean.md5sum:
- dh_testdir
- $(MAKE) -f debian/rules unpatch
- rm -f $(STAMP_DIR)/check.md5sum
- $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
- mv $(STAMP_DIR)/check.md5sum $@
-
-# Internal target. Never invoke directly.
-debian/patches/patched.md5sum:
- dh_testdir
- [ -f $(STAMP_DIR)/clean.md5sum ] || \
- $(MAKE) -f debian/rules $(STAMP_DIR)/clean.md5sum
-
- $(MAKE) -f debian/rules patch
- rm -f $(STAMP_DIR)/check.md5sum
- $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
- if ! diff $(STAMP_DIR)/clean.md5sum \
- $(STAMP_DIR)/check.md5sum > /dev/null; then \
- $(MAKE) -f debian/rules doautoreconf; \
- else \
- mv $(STAMP_DIR)/check.md5sum $@; \
- fi
-
-# Internal target. Never invoke directly.
-,PHONY: doautoreconf
-doautoreconf: patch
- quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1 || true
- if quilt applied | grep ^autoreconf.diff$$ > /dev/null; then \
- quilt pop -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt rename -p autoreconf.diff autoreconf-old.diff \
- >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt delete autoreconf-old.diff >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- fi
-
- if [ -e $(RECONF_DIR) ]; then \
- echo "ERROR: $(RECONF_DIR) already exists. Cleanup by hand"; \
- exit 1; \
- fi
-
- mkdir -p $(RECONF_DIR)/before
- find . -maxdepth 1 -mindepth 1 ! -wholename ./$(RECONF_DIR) \
- -a ! -wholename ./debian -a ! -wholename ./patches \
- -a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \
- xargs -i{} cp -al {} $(RECONF_DIR)/before/
-
- for F in $(RECONF_PRUNEFILES); do \
- find $(RECONF_DIR)/before -name $$F -print | \
- xargs --no-run-if-empty rm -r; \
- done
-
- cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after
-
- for F in $(RECONF_NOLINKFILES); do \
- find . -wholename ./$(RECONF_DIR) -prune -o -wholename ./debian \
- -prune -o -wholename ./$(STAMP_DIR) -prune -o -name $$F \
- -print | \
- xargs --no-run-if-empty -i{} cp --remove-destination {} \
- $(RECONF_DIR)/after/{}; \
- done
-
- cd $(RECONF_DIR)/after && autoreconf -v --install && \
- for F in $(RECONF_PRUNEFILES); do \
- find . -name $$F -print | \
- xargs --no-run-if-empty rm -r; \
- done
-
- cd $(RECONF_DIR) && diff -Nru before after > autoreconf.diff || true
-
- quilt import $(RECONF_DIR)/autoreconf.diff \
- >>$(STAMP_DIR)/log/autoreconf 2>&1
-
- mv $(STAMP_DIR)/check.md5sum debian/patches/patched.md5sum
-
- rm -r $(RECONF_DIR) && rm -f patches/autoreconf-old.diff
-
- @echo
- @echo "****************************************************************"
- @echo " This target is made to fail INTENTIONALLY. It should NEVER "
- @echo " be invoked during automatic builds. "
- @echo
- @echo " This target was invoked because you added/removed/changed "
- @echo " patches which modify either configure.ac or Makefile.am and, "
- @echo " thus, require autoreconf run. And all autoreconfing should "
- @echo " happen before uploading. "
- @echo
- @echo " (See also debian/xsfbs/xsfbs-autoreconf.mk) "
- @echo
- @echo " If you see this message, autoreconfing actually SUCCEEDED, "
- @echo " and your build should finish successfully, when rerun. "
- @echo "****************************************************************"
- @echo
- exit 1;
-
-.PHONY: autoreconf
-autoreconf: debian/patches/patched.md5sum patch $(STAMP_DIR)/check.md5sum
- if ! diff $(STAMP_DIR)/check.md5sum \
- debian/patches/patched.md5sum > /dev/null; then \
- $(MAKE) -f debian/rules doautoreconf; \
- fi
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 51fa145..6582a42 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -307,6 +307,4 @@ else
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
endif
-include debian/xsfbs/xsfbs-autoreconf.mk
-
# vim:set noet ai sts=8 sw=8 tw=0:
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\
Reply to: