xdm: Changes to 'debian-unstable'
debian/patches/03_spelling.diff | 2 ++
debian/patches/04_xdm_init_log_earlier.diff | 3 +++
debian/patches/07_xdm_more_debug.diff | 2 ++
debian/patches/08_xdm_execute_more_debug.diff | 2 ++
debian/patches/09_xdm_syserrormsg.diff | 1 +
debian/patches/10_xdm_better_logging.diff | 2 ++
debian/patches/11_xdm_strerror.diff | 1 +
debian/patches/12_remove_pidfile.diff | 2 ++
debian/patches/series | 5 +++--
9 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit d1c1b7acd1467c57d4e62f3ee74528a0c80dfaa2
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Aug 2 14:36:27 2009 +0200
Add upstream commit references to patches
Alan Coopersmith applied some of our patches upstream.
diff --git a/debian/patches/03_spelling.diff b/debian/patches/03_spelling.diff
index 1e11c35..2bdbbcd 100644
--- a/debian/patches/03_spelling.diff
+++ b/debian/patches/03_spelling.diff
@@ -1,6 +1,8 @@
From: Branden Robinson <branden@debian.org>
Subject: spelling fix
+Upstream commit 6dfbdf2823dc50c6b0ff24afbc58c67dc1651bef
+
Index: xdm/dm.c
===================================================================
--- xdm.orig/dm.c
diff --git a/debian/patches/04_xdm_init_log_earlier.diff b/debian/patches/04_xdm_init_log_earlier.diff
index d1a7b2d..5402ee2 100644
--- a/debian/patches/04_xdm_init_log_earlier.diff
+++ b/debian/patches/04_xdm_init_log_earlier.diff
@@ -5,6 +5,9 @@ Subject: [PATCH] Call InitErrorLog() right after BecomeDaemon()
The latter points stderr to /dev/null, so the sooner we open the log
after that, the better.
+
+Upstream commit 72240433a85410e68a3b6705e097337ff985ae90
+
---
dm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/patches/07_xdm_more_debug.diff b/debian/patches/07_xdm_more_debug.diff
index 959c9f4..e75818d 100644
--- a/debian/patches/07_xdm_more_debug.diff
+++ b/debian/patches/07_xdm_more_debug.diff
@@ -3,6 +3,8 @@ Subject: [PATCH] Add some more log and debug messages
Add log messages for xdm startup, shutdown, and normal exit. Add a
debugging message when xdm enters its main loop.
+
+Upstream commit 2d6d2f121bffb378676f422b44d37534c8c5d53b
---
dm.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/debian/patches/08_xdm_execute_more_debug.diff b/debian/patches/08_xdm_execute_more_debug.diff
index d64c91d..64ad4e1 100644
--- a/debian/patches/08_xdm_execute_more_debug.diff
+++ b/debian/patches/08_xdm_execute_more_debug.diff
@@ -2,6 +2,8 @@ From: Branden Robinson <branden@debian.org>
Subject: [PATCH] session.c: Add more debugging to execute()
[jcristau@debian.org: save errno before calling Debug() in one place]
+
+Upstream commit d6faa3c02a6f61c8d01accd0fcead28c39673e32
---
session.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/debian/patches/09_xdm_syserrormsg.diff b/debian/patches/09_xdm_syserrormsg.diff
index 58df1c0..94bcadd 100644
--- a/debian/patches/09_xdm_syserrormsg.diff
+++ b/debian/patches/09_xdm_syserrormsg.diff
@@ -1,6 +1,7 @@
From: Branden Robinson <branden@debian.org>
Subject: [PATCH] Use xdm's _SysErrorMsg() function instead of merely printing errno
+Upstream commit 8d15af786d96bb70aceca116a588c2a4b7c45d63
---
greeter/verify.c | 2 +-
session.c | 7 ++++---
diff --git a/debian/patches/10_xdm_better_logging.diff b/debian/patches/10_xdm_better_logging.diff
index 9a7a169..4c2f13b 100644
--- a/debian/patches/10_xdm_better_logging.diff
+++ b/debian/patches/10_xdm_better_logging.diff
@@ -7,6 +7,8 @@ first thing we do after an error condition in those cases.
Forward-ported by David Nusinow, Eugene Konev and Julien Cristau.
+Upstream commit 18f286641afbe1d3b61abd31d93c0ae8acb375e9
+
Index: xdm/auth.c
===================================================================
--- xdm.orig/auth.c
diff --git a/debian/patches/11_xdm_strerror.diff b/debian/patches/11_xdm_strerror.diff
index f97ba31..234f8c4 100644
--- a/debian/patches/11_xdm_strerror.diff
+++ b/debian/patches/11_xdm_strerror.diff
@@ -1,6 +1,7 @@
From: Branden Robinson <branden@debian.org>
Subject: [PATCH] Use xdm's _SysErrorMsg() function instead of strerror()
+Upstream commit ec3152fbba9ee39bbb069913e76e9d165001f98a
---
choose.c | 2 +-
daemon.c | 6 +++---
diff --git a/debian/patches/12_remove_pidfile.diff b/debian/patches/12_remove_pidfile.diff
index 8c3362c..643021a 100644
--- a/debian/patches/12_remove_pidfile.diff
+++ b/debian/patches/12_remove_pidfile.diff
@@ -5,6 +5,8 @@ Debian bug#213076
Forward-ported by David Nusinow, Eugene Konev and Julien Cristau.
+Upstream commit 2f5bd6ea016a6405208c91c976a16a672cc04184
+
Index: xdm/dm.c
===================================================================
--- xdm.orig/dm.c
diff --git a/debian/patches/series b/debian/patches/series
index c6f051b..f0195d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,19 +2,20 @@
00_warning_fixes.diff
01_xdm_include_fcntl.diff
02_xdm_zombie_no_error.diff
+
+# applied upstream
03_spelling.diff
04_xdm_init_log_earlier.diff
# this one might need some ifdefs
06_hurd_utsname.diff
-# log and debug stuff, to kill or send upstream
+# applied upstream
07_xdm_more_debug.diff
08_xdm_execute_more_debug.diff
09_xdm_syserrormsg.diff
10_xdm_better_logging.diff
11_xdm_strerror.diff
-
12_remove_pidfile.diff
# not sure this one is still relevant now we use mkstemp
Reply to: