Merge pull request syslog-ng#1686 from lbudai/version/3.12

Version/3.12
shastah · Sep 20, 2017 · 2b5e79f · 2b5e79f
2 parents d0752d0 + 2a1a817
commit 2b5e79f
Show file tree

Hide file tree

Showing 20 changed files with 79 additions and 103 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,82 +1,58 @@
-3.11.1
+3.12.1
 
-<!-- Tue, 25 Jul 2017 13:43:52 +0200 -->
+<!-- Tue, 19 Sep 2017 12:59:40 +0200 -->
 
 # Features
 
- * Add geoip2 parser and template function.
-   It is based on the libmaxminddb(MaxMindDB).
-   It will replace the old geoip parser and template function,
-   so they are deprecated from 3.11 (but still available).
-
- * Add SSL support to AMQP.
-
- * Add template option to apache-accesslog-parser.
-
- * Add configurable event time to Riemann destination.
-
- * Add drop-unmatched() option to dbparser.
-
- * Add Ubuntu Xenial to the bundled docker images.
-
- * Support multi-instance support for Solaris 10 and 11.
-
- * Support multi-instance for systemd.
-
- * Add configurable timeout to HTTP destination.
-
- * Add prefix() option to cisco-parser.
+* HDFS: support macro in filename (#1638)
+* HDFS: add append support (#1675)
+* Java: allow to use sequence numbers in templates (#1628)
+* TLS improvements (#1603, #1636)
+    - Add **PKCS 12** support with the new `pkcs12-file()` TLS option
+    - startup time `ssl-options()` and `peer-verify()` check
+    - startup time `key_file`, `cert_file`, `ca_dir`, `crl_dir` and `cipher_suite` check
+    - **ECDH  cipher support** (OpenSSL 1.0.1, 1.0.2, 1.1.0) with the `ecdh-curve-list()` option (only available >= 1.0.2)
+        - for < 1.0.2, a hard-coded curve is used
+        - for >= 1.0.2, automatic curve selection is used (the `ecdh-curve-list()` option can restrict this list)
+    - **DH cipher support** with the `dhparam-file()` option
+        - if the option is not specified, fallback RFC 3526 parameters are used
+    - minor fixes
+* `stdin()` source driver (#1605)
+* Implement `read_old_records` option for systemd-journal source (#1642)
+* Add tags-parser: a new module to parse $TAGS values (#1658)
+* Add a Windows eventlog parser scl module (#1572)
+* Add XML parser module (#1659, #1684)
 
 # Bugfixes
 
- * Fix a memory usage counter underflow for threaded destination drivers
-   and writers.
-
- * Fix a potential crash in AMQP.
-
- * Fix a potential crash during reload.
-
- * Fix a reload/shutdown issue.
-   Under heavy load, worker might never exit from the fetch loop from the
-   queue.
-
- * Fix a potential crash in afsocket destination during reload.
-
- * Fix a counter registration bug.
-   In some cases not all the required counters are registered.
-
- * Fix a build issue on FreeBSD.
-
- * Fix a memory leak in diskq plugin.
-
- * Fix systemd-journal error codes validation.
-
- * Fix a potential crash in diskq when it is used with file
-   destination and the file is reaped.
-
- * Fix a memory leak in HTTP destination
-
- * Fix ENABLE_DEBUG in dbparser.
-
- * Fix a unit tests that caused build issue on 32 bit platforms.
+* Fix cannot parse ipv6 into hostname (#1617)
+* Speedup add-contextual-data by making ordering optional (#1645)
+* Fix `monitor-method()` option not working for `wildcard-file()` source (#1651)
+* Sanitize SDATA keys in syslog-protocol messages to avoid generating non-valid messages (#1650, #1654)
+* Fix memory leaks reported using Valgrind (#1649)
+* Fix memory leak related to cloning pipes and reload (#1647)
+* Fix getent protocol number returns incorrect value (#1665)
+* Fix elasticsearch2 destination flush mechanism (#1668)
+* Fix file destination related memory leak (#1685)
+* Fix a possible memory leak around affile destination (#1685)
 
 # Other changes
 
- * The eventlog library is part of syslog-ng from now.
-
- * Improve error messages when the config cannot be initialized.
-
- * Improve source suspended/resumed debug messages.
-
- * Rename syslog-debun to syslog-ng-debun.
-
- * Update manpages to v3.11
-
- * Remove tgz2build directory.
+* Improve syslog-ng debun functionality (#1633, #1641, #1663)
+* Java: allow to set JVM options form global syslog-ng options (#1639)
+* Do steps towards Python 3 support:
+    * Fix string compatibility for Python 3 (#1632)
+    * Improve Python version auto detection (#1660)
+* HTTP destination: display verbose logs on debug level (#1526)
+* Improvements for Solaris packing (#1664)
 
 # Notes to the Developers
 
- * Rewrite merge-grammar script from Perl to Python.
+* Update internal RabbitMQ (#1662)
+* Update internal ivykis to v0.42 (#1566)
+* Fix Travis and test related issues (#1566, #1644, #1674)
+* Update docker images (#1637)
+* Fix some clang compile errors (#1662)
 
 # Credits
 
@@ -88,9 +64,7 @@ feedback are all important contributions, so please if you are a user
 of syslog-ng, contribute.
 
 We would like to thank the following people for their contribution:
-
-Andras Mitzki, Antal Nemes, Attila Szalay, Balazs Scheidler, Fabien Wernli,
-Gabor Nagy, Giuseppe D'Anna, Janos Szigetvari, Laszlo Budai, Laszlo Varady,
-Lorand Muzamel, Mate Farkas, Noemi Vanyi, Peter Czanik, Tamas Nagy,
-Tibor Bodnar, Tomasz Kazimierczak, Zoltan Pallagi
+Andras Mitzki, Antal Nemes, Attila Szalay, Balazs Scheidler, Gabor Nagy,
+Gergely Orosz, Janos Szigetvari, Laszlo Budai, Laszlo Varady, Mate Farkas,
+Marton Suranyi, Peter Kokai, Szilard Pfeiffer, Tamas Nagy, Zoltan Pallagi.
 
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ applications or forwarded by systemd) and writes everything to a single
 file:
 
 ```
-@version: 3.11
+@version: 3.12
 @include "scl.conf"
 
 log {
@@ -28,7 +28,7 @@ log {
 This one also processes logs from the network (TCP/514 by default):
 
 ```
-@version: 3.11
+@version: 3.12
 @include "scl.conf"
 
 log {
@@ -42,7 +42,7 @@ log {
 Structured/application logging, local submission via JSON, output in key=value format.
 
 ```
-@version: 3.11
+@version: 3.12
 @include "scl.conf"
 
 log {

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.11.1
+3.12.1
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.11</refmiscinfo>
+      <refmiscinfo class="version">3.12</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.11 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.12 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.11</refmiscinfo>
+      <refmiscinfo class="version">3.12</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.11 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.12 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.11</refmiscinfo>
+      <refmiscinfo class="version">3.12</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.11 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.12 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.11</refmiscinfo>
+      <refmiscinfo class="version">3.12</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.11 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.12 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.11</refmiscinfo>
+      <refmiscinfo class="version">3.12</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.11 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.12 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.11</refmiscinfo>
+      <refmiscinfo class="version">3.12</refmiscinfo>
       <refmiscinfo class="source"/>
     </refmeta>
     <refnamediv>
@@ -298,7 +298,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.11 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.12 Administrator Guide</command> for details.</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -318,7 +318,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.11 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.12 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.11</refmiscinfo>
+      <refmiscinfo class="version">3.12</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.11 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.12 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/versioning.h b/lib/versioning.h
@@ -103,6 +103,7 @@
 #define VERSION_3_9 "syslog-ng 3.9"
 #define VERSION_3_10 "syslog-ng 3.10"
 #define VERSION_3_11 "syslog-ng 3.11"
+#define VERSION_3_12 "syslog-ng 3.12"
 
 #define VERSION_VALUE_3_0  0x0300
 #define VERSION_VALUE_3_1  0x0301
@@ -116,11 +117,12 @@
 #define VERSION_VALUE_3_9  0x0309
 #define VERSION_VALUE_3_10 0x030a
 #define VERSION_VALUE_3_11 0x030b
+#define VERSION_VALUE_3_12 0x030c
 
 /* config version code, in the same format as GlobalConfig->version */
-#define VERSION_VALUE   0x030b
-#define VERSION_CURRENT VERSION_3_11
-#define VERSION_CURRENT_VER_ONLY "3.11"
+#define VERSION_VALUE   0x030c
+#define VERSION_CURRENT VERSION_3_12
+#define VERSION_CURRENT_VER_ONLY "3.12"
 
 #define version_convert_from_user(v)  (v)
 

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.11
+@version: 3.12
 @include "scl.conf"
 source s_system {
 # ----- Cut here -----

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

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.11
+config_poll = """@version: 3.12
 
 options { ts_format(iso); chain_hostnames(no); keep_hostname(yes); threaded(yes); };
 
@@ -43,7 +43,7 @@
 
 """ % locals()
 
-config_auto = """@version: 3.11
+config_auto = """@version: 3.12
 
 options { ts_format(iso); chain_hostnames(no); keep_hostname(yes); threaded(yes); };
 

diff --git a/tests/functional/test_filters.py b/tests/functional/test_filters.py
@@ -25,7 +25,7 @@
 from messagegen import *
 from messagecheck import *
 
-config = """@version: 3.11
+config = """@version: 3.12
 
 options { ts_format(iso); chain_hostnames(no); keep_hostname(yes); threaded(yes); };
 

diff --git a/tests/functional/test_input_drivers.py b/tests/functional/test_input_drivers.py
@@ -25,7 +25,7 @@
 from messagegen import *
 from messagecheck import *
 
-config = """@version: 3.11
+config = """@version: 3.12
 
 options { ts_format(iso); chain_hostnames(no); keep_hostname(yes); threaded(yes); };
 

diff --git a/tests/functional/test_map_value_pairs.py b/tests/functional/test_map_value_pairs.py
@@ -27,7 +27,7 @@
 from control import flush_files, stop_syslogng
 import os
 
-config = """@version: 3.11
+config = """@version: 3.12
 
 options { keep-hostname(yes); };
 

diff --git a/tests/functional/test_performance.py b/tests/functional/test_performance.py
@@ -25,7 +25,7 @@
 from messagegen import *
 from messagecheck import *
 
-config = """@version: 3.11
+config = """@version: 3.12
 
 options { ts_format(iso); chain_hostnames(no); keep_hostname(yes); threaded(yes); };