Update rsyslog to 8.15.0

Switch to libfastjson, which will become a requirement in the next release.

- KSI Lib: Updated code to run with libksi 3.4.0.5
- KSI utilities: Added option to ser publication url.
- KSI Lib: Fixed wrong TLV container for KSI signatures from 0905 to 0906.
- KSI/GT Lib: Fixed multiple issues found using static analyzer
- performance improvement for configs with heavy use of JSON variables
- added pmpanngfw: contributed module for translating Palo Alto Networks
  logs.
- testbench: Changed valgrind option for imtcp-tls-basic-vg.sh
- pmciscoios: support for asterisk before timestamp added
- solr external output plugin much enhanced
- omrabbitmq: improvements
- add support for libfastjson (as a replacement for json-c)
- KSI utilities: somewhat improved error messages
- pmciscoios: support for some format variations
- support grok via new contributed module mmgrok
- omkafka: new statistics counter "maxoutqsize"
- improvments for 0mq modules:
  - omczmq: suspend / Retry handling - the output plugin can now recover
    from some error states due to issues with plugin startup or message
    sending
  - omczmq: refactored topic handling code for ZMQ_PUB output to be
    a little more efficient
  - omczmq: added ability to set a timeout for sends
  - omczmq: set topics can be in separate frame (default) or part
    of message frame (configurable)
  - omcmzq: code cleanup
  - imczmq: code cleanup
  - imczmq: fixed a couple of cases where vars could be used uninitialized
  - imczmq: ZMQ_ROUTER support
  - imczmq: Fix small memory leak from not freeing sockets  when done
    with them
  - allow creation of on demand ephemeral CurveZMQ certs for encryption.
- cleanup on code to unset a variable
- omelasticsearch: build on FreeBSD
- pmciscoios: fix some small issues clang static analyzer detected
- testbench: many improvements and some new tests
- overall code improvements thanks to clang static analyzer
- gnutls fix: Added possible fix for gnutls issue #575
- bugfix omkafka: restore ability to build on all platforms
- bugfix omkafka: fix potentially negative partition number
- bugfix: solve potential race in creation of additional action workers
- bugfix: potential memory leak in config parsing
- bugfix: small memory leak in loading template config
- bugfix: fix extra whitespace in property expansions
- bugfix: mmfields leaked memory if very large messages were processed
- bugfix: mmfields could add garbagge data to field
- bugfix: omhttpfs now also compiles with older json-c lib
- bugfix: memory leak in (contributed) module omhttpfs
- bugfix: parameter mismatch in error message for wrap() function
- bugfix: parameter mismatch in error message for random() function
- bugfix: divide by zero if max() function was provided zero
- bugfix: invalid mutex handling in omfile async write mode
- bugfix: fix inconsistent number processing
- bugfix: timezone() object: fix NULL pointer dereference
- bugfix omfile: memory addressing error if very long outchannel name used

3 files changed, 8 insertions, 25 deletions

diff --git a/sysutils/rsyslog/Makefile.common b/sysutils/rsyslog/Makefile.common
index eae9aae50da..81bb28f0892 100644
--- a/sysutils/rsyslog/Makefile.common
+++ b/sysutils/rsyslog/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2015/11/12 16:41:27 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.16 2016/01/01 15:34:24 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.14.0
+DISTNAME=		rsyslog-8.15.0
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.rsyslog.com/files/download/rsyslog/
 
@@ -52,4 +52,4 @@ BUILDLINK_DEPMETHOD.libuuid+=		build
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../sysutils/liblogging/buildlink3.mk"
-.include "../../textproc/json-c/buildlink3.mk"
+.include "../../textproc/libfastjson/buildlink3.mk"
diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo
index 5117a8a9115..5f50da0d479 100644
--- a/sysutils/rsyslog/distinfo
+++ b/sysutils/rsyslog/distinfo
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.11 2015/11/12 16:41:27 fhajny Exp $
+$NetBSD: distinfo,v 1.12 2016/01/01 15:34:24 fhajny Exp $
 
-SHA1 (rsyslog-8.14.0.tar.gz) = 8b5934129c9aec8f8244e6169f6d0fb4e4043205
-RMD160 (rsyslog-8.14.0.tar.gz) = 058f2bd880d07ead6f405f1e5ab4b3f89713738f
-SHA512 (rsyslog-8.14.0.tar.gz) = 8db9ca660e4bd381e5b15ffa5dbb502bc231bf99d1119098c4d0ea1a2ff46abd73e583e905c7ddb2fd6639c3a5db44043bf9d89f055aa136c280249c6a544703
-Size (rsyslog-8.14.0.tar.gz) = 2078483 bytes
+SHA1 (rsyslog-8.15.0.tar.gz) = e1d5ff63c96bce9945dc65581c8e195950256d3c
+RMD160 (rsyslog-8.15.0.tar.gz) = 4b5ce307702596fc1b69faf0de72c8f8611b62fd
+SHA512 (rsyslog-8.15.0.tar.gz) = 66416955d681f1d9f617a4d67000b565a148037f6dc6e510bc78159d4b1754559d0e1e189b4cb5ed32f0464a63071a955df4d7b2d8741b062f79a9aab990da4c
+Size (rsyslog-8.15.0.tar.gz) = 2103768 bytes
 SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec
 SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433
 SHA1 (patch-plugins_imfile_imfile.c) = 05b171b241825b19573315aa9b185b4708e38155
 SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e
 SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da
 SHA1 (patch-plugins_mmexternal_mmexternal.c) = 00606bd11d5d281bf4b32f038e857eb364954c4c
-SHA1 (patch-plugins_omelasticsearch_omelasticsearch.c) = 7bd0f94d1a3fd16106b952e63ff4593e8e37386b
 SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437
 SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341
 SHA1 (patch-tools_rsyslogd.c) = 5d480bc32f44ee308acad76588b250f8a56d894f
diff --git a/sysutils/rsyslog/patches/patch-plugins_omelasticsearch_omelasticsearch.c b/sysutils/rsyslog/patches/patch-plugins_omelasticsearch_omelasticsearch.c
deleted file mode 100644
index 76aeed82ed8..00000000000
--- a/sysutils/rsyslog/patches/patch-plugins_omelasticsearch_omelasticsearch.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-plugins_omelasticsearch_omelasticsearch.c,v 1.1 2015/09/21 11:15:34 wiedi Exp $
-
-Ignore O_LARGEFILE on systems that don't have it
---- plugins/omelasticsearch/omelasticsearch.c.orig	2015-07-08 14:31:07.000000000 +0000
-+++ plugins/omelasticsearch/omelasticsearch.c
-@@ -49,6 +49,10 @@
- #include "cfsysline.h"
- #include "unicode-helper.h"
- 
-+#if !defined(O_LARGEFILE)
-+#define O_LARGEFILE 0
-+#endif
-+
- MODULE_TYPE_OUTPUT
- MODULE_TYPE_NOKEEP
- MODULE_CNFNAME("omelasticsearch")