From 17f3ffd9a0b1937523b1f4981880ca7942c5f061878a209ecb838a6267443e0f Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Wed, 17 Oct 2012 14:16:38 +0000 Subject: [PATCH 1/2] - Use RFC-5424 conform log format with RFC-3339 high-precision timestamps by default, removed obsolete rsyslog.early.conf. OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=101 --- rsyslog.changes | 6 ++++++ rsyslog.conf.in | 11 +++++++---- rsyslog.early.conf.in | 13 ------------- rsyslog.spec | 7 +------ 4 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 rsyslog.early.conf.in diff --git a/rsyslog.changes b/rsyslog.changes index 892cec4..e66f74d 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 17 14:13:38 UTC 2012 - mt@suse.com + +- Use RFC-5424 conform log format with RFC-3339 high-precision + timestamps by default, removed obsolete rsyslog.early.conf. + ------------------------------------------------------------------- Mon Sep 24 17:58:16 UTC 2012 - andreas.stieger@gmx.de diff --git a/rsyslog.conf.in b/rsyslog.conf.in index 39fdfd0..43ba4c1 100644 --- a/rsyslog.conf.in +++ b/rsyslog.conf.in @@ -37,14 +37,17 @@ $ModLoad imklog.so # 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 diff --git a/rsyslog.early.conf.in b/rsyslog.early.conf.in deleted file mode 100644 index 6839f2a..0000000 --- a/rsyslog.early.conf.in +++ /dev/null @@ -1,13 +0,0 @@ -## -## NOTE: This config file is obsolete and will be dropped in -## further package versions. Even while early syslog -## start, the /etc/rsyslog.conf file is used now. -## See rsyslog.conf and remote.conf for more details. -## -## We still ship the file, because systemd does not -## provide a way to execute syslog-service-generator. -## - -$IncludeConfig ETC_RSYSLOG_CONF - -### diff --git a/rsyslog.spec b/rsyslog.spec index 0d5b294..659c892 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -126,7 +126,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build 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 andreas.stieger@gmx.de -- fix compiler error Patch0: rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch @@ -413,7 +412,7 @@ done 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 @@ for file in rsyslog.conf rsyslog.early.conf rsyslog.d.remote.conf ; do 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 # @@ -478,7 +475,6 @@ fi # %{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 +570,6 @@ fi %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} From 156d7dcb2568b2c2c601859694831462d6fde252a4fb46b5ed79387329102ee8 Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Thu, 18 Oct 2012 16:10:32 +0000 Subject: [PATCH 2/2] Accepting request 138521 from openSUSE:Factory:Staging:Systemd - Fix build with new systemd location. OBS-URL: https://build.opensuse.org/request/show/138521 OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=102 --- rsyslog.changes | 5 +++++ rsyslog.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rsyslog.changes b/rsyslog.changes index e66f74d..3a5970e 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 17 14:33:35 UTC 2012 - fcrozat@suse.com + +- Fix build with new systemd location. + ------------------------------------------------------------------- Wed Oct 17 14:13:38 UTC 2012 - mt@suse.com diff --git a/rsyslog.spec b/rsyslog.spec index 659c892..1c09f1b 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -456,9 +456,11 @@ install -m644 plugins/ompgsql/createDB.sql \ # 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