diff --git a/syslog-ng.conf b/syslog-ng.conf index c96f4cf..d42f127 100644 --- a/syslog-ng.conf +++ b/syslog-ng.conf @@ -1,35 +1,7 @@ -@version: 3.4 +@version: 3.6 # syslog-ng configuration file. -# -# This should behave pretty much like the original syslog on RedHat. But -# it could be configured a lot smarter. -# -# See syslog-ng(8) and syslog-ng.conf(5) for more information. -# -# 20000925 gb@sysfive.com -# -# Updated by Frank Crawford () - 10 Aug 2002 -# - for Red Hat 7.3 -# - totally do away with klogd -# - add message "kernel:" as is done with klogd. -# -# Updated by Frank Crawford () - 22 Aug 2002 -# - use the log_prefix option as per Balazs Scheidler's email -# -# Updated by Jose Pedro Oliveira () - 05 Apr 2003 -# - corrected filters 'f_filter2' and 'f_filter6' -# these filters were only allowing messages of one specific -# priority level; they should be allowing messages from that -# priority and upper levels. -# -# Updated by Jose Pedro Oliveira () - 25 Jan 2005 -# - Don't sync the d_mail destination -# -# Updated by Jose Pedro Oliveira () - 01 Feb 2005 -# - /proc/kmsg is a file not a pipe. -# (https://lists.balabit.hu/pipermail/syslog-ng/2005-February/006963.html) -# +@include "scl.conf" options { flush_lines (0); @@ -44,10 +16,9 @@ options { }; source s_sys { - file ("/proc/kmsg" program_override("kernel: ")); - unix-dgram ("/dev/log"); + #file ("/proc/kmsg" program_override("kernel: ")); + system(); internal(); - # udp(ip(0.0.0.0) port(514)); }; destination d_cons { file("/dev/console"); }; diff --git a/syslog-ng.spec b/syslog-ng.spec index 9118d79..33b04c7 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -1,7 +1,7 @@ %define majorminor %(echo %version | cut -d. -f 1-2) Name: syslog-ng -Version: 3.6.3 +Version: 3.6.4 Release: 1mamba Summary: A syslogd replacement with new functionality Group: System/Servers @@ -86,7 +86,6 @@ This package contains static libraries and header files need for development. %build %configure \ --sysconfdir=%{_sysconfdir}/syslog-ng \ - --sbindir=/sbin \ --with-module-dir=%{_libdir}/syslog-ng \ --enable-ipv6 \ --enable-tcp-wrapper \ @@ -100,7 +99,7 @@ This package contains static libraries and header files need for development. [ "%{buildroot}" != / ] && rm -rf %{buildroot} %makeinstall -install -D -m0750 %{S:1} %{buildroot}%{_initrddir}/syslog-ng +#install -D -m0750 %{S:1} %{buildroot}%{_initrddir}/syslog-ng install -D -m0644 %{S:2} \ %{buildroot}%{_sysconfdir}/syslog-ng/syslog-ng.conf install -D -m0644 %{S:3} \ @@ -167,17 +166,21 @@ exit 0 %post -n libsyslog-ng -p /sbin/ldconfig %postun -n libsyslog-ng -p /sbin/ldconfig +%posttrans +# clean broken old sysv links +find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \; +: + %files %defattr(-,root,root) -%{_initrddir}/syslog-ng %dir %{_sysconfdir}/syslog-ng %{_sysconfdir}/logrotate.d/syslog-ng #%{_sysconfdir}/syslog-ng/modules.conf %{_sysconfdir}/syslog-ng/scl.conf %config %{_sysconfdir}/syslog-ng/syslog-ng.conf %config(noreplace) %{_sysconfdir}/sysconfig/syslog-ng -/sbin/syslog-ng -/sbin/syslog-ng-ctl +%{_sbindir}/syslog-ng +%{_sbindir}/syslog-ng-ctl %{_bindir}/loggen %{_bindir}/pdbtool %{_bindir}/update-patterndb @@ -189,13 +192,7 @@ exit 0 %ghost /var/log/mail %ghost /var/log/news %{_datadir}/include/scl -#%{_datadir}/xsd/patterndb-?.xsd %{_datadir}/tools/system-expand -#%{_mandir}/man1/loggen.1.* -#%{_mandir}/man1/pdbtool.* -#%{_mandir}/man1/syslog-ng-ctl.* -#%{_mandir}/man5/syslog-ng.conf.* -#%{_mandir}/man8/syslog-ng.* %files -n libsyslog-ng %defattr(-,root,root) @@ -218,6 +215,10 @@ exit 0 #%doc NEWS %changelog +* Sun Oct 30 2016 Silvan Calarco 3.6.4-1mamba +- update to 3.6.4 +- install binaries from /sbin to /usr/sbin + * Sun Aug 02 2015 Automatic Build System 3.6.3-1mamba - automatic version update by autodist