Update sysutils/rsyslog to 8.13.0. Version 8.13.0 [v8-stable] 2015-09-22 - ZeroMQ enhancements: - Added the ability to set a static publishing topic per action as an alternative to constructing topics with templates - ZMQ_PUB socket now defaults to bind and ZMQ_SUB socket now defaults to connect - Redis enhancements: - Can now LPUSH to a Redis list in "queue" mode - Can now PUBLISH to a Redis channel in "publish" mode - build requirement for rsyslog/mmnormalize is now liblognorm 1.1.2 or above - mmnormalize: liblognorm error messages are now emitted via regular rsyslog error reporting mechanism (aka "are now logged") - add support for TCP client side keep-alives - bugfix: imtcp/TLS hangs on dropped packets - bugfix testbench: some tests using imptcp are run if module is disabled - bugfix omkafka: Fixes a bug not accepting new messages anymore. - bugfix: Parallel build issue "cannot find ../runtime/.libs/librsyslog.a: No such file or directory" (#479) fixed. - bugfix: Added missing mmpstructdata testfiles into makefile. - bugfix: Reverted FIX for issue #392 as it had unexpected side effects. - The new fix duplicates the Listener object for static files (like done for dynamic files already), resolving issue #392 and #490. - bugfix: issues in queue subsystem if syncqueuefiles was enabled - Error 14 was generated on the .qi file directory handle. As the .qi filestream does not have a directory set, fsync was called on an empty directory causing a error 14 in debug log. - When queue files existed on startup, the bSyncQueueFiles strm property was not set to 1. This is now done in the qqueueLoadPersStrmInfoFixup function. - bugfix/testbench: tcpflood tool could abort when random data was added - rscryutil: Added support to decrypt a not closed log file.diff -r1.4 -r1.5 pkgsrc/sysutils/rsyslog/Makefile
(fhajny)
@@ -1,25 +1,25 @@ | @@ -1,25 +1,25 @@ | |||
1 | # $NetBSD: Makefile,v 1.4 2015/04/23 09:30:49 jperkin Exp $ | 1 | # $NetBSD: Makefile,v 1.5 2015/10/08 12:46:07 fhajny Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | BUILDLINK_DEPMETHOD.libestr= full | 4 | BUILDLINK_DEPMETHOD.libestr= full | |
5 | BUILDLINK_DEPMETHOD.liblogging= full | 5 | BUILDLINK_DEPMETHOD.liblogging= full | |
6 | BUILDLINK_DEPMETHOD.libuuid= full | 6 | BUILDLINK_DEPMETHOD.libuuid= full | |
7 | 7 | |||
8 | .include "../../sysutils/rsyslog/Makefile.common" | 8 | .include "../../sysutils/rsyslog/Makefile.common" | |
9 | 9 | |||
10 | COMMENT= The enhanced syslogd for Unix | 10 | COMMENT= The enhanced syslogd for Unix | |
11 | 11 | |||
12 | CONFIGURE_ARGS+= --disable-testbench --enable-cached-man-pages \ | 12 | CONFIGURE_ARGS+= --disable-testbench \ | |
13 | --enable-diagtools --enable-usertools --enable-uuid \ | 13 | --enable-diagtools --enable-usertools --enable-uuid \ | |
14 | --enable-imdiag --enable-imfile --enable-impstats \ | 14 | --enable-imdiag --enable-imfile --enable-impstats \ | |
15 | --enable-mail --enable-mmjsonparse --enable-mmnormalize \ | 15 | --enable-mail --enable-mmjsonparse --enable-mmnormalize \ | |
16 | --enable-omstdout | 16 | --enable-omstdout | |
17 | 17 | |||
18 | PLIST_VARS+= klog solaris | 18 | PLIST_VARS+= klog solaris | |
19 | 19 | |||
20 | .if ${OPSYS} == "SunOS" | 20 | .if ${OPSYS} == "SunOS" | |
21 | CONFIGURE_ARGS+= --enable-imsolaris --disable-klog | 21 | CONFIGURE_ARGS+= --enable-imsolaris --disable-klog | |
22 | # Explicitly disable epoll/inotify on illumos, provided for Linux compat only. | 22 | # Explicitly disable epoll/inotify on illumos, provided for Linux compat only. | |
23 | CONFIGURE_ENV+= ac_cv_func_epoll_create=no | 23 | CONFIGURE_ENV+= ac_cv_func_epoll_create=no | |
24 | CONFIGURE_ENV+= ac_cv_func_epoll_create1=no | 24 | CONFIGURE_ENV+= ac_cv_func_epoll_create1=no | |
25 | CONFIGURE_ENV+= ac_cv_func_inotify_init=no | 25 | CONFIGURE_ENV+= ac_cv_func_inotify_init=no |
@@ -1,28 +1,28 @@ | @@ -1,28 +1,28 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.13 2015/09/05 15:32:19 wiedi Exp $ | 1 | # $NetBSD: Makefile.common,v 1.14 2015/10/08 12:46:07 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.12.0 | 15 | DISTNAME= rsyslog-8.13.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 | |
@@ -30,25 +30,26 @@ CONFIGURE_ARGS+= RST2MAN=${PREFIX}/bin/r | @@ -30,25 +30,26 @@ CONFIGURE_ARGS+= RST2MAN=${PREFIX}/bin/r | |||
30 | .if ${OPSYS} == "SunOS" | 30 | .if ${OPSYS} == "SunOS" | |
31 | CONFIGURE_ARGS+= ac_cv_func_epoll_create=no ac_cv_func_epoll_create1=no | 31 | CONFIGURE_ARGS+= ac_cv_func_epoll_create=no ac_cv_func_epoll_create1=no | |
32 | .endif | 32 | .endif | |
33 | 33 | |||
34 | GNU_CONFIGURE= yes | 34 | GNU_CONFIGURE= yes | |
35 | 35 | |||
36 | USE_LIBTOOL= yes | 36 | USE_LIBTOOL= yes | |
37 | USE_TOOLS+= bison flex pkg-config | 37 | USE_TOOLS+= bison flex pkg-config | |
38 | PYTHON_FOR_BUILD_ONLY= yes | 38 | PYTHON_FOR_BUILD_ONLY= yes | |
39 | 39 | |||
40 | EGDIR= ${PREFIX}/share/examples/rsyslog | 40 | EGDIR= ${PREFIX}/share/examples/rsyslog | |
41 | 41 | |||
42 | CONFIGURE_ARGS+= --disable-libgcrypt --disable-testbench \ | 42 | CONFIGURE_ARGS+= --disable-libgcrypt --disable-testbench \ | |
43 | --enable-diagtools --enable-usertools | 43 | --enable-diagtools --enable-usertools \ | |
44 | --enable-generate-man-pages | |||
44 | 45 | |||
45 | BUILDLINK_DEPMETHOD.libestr+= build | 46 | BUILDLINK_DEPMETHOD.libestr+= build | |
46 | BUILDLINK_DEPMETHOD.liblogging+= build | 47 | BUILDLINK_DEPMETHOD.liblogging+= build | |
47 | BUILDLINK_DEPMETHOD.libuuid+= build | 48 | BUILDLINK_DEPMETHOD.libuuid+= build | |
48 | 49 | |||
49 | .include "../../devel/libestr/buildlink3.mk" | 50 | .include "../../devel/libestr/buildlink3.mk" | |
50 | .include "../../devel/libuuid/buildlink3.mk" | 51 | .include "../../devel/libuuid/buildlink3.mk" | |
51 | .include "../../devel/zlib/buildlink3.mk" | 52 | .include "../../devel/zlib/buildlink3.mk" | |
52 | .include "../../lang/python/pyversion.mk" | 53 | .include "../../lang/python/pyversion.mk" | |
53 | .include "../../sysutils/liblogging/buildlink3.mk" | 54 | .include "../../sysutils/liblogging/buildlink3.mk" | |
54 | .include "../../textproc/json-c/buildlink3.mk" | 55 | .include "../../textproc/json-c/buildlink3.mk" |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: distinfo,v 1.8 2015/09/21 11:15:34 wiedi Exp $ | 1 | $NetBSD: distinfo,v 1.9 2015/10/08 12:46:07 fhajny Exp $ | |
2 | 2 | |||
3 | SHA1 (rsyslog-8.12.0.tar.gz) = d43b917ec413a249310d5dcf76f848ea6871ea73 | 3 | SHA1 (rsyslog-8.13.0.tar.gz) = 9fea5cb7a76c83b111c87d93e16f73c68af4f4ea | |
4 | RMD160 (rsyslog-8.12.0.tar.gz) = 1e9cc2651d6e0e033829c600c9d0aef05cd7e2bc | 4 | RMD160 (rsyslog-8.13.0.tar.gz) = f4d5b5802f8e90fbd815204e7d17617ba2b209b6 | |
5 | Size (rsyslog-8.12.0.tar.gz) = 2091620 bytes | 5 | Size (rsyslog-8.13.0.tar.gz) = 2077267 bytes | |
6 | SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec | 6 | SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec | |
7 | SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433 | 7 | SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433 | |
8 | SHA1 (patch-plugins_imfile_imfile.c) = 05b171b241825b19573315aa9b185b4708e38155 | 8 | SHA1 (patch-plugins_imfile_imfile.c) = 05b171b241825b19573315aa9b185b4708e38155 | |
9 | SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e | 9 | SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e | |
10 | SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da | 10 | SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da | |
11 | SHA1 (patch-plugins_mmexternal_mmexternal.c) = 00606bd11d5d281bf4b32f038e857eb364954c4c | 11 | SHA1 (patch-plugins_mmexternal_mmexternal.c) = 00606bd11d5d281bf4b32f038e857eb364954c4c | |
12 | SHA1 (patch-plugins_omelasticsearch_omelasticsearch.c) = 7bd0f94d1a3fd16106b952e63ff4593e8e37386b | 12 | SHA1 (patch-plugins_omelasticsearch_omelasticsearch.c) = 7bd0f94d1a3fd16106b952e63ff4593e8e37386b | |
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,19 +1,18 @@ | @@ -1,19 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.2 2015/08/23 14:30:42 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.3 2015/10/08 12:46:08 fhajny Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | RSYSLOG_MOD= gnutls | 4 | RSYSLOG_MOD= gnutls | |
5 | PKGNAME= ${DISTNAME:S/rsyslog/rsyslog-${RSYSLOG_MOD}/} | 5 | PKGNAME= ${DISTNAME:S/rsyslog/rsyslog-${RSYSLOG_MOD}/} | |
6 | PKGREVISION= 1 | |||
7 | 6 | |||
8 | DEPENDS+= rsyslog>=${PKGVERSION_NOREV}:../../sysutils/rsyslog | 7 | DEPENDS+= rsyslog>=${PKGVERSION_NOREV}:../../sysutils/rsyslog | |
9 | 8 | |||
10 | .include "../../sysutils/rsyslog/Makefile.common" | 9 | .include "../../sysutils/rsyslog/Makefile.common" | |
11 | 10 | |||
12 | CONFIGURE_ARGS+= --enable-gnutls | 11 | CONFIGURE_ARGS+= --enable-gnutls | |
13 | 12 | |||
14 | BUILD_DIRS= compat runtime | 13 | BUILD_DIRS= compat runtime | |
15 | 14 | |||
16 | INSTALLATION_DIRS+= lib/rsyslog | 15 | INSTALLATION_DIRS+= lib/rsyslog | |
17 | 16 | |||
18 | do-install: | 17 | do-install: | |
19 | ${INSTALL_LIB} ${WRKSRC}/runtime/.libs/lmnsd_gtls.so \ | 18 | ${INSTALL_LIB} ${WRKSRC}/runtime/.libs/lmnsd_gtls.so \ |