Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at 2012-10-19 08:51:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-09-25 14:17:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rsyslog.new/rsyslog.changes 2012-10-19 08:51:34.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Oct 17 14:33:35 UTC 2012 - [email protected] + +- Fix build with new systemd location. + +------------------------------------------------------------------- +Wed Oct 17 14:13:38 UTC 2012 - [email protected] + +- Use RFC-5424 conform log format with RFC-3339 high-precision + timestamps by default, removed obsolete rsyslog.early.conf. + +------------------------------------------------------------------- Old: ---- rsyslog.early.conf.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.E0UtAO/_old 2012-10-19 08:51:35.000000000 +0200 +++ /var/tmp/diff_new_pack.E0UtAO/_new 2012-10-19 08:51:35.000000000 +0200 @@ -126,7 +126,6 @@ Source0: http://www.rsyslog.com/files/download/%{name}/%{name}-%{upstream_version}.tar.gz Source1: rsyslog.sysconfig Source2: rsyslog.conf.in -Source3: rsyslog.early.conf.in Source4: rsyslog.d.remote.conf.in #PATCH-FIX-OPENSUSE rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch [email protected] -- fix compiler error Patch0: rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch @@ -413,7 +412,7 @@ install -d -m0755 %{buildroot}%{_sysconfdir}/rsyslog.d install -d -m0755 %{buildroot}%{_localstatedir}/run/rsyslog install -d -m0755 %{buildroot}%{_localstatedir}/spool/rsyslog -for file in rsyslog.conf rsyslog.early.conf rsyslog.d.remote.conf ; do +for file in rsyslog.conf rsyslog.d.remote.conf ; do sed \ %ifarch s390 s390x -e 's;tty10;console;g' \ @@ -427,8 +426,6 @@ done install -m0600 rsyslog.conf.$$ \ %{buildroot}%{_sysconfdir}/rsyslog.conf -install -m0600 rsyslog.early.conf.$$ \ - %{buildroot}%{_sysconfdir}/rsyslog.early.conf install -m0600 rsyslog.d.remote.conf.$$ \ %{buildroot}%{_sysconfdir}/rsyslog.d/remote.conf # @@ -459,9 +456,11 @@ # On 12.x, the syslog.service file is provided by # the syslog-service package. # -if test -e %{buildroot}/lib/systemd/system/rsyslog.service ; then - rm -f %{buildroot}/lib/systemd/system/rsyslog.service +%if %{with systemd} +if test -e %{buildroot}%{_unitdir}/rsyslog.service ; then + rm -f %{buildroot}%{_unitdir}/rsyslog.service fi +%endif %clean if [ -n "%{buildroot}" ] && [ "%{buildroot}" != "/" ] ; then @@ -478,7 +477,6 @@ # %{remove_and_set -n syslog RSYSLOGD_NATIVE_VERSION} %{fillup_and_insserv -ny syslog syslog} -%{fillup_and_insserv -nY syslog earlysyslog} # # add RSYSLOGD_* variables if needed # @@ -574,7 +572,6 @@ %defattr(-,root,root) %dir %{_sysconfdir}/rsyslog.d %config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.conf -%config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.early.conf %config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/remote.conf %{_sbindir}/rsyslogd %dir %{rsyslog_module_dir_nodeps} ++++++ rsyslog.conf.in ++++++ --- /var/tmp/diff_new_pack.E0UtAO/_old 2012-10-19 08:51:35.000000000 +0200 +++ /var/tmp/diff_new_pack.E0UtAO/_new 2012-10-19 08:51:35.000000000 +0200 @@ -37,14 +37,17 @@ # set log level 1 (same as in /etc/sysconfig/syslog). $klogConsoleLogLevel 1 +# Use rsyslog native, rfc5424 conform log format as default +# ($ActionFileDefaultTemplate RSYSLOG_FileFormat). # -# Use traditional log format by default. To change a single -# file to use rsyslog format (high-precision timestamps), -# append ";RSYSLOG_FileFormat" to the filename. See +# To change a single file to use obsolete BSD syslog format +# (rfc 3164, no high-precision timestamps), set the variable +# bellow or append ";RSYSLOG_FileFormat" to the filename. +# See # http://www.rsyslog.com/doc/rsyslog_conf_templates.html # for more informations. # -$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +#$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat # # Include config generated by /etc/init.d/syslog script -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
