Please merge rsyslog 5.8.0-1 (main) from debian unstable (main)

[Lorenzo De Liso]

Binary package hint: rsyslog

Please merge rsyslog 5.8.0-1 (main) from debian unstable (main).

[Colin Watson (cjwatson)]

diff -Nru rsyslog-5.8.0/debian/rules rsyslog-5.8.0/debian/rules
--- rsyslog-5.8.0/debian/rules 2011-04-12 14:35:18.000000000 +0200
+++ rsyslog-5.8.0/debian/rules 2011-05-02 17:57:38.000000000 +0200
@@ -30,4 +30,4 @@
        dh_compress -X rsyslog-example.conf

 override_dh_installinit:
- dh_installinit -R -- start 10 2 3 4 5 . start 30 0 6 . stop 90 1 .
+ dh_installinit --upstart-only --name=dmesg --no-start

This causes debian/rsyslog.upstart to no longer be installed, which will break everyone's logging, as far as I can see. At the very least, if this change is intentional, it needs to be explicitly documented - but it looks like a mistake.

Although I'm happy to review patches either way, you might find it easier to avoid making this kind of mistake if you did the merge in bzr?

+ - Patch the upstart job to parse /etc/default/rsyslog as the old init
+ script used to

Since the entire upstart job is one of the "remaining changes" in Ubuntu, there's no need to separately list changes to it. The entry "Replace init script with debian/rsyslog.upstart" is enough.

[Lorenzo De Liso (blackz)]

This attached debdiff fixes the issues you pointed out. Yes, sorry it was a mistake. I generally don't use bzr to merge packages and I prefer the debdiff for the merges.

[Martin Pitt (pitti)]

As I am the default assignee for the merge, I didn't check for bug reports about it. I already have merged it (in fact the diff looks pretty much like your's). I didn't upload it yet because 5.8.0 keeps spamming syslog with

May 4 15:41:28 donald rsyslogd: rsyslogd's groupid changed to 103
May 4 15:41:28 donald rsyslogd: rsyslogd's userid changed to 101
May 4 15:41:28 donald rsyslogd-2039: Could no open output pipe '/dev/xconsole' [try http://www.rsyslog.com/e/2039 ]

over and over again, with pretty much every "real" message that comes in. Do you have the same problem when running this?

[Lorenzo De Liso (blackz)]

Hello Martin,

Sorry for the late answer (I already answered you on IRC, though). By the way, I was not having this problem, but now I'm having it as well.

[Lorenzo De Liso (blackz)]

err, s/answered/contacted

[Clint Byrum (clint-fewbar)]

You both seem to be experiencing bug #459730 . Its possible the new version more readily introduces the problem. I think the appropriate answer is to fix that bug first, then update this merge to include whatever the fix is.

[Martin Pitt (pitti)]

So while the old rsyslog just ignored that, the new one seems to refuse operation without it and only logs about /dev/xconsole, and nothing else. Is that a sensible behaviour in the first place?