Update sysutils/rsyslog to 8.12.0.

Version 8.12.0 [v8-stable] 2015-08-11
- Harmonize resetConfigVariables values and defaults
  see also https://github.com/rsyslog/rsyslog/pull/413
  Thanks to Tomas Heinrich for the patch.
- GT/KSI: fix some issues in signature file format and add conversion tool
  The file format is incompatible to previous format, but tools have been
  upgraded to handle both and also an option been added to convert from
  old to new format.
- bugfix: ommysql did not work when gnutls was enabled
  as it turned out, this was due to a check for GnuTLS functions
  with the side-effect that
  AC_CHECK_LIB, by default, adds the lib to LIBS, if there is no
  explicit action, what was the case here. So everything was now
  linked against GnuTLS, which in turn made ommysql fail.
  Thanks to Thomas D. (whissi) for the analysis of the ommysql/gnutls
  problem and Thomas Heinrich for pointing out that AC_CHECK_LIB might
  be the culprit.
- bugfix omfile: potential memory leak on file close
  see also: https://github.com/rsyslog/rsyslog/pull/423
  Thanks to Robert Schiele for the patch.
- bugfix omfile: potential race in dynafile detection/creation
  This could lead to a segfault.
  Thanks to Tomas Heinrich for the patch.
- bugfix omfile: Fix race-condition detection in path-creation code
  The affected code is used to detect a race condition in between
  testing for the existence of a directory and creating it if it didn't
  exist.  The variable tracking the number of attempts wasn't reset for
  subsequent elements in the path, thus limiting the number of
  reattempts to one per the whole path, instead of one per each path
  element.
  This solution was provided by Martin Poole.
- bugfix parser subsystem: potential misadressing in SanitizeMsg()
  could lead to a segfault
  Thanks to Tomas Heinrich for the patch.
- imfile: files moved outside of directory are now (properly) handled
- bugfix: imfile: segfault when using startmsg.regex if first log line
  doesn't match
  Thanks to Ciprian Hacman for the patch.
- bugfix imfile: file table was corrupted when on file deletion
  This could happen when a file that was statically configured (not via an
  wildcard) was deleted.
- bugfix ompgsql: transaction were improperly handled
  now transaction support is solidly disabled until we have enough requests
  to implement it again. Module still works fine in single insert mode.
  closes https://github.com/rsyslog/rsyslog/issues/399
- bugfix mmjsonparse: memory leak if non-cee-json message is processed
  see also https://github.com/rsyslog/rsyslog/pull/383
  Thanks to Anton Matveenko for the patch
- testbench: remove raciness from UDP based tests
- testbench: added bash into all scripts makign it mandatory
- bugfix testbench: Fixed problem building syslog_caller util when
  liblogging-stdlog is not available.
  Thanks to Louis Bouchard for the patch
- bugfix rscryutil.1: Added fix checking for generate_man_pages condition
  Thanks to Radovan Sroka for the patch
- bugfix freebsd console: \n (NL) is prepended with \r (CR) in console
  output on freebsd only. For more details see here:
  https://github.com/rsyslog/rsyslog/issues/372
  Thanks to AlexandreFenyo for the patch
------------------------------------------------------------------------------
Version 8.11.0 [v8-stable] 2015-06-30
- new signature provider for Keyless Signature Infrastructure (KSI) added
- build system: re-enable use of "make distcheck"
- add new signature provider for Kesless Signature Infrastructure (KSI)
  This has also been added to existing tooling; KSI is kind of v2 of
  the Guardtime functionality and has been added in the appropriate
  places.
- bugfix imfile: regex multiline mode ignored escapeLF option
  Thanks to Ciprian Hacman for reporting the problem
  closes https://github.com/rsyslog/rsyslog/issues/370
- bugfix omkafka: fixed several concurrency issues, most of them related
  to dynamic topics.
  Thanks to Janmejay Singh for the patch.
- bugfix: execonlywhenpreviousissuspended did not work correctly
  This especially caused problems when an action with this attribute was
  configured with an action queue.
- bugfix core engine: ensured global variable atomicity
  This could lead to problems in RainerScript, as well as probably in other
  areas where global variables are used inside rsyslog. I wouldn't outrule
  it could lead to segfaults.
  Thanks to Janmejay Singh for the patch.
- bugfix imfile: segfault when using startmsg.regex because of empty log line
  closes https://github.com/rsyslog/rsyslog/issues/357
  Thanks to Ciprian Hacman for the patch.
- bugfix: build problem on Solaris
  Thanks to Dagobert Michelsen for reporting this and getting us up to
  speed on the openCWS build farm.
- bugfix: build system strndup was used even if not present
  now added compatibility function. This came up on Solaris builds.
  Thanks to Dagobert Michelsen for reporting the problem.
  closes https://github.com/rsyslog/rsyslog/issues/347
- bugfix imjournal: do not pass empty messages to rsyslog core
  this causes a crash of the daemon
  see also https://github.com/rsyslog/rsyslog/pull/412
  Thanks to Tomas Heinrich for the patch.
- bugfix imjournal: cosmetic memory leak
  very small and an shutdown only, so did not affect operations
  see also https://github.com/rsyslog/rsyslog/pull/411
  Thanks to Tomas Heinrich for the patch.

4 files changed, 18 insertions, 33 deletions

diff --git a/sysutils/rsyslog/Makefile.common b/sysutils/rsyslog/Makefile.common
index e6ab571203b..fc1cbcf90e0 100644
--- a/sysutils/rsyslog/Makefile.common
+++ b/sysutils/rsyslog/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2015/06/09 15:00:33 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.12 2015/08/26 00:55:33 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.10.0
+DISTNAME=		rsyslog-8.12.0
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.rsyslog.com/files/download/rsyslog/
 
diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo
index 4e17e881dbb..42e6c81c8c6 100644
--- a/sysutils/rsyslog/distinfo
+++ b/sysutils/rsyslog/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.6 2015/06/09 15:00:33 fhajny Exp $
+$NetBSD: distinfo,v 1.7 2015/08/26 00:55:33 fhajny Exp $
 
-SHA1 (rsyslog-8.10.0.tar.gz) = 9fddcf1121e438e5291f738bb4619230de525e50
-RMD160 (rsyslog-8.10.0.tar.gz) = 7902285e72c47d14b9d21071ba6fe85f58ac2162
-Size (rsyslog-8.10.0.tar.gz) = 2013205 bytes
+SHA1 (rsyslog-8.12.0.tar.gz) = d43b917ec413a249310d5dcf76f848ea6871ea73
+RMD160 (rsyslog-8.12.0.tar.gz) = 1e9cc2651d6e0e033829c600c9d0aef05cd7e2bc
+Size (rsyslog-8.12.0.tar.gz) = 2091620 bytes
 SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec
 SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433
-SHA1 (patch-plugins_imfile_imfile.c) = 277d894673444caeb782a513c0d1cdd72c49a849
+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) = 12053abfd32553c4c29faa131b803e7edfaa3803
+SHA1 (patch-plugins_mmexternal_mmexternal.c) = 00606bd11d5d281bf4b32f038e857eb364954c4c
 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_imfile_imfile.c b/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c
index c62ab54bf3e..597314ace26 100644
--- a/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c
+++ b/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-plugins_imfile_imfile.c,v 1.3 2015/06/09 15:00:33 fhajny Exp $
+$NetBSD: patch-plugins_imfile_imfile.c,v 1.4 2015/08/26 00:55:33 fhajny Exp $
 
 Avoid unresolved symbol on inotify-less platforms.
---- plugins/imfile/imfile.c.orig	2015-05-19 08:53:40.000000000 +0000
+--- plugins/imfile/imfile.c.orig	2015-08-10 10:24:49.000000000 +0000
 +++ plugins/imfile/imfile.c
-@@ -1763,11 +1763,14 @@ BEGINrunInput
+@@ -1840,11 +1840,14 @@ BEGINrunInput
  CODESTARTrunInput
  	DBGPRINTF("imfile: working in %s mode\n", 
  		 (runModConf->opMode == OPMODE_POLLING) ? "polling" : "inotify");
@@ -19,18 +19,3 @@ Avoid unresolved symbol on inotify-less platforms.
  	DBGPRINTF("imfile: terminating upon request of rsyslog core\n");
  ENDrunInput
  
-@@ -1869,12 +1872,14 @@ CODESTARTmodExit
- 	objRelease(errmsg, CORE_COMPONENT);
- 	objRelease(prop, CORE_COMPONENT);
- 	objRelease(ruleset, CORE_COMPONENT);
-+#if HAVE_INOTIFY_INIT
- 	if(dirs != NULL) {
- 		free(dirs->active.listeners);
- 		free(dirs->configured.listeners);
- 		free(dirs);
- 	}
- 	free(wdmap);
-+#endif /* #if HAVE_INOTIFY_INIT */
- ENDmodExit
- 
- 
diff --git a/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c b/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
index 7e2d6febb2a..92c2fb952df 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.2 2014/12/12 12:47:46 fhajny Exp $
+$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.3 2015/08/26 00:55:33 fhajny Exp $
 
 Fix build on BSD.
---- plugins/mmexternal/mmexternal.c.orig	2014-11-25 15:45:35.000000000 +0000
+--- plugins/mmexternal/mmexternal.c.orig	2015-08-10 10:24:49.000000000 +0000
 +++ plugins/mmexternal/mmexternal.c
 @@ -31,7 +31,7 @@
  #include <errno.h>
  #include <unistd.h>
  #include <fcntl.h>
--#include <wait.h>
-+#include <sys/wait.h>
- #include <sys/uio.h>
- #include "conf.h"
- #include "syslogd-types.h"
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__)
+ #include <sys/wait.h>
+ #else
+ #include <wait.h>