ports/169303: [patch] port of sysutils/rsyslog6

[Brad Davis]

>Number:         169303
>Category:       ports
>Synopsis:       [patch] port of sysutils/rsyslog6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 21 21:40:11 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Brad Davis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD mccaffrey.den.so14k.com 9.0-RELEASE FreeBSD 9.0-RELEASE #24: Tue Jan 17 20:26:54 MST 2012 bdavis at mccaffrey.den.so14k.com:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
	Port of rsyslog 6.2.2
>How-To-Repeat:
	
>Fix:
	- Repo copy the sysutils/rsyslog6-devel* ports to sysutils/rsyslog*
	- Apply the following patch:


diff -ruN rsyslog6.ori/Makefile rsyslog6/Makefile
--- rsyslog6.ori/Makefile	2012-06-21 15:24:34.000000000 -0600
+++ rsyslog6/Makefile	2012-06-21 13:56:09.000000000 -0600
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	6.3.6
+PORTVERSION=	6.2.2
 PORTREVISION?=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
@@ -20,7 +20,8 @@
 USE_LDCONFIG=	yes
 
 LIB_DEPENDS+=	ee:${PORTSDIR}/devel/libee \
-		estr:${PORTSDIR}/devel/libestr
+		estr:${PORTSDIR}/devel/libestr \
+		sysinfo:${PORTSDIR}/devel/libsysinfo
 
 .ifdef MNAME
 RUN_DEPENDS=	rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6-devel
@@ -56,7 +57,7 @@
 CPPFLAGS+=-march=i686
 .endif
 
-CONFIGURE_ENV+=	LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee"
+CONFIGURE_ENV+=	LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lsysinfo -lkvm"
 CFLAGS+=	${CPPFLAGS}
 
 .ifndef MNAME
diff -ruN rsyslog6.ori/distinfo rsyslog6/distinfo
--- rsyslog6.ori/distinfo	2012-06-21 15:24:34.000000000 -0600
+++ rsyslog6/distinfo	2012-06-21 09:11:40.000000000 -0600
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-6.3.6.tar.gz) = 5674ccb45cf57670a24eeeed8a713962b9706b3ea5e7cebcee3ca51ee6d59108
-SIZE (rsyslog-6.3.6.tar.gz) = 2472350
+SHA256 (rsyslog-6.2.2.tar.gz) = c54b51f9f26d16e623d664c765268f3696721ceddfbee4e76b0dd89f04a6f471
+SIZE (rsyslog-6.2.2.tar.gz) = 2432745
diff -ruN rsyslog6.ori/files/patch-grammar__lexer.l rsyslog6/files/patch-grammar__lexer.l
--- rsyslog6.ori/files/patch-grammar__lexer.l	2012-06-21 15:24:34.000000000 -0600
+++ rsyslog6/files/patch-grammar__lexer.l	1969-12-31 17:00:00.000000000 -0700
@@ -1,11 +0,0 @@
---- ./grammar/lexer.l.orig	2011-09-15 06:01:15.000000000 +0000
-+++ ./grammar/lexer.l	2012-01-17 01:17:22.081763540 +0000
-@@ -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 -ruN rsyslog6.ori/files/patch-plugins__imklog__bsd.c rsyslog6/files/patch-plugins__imklog__bsd.c
--- rsyslog6.ori/files/patch-plugins__imklog__bsd.c	2012-06-21 15:24:34.000000000 -0600
+++ rsyslog6/files/patch-plugins__imklog__bsd.c	1969-12-31 17:00:00.000000000 -0700
@@ -1,29 +0,0 @@
---- ./plugins/imklog/bsd.c.orig	2012-01-17 01:18:16.381760139 +0000
-+++ ./plugins/imklog/bsd.c	2012-01-17 01:20:48.523313199 +0000
-@@ -93,7 +93,7 @@
-  * entry point. -- rgerhards, 2008-04-09
-  */
- rsRetVal
--klogWillRun(void)
-+klogWillRun(modConfData_t *pModConf)
- {
- 	DEFiRet;
- 
-@@ -176,7 +176,7 @@
- /* to be called in the module's AfterRun entry point
-  * rgerhards, 2008-04-09
-  */
--rsRetVal klogAfterRun(void)
-+rsRetVal klogAfterRun(modConfData_t *pModConf)
- {
-         DEFiRet;
- 	if(fklog != -1)
-@@ -190,7 +190,7 @@
-  * "message pull" mechanism.
-  * rgerhards, 2008-04-09
-  */
--rsRetVal klogLogKMsg(void)
-+rsRetVal klogLogKMsg(modConfData_t *pModConf)
- {
-         DEFiRet;
- 	readklog();
diff -ruN rsyslog6.ori/files/patch-plugins__imklog__imklog.h rsyslog6/files/patch-plugins__imklog__imklog.h
--- rsyslog6.ori/files/patch-plugins__imklog__imklog.h	2012-06-21 15:24:34.000000000 -0600
+++ rsyslog6/files/patch-plugins__imklog__imklog.h	1969-12-31 17:00:00.000000000 -0700
@@ -1,11 +0,0 @@
---- ./plugins/imklog/imklog.h.orig	2012-01-17 01:19:00.125759823 +0000
-+++ ./plugins/imklog/imklog.h	2012-01-17 01:19:09.879756857 +0000
-@@ -60,7 +60,7 @@
-  * believe it is appropriate for the job that needs to be done.
-  * rgerhards, 2008-04-09
-  */
--#if 0
-+#if 1
- extern int symbols_twice;
- extern int use_syscall;
- extern int symbol_lookup;
diff -ruN rsyslog6.ori/pkg-plist rsyslog6/pkg-plist
--- rsyslog6.ori/pkg-plist	2012-06-21 15:24:34.000000000 -0600
+++ rsyslog6/pkg-plist	2012-06-21 14:02:53.000000000 -0600
@@ -141,7 +141,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_secure_tls.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_stunnel.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_tls.html
-%%PORTDOCS%%%%DOCSDIR%%/scoping.html
 %%PORTDOCS%%%%DOCSDIR%%/syslog_parsing.html
 %%PORTDOCS%%%%DOCSDIR%%/syslog_protocol.html
 %%PORTDOCS%%%%DOCSDIR%%/tls_cert.jpg
>Release-Note:
>Audit-Trail:
>Unformatted: