Package: release.debian.org Severity: normal User: [email protected] 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 <[email protected]> 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 <[email protected]> +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
