CVS commit: pkgsrc/sysutils/rsyslog

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Mon Feb 13 19:59:36 UTC 2017

Modified Files:
        pkgsrc/sysutils/rsyslog: Makefile.common distinfo
        pkgsrc/sysutils/rsyslog/patches: patch-grammar_lexer.l
            patch-plugins_mmexternal_mmexternal.c patch-tools_rsyslogd.c

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/sysutils/rsyslog/Makefile.common
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/rsyslog/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/sysutils/rsyslog/patches/patch-grammar_lexer.l
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c \
    pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/rsyslog/Makefile.common
diff -u pkgsrc/sysutils/rsyslog/Makefile.common:1.24 pkgsrc/sysutils/rsyslog/Makefile.common:1.25
--- pkgsrc/sysutils/rsyslog/Makefile.common:1.24        Mon Dec  5 10:36:46 2016
+++ pkgsrc/sysutils/rsyslog/Makefile.common     Mon Feb 13 19:59:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2016/12/05 10:36:46 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.25 2017/02/13 19:59:36 fhajny Exp $
 # used by sysutils/rsyslog/Makefile
 # used by sysutils/rsyslog-dbi/Makefile
 # used by sysutils/rsyslog-elasticsearch/Makefile
@@ -8,11 +8,12 @@
 # used by sysutils/rsyslog-mysql/Makefile
 # used by sysutils/rsyslog-pgsql/Makefile
 # used by sysutils/rsyslog-rabbitmq/Makefile
+# used by sysutils/rsyslog-relp/Makefile
 # used by sysutils/rsyslog-snmp/Makefile
 
 .include "../../mk/bsd.prefs.mk"
 
-DISTNAME=              rsyslog-8.23.0
+DISTNAME=              rsyslog-8.24.0
 CATEGORIES=            sysutils
 MASTER_SITES=          http://www.rsyslog.com/files/download/rsyslog/
 

Index: pkgsrc/sysutils/rsyslog/distinfo
diff -u pkgsrc/sysutils/rsyslog/distinfo:1.22 pkgsrc/sysutils/rsyslog/distinfo:1.23
--- pkgsrc/sysutils/rsyslog/distinfo:1.22       Thu Feb  9 00:18:36 2017
+++ pkgsrc/sysutils/rsyslog/distinfo    Mon Feb 13 19:59:36 2017
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.22 2017/02/09 00:18:36 joerg Exp $
+$NetBSD: distinfo,v 1.23 2017/02/13 19:59:36 fhajny Exp $
 
-SHA1 (rsyslog-8.23.0.tar.gz) = a9c4c60957460e525e27e9212117596d1172f326
-RMD160 (rsyslog-8.23.0.tar.gz) = f75c771c565f9564be6e39f0a9a80fbe42a3ffe2
-SHA512 (rsyslog-8.23.0.tar.gz) = 4e4832287f02d4b0435b3711241d58cad9f393ce14318bbccce7b89dceeed01205960e7df4b2629831429e550c0865407374eb6a5548ecb47a3aea90c7d7df2d
-Size (rsyslog-8.23.0.tar.gz) = 2338318 bytes
+SHA1 (rsyslog-8.24.0.tar.gz) = 615ee5b47ca4c3a28de3c8ee4477c721c20f31aa
+RMD160 (rsyslog-8.24.0.tar.gz) = a0f4085df59440ecd34c41a8fd2dc5be624c8d9f
+SHA512 (rsyslog-8.24.0.tar.gz) = b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d
+Size (rsyslog-8.24.0.tar.gz) = 2374240 bytes
 SHA1 (patch-configure) = aaba67d65b249b6aebfe8c5b3a1c9cd07e06c794
-SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec
+SHA1 (patch-grammar_lexer.l) = 6de5aac9253ebcfae124f8dc3c7178446248f2b4
 SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef460433
 SHA1 (patch-plugins_imfile_imfile.c) = 65b56f6799e2b206e1a8c3d055a4e9dc22da88be
 SHA1 (patch-plugins_impstats_impstats.c) = a4eb7b8b9870271204d856c3a9e05fd24cee702b
 SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e
 SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da
-SHA1 (patch-plugins_mmexternal_mmexternal.c) = 09b8007f44abc9a20fed884a132e734c8b613fb4
+SHA1 (patch-plugins_mmexternal_mmexternal.c) = 14546fb631822c697c8ef766450a24afaf4ebf7a
 SHA1 (patch-runtime_lookup.c) = cedb0531ff00063d44467029beba852ce4fbc0be
 SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437
 SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341
-SHA1 (patch-tools_rsyslogd.c) = 116f75e4e3edf32f339a2e66591b8a3d681d804f
+SHA1 (patch-tools_rsyslogd.c) = 0776a632143a2dbbb3bf00159e4e3376c55418ff
 SHA1 (patch-tools_syslogd.c) = 6855271d05da979d53ae7cee167163a563922b00

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

Index: pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
diff -u pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c:1.4 pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c:1.5
--- pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c:1.4   Fri Apr 22 16:52:14 2016
+++ pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c       Mon Feb 13 19:59:36 2017
@@ -1,14 +1,14 @@
-$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.4 2016/04/22 16:52:14 jperkin Exp $
+$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.5 2017/02/13 19:59:36 fhajny Exp $
 
 Fix build on BSD.
---- plugins/mmexternal/mmexternal.c.orig       2016-03-02 11:12:44.000000000 +0000
+--- plugins/mmexternal/mmexternal.c.orig       2017-01-10 09:00:04.000000000 +0000
 +++ plugins/mmexternal/mmexternal.c
 @@ -31,7 +31,7 @@
  #include <errno.h>
  #include <unistd.h>
  #include <fcntl.h>
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) || defined(__APPLE__)
+-#if defined(_AIX) || defined(__FreeBSD__) 
++#if defined(_AIX) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) || defined(__APPLE__)
  #include <sys/wait.h>
  #else
  #include <wait.h>
Index: pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
diff -u pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c:1.4 pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c:1.5
--- pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c:1.4  Thu Oct 20 10:05:11 2016
+++ pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c      Mon Feb 13 19:59:36 2017
@@ -1,9 +1,9 @@
-$NetBSD: patch-tools_rsyslogd.c,v 1.4 2016/10/20 10:05:11 fhajny Exp $
+$NetBSD: patch-tools_rsyslogd.c,v 1.5 2017/02/13 19:59:36 fhajny Exp $
 
 Need errno.h on NetBSD. Default PID file path.
---- tools/rsyslogd.c.orig      2016-08-23 12:15:33.000000000 +0000
+--- tools/rsyslogd.c.orig      2017-01-10 09:00:04.000000000 +0000
 +++ tools/rsyslogd.c
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
  #else
  #  include <syslog.h>
  #endif
@@ -12,12 +12,12 @@ Need errno.h on NetBSD. Default PID file
  #     include <errno.h>
  #else
  #     include <sys/errno.h>
-@@ -89,7 +89,7 @@ void rsyslogdDoDie(int sig);
- 
- 
- #ifndef PATH_PIDFILE
+@@ -146,7 +146,7 @@ void rsyslogdDoDie(int sig);
+ #if defined(_AIX)  /* AIXPORT : Add _AIX */
+ #     define PATH_PIDFILE "/etc/rsyslogd.pid"
+ #else
 -#     define PATH_PIDFILE "/var/run/rsyslogd.pid"
 +#     define PATH_PIDFILE "@RSYSLOG_PIDDIR@/rsyslogd.pid"
+ #endif /*_AIX*/
  #endif
  
- /* global data items */