From 88175d4d3d814bd9c6910e7b8609f315e7936dc3 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions@users.noreply.github.com> Date: Thu, 4 Jul 2024 12:51:48 +0000 Subject: [PATCH] version: bumped to 4.8.0 Signed-off-by: github-actions <41898282+github-actions@users.noreply.github.com> --- README.md | 8 ++++---- VERSION.txt | 2 +- contrib/openbsd-packaging/syslog-ng.conf | 2 +- doc/man/dqtool.1.xml | 4 ++-- doc/man/loggen.1.xml | 4 ++-- doc/man/pdbtool.1.xml | 6 +++--- doc/man/persist-tool.1.xml | 4 ++-- doc/man/secure-logging.7.xml | 4 ++-- doc/man/slogencrypt.1.xml | 2 +- doc/man/slogkey.1.xml | 2 +- doc/man/slogverify.1.xml | 2 +- doc/man/syslog-ng-ctl.1.xml | 4 ++-- doc/man/syslog-ng-debun.1.xml | 4 ++-- doc/man/syslog-ng.8.xml | 6 +++--- doc/man/syslog-ng.conf.5.xml | 4 ++-- docker/apkbuild/axoflow/axosyslog/APKBUILD | 4 ++-- lib/versioning.h | 8 +++++--- packaging/debian/changelog | 6 ++++++ packaging/debian/syslog-ng.conf | 2 +- packaging/rhel/axosyslog.spec | 5 ++++- packaging/rhel/syslog-ng.conf | 2 +- scl/syslog-ng.conf | 2 +- 22 files changed, 49 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index dc04498738..5f96d2a330 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ [![Binary packages](https://github.com/axoflow/axosyslog/actions/workflows/packages.yml/badge.svg)](https://github.com/axoflow/axosyslog/actions/workflows/packages.yml) AxoSyslog started as a syslog-ng [[1]](#r1) fork, branched right after -syslog-ng v4.7.1 with the following focus: +syslog-ng v4.8.0 with the following focus: * cloud native (containers, helm charts, kubernetes integration), * security data tailored parsing and transformation (filterx, app-parser, app-transform, etc) * performance (eBPF, memory allocator, etc), @@ -45,7 +45,7 @@ A simple example is to ingest syslog traffic on tcp/514 and write it to a file: ``` -@version: 4.7 +@version: 4.8 @include "scl.conf" log { @@ -85,7 +85,7 @@ docker pull ghcr.io/axoflow/axosyslog:nightly > Note: These named packages are automatically updated when a new AxoSyslog package is released. To install a specific version, run `docker pull ghcr.io/axoflow/axosyslog:`, for example: > > ```shell -> docker pull ghcr.io/axoflow/axosyslog:4.7.1 +> docker pull ghcr.io/axoflow/axosyslog:4.8.0 > ``` The container images contain a default configuration file which you probably @@ -163,7 +163,7 @@ on the [Axoflow website](https://axoflow.com/). ## Difference from syslog-ng The original founder of syslog-ng forked off AxoSyslog from the original -syslog-ng after the 4.7.1 release. AxoSyslog is a drop in replacement, retaining +syslog-ng after the 4.8.0 release. AxoSyslog is a drop in replacement, retaining the original license, release schedule and processes. ## Contact and support diff --git a/VERSION.txt b/VERSION.txt index 7c66fca579..88f181192c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -4.7.1 +4.8.0 diff --git a/contrib/openbsd-packaging/syslog-ng.conf b/contrib/openbsd-packaging/syslog-ng.conf index f3e2b090c2..6a8a2beda2 100644 --- a/contrib/openbsd-packaging/syslog-ng.conf +++ b/contrib/openbsd-packaging/syslog-ng.conf @@ -2,7 +2,7 @@ # This should provide behavior similar to OpenBSD's syslog.conf(5). # 2021-05-24 millert@openbsd.org -@version: 4.7 +@version: 4.8 @requires openbsd options { diff --git a/doc/man/dqtool.1.xml b/doc/man/dqtool.1.xml index f6ae1e83ad..de7e9ed2c6 100644 --- a/doc/man/dqtool.1.xml +++ b/doc/man/dqtool.1.xml @@ -30,7 +30,7 @@ dqtool 1 - 4.7 + 4.8 @@ -117,7 +117,7 @@ Mar 3 10:52:05 tristram localprg[1234]: seq: 0000011631, runid: 1267609923, sta syslog-ng(8) - For the detailed documentation of see The 4.7 Administrator Guide + For the detailed documentation of see The 4.8 Administrator Guide If you experience any problems or need help with syslog-ng, visit the syslog-ng mailing list. For news and notifications about of syslog-ng, visit the syslog-ng blogs. diff --git a/doc/man/loggen.1.xml b/doc/man/loggen.1.xml index ffb4eb45a5..ee6cc4ccaf 100644 --- a/doc/man/loggen.1.xml +++ b/doc/man/loggen.1.xml @@ -30,7 +30,7 @@ loggen 1 - 4.7 + 4.8 @@ -280,7 +280,7 @@ syslog-ng.conf(5) - For the detailed documentation of see The 4.7 Administrator Guide + For the detailed documentation of see The 4.8 Administrator Guide If you experience any problems or need help with syslog-ng, visit the syslog-ng mailing list. For news and notifications about of syslog-ng, visit the syslog-ng blogs. diff --git a/doc/man/pdbtool.1.xml b/doc/man/pdbtool.1.xml index 330cdaa20f..5ee2e48cc4 100644 --- a/doc/man/pdbtool.1.xml +++ b/doc/man/pdbtool.1.xml @@ -30,7 +30,7 @@ pdbtool 1 - 4.7 + 4.8 @@ -377,7 +377,7 @@ A pattern is added to the output pattern database if at least the specified percentage of log messages from the input logfile match the pattern. For example, if the input logfile contains 1000 log messages and the --support=3.0 option is used, a pattern is created only if the pattern matches at least 3 percent of the log messages (that is, 30 log messages). If patternize does not create enough patterns, try to decrease the support value. - Default value: 4.7 + Default value: 4.8 @@ -467,7 +467,7 @@ syslog-ng(8) - For the detailed documentation of see The 4.7 Administrator Guide + For the detailed documentation of see The 4.8 Administrator Guide If you experience any problems or need help with syslog-ng, visit the syslog-ng mailing list. For news and notifications about of syslog-ng, visit the syslog-ng blogs. diff --git a/doc/man/persist-tool.1.xml b/doc/man/persist-tool.1.xml index 77a0609eb1..02169eb054 100644 --- a/doc/man/persist-tool.1.xml +++ b/doc/man/persist-tool.1.xml @@ -30,7 +30,7 @@ persist-tool 1 - 4.7 + 4.8 @@ -130,7 +130,7 @@ affile_sd_curpos(/var/aaa.txt) OK syslog-ng.conf(5) syslog-ng(8) - For the detailed documentation of see The 4.7 Administrator Guide + For the detailed documentation of see The 4.8 Administrator Guide If you experience any problems or need help with syslog-ng, visit the syslog-ng mailing list. For news and notifications about of syslog-ng, visit the syslog-ng blogs. diff --git a/doc/man/secure-logging.7.xml b/doc/man/secure-logging.7.xml index 40560ed359..3ca88cd539 100644 --- a/doc/man/secure-logging.7.xml +++ b/doc/man/secure-logging.7.xml @@ -30,7 +30,7 @@ secure-logging 7 - 4.7 + 4.8 @@ -190,7 +190,7 @@ AgAAAAAAAAA=:5UVybnKL1EAbgC4CLfd8HpgurjREf4LEN61/yWHSD2hbXjRD4QmQdtbwguT1chzdItK # entries will be logged to a single file called /var/log/messages.slog # -@version: 4.7 +@version: 4.8 @include "scl.conf" source s_local { diff --git a/doc/man/slogencrypt.1.xml b/doc/man/slogencrypt.1.xml index 505c68ea02..e943248a31 100644 --- a/doc/man/slogencrypt.1.xml +++ b/doc/man/slogencrypt.1.xml @@ -30,7 +30,7 @@ slogencrypt 1 - 4.7 + 4.8 diff --git a/doc/man/slogkey.1.xml b/doc/man/slogkey.1.xml index 77ec8484e6..b90a822a5d 100644 --- a/doc/man/slogkey.1.xml +++ b/doc/man/slogkey.1.xml @@ -30,7 +30,7 @@ slogkey 1 - 4.7 + 4.8 diff --git a/doc/man/slogverify.1.xml b/doc/man/slogverify.1.xml index 2b5378a366..0bd0b003ca 100644 --- a/doc/man/slogverify.1.xml +++ b/doc/man/slogverify.1.xml @@ -30,7 +30,7 @@ slogverify 1 - 4.7 + 4.8 diff --git a/doc/man/syslog-ng-ctl.1.xml b/doc/man/syslog-ng-ctl.1.xml index 23341d35fa..7910b29817 100644 --- a/doc/man/syslog-ng-ctl.1.xml +++ b/doc/man/syslog-ng-ctl.1.xml @@ -30,7 +30,7 @@ syslog-ng-ctl 1 - 4.7 + 4.8 @@ -178,7 +178,7 @@ destination;df_facility_dot_err;;a;processed;0 syslog-ng(8) - For the detailed documentation of see The 4.7 Administrator Guide + For the detailed documentation of see The 4.8 Administrator Guide If you experience any problems or need help with syslog-ng, visit the syslog-ng mailing list. For news and notifications about of syslog-ng, visit the syslog-ng blogs. diff --git a/doc/man/syslog-ng-debun.1.xml b/doc/man/syslog-ng-debun.1.xml index f21f89457b..e05d69ec56 100644 --- a/doc/man/syslog-ng-debun.1.xml +++ b/doc/man/syslog-ng-debun.1.xml @@ -30,7 +30,7 @@ syslog-ng-debun 1 - 4.7 + 4.8 @@ -242,7 +242,7 @@ syslog-ng.conf(5) - For the detailed documentation of see The 4.7 Administrator Guide + For the detailed documentation of see The 4.8 Administrator Guide If you experience any problems or need help with syslog-ng, visit the syslog-ng mailing list. For news and notifications about of syslog-ng, visit the syslog-ng blogs. diff --git a/doc/man/syslog-ng.8.xml b/doc/man/syslog-ng.8.xml index 1cf33184f2..030d4349fb 100644 --- a/doc/man/syslog-ng.8.xml +++ b/doc/man/syslog-ng.8.xml @@ -30,7 +30,7 @@ syslog-ng 8 - 4.7 + 4.8 @@ -306,7 +306,7 @@ - Sets the number of worker threads can use, including the main thread. Note that certain operations in can use threads that are not limited by this option. This setting has effect only when is running in multithreaded mode. Available only in and later. See The 4.7 Administrator Guide for details. + Sets the number of worker threads can use, including the main thread. Note that certain operations in can use threads that are not limited by this option. This setting has effect only when is running in multithreaded mode. Available only in and later. See The 4.8 Administrator Guide for details. @@ -326,7 +326,7 @@ syslog-ng.conf(5) - For the detailed documentation of see The 4.7 Administrator Guide + For the detailed documentation of see The 4.8 Administrator Guide If you experience any problems or need help with syslog-ng, visit the syslog-ng mailing list. For news and notifications about of syslog-ng, visit the syslog-ng blogs. diff --git a/doc/man/syslog-ng.conf.5.xml b/doc/man/syslog-ng.conf.5.xml index b7f263ceae..4be357b6e0 100644 --- a/doc/man/syslog-ng.conf.5.xml +++ b/doc/man/syslog-ng.conf.5.xml @@ -30,7 +30,7 @@ syslog-ng.conf 5 - 4.7 + 4.8 @@ -461,7 +461,7 @@ log { source(s_localhost); destination(d_tcp); }; syslog-ng(8) - For the detailed documentation of see The 4.7 Administrator Guide + For the detailed documentation of see The 4.8 Administrator Guide If you experience any problems or need help with syslog-ng, visit the syslog-ng mailing list. For news and notifications about of syslog-ng, visit the syslog-ng blogs. diff --git a/docker/apkbuild/axoflow/axosyslog/APKBUILD b/docker/apkbuild/axoflow/axosyslog/APKBUILD index 357fe513fe..21b655d1bf 100644 --- a/docker/apkbuild/axoflow/axosyslog/APKBUILD +++ b/docker/apkbuild/axoflow/axosyslog/APKBUILD @@ -5,7 +5,7 @@ # Contributor: jv # Maintainer: László Várady pkgname=axosyslog -pkgver=4.7.1 +pkgver=4.8.0 pkgrel=0 pkgdesc="Next generation logging daemon" url="https://axoflow.com/docs/axosyslog/" @@ -174,5 +174,5 @@ _submv() { } sha512sums=" -SKIP axosyslog-4.7.1.tar.gz +SKIP axosyslog-4.8.0.tar.gz " diff --git a/lib/versioning.h b/lib/versioning.h index 35e0f9428c..6b7aa3336f 100644 --- a/lib/versioning.h +++ b/lib/versioning.h @@ -142,6 +142,7 @@ #define VERSION_4_5 "syslog-ng 4.5" #define VERSION_4_6 "syslog-ng 4.6" #define VERSION_4_7 "syslog-ng 4.7" +#define VERSION_4_8 "syslog-ng 4.8" /* VERSION_VALUE_* references versions as integers to be compared against stuff like cfg->user_version */ /* VERSION_STR_* references versions as strings to be shown to the user */ @@ -193,11 +194,12 @@ #define VERSION_VALUE_4_5 0x0405 #define VERSION_VALUE_4_6 0x0406 #define VERSION_VALUE_4_7 0x0407 +#define VERSION_VALUE_4_8 0x0408 /* config version code, in the same format as GlobalConfig->version */ -#define VERSION_VALUE_CURRENT VERSION_VALUE_4_7 -#define VERSION_STR_CURRENT "4.7" -#define VERSION_PRODUCT_CURRENT VERSION_4_7 +#define VERSION_VALUE_CURRENT VERSION_VALUE_4_8 +#define VERSION_STR_CURRENT "4.8" +#define VERSION_PRODUCT_CURRENT VERSION_4_8 /* this value points to the last syslog-ng version where we changed the * meaning of any setting in the configuration file. Basically, it is the diff --git a/packaging/debian/changelog b/packaging/debian/changelog index df128a9840..56dfc49ce0 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +axosyslog (4.8.0-1) unstable; urgency=medium + + * New upstream release 4.8.0 + + -- github-actions <41898282+github-actions@users.noreply.github.com> Thu, 04 Jul 2024 12:51:48 +0000 + axosyslog (4.7.1-1) unstable; urgency=medium * New upstream release 4.7.1 diff --git a/packaging/debian/syslog-ng.conf b/packaging/debian/syslog-ng.conf index 36c61c8c54..eeac2d09af 100644 --- a/packaging/debian/syslog-ng.conf +++ b/packaging/debian/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 4.7 +@version: 4.8 @include "scl.conf" # Syslog-ng configuration file, compatible with default Debian syslogd diff --git a/packaging/rhel/axosyslog.spec b/packaging/rhel/axosyslog.spec index 37a71bd403..ff5740807a 100644 --- a/packaging/rhel/axosyslog.spec +++ b/packaging/rhel/axosyslog.spec @@ -1,5 +1,5 @@ Name: axosyslog -Version: 4.7.1 +Version: 4.8.0 Release: 2%{?dist} Summary: Next-generation syslog server @@ -676,6 +676,9 @@ fi %changelog +* Thu Jul 4 2024 github-actions <41898282+github-actions@users.noreply.github.com> - 4.8.0-1 +- updated to 4.8.0 + * Fri Apr 19 2024 github-actions <41898282+github-actions@users.noreply.github.com> - 4.7.1-1 - updated to 4.7.1 diff --git a/packaging/rhel/syslog-ng.conf b/packaging/rhel/syslog-ng.conf index 0d14b143b3..fae220baf9 100644 --- a/packaging/rhel/syslog-ng.conf +++ b/packaging/rhel/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 4.7 +@version: 4.8 @include "scl.conf" # syslog-ng configuration file. diff --git a/scl/syslog-ng.conf b/scl/syslog-ng.conf index 68f4217440..01c8b38bb0 100644 --- a/scl/syslog-ng.conf +++ b/scl/syslog-ng.conf @@ -3,7 +3,7 @@ # single file called /var/log/messages. # -@version: 4.7 +@version: 4.8 @include "scl.conf" source s_local {