Update sysutils/rsyslog to 8.16.0. Version 8.16.0 [v8-stable] 2016-01-26 - rsgtutil: Added extraction support including loglines and hash chains. - clean up doAction output module interface - new system properties for $NOW properties based on UTC - impstats: support broken ElasticSearch JSON implementation - omelasticsearch: craft better URLs - imfile: add experimental "reopenOnTruncate" parameter - bugfix imfile: proper handling of inotify initialization failure - bugfix imfile: potential segfault due to improper handling of ev var - bugfix imfile: potential segfault under heavey load. - bugfix ommail: invalid handling of server response - bugfix omelasticsearch: custom serverport was ignored on some platforms - bugfix: tarball did not include some testbench files - bugfix: memory misadressing during config parsing string template - bugfix imzmq: memory leak - bugfix imzmq: memory leak - bugfix omzmq: memory leak - some code improvement and cleanupdiff -r1.16 -r1.17 pkgsrc/sysutils/rsyslog/Makefile.common
(fhajny)
@@ -1,28 +1,28 @@ | @@ -1,28 +1,28 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.16 2016/01/01 15:34:24 fhajny Exp $ | 1 | # $NetBSD: Makefile.common,v 1.17 2016/01/26 15:20:33 fhajny Exp $ | |
2 | # used by sysutils/rsyslog/Makefile | 2 | # used by sysutils/rsyslog/Makefile | |
3 | # used by sysutils/rsyslog-dbi/Makefile | 3 | # used by sysutils/rsyslog-dbi/Makefile | |
4 | # used by sysutils/rsyslog-elasticsearch/Makefile | 4 | # used by sysutils/rsyslog-elasticsearch/Makefile | |
5 | # used by sysutils/rsyslog-gnutls/Makefile | 5 | # used by sysutils/rsyslog-gnutls/Makefile | |
6 | # used by sysutils/rsyslog-gssapi/Makefile | 6 | # used by sysutils/rsyslog-gssapi/Makefile | |
7 | # used by sysutils/rsyslog-libgcrypt/Makefile | 7 | # used by sysutils/rsyslog-libgcrypt/Makefile | |
8 | # used by sysutils/rsyslog-mysql/Makefile | 8 | # used by sysutils/rsyslog-mysql/Makefile | |
9 | # used by sysutils/rsyslog-pgsql/Makefile | 9 | # used by sysutils/rsyslog-pgsql/Makefile | |
10 | # used by sysutils/rsyslog-rabbitmq/Makefile | 10 | # used by sysutils/rsyslog-rabbitmq/Makefile | |
11 | # used by sysutils/rsyslog-snmp/Makefile | 11 | # used by sysutils/rsyslog-snmp/Makefile | |
12 | 12 | |||
13 | .include "../../mk/bsd.prefs.mk" | 13 | .include "../../mk/bsd.prefs.mk" | |
14 | 14 | |||
15 | DISTNAME= rsyslog-8.15.0 | 15 | DISTNAME= rsyslog-8.16.0 | |
16 | CATEGORIES= sysutils | 16 | CATEGORIES= sysutils | |
17 | MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ | 17 | MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ | |
18 | 18 | |||
19 | MAINTAINER?= filip@joyent.com | 19 | MAINTAINER?= filip@joyent.com | |
20 | HOMEPAGE= http://www.rsyslog.com/ | 20 | HOMEPAGE= http://www.rsyslog.com/ | |
21 | LICENSE= gnu-gpl-v3 | 21 | LICENSE= gnu-gpl-v3 | |
22 | COMMENT?= Enhanced syslogd for Unix - the ${RSYSLOG_MOD} module | 22 | COMMENT?= Enhanced syslogd for Unix - the ${RSYSLOG_MOD} module | |
23 | 23 | |||
24 | DISTINFO_FILE= ${.CURDIR}/../../sysutils/rsyslog/distinfo | 24 | DISTINFO_FILE= ${.CURDIR}/../../sysutils/rsyslog/distinfo | |
25 | PATCHDIR= ${.CURDIR}/../../sysutils/rsyslog/patches | 25 | PATCHDIR= ${.CURDIR}/../../sysutils/rsyslog/patches | |
26 | 26 | |||
27 | BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils | 27 | BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils | |
28 | CONFIGURE_ARGS+= RST2MAN=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py | 28 | CONFIGURE_ARGS+= RST2MAN=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: distinfo,v 1.12 2016/01/01 15:34:24 fhajny Exp $ | 1 | $NetBSD: distinfo,v 1.13 2016/01/26 15:20:33 fhajny Exp $ | |
2 | 2 | |||
3 | SHA1 (rsyslog-8.15.0.tar.gz) = e1d5ff63c96bce9945dc65581c8e195950256d3c | 3 | SHA1 (rsyslog-8.16.0.tar.gz) = 71c477921c161e46eb4292502df91be0e85a1e98 | |
4 | RMD160 (rsyslog-8.15.0.tar.gz) = 4b5ce307702596fc1b69faf0de72c8f8611b62fd | 4 | RMD160 (rsyslog-8.16.0.tar.gz) = c92ce81314cfb6fed3a8c505db8b84c2f2958ba6 | |
5 | SHA512 (rsyslog-8.15.0.tar.gz) = 66416955d681f1d9f617a4d67000b565a148037f6dc6e510bc78159d4b1754559d0e1e189b4cb5ed32f0464a63071a955df4d7b2d8741b062f79a9aab990da4c | 5 | SHA512 (rsyslog-8.16.0.tar.gz) = e45acc16078d83937edd7e22f916fe050b62aa057ca4dd980823850f2195213c12db36f759c528b5fe6f1b061a61e2117fca6086245bc248392cc4e61b2383dc | |
6 | Size (rsyslog-8.15.0.tar.gz) = 2103768 bytes | 6 | Size (rsyslog-8.16.0.tar.gz) = 2132012 bytes | |
7 | SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec | 7 | SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec | |
8 | SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433 | 8 | SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433 | |
9 | SHA1 (patch-plugins_imfile_imfile.c) = 05b171b241825b19573315aa9b185b4708e38155 | 9 | SHA1 (patch-plugins_imfile_imfile.c) = 65b56f6799e2b206e1a8c3d055a4e9dc22da88be | |
10 | SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e | 10 | SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e | |
11 | SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da | 11 | SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da | |
12 | SHA1 (patch-plugins_mmexternal_mmexternal.c) = 00606bd11d5d281bf4b32f038e857eb364954c4c | 12 | SHA1 (patch-plugins_mmexternal_mmexternal.c) = 00606bd11d5d281bf4b32f038e857eb364954c4c | |
13 | SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437 | 13 | SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437 | |
14 | SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341 | 14 | SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341 | |
15 | SHA1 (patch-tools_rsyslogd.c) = 5d480bc32f44ee308acad76588b250f8a56d894f | 15 | SHA1 (patch-tools_rsyslogd.c) = 5d480bc32f44ee308acad76588b250f8a56d894f | |
16 | SHA1 (patch-tools_syslogd.c) = 6855271d05da979d53ae7cee167163a563922b00 | 16 | SHA1 (patch-tools_syslogd.c) = 6855271d05da979d53ae7cee167163a563922b00 |
@@ -1,21 +1,20 @@ | @@ -1,21 +1,20 @@ | |||
1 | $NetBSD: patch-plugins_imfile_imfile.c,v 1.4 2015/08/26 00:55:33 fhajny Exp $ | 1 | $NetBSD: patch-plugins_imfile_imfile.c,v 1.5 2016/01/26 15:20:33 fhajny Exp $ | |
2 | 2 | |||
3 | Avoid unresolved symbol on inotify-less platforms. | 3 | Avoid unresolved symbol on inotify-less platforms. | |
4 | --- plugins/imfile/imfile.c.orig 2015-08-10 10:24:49.000000000 +0000 | 4 | --- plugins/imfile/imfile.c.orig 2016-01-22 07:54:28.000000000 +0000 | |
5 | +++ plugins/imfile/imfile.c | 5 | +++ plugins/imfile/imfile.c | |
6 | @@ -1840,11 +1840,14 @@ BEGINrunInput | 6 | @@ -1839,10 +1839,14 @@ BEGINrunInput | |
7 | CODESTARTrunInput | 7 | CODESTARTrunInput | |
8 | DBGPRINTF("imfile: working in %s mode\n", | 8 | DBGPRINTF("imfile: working in %s mode\n", | |
9 | (runModConf->opMode == OPMODE_POLLING) ? "polling" : "inotify"); | 9 | (runModConf->opMode == OPMODE_POLLING) ? "polling" : "inotify"); | |
10 | +#if HAVE_INOTIFY_INIT | 10 | +#if HAVE_INOTIFY_INIT | |
11 | if(runModConf->opMode == OPMODE_POLLING) | 11 | if(runModConf->opMode == OPMODE_POLLING) | |
12 | iRet = doPolling(); | 12 | iRet = doPolling(); | |
13 | else | 13 | else | |
14 | iRet = do_inotify(); | 14 | iRet = do_inotify(); | |
15 | - | |||
16 | +#else | 15 | +#else | |
17 | + iRet = doPolling(); | 16 | + iRet = doPolling(); | |
18 | +#endif | 17 | +#endif | |
18 | ||||
19 | DBGPRINTF("imfile: terminating upon request of rsyslog core\n"); | 19 | DBGPRINTF("imfile: terminating upon request of rsyslog core\n"); | |
20 | ENDrunInput | 20 | ENDrunInput | |
21 |