diff options
7 files changed, 70 insertions, 7 deletions
diff --git a/sysutils/rsyslog6-devel/Makefile b/sysutils/rsyslog6-devel/Makefile index d822a454864e..74439e38a68a 100644 --- a/sysutils/rsyslog6-devel/Makefile +++ b/sysutils/rsyslog6-devel/Makefile @@ -6,8 +6,8 @@ # PORTNAME= rsyslog -PORTVERSION= 6.1.10 -PORTREVISION?= 1 +PORTVERSION= 6.3.6 +PORTREVISION?= 0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ .ifdef MNAME diff --git a/sysutils/rsyslog6-devel/distinfo b/sysutils/rsyslog6-devel/distinfo index 1b25a6cabb41..11436f5bcf4b 100644 --- a/sysutils/rsyslog6-devel/distinfo +++ b/sysutils/rsyslog6-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (rsyslog-6.1.10.tar.gz) = 3e2e9a37af964a3e6dc80940edd8bca1f1b9367f741afc1874c6735c7a37dafc -SIZE (rsyslog-6.1.10.tar.gz) = 2410995 +SHA256 (rsyslog-6.3.6.tar.gz) = 5674ccb45cf57670a24eeeed8a713962b9706b3ea5e7cebcee3ca51ee6d59108 +SIZE (rsyslog-6.3.6.tar.gz) = 2472350 diff --git a/sysutils/rsyslog6-devel/files/patch-grammar__lexer.l b/sysutils/rsyslog6-devel/files/patch-grammar__lexer.l new file mode 100644 index 000000000000..2c0658af1d43 --- /dev/null +++ b/sysutils/rsyslog6-devel/files/patch-grammar__lexer.l @@ -0,0 +1,11 @@ +--- ./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 --git a/sysutils/rsyslog6-devel/files/patch-plugins__im3195__im3195.c b/sysutils/rsyslog6-devel/files/patch-plugins__im3195__im3195.c index 71e392b30f43..a20cda530f68 100644 --- a/sysutils/rsyslog6-devel/files/patch-plugins__im3195__im3195.c +++ b/sysutils/rsyslog6-devel/files/patch-plugins__im3195__im3195.c @@ -1,6 +1,6 @@ ---- ./plugins/im3195/im3195.c.orig 2010-10-05 05:17:31.289999990 +0000 -+++ ./plugins/im3195/im3195.c 2010-10-05 05:18:22.651270169 +0000 -@@ -161,8 +161,8 @@ +--- ./plugins/im3195/im3195.c.orig 2011-09-15 06:01:15.000000000 +0000 ++++ ./plugins/im3195/im3195.c 2012-01-17 01:17:22.083763800 +0000 +@@ -195,8 +195,8 @@ CODEmodInit_QueryRegCFSLineHdlr CHKiRet(objUse(errmsg, CORE_COMPONENT)); diff --git a/sysutils/rsyslog6-devel/files/patch-plugins__imklog__bsd.c b/sysutils/rsyslog6-devel/files/patch-plugins__imklog__bsd.c new file mode 100644 index 000000000000..a5b57eb09cb7 --- /dev/null +++ b/sysutils/rsyslog6-devel/files/patch-plugins__imklog__bsd.c @@ -0,0 +1,29 @@ +--- ./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 --git a/sysutils/rsyslog6-devel/files/patch-plugins__imklog__imklog.h b/sysutils/rsyslog6-devel/files/patch-plugins__imklog__imklog.h new file mode 100644 index 000000000000..7d0eade4bc70 --- /dev/null +++ b/sysutils/rsyslog6-devel/files/patch-plugins__imklog__imklog.h @@ -0,0 +1,11 @@ +--- ./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 --git a/sysutils/rsyslog6-devel/files/patch-plugins__imuxsock__imuxsock.c b/sysutils/rsyslog6-devel/files/patch-plugins__imuxsock__imuxsock.c new file mode 100644 index 000000000000..214c10686cbc --- /dev/null +++ b/sysutils/rsyslog6-devel/files/patch-plugins__imuxsock__imuxsock.c @@ -0,0 +1,12 @@ +--- ./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 @@ + int iMaxLine; + struct msghdr msgh; + struct iovec msgiov; +-# if HAVE_SCM_CREDENTIALS + struct cmsghdr *cm; +-# endif + struct ucred *cred; + struct timeval *ts; + uchar bufRcv[4096+1]; |