Mon Feb 13 19:59:36 2017 UTC ()
Update sysutils/rsyslog to 8.24.0.

Changelog (abridged):

- rsyslog now builds on AIX
- mmdblookup: new maxminddb lookup message modify plugin
- mmrm1stspace: new module; removes first space in MSG if present
- KSI signature provider: file permissions can now be specified
- omzmq: new features
- change: when the hostname is empty, we now use "localhost-empty-hostname"
- omelasticsearch: remove "asyncrepl" config parameter
- omfwd: Add support for bind-to-device (see below on same for imudp)
- imudp: Add support for bind-to-device
- imudp: limit rcvbufsize parameter to max 1GiB
- rainerscript: implement new "call_indirect" statement
- bugfix imjournal: make state file handling more robust
- bugfix core: lookup table reload was not properly integrated
- bugfix core: potential dealock on shutdown
- bugfix ommongodb: did not work in v8 due to invalid indirection
- bugfix ommongodb: fix tryResume handling
- bugfix omfwd: retry processing was not done correctly, could stall
- bugfix imuxsock: segfault non shutdown when $OmitLocalLogging is on


(fhajny)
diff -r1.24 -r1.25 pkgsrc/sysutils/rsyslog/Makefile.common
diff -r1.22 -r1.23 pkgsrc/sysutils/rsyslog/distinfo
diff -r1.3 -r1.4 pkgsrc/sysutils/rsyslog/patches/patch-grammar_lexer.l
diff -r1.4 -r1.5 pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
diff -r1.4 -r1.5 pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
cvs diff -r1.24 -r1.25 pkgsrc/sysutils/rsyslog/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/Makefile.common 2016/12/05 10:36:46 1.24
+++ pkgsrc/sysutils/rsyslog/Makefile.common 2017/02/13 19:59:36 1.25
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile.common,v 1.24 2016/12/05 10:36:46 fhajny Exp $ 1# $NetBSD: Makefile.common,v 1.25 2017/02/13 19:59:36 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-relp/Makefile
11# used by sysutils/rsyslog-snmp/Makefile 12# used by sysutils/rsyslog-snmp/Makefile
12 13
13.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
14 15
15DISTNAME= rsyslog-8.23.0 16DISTNAME= rsyslog-8.24.0
16CATEGORIES= sysutils 17CATEGORIES= sysutils
17MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ 18MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
18 19
19MAINTAINER?= filip@joyent.com 20MAINTAINER?= filip@joyent.com
20HOMEPAGE= http://www.rsyslog.com/ 21HOMEPAGE= http://www.rsyslog.com/
21LICENSE= gnu-gpl-v3 22LICENSE= gnu-gpl-v3
22COMMENT?= Enhanced syslogd for Unix - the ${RSYSLOG_MOD} module 23COMMENT?= Enhanced syslogd for Unix - the ${RSYSLOG_MOD} module
23 24
24DISTINFO_FILE= ${.CURDIR}/../../sysutils/rsyslog/distinfo 25DISTINFO_FILE= ${.CURDIR}/../../sysutils/rsyslog/distinfo
25PATCHDIR= ${.CURDIR}/../../sysutils/rsyslog/patches 26PATCHDIR= ${.CURDIR}/../../sysutils/rsyslog/patches
26 27
27BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils 28BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
28CONFIGURE_ARGS+= RST2MAN=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py 29CONFIGURE_ARGS+= RST2MAN=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
cvs diff -r1.22 -r1.23 pkgsrc/sysutils/rsyslog/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/distinfo 2017/02/09 00:18:36 1.22
+++ pkgsrc/sysutils/rsyslog/distinfo 2017/02/13 19:59:36 1.23
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.22 2017/02/09 00:18:36 joerg Exp $ 1$NetBSD: distinfo,v 1.23 2017/02/13 19:59:36 fhajny Exp $
2 2
3SHA1 (rsyslog-8.23.0.tar.gz) = a9c4c60957460e525e27e9212117596d1172f326 3SHA1 (rsyslog-8.24.0.tar.gz) = 615ee5b47ca4c3a28de3c8ee4477c721c20f31aa
4RMD160 (rsyslog-8.23.0.tar.gz) = f75c771c565f9564be6e39f0a9a80fbe42a3ffe2 4RMD160 (rsyslog-8.24.0.tar.gz) = a0f4085df59440ecd34c41a8fd2dc5be624c8d9f
5SHA512 (rsyslog-8.23.0.tar.gz) = 4e4832287f02d4b0435b3711241d58cad9f393ce14318bbccce7b89dceeed01205960e7df4b2629831429e550c0865407374eb6a5548ecb47a3aea90c7d7df2d 5SHA512 (rsyslog-8.24.0.tar.gz) = b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d
6Size (rsyslog-8.23.0.tar.gz) = 2338318 bytes 6Size (rsyslog-8.24.0.tar.gz) = 2374240 bytes
7SHA1 (patch-configure) = aaba67d65b249b6aebfe8c5b3a1c9cd07e06c794 7SHA1 (patch-configure) = aaba67d65b249b6aebfe8c5b3a1c9cd07e06c794
8SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec 8SHA1 (patch-grammar_lexer.l) = 6de5aac9253ebcfae124f8dc3c7178446248f2b4
9SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433 9SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433
10SHA1 (patch-plugins_imfile_imfile.c) = 65b56f6799e2b206e1a8c3d055a4e9dc22da88be 10SHA1 (patch-plugins_imfile_imfile.c) = 65b56f6799e2b206e1a8c3d055a4e9dc22da88be
11SHA1 (patch-plugins_impstats_impstats.c) = a4eb7b8b9870271204d856c3a9e05fd24cee702b 11SHA1 (patch-plugins_impstats_impstats.c) = a4eb7b8b9870271204d856c3a9e05fd24cee702b
12SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e 12SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e
13SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da 13SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da
14SHA1 (patch-plugins_mmexternal_mmexternal.c) = 09b8007f44abc9a20fed884a132e734c8b613fb4 14SHA1 (patch-plugins_mmexternal_mmexternal.c) = 14546fb631822c697c8ef766450a24afaf4ebf7a
15SHA1 (patch-runtime_lookup.c) = cedb0531ff00063d44467029beba852ce4fbc0be 15SHA1 (patch-runtime_lookup.c) = cedb0531ff00063d44467029beba852ce4fbc0be
16SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437 16SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437
17SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341 17SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341
18SHA1 (patch-tools_rsyslogd.c) = 116f75e4e3edf32f339a2e66591b8a3d681d804f 18SHA1 (patch-tools_rsyslogd.c) = 0776a632143a2dbbb3bf00159e4e3376c55418ff
19SHA1 (patch-tools_syslogd.c) = 6855271d05da979d53ae7cee167163a563922b00 19SHA1 (patch-tools_syslogd.c) = 6855271d05da979d53ae7cee167163a563922b00
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/rsyslog/patches/Attic/patch-grammar_lexer.l (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/patches/Attic/patch-grammar_lexer.l 2014/12/12 12:47:46 1.3
+++ pkgsrc/sysutils/rsyslog/patches/Attic/patch-grammar_lexer.l 2017/02/13 19:59:36 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-grammar_lexer.l,v 1.3 2014/12/12 12:47:46 fhajny Exp $ 1$NetBSD: patch-grammar_lexer.l,v 1.4 2017/02/13 19:59:36 fhajny Exp $
2 2
3Fix build on BSD. 3Fix build on BSD.
4--- grammar/lexer.l.orig 2014-12-02 10:15:16.000000000 +0000 4--- grammar/lexer.l.orig 2017-01-10 09:00:04.000000000 +0000
5+++ grammar/lexer.l 5+++ grammar/lexer.l
6@@ -95,7 +95,7 @@ extern int yydebug; 6@@ -102,7 +102,7 @@ extern int yydebug;
7 /* somehow, I need these prototype even though the headers are  7 /* somehow, I need these prototype even though the headers are
8 * included. I guess that's some autotools magic I don't understand... 8 * included. I guess that's some autotools magic I don't understand...
9 */ 9 */
10-#if !defined(__FreeBSD__) 10-#if !defined(__FreeBSD__) && !defined(_AIX)
11+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonflyBSD__) 11+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonflyBSD__) && !defined(_AIX)
12 int fileno(FILE *stream); 12 int fileno(FILE *stream);
13 #endif 13 #endif
14  14
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/rsyslog/patches/Attic/patch-plugins_mmexternal_mmexternal.c (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/patches/Attic/patch-plugins_mmexternal_mmexternal.c 2016/04/22 16:52:14 1.4
+++ pkgsrc/sysutils/rsyslog/patches/Attic/patch-plugins_mmexternal_mmexternal.c 2017/02/13 19:59:36 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.4 2016/04/22 16:52:14 jperkin Exp $ 1$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.5 2017/02/13 19:59:36 fhajny Exp $
2 2
3Fix build on BSD. 3Fix build on BSD.
4--- plugins/mmexternal/mmexternal.c.orig 2016-03-02 11:12:44.000000000 +0000 4--- plugins/mmexternal/mmexternal.c.orig 2017-01-10 09:00:04.000000000 +0000
5+++ plugins/mmexternal/mmexternal.c 5+++ plugins/mmexternal/mmexternal.c
6@@ -31,7 +31,7 @@ 6@@ -31,7 +31,7 @@
7 #include <errno.h> 7 #include <errno.h>
8 #include <unistd.h> 8 #include <unistd.h>
9 #include <fcntl.h> 9 #include <fcntl.h>
10-#if defined(__FreeBSD__) 10-#if defined(_AIX) || defined(__FreeBSD__)
11+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) || defined(__APPLE__) 11+#if defined(_AIX) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) || defined(__APPLE__)
12 #include <sys/wait.h> 12 #include <sys/wait.h>
13 #else 13 #else
14 #include <wait.h> 14 #include <wait.h>
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c 2016/10/20 10:05:11 1.4
+++ pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c 2017/02/13 19:59:36 1.5
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-tools_rsyslogd.c,v 1.4 2016/10/20 10:05:11 fhajny Exp $ 1$NetBSD: patch-tools_rsyslogd.c,v 1.5 2017/02/13 19:59:36 fhajny Exp $
2 2
3Need errno.h on NetBSD. Default PID file path. 3Need errno.h on NetBSD. Default PID file path.
4--- tools/rsyslogd.c.orig 2016-08-23 12:15:33.000000000 +0000 4--- tools/rsyslogd.c.orig 2017-01-10 09:00:04.000000000 +0000
5+++ tools/rsyslogd.c 5+++ tools/rsyslogd.c
6@@ -32,7 +32,7 @@ 6@@ -33,7 +33,7 @@
7 #else 7 #else
8 # include <syslog.h> 8 # include <syslog.h>
9 #endif 9 #endif
10-#ifdef OS_SOLARIS 10-#ifdef OS_SOLARIS
11+#if defined(OS_SOLARIS) || defined(OS_BSD) 11+#if defined(OS_SOLARIS) || defined(OS_BSD)
12 # include <errno.h> 12 # include <errno.h>
13 #else 13 #else
14 # include <sys/errno.h> 14 # include <sys/errno.h>
15@@ -89,7 +89,7 @@ void rsyslogdDoDie(int sig); 15@@ -146,7 +146,7 @@ void rsyslogdDoDie(int sig);
16  16 #if defined(_AIX) /* AIXPORT : Add _AIX */
17  17 # define PATH_PIDFILE "/etc/rsyslogd.pid"
18 #ifndef PATH_PIDFILE 18 #else
19-# define PATH_PIDFILE "/var/run/rsyslogd.pid" 19-# define PATH_PIDFILE "/var/run/rsyslogd.pid"
20+# define PATH_PIDFILE "@RSYSLOG_PIDDIR@/rsyslogd.pid" 20+# define PATH_PIDFILE "@RSYSLOG_PIDDIR@/rsyslogd.pid"
 21 #endif /*_AIX*/
21 #endif 22 #endif
22  23
23 /* global data items */