From a01985cff95a620f5b2225c543a5809c54e3b561 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 1 Jan 2021 20:30:04 +0100 Subject: [PATCH] - updated to 3.30.1 --- syslog-ng-simple.conf | 2 +- syslog-ng.conf | 2 +- syslog-ng.spec | 30 +++++++++++++++++++----------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/syslog-ng-simple.conf b/syslog-ng-simple.conf index 691f933..91f9047 100644 --- a/syslog-ng-simple.conf +++ b/syslog-ng-simple.conf @@ -1,4 +1,4 @@ -@version: 3.26 +@version: 3.30 # # Syslog-ng configuration for TLD Linux # diff --git a/syslog-ng.conf b/syslog-ng.conf index f845a44..7e3afb9 100644 --- a/syslog-ng.conf +++ b/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.26 +@version: 3.30 @include "scl.conf" # # Syslog-ng configuration for TLD Linux diff --git a/syslog-ng.spec b/syslog-ng.spec index 1f63606..8cae05b 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -28,19 +28,19 @@ # as in git submodule %define libivykis_version 0.42.4 -%define glib2_ver 1:2.24.0 -%define mver 3.26 -%define docmver 3.26 +%define glib2_ver 1:2.28.0 +%define mver 3.30 +%define docmver 3.30 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.26.1 +Version: 3.30.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: a0d2b117ff8fb9a25e94446271285b87 +# Source0-md5: c17a8df8def95dbbe6c93db18842cedd Source1: %{name}.init Source2: %{name}.conf Source3: %{name}.logrotate @@ -65,10 +65,10 @@ BuildRequires: docbook-style-xsl BuildRequires: flex BuildRequires: glib2-devel >= %{glib2_ver} %{?with_redis:BuildRequires: hiredis-devel} -%{?with_json:BuildRequires: json-c-devel >= 0.9} +%{?with_json:BuildRequires: json-c-devel >= 0.13} %{?with_mongodb:BuildRequires: libbson-devel} BuildRequires: libcap-devel -%{?with_sql:BuildRequires: libdbi-devel >= 0.8.3-2} +%{?with_sql:BuildRequires: libdbi-devel >= 0.9.0} %{?with_smtp:BuildRequires: libesmtp-devel} %{?with_system_libivykis:BuildRequires: libivykis-devel >= %{libivykis_version}} %{?with_mongodb:BuildRequires: mongo-c-driver-devel} @@ -81,7 +81,7 @@ BuildRequires: lz4-devel >= r131-5 BuildRequires: openssl-devel >= 0.9.8 BuildRequires: pcre-devel >= 6.1 BuildRequires: pkgconfig -%{?with_system_rabbitmq:BuildRequires: rabbitmq-c-devel >= 0.0.1} +%{?with_system_rabbitmq:BuildRequires: rabbitmq-c-devel >= 0.5.3} %{?with_riemann:BuildRequires: riemann-c-client-devel >= 1.0.0} BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.623 @@ -484,6 +484,7 @@ exit 0 %endif %attr(755,root,root) %{moduledir}/libaffile.so %attr(755,root,root) %{moduledir}/libafprog.so +%attr(755,root,root) %{moduledir}/libafsnmp.so %attr(755,root,root) %{moduledir}/libafsocket.so %attr(755,root,root) %{moduledir}/libafstomp.so %attr(755,root,root) %{moduledir}/libafuser.so @@ -510,8 +511,7 @@ exit 0 %attr(755,root,root) %{moduledir}/libmap-value-pairs.so %attr(755,root,root) %{moduledir}/libpacctformat.so %attr(755,root,root) %{moduledir}/libpseudofile.so -%attr(755,root,root) %{moduledir}/libsnmpdest.so -%attr(755,root,root) %{moduledir}/libsnmptrapd-parser.so +%attr(755,root,root) %{moduledir}/libsecure-logging.so %attr(755,root,root) %{moduledir}/libstardate.so %attr(755,root,root) %{moduledir}/libtags-parser.so %attr(755,root,root) %{moduledir}/libtfgetent.so @@ -525,6 +525,9 @@ exit 0 %attr(755,root,root) %{_bindir}/loggen %attr(755,root,root) %{_bindir}/pdbtool %attr(755,root,root) %{_bindir}/persist-tool +%attr(755,root,root) %{_bindir}/slogencrypt +%attr(755,root,root) %{_bindir}/slogkey +%attr(755,root,root) %{_bindir}/slogverify %attr(755,root,root) %{_bindir}/update-patterndb %dir %{_datadir}/syslog-ng/include @@ -548,10 +551,12 @@ exit 0 %{_datadir}/syslog-ng/include/scl/nodejs %{_datadir}/syslog-ng/include/scl/osquery %{_datadir}/syslog-ng/include/scl/pacct +%{_datadir}/syslog-ng/include/scl/paloalto %{_datadir}/syslog-ng/include/scl/rewrite %{_datadir}/syslog-ng/include/scl/snmptrap %{_datadir}/syslog-ng/include/scl/solaris %{_datadir}/syslog-ng/include/scl/sudo +%{_datadir}/syslog-ng/include/scl/sumologic %{_datadir}/syslog-ng/include/scl/websense %{_datadir}/syslog-ng/include/scl/windowseventlog %dir %{_datadir}/syslog-ng/include/scl/syslogconf @@ -566,7 +571,11 @@ exit 0 %{_mandir}/man1/dqtool.1* %{_mandir}/man1/loggen.1* %{_mandir}/man1/pdbtool.1* +%{_mandir}/man1/slogencrypt.1* +%{_mandir}/man1/slogkey.1* +%{_mandir}/man1/slogverify.1* %{_mandir}/man1/persist-tool.1* +%{_mandir}/man7/secure-logging.7* %{_mandir}/man1/syslog-ng-ctl.1* %{_mandir}/man5/syslog-ng.conf.5* %{_mandir}/man8/syslog-ng.8* @@ -665,7 +674,6 @@ exit 0 %{_includedir}/syslog-ng/control %{_includedir}/syslog-ng/debugger %{_includedir}/syslog-ng/filter -%{_includedir}/syslog-ng/http-auth %if %{without system_libivykis} %{_includedir}/syslog-ng/ivykis %endif -- 2.46.0