Update syslog/rsyslog* to 8.18.0.

Version 8.18.0 [v8-stable] 2016-04-19
- testbench: When running privdrop tests testbench tries to drop
  user to "rsyslog", "syslog" or "daemon" when running as root and
  you don't explict set RSYSLOG_TESTUSER environment variable.
  Make sure the unprivileged testuser can write into tests/ dir!
- templates: add option to convert timestamps to UTC
  closes https://github.com/rsyslog/rsyslog/issues/730
- omjournal: fix segfault (regression in 8.17.0)
- imptcp: added AF_UNIX support
  Thanks to Nathan Brown for implementing this feature.
- new template options
  * compressSpace
  * date-utc
- redis: support for authentication
  Thanks to Manohar Ht for the patch
- omkafka: makes kafka-producer on-HUP restart optional
  As of now, omkafka kills and re-creates kafka-producer on HUP.
  This is not always desirable. This change introduces an action param
  (reopenOnHup="on|off") which allows user to control re-cycling of
  kafka-producer.
  It defaults to on (for backward compatibility). Off allows user to
  ignore HUP as far as kafka-producer is concerned.
  Thanks to Janmejay Singh for implementing this feature
- imfile: new "FreshStartTail" input parameter
  Thanks to Curu Wong for implementing this.
- omjournal: fix libfastjson API issues
  This module accessed private data members of libfastjson
- ommongodb: fix json API issues
  This module accessed private data members of libfastjson
- testbench improvements (more tests and more thourough tests)
  among others:
  - tests for omjournal added
  - tests for KSI subsystem
  - tests for priviledge drop statements
  - basic test for RELP with TLS
  - some previously disabled tests have been re-enabled
- dynamic stats subsystem: a couple of smaller changes
  they also involve the format, which is slightly incompatible to
  previous version. As this was out only very recently (last version),
  we considered this as acceptable.
  Thanks to Janmejay Singh for developing this.
- foreach loop: now also iterates over objects (not just arrays)
  Thanks to Janmejay Singh for developing this.
- improvements to the CI environment
- enhancement: queue subsystem is more robst in regard to some
  corruptions
  It is now detected if a .qi file states that the queue contains more
  records than there are actually inside the queue files. Previously this
  resulted in an emergency switch to direct mode, now the problem is only
  reported but processing continues.
- enhancement: Allow rsyslog to bind UDP ports even w/out specific
  interface being up at the moment.
  Alternatively, rsyslog could be ordered after networking, however,
  that might have some negative side effects. Also IP_FREEBIND is
  recommended by systemd documentation.
  Thanks to Nirmoy Das and Marius Tomaschewski for the patch.
- cleanup: removed no longer needed json-c compatibility layer
  as we now always use libfastjson, we do not need to support old
  versions of json-c (libfastjson was based on the newest json-c
  version at the time of the fork, which is the newest in regard
  to the compatibility layer)
- new External plugin for sending metrics to SPM Monitoring SaaS
  Thanks to Radu Gheorghe for the patch.
- bugfix imfile: fix memory corruption bug when appending @cee
  Thanks to Brian Knox for the patch.
- bugfix: memory misallocation if position.from and position.to is used
  a negative amount of memory is tried to be allocated if position.from
  is smaller than the buffer size (at least with json variables). This
  usually leads to a segfault.
  closes https://github.com/rsyslog/rsyslog/issues/915
- bugfix: fix potential memleak in TCP allowed sender definition
  depending on circumstances, a very small leak could happen on each
  HUP. This was caused by an invalid macro definition which did not rule
  out side effects.
- bugfix: $PrivDropToGroupID actually did a name lookup
  ... instead of using the provided ID
- bugfix: small memory leak in imfile
  Thanks to Tomas Heinrich for the patch.
- bugfix: double free in jsonmesg template
  There has to be actual json data in the message (from mmjsonparse,
  mmnormalize, imjournal, ...) to trigger the crash.
  Thanks to Tomas Heinrich for the patch.
- bugfix: incorrect formatting of stats when CEE/Json format is used
  This lead to ill-formed json being generated
- bugfix omfwd: new-style keepalive action parameters did not work
  due to being inconsistently spelled inside the code. Note that legacy
  parameters $keepalive... always worked
  see also: https://github.com/rsyslog/rsyslog/issues/916
  Thanks to Devin Christensen for alerting us and an analysis of the
  root cause.
- bugfix: memory leaks in logctl utility
  Detected by clang static analyzer. Note that these leaks CAN happen in
  practice and may even be pretty large. This was probably never detected
  because the tool is not often used.
- bugfix omrelp: fix segfault if no port action parameter was given
  closes https://github.com/rsyslog/rsyslog/issues/911
- bugfix imtcp: Messages not terminated by a NL were discarded
  ... upon connection termination.
  Thanks to Tomas Heinrich for the patch.

4 files changed, 37 insertions, 7 deletions

diff --git a/sysutils/rsyslog/Makefile.common b/sysutils/rsyslog/Makefile.common
index b4f92f54323..ffb7fae05bc 100644
--- a/sysutils/rsyslog/Makefile.common
+++ b/sysutils/rsyslog/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2016/03/09 20:54:43 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.20 2016/04/21 09:16:43 fhajny Exp $
 # used by sysutils/rsyslog/Makefile
 # used by sysutils/rsyslog-dbi/Makefile
 # used by sysutils/rsyslog-elasticsearch/Makefile
@@ -12,7 +12,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-DISTNAME=		rsyslog-8.17.0
+DISTNAME=		rsyslog-8.18.0
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.rsyslog.com/files/download/rsyslog/
 
diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo
index cee89cc6630..c5dddca57bb 100644
--- a/sysutils/rsyslog/distinfo
+++ b/sysutils/rsyslog/distinfo
@@ -1,15 +1,17 @@
-$NetBSD: distinfo,v 1.15 2016/03/13 08:15:59 tnn Exp $
+$NetBSD: distinfo,v 1.16 2016/04/21 09:16:43 fhajny Exp $
 
-SHA1 (rsyslog-8.17.0.tar.gz) = 179593a63f1977ab4b2529bd14b2f1655aa9e78d
-RMD160 (rsyslog-8.17.0.tar.gz) = 98e1228189cb73ab54097f481b5300d1707acaf6
-SHA512 (rsyslog-8.17.0.tar.gz) = bfa228d9fd9f856e4890273f8a0675710c6a9a6d38d457f778f92223eea7f20723158e570e2db62f6d01b585910596677be46b22316f39d24af3504bc7ba998e
-Size (rsyslog-8.17.0.tar.gz) = 2220523 bytes
+SHA1 (rsyslog-8.18.0.tar.gz) = aea11258e2d25986c13541d2077f4913f28ce34e
+RMD160 (rsyslog-8.18.0.tar.gz) = 4b12d52db40a5cceff23ee71c5789f4902c73b5f
+SHA512 (rsyslog-8.18.0.tar.gz) = 6b159ba23100b4675576f5b247d2bf482bab0beaa071c26c692c99e50f202b0b272b7a64ba2b7c726390d663677b7a6d68666b06f73825e35605b13ae0930fc7
+Size (rsyslog-8.18.0.tar.gz) = 2261731 bytes
 SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec
 SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433
 SHA1 (patch-plugins_imfile_imfile.c) = 65b56f6799e2b206e1a8c3d055a4e9dc22da88be
 SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e
 SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da
 SHA1 (patch-plugins_mmexternal_mmexternal.c) = 00606bd11d5d281bf4b32f038e857eb364954c4c
+SHA1 (patch-plugins_ommysql_ommysql.c) = d3a1d3837d64a38a8e3064c30fb95bf3efb70877
+SHA1 (patch-plugins_ompgsql_ompgsql.c) = 549197b89efed1e8f45f536f58dafd67df3d462d
 SHA1 (patch-runtime_lookup.c) = f4551d19792fedea7944d395df3c491363bbbcf1
 SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437
 SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341
diff --git a/sysutils/rsyslog/patches/patch-plugins_ommysql_ommysql.c b/sysutils/rsyslog/patches/patch-plugins_ommysql_ommysql.c
new file mode 100644
index 00000000000..cc3037dffea
--- /dev/null
+++ b/sysutils/rsyslog/patches/patch-plugins_ommysql_ommysql.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_ommysql_ommysql.c,v 1.1 2016/04/21 09:16:44 fhajny Exp $
+
+Need netdb.h for MAXHOSTNAMELEN.
+
+--- plugins/ommysql/ommysql.c.orig	2016-04-15 07:33:14.000000000 +0000
++++ plugins/ommysql/ommysql.c
+@@ -33,6 +33,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <time.h>
++#include <netdb.h>
+ #include <mysql.h>
+ #include "conf.h"
+ #include "syslogd-types.h"
diff --git a/sysutils/rsyslog/patches/patch-plugins_ompgsql_ompgsql.c b/sysutils/rsyslog/patches/patch-plugins_ompgsql_ompgsql.c
new file mode 100644
index 00000000000..cc8b2e3d236
--- /dev/null
+++ b/sysutils/rsyslog/patches/patch-plugins_ompgsql_ompgsql.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_ompgsql_ompgsql.c,v 1.1 2016/04/21 09:16:44 fhajny Exp $
+
+Need netdb.h for MAXHOSTNAMELEN.
+
+--- plugins/ompgsql/ompgsql.c.orig	2016-04-15 07:33:14.000000000 +0000
++++ plugins/ompgsql/ompgsql.c
+@@ -39,6 +39,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <time.h>
++#include <netdb.h>
+ #include <libpq-fe.h>
+ #include "conf.h"
+ #include "syslogd-types.h"