Update sysutils/rsyslog to 8.27.0

Version 8.27.0 [v8-stable] 2017-05-16
- imkafka: add module
- imptcp enhancements:
  * optionally emit an error message if incoming messages are truncated
  * optionally emit connection tracking message (on connection create and
    close)
  * add "maxFrameSize" parameter to specify the maximum size permitted
    in octet-counted mode
  * add parameter "discardTruncatedMsg" to permit truncation of
    oversize messages
  * improve octect-counted mode detection: if the octet count is larger
    then the set frame size (or overly large in general), it is now
    assumed that octet-stuffing mode is used. This probably solves a
    number of issues seen in real deployments.
- imtcp enhancements:
  * add parameter "discardTruncatedMsg" to permit truncation of
    oversize messages
  * add "maxFrameSize" parameter to specify the maximum size permitted
    in octet-counted mode
- imfile bugfix: "file not found error" repeatedly being reported
  for configured non-existing file.
- imfile: in inotify mode, add error message if configured file cannot
  be found
- imfile: add parameter "fileNotFoundError" to optinally disable
  "file not found" error messages
- core: replaced gethostbyname() with getaddrinfo() call
- omkafka: add "origin" field to stats output
- imuxsock: rate-limiting also uses process name
  both for the actual limit procesing as well as warning messages emitted
- Added new module: KSI log signing ver. 1.2 (lmsig_ksi_ls12)
- rsylsog base functionality now builds on osx (Mac)
- build now works on solaris again
- imfile: fix cross-platform build issue
- bugfix core: segfault when no parser could parse message
- bugfix core: rate-limit internal messages when going to external log system
- bugfix core: when obtaining local hostname, a NULL pointer could be
  accessed.
- bugfix core: on shutdown, stderr was written to, even if alrady closed
- bugfix core: perform MainqObj destruction only when not NULL already
- bugfix core: memory leak when internal messages not processed internally
- bugfix imptcp: potential overflow in octet count computation
  when a very large octet count was specified, the counter could overflow

6 files changed, 51 insertions, 32 deletions

diff --git a/sysutils/rsyslog-elasticsearch/Makefile b/sysutils/rsyslog-elasticsearch/Makefile
index e0835cb9898..1f2fb09658f 100644
--- a/sysutils/rsyslog-elasticsearch/Makefile
+++ b/sysutils/rsyslog-elasticsearch/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2017/04/30 01:22:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2017/05/18 13:27:44 fhajny Exp $
 #
 
 RSYSLOG_MOD=	elasticsearch
 PKGNAME=	${DISTNAME:S/rsyslog/rsyslog-${RSYSLOG_MOD}/}
-PKGREVISION=	1
 
 DEPENDS+=	rsyslog>=${PKGVERSION_NOREV}:../../sysutils/rsyslog
 
diff --git a/sysutils/rsyslog/Makefile.common b/sysutils/rsyslog/Makefile.common
index fcb99334816..ebe3e146d32 100644
--- a/sysutils/rsyslog/Makefile.common
+++ b/sysutils/rsyslog/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2017/04/06 20:08:37 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.28 2017/05/18 13:27:44 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.26.0
+DISTNAME=		rsyslog-8.27.0
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.rsyslog.com/files/download/rsyslog/
 
@@ -51,4 +51,5 @@ BUILDLINK_DEPMETHOD.libuuid+=		build
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../sysutils/liblogging/buildlink3.mk"
+BUILDLINK_API_DEPENDS.liblognorm+=	libfastjson>=0.99.3
 .include "../../textproc/libfastjson/buildlink3.mk"
diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo
index 11e230714f8..a394f6db60e 100644
--- a/sysutils/rsyslog/distinfo
+++ b/sysutils/rsyslog/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.25 2017/04/06 20:08:37 fhajny Exp $
+$NetBSD: distinfo,v 1.26 2017/05/18 13:27:44 fhajny Exp $
 
-SHA1 (rsyslog-8.26.0.tar.gz) = 9c5e253fbf1c6992ac5d1eefe17587d4da2cdbfd
-RMD160 (rsyslog-8.26.0.tar.gz) = 1a8dd7a430c005c3a2b9b09eb958d0714b9fe52f
-SHA512 (rsyslog-8.26.0.tar.gz) = 96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19
-Size (rsyslog-8.26.0.tar.gz) = 2393148 bytes
-SHA1 (patch-configure) = aaba67d65b249b6aebfe8c5b3a1c9cd07e06c794
+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 (patch-configure) = df356c47b6c19c96b923978a5b194724fc0f10ba
 SHA1 (patch-grammar_lexer.l) = 6de5aac9253ebcfae124f8dc3c7178446248f2b4
 SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433
 SHA1 (patch-plugins_imfile_imfile.c) = 65b56f6799e2b206e1a8c3d055a4e9dc22da88be
 SHA1 (patch-plugins_impstats_impstats.c) = a4eb7b8b9870271204d856c3a9e05fd24cee702b
 SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e
 SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da
-SHA1 (patch-plugins_mmexternal_mmexternal.c) = 14546fb631822c697c8ef766450a24afaf4ebf7a
-SHA1 (patch-runtime_lookup.c) = cedb0531ff00063d44467029beba852ce4fbc0be
+SHA1 (patch-plugins_mmexternal_mmexternal.c) = 498fc31e687e50e6aee821c64e029f9407e902ef
+SHA1 (patch-runtime_lookup.c) = 2d824bfb00d93ba2abfb481445ed8b904ecbeae7
 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-configure b/sysutils/rsyslog/patches/patch-configure
index db499431c11..e3958d77f42 100644
--- a/sysutils/rsyslog/patches/patch-configure
+++ b/sysutils/rsyslog/patches/patch-configure
@@ -1,11 +1,29 @@
-$NetBSD: patch-configure,v 1.1 2016/12/05 10:36:46 fhajny Exp $
+$NetBSD: patch-configure,v 1.2 2017/05/18 13:27:44 fhajny Exp $
 
 Portability.
 
---- configure.orig	2016-11-13 15:48:32.000000000 +0000
+--- configure.orig	2017-05-15 09:42:02.000000000 +0000
 +++ configure
-@@ -15255,7 +15255,7 @@ if test -d "$srcdir"/.git && ! test -f
-   in_git_src=yes
+@@ -15337,7 +15337,7 @@ $as_echo "#define OS_AIX 1" >>confdefs.h
+ 
+   ;;
+ esac
+- if test x$os_type == xapple; then
++ if test x$os_type = xapple; then
+   OS_APPLE_TRUE=
+   OS_APPLE_FALSE='#'
+ else
+@@ -15345,7 +15345,7 @@ else
+   OS_APPLE_FALSE=
+ fi
+ 
+- if test x$os_type == xlinux; then
++ if test x$os_type = xlinux; then
+   xOS_LINUX_TRUE=
+   xOS_LINUX_FALSE='#'
+ else
+@@ -15353,7 +15353,7 @@ else
+   xOS_LINUX_FALSE=
  fi
  
 - if test x$os_type == xlinux; then
diff --git a/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c b/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
index 8d11a09c1f7..8b73b69dd2a 100644
--- a/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
+++ b/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
@@ -1,14 +1,14 @@
-$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.5 2017/02/13 19:59:36 fhajny Exp $
+$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.6 2017/05/18 13:27:44 fhajny Exp $
 
 Fix build on BSD.
---- plugins/mmexternal/mmexternal.c.orig	2017-01-10 09:00:04.000000000 +0000
+--- plugins/mmexternal/mmexternal.c.orig	2017-05-15 09:41:19.000000000 +0000
 +++ plugins/mmexternal/mmexternal.c
 @@ -31,7 +31,7 @@
  #include <errno.h>
  #include <unistd.h>
  #include <fcntl.h>
--#if defined(_AIX) || defined(__FreeBSD__) 
-+#if defined(_AIX) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) || defined(__APPLE__)
+-#if defined(_AIX) || defined(__FreeBSD__) || defined(__APPLE__) 
++#if defined(_AIX) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) || defined(__APPLE__) 
  #include <sys/wait.h>
  #else
  #include <wait.h>
diff --git a/sysutils/rsyslog/patches/patch-runtime_lookup.c b/sysutils/rsyslog/patches/patch-runtime_lookup.c
index 9cf6170c9cd..5d9224a7c8e 100644
--- a/sysutils/rsyslog/patches/patch-runtime_lookup.c
+++ b/sysutils/rsyslog/patches/patch-runtime_lookup.c
@@ -1,21 +1,22 @@
-$NetBSD: patch-runtime_lookup.c,v 1.2 2016/04/22 16:52:14 jperkin Exp $
+$NetBSD: patch-runtime_lookup.c,v 1.3 2017/05/18 13:27:44 fhajny Exp $
 
 Handle Darwin's pthread_setname_np().
 
---- runtime/lookup.c.orig	2016-03-07 06:47:55.000000000 +0000
+--- runtime/lookup.c.orig	2017-05-15 09:41:19.000000000 +0000
 +++ runtime/lookup.c
-@@ -926,8 +926,14 @@ lookupTableDefProcessCnf(struct cnfobj *
+@@ -958,10 +958,12 @@ lookupTableDefProcessCnf(struct cnfobj *
  	strcpy(reloader_thd_name, reloader_prefix);
  	strcpy(reloader_thd_name + strlen(reloader_prefix), (char*) lu->name);
  	reloader_thd_name[thd_name_len - 1] = '\0';
-+#if defined(__NetBSD__)
-+	pthread_setname_np(lu->reloader, "%s", reloader_thd_name);
-+#elif defined(__APPLE__)
-+	pthread_setname_np(reloader_thd_name);
-+#else
- 	pthread_setname_np(lu->reloader, reloader_thd_name);
+-  #ifndef __APPLE__
+-     pthread_setname_np(lu->reloader, reloader_thd_name);
++  #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(lu->reloader, reloader_thd_name);
+   #endif
  #endif
-+#endif
  	CHKiRet(lookupReadFile(lu->self, lu->name, lu->filename));
- 	DBGPRINTF("lookup table '%s' loaded from file '%s'\n", lu->name, lu->filename);
-