Skip to content

Commit 4a1edc0

Browse files
therandomstringtherandomstring
authored
Merge pull request syslog-ng#5037 from syslog-ng/version/4.8.0
Version: 4.8.0
2 parents 817b0fb + 9d0ac59 commit 4a1edc0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+181
-397
lines changed

‎NEWS.md

+131-232
Large diffs are not rendered by default.

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ applications or forwarded by systemd) and writes everything to a single
1717
file:
1818

1919
``` config
20-
@version: 4.7
20+
@version: 4.8
2121
@include "scl.conf"
2222
2323
log {
@@ -29,7 +29,7 @@ log {
2929
This one additionally processes logs from the network (TCP/514 by default):
3030

3131
``` config
32-
@version: 4.7
32+
@version: 4.8
3333
@include "scl.conf"
3434
3535
log {
@@ -43,7 +43,7 @@ log {
4343
This config is designed for structured/application logging, using local submission via JSON, and outputting in key=value format:
4444

4545
``` config
46-
@version: 4.7
46+
@version: 4.8
4747
@include "scl.conf"
4848
4949
log {

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7.1
1+
4.8.0

‎contrib/openbsd-packaging/syslog-ng.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This should provide behavior similar to OpenBSD's syslog.conf(5).
33
# 2021-05-24 [email protected]
44

5-
@version: 4.7
5+
@version: 4.8
66
@requires openbsd
77

88
options {

‎dbld/packages.manifest

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ python3-venv [debian, ubuntu, devshell]
9898

9999
# python 3.10 has issues on Debian Testing
100100
# Nevertheless we should only downgrade for Light style-check tests, which uses pre-commit
101-
python3.11 [devshell]
102-
python3.11-dev [devshell]
103-
python3.11-venv [devshell]
101+
python3.12 [devshell]
102+
python3.12-dev [devshell]
103+
python3.12-venv [devshell]
104104

105105
# libmongoc and libbson packages on various platforms
106106
# Because we are using fixed version of libmongoc on Bionic, we need to

‎doc/man/dqtool.1.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>dqtool</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.7</refmiscinfo>
33+
<refmiscinfo class="version">4.8</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -117,7 +117,7 @@ Mar 3 10:52:05 tristram localprg[1234]: seq: 0000011631, runid: 1267609923, sta
117117
<link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
118118
</para>
119119
<note version="5.0">
120-
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.syslog-ng.com/technical-documents/doc/syslog-ng-open-source-edition/3.37/administration-guide"><command>The 4.7 Administrator Guide</command></link></para>
120+
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.syslog-ng.com/technical-documents/doc/syslog-ng-open-source-edition/3.37/administration-guide"><command>The 4.8 Administrator Guide</command></link></para>
121121
<para>If you experience any problems or need help with syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://lists.balabit.hu/mailman/listinfo/syslog-ng"><command>syslog-ng mailing list</command></link>.</para>
122122
<para>For news and notifications about of syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://syslog-ng.org/blogs/"><command>syslog-ng blogs</command></link>.</para>
123123
</note>

‎doc/man/loggen.1.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>loggen</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.7</refmiscinfo>
33+
<refmiscinfo class="version">4.8</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -280,7 +280,7 @@
280280
<link linkend="syslog-ng.conf.5"><command>syslog-ng.conf</command>(5)</link>
281281
</para>
282282
<note version="5.0">
283-
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.syslog-ng.com/technical-documents/doc/syslog-ng-open-source-edition/3.37/administration-guide"><command>The 4.7 Administrator Guide</command></link></para>
283+
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.syslog-ng.com/technical-documents/doc/syslog-ng-open-source-edition/3.37/administration-guide"><command>The 4.8 Administrator Guide</command></link></para>
284284
<para>If you experience any problems or need help with syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://lists.balabit.hu/mailman/listinfo/syslog-ng"><command>syslog-ng mailing list</command></link>.</para>
285285
<para>For news and notifications about of syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://syslog-ng.org/blogs/"><command>syslog-ng blogs</command></link>.</para>
286286
</note>

‎doc/man/pdbtool.1.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>pdbtool</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.7</refmiscinfo>
33+
<refmiscinfo class="version">4.8</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -377,7 +377,7 @@
377377
</term>
378378
<listitem>
379379
<para>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 <parameter>--support=3.0</parameter> 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.</para>
380-
<para>Default value: <parameter>4.7</parameter></para>
380+
<para>Default value: <parameter>4.8</parameter></para>
381381
</listitem>
382382
</varlistentry>
383383
<varlistentry version="5.0">
@@ -467,7 +467,7 @@
467467
<link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
468468
</para>
469469
<note version="5.0">
470-
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.7 Administrator Guide</command></link></para>
470+
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.8 Administrator Guide</command></link></para>
471471
<para>If you experience any problems or need help with syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://lists.balabit.hu/mailman/listinfo/syslog-ng"><command>syslog-ng mailing list</command></link>.</para>
472472
<para>For news and notifications about of syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://syslog-ng.org/blogs/"><command>syslog-ng blogs</command></link>.</para>
473473
</note>

‎doc/man/persist-tool.1.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>persist-tool</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.7</refmiscinfo>
33+
<refmiscinfo class="version">4.8</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -130,7 +130,7 @@ affile_sd_curpos(/var/aaa.txt) OK</synopsis>
130130
<para><link linkend="syslog-ng.conf.5"> <command>syslog-ng.conf</command>(5)</link></para>
131131
<para><link linkend="syslog-ng.8"> <command>syslog-ng</command>(8)</link></para>
132132
<note version="5.0">
133-
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.7 Administrator Guide</command></link></para>
133+
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.8 Administrator Guide</command></link></para>
134134
<para>If you experience any problems or need help with syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://lists.balabit.hu/mailman/listinfo/syslog-ng"><command>syslog-ng mailing list</command></link>.</para>
135135
<para>For news and notifications about of syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://syslog-ng.org/blogs/"><command>syslog-ng blogs</command></link>.</para>
136136
</note>

‎doc/man/secure-logging.7.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>secure-logging</refentrytitle>
3232
<manvolnum>7</manvolnum>
33-
<refmiscinfo class="version">4.7</refmiscinfo>
33+
<refmiscinfo class="version">4.8</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -190,7 +190,7 @@ AgAAAAAAAAA=:5UVybnKL1EAbgC4CLfd8HpgurjREf4LEN61/yWHSD2hbXjRD4QmQdtbwguT1chzdItK
190190
# entries will be logged to a single file called /var/log/messages.slog
191191
#
192192
193-
@version: 4.7
193+
@version: 4.8
194194
@include "scl.conf"
195195
196196
source s_local {

‎doc/man/slogencrypt.1.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>slogencrypt</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.7</refmiscinfo>
33+
<refmiscinfo class="version">4.8</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>

‎doc/man/slogkey.1.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>slogkey</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.7</refmiscinfo>
33+
<refmiscinfo class="version">4.8</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>

‎doc/man/slogverify.1.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>slogverify</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.7</refmiscinfo>
33+
<refmiscinfo class="version">4.8</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>

‎doc/man/syslog-ng-ctl.1.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>syslog-ng-ctl</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.7</refmiscinfo>
33+
<refmiscinfo class="version">4.8</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -178,7 +178,7 @@ destination;df_facility_dot_err;;a;processed;0</synopsis>
178178
<link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
179179
</para>
180180
<note version="5.0">
181-
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.7 Administrator Guide</command></link></para>
181+
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.8 Administrator Guide</command></link></para>
182182
<para>If you experience any problems or need help with syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://lists.balabit.hu/mailman/listinfo/syslog-ng"><command>syslog-ng mailing list</command></link>.</para>
183183
<para>For news and notifications about of syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://syslog-ng.org/blogs/"><command>syslog-ng blogs</command></link>.</para>
184184
</note>

‎doc/man/syslog-ng-debun.1.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>syslog-ng-debun</refentrytitle>
3232
<manvolnum>1</manvolnum>
33-
<refmiscinfo class="version">4.7</refmiscinfo>
33+
<refmiscinfo class="version">4.8</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -242,7 +242,7 @@
242242
<link linkend="syslog-ng.conf.5"><command>syslog-ng.conf</command>(5)</link>
243243
</para>
244244
<note version="5.0">
245-
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.7 Administrator Guide</command></link></para>
245+
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.8 Administrator Guide</command></link></para>
246246
<para>If you experience any problems or need help with syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://lists.balabit.hu/mailman/listinfo/syslog-ng"><command>syslog-ng mailing list</command></link>.</para>
247247
<para>For news and notifications about of syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://syslog-ng.org/blogs/"><command>syslog-ng blogs</command></link>.</para>
248248
</note>

‎doc/man/syslog-ng.8.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>syslog-ng</refentrytitle>
3232
<manvolnum>8</manvolnum>
33-
<refmiscinfo class="version">4.7</refmiscinfo>
33+
<refmiscinfo class="version">4.8</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -306,7 +306,7 @@
306306
</indexterm>
307307
</term>
308308
<listitem>
309-
<para>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 <command>The 4.7 Administrator Guide</command> for details.</para>
309+
<para>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 <command>The 4.8 Administrator Guide</command> for details.</para>
310310
</listitem>
311311
</varlistentry>
312312
</variablelist>
@@ -326,7 +326,7 @@
326326
<link linkend="syslog-ng.conf.5"><command>syslog-ng.conf</command>(5)</link>
327327
</para>
328328
<note version="5.0">
329-
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.7 Administrator Guide</command></link></para>
329+
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.8 Administrator Guide</command></link></para>
330330
<para>If you experience any problems or need help with syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://lists.balabit.hu/mailman/listinfo/syslog-ng"><command>syslog-ng mailing list</command></link>.</para>
331331
<para>For news and notifications about of syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://syslog-ng.org/blogs/"><command>syslog-ng blogs</command></link>.</para>
332332
</note>

‎doc/man/syslog-ng.conf.5.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<refmeta>
3131
<refentrytitle>syslog-ng.conf</refentrytitle>
3232
<manvolnum>5</manvolnum>
33-
<refmiscinfo class="version">4.7</refmiscinfo>
33+
<refmiscinfo class="version">4.8</refmiscinfo>
3434
<refmiscinfo class="source"/>
3535
</refmeta>
3636
<refnamediv>
@@ -461,7 +461,7 @@ log { source(s_localhost); destination(d_tcp); };</synopsis>
461461
<link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
462462
</para>
463463
<note version="5.0">
464-
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.7 Administrator Guide</command></link></para>
464+
<para>For the detailed documentation of see <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://www.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The 4.8 Administrator Guide</command></link></para>
465465
<para>If you experience any problems or need help with syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://lists.balabit.hu/mailman/listinfo/syslog-ng"><command>syslog-ng mailing list</command></link>.</para>
466466
<para>For news and notifications about of syslog-ng, visit the <link xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="https://syslog-ng.org/blogs/"><command>syslog-ng blogs</command></link>.</para>
467467
</note>

‎docker/syslog-ng.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# docker run ... -v "$PWD/syslog-ng.conf":/etc/syslog-ng/syslog-ng.conf
1111
#
1212

13-
@version: 4.7
13+
@version: 4.8
1414
@include "scl.conf"
1515

1616
source s_local {

‎lib/versioning.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
#define VERSION_4_5 "syslog-ng 4.5"
143143
#define VERSION_4_6 "syslog-ng 4.6"
144144
#define VERSION_4_7 "syslog-ng 4.7"
145+
#define VERSION_4_8 "syslog-ng 4.8"
145146

146147
/* VERSION_VALUE_* references versions as integers to be compared against stuff like cfg->user_version */
147148
/* VERSION_STR_* references versions as strings to be shown to the user */
@@ -193,11 +194,12 @@
193194
#define VERSION_VALUE_4_5 0x0405
194195
#define VERSION_VALUE_4_6 0x0406
195196
#define VERSION_VALUE_4_7 0x0407
197+
#define VERSION_VALUE_4_8 0x0408
196198

197199
/* config version code, in the same format as GlobalConfig->version */
198-
#define VERSION_VALUE_CURRENT VERSION_VALUE_4_7
199-
#define VERSION_STR_CURRENT "4.7"
200-
#define VERSION_PRODUCT_CURRENT VERSION_4_7
200+
#define VERSION_VALUE_CURRENT VERSION_VALUE_4_8
201+
#define VERSION_STR_CURRENT "4.8"
202+
#define VERSION_PRODUCT_CURRENT VERSION_4_8
201203

202204
/* this value points to the last syslog-ng version where we changed the
203205
* meaning of any setting in the configuration file. Basically, it is the

‎news/bugfix-162.md

-3
This file was deleted.

‎news/bugfix-169.md

-3
This file was deleted.

‎news/bugfix-216.md

-3
This file was deleted.

‎news/bugfix-4947.md

-3
This file was deleted.

‎news/bugfix-4994.md

-3
This file was deleted.

‎news/bugfix-4995-2.md

-1
This file was deleted.

‎news/bugfix-4995.md

-3
This file was deleted.

‎news/bugfix-4998.md

-14
This file was deleted.

‎news/feature-4544.md

-3
This file was deleted.

0 commit comments

Comments
 (0)