diff options
author | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-10-06 00:20:08 +0000 |
---|---|---|
committer | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-10-06 00:20:08 +0000 |
commit | 69a9c7639e65e78c6c217dc2a685ae0c9ea782c4 (patch) | |
tree | 00652b33c114f2ea1a1f7c3de6d02fd69a0c6dda /sysutils | |
parent | 6509ee24fdac8543b615895604e198c868a8a8d6 (diff) |
RSYSLOG OVERHAUL: Part 11
- Don't compile the imtemplate plugin
- Fix the im3195 plugin compile
PR: ports/151021
Notes
Notes:
svn path=/head/; revision=262478
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/rsyslog6-devel/files/patch-Makefile.in | 19 | ||||
-rw-r--r-- | sysutils/rsyslog6-devel/files/patch-plugins__im3195__im3195.c | 13 |
2 files changed, 32 insertions, 0 deletions
diff --git a/sysutils/rsyslog6-devel/files/patch-Makefile.in b/sysutils/rsyslog6-devel/files/patch-Makefile.in new file mode 100644 index 000000000000..7286fe924feb --- /dev/null +++ b/sysutils/rsyslog6-devel/files/patch-Makefile.in @@ -0,0 +1,19 @@ +--- ./Makefile.in.orig 2010-10-05 05:14:22.724781915 +0000 ++++ ./Makefile.in 2010-10-05 05:14:41.908897529 +0000 +@@ -52,7 +52,6 @@ + @ENABLE_PGSQL_TRUE@am__append_10 = plugins/ompgsql + @ENABLE_SNMP_TRUE@am__append_11 = plugins/omsnmp + @ENABLE_CUST1_TRUE@am__append_12 = plugins/cust1 +-@ENABLE_IMTEMPLATE_TRUE@am__append_13 = plugins/imtemplate + @ENABLE_OMSTDOUT_TRUE@am__append_14 = plugins/omstdout + @ENABLE_PMLASTMSG_TRUE@am__append_15 = plugins/pmlastmsg + @ENABLE_PMRFC3164SD_TRUE@am__append_16 = plugins/pmrfc3164sd +@@ -194,7 +193,7 @@ + plugins/imklog plugins/imsolaris plugins/omgssapi \ + plugins/imgssapi plugins/omrelp plugins/imrelp plugins/ommysql \ + plugins/omlibdbi plugins/ompgsql plugins/omsnmp plugins/cust1 \ +- plugins/imtemplate plugins/omstdout plugins/pmlastmsg \ ++ plugins/omstdout plugins/pmlastmsg \ + plugins/pmrfc3164sd plugins/omruleset plugins/omdbalerting \ + plugins/omudpspoof plugins/omuxsock plugins/omtemplate \ + plugins/imfile plugins/imptcp plugins/imdiag plugins/ommail \ diff --git a/sysutils/rsyslog6-devel/files/patch-plugins__im3195__im3195.c b/sysutils/rsyslog6-devel/files/patch-plugins__im3195__im3195.c new file mode 100644 index 000000000000..71e392b30f43 --- /dev/null +++ b/sysutils/rsyslog6-devel/files/patch-plugins__im3195__im3195.c @@ -0,0 +1,13 @@ +--- ./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 @@ + CODEmodInit_QueryRegCFSLineHdlr + CHKiRet(objUse(errmsg, CORE_COMPONENT)); + +- CHKiRet(omsdRegCFSLineHdlr((uchar *)"input3195listenport", 0, eCmdHdlrInt, NULL, &listenPort, STD_LOADABLE_MODULE_ID)); +- CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID)); ++ CHKiRet(omsdRegCFSLineHdlr((uchar *)"input3195listenport", 0, eCmdHdlrInt, NULL, &listenPort, STD_LOADABLE_MODULE_ID, eConfObjAction)); ++ CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID, eConfObjAction)); + ENDmodInit + /* vim:set ai: + */ |