- Update sysutils/rsyslog7 to 7.6.6 [1] and sysutils/rsyslog8 to 8.4.1 [2] to fix CVE-2014-3634 [3].

1: http://www.rsyslog.com/changelog-for-7-6-6-v7-stable/
2: http://www.rsyslog.com/changelog-for-8-4-1-v8-stable/
3: http://www.rsyslog.com/remote-syslog-pri-vulnerability/

Reviewed by:	bdrewery@
Security:	8e0e86ff-48b5-11e4-ab80-000c29f6ae42

7 files changed, 41 insertions, 9 deletions

diff --git a/sysutils/rsyslog7/Makefile b/sysutils/rsyslog7/Makefile
index 06f512c6a65d..00f1d8152a1b 100644
--- a/sysutils/rsyslog7/Makefile
+++ b/sysutils/rsyslog7/Makefile
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	rsyslog
-PORTVERSION=	7.6.3
-PORTREVISION=	4
+PORTVERSION=	7.6.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
 MAINTAINER=	brd@FreeBSD.org
 COMMENT=	Syslogd supporting SQL, TCP, and TLS
 
-BUILD_DEPENDS=	libgcrypt-config:${PORTSDIR}/security/libgcrypt
+BUILD_DEPENDS=	libgcrypt-config:${PORTSDIR}/security/libgcrypt \
+		rst2man:${PORTSDIR}/textproc/py-docutils
 
 LIB_DEPENDS=	libee.so:${PORTSDIR}/devel/libee \
 		libestr.so:${PORTSDIR}/devel/libestr \
diff --git a/sysutils/rsyslog7/distinfo b/sysutils/rsyslog7/distinfo
index 4b25d3db047d..7d9264a52b85 100644
--- a/sysutils/rsyslog7/distinfo
+++ b/sysutils/rsyslog7/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-7.6.3.tar.gz) = 013359035f8b6e5a4328edaffbda1120974accaba36ddc5de66a582fa588f5ec
-SIZE (rsyslog-7.6.3.tar.gz) = 3052448
+SHA256 (rsyslog-7.6.6.tar.gz) = c77ae0db6204c5bd670fa96c354ee5fe1c62c876bd84ec06ed429138c78885bb
+SIZE (rsyslog-7.6.6.tar.gz) = 3027663
diff --git a/sysutils/rsyslog7/files/patch-grammar__lexer.l b/sysutils/rsyslog7/files/patch-grammar__lexer.l
new file mode 100644
index 000000000000..c30b117b0223
--- /dev/null
+++ b/sysutils/rsyslog7/files/patch-grammar__lexer.l
@@ -0,0 +1,11 @@
+--- grammar/lexer.l.orig	2014-09-30 16:44:49 UTC
++++ 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... */
+ %}
+ 
+ %option noyywrap nodefault case-insensitive yylineno
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
index c42edf25aa11..91b0753f7342 100644
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rsyslog
-PORTVERSION=	8.2.1
-PORTREVISION=	4
+PORTVERSION=	8.4.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo
index 4d6db6f28cde..bfa5cc1b5c01 100644
--- a/sysutils/rsyslog8/distinfo
+++ b/sysutils/rsyslog8/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-8.2.1.tar.gz) = 193901c359b8228a85dca7a6a2e715ab2b52c18a66ca9f805d4028bedff98196
-SIZE (rsyslog-8.2.1.tar.gz) = 1944225
+SHA256 (rsyslog-8.4.0.tar.gz) = bf0ab78c3739d49527c3734f3da7f48cb90e51f89d9741adced0cf234c7190c0
+SIZE (rsyslog-8.4.0.tar.gz) = 1955549
diff --git a/sysutils/rsyslog8/files/patch-grammar__lexer.l b/sysutils/rsyslog8/files/patch-grammar__lexer.l
new file mode 100644
index 000000000000..c30b117b0223
--- /dev/null
+++ b/sysutils/rsyslog8/files/patch-grammar__lexer.l
@@ -0,0 +1,11 @@
+--- grammar/lexer.l.orig	2014-09-30 16:44:49 UTC
++++ 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... */
+ %}
+ 
+ %option noyywrap nodefault case-insensitive yylineno
diff --git a/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c b/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c
new file mode 100644
index 000000000000..4393552aef9f
--- /dev/null
+++ b/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c
@@ -0,0 +1,11 @@
+--- plugins/mmexternal/mmexternal.c.orig	2014-09-30 16:57:35 UTC
++++ 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"