diff --git a/rsyslog-5.8.10-systemd.patch b/rsyslog-5.8.10-systemd.patch new file mode 100644 index 0000000..4881e60 --- /dev/null +++ b/rsyslog-5.8.10-systemd.patch @@ -0,0 +1,14 @@ +diff -up rsyslog-5.8.10/rsyslog.service.in.orig rsyslog-5.8.10/rsyslog.service.in +--- rsyslog-5.8.10/rsyslog.service.in.orig 2012-06-20 16:50:05.992719494 +0200 ++++ rsyslog-5.8.10/rsyslog.service.in 2012-06-20 16:51:21.857765838 +0200 +@@ -2,8 +2,8 @@ + Description=System Logging Service + + [Service] +-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service +-ExecStart=@sbindir@/rsyslogd -n -c5 ++EnvironmentFile=-/etc/sysconfig/rsyslog ++ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS + Sockets=syslog.socket + StandardOutput=null + diff --git a/rsyslog.spec b/rsyslog.spec index 6c49207..acaefee 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -6,7 +6,7 @@ Summary: Enhanced system logging and kernel message trapping daemon Name: rsyslog Version: 5.8.10 -Release: 1%{?dist} +Release: 2%{?dist} License: (GPLv3+ and ASL 2.0) Group: System Environment/Daemons URL: http://www.rsyslog.com/ @@ -16,7 +16,7 @@ Source2: rsyslog.conf Source3: rsyslog.sysconfig Source4: rsyslog.log # tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog -Patch0: rsyslog-5.8.5-systemd.patch +Patch0: rsyslog-5.8.10-systemd.patch Patch1: rsyslog-5.8.7-sysklogd-compat-1-template.patch Patch2: rsyslog-5.8.7-sysklogd-compat-2-option.patch @@ -320,6 +320,10 @@ mv /var/lock/subsys/rsyslogd /var/lock/subsys/rsyslog %{_libdir}/rsyslog/omudpspoof.so %changelog +* Wed Jun 20 2012 Tomas Heinrich 5.8.10-2 +- update systemd patch: remove the 'ExecStartPre' option + Resolves: #833549 + * Fri Apr 13 2012 Tomas Heinrich 5.8.10-1 - upgrade to new upstream stable version 5.8.10 - add impstats and imptcp modules