From 144f42abb9a817e923f77916a86b9fe50bbeeacb Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 2 Apr 2024 23:23:10 +0200 Subject: [PATCH 1/2] - updated to 4.6.0 --- bison.patch | 4 ++-- syslog-ng-simple.conf | 2 +- syslog-ng.conf | 2 +- syslog-ng.spec | 33 ++++++++++++++++++++------------- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/bison.patch b/bison.patch index 9b43955..49fa338 100644 --- a/bison.patch +++ b/bison.patch @@ -5,8 +5,8 @@ diff -urNp -x '*.orig' syslog-ng-syslog-ng-4.2.0.org/Makefile.am syslog-ng-syslo SUBDIRS = DIST_SUBDIRS = AM_MAKEFLAGS = --no-print-directory --AM_YFLAGS = -Wno-yacc -Wno-other -Werror=conflicts-sr -Werror=conflicts-rr -+AM_YFLAGS = -Wnone -Werror=conflicts-sr -Werror=conflicts-rr +-AM_YFLAGS = -Wno-yacc -Wno-other -Werror=conflicts-sr -Werror=conflicts-rr -Wcounterexamples ++AM_YFLAGS = -Wnone -Werror=conflicts-sr -Werror=conflicts-rr -Wcounterexamples AM_TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)" CRITERION_TEST_PATTERN='!(*/*performance*)' ASAN_OPTIONS="detect_odr_violation=0" if ENABLE_SANITIZER diff --git a/syslog-ng-simple.conf b/syslog-ng-simple.conf index cd46fd3..e1f8c98 100644 --- a/syslog-ng-simple.conf +++ b/syslog-ng-simple.conf @@ -1,4 +1,4 @@ -@version: 4.2 +@version: 4.6 # # Syslog-ng configuration for TLD Linux # diff --git a/syslog-ng.conf b/syslog-ng.conf index 23082e5..e23b02f 100644 --- a/syslog-ng.conf +++ b/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 4.2 +@version: 4.6 @include "scl.conf" # # Syslog-ng configuration for TLD Linux diff --git a/syslog-ng.spec b/syslog-ng.spec index 3677c9a..80859a9 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -29,18 +29,18 @@ %define libivykis_version 0.42.4 %define glib2_ver 1:2.32.0 -%define mver 4.2 -%define docmver 4.2 +%define mver 4.6 +%define docmver 4.6 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: 4.2.0 +Version: 4.6.0 Release: 1 License: GPL v2+ with OpenSSL exception Group: Daemons Source0: https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz -# Source0-md5: 755953b638c07fe6ddad4c467c47f34b +# Source0-md5: 389d1d5d5b6af8e73d5b6caa37ae1bfe Source1: %{name}.init Source2: %{name}.conf Source3: %{name}.logrotate @@ -50,13 +50,12 @@ Source5: %{name}-simple.conf Source6: https://github.com/buytenh/ivykis/archive/v%{libivykis_version}/ivykis-%{libivykis_version}.tar.gz # Source6-md5: e09caeb95a01a541ec40d3b757dada12 Patch0: %{name}-datadir.patch -Patch1: pcre2.patch -Patch2: %{name}-nolibs.patch -Patch3: man-paths.patch -Patch4: %{name}-link.patch -Patch5: no_shared_ivykis.patch -Patch6: bison.patch -Patch7: shebang.patch +Patch1: %{name}-nolibs.patch +Patch2: man-paths.patch +Patch3: %{name}-link.patch +Patch4: no_shared_ivykis.patch +Patch5: bison.patch +Patch6: shebang.patch URL: https://syslog-ng.org/ BuildRequires: autoconf >= 2.59 BuildRequires: automake @@ -337,7 +336,6 @@ mv ivykis-%{libivykis_version} lib/ivykis %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 cp -p %{SOURCE4} doc cp -p %{SOURCE5} contrib/syslog-ng.conf.simple @@ -373,6 +371,7 @@ cp -p %{SOURCE5} contrib/syslog-ng.conf.simple --with-timezone-dir=%{_datadir}/zoneinfo \ --with-python-packages=none \ %{__enable_disable amqp} \ + --disable-cloud-auth \ %{__enable_disable geoip2} \ --enable-http%{!?with_http:=no} \ --enable-ipv6 \ @@ -516,7 +515,6 @@ exit 0 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}@default %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng/patterndb.d -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/scl.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/syslog-ng.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/syslog-ng %attr(754,root,root) /etc/rc.d/init.d/syslog-ng @@ -581,10 +579,12 @@ exit 0 %dir %{_datadir}/syslog-ng/include %dir %{_datadir}/syslog-ng/include/scl +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_datadir}/syslog-ng/include/scl.conf %{_datadir}/syslog-ng/include/scl/apache %{_datadir}/syslog-ng/include/scl/checkpoint %{_datadir}/syslog-ng/include/scl/cisco %{_datadir}/syslog-ng/include/scl/collectd +%{_datadir}/syslog-ng/include/scl/darwinosl %{_datadir}/syslog-ng/include/scl/default-network-drivers %{_datadir}/syslog-ng/include/scl/fortigate %{_datadir}/syslog-ng/include/scl/graphite @@ -602,7 +602,10 @@ exit 0 %{_datadir}/syslog-ng/include/scl/osquery %{_datadir}/syslog-ng/include/scl/pacct %{_datadir}/syslog-ng/include/scl/paloalto +%{_datadir}/syslog-ng/include/scl/pgsql +%{_datadir}/syslog-ng/include/scl/pihole %{_datadir}/syslog-ng/include/scl/python +%{_datadir}/syslog-ng/include/scl/qbittorrent %{_datadir}/syslog-ng/include/scl/rewrite %{_datadir}/syslog-ng/include/scl/snmptrap %{_datadir}/syslog-ng/include/scl/solaris @@ -689,10 +692,14 @@ exit 0 %{_datadir}/syslog-ng/include/scl/cim %{_datadir}/syslog-ng/include/scl/discord %{_datadir}/syslog-ng/include/scl/ewmm +%{_datadir}/syslog-ng/include/scl/google %{_datadir}/syslog-ng/include/scl/graylog2 %{_datadir}/syslog-ng/include/scl/loggly %{_datadir}/syslog-ng/include/scl/logmatic +%{_datadir}/syslog-ng/include/scl/logscale %{_datadir}/syslog-ng/include/scl/netskope +%{_datadir}/syslog-ng/include/scl/openobserve +%{_datadir}/syslog-ng/include/scl/opensearch %{_datadir}/syslog-ng/include/scl/slack %{_datadir}/syslog-ng/include/scl/splunk %{_datadir}/syslog-ng/include/scl/sumologic -- 2.44.0 From 4320aa42a2c3ab8c47430d741de61c474ac436aa Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Tue, 30 Apr 2024 10:17:24 +0200 Subject: [PATCH 2/2] - fix obsoleted keyword stats_freq in config files --- syslog-ng-simple.conf | 2 +- syslog-ng.conf | 2 +- syslog-ng.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/syslog-ng-simple.conf b/syslog-ng-simple.conf index e1f8c98..cfcb393 100644 --- a/syslog-ng-simple.conf +++ b/syslog-ng-simple.conf @@ -14,7 +14,7 @@ options { dir_owner(root); dir_group(logs); dir_perm(0750); - stats_freq(43200); + stats(freq(43200)); time_reopen(10); time_reap(360); mark_freq(600); diff --git a/syslog-ng.conf b/syslog-ng.conf index e23b02f..6380ab8 100644 --- a/syslog-ng.conf +++ b/syslog-ng.conf @@ -15,7 +15,7 @@ options { dir_owner(root); dir_group(logs); dir_perm(0750); - stats_freq(3600); + stats(freq(3600)); time_reopen(10); time_reap(360); mark_freq(600); diff --git a/syslog-ng.spec b/syslog-ng.spec index 80859a9..6745f20 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -36,7 +36,7 @@ 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: 4.6.0 -Release: 1 +Release: 2 License: GPL v2+ with OpenSSL exception Group: Daemons Source0: https://github.com/balabit/syslog-ng/archive/%{name}-%{version}.tar.gz -- 2.44.0