xdm: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/patches/01_xdm_include_fcntl.diff | 19 -------------------
debian/patches/15_xdm_openfiles.diff | 23 ++---------------------
debian/patches/log_sourcing_better.diff | 20 +++++++++++++++-----
debian/patches/series | 18 +++++++++++-------
debian/patches/storepid_rewrite.diff | 10 +++++-----
6 files changed, 40 insertions(+), 57 deletions(-)
New commits:
commit dbb32ecb4c2a199e2c063c387751d60913da60a3
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jan 12 18:49:40 2010 +0000
Document patches applied upstream
diff --git a/debian/patches/series b/debian/patches/series
index 81799ad..1e5edbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,24 +1,29 @@
-# these should either be upstream or killed yesterday
+# upstream cd6b6d5f78e92725d6466d138f5441d791e58212
02_xdm_zombie_no_error.diff
# this one might need some ifdefs
06_hurd_utsname.diff
-# not sure this one is still relevant now we use mkstemp
+# upstream 11d6aa0b392daef2900681b70960d8be4ada89a9
15_xdm_openfiles.diff
-# should get forwarded upstream
+# patch 20 has signal safety issues
20_xdm_log_timestamp.diff
21_xdm_log_append.diff
+# upstream 17105faffcb4533da71f0d3d17fd40a64b6faf50
90_xdm_write_dummy_auth.diff
-# depends on patch 90
+# upstream 5222d28e8d8e5b4cc705f1a637aace405ad32bd5
91_xdm_saveserverauth_logging.diff
-#xdm_fixes.diff is now split up in the above patches
-
+# upstream 90c2cc57cdf911cec2eec185f357868209212c79
log_sourcing_better.diff
+# upstream 6d393844dca10823f85d1ac797879fc6e00eae59
selinux_support.diff
+
support_logfile_rotation.diff
+
+# upstream c925709069d7515bb94f43e4b88155a95e41c8fe
storepid_rewrite.diff
+
debian.diff
commit baade080a6cb9abf09d738f7e824097bee8afdca
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jan 5 16:25:45 2010 +0000
Minor formatting change to storepid_rewrite.diff header
diff --git a/debian/patches/storepid_rewrite.diff b/debian/patches/storepid_rewrite.diff
index d216756..ddd4a5e 100644
--- a/debian/patches/storepid_rewrite.diff
+++ b/debian/patches/storepid_rewrite.diff
@@ -2,15 +2,15 @@ From: Branden Robinson <branden@debian.org>
Date: Mon, 18 Nov 2002 04:24:48 -0500
Subject: rewrite StorePid()
-Update StorePid() function to use Matthieu Herrb's changes that
-refuse to open an existing pid file, and take more care with the
-size of the Pid_t type.
+Update StorePid() function to use Matthieu Herrb's changes that refuse
+to open an existing pid file, and take more care with the size of the
+Pid_t type.
-"Matthieu Herrb rewrote the StorePid() function based on my changes; he
+Matthieu Herrb rewrote the StorePid() function based on my changes; he
made it more careful with the size of Pid_t, and treats an existing pid
file as a failure. I then made some more changes: use _SysErrorMsg()
instead of strerror(), and don't assume that the process id we write to
-the pidFile is 5 digits."
+the pidFile is 5 digits.
Forward-ported by David Nusinow, Eugene Konev and Julien Cristau.
commit cbe71a0bc9c4f20ba74f3c096320f01e2a0c7834
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jan 5 16:21:24 2010 +0000
log_sourcing_better.diff: resurrect patch header
Taken from the monolith's 078_xdm_log_sourcing_better.diff.
diff --git a/debian/changelog b/debian/changelog
index 35f49f3..a80ea10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ xdm (1:1.1.9-1) UNRELEASED; urgency=low
allowed passing NULL as third argument to openFiles(), and used to have an
accompanying change in SetUserAuthorization() which seems to have
disappeared since then, so this isn't necessary anymore.
+ * log_sourcing_better.diff: resurrect patch header from the monolith's
+ 078_xdm_log_sourcing_better.diff.
[ Brice Goglin ]
* New upstream release.
diff --git a/debian/patches/log_sourcing_better.diff b/debian/patches/log_sourcing_better.diff
index 7b137cc..29668b6 100644
--- a/debian/patches/log_sourcing_better.diff
+++ b/debian/patches/log_sourcing_better.diff
@@ -1,9 +1,19 @@
-# HG changeset patch
-# User ejka@imfi.kspu.ru
-# Node ID 28b3145223134d9d9a32202d0bae2036572e560a
-# Parent fbeb28a122da949d0e70dd30956800ae707700d3
-Applied 078_xdm_log_sourcing_better.diff
+From: Branden Robinson <branden@debian.org>
+Subject: Improve logging of xdm's script handling
+* Make execution of the session program an informational log message (with
+ LogInfo()), not a Debug() message.
+* Ensure that source()d scripts (Xreset, Xsetup, Xstartup) can be
+ fopen()ed before invoking runAndWait() on them. If they can, LogInfo()
+ the fact. If they cannot, LogInfo() that, too, and use _SysErrorMsg() to
+ report why fopen() failed.
+* Make source() complain using Debug() when it is given a null pointer in
+ its file argument.
+* For clarity, make source() return from only one location.
+
+Also see Debian bug #219311.
+
+Forward ported by Eugene Konev.
---
session.c | 33 ++++++++++++++++++++-------------
1 file changed, 20 insertions(+), 13 deletions(-)
commit 4dd475a06d2db56d914854e59fd988e1883bfce1
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jan 5 16:14:10 2010 +0000
15_xdm_openfiles.diff: only keep the race condition fix.
The other change allowed passing NULL as third argument to openFiles(),
and used to have an accompanying change in SetUserAuthorization() which
seems to have disappeared since then, so this isn't necessary anymore.
diff --git a/debian/changelog b/debian/changelog
index 5175097..35f49f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ xdm (1:1.1.9-1) UNRELEASED; urgency=low
* xdm.prerm uses ps, add Depends on procps.
* Update patches 20_xdm_log_timestamp.diff and 21_xdm_log_append.diff.
* Drop 01_xdm_include_fcntl.diff, not necessary.
+ * 15_xdm_openfiles.diff: only keep the race condition fix. The other change
+ allowed passing NULL as third argument to openFiles(), and used to have an
+ accompanying change in SetUserAuthorization() which seems to have
+ disappeared since then, so this isn't necessary anymore.
[ Brice Goglin ]
* New upstream release.
diff --git a/debian/patches/15_xdm_openfiles.diff b/debian/patches/15_xdm_openfiles.diff
index 5cbd7ed..4bb57f6 100644
--- a/debian/patches/15_xdm_openfiles.diff
+++ b/debian/patches/15_xdm_openfiles.diff
@@ -1,9 +1,5 @@
From: Branden Robinson <branden@debian.org>
-Subject: [PATCH] openFiles() improvements
-
-Change openFiles() to avoid race-based symlink attacks.
-Change openFiles() to accept NULL for its third argument,
-and check for a NULL value before fopen()ing the first argument.
+Subject: [PATCH] Change openFiles() to avoid race-based symlink attacks.
Forward-ported by Julien Cristau <jcristau@debian.org>.
@@ -11,7 +7,7 @@ Index: xdm/auth.c
===================================================================
--- xdm.orig/auth.c
+++ xdm/auth.c
-@@ -495,20 +495,45 @@
+@@ -494,12 +494,32 @@
openFiles (char *name, char *new_name, FILE **oldp, FILE **newp)
{
mode_t mask;
@@ -45,18 +41,3 @@ Index: xdm/auth.c
(void) umask (mask);
if (!*newp) {
Debug ("can't open new file %s\n", new_name);
- return 0;
- }
-- if (!*oldp)
-+ else
-+ Debug ("open succeeded: %s\n", new_name);
-+ if (oldp)
-+ {
- *oldp = fopen (name, "r");
-- Debug ("opens succeeded %s %s\n", name, new_name);
-+ if (*oldp)
-+ Debug ("open succeeded: %s\n", name);
-+ }
- return 1;
- }
-
commit 803e499096885fa16bd288ef6aefda43ad53cfcb
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jan 5 16:10:44 2010 +0000
Drop 01_xdm_include_fcntl.diff, not necessary.
diff --git a/debian/changelog b/debian/changelog
index 15150ca..5175097 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xdm (1:1.1.9-1) UNRELEASED; urgency=low
and points to xdm. Fixes piuparts failure.
* xdm.prerm uses ps, add Depends on procps.
* Update patches 20_xdm_log_timestamp.diff and 21_xdm_log_append.diff.
+ * Drop 01_xdm_include_fcntl.diff, not necessary.
[ Brice Goglin ]
* New upstream release.
diff --git a/debian/patches/01_xdm_include_fcntl.diff b/debian/patches/01_xdm_include_fcntl.diff
deleted file mode 100644
index 3790359..0000000
--- a/debian/patches/01_xdm_include_fcntl.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Branden Robinson <branden@debian.org>
-Subject: [PATCH] auth.c: include <fcntl.h> for definitions of O_ flags to open().
-
----
- auth.c | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: xdm/auth.c
-===================================================================
---- xdm.orig/auth.c 2009-12-06 21:37:54.000000000 +0100
-+++ xdm/auth.c 2009-12-06 21:44:07.000000000 +0100
-@@ -39,6 +39,7 @@
- #include <X11/Xlibint.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <fcntl.h>
-
- #include "dm.h"
- #include "dm_auth.h"
diff --git a/debian/patches/series b/debian/patches/series
index 1927a27..81799ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
# these should either be upstream or killed yesterday
-01_xdm_include_fcntl.diff
02_xdm_zombie_no_error.diff
# this one might need some ifdefs
Reply to: