Merge pull request syslog-ng#1286 from balabit/preparations-for-3.9

*: preparations for 3.9.1
shastah · Dec 21, 2016 · 59aa4e5 · 59aa4e5
2 parents 9c5b657 + 88de5a4
commit 59aa4e5
Show file tree

Hide file tree

Showing 12 changed files with 137 additions and 247 deletions.
diff --git a/NEWS.md b/NEWS.md
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ applications or forwarded by systemd) and writes everything to a single
 file:
 
 ```
-@version: 3.8
+@version: 3.9
 @include "scl.conf"
 
 log {
@@ -29,7 +29,7 @@ log {
 This one also processes logs from the network (TCP/514 by default):
 
 ```
-@version: 3.8
+@version: 3.9
 @include "scl.conf"
 
 log {
@@ -43,7 +43,7 @@ log {
 Structured/application logging, local submission via JSON, output in key=value format.
 
 ```
-@version: 3.8
+@version: 3.9
 @include "scl.conf"
 
 log {

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.8.1
+3.9.1
diff --git a/lib/versioning.h b/lib/versioning.h
@@ -100,6 +100,7 @@
 #define VERSION_3_6 "syslog-ng 3.6"
 #define VERSION_3_7 "syslog-ng 3.7"
 #define VERSION_3_8 "syslog-ng 3.8"
+#define VERSION_3_9 "syslog-ng 3.9"
 
 #define VERSION_VALUE_3_0  0x0300
 #define VERSION_VALUE_3_1  0x0301
@@ -110,11 +111,12 @@
 #define VERSION_VALUE_3_6  0x0306
 #define VERSION_VALUE_3_7  0x0307
 #define VERSION_VALUE_3_8  0x0308
+#define VERSION_VALUE_3_9  0x0309
 
 /* config version code, in the same format as GlobalConfig->version */
-#define VERSION_VALUE   0x0308
-#define VERSION_CURRENT VERSION_3_8
-#define VERSION_CURRENT_VER_ONLY "3.8"
+#define VERSION_VALUE   0x0309
+#define VERSION_CURRENT VERSION_3_9
+#define VERSION_CURRENT_VER_ONLY "3.9"
 
 #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.8
+@version: 3.9
 @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.8
+@version: 3.9
 @include "scl.conf"
 
 source s_local {

diff --git a/tests/functional/test_file_source.py b/tests/functional/test_file_source.py
@@ -25,7 +25,7 @@
 from messagegen import *
 from messagecheck import *
 
-config = """@version: 3.8
+config = """@version: 3.9
 
 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.8
+config = """@version: 3.9
 
 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.8
+config = """@version: 3.9
 
 options { ts_format(iso); chain_hostnames(no); keep_hostname(yes); threaded(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.8
+config = """@version: 3.9
 
 options { ts_format(iso); chain_hostnames(no); keep_hostname(yes); threaded(yes); };
 

diff --git a/tests/functional/test_python.py b/tests/functional/test_python.py
@@ -27,7 +27,7 @@
 from control import flush_files, stop_syslogng
 import os
 
-config = """@version: 3.8
+config = """@version: 3.9
 
 source s_int { internal(); };
 source s_tcp { tcp(port(%(port_number)d)); };

diff --git a/tests/functional/test_sql.py b/tests/functional/test_sql.py
@@ -26,7 +26,7 @@
 from messagecheck import *
 from control import flush_files, stop_syslogng
 
-config = """@version: 3.8
+config = """@version: 3.9
 
 options { ts_format(iso); chain_hostnames(no); keep_hostname(yes); threaded(yes); };