debian/changelog | 3
debian/local/Xstartup | 2
debian/patches/xdm_fixes.diff | 158 ------------------------------------------
debian/rules | 1
4 files changed, 5 insertions(+), 159 deletions(-)
New commits:
commit 56983435f3307ded89cd557d70b7188e5bb034dc
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Apr 10 15:49:24 2010 +0200
Delete unused xdm_fixes.diff
It was split up a while ago, and mostly included upstream.
diff --git a/debian/patches/xdm_fixes.diff b/debian/patches/xdm_fixes.diff
deleted file mode 100644
index 874708a..0000000
--- a/debian/patches/xdm_fixes.diff
+++ /dev/null
@@ -1,158 +0,0 @@
-# HG changeset patch
-# User e...@imfi.kspu.ru
-# Node ID fbeb28a122da949d0e70dd30956800ae707700d3
-# Parent 77625b567802c5b6977eddb845f391e65a8733d0
-Applied 002_xdm_fixes.diff
-
-Index: xdm/auth.c
-===================================================================
---- xdm.orig/auth.c
-+++ xdm/auth.c
-@@ -48,6 +48,7 @@
- #include "dm_error.h"
-
- #include <errno.h>
-+#include <fcntl.h>
-
- #include <sys/ioctl.h>
-
-Index: xdm/dm.c
-===================================================================
---- xdm.orig/dm.c
-+++ xdm/dm.c
-@@ -41,6 +41,7 @@
- # include "dm_error.h"
-
- # include <stdio.h>
-+# include <string.h>
- #ifdef X_POSIX_C_SOURCE
- #define _POSIX_C_SOURCE X_POSIX_C_SOURCE
- #include <signal.h>
-@@ -569,9 +570,10 @@
- RestartDisplay (d, FALSE);
- break;
- default:
-- Debug ("Display exited with unknown status %d\n",
waitVal(status));
-- LogError ("Unknown session exit code %d from process %d\n",
-- waitVal (status), pid);
-+ Debug ("display %s exited with unknown status %d\n",
-+ d->name, waitVal(status));
-+ LogError ("display %s (pid %ld) exited with unexpected status "
-+ "%d\n", d->name, waitVal (status), (long) pid);
- StopDisplay (d);
- break;
- }
-Index: xdm/genauth.c
-===================================================================
---- xdm.orig/genauth.c
-+++ xdm/genauth.c
-@@ -42,6 +42,8 @@
- # include "dm_error.h"
-
- #include <errno.h>
-+#include <fcntl.h>
-+#include <string.h>
-
- #include <time.h>
- #define Time_t time_t
-Index: xdm/session.c
-===================================================================
---- xdm.orig/session.c
-+++ xdm/session.c
-@@ -878,12 +878,14 @@
- open ("/dev/null", O_RDONLY);
- /* make stdout follow stderr to the log file */
- dup2 (2,1);
-+ Debug ("attempting to execve() %s\n", argv[0]);
- execve (argv[0], argv, environ);
- /*
- * In case this is a shell script which hasn't been
- * made executable (or this is a SYSV box), do
- * a reasonable thing
- */
-+ Debug ("execve() of %s failed: %s\n", argv[0], _SysErrorMsg (errno));
- if (errno != ENOENT) {
- char program[1024], *e, *p, *optarg;
- FILE *f;
-@@ -942,6 +944,7 @@
- while ((*av++ = *argv++))
- /* SUPPRESS 530 */
- ;
-+ Debug ("attempting to execve() %s\n", newargv[0]);
- execve (newargv[0], newargv, environ);
- }
- }
-Index: xdm/xdm.man.cpp
-===================================================================
---- xdm.orig/xdm.man.cpp
-+++ xdm/xdm.man.cpp
-@@ -289,7 +289,7 @@
- this resource to ``false'' will disable this feature.
- .IP "\fBDisplayManager.pidFile\fP"
- The filename specified will be created to contain an ASCII
--representation of the process-id of the main
-+representation of the process ID of the main
- .I xdm
- process.
- .I Xdm
-@@ -353,9 +353,11 @@
- #ifdef DEV_RANDOM
- .IP \fBDisplayManager.randomDevice\fP
- A file to read 8 bytes from to generate the seed of authorization keys.
--The default is \fI DEV_RANDOM \fP. If this file cannot be read, or if a
--read blocks for more than 5 seconds, xdm falls back to using a checksum
--of \fBDisplayManager.randomFile\fP to generate the seed.
-+The default is
-+.IR DEV_RANDOM .
-+If this file cannot be read, or if a read blocks for more than 5 seconds,
-+xdm falls back to using a checksum of \fBDisplayManager.randomFile\fP to
-+generate the seed.
- #endif
- #if !defined(ARC4_RANDOM)
- .IP \fBDisplayManager.prngdSocket\fP
-Index: xdm/xdmauth.c
-===================================================================
---- xdm.orig/xdmauth.c
-+++ xdm/xdmauth.c
-@@ -45,6 +45,18 @@
- static char auth_name[256];
- static int auth_name_len;
-
-+static void XdmPrintDataHex (char *s, char *a, int l);
-+# ifdef XDMCP
-+static void XdmPrintArray8Hex (char *s, ARRAY8Ptr a);
-+# endif
-+static Xauth *XdmGetAuthHelper (unsigned short namelen,
-+ char *name,
-+ int includeRho);
-+# ifdef XDMCP
-+static int HexToBinary (char *key);
-+static int XdmGetKey (struct protoDisplay *pdpy, ARRAY8Ptr displayID);
-+# endif
-+
- static void
- XdmPrintDataHex (char *s, char *a, int l)
- {
-@@ -182,7 +194,9 @@
- XdmPrintDataHex ("Accept packet auth", xdmcpauth->data,
xdmcpauth->data_length);
- XdmPrintDataHex ("Auth file auth", fileauth->data, fileauth->data_length);
- /* encrypt the session key for its trip back to the server */
-- XdmcpWrap (xdmcpauth->data, (unsigned char *)&pdpy->key, xdmcpauth->data,
8);
-+ XdmcpWrap ((unsigned char *)&xdmcpauth->data,
-+ (unsigned char *)&pdpy->key,
-+ (unsigned char *)&xdmcpauth->data, 8);
- pdpy->fileAuthorization = fileauth;
- pdpy->xdmcpAuthorization = xdmcpauth;
- }
-Index: xdm/xdmshell.c
-===================================================================
---- xdm.orig/xdmshell.c
-+++ xdm/xdmshell.c
-@@ -41,6 +41,7 @@
- #include <stdio.h>
- #include "dm.h"
- #include <errno.h>
-+#include <string.h>
-
- #ifdef macII
- #define ON_CONSOLE_ONLY
commit 2fcf91af1e6e7e19077fa1f8dfd929298acc29f0
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Apr 10 15:43:11 2010 +0200
debian/rules: delete libtool m4 files on clean.
diff --git a/debian/changelog b/debian/changelog
index 0519cea..8385976 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ xdm (1:1.1.10-1) UNRELEASED; urgency=low
- storepid_rewrite.diff
* Xstartup: use id -u $USER, not id -u, since this script is run as root.
See #118677.
+ * debian/rules: delete libtool m4 files on clean.
-- Julien Cristau <jcris...@debian.org> Sat, 10 Apr 2010 03:49:17 +0200
diff --git a/debian/rules b/debian/rules
index 5652360..4247e52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,6 +108,7 @@ clean: xsfclean
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
+ rm -f m4/lt*.m4 m4/libtool.m4
rm -f $$(find -name Makefile.in)
dh_clean
commit 767d87259a706c68198a225960fb5d305c62d2dd
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Apr 10 15:41:47 2010 +0200
Xstartup: use id -u $USER, not id -u, since this script is run as root.
See #118677.
diff --git a/debian/changelog b/debian/changelog
index 5d86555..0519cea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ xdm (1:1.1.10-1) UNRELEASED; urgency=low
- log_sourcing_better.diff
- selinux_support.diff
- storepid_rewrite.diff
+ * Xstartup: use id -u $USER, not id -u, since this script is run as root.
+ See #118677.
-- Julien Cristau <jcris...@debian.org> Sat, 10 Apr 2010 03:49:17 +0200
diff --git a/debian/local/Xstartup b/debian/local/Xstartup
index cd51e52..200222e 100644
--- a/debian/local/Xstartup
+++ b/debian/local/Xstartup
@@ -8,7 +8,7 @@ if [ -e /etc/nologin ]; then
if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then
xmessage -file /etc/nologin -geometry 640x480
fi
- if [ "$(id -u)" != "0" ] && \
+ if [ "$(id -u $USER)" != "0" ] && \
! grep -qs '^ignore-nologin' /etc/X11/xdm/xdm.options; then
exit 1
fi
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o0b6f-0006vu...@alioth.debian.org
