Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at 2013-04-19 15:46:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rsyslog (Old) and /work/SRC/openSUSE:Factory/.rsyslog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rsyslog", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/rsyslog/rsyslog.changes 2013-04-02 20:43:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rsyslog.new/rsyslog.changes 2013-04-19 15:46:45.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Apr 16 08:49:49 UTC 2013 - [email protected] + +- Fixed service file to pass $RSYSLOGD_PARAMS to rsyslogd again. + +------------------------------------------------------------------- +Sun Apr 14 06:35:09 UTC 2013 - [email protected] + +- Fix systemd units to do exactly what is documented as + required --> http://www.freedesktop.org/wiki/Software/systemd/syslog + In particular, it must not mess with the ordering of syslog.target + this is done by removing the custom unit and adapting the upstream + one with openSUSE additions (rsyslog-unit.patch) + +------------------------------------------------------------------- Old: ---- rsyslog.service.in.in New: ---- rsyslog-unit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.q6cncn/_old 2013-04-19 15:46:57.000000000 +0200 +++ /var/tmp/diff_new_pack.q6cncn/_new 2013-04-19 15:46:57.000000000 +0200 @@ -153,7 +153,8 @@ Source2: rsyslog.conf.in Source4: rsyslog.d.remote.conf.in Source5: rsyslog-service-prepare.in -Source6: rsyslog.service.in.in +# PATCH-FIX-OPENSUSE rsyslog-unit.patch [email protected] Customize upstream systemd unit for openSUSE needs. +Patch0: rsyslog-unit.patch %description Rsyslog is an enhanced multi-threaded syslogd supporting, among others, @@ -407,9 +408,10 @@ %prep %setup -q -n %{name}-%{upstream_version} +%patch0 -p1 # %if %{with systemd} -for file in rsyslog-service-prepare rsyslog.service.in ; do +for file in rsyslog-service-prepare; do sed \ -e 's;RUN_DIR;%{rsyslog_rundir};g' \ -e 's;ADDITIONAL_SOCKETS;%{rsyslog_sockets_cfg};g' \ ++++++ rsyslog-unit.patch ++++++ --- rsyslog-7.2.5/rsyslog.service.in +++ rsyslog-7.2.5/rsyslog.service.in 2013/04/16 08:48:30 @@ -1,9 +1,16 @@ [Unit] Description=System Logging Service +Requires=var-run.mount +Requires=syslog.socket +After=var-run.mount +Conflicts=syslog-ng.service syslogd.service [Service] -ExecStart=@sbindir@/rsyslogd -n -Sockets=syslog.socket +Environment=RSYSLOGD_PARAMS= +ExecStartPre=@sbindir@/rsyslog-service-prepare +EnvironmentFile=-/etc/sysconfig/syslog +ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS +ExecReload=/bin/kill -HUP $MAINPID StandardOutput=null [Install] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
