xdm: Changes to 'debian-unstable'
.gitignore | 14
AUTHORS | 2
COPYING | 5
ChangeLog | 1114 ++++++++++++++++++
Makefile.am | 183 ---
access.c | 991 ----------------
app-defaults/.gitignore | 2
app-defaults/Chooser | 51
app-defaults/Chooser.ad | 51
app-defaults/Makefile.am | 1
auth.c | 1556 --------------------------
choose.c | 545 ---------
chooser.c | 1381 -----------------------
chooser/.gitignore | 1
chooser/Makefile.am | 16
chooser/chooser.c | 1381 +++++++++++++++++++++++
config/Makefile.am | 2
config/Xaccess | 4
config/Xresources.cpp | 8
config/Xsession.cpp | 6
config/xdm-config.cpp | 2
configure.ac | 441 +++----
cpprules.in | 9
daemon.c | 90 -
debian/changelog | 22
debian/control | 3
debian/patches/06_hurd_utsname.diff | 8
debian/patches/20_xdm_log_timestamp.diff | 8
debian/patches/21_xdm_log_append.diff | 10
debian/patches/debian.diff | 12
debian/patches/doc_mention_xdm.options.diff | 10
debian/patches/greeter-xrender.diff | 49
debian/patches/series | 3
debian/patches/support_logfile_rotation.diff | 44
debian/rules | 27
debian/xdm.install | 1
dm.c | 1037 -----------------
dm.h | 516 --------
dm_auth.h | 99 -
dm_error.h | 52
dm_socket.h | 45
dpylist.c | 266 ----
error.c | 138 --
file.c | 250 ----
genauth.c | 481 --------
greet.h | 218 ---
greeter/Login.c | 132 +-
greeter/Login.h | 4
greeter/LoginP.h | 26
greeter/Makefile.am | 7
greeter/greet.c | 95 -
greeter/verify.c | 22
include/Makefile.am | 6
include/dm.h | 518 ++++++++
include/dm_auth.h | 99 +
include/dm_error.h | 46
include/dm_socket.h | 45
include/greet.h | 218 +++
krb5auth.c | 258 ----
m4/ac_define_dir.m4 | 45
m4/ax_define_dir.m4 | 49
man/Makefile.am | 55
man/xdm.man | 1466 ++++++++++++++++++++++++
man/xdmshell.man | 108 +
mitauth.c | 93 -
netaddr.c | 272 ----
policy.c | 208 ---
prngc.c | 190 ---
protodpy.c | 164 --
reset.c | 113 -
resource.c | 509 --------
rpcauth.c | 89 -
server.c | 406 ------
session.c | 1048 -----------------
socket.c | 558 ---------
streams.c | 167 --
util.c | 310 -----
xdm.man.cpp | 1451 ------------------------
xdm.service.in | 9
xdm/.gitignore | 1
xdm/Makefile.am | 79 +
xdm/access.c | 986 ++++++++++++++++
xdm/auth.c | 1554 ++++++++++++++++++++++++++
xdm/choose.c | 544 +++++++++
xdm/daemon.c | 90 +
xdm/dm.c | 1058 +++++++++++++++++
xdm/dpylist.c | 266 ++++
xdm/error.c | 136 ++
xdm/file.c | 249 ++++
xdm/genauth.c | 481 ++++++++
xdm/krb5auth.c | 256 ++++
xdm/mitauth.c | 93 +
xdm/netaddr.c | 272 ++++
xdm/policy.c | 208 +++
xdm/prngc.c | 190 +++
xdm/protodpy.c | 164 ++
xdm/reset.c | 113 +
xdm/resource.c | 511 ++++++++
xdm/rpcauth.c | 89 +
xdm/server.c | 405 ++++++
xdm/session.c | 1038 +++++++++++++++++
xdm/socket.c | 557 +++++++++
xdm/streams.c | 167 ++
xdm/util.c | 310 +++++
xdm/xdmauth.c | 284 ++++
xdm/xdmcp.c | 1601 +++++++++++++++++++++++++++
xdmauth.c | 286 ----
xdmcp.c | 1601 ---------------------------
xdmshell.c | 161 --
xdmshell/.gitignore | 1
xdmshell/Makefile.am | 23
xdmshell/xdmshell.c | 160 ++
112 files changed, 17598 insertions(+), 16277 deletions(-)
New commits:
commit d9984d14a4f1fcba2d20014e8bdef8b8ecf3c3af
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 22 17:44:59 2011 +0200
Disable silent rules.
diff --git a/debian/changelog b/debian/changelog
index 131d3a2..2a10efe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ xdm (1:1.1.11-1) UNRELEASED; urgency=low
configure.
* Add patch to link the greeter against -lXrender.
* Use dpkg-buildflags and enable pie and bindnow hardening.
+ * Disable silent rules.
-- Julien Cristau <jcristau@debian.org> Sat, 22 Oct 2011 16:30:18 +0200
diff --git a/debian/rules b/debian/rules
index 65e1c87..59da5d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,9 @@ confflags += \
--with-color-pixmap=debian.xpm \
--with-bw-pixmap=debianbw.xpm \
--disable-xdm-auth \
- --with-xft
+ --with-xft \
+ --disable-silent-rules \
+ $(NULL)
configure_vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie,+bindnow" DEB_CFLAGS_MAINT_APPEND="-Wall" dpkg-buildflags --export=configure)
commit 59ff3371dc64d09f70107ab60ac23c34cdc2fb95
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 22 17:44:00 2011 +0200
Use dpkg-buildflags and enable pie and bindnow hardening.
diff --git a/debian/changelog b/debian/changelog
index e490ac1..131d3a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ xdm (1:1.1.11-1) UNRELEASED; urgency=low
libXdmGreeter.so and don't pass the --disable-dynamic-greeter option to
configure.
* Add patch to link the greeter against -lXrender.
+ * Use dpkg-buildflags and enable pie and bindnow hardening.
-- Julien Cristau <jcristau@debian.org> Sat, 22 Oct 2011 16:30:18 +0200
diff --git a/debian/control b/debian/control
index b5e6917..cc95297 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
+ dpkg-dev (>= 1.16.1),
pkg-config,
libxmu-dev (>= 1:1.0.1),
libx11-dev (>= 2:1.0.0),
@@ -17,7 +18,7 @@ Build-Depends:
quilt,
automake,
libtool,
- xutils-dev
+ xutils-dev,
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xdm
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xdm.git
diff --git a/debian/rules b/debian/rules
index 2003eb9..65e1c87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,12 +27,8 @@ confflags += \
--disable-xdm-auth \
--with-xft
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+configure_vars = $(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie,+bindnow" DEB_CFLAGS_MAINT_APPEND="-Wall" dpkg-buildflags --export=configure)
+
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -74,7 +70,7 @@ $(STAMP_DIR)/build: $(STAMP_DIR)/prepare $(STAMP_DIR)/config
cd $(BUILD_DIR) && \
../configure \
$(confflags) \
- CFLAGS="$(CFLAGS)" \
+ $(configure_vars) \
APP_MAN_SUFFIX=1 \
DEF_USER_PATH="/usr/local/bin:/usr/bin:/bin:/usr/games" \
DEF_SYSTEM_PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
commit 0affbd351ef48fa46f44924897893388ba75abda
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 22 17:34:27 2011 +0200
Move configure flags around
diff --git a/debian/rules b/debian/rules
index 0ad850e..2003eb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,11 @@ PACKAGE = xdm
include debian/xsfbs/xsfbs.mk
-confflags += --with-pam \
+confflags += \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --with-pam \
--with-xdmconfigdir=/etc/X11/xdm \
--with-xdmscriptdir=\$${xdmconfigdir} \
--with-authdir=/var/lib/xdm \
@@ -68,11 +72,10 @@ $(STAMP_DIR)/build: $(STAMP_DIR)/prepare $(STAMP_DIR)/config
dh_testdir
mkdir -p $(BUILD_DIR)
cd $(BUILD_DIR) && \
- ../configure --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
+ ../configure \
$(confflags) \
- CFLAGS="$(CFLAGS)" APP_MAN_SUFFIX=1 \
+ CFLAGS="$(CFLAGS)" \
+ APP_MAN_SUFFIX=1 \
DEF_USER_PATH="/usr/local/bin:/usr/bin:/bin:/usr/games" \
DEF_SYSTEM_PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
cd $(BUILD_DIR) && $(MAKE)
commit d6887ceb7d1296f3f87155c7bc5e30391d5e4296
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 22 17:29:21 2011 +0200
Add patch to link the greeter against -lXrender.
diff --git a/debian/changelog b/debian/changelog
index 039cccc..e490ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ xdm (1:1.1.11-1) UNRELEASED; urgency=low
* Upstream dropped the option to link the greeter statically, so install
libXdmGreeter.so and don't pass the --disable-dynamic-greeter option to
configure.
+ * Add patch to link the greeter against -lXrender.
-- Julien Cristau <jcristau@debian.org> Sat, 22 Oct 2011 16:30:18 +0200
diff --git a/debian/patches/greeter-xrender.diff b/debian/patches/greeter-xrender.diff
new file mode 100644
index 0000000..964bec3
--- /dev/null
+++ b/debian/patches/greeter-xrender.diff
@@ -0,0 +1,49 @@
+From 5c672dcc9f0437f7669c24996f64176265da2eb8 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Sat, 22 Oct 2011 17:14:46 +0200
+Subject: [PATCH xdm] greeter: link against -lXrender if xft is enabled
+
+XmuCvtStringToXftColor uses XRenderParseColor, so require xrender for
+the xft option, and link against it.
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ configure.ac | 4 ++--
+ greeter/Login.c | 4 ++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fcb37f8..d20ae28 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -345,10 +345,10 @@ AC_ARG_WITH(xft,
+ AS_HELP_STRING([--with-xft],
+ [Use Xft to draw text (default is YES if installed)]),
+ [USE_XFT="$withval"],
+- PKG_CHECK_EXISTS(xft, [USE_XFT="yes"], [USE_XFT="no"]))
++ PKG_CHECK_EXISTS(xft xrender, [USE_XFT="yes"], [USE_XFT="no"]))
+
+ if test "x$USE_XFT" = "xyes" ; then
+- PKG_CHECK_MODULES(XFT, xft)
++ PKG_CHECK_MODULES(XFT, xft xrender)
+ GREETER_CFLAGS="$GREETER_CFLAGS $XFT_CFLAGS"
+ GREETER_LIBS="$GREETER_LIBS $XFT_LIBS"
+ AC_DEFINE([USE_XFT], 1,
+diff --git a/greeter/Login.c b/greeter/Login.c
+index 99a3932..d899376 100644
+--- a/greeter/Login.c
++++ b/greeter/Login.c
+@@ -86,6 +86,10 @@ from The Open Group.
+ # include <X11/extensions/Xinerama.h>
+ #endif
+
++#ifdef USE_XFT
++# include <X11/extensions/Xrender.h>
++#endif
++
+ #ifndef DEBUG
+ # define XDM_ASSERT(a) /* do nothing */
+ #else
+--
+1.7.6.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 15eddf7..854f2c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
+# sent to xorg-devel
+greeter-xrender.diff
+
# this one might need some ifdefs
06_hurd_utsname.diff
commit 33c4c8d80095ea0914b34b84b1d7ce3158c50253
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 22 17:10:29 2011 +0200
Cope with the dynamic greeter
Upstream dropped the option to link the greeter statically, so install
libXdmGreeter.so and don't pass the --disable-dynamic-greeter option to
configure.
diff --git a/debian/changelog b/debian/changelog
index 15e71b8..039cccc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ xdm (1:1.1.11-1) UNRELEASED; urgency=low
21_xdm_log_append.diff, debian.diff, doc_mention_xdm.options.diff,
support_logfile_rotation.diff.
* Don't require fakeroot for debian/rules clean.
+ * Upstream dropped the option to link the greeter statically, so install
+ libXdmGreeter.so and don't pass the --disable-dynamic-greeter option to
+ configure.
-- Julien Cristau <jcristau@debian.org> Sat, 22 Oct 2011 16:30:18 +0200
diff --git a/debian/rules b/debian/rules
index 86d7f20..0ad850e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,6 @@ confflags += --with-pam \
--with-pixmapdir=/usr/share/X11/xdm/pixmaps \
--with-color-pixmap=debian.xpm \
--with-bw-pixmap=debianbw.xpm \
- --disable-dynamic-greeter \
--disable-xdm-auth \
--with-xft
diff --git a/debian/xdm.install b/debian/xdm.install
index 7481ddc..60ec165 100644
--- a/debian/xdm.install
+++ b/debian/xdm.install
@@ -12,6 +12,7 @@ etc/X11/xdm/xdm.options
etc/insserv.conf.d/xdm
usr/bin/xdm
usr/lib/X11/xdm/chooser
+usr/lib/X11/xdm/libXdmGreet.so
usr/share/X11/xdm/pixmaps/debianbw.xpm
usr/share/X11/xdm/pixmaps/debian.xpm
usr/share/X11/xdm/pixmaps/xorg-bw.xpm
commit 47c895920e09e081194b4fce75d0bdb7509c9f7f
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 22 16:58:28 2011 +0200
Don't require fakeroot for debian/rules clean.
diff --git a/debian/changelog b/debian/changelog
index cc1dd7f..15e71b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ xdm (1:1.1.11-1) UNRELEASED; urgency=low
* Update patches 06_hurd_utsname.diff, 20_xdm_log_timestamp.diff,
21_xdm_log_append.diff, debian.diff, doc_mention_xdm.options.diff,
support_logfile_rotation.diff.
+ * Don't require fakeroot for debian/rules clean.
-- Julien Cristau <jcristau@debian.org> Sat, 22 Oct 2011 16:30:18 +0200
diff --git a/debian/rules b/debian/rules
index 57b33e8..86d7f20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -112,7 +112,6 @@ $(STAMP_DIR)/install: $(STAMP_DIR)/build $(STAMP_DIR)/genscripts
clean: xsfclean
dh_testdir
- dh_testroot
rm -rf $(BUILD_DIR)
rm -f aclocal.m4 compile config.guess config.sub config.h.in configure
rm -f depcomp install-sh ltmain.sh missing INSTALL
commit 40d0db68bcd0cd88c1ca04e3438361ba49313101
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 22 16:58:12 2011 +0200
Update patch stack
Update patches 06_hurd_utsname.diff, 20_xdm_log_timestamp.diff,
21_xdm_log_append.diff, debian.diff, doc_mention_xdm.options.diff,
support_logfile_rotation.diff.
diff --git a/debian/changelog b/debian/changelog
index bb4f2ce..cc1dd7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ xdm (1:1.1.11-1) UNRELEASED; urgency=low
+ greeter: Add echoPasswdChar resource to set character to display
(closes: #575486)
+ Fix linking with gold (closes: #556694)
+ * Update patches 06_hurd_utsname.diff, 20_xdm_log_timestamp.diff,
+ 21_xdm_log_append.diff, debian.diff, doc_mention_xdm.options.diff,
+ support_logfile_rotation.diff.
-- Julien Cristau <jcristau@debian.org> Sat, 22 Oct 2011 16:30:18 +0200
diff --git a/debian/patches/06_hurd_utsname.diff b/debian/patches/06_hurd_utsname.diff
index 375d2b2..c1a9acf 100644
--- a/debian/patches/06_hurd_utsname.diff
+++ b/debian/patches/06_hurd_utsname.diff
@@ -1,11 +1,11 @@
---
- auth.c | 2 --
+ xdm/auth.c | 2 --
1 file changed, 2 deletions(-)
-Index: xdm/auth.c
+Index: a/xdm/auth.c
===================================================================
---- xdm.orig/auth.c
-+++ xdm/auth.c
+--- a/xdm/auth.c
++++ b/xdm/auth.c
@@ -56,9 +56,7 @@
# include <netdnet/dnetdb.h>
#endif
diff --git a/debian/patches/20_xdm_log_timestamp.diff b/debian/patches/20_xdm_log_timestamp.diff
index f109c5a..40951b2 100644
--- a/debian/patches/20_xdm_log_timestamp.diff
+++ b/debian/patches/20_xdm_log_timestamp.diff
@@ -5,13 +5,13 @@ Subject: [PATCH] Add timestamping to logging functions
Based on patch by Branden Robinson <branden@debian.org>
---
- error.c | 20 +++++++++++++++++---
+ xdm/error.c | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
-Index: xdm/error.c
+Index: a/xdm/error.c
===================================================================
---- xdm.orig/error.c
-+++ xdm/error.c
+--- a/xdm/error.c
++++ b/xdm/error.c
@@ -64,9 +64,6 @@
va_end(args); \
} while(0)
diff --git a/debian/patches/21_xdm_log_append.diff b/debian/patches/21_xdm_log_append.diff
index 78f21fe..8d2ea55 100644
--- a/debian/patches/21_xdm_log_append.diff
+++ b/debian/patches/21_xdm_log_append.diff
@@ -3,11 +3,11 @@ Subject: Append to the log file instead of truncating it
Based on patch by Branden Robinson <branden@debian.org>
-Index: xdm/error.c
+Index: xdm/xdm/error.c
===================================================================
---- xdm.orig/error.c
-+++ xdm/error.c
-@@ -38,6 +38,7 @@
+--- xdm.orig/xdm/error.c
++++ xdm/xdm/error.c
+@@ -38,6 +38,7 @@ from The Open Group.
#include <stdio.h>
#include <stdarg.h>
@@ -15,7 +15,7 @@ Index: xdm/error.c
#include "dm.h"
#include "dm_error.h"
-@@ -140,13 +141,13 @@
+@@ -138,13 +139,13 @@ InitErrorLog (void)
{
int i;
if (errorLogFile[0]) {
diff --git a/debian/patches/debian.diff b/debian/patches/debian.diff
index f891c3f..da1cf81 100644
--- a/debian/patches/debian.diff
+++ b/debian/patches/debian.diff
@@ -18,7 +18,7 @@ Index: xdm/config/Xservers.ws.cpp
===================================================================
--- xdm.orig/config/Xservers.ws.cpp
+++ xdm/config/Xservers.ws.cpp
-@@ -9,4 +9,26 @@
+@@ -9,4 +9,26 @@ XCOMM you can add them here as well. Ea
XCOMM look like:
XCOMM XTerminalName:0 foreign
XCOMM
@@ -63,14 +63,14 @@ Index: xdm/config/Xsession.cpp
-else
-#ifdef MKTEMP_COMMAND
- mktemp=MKTEMP_COMMAND
-- for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+- for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
- do
- if ef="$( umask 077 && $mktemp "$errfile.XXXXXX" 2> /dev/null)"
- then
- exec > "$ef" 2>&1
- mv "$ef" "$errfile" 2> /dev/null
-- break
-- fi
+- break
+- fi
- done
-#else
-XCOMM Since this system doesn't have a mktemp command to allow secure
@@ -141,9 +141,9 @@ Index: xdm/config/xdm-config.cpp
===================================================================
--- xdm.orig/config/xdm-config.cpp
+++ xdm/config/xdm-config.cpp
-@@ -18,19 +18,16 @@
+@@ -18,19 +18,16 @@ DisplayManager.accessFile: XDMCONFIGDIR/
DisplayManager*resources: XDMCONFIGDIR/Xresources
- DisplayManager.willing: SU nobody -c XDMSCRIPTDIR/Xwilling
+ DisplayManager.willing: SU nobody -s /bin/sh -c XDMSCRIPTDIR/Xwilling
! All displays should use authorization, but we cannot be sure
-! X terminals may not be configured that way, so they will require
-! individual resource settings.
diff --git a/debian/patches/doc_mention_xdm.options.diff b/debian/patches/doc_mention_xdm.options.diff
index 8d4e59f..04a3828 100644
--- a/debian/patches/doc_mention_xdm.options.diff
+++ b/debian/patches/doc_mention_xdm.options.diff
@@ -1,11 +1,11 @@
-Index: xdm/xdm.man.cpp
+Index: xdm/man/xdm.man
===================================================================
---- xdm.orig/xdm.man.cpp
-+++ xdm/xdm.man.cpp
-@@ -1473,7 +1473,8 @@
+--- xdm.orig/man/xdm.man
++++ xdm/man/xdm.man
+@@ -1488,7 +1488,8 @@ Kerberos credentials cache
.IR Xserver (__appmansuffix__),
.\" .IR chooser (__appmansuffix__), \" except that there isn't a manual for it yet
- .\" .IR xdmshell (__appmansuffix__), \" except that there isn't a manual for it yet
+ .IR xdmshell (__appmansuffix__),
-.IR fonts.conf (__filemansuffix__).
+.IR fonts.conf (__filemansuffix__),
+.IR xdm.options (__filemansuffix__).
diff --git a/debian/patches/support_logfile_rotation.diff b/debian/patches/support_logfile_rotation.diff
index 51cf119..9ce9da2 100644
--- a/debian/patches/support_logfile_rotation.diff
+++ b/debian/patches/support_logfile_rotation.diff
@@ -9,11 +9,11 @@ Subject: add support for logfile rotation
Forward-ported by Eugene Konev and Julien Cristau.
-Index: xdm/dm.c
+Index: xdm/xdm/dm.c
===================================================================
---- xdm.orig/dm.c
-+++ xdm/dm.c
-@@ -90,8 +90,10 @@
+--- xdm.orig/xdm/dm.c
++++ xdm/xdm/dm.c
+@@ -90,8 +90,10 @@ from The Open Group.
extern FILE *fdopen();
#endif
@@ -25,7 +25,7 @@ Index: xdm/dm.c
static void RestartDisplay (struct display *d, int forceReserver);
static void ScanServers (void);
static void SetAccessFileTime (void);
-@@ -100,6 +102,7 @@
+@@ -100,6 +102,7 @@ static void StartDisplays (void);
static void TerminateProcess (pid_t pid, int signal);
volatile int Rescan;
@@ -33,7 +33,7 @@ Index: xdm/dm.c
static long ServersModTime, ConfigModTime, AccessFileModTime;
int nofork_session = 0;
-@@ -209,6 +212,7 @@
+@@ -209,6 +212,7 @@ main (int argc, char **argv)
AddOtherEntropy();
#endif
(void) Signal (SIGHUP, RescanNotify);
@@ -41,7 +41,7 @@ Index: xdm/dm.c
#ifndef UNRELIABLE_SIGNALS
(void) Signal (SIGCHLD, ChildNotify);
#endif
-@@ -219,6 +223,11 @@
+@@ -219,6 +223,11 @@ main (int argc, char **argv)
#endif
AnyDisplaysLeft ())
{
@@ -53,7 +53,7 @@ Index: xdm/dm.c
if (Rescan)
{
RescanServers ();
-@@ -243,6 +252,7 @@
+@@ -243,6 +252,7 @@ RescanNotify (int n)
int olderrno = errno;
Debug ("Caught SIGHUP\n");
@@ -61,7 +61,7 @@ Index: xdm/dm.c
Rescan = 1;
#ifdef SIGNALS_RESET_WHEN_CAUGHT
(void) Signal (SIGHUP, RescanNotify);
-@@ -250,6 +260,26 @@
+@@ -250,6 +260,26 @@ RescanNotify (int n)
errno = olderrno;
}
@@ -88,7 +88,7 @@ Index: xdm/dm.c
static void
ScanServers (void)
{
-@@ -317,6 +347,14 @@
+@@ -317,6 +347,14 @@ RescanServers (void)
}
static void
@@ -103,24 +103,24 @@ Index: xdm/dm.c
SetConfigFileTime (void)
{
struct stat statb;
-Index: xdm/dm_error.h
+Index: xdm/include/dm_error.h
===================================================================
---- xdm.orig/dm_error.h
-+++ xdm/dm_error.h
-@@ -40,6 +40,8 @@
- # define GCC_PRINTFLIKE(fmt,var) /*nothing*/
- # endif
+--- xdm.orig/include/dm_error.h
++++ xdm/include/dm_error.h
+@@ -34,6 +34,8 @@ authorization.
+ #ifndef _DM_ERROR_H_
+ # define _DM_ERROR_H_ 1
+#define WRITES(fd, buf) write(fd, buf, strlen(buf))
+
- extern void Debug (const char * fmt, ...) GCC_PRINTFLIKE(1,2);
+ extern void Debug (const char * fmt, ...) _X_ATTRIBUTE_PRINTF(1,2);
extern void InitErrorLog (void);
- extern void LogAppend (const char * fmt, ...) GCC_PRINTFLIKE(1,2);
-Index: xdm/xdm.man.cpp
+ extern void LogAppend (const char * fmt, ...) _X_ATTRIBUTE_PRINTF(1,2);
+Index: xdm/man/xdm.man
===================================================================
---- xdm.orig/xdm.man.cpp
-+++ xdm/xdm.man.cpp
-@@ -1407,6 +1407,37 @@
+--- xdm.orig/man/xdm.man
++++ xdm/man/xdm.man
+@@ -1422,6 +1422,37 @@ isn't very good at doing is coexisting w
multiple window systems on the same hardware, you'll probably be more
interested in
.I xinit.
commit 6621e1f4b151c2806544d5b6bbfe1da5a208e913
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 22 16:42:15 2011 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 9af5a86..9409b11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,1117 @@
+commit 23949f9a4c30b5dfa67a88b3dd2523f09f163d91
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Sep 25 00:41:25 2011 -0700
+
+ configure.ac: Bump to 1.1.11
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 225493d3c6be64dafec69095f254a1bee6386e33
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Sep 20 17:39:34 2011 -0700
+
+ fix whitespace issues
+
+ Performed with:
+ find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
+ find * -type f | xargs perl -i -p -e 's{^[ ]+\t}{\t}'
+ git diff -w & git diff -b show no diffs from this change
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 8016dfd9080393c23d19b1c34e81d1f544655d5a
+Author: Matěj Cepl <mcepl@redhat.com>
+Date: Mon Aug 8 21:26:47 2011 +0200
+
+ Use explicitly /bin/sh for running of Xwilling script via su.
+
+ su nobody -c <command> uses a default shell of the user, which in case
+ of nobody is (at least on Linux distros) /sbin/nologin.
+
+ Signed-off-by: Matěj Cepl <mcepl@redhat.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewd-by: Mark Kettenis <kettenis@openbsd.org>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 0782f1c24c658c06736907dd143f8e67359ac235
+Author: Michał Górny <mgorny@gentoo.org>
+Date: Wed Aug 31 18:02:53 2011 +0200
+
+ Support installing systemd unit file.
+
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=38339
+ Signed-off-by: Michał Górny <mgorny@gentoo.org>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+ Tested-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 5574b79c2d6c89f96484b890872ba1594fb6ddd2
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jun 2 21:52:20 2011 -0700
+
+ Simplify FailedLogin code
+
+ Relies on username going out of scope to discard the pointer returned by
+ pam_get_item that pam_end frees at the bottom of the loop.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 29e9393697d0b7158c2c1e0856180713c7c8f925
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jun 2 21:39:16 2011 -0700
+
+ Stop using username retrieved from PAM before pam_end frees it.
+
+ The first time a failed login message was syslogged it had the right
+ username, but subsequent ones kept reusing that pointer, even though
+ PAM had freed it and it may have been reused and filled with something
+ else, resulting in garbage user names for the later login failures.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit eca379146cf487cbd05e1698ea12c1835327d1d4
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jun 2 20:46:57 2011 -0700
+
+ Add _X_ATTRIBUTE_PRINTF to LogVWrite declaration
+
+ Suggested by gcc -Wmissing-format-attribute
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 7b8a4bb753d9da4cde60379050493d811c9b3044
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jun 2 20:45:32 2011 -0700
+
+ Replace GCC_PRINTFLIKE with xproto's _X_ATTRIBUTE_PRINTF
+
+ The existing GCC_PRINTFLIKE declaration seems to have been broken, since
+ it only defined GCC_PRINTFLIKE if GCC_PRINTFLIKE was already defined.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 7843f1e00caba67025ac75c4985ddd3af7924a9c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jun 2 20:38:29 2011 -0700
+
+ Use C99 named initializers for XSetWindowAttributes structure
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 3c3f9cde9dda4c74178cc5428ebf8967c26a516a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jun 2 18:33:56 2011 -0700
+
+ Bug 13455: allowNullPasswd: true doesn't work until the second login attempt
+
+ Assign allow_null_passwd and allow_root_login variables' values before call to
+ pam_authenticate()
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=13455
+
+ Based on a fix suggested by: Tim Shumakov <ars_1@mail.ru>
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 7d69ff7b9dfcd3e4410f181225f66f51089eef67
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri May 27 22:46:09 2011 -0700
+
+ On Solaris, make sure PAM_TTY is only ever set to an actual /dev path
+
+ Solaris PAM & auditing insist this is a device file that can be found in
+ the filesystem, so we can't use the display name (":0") like we've
+ been doing (and continue to do on other OS'es).
+
+ Fixes Solaris bug 6960231:
+ xdm login fails with: pam_unix_cred: cannot load ttyname with c2audit loaded
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 68517be0c7ae67989bc3cd845c8aa79ef7040618
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue May 17 19:37:15 2011 -0700
+
+ xdm.man: address only needs 2 S's, not 3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit bd0acffc9e69c4ca39d0881984ae587ad4385934
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 14 10:08:25 2011 -0700
+
+ freeifaddrs() when done with it in DefineSelf()
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 96362c12ccd08fcb50f697106622d0c0f8a6007a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 14 09:39:21 2011 -0700
+
+ Add Solaris 11 libsocket to list of libraries to search for getifaddrs()
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Acked-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1953570d9cd7c4e57fc270e6146aa13e794be0de
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 14 10:52:18 2011 -0700
+
+ Only greeter needs XPM CFLAGS & LIBS, not xdm daemon
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Acked-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 47c1b146c786f057026ea2ad89b8cb4c51ee3d50
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 14 10:44:06 2011 -0700
+
+ Stop casting return values of malloc and friends
+
+ It's not needed on modern mallocs that return void *, and can hide
+ missing prototype errors that cause the compiler to assume int is
+ returned (a bad thing to assume in 64-bit builds).
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
+
+commit f29b73ba549fbdcbe1361c016fc40cc424c32e9b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 14 10:33:50 2011 -0700
+
+ Stop casting free() arguments to (char *)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
+
+commit 6cb6fcd3a95bc125615d4a6736712bcc45ad7685
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 14 10:24:06 2011 -0700
+
+ Stop checking for NULL before calling free()
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
+
+commit d39dbde390f0f609c03dbd79f0bcc6a3486ca8a3
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat May 14 09:29:30 2011 -0700
+
+ Fix potential memory leak in allocation failure cleanup path
+
+ Error: Memory leak (CWE 401)
+ Memory leak of pointer 'newargv' allocated with realloc(((i8*)argv), ((i * 4) + 8))
+ at line 239 of /export/alanc/X.Org/git/app/xdm/xdm/util.c in function 'parseArgs'.
+ 'newargv' allocated at line 231 with realloc(((i8*)argv), ((i * 4) + 8)).
+ newargv leaks when newargv != 0 at line 234
+ and save == 0 at line 234.
+
+ [This bug was found by the Parfait 0.3.7 bug checking tool.
+ For more information see http://labs.oracle.com/projects/parfait/ ]
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 4b9cbfd3f4d16000120c3241503c7a6102ae8afe
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Mar 4 20:31:01 2011 -0500
+
+ man: replace hard coded section number (1) with __appmansuffix__
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f394b7e3c7d0437a4415fe99965b866e35066713
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Feb 21 16:52:19 2011 -0800
+
+ greeter: Make sure cursor stays in bounds too
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 7d5c2364cc6c2b7338b4df9f1be0b621ca9fd2e7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Feb 21 16:43:41 2011 -0800
+
+ greeter: Replace several #ifdef XPM blocks with LOGO_W macro
+
+ Refactor code assuming compiler is smart enough to optimize out any
+ that reduce to + 0 or - 0 if building without XPM defined.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f59d8f32c755b8747acf71aa3ab4c4809bff4ebf
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Feb 21 15:54:00 2011 -0800
+
+ greeter: Make sure text input areas stay inside the lines
+
+ Regression introduced by f8585c60831a8e5ddebce18bdd7e78d217a822c5
+ broke bounds checking for text displayed in input fields.
+
+ Since this makes each TEXT_WIDTH value only be used once, just use
+ them directly instead of storing the result in a variable.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3297eb892017c850f25d3dc4a37095612a20a381
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Feb 21 15:53:23 2011 -0800
+
+ greeter: Add echoPasswdChar resource to set character to display
+
+ Stop hardcoding it to '*'. Allows setting a resource with no value to
+ to advance the cursor without drawing text (as was previously the default).
+
+ Resolves https://bugs.freedesktop.org/show_bug.cgi?id=32794
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 472dc516e7d0190d81fdedd817261ee41bf8ada6
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Feb 19 22:33:33 2011 -0800
+
+ greeter: inline valueMask for xpm window to avoid shadowing argument
+
+ The Realize function names one of its arguments valueMask, and the
+ valueMask variable in the inner scope is just used as a static set
+ of mask flags, so just pass them directly to the function to reduce
Reply to: