- updated to 3.18.1

diff --git a/syslog-ng-simple.conf b/syslog-ng-simple.conf
index 5a4752f02ab403ccff4557608fb0e0de1eb5c4d2..d6023c77e77e10d92c1d7373a05a71991a1d488e 100644 (file)
--- a/syslog-ng-simple.conf
+++ b/syslog-ng-simple.conf
@@ -1,4 +1,4 @@
-@version: 3.17
+@version: 3.18
 #
 # Syslog-ng configuration for TLD Linux
 #

diff --git a/syslog-ng.conf b/syslog-ng.conf
index 8103f1183e06a92bd84c045c7dd9dd832d692fd9..a6069d4b6f258b9309e5eeffc810cff802764000 100644 (file)
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.17
+@version: 3.18
 @include "scl.conf"
 #
 # Syslog-ng configuration for TLD Linux

diff --git a/syslog-ng.spec b/syslog-ng.spec
index cead3808a20d51db5de3991f0bd4115dd2a37b5e..7957819718075c0bd4d81f03cd9374cf7165ef79 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -30,18 +30,18 @@
 %define        libivykis_version 0.42.3
 
 %define                glib2_ver       1:2.24.0
-%define                mver    3.17
-%define                docmver 3.17
+%define                mver    3.18
+%define                docmver 3.18
 Summary:       Syslog-ng - new generation of the system logger
 Summary(pl.UTF-8):     Syslog-ng - systemowy demon logujący nowej generacji
 Summary(pt_BR.UTF-8):  Daemon de log nova geração
 Name:          syslog-ng
-Version:       3.17.2
-Release:       2
+Version:       3.18.1
+Release:       1
 License:       GPL v2+ with OpenSSL exception
 Group:         Daemons
 Source0:       https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz
-# Source0-md5: cabeed054c4734f91bf6784bb14cde57
+# Source0-md5: 43dc0dbe1c6de5118b2684d009c2ca04
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.logrotate
@@ -51,11 +51,10 @@ Source5:    %{name}-simple.conf
 Source6:       https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-%{libivykis_version}.tar.gz
 # Source6-md5: 4d84813d011ff671e66eccc952a5c78f
 Patch0:                %{name}-datadir.patch
-Patch1:                cap_syslog-vserver-workaround.patch
-Patch2:                %{name}-nolibs.patch
-Patch4:                man-paths.patch
-Patch5:                %{name}-link.patch
-Patch6:                no_shared_ivykis.patch
+Patch1:                %{name}-nolibs.patch
+Patch2:                man-paths.patch
+Patch3:                %{name}-link.patch
+Patch4:                no_shared_ivykis.patch
 URL:           https://syslog-ng.org/
 %{?with_geoip:BuildRequires:   GeoIP-devel >= 1.5.1}
 BuildRequires: autoconf >= 2.59
@@ -319,9 +318,8 @@ mv ivykis-%{libivykis_version} lib/ivykis
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 cp -p %{SOURCE4} doc
 cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 
@@ -514,6 +512,7 @@ exit 0
 %attr(755,root,root) %{moduledir}/libdate.so
 %attr(755,root,root) %{moduledir}/libdbparser.so
 %attr(755,root,root) %{moduledir}/libdisk-buffer.so
+%attr(755,root,root) %{moduledir}/libexamples.so
 %if %{with geoip2}
 %attr(755,root,root) %{moduledir}/libgeoip2-plugin.so
 %endif
@@ -549,6 +548,8 @@ exit 0
 %{_datadir}/syslog-ng/include/scl/hdfs
 %{_datadir}/syslog-ng/include/scl/kafka
 %{_datadir}/syslog-ng/include/scl/iptables
+%{_datadir}/syslog-ng/include/scl/linux-audit
+
 %dir %{_datadir}/syslog-ng/include/scl/loadbalancer
 %attr(755,root,root) %{_datadir}/syslog-ng/include/scl/loadbalancer/gen-loadbalancer.sh
 %{_datadir}/syslog-ng/include/scl/loadbalancer/plugin.conf
@@ -680,6 +681,7 @@ exit 0
 %endif
 %{_includedir}/syslog-ng/logmsg
 %{_includedir}/syslog-ng/logproto
+%{_includedir}/syslog-ng/logthrsource
 %dir %{_includedir}/syslog-ng/modules
 %{_includedir}/syslog-ng/modules/add-contextual-data
 %{_includedir}/syslog-ng/parser