- Update to 6.4.1

- Unmark as BROKEN on i386 with SNMP

Changes: http://www.rsyslog.com/changelog-for-6-4-1-v6-stable/

6 files changed, 26 insertions, 14 deletions

diff --git a/sysutils/rsyslog6-gnutls/Makefile b/sysutils/rsyslog6-gnutls/Makefile
index e421ef4117db..ab098ce13eae 100644
--- a/sysutils/rsyslog6-gnutls/Makefile
+++ b/sysutils/rsyslog6-gnutls/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
-
 COMMENT=	GNUTLS module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog6
 
diff --git a/sysutils/rsyslog6/Makefile b/sysutils/rsyslog6/Makefile
index 48d4e964e18f..00963000831f 100644
--- a/sysutils/rsyslog6/Makefile
+++ b/sysutils/rsyslog6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	6.2.2
+PORTVERSION=	6.4.1
 PORTREVISION?=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
@@ -93,10 +93,6 @@ post-install:
 
 .ifdef MNAME
 
-.if ${MNAME} == "snmp" && ${ARCH} == "i386" && ${OSVERSION} >= 800000
-BROKEN=		Does not link on i386: can't find symbol snmp_timeout in libnetsnmp
-.endif
-
 CONFIGURE_ARGS+=	--disable-rsyslogd --disable-klog
 
 DESCR?=		${.CURDIR}/../rsyslog6/pkg-descr
diff --git a/sysutils/rsyslog6/distinfo b/sysutils/rsyslog6/distinfo
index bc0c716d92ac..091b68db70d3 100644
--- a/sysutils/rsyslog6/distinfo
+++ b/sysutils/rsyslog6/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-6.2.2.tar.gz) = c54b51f9f26d16e623d664c765268f3696721ceddfbee4e76b0dd89f04a6f471
-SIZE (rsyslog-6.2.2.tar.gz) = 2432745
+SHA256 (rsyslog-6.4.1.tar.gz) = 6150e81f3338c8624c0e91dbfc83ce753b180993f12a211525a4ac59891efb21
+SIZE (rsyslog-6.4.1.tar.gz) = 2526465
diff --git a/sysutils/rsyslog6/files/patch-grammar__lexer.l b/sysutils/rsyslog6/files/patch-grammar__lexer.l
new file mode 100644
index 000000000000..ac71c892a44b
--- /dev/null
+++ b/sysutils/rsyslog6/files/patch-grammar__lexer.l
@@ -0,0 +1,11 @@
+--- grammar/lexer.l.orig	2012-09-09 19:56:44.000000000 -0600
++++ grammar/lexer.l	2012-09-09 19:56:56.000000000 -0600
+@@ -87,7 +87,7 @@
+  * included. I guess that's some autotools magic I don't understand...
+  */
+ //char *strdup(char*);
+-int fileno(FILE *stream);
++//int fileno(FILE *stream);
+ 
+ %}
+ 
diff --git a/sysutils/rsyslog6/files/patch-plugins__imuxsock__imuxsock.c b/sysutils/rsyslog6/files/patch-plugins__imuxsock__imuxsock.c
index 214c10686cbc..bfbc242d83b9 100644
--- a/sysutils/rsyslog6/files/patch-plugins__imuxsock__imuxsock.c
+++ b/sysutils/rsyslog6/files/patch-plugins__imuxsock__imuxsock.c
@@ -1,6 +1,15 @@
---- ./plugins/imuxsock/imuxsock.c.orig	2011-09-15 06:01:15.000000000 +0000
-+++ ./plugins/imuxsock/imuxsock.c	2012-01-17 01:17:22.085759310 +0000
-@@ -727,9 +727,7 @@
+--- plugins/imuxsock/imuxsock.c.orig	2012-09-06 04:05:36.000000000 -0600
++++ plugins/imuxsock/imuxsock.c	2012-09-09 20:03:06.000000000 -0600
+@@ -81,7 +81,7 @@
+ 
+ /* emulate struct ucred for platforms that do not have it */
+ #ifndef HAVE_SCM_CREDENTIALS
+-struct ucred { int pid; };
++struct ucred { int pid; uid_t uid; gid_t gid; };
+ #endif
+ 
+ /* handle some defines missing on more than one platform */
+@@ -895,9 +895,7 @@
  	int iMaxLine;
  	struct msghdr msgh;
  	struct iovec msgiov;
diff --git a/sysutils/rsyslog6/pkg-plist b/sysutils/rsyslog6/pkg-plist
index c232eeb62a88..061bf7f68ef3 100644
--- a/sysutils/rsyslog6/pkg-plist
+++ b/sysutils/rsyslog6/pkg-plist
@@ -6,8 +6,6 @@ lib/rsyslog/immark.la
 lib/rsyslog/immark.so
 lib/rsyslog/imtcp.la
 lib/rsyslog/imtcp.so
-lib/rsyslog/imtemplate.la
-lib/rsyslog/imtemplate.so
 lib/rsyslog/imudp.la
 lib/rsyslog/imudp.so
 lib/rsyslog/imuxsock.la