Merge pull request #2882 from lbudai/version/3.23

Version/3.23
syslog-ng · Aug 26, 2019 · 26c0fe2 · 26c0fe2
2 parents 2cf8bdd + 6b02616
commit 26c0fe2
Show file tree

Hide file tree

Showing 36 changed files with 63 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ applications or forwarded by systemd) and writes everything to a single
 file:
 
 ```
-@version: 3.22
+@version: 3.23
 @include "scl.conf"
 
 log {
@@ -27,7 +27,7 @@ log {
 This one additionally processes logs from the network (TCP/514 by default):
 
 ```
-@version: 3.22
+@version: 3.23
 @include "scl.conf"
 
 log {
@@ -41,7 +41,7 @@ log {
 This config is designed for structured/application logging, using local submission via JSON, and outputting in key=value format:
 
 ```
-@version: 3.22
+@version: 3.23
 @include "scl.conf"
 
 log {
@@ -184,7 +184,7 @@ Binaries are also available as a Docker image. To find out more, check out the b
 
 ## Documentation
 
-The documentation of the latest released version of syslog-ng Open Source Edition is available [here](https://www.syslog-ng.com/technical-documents/doc/syslog-ng-open-source-edition/3.22/administration-guide). For earlier versions, see the syslog-ng [Documentation Page](https://www.syslog-ng.com/technical-documents).
+The documentation of the latest released version of syslog-ng Open Source Edition is available [here](https://www.syslog-ng.com/technical-documents/doc/syslog-ng-open-source-edition/3.23/administration-guide). For earlier versions, see the syslog-ng [Documentation Page](https://www.syslog-ng.com/technical-documents).
 
 ## Contributing
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.22.1
+3.23.1
diff --git a/contrib/openbsd-packaging/syslog-ng.conf b/contrib/openbsd-packaging/syslog-ng.conf
@@ -2,7 +2,7 @@
 # This should provide the same behavior as OpenBSD's syslog.conf(5).
 # 2010-07-18 steven@openbsd.org
 
-@version: 3.22
+@version: 3.23
 
 options {
 	use_dns(no);

diff --git a/dbld/generate-debian-directory b/dbld/generate-debian-directory
@@ -7,7 +7,7 @@ MODE=$1
 cp -r /source/packaging/debian .
 if [ $MODE = "snapshot" ]; then
 	echo "Generating snapshot version in debian/"
-	DEBEMAIL="dev@null" DEBFULLNAME="syslog-ng snapshot" debchange --newversion ${VERSION}-${MODE}+`date +%Y%m%dT%H%M%S` "Snapshot release based on ${GITREF}"
+	DEBEMAIL="dev@null" DEBFULLNAME="syslog-ng snapshot" debchange --force-bad-version --newversion ${VERSION}-${MODE}+`date +%Y%m%dT%H%M%S` "Snapshot release based on ${GITREF}"
 elif [ $MODE = "release" ]; then
 	echo "Validating if your debian/ directory matches current version"
 	DEB_VERSION=`dpkg-parsechangelog -S Version | cut -d - -f1`

diff --git a/doc/man/dqtool.1.xml b/doc/man/dqtool.1.xml
@@ -8,7 +8,7 @@
     <refmeta>
       <refentrytitle>dqtool</refentrytitle>
       <manvolnum>1</manvolnum>
-      <refmiscinfo class="version">3.22</refmiscinfo>
+      <refmiscinfo class="version">3.23</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -95,7 +95,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.balabit.com/documents/syslog-ng-ose-latest-guides/en/syslog-ng-ose-guide-admin/html/index.html"><command>The  3.22 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  3.23 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
@@ -8,7 +8,7 @@
     <refmeta>
       <refentrytitle>loggen</refentrytitle>
       <manvolnum>1</manvolnum>
-      <refmiscinfo class="version">3.22</refmiscinfo>
+      <refmiscinfo class="version">3.23</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -258,7 +258,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  3.22 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  3.23 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
@@ -8,7 +8,7 @@
     <refmeta>
       <refentrytitle>pdbtool</refentrytitle>
       <manvolnum>1</manvolnum>
-      <refmiscinfo class="version">3.22</refmiscinfo>
+      <refmiscinfo class="version">3.23</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -445,7 +445,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  3.22 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  3.23 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-ctl.1.xml b/doc/man/syslog-ng-ctl.1.xml
@@ -8,7 +8,7 @@
     <refmeta>
       <refentrytitle>syslog-ng-ctl</refentrytitle>
       <manvolnum>1</manvolnum>
-      <refmiscinfo class="version">3.22</refmiscinfo>
+      <refmiscinfo class="version">3.23</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -156,7 +156,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  3.22 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  3.23 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
@@ -8,7 +8,7 @@
     <refmeta>
       <refentrytitle>syslog-ng-debun</refentrytitle>
       <manvolnum>1</manvolnum>
-      <refmiscinfo class="version">3.22</refmiscinfo>
+      <refmiscinfo class="version">3.23</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -220,7 +220,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  3.22 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  3.23 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
@@ -8,7 +8,7 @@
     <refmeta>
       <refentrytitle>syslog-ng</refentrytitle>
       <manvolnum>8</manvolnum>
-      <refmiscinfo class="version">3.22</refmiscinfo>
+      <refmiscinfo class="version">3.23</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -284,7 +284,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  3.22 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  3.23 Administrator Guide</command> for details.</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -304,7 +304,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  3.22 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  3.23 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
@@ -8,7 +8,7 @@
     <refmeta>
       <refentrytitle>syslog-ng.conf</refentrytitle>
       <manvolnum>5</manvolnum>
-      <refmiscinfo class="version">3.22</refmiscinfo>
+      <refmiscinfo class="version">3.23</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -439,7 +439,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  3.22 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  3.23 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/lib/tests/test_lexer.c b/lib/tests/test_lexer.c
@@ -298,10 +298,10 @@ Test(lexer, at_version_stores_config_version_in_parsed_version_in_hex_form)
 {
   parser->lexer->ignore_pragma = FALSE;
 
-  _input("@version: 3.22\n\
+  _input("@version: 3.23\n\
 foo\n");
   assert_parser_identifier("foo");
-  cr_assert_eq(configuration->parsed_version, 0x0316,
+  cr_assert_eq(configuration->parsed_version, 0x0317,
                "@version parsing mismatch, value %04x expected %04x", configuration->parsed_version, 0x0314);
 
   _input("@version: 3.1\n\

diff --git a/lib/tests/test_pragma.c b/lib/tests/test_pragma.c
@@ -28,9 +28,9 @@
 
 Test(pragma_parser, process_valid_major_minor)
 {
-  const guint version = process_version_string("3.22");
+  const guint version = process_version_string("3.23");
 
-  cr_assert_eq(0x0316, version);
+  cr_assert_eq(0x0317, version);
 }
 
 Test(pragma_parser, process_version_large_minor)

diff --git a/lib/versioning.h b/lib/versioning.h
@@ -117,6 +117,7 @@
 #define VERSION_3_20 "syslog-ng 3.20"
 #define VERSION_3_21 "syslog-ng 3.21"
 #define VERSION_3_22 "syslog-ng 3.22"
+#define VERSION_3_23 "syslog-ng 3.23"
 
 #define VERSION_VALUE_3_0  0x0300
 #define VERSION_VALUE_3_1  0x0301
@@ -141,11 +142,12 @@
 #define VERSION_VALUE_3_20 0x0314
 #define VERSION_VALUE_3_21 0x0315
 #define VERSION_VALUE_3_22 0x0316
+#define VERSION_VALUE_3_23 0x0317
 
 /* config version code, in the same format as GlobalConfig->version */
-#define VERSION_VALUE   0x0316
-#define VERSION_CURRENT VERSION_3_22
-#define VERSION_CURRENT_VER_ONLY "3.22"
+#define VERSION_VALUE   0x0317
+#define VERSION_CURRENT VERSION_3_23
+#define VERSION_CURRENT_VER_ONLY "3.23"
 
 #define version_convert_from_user(v)  (v)
 

diff --git a/modules/http/README.md b/modules/http/README.md
@@ -9,7 +9,7 @@ not set, POST will be used.
 Example config:
 
 ```
-@version: 3.22
+@version: 3.23
 @include "scl.conf"
 source      s_system { system(); internal(); };
 destination http_des {

diff --git a/modules/java-modules/common/README.md b/modules/java-modules/common/README.md
@@ -28,7 +28,7 @@ bin/kafka-console-producer.sh --broker-list localhost:9092 --sync --topic mytopi
 Sample config:
 
 ```
-@version: 3.22
+@version: 3.23
 @include "scl.conf"
 @module "mod-java"
 

diff --git a/modules/java/README.md b/modules/java/README.md
@@ -51,7 +51,7 @@ You have to set the path of the class file or the name of the jar file (with ful
 
 Example configuration for this (if you compiled the java file above, and the class file is in the /tmp directory):
 ```
-@version: 3.22
+@version: 3.23
 
 options {
   threaded(yes);
@@ -80,7 +80,7 @@ log{
 ```
 Example configuration using jar files in the class_path (the path inside the jar file has to been set using '.'):
 ```
-@version: 3.22
+@version: 3.23
 
 options {
   threaded(yes);

diff --git a/modules/java/tools/syslog-ng.conf.example b/modules/java/tools/syslog-ng.conf.example
@@ -1,4 +1,4 @@
-@version: 3.22
+@version: 3.23
 @module java
 
 options {

diff --git a/modules/python/python-example.conf b/modules/python/python-example.conf
@@ -1,4 +1,4 @@
-@version: 3.22
+@version: 3.23
 
 log {
   source { tcp(port(12345)); };

diff --git a/modules/riemann/riemann-example.conf b/modules/riemann/riemann-example.conf
@@ -1,4 +1,4 @@
-@version: 3.22
+@version: 3.23
 
 source s_network {
     tcp(port(12345));

diff --git a/modules/system-source/system-expand.sh b/modules/system-source/system-expand.sh
@@ -29,7 +29,7 @@ out="$(mktemp)"
 create_config () {
         local cfg="$1"
         cat >"${cfg}" <<EOF
-@version: 3.22
+@version: 3.23
 @include "scl.conf"
 source s_system {
 # ----- Cut here -----

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+syslog-ng (3.23.1-1) unstable; urgency=medium
+
+  * Upstream upgrade to 3.23.1
+
+ -- Laszlo Budai <laszlo.budai@balabit.com>  Mon, 26 Aug 2019 08:59:04 +0200
+
 syslog-ng (3.22.1-1) unstable; urgency=medium
 
   * Upstream upgrade to 3.22.1

diff --git a/packaging/debian/syslog-ng.conf b/packaging/debian/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.22
+@version: 3.23
 @include "scl.conf"
 
 # Syslog-ng configuration file, compatible with default Debian syslogd

diff --git a/packaging/debian/tests/config.syslog b/packaging/debian/tests/config.syslog
@@ -1,4 +1,4 @@
-@version: 3.22
+@version: 3.23
 @include "scl.conf"
 
 source s_src { unix-dgram("/tmp/input"); };

diff --git a/packaging/rhel/syslog-ng.conf b/packaging/rhel/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.22
+@version: 3.23
 @include "scl.conf"
 
 # syslog-ng configuration file.

diff --git a/packaging/rhel/syslog-ng.spec b/packaging/rhel/syslog-ng.spec
@@ -51,7 +51,7 @@ Intentional syntax error to cause rpmbuild to abort.
 %global ivykis_ver 0.36.1
 
 Name: syslog-ng
-Version: 3.22.1
+Version: 3.23.1
 Release: 1%{?dist}
 Summary: Next-generation syslog server
 
@@ -577,6 +577,9 @@ fi
 %{_datadir}/%{name}/tools/
 
 %changelog
+* Fri Aug  15 2019 Laszlo Budai <laszlo.budai@balabit.com> - 3.23.1-1
+- update to 3.23.1
+
 * Sun Jun 16 2019 Balazs Scheidler <balazs.scheidler@oneidentity.com> - 3.22.1-1
 - merge changes from Peter Czanik's copr specfile
 - make this work on all supported distros (centos-6, centos-7, latest fedora releases)

diff --git a/scl/graphite/README b/scl/graphite/README
@@ -1,6 +1,6 @@
 An example graphite() destination config can be found below:
 
-@version: 3.22
+@version: 3.23
 @include "scl.conf"
 
 source s_all {

diff --git a/scl/syslog-ng.conf b/scl/syslog-ng.conf
@@ -3,7 +3,7 @@
 # single file called /var/log/messages.
 #
 
-@version: 3.22
+@version: 3.23
 @include "scl.conf"
 
 source s_local {

diff --git a/scl/syslogconf/README b/scl/syslogconf/README
@@ -3,7 +3,7 @@ In order to convert an existing syslog.conf file into syslog-ng
 configuration automatically, you need to use the syslogconf SCL plugin and
 write a skeleton syslog-ng.conf file which need not be changed, like this:
 
-@version: 3.22
+@version: 3.23
 @include "scl.conf"
 
 syslogconf()
diff --git a/tests/functional/test_file_source.py b/tests/functional/test_file_source.py
@@ -26,7 +26,7 @@
 from messagecheck import *
 from control import *
 
-config_poll = """@version: 3.22
+config_poll = """@version: 3.23
 
 options { ts_format(iso); chain_hostnames(no); keep_hostname(yes); threaded(yes); };
 
@@ -43,7 +43,7 @@
 
 """ % locals()
 
-config_auto = """@version: 3.22
+config_auto = """@version: 3.23
 
 options { ts_format(iso); chain_hostnames(no); keep_hostname(yes); threaded(yes); };