[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#702390: marked as done (unblock: rsyslog/5.8.11-3)

Your message dated Tue, 19 Mar 2013 13:15:44 +0000
with message-id <cdcb7631967661ef2a7b56feba8c83d2@mail.adsl.funky-badger.org>
and subject line Re: Bug#702390: unblock: rsyslog/5.8.11-3
has caused the Debian Bug report #702390,
regarding unblock: rsyslog/5.8.11-3
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
702390: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=702390
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package rsyslog

It has a one-line fix to future-proof rsyslog's systemd service file to
work with newer systemd versions.

Complete debdiff is attached.

Cheers,
Michael


unblock rsyslog/5.8.11-3

-- System Information:
Debian Release: 7.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff --git a/debian/changelog b/debian/changelog
index ff6eca0..55dfe0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+rsyslog (5.8.11-3) unstable; urgency=low
+
+  * debian/patches/04-systemd_journal.patch: The journal has replaced
+    systemd-kmsg-syslogd and systemd-stdout-bridge. Stopping a non-existing
+    service will generate an error in newer versions of systemd, so remove
+    that from ExecStartPre.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 05 Mar 2013 23:06:57 +0100
+
 rsyslog (5.8.11-2) unstable; urgency=low
 
   * Disable omstdout module again. Upstream doesn't consider it viable for
diff --git a/debian/patches/04-systemd_journal.patch b/debian/patches/04-systemd_journal.patch
new file mode 100644
index 0000000..87b7ac1
--- /dev/null
+++ b/debian/patches/04-systemd_journal.patch
@@ -0,0 +1,19 @@
+Description: Update for systemd journal
+ The journal that was introduced in systemd v38 has replaced
+ systemd-kmsg-syslogd and systemd-stdout-bridge.
+ Stopping a non-existing service will generate a failure in newer
+ versions of systemd and since wheezy has systemd v44, it's best
+ to remove that ExecStartPre.
+Author: Michael Biebl <biebl@debian.org>
+Index: rsyslog/rsyslog.service.in
+===================================================================
+--- rsyslog.orig/rsyslog.service.in	2013-03-05 19:12:26.579631305 +0100
++++ rsyslog/rsyslog.service.in	2013-03-05 22:57:35.377856176 +0100
+@@ -2,7 +2,6 @@
+ Description=System Logging Service
+ 
+ [Service]
+-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
+ ExecStart=@sbindir@/rsyslogd -n -c5
+ Sockets=syslog.socket
+ StandardOutput=null
diff --git a/debian/patches/series b/debian/patches/series
index d985f46..aa55a18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 01-dont_create_db.patch
 02-path_max.patch
 03-fix_relp_dns_resolution.patch
+04-systemd_journal.patch

--- End Message ---
--- Begin Message --- 
On 19.03.2013 12:13, Michael Biebl wrote:

On 19.03.2013 12:58, intrigeri wrote:

[...]
So, Michael, what's the actual potential harm, in practice, of keeping 
the useless ExecStartPre? More complicated upgrade path to Jessie?
Running Wheezy + a newer systemd? Anything else?


right, backports are one issue, partial upgrades another.
With the ExecStartPre, the rsyslog service will fail to start with newer 
systemd versions.
While we could add Breaks to systemd, having a fixed package already in wheezy sounds like the better alternative to me. Breaks seem to have the tendency to confuse APT, so if they can be avoided, it seems worthwile 
to me to include this fix.


ACK; unblocked.

Regards,

Adam

--- End Message ---
Reply to: