Merge pull request syslog-ng#4780 from syslog-ng/version/4.6.0

Version: 4.6.0
bazsi · Jan 25, 2024 · 0ca247c · 0ca247c
2 parents 0fa3da3 + fb3ad13
commit 0ca247c
Show file tree

Hide file tree

Showing 44 changed files with 405 additions and 438 deletions.
diff --git a/NEWS.md b/NEWS.md
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ applications or forwarded by systemd) and writes everything to a single
 file:
 
 ```
-@version: 4.5
+@version: 4.6
 @include "scl.conf"
 
 log {
@@ -30,7 +30,7 @@ log {
 This one additionally processes logs from the network (TCP/514 by default):
 
 ```
-@version: 4.5
+@version: 4.6
 @include "scl.conf"
 
 log {
@@ -44,7 +44,7 @@ log {
 This config is designed for structured/application logging, using local submission via JSON, and outputting in key=value format:
 
 ```
-@version: 4.5
+@version: 4.6
 @include "scl.conf"
 
 log {

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-4.5.0
+4.6.0
diff --git 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 [email protected]
 
-@version: 4.5
+@version: 4.6
 @requires openbsd
 
 options { 

diff --git a/doc/man/dqtool.1.xml b/doc/man/dqtool.1.xml
@@ -30,7 +30,7 @@
     <refmeta>
       <refentrytitle>dqtool</refentrytitle>
       <manvolnum>1</manvolnum>
-      <refmiscinfo class="version">4.5</refmiscinfo>
+      <refmiscinfo class="version">4.6</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -117,7 +117,7 @@ Mar  3 10:52:05 tristram localprg[1234]: seq: 0000011631, runid: 1267609923, sta
         <link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
       </para>
       <note version="5.0">
-        <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.5 Administrator Guide</command></link></para>
+        <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.6 Administrator Guide</command></link></para>
         <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>
         <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>
       </note>

diff --git a/doc/man/loggen.1.xml b/doc/man/loggen.1.xml
@@ -30,7 +30,7 @@
     <refmeta>
       <refentrytitle>loggen</refentrytitle>
       <manvolnum>1</manvolnum>
-      <refmiscinfo class="version">4.5</refmiscinfo>
+      <refmiscinfo class="version">4.6</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -280,7 +280,7 @@
         <link linkend="syslog-ng.conf.5"><command>syslog-ng.conf</command>(5)</link>
       </para>
       <note version="5.0">
-        <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.5 Administrator Guide</command></link></para>
+        <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.6 Administrator Guide</command></link></para>
         <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>
         <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>
       </note>

diff --git a/doc/man/pdbtool.1.xml b/doc/man/pdbtool.1.xml
@@ -30,7 +30,7 @@
     <refmeta>
       <refentrytitle>pdbtool</refentrytitle>
       <manvolnum>1</manvolnum>
-      <refmiscinfo class="version">4.5</refmiscinfo>
+      <refmiscinfo class="version">4.6</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -377,7 +377,7 @@
                     </term>
           <listitem>
             <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>
-            <para>Default value: <parameter>4.5</parameter></para>
+            <para>Default value: <parameter>4.6</parameter></para>
           </listitem>
         </varlistentry>
         <varlistentry version="5.0">
@@ -467,7 +467,7 @@
         <link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
       </para>
       <note version="5.0">
-        <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.5 Administrator Guide</command></link></para>
+        <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.6 Administrator Guide</command></link></para>
         <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>
         <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>
       </note>

diff --git a/doc/man/persist-tool.1.xml b/doc/man/persist-tool.1.xml
@@ -30,7 +30,7 @@
         <refmeta>
             <refentrytitle>persist-tool</refentrytitle>
             <manvolnum>1</manvolnum>
-            <refmiscinfo class="version">4.5</refmiscinfo>
+            <refmiscinfo class="version">4.6</refmiscinfo>
             <refmiscinfo class="source"/>
         </refmeta>
         <refnamediv>
@@ -130,7 +130,7 @@ affile_sd_curpos(/var/aaa.txt)        OK</synopsis>
             <para><link linkend="syslog-ng.conf.5"> <command>syslog-ng.conf</command>(5)</link></para>
             <para><link linkend="syslog-ng.8"> <command>syslog-ng</command>(8)</link></para>
             <note version="5.0">
-                <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.5 Administrator Guide</command></link></para>
+                <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.6 Administrator Guide</command></link></para>
                 <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>
                 <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>
             </note>

diff --git a/doc/man/secure-logging.7.xml b/doc/man/secure-logging.7.xml
@@ -30,7 +30,7 @@
     <refmeta>
       <refentrytitle>secure-logging</refentrytitle>
       <manvolnum>7</manvolnum>
-      <refmiscinfo class="version">4.5</refmiscinfo>
+      <refmiscinfo class="version">4.6</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -190,7 +190,7 @@ AgAAAAAAAAA=:5UVybnKL1EAbgC4CLfd8HpgurjREf4LEN61/yWHSD2hbXjRD4QmQdtbwguT1chzdItK
 # entries will be logged to a single file called /var/log/messages.slog
 #
 
-@version: 4.5
+@version: 4.6
 @include "scl.conf"
 
 source s_local {

diff --git a/doc/man/slogencrypt.1.xml b/doc/man/slogencrypt.1.xml
@@ -30,7 +30,7 @@
     <refmeta>
       <refentrytitle>slogencrypt</refentrytitle>
       <manvolnum>1</manvolnum>
-      <refmiscinfo class="version">4.5</refmiscinfo>
+      <refmiscinfo class="version">4.6</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>

diff --git a/doc/man/slogkey.1.xml b/doc/man/slogkey.1.xml
@@ -30,7 +30,7 @@
     <refmeta>
       <refentrytitle>slogkey</refentrytitle>
       <manvolnum>1</manvolnum>
-      <refmiscinfo class="version">4.5</refmiscinfo>
+      <refmiscinfo class="version">4.6</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>

diff --git a/doc/man/slogverify.1.xml b/doc/man/slogverify.1.xml
@@ -30,7 +30,7 @@
     <refmeta>
       <refentrytitle>slogverify</refentrytitle>
       <manvolnum>1</manvolnum>
-      <refmiscinfo class="version">4.5</refmiscinfo>
+      <refmiscinfo class="version">4.6</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>

diff --git a/doc/man/syslog-ng-ctl.1.xml b/doc/man/syslog-ng-ctl.1.xml
@@ -30,7 +30,7 @@
     <refmeta>
       <refentrytitle>syslog-ng-ctl</refentrytitle>
       <manvolnum>1</manvolnum>
-      <refmiscinfo class="version">4.5</refmiscinfo>
+      <refmiscinfo class="version">4.6</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -178,7 +178,7 @@ destination;df_facility_dot_err;;a;processed;0</synopsis>
         <link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
       </para>
       <note version="5.0">
-        <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.5 Administrator Guide</command></link></para>
+        <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.6 Administrator Guide</command></link></para>
         <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>
         <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>
       </note>

diff --git a/doc/man/syslog-ng-debun.1.xml b/doc/man/syslog-ng-debun.1.xml
@@ -30,7 +30,7 @@
     <refmeta>
       <refentrytitle>syslog-ng-debun</refentrytitle>
       <manvolnum>1</manvolnum>
-      <refmiscinfo class="version">4.5</refmiscinfo>
+      <refmiscinfo class="version">4.6</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -242,7 +242,7 @@
         <link linkend="syslog-ng.conf.5"><command>syslog-ng.conf</command>(5)</link>
       </para>
       <note version="5.0">
-        <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.5 Administrator Guide</command></link></para>
+        <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.6 Administrator Guide</command></link></para>
         <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>
         <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>
       </note>

diff --git a/doc/man/syslog-ng.8.xml b/doc/man/syslog-ng.8.xml
@@ -30,7 +30,7 @@
     <refmeta>
       <refentrytitle>syslog-ng</refentrytitle>
       <manvolnum>8</manvolnum>
-      <refmiscinfo class="version">4.5</refmiscinfo>
+      <refmiscinfo class="version">4.6</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -306,7 +306,7 @@
             </indexterm>
           </term>
           <listitem>
-            <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.5 Administrator Guide</command> for details.</para>
+            <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.6 Administrator Guide</command> for details.</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -326,7 +326,7 @@
         <link linkend="syslog-ng.conf.5"><command>syslog-ng.conf</command>(5)</link>
       </para>
       <note version="5.0">
-        <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.5 Administrator Guide</command></link></para>
+        <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.6 Administrator Guide</command></link></para>
         <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>
         <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>
       </note>

diff --git a/doc/man/syslog-ng.conf.5.xml b/doc/man/syslog-ng.conf.5.xml
@@ -30,7 +30,7 @@
     <refmeta>
       <refentrytitle>syslog-ng.conf</refentrytitle>
       <manvolnum>5</manvolnum>
-      <refmiscinfo class="version">4.5</refmiscinfo>
+      <refmiscinfo class="version">4.6</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -461,7 +461,7 @@ log { source(s_localhost); destination(d_tcp); };</synopsis>
         <link linkend="syslog-ng.8"><command>syslog-ng</command>(8)</link>
       </para>
       <note version="5.0">
-        <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.5 Administrator Guide</command></link></para>
+        <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.6 Administrator Guide</command></link></para>
         <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>
         <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>
       </note>

diff --git a/docker/syslog-ng.conf b/docker/syslog-ng.conf
@@ -10,7 +10,7 @@
 #  docker run ...  -v "$PWD/syslog-ng.conf":/etc/syslog-ng/syslog-ng.conf
 #
 
-@version: 4.5
+@version: 4.6
 @include "scl.conf"
 
 source s_local {

diff --git a/lib/versioning.h b/lib/versioning.h
@@ -140,6 +140,7 @@
 #define VERSION_4_3 "syslog-ng 4.3"
 #define VERSION_4_4 "syslog-ng 4.4"
 #define VERSION_4_5 "syslog-ng 4.5"
+#define VERSION_4_6 "syslog-ng 4.6"
 
 /* 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 */
@@ -189,11 +190,12 @@
 #define VERSION_VALUE_4_3 0x0403
 #define VERSION_VALUE_4_4 0x0404
 #define VERSION_VALUE_4_5 0x0405
+#define VERSION_VALUE_4_6 0x0406
 
 /* config version code, in the same format as GlobalConfig->version */
-#define VERSION_VALUE_CURRENT   VERSION_VALUE_4_5
-#define VERSION_STR_CURRENT     "4.5"
-#define VERSION_PRODUCT_CURRENT VERSION_4_5
+#define VERSION_VALUE_CURRENT   VERSION_VALUE_4_6
+#define VERSION_STR_CURRENT     "4.6"
+#define VERSION_PRODUCT_CURRENT VERSION_4_6
 
 /* 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/news/bugfix-4744.md b/news/bugfix-4744.md
diff --git a/news/bugfix-4750.md b/news/bugfix-4750.md
diff --git a/news/bugfix-4759.md b/news/bugfix-4759.md
diff --git a/news/bugfix-4790.md b/news/bugfix-4790.md
diff --git a/news/developer-note-4774.md b/news/developer-note-4774.md