Update rsyslog to 8.4.2.

Version 8.4.2 [v8-stable] 2014-10-02
- bugfix: the fix for CVE-2014-3634 did not handle all cases. This is
  corrected now. see also: CVE-2014-3683
- fixed a build problem on some platforms. Thanks to Olaf for the patch
- behaviour change: "msg" of messages with invalid PRI set to "rawmsg"
  When the PRI is invalid, the rest of the header cannot be valid. So
  we move all of it to MSG and do not try to parse it out. Note that
  this is not directly related to the security issue but rather done
  because it makes most sense.

Version 8.4.1 [v8-stable] 2014-09-30
- imudp: add for bracketing mode, which makes parsing stats easier
- permit at-sign in variable names
  closes: https://github.com/rsyslog/rsyslog/issues/110
- bugfix: fix syntax error in anon_cc_numbers.py script
  Thanks to github user anthcourtney for the patch.
  closes: https://github.com/rsyslog/rsyslog/issues/109
- bugfix: ompgsql: don't loose uncomitted data on retry
  Thanks to Jared Johnson and Axel Rau for the patch.
- bugfix: imfile: if a state file for a different file name was set,
  that different file (name) was monitored instead of the configured
  one. Now, the state file is deleted and the correct file monitored.
  closes: https://github.com/rsyslog/rsyslog/issues/103
- bugfix: omudpspoof: source port was invalid
  Thanks to Pavel Levshin for the patch
- bugfix: build failure on systems which don't have json_tokener_errors
  Older versions of json-c need to use a different API (which don't
  exists on newer versions, unfortunately...)
  Thanks to Thomas D. for reporting this problem.
- bugfix: omelasticsearch does not work with broken/changed ES 1.0+ API
  closes: https://github.com/rsyslog/rsyslog/issues/104
- bugfix: mmanon did not properly anonymize IP addresses starting with '9'
  Thanks to defa-at-so36.net for reporting this problem.
  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=529
- bugfix: build problems on SuSe Linux
  Thanks Andreas Stieger for the patch
- bugfix: omelasticsearch error file did not work correctly on ES 1.0+
  due to a breaking change in the ElasticSearch API.
  see also: https://github.com/rsyslog/rsyslog/issues/104
- bugfix: potential abort when a message with PRI > 191 was processed
  if the "pri-text" property was used in active templates, this could be
  abused to a remote denial of service from permitted senders
  see also: CVE-2014-3634

4 files changed, 11 insertions, 30 deletions

diff --git a/sysutils/rsyslog/Makefile.common b/sysutils/rsyslog/Makefile.common
index 6f3afba495a..23c0515f8d3 100644
--- a/sysutils/rsyslog/Makefile.common
+++ b/sysutils/rsyslog/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2014/09/25 08:49:50 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.3 2014/10/26 21:11:09 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.4.0
+DISTNAME=		rsyslog-8.4.2
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.rsyslog.com/files/download/rsyslog/
 
diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo
index 4350aa84d25..d5754881fc6 100644
--- a/sysutils/rsyslog/distinfo
+++ b/sysutils/rsyslog/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.1 2014/09/05 07:15:41 fhajny Exp $
+$NetBSD: distinfo,v 1.2 2014/10/26 21:11:09 fhajny Exp $
 
-SHA1 (rsyslog-8.4.0.tar.gz) = 2e0e9f0f53be4abb5587c48d0d93cb2d35d71150
-RMD160 (rsyslog-8.4.0.tar.gz) = fdced7c26066432f299e763cdaa46b96feef5e8c
-Size (rsyslog-8.4.0.tar.gz) = 1955549 bytes
-SHA1 (patch-grammar_lexer.l) = 6c4314b340449af3fce1acecbdfd4e2b4c0328f5
+SHA1 (rsyslog-8.4.2.tar.gz) = f68f92a1fa3d8fca6f4fc3dc4a7acbabc1774612
+RMD160 (rsyslog-8.4.2.tar.gz) = 0cca89d75b754f06360ad1a44b1f31167fdb64ca
+Size (rsyslog-8.4.2.tar.gz) = 1938563 bytes
+SHA1 (patch-grammar_lexer.l) = e9702023a7899fe6a3fe8c6902fb9127b3eb29bc
 SHA1 (patch-platform_redhat_rsyslog.conf) = 775c523e3eae6641b30cc09c4044e46ae87fa7a4
 SHA1 (patch-plugins_imfile_imfile.c) = 390aa8febed6693bf69bc1c1764521eae0250477
 SHA1 (patch-plugins_imuxsock_imuxsock.c) = 2516941970ac1b4c42d7a326a2bd824052bc9b0b
 SHA1 (patch-plugins_mmexternal_mmexternal.c) = 4f5d13c1206f0c5d00458ee93cb0791ac150fc30
-SHA1 (patch-runtime_msg.c) = e41ab9e291822f44bcc3c420332d2b33fc786f78
 SHA1 (patch-tools_rsyslogd.c) = 99f63b04195ca7fb753d2900a4d68918a54914f5
 SHA1 (patch-tools_syslogd.c) = 9244710cd24377d7a36c24148250935f58dee5da
diff --git a/sysutils/rsyslog/patches/patch-grammar_lexer.l b/sysutils/rsyslog/patches/patch-grammar_lexer.l
index fca81b00c96..679233c138e 100644
--- a/sysutils/rsyslog/patches/patch-grammar_lexer.l
+++ b/sysutils/rsyslog/patches/patch-grammar_lexer.l
@@ -1,14 +1,14 @@
-$NetBSD: patch-grammar_lexer.l,v 1.1 2014/09/05 07:15:41 fhajny Exp $
+$NetBSD: patch-grammar_lexer.l,v 1.2 2014/10/26 21:11:09 fhajny Exp $
 
 Fix build on BSD.
---- grammar/lexer.l.orig	2014-08-18 09:14:06.000000000 +0000
+--- grammar/lexer.l.orig	2014-10-02 10:27:30.000000000 +0000
 +++ grammar/lexer.l
 @@ -31,7 +31,7 @@
  %{
  #include "config.h"
  #include "parserif.h"
--extern char *strdup(char*); /* somehow we do not get this from string.h... */
-+// extern char *strdup(char*); /* somehow we do not get this from string.h... */
+-extern char *strdup(__const char*); /* somehow we may not get this from string.h... */
++// extern char *strdup(__const char*); /* somehow we may not get this from string.h... */
  %}
  
  %option noyywrap nodefault case-insensitive yylineno
diff --git a/sysutils/rsyslog/patches/patch-runtime_msg.c b/sysutils/rsyslog/patches/patch-runtime_msg.c
deleted file mode 100644
index 2cc0385f037..00000000000
--- a/sysutils/rsyslog/patches/patch-runtime_msg.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-runtime_msg.c,v 1.1 2014/09/05 07:15:41 fhajny Exp $
-
-Fix build with newer json-c.
---- runtime/msg.c.orig	2014-08-18 09:14:06.000000000 +0000
-+++ runtime/msg.c
-@@ -4074,7 +4074,11 @@ MsgSetPropsViaJSON(msg_t *__restrict__ c
- 
- 			err = tokener->err;
- 			if(err != json_tokener_continue)
--				errMsg = json_tokener_errors[err];
-+#if				HAVE_JSON_TOKENER_ERROR_DESC
-+					errMsg = json_tokener_error_desc(err);
-+#				else
-+					errMsg = json_tokener_errors[err];
-+#				endif
- 			else
- 				errMsg = "Unterminated input";
- 		} else if(!json_object_is_type(json, json_type_object))