Update sysutils/rsyslog* to 8.28.0

- omfwd: add parameter "tcp_frameDelimiter"
- omkafka: large refactor of kafka subsystem
- imfile: improved handling of atomically renamed file (w/ wildcards)
- imfile: add capability to truncate oversize messages or split into
  multiple
- mmdblookup
  * upgraded from "contrib" to "fully supported" state
  * refactored and simplified code
  * added ability to specify custom names for extracted fields
  * bugfix: fixed multiple memory leaks
- imptcp: add new parameter "flowControl"
- imrelp: add "maxDataSize" config parameter
- multiple modules: gtls: improve error if certificate file can't be
  opened
- omsnare: allow different tab escapes
- omelasticsearch: converted to use libfastjson instead of json-c
- imjournal: _PID fallback
- multiple modules: add better error messages when regcomp is failing
- omhiredis: fix build warnings
- imfile bugfix: files mv-ed in into directory were not handled
- omprog bugfix: execve() incorrectly called
- imfile bugfix: multiline timeout did not work if state file exists
- lmsig_ksi-ls12 bugfix: build problems on some platforms
- core bugfix: invalid object type assertion
- regression fix: local hostname was not always detected properly on
  early start (w/o network).
- bugfix: format security issues in zmq3 modules
- bugfix build system: add libksi only to those binaries that need it
- bugfix KSI ls12 components: invalid tree height calculation
- testbench/CI enhancements

5 files changed, 28 insertions, 24 deletions

diff --git a/sysutils/rsyslog/Makefile b/sysutils/rsyslog/Makefile
index 4c041eccba3..0b059647fe4 100644
--- a/sysutils/rsyslog/Makefile
+++ b/sysutils/rsyslog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/04/06 20:08:37 fhajny Exp $
+# $NetBSD: Makefile,v 1.10 2017/07/04 13:31:16 fhajny Exp $
 #
 
 BUILDLINK_DEPMETHOD.libestr=	full
@@ -23,6 +23,7 @@ CONFIGURE_ARGS+=	--enable-imsolaris --disable-klog
 CONFIGURE_ENV+=		ac_cv_func_epoll_create=no
 CONFIGURE_ENV+=		ac_cv_func_epoll_create1=no
 CONFIGURE_ENV+=		ac_cv_func_inotify_init=no
+CONFIGURE_ENV+=		ac_cv_header_sys_inotify_h=no
 PLIST.solaris=		yes
 RSYSLOG_SYSMOD=		imsolaris
 .else
diff --git a/sysutils/rsyslog/Makefile.common b/sysutils/rsyslog/Makefile.common
index ebe3e146d32..cabbba69240 100644
--- a/sysutils/rsyslog/Makefile.common
+++ b/sysutils/rsyslog/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2017/05/18 13:27:44 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.29 2017/07/04 13:31:16 fhajny Exp $
 # used by sysutils/rsyslog/Makefile
 # used by sysutils/rsyslog-dbi/Makefile
 # used by sysutils/rsyslog-elasticsearch/Makefile
@@ -13,7 +13,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-DISTNAME=		rsyslog-8.27.0
+DISTNAME=		rsyslog-8.28.0
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.rsyslog.com/files/download/rsyslog/
 
diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo
index 439e796659b..daa5d95de25 100644
--- a/sysutils/rsyslog/distinfo
+++ b/sysutils/rsyslog/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.27 2017/05/22 23:43:00 joerg Exp $
+$NetBSD: distinfo,v 1.28 2017/07/04 13:31:16 fhajny Exp $
 
-SHA1 (rsyslog-8.27.0.tar.gz) = cdc1aa0744098bf595056d20a2970b2af4dd432b
-RMD160 (rsyslog-8.27.0.tar.gz) = 57737e20ff19af3c667e66564605cc89d152b3f3
-SHA512 (rsyslog-8.27.0.tar.gz) = dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753
-Size (rsyslog-8.27.0.tar.gz) = 2435123 bytes
+SHA1 (rsyslog-8.28.0.tar.gz) = 5c406cd2b13bd8d4460fe43057c0a4072f1e26b5
+RMD160 (rsyslog-8.28.0.tar.gz) = f45787630fd5634cd8ffe69ed33939e441c4c33d
+SHA512 (rsyslog-8.28.0.tar.gz) = e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1
+Size (rsyslog-8.28.0.tar.gz) = 2471122 bytes
 SHA1 (patch-configure) = df356c47b6c19c96b923978a5b194724fc0f10ba
 SHA1 (patch-grammar_lexer.l) = 6de5aac9253ebcfae124f8dc3c7178446248f2b4
 SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433
@@ -12,8 +12,8 @@ SHA1 (patch-plugins_impstats_impstats.c) = a4eb7b8b9870271204d856c3a9e05fd24cee7
 SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e
 SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da
 SHA1 (patch-plugins_mmexternal_mmexternal.c) = 498fc31e687e50e6aee821c64e029f9407e902ef
-SHA1 (patch-plugins_omkafka_omkafka.c) = 56d538f7c23a712951c6d3354c3b36bd87add876
-SHA1 (patch-runtime_lookup.c) = 2d824bfb00d93ba2abfb481445ed8b904ecbeae7
+SHA1 (patch-plugins_omkafka_omkafka.c) = e0cb97ae66807efe3d58db929beabf7292cbf28d
+SHA1 (patch-runtime_lookup.c) = d6d0e629193546d088f98282d04c11f434644d22
 SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437
 SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341
 SHA1 (patch-tools_rsyslogd.c) = 0776a632143a2dbbb3bf00159e4e3376c55418ff
diff --git a/sysutils/rsyslog/patches/patch-plugins_omkafka_omkafka.c b/sysutils/rsyslog/patches/patch-plugins_omkafka_omkafka.c
index 76b82a0e05e..cc9649b6f5c 100644
--- a/sysutils/rsyslog/patches/patch-plugins_omkafka_omkafka.c
+++ b/sysutils/rsyslog/patches/patch-plugins_omkafka_omkafka.c
@@ -1,16 +1,19 @@
-$NetBSD: patch-plugins_omkafka_omkafka.c,v 1.1 2017/05/22 23:43:00 joerg Exp $
+$NetBSD: patch-plugins_omkafka_omkafka.c,v 1.2 2017/07/04 13:31:16 fhajny Exp $
 
---- plugins/omkafka/omkafka.c.orig	2017-05-21 19:04:23.931288632 +0000
+Need strings.h for index().
+O_LARGEFILE not defined on at least NetBSD.
+
+--- plugins/omkafka/omkafka.c.orig	2017-06-27 13:40:22.000000000 +0000
 +++ plugins/omkafka/omkafka.c
-@@ -29,6 +29,7 @@
+@@ -25,6 +25,7 @@
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <strings.h>
+ #include <assert.h>
  #include <errno.h>
  #include <fcntl.h>
- #include <pthread.h>
-+#include <sys/stat.h>
- #include <sys/uio.h>
- #include <librdkafka/rdkafka.h>
- #include "syslogd-types.h"
-@@ -67,6 +68,10 @@ struct kafka_params {
+@@ -76,6 +77,10 @@ struct kafka_params {
  	const char *val;
  };
  
diff --git a/sysutils/rsyslog/patches/patch-runtime_lookup.c b/sysutils/rsyslog/patches/patch-runtime_lookup.c
index 5d9224a7c8e..6ccde67d935 100644
--- a/sysutils/rsyslog/patches/patch-runtime_lookup.c
+++ b/sysutils/rsyslog/patches/patch-runtime_lookup.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-runtime_lookup.c,v 1.3 2017/05/18 13:27:44 fhajny Exp $
+$NetBSD: patch-runtime_lookup.c,v 1.4 2017/07/04 13:31:16 fhajny Exp $
 
 Handle Darwin's pthread_setname_np().
 
---- runtime/lookup.c.orig	2017-05-15 09:41:19.000000000 +0000
+--- runtime/lookup.c.orig	2017-06-25 11:46:08.000000000 +0000
 +++ runtime/lookup.c
 @@ -958,10 +958,12 @@ lookupTableDefProcessCnf(struct cnfobj *
  	strcpy(reloader_thd_name, reloader_prefix);
@@ -10,12 +10,12 @@ Handle Darwin's pthread_setname_np().
  	reloader_thd_name[thd_name_len - 1] = '\0';
 -  #ifndef __APPLE__
 -     pthread_setname_np(lu->reloader, reloader_thd_name);
+-  #else
 +  #if defined(__NetBSD__)
 +     pthread_setname_np(lu->reloader, "%s", reloader_thd_name);
 +  #elif defined(__APPLE__)
-+     pthread_setname_np(reloader_thd_name); // must check
-   #else
--     pthread_setname_np(reloader_thd_name); // must check
+      pthread_setname_np(reloader_thd_name); // must check
++  #else
 +     pthread_setname_np(lu->reloader, reloader_thd_name);
    #endif
  #endif