Update rsyslog to 8.7.0.

- add message metadata "system" to msg object
  this permits to store metadata alongside the message
- imfile: add support for "filename" metadata
  this is useful in cases where wildcards are used
- imptcp: make stats counter names consistent with what imudp, imtcp uses
- added new module "omkafka" to support writing to Apache Kafka
- omfwd: add new "udp.senddelay" parameter
- mmnormalize enhancements
- RainerScript "foreach" iterator and array reading support
- now requires liblognorm >= 1.0.2
- add support for systemd >= 209 library names
- BSD "ntp" facility (value 12) is now also supported in filter
- bugfix: global(localHostName="xxx") was not respected in all modules
- bugfix: emit correct error message on config-file-not-found
- bugfix: impstats emitted invalid JSON format (if JSON was selected)
- bugfix: (small) memory leak in omfile's outchannel code
- bugfix: imuxsock did not deactivate some code not supported by platform

8 files changed, 97 insertions, 33 deletions

diff --git a/sysutils/rsyslog/Makefile b/sysutils/rsyslog/Makefile
index 932178bf47a..b22e91606ef 100644
--- a/sysutils/rsyslog/Makefile
+++ b/sysutils/rsyslog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/09/25 08:49:50 fhajny Exp $
+# $NetBSD: Makefile,v 1.3 2015/01/16 16:58:28 fhajny Exp $
 #
 
 BUILDLINK_DEPMETHOD.libestr=	full
@@ -9,8 +9,6 @@ BUILDLINK_DEPMETHOD.libuuid=	full
 
 COMMENT=		The enhanced syslogd for Unix
 
-#.include "options.mk"
-
 CONFIGURE_ARGS+=	--disable-testbench --enable-cached-man-pages		\
 			--enable-diagtools --enable-usertools --enable-uuid	\
 			--enable-imdiag --enable-imfile	--enable-impstats	\
@@ -52,5 +50,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/platform/redhat/rsyslog.conf			\
 		${DESTDIR}${EGDIR}/rsyslog.conf
 
+BUILDLINK_ABI_DEPENDS.liblognorm+=	liblognorm>=1.0.2
 .include "../../sysutils/liblognorm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rsyslog/Makefile.common b/sysutils/rsyslog/Makefile.common
index 79b875dd818..4c26efe18ab 100644
--- a/sysutils/rsyslog/Makefile.common
+++ b/sysutils/rsyslog/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2014/12/12 12:47:46 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.5 2015/01/16 16:58:28 fhajny Exp $
 # used by sysutils/rsyslog/Makefile
 # used by sysutils/rsyslog-dbi/Makefile
 # used by sysutils/rsyslog-gnutls/Makefile
@@ -11,7 +11,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-DISTNAME=		rsyslog-8.6.0
+DISTNAME=		rsyslog-8.7.0
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.rsyslog.com/files/download/rsyslog/
 
diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo
index a148ee0e9f3..1d1a723ef20 100644
--- a/sysutils/rsyslog/distinfo
+++ b/sysutils/rsyslog/distinfo
@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.3 2014/12/12 12:47:46 fhajny Exp $
+$NetBSD: distinfo,v 1.4 2015/01/16 16:58:28 fhajny Exp $
 
-SHA1 (rsyslog-8.6.0.tar.gz) = 06e912c8d48a9736ab2a1810f4f7c76a20abb0eb
-RMD160 (rsyslog-8.6.0.tar.gz) = 12f53341404fd20ded9f9de50b2e57aedef89205
-Size (rsyslog-8.6.0.tar.gz) = 1975854 bytes
+SHA1 (rsyslog-8.7.0.tar.gz) = 7f3909e58ec2f785c6aadf2e0685479150c82cc7
+RMD160 (rsyslog-8.7.0.tar.gz) = 2bb24de029edc69e0724c012bbe710e063d1907f
+Size (rsyslog-8.7.0.tar.gz) = 2003365 bytes
 SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec
-SHA1 (patch-platform_redhat_rsyslog.conf) = a61cf6750e21bfb8ddb4fd8150b98835231cb950
+SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433
 SHA1 (patch-plugins_imfile_imfile.c) = 6909e68e700d61099d9200fd26072bd7f199639f
+SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e
 SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da
 SHA1 (patch-plugins_mmexternal_mmexternal.c) = 12053abfd32553c4c29faa131b803e7edfaa3803
+SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437
 SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341
-SHA1 (patch-tools_rsyslogd.c) = 7d33c23a7c5b61317e2857df11b7b62e6c8f188b
-SHA1 (patch-tools_syslogd.c) = 94a53b2a2cfbc2b57c29d90c276fa4877fdfd2f2
+SHA1 (patch-tools_rsyslogd.c) = 5d480bc32f44ee308acad76588b250f8a56d894f
+SHA1 (patch-tools_syslogd.c) = 6855271d05da979d53ae7cee167163a563922b00
diff --git a/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf b/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf
index a75bc5c77a8..a1c71e7c848 100644
--- a/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf
+++ b/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf
@@ -1,17 +1,16 @@
-$NetBSD: patch-platform_redhat_rsyslog.conf,v 1.2 2014/12/12 12:47:46 fhajny Exp $
+$NetBSD: patch-platform_redhat_rsyslog.conf,v 1.3 2015/01/16 16:58:28 fhajny Exp $
 
 Fix sample config file. Auto-select kernel logging module.
---- platform/redhat/rsyslog.conf.orig	2014-11-17 15:08:14.000000000 +0000
+--- platform/redhat/rsyslog.conf.orig	2015-01-12 14:15:52.000000000 +0000
 +++ platform/redhat/rsyslog.conf
-@@ -4,15 +4,14 @@
-  * like we have with the default config. For more advanced 
-  * things, RainerScript configuration is suggested.
-  *
-- * For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
-- * or latest version online at http://www.rsyslog.com/doc/rsyslog_conf.html 
-+ * For more information see http://www.rsyslog.com/doc/rsyslog_conf.html
-  * If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
-  */
+@@ -4,14 +4,14 @@
+ # like we have with the default config. For more advanced 
+ # things, RainerScript configuration is suggested.
+ #
+-# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
++# For more information see `man rsyslog.conf`
+ # or latest version online at http://www.rsyslog.com/doc/rsyslog_conf.html 
+ # If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
  
  #### MODULES ####
  
diff --git a/sysutils/rsyslog/patches/patch-plugins_imptcp_imptcp.c b/sysutils/rsyslog/patches/patch-plugins_imptcp_imptcp.c
new file mode 100644
index 00000000000..acd9472c3a8
--- /dev/null
+++ b/sysutils/rsyslog/patches/patch-plugins_imptcp_imptcp.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-plugins_imptcp_imptcp.c,v 1.1 2015/01/16 16:58:28 fhajny Exp $
+
+Improve portability, fix build on SunOS and BSD.
+--- plugins/imptcp/imptcp.c.orig	2015-01-08 14:58:14.000000000 +0000
++++ plugins/imptcp/imptcp.c
+@@ -585,7 +585,7 @@ EnableKeepAlive(ptcplstn_t *pLstn, int s
+ 	if(pLstn->pSrv->iKeepAliveProbes > 0) {
+ 		optval = pLstn->pSrv->iKeepAliveProbes;
+ 		optlen = sizeof(optval);
+-		ret = setsockopt(sock, SOL_TCP, TCP_KEEPCNT, &optval, optlen);
++		ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT, &optval, optlen);
+ 	} else {
+ 		ret = 0;
+ 	}
+@@ -600,7 +600,7 @@ EnableKeepAlive(ptcplstn_t *pLstn, int s
+ 	if(pLstn->pSrv->iKeepAliveTime > 0) {
+ 		optval = pLstn->pSrv->iKeepAliveTime;
+ 		optlen = sizeof(optval);
+-		ret = setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &optval, optlen);
++		ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen);
+ 	} else {
+ 		ret = 0;
+ 	}
+@@ -615,7 +615,7 @@ EnableKeepAlive(ptcplstn_t *pLstn, int s
+ 	if(pLstn->pSrv->iKeepAliveIntvl > 0) {
+ 		optval = pLstn->pSrv->iKeepAliveIntvl;
+ 		optlen = sizeof(optval);
+-		ret = setsockopt(sock, SOL_TCP, TCP_KEEPINTVL, &optval, optlen);
++		ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL, &optval, optlen);
+ 	} else {
+ 		ret = 0;
+ 	}
diff --git a/sysutils/rsyslog/patches/patch-runtime_nsd__ptcp.c b/sysutils/rsyslog/patches/patch-runtime_nsd__ptcp.c
new file mode 100644
index 00000000000..ed669571505
--- /dev/null
+++ b/sysutils/rsyslog/patches/patch-runtime_nsd__ptcp.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-runtime_nsd__ptcp.c,v 1.1 2015/01/16 16:58:28 fhajny Exp $
+
+Improve portability, fix build on SunOS and BSD.
+--- runtime/nsd_ptcp.c.orig	2015-01-08 14:58:14.000000000 +0000
++++ runtime/nsd_ptcp.c
+@@ -656,7 +656,7 @@ EnableKeepAlive(nsd_t *pNsd)
+ 	if(pThis->iKeepAliveProbes > 0) {
+ 		optval = pThis->iKeepAliveProbes;
+ 		optlen = sizeof(optval);
+-		ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPCNT, &optval, optlen);
++		ret = setsockopt(pThis->sock, IPPROTO_TCP, TCP_KEEPCNT, &optval, optlen);
+ 	} else {
+ 		ret = 0;
+ 	}
+@@ -671,7 +671,7 @@ EnableKeepAlive(nsd_t *pNsd)
+ 	if(pThis->iKeepAliveTime > 0) {
+ 		optval = pThis->iKeepAliveTime;
+ 		optlen = sizeof(optval);
+-		ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPIDLE, &optval, optlen);
++		ret = setsockopt(pThis->sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen);
+ 	} else {
+ 		ret = 0;
+ 	}
+@@ -686,7 +686,7 @@ EnableKeepAlive(nsd_t *pNsd)
+ 	if(pThis->iKeepAliveIntvl > 0) {
+ 		optval = pThis->iKeepAliveIntvl;
+ 		optlen = sizeof(optval);
+-		ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPINTVL, &optval, optlen);
++		ret = setsockopt(pThis->sock, IPPROTO_TCP, TCP_KEEPINTVL, &optval, optlen);
+ 	} else {
+ 		ret = 0;
+ 	}
diff --git a/sysutils/rsyslog/patches/patch-tools_rsyslogd.c b/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
index f603a13d12a..1266e0d4975 100644
--- a/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
+++ b/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
@@ -1,18 +1,18 @@
-$NetBSD: patch-tools_rsyslogd.c,v 1.2 2014/12/12 12:47:46 fhajny Exp $
+$NetBSD: patch-tools_rsyslogd.c,v 1.3 2015/01/16 16:58:28 fhajny Exp $
 
 Need errno.h on NetBSD. Default PID file path.
---- tools/rsyslogd.c.orig	2014-12-02 10:15:16.000000000 +0000
+--- tools/rsyslogd.c.orig	2015-01-12 08:49:44.000000000 +0000
 +++ tools/rsyslogd.c
-@@ -27,7 +27,7 @@
- #include <signal.h>
- #include <sys/wait.h>
- #include <liblogging/stdlog.h>
+@@ -29,7 +29,7 @@
+ #ifdef HAVE_LIBLOGGING_STDLOG
+ #  include <liblogging/stdlog.h>
+ #endif
 -#ifdef OS_SOLARIS
-+#if defined(OS_SOLARIS) || defined(__NetBSD__)
++#if defined(OS_SOLARIS) || defined(OS_BSD)
  #	include <errno.h>
  #else
  #	include <sys/errno.h>
-@@ -84,7 +84,7 @@ void rsyslogdDoDie(int sig);
+@@ -87,7 +87,7 @@ void rsyslogdDoDie(int sig);
  
  
  #ifndef PATH_PIDFILE
diff --git a/sysutils/rsyslog/patches/patch-tools_syslogd.c b/sysutils/rsyslog/patches/patch-tools_syslogd.c
index da7b78bc048..c61d9e2f2f6 100644
--- a/sysutils/rsyslog/patches/patch-tools_syslogd.c
+++ b/sysutils/rsyslog/patches/patch-tools_syslogd.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-tools_syslogd.c,v 1.2 2014/12/12 12:47:46 fhajny Exp $
+$NetBSD: patch-tools_syslogd.c,v 1.3 2015/01/16 16:58:28 fhajny Exp $
 
 Need errno.h on NetBSD. Fix default PID path.
 --- tools/syslogd.c.orig	2014-12-02 10:15:16.000000000 +0000
@@ -8,7 +8,7 @@ Need errno.h on NetBSD. Fix default PID path.
  #include <assert.h>
  
 -#ifdef OS_SOLARIS
-+#if defined(OS_SOLARIS) || defined(__NetBSD__)
++#if defined(OS_SOLARIS) || defined(OS_BSD)
  #	include <errno.h>
 +#else
 +#	include <sys/errno.h>