Accepting request 138744 from Base:System
- Fix build with new systemd location. (forwarded request 138521 from fcrozat) OBS-URL: https://build.opensuse.org/request/show/138744 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=58
This commit is contained in:
commit
ac5d43eb2b
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- 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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
###
|
13
rsyslog.spec
13
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
|
||||
#
|
||||
@ -459,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
|
||||
@ -478,7 +477,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 +572,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}
|
||||
|
Loading…
Reference in New Issue
Block a user