From 09e865df420535d8279f454d554625ce67a56352 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 21 Sep 2012 16:55:01 +0200 Subject: rsyslog: fix for new systemd Signed-off-by: Michael Olbrich (cherry picked from commit 6ee9df3fc207b509cd850b4dd84c05eff0da0b5e) Signed-off-by: Marc Kleine-Budde --- ...unitfile-for-newer-systemd-implementation.patch | 25 ++++++++++++++++++++++ patches/rsyslog-5.8.13/series | 4 ++++ rules/rsyslog.make | 6 ++++-- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 patches/rsyslog-5.8.13/0001-fix-unitfile-for-newer-systemd-implementation.patch create mode 100644 patches/rsyslog-5.8.13/series diff --git a/patches/rsyslog-5.8.13/0001-fix-unitfile-for-newer-systemd-implementation.patch b/patches/rsyslog-5.8.13/0001-fix-unitfile-for-newer-systemd-implementation.patch new file mode 100644 index 000000000..4717cac05 --- /dev/null +++ b/patches/rsyslog-5.8.13/0001-fix-unitfile-for-newer-systemd-implementation.patch @@ -0,0 +1,25 @@ +From: Gavin Schenk +Date: Wed, 19 Sep 2012 12:21:01 +0200 +Subject: [PATCH] fix unitfile for newer systemd implementation + +--- + rsyslog.service.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/rsyslog.service.in b/rsyslog.service.in +index aa9e5db..9f91923 100644 +--- a/rsyslog.service.in ++++ b/rsyslog.service.in +@@ -1,8 +1,8 @@ + [Unit] + Description=System Logging Service ++Requires=syslog.socket + + [Service] +-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service + ExecStart=@sbindir@/rsyslogd -n -c5 + Sockets=syslog.socket + StandardOutput=null +-- +1.7.0.4 + diff --git a/patches/rsyslog-5.8.13/series b/patches/rsyslog-5.8.13/series new file mode 100644 index 000000000..d729c926c --- /dev/null +++ b/patches/rsyslog-5.8.13/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-fix-unitfile-for-newer-systemd-implementation.patch +# 9cdaaf0fca11973761c6ad8ccefad8c4 - git-ptx-patches magic diff --git a/rules/rsyslog.make b/rules/rsyslog.make index ced87cc04..d41399ee0 100644 --- a/rules/rsyslog.make +++ b/rules/rsyslog.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_RSYSLOG) += rsyslog # # Paths and names # -RSYSLOG_VERSION := 5.8.12 -RSYSLOG_MD5 := e4a105a004ca7113ec5948b30c6af20c +RSYSLOG_VERSION := 5.8.13 +RSYSLOG_MD5 := 8d228a8b622f90b320c95f38be7fc5bb RSYSLOG := rsyslog-$(RSYSLOG_VERSION) RSYSLOG_SUFFIX := tar.gz RSYSLOG_URL := http://www.rsyslog.com/files/download/rsyslog/$(RSYSLOG).$(RSYSLOG_SUFFIX) @@ -138,6 +138,8 @@ ifdef PTXCONF_RSYSLOG_SYSTEMD_UNIT /lib/systemd/system/rsyslog.service) @$(call install_link, rsyslog, ../rsyslog.service, \ /lib/systemd/system/multi-user.target.wants/rsyslog.service) + @$(call install_link, rsyslog, rsyslog.service, \ + /lib/systemd/system/syslog.service) endif @for plugin in $(RSYSLOG_PLUGINS-y); do \ -- cgit v1.2.3