[pkgsrc/trunk]: pkgsrc/sysutils/rsyslog Update rsyslog to 8.6.0.

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8b82cad1f99c
branches:  trunk
changeset: 643205:8b82cad1f99c
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Fri Dec 12 12:47:46 2014 +0000

description:
Update rsyslog to 8.6.0.

Version 8.6.0 [v8-stable] 2014-12-02
 - configuration-setting rsyslogd command line options deprecated
 - new and enhanced plugins for 0mq. These are currently experimantal.
 - empty rulesets have been permitted. They no longer raise a syntax error.
 - add parameter -N3 to enable config check of partial config file
 - rsyslogd -e option has finally been removed
 - testbench improvements
 - testbench is now by default disabled
 - add new RainerScript functions warp() and replace()
 - mmnormalize can now also work on a variable
 - new property date options for day ordinal and week number
 - remove --enable-zlib configure option, we always require it
 - slight source-tree restructuring: contributed modules are now in their
   own ./contrib directory
 - bugfix: imudp makes rsyslog hang on shutdown when more than 1 thread used
 - bugfix: not all files closed on auto-backgrounding startup
 - bugfix: typo in queue configuration parameter made parameter unusable
 - bugfix: unitialized buffer off-by-one error in hostname generation
 - bugfix imuxsock: possible segfault when SysSock.Use="off"
 - bugfix: RainerScript: invalid ruleset names were accepted during ruleset
   defintion, but could of course not be used when e.g. calling a ruleset.
 - bugfix: some module entry points were not called for all modules callbacks
   like endCnfLoad() were primarily being called for input modules. This has
   been corrected. Note that this bugfix has some regression potential.
 - bugfix omlibdbi: connection was taken down in wrong thread
 - imttcp was removed because it was an incompleted experimental module
 - pmrfc3164sd because it was a custom module nobody used
 - omoracle was removed because it was orphaned and did not build/work
   for quite some years and nobody was interested in fixing it

Version 8.5.0 [v8-stable] 2014-10-24
 - imfile greatly refactored and support for wildcards added
 - PRI-handling code refactored for more clarity and robustness
 - ommail: add support for RainerScript config system [action() object]
 - refactored the auto-backgrounding method
 - make gntls tcp syslog driver emit more error messages
 - bugfix: imfile did not complain if configured file did not exist
 - bugfix: build failure on systems which don't have json_tokener_errors
 - imgssapi: log remote peer address in some error messages

diffstat:

 sysutils/rsyslog/Makefile.common                               |   4 +-
 sysutils/rsyslog/PLIST                                         |   3 +-
 sysutils/rsyslog/distinfo                                      |  23 +++---
 sysutils/rsyslog/patches/patch-grammar_lexer.l                 |  15 +---
 sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf    |   4 +-
 sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c         |   6 +-
 sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c     |   4 +-
 sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c |   4 +-
 sysutils/rsyslog/patches/patch-tools_rsyslogd.8                |  31 ++++++++++
 sysutils/rsyslog/patches/patch-tools_rsyslogd.c                |  19 ++++-
 sysutils/rsyslog/patches/patch-tools_syslogd.c                 |  13 +---
 11 files changed, 74 insertions(+), 52 deletions(-)

diffs (236 lines):

diff -r 11783a60ff85 -r 8b82cad1f99c sysutils/rsyslog/Makefile.common
--- a/sysutils/rsyslog/Makefile.common  Fri Dec 12 11:58:02 2014 +0000
+++ b/sysutils/rsyslog/Makefile.common  Fri Dec 12 12:47:46 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2014/10/26 21:11:09 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.4 2014/12/12 12:47:46 fhajny Exp $
 # used by sysutils/rsyslog/Makefile
 # used by sysutils/rsyslog-dbi/Makefile
 # used by sysutils/rsyslog-gnutls/Makefile
@@ -11,7 +11,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-DISTNAME=              rsyslog-8.4.2
+DISTNAME=              rsyslog-8.6.0
 CATEGORIES=            sysutils
 MASTER_SITES=          http://www.rsyslog.com/files/download/rsyslog/
 
diff -r 11783a60ff85 -r 8b82cad1f99c sysutils/rsyslog/PLIST
--- a/sysutils/rsyslog/PLIST    Fri Dec 12 11:58:02 2014 +0000
+++ b/sysutils/rsyslog/PLIST    Fri Dec 12 12:47:46 2014 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/09/05 07:15:41 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/12/12 12:47:46 fhajny Exp $
 lib/rsyslog/imdiag.la
 lib/rsyslog/imfile.la
 ${PLIST.klog}lib/rsyslog/imklog.la
@@ -27,6 +27,5 @@
 sbin/msggen
 sbin/rsyslog_diag_hostname
 sbin/rsyslogd
-sbin/zpipe
 share/examples/rc.d/rsyslogd
 share/examples/rsyslog/rsyslog.conf
diff -r 11783a60ff85 -r 8b82cad1f99c sysutils/rsyslog/distinfo
--- a/sysutils/rsyslog/distinfo Fri Dec 12 11:58:02 2014 +0000
+++ b/sysutils/rsyslog/distinfo Fri Dec 12 12:47:46 2014 +0000
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.2 2014/10/26 21:11:09 fhajny Exp $
+$NetBSD: distinfo,v 1.3 2014/12/12 12:47:46 fhajny Exp $
 
-SHA1 (rsyslog-8.4.2.tar.gz) = f68f92a1fa3d8fca6f4fc3dc4a7acbabc1774612
-RMD160 (rsyslog-8.4.2.tar.gz) = 0cca89d75b754f06360ad1a44b1f31167fdb64ca
-Size (rsyslog-8.4.2.tar.gz) = 1938563 bytes
-SHA1 (patch-grammar_lexer.l) = e9702023a7899fe6a3fe8c6902fb9127b3eb29bc
-SHA1 (patch-platform_redhat_rsyslog.conf) = 775c523e3eae6641b30cc09c4044e46ae87fa7a4
-SHA1 (patch-plugins_imfile_imfile.c) = 390aa8febed6693bf69bc1c1764521eae0250477
-SHA1 (patch-plugins_imuxsock_imuxsock.c) = 2516941970ac1b4c42d7a326a2bd824052bc9b0b
-SHA1 (patch-plugins_mmexternal_mmexternal.c) = 4f5d13c1206f0c5d00458ee93cb0791ac150fc30
-SHA1 (patch-tools_rsyslogd.c) = 99f63b04195ca7fb753d2900a4d68918a54914f5
-SHA1 (patch-tools_syslogd.c) = 9244710cd24377d7a36c24148250935f58dee5da
+SHA1 (rsyslog-8.6.0.tar.gz) = 06e912c8d48a9736ab2a1810f4f7c76a20abb0eb
+RMD160 (rsyslog-8.6.0.tar.gz) = 12f53341404fd20ded9f9de50b2e57aedef89205
+Size (rsyslog-8.6.0.tar.gz) = 1975854 bytes
+SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec
+SHA1 (patch-platform_redhat_rsyslog.conf) = a61cf6750e21bfb8ddb4fd8150b98835231cb950
+SHA1 (patch-plugins_imfile_imfile.c) = 6909e68e700d61099d9200fd26072bd7f199639f
+SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da
+SHA1 (patch-plugins_mmexternal_mmexternal.c) = 12053abfd32553c4c29faa131b803e7edfaa3803
+SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341
+SHA1 (patch-tools_rsyslogd.c) = 7d33c23a7c5b61317e2857df11b7b62e6c8f188b
+SHA1 (patch-tools_syslogd.c) = 94a53b2a2cfbc2b57c29d90c276fa4877fdfd2f2
diff -r 11783a60ff85 -r 8b82cad1f99c sysutils/rsyslog/patches/patch-grammar_lexer.l
--- a/sysutils/rsyslog/patches/patch-grammar_lexer.l    Fri Dec 12 11:58:02 2014 +0000
+++ b/sysutils/rsyslog/patches/patch-grammar_lexer.l    Fri Dec 12 12:47:46 2014 +0000
@@ -1,18 +1,9 @@
-$NetBSD: patch-grammar_lexer.l,v 1.2 2014/10/26 21:11:09 fhajny Exp $
+$NetBSD: patch-grammar_lexer.l,v 1.3 2014/12/12 12:47:46 fhajny Exp $
 
 Fix build on BSD.
---- grammar/lexer.l.orig       2014-10-02 10:27:30.000000000 +0000
+--- grammar/lexer.l.orig       2014-12-02 10:15:16.000000000 +0000
 +++ grammar/lexer.l
-@@ -31,7 +31,7 @@
- %{
- #include "config.h"
- #include "parserif.h"
--extern char *strdup(__const char*); /* somehow we may not get this from string.h... */
-+// extern char *strdup(__const char*); /* somehow we may not get this from string.h... */
- %}
- 
- %option noyywrap nodefault case-insensitive yylineno
-@@ -92,7 +92,7 @@ extern int yydebug;
+@@ -95,7 +95,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...
   */
diff -r 11783a60ff85 -r 8b82cad1f99c sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf
--- a/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf       Fri Dec 12 11:58:02 2014 +0000
+++ b/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf       Fri Dec 12 12:47:46 2014 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-platform_redhat_rsyslog.conf,v 1.1 2014/09/05 07:15:41 fhajny Exp $
+$NetBSD: patch-platform_redhat_rsyslog.conf,v 1.2 2014/12/12 12:47:46 fhajny Exp $
 
 Fix sample config file. Auto-select kernel logging module.
---- platform/redhat/rsyslog.conf.orig  2014-07-14 12:54:54.000000000 +0000
+--- platform/redhat/rsyslog.conf.orig  2014-11-17 15:08:14.000000000 +0000
 +++ platform/redhat/rsyslog.conf
 @@ -4,15 +4,14 @@
   * like we have with the default config. For more advanced 
diff -r 11783a60ff85 -r 8b82cad1f99c sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c
--- a/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c    Fri Dec 12 11:58:02 2014 +0000
+++ b/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c    Fri Dec 12 12:47:46 2014 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-plugins_imfile_imfile.c,v 1.1 2014/09/05 07:15:41 fhajny Exp $
+$NetBSD: patch-plugins_imfile_imfile.c,v 1.2 2014/12/12 12:47:46 fhajny Exp $
 
 Avoid unresolved symbol on inotify-less platforms.
---- plugins/imfile/imfile.c.orig       2014-07-15 13:34:03.000000000 +0000
+--- plugins/imfile/imfile.c.orig       2014-12-02 10:15:16.000000000 +0000
 +++ plugins/imfile/imfile.c
-@@ -1348,11 +1348,14 @@ BEGINrunInput
+@@ -1709,11 +1709,14 @@ BEGINrunInput
  CODESTARTrunInput
        DBGPRINTF("imfile: working in %s mode\n", 
                 (runModConf->opMode == OPMODE_POLLING) ? "polling" : "inotify");
diff -r 11783a60ff85 -r 8b82cad1f99c sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c
--- a/sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c        Fri Dec 12 11:58:02 2014 +0000
+++ b/sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c        Fri Dec 12 12:47:46 2014 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-plugins_imuxsock_imuxsock.c,v 1.1 2014/09/05 07:15:41 fhajny Exp $
+$NetBSD: patch-plugins_imuxsock_imuxsock.c,v 1.2 2014/12/12 12:47:46 fhajny Exp $
 
 Define _XPG4_2 on SunOS to pick up CMSG_* macros.
 
---- plugins/imuxsock/imuxsock.c.orig   2014-08-18 09:14:06.000000000 +0000
+--- plugins/imuxsock/imuxsock.c.orig   2014-12-02 10:15:16.000000000 +0000
 +++ plugins/imuxsock/imuxsock.c
 @@ -25,6 +25,9 @@
   *
diff -r 11783a60ff85 -r 8b82cad1f99c sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
--- a/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c    Fri Dec 12 11:58:02 2014 +0000
+++ b/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c    Fri Dec 12 12:47:46 2014 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.1 2014/09/05 07:15:41 fhajny Exp $
+$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.2 2014/12/12 12:47:46 fhajny Exp $
 
 Fix build on BSD.
---- plugins/mmexternal/mmexternal.c.orig       2014-08-18 09:14:06.000000000 +0000
+--- plugins/mmexternal/mmexternal.c.orig       2014-11-25 15:45:35.000000000 +0000
 +++ plugins/mmexternal/mmexternal.c
 @@ -31,7 +31,7 @@
  #include <errno.h>
diff -r 11783a60ff85 -r 8b82cad1f99c sysutils/rsyslog/patches/patch-tools_rsyslogd.8
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/rsyslog/patches/patch-tools_rsyslogd.8   Fri Dec 12 12:47:46 2014 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-tools_rsyslogd.8,v 1.1 2014/12/12 12:47:46 fhajny Exp $
+
+Default PID file path.
+--- tools/rsyslogd.8.orig      2014-12-02 10:15:16.000000000 +0000
++++ tools/rsyslogd.8
+@@ -130,14 +130,14 @@ reacts to a set of signals.  You may eas
+ using the following:
+ .IP
+ .nf
+-kill -SIGNAL $(cat /var/run/rsyslogd.pid)
++kill -SIGNAL $(cat @RSYSLOG_PIDDIR@/rsyslogd.pid)
+ .fi
+ .PP
+ Note that -SIGNAL must be replaced with the actual signal
+ you are trying to send, e.g. with HUP. So it then becomes:
+ .IP
+ .nf
+-kill -HUP $(cat /var/run/rsyslogd.pid)
++kill -HUP $(cat @RSYSLOG_PIDDIR@/rsyslogd.pid)
+ .fi
+ .PP
+ .TP
+@@ -218,7 +218,7 @@ for exact information.
+ .I /dev/log
+ The Unix domain socket to from where local syslog messages are read.
+ .TP
+-.I /var/run/rsyslogd.pid
++.I @RSYSLOG_PIDDIR@/rsyslogd.pid
+ The file containing the process id of 
+ .BR rsyslogd .
+ .TP
diff -r 11783a60ff85 -r 8b82cad1f99c sysutils/rsyslog/patches/patch-tools_rsyslogd.c
--- a/sysutils/rsyslog/patches/patch-tools_rsyslogd.c   Fri Dec 12 11:58:02 2014 +0000
+++ b/sysutils/rsyslog/patches/patch-tools_rsyslogd.c   Fri Dec 12 12:47:46 2014 +0000
@@ -1,14 +1,23 @@
-$NetBSD: patch-tools_rsyslogd.c,v 1.1 2014/09/05 07:15:41 fhajny Exp $
+$NetBSD: patch-tools_rsyslogd.c,v 1.2 2014/12/12 12:47:46 fhajny Exp $
 
-Need errno.h on NetBSD.
---- tools/rsyslogd.c.orig      2014-08-18 09:14:06.000000000 +0000
+Need errno.h on NetBSD. Default PID file path.
+--- tools/rsyslogd.c.orig      2014-12-02 10:15:16.000000000 +0000
 +++ tools/rsyslogd.c
-@@ -26,7 +26,7 @@
- 
+@@ -27,7 +27,7 @@
  #include <signal.h>
+ #include <sys/wait.h>
  #include <liblogging/stdlog.h>
 -#ifdef OS_SOLARIS
 +#if defined(OS_SOLARIS) || defined(__NetBSD__)
  #     include <errno.h>
  #else
  #     include <sys/errno.h>
+@@ -84,7 +84,7 @@ void rsyslogdDoDie(int sig);
+ 
+ 
+ #ifndef PATH_PIDFILE
+-#     define PATH_PIDFILE "/var/run/rsyslogd.pid"
++#     define PATH_PIDFILE "@RSYSLOG_PIDDIR@/rsyslogd.pid"
+ #endif
+ 
+ /* global data items */
diff -r 11783a60ff85 -r 8b82cad1f99c sysutils/rsyslog/patches/patch-tools_syslogd.c
--- a/sysutils/rsyslog/patches/patch-tools_syslogd.c    Fri Dec 12 11:58:02 2014 +0000
+++ b/sysutils/rsyslog/patches/patch-tools_syslogd.c    Fri Dec 12 12:47:46 2014 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-tools_syslogd.c,v 1.1 2014/09/05 07:15:41 fhajny Exp $
+$NetBSD: patch-tools_syslogd.c,v 1.2 2014/12/12 12:47:46 fhajny Exp $
 
 Need errno.h on NetBSD. Fix default PID path.
---- tools/syslogd.c.orig       2014-07-15 13:34:03.000000000 +0000
+--- tools/syslogd.c.orig       2014-12-02 10:15:16.000000000 +0000
 +++ tools/syslogd.c
 @@ -58,15 +58,19 @@
  #include <time.h>
@@ -25,12 +25,3 @@
  #endif
  
  #include <sys/ioctl.h>
-@@ -135,7 +139,7 @@ void rsyslogdDoDie(int sig);
- 
- 
- #ifndef _PATH_LOGPID
--#     define _PATH_LOGPID "/var/run/rsyslogd.pid"
-+#     define _PATH_LOGPID "@RSYSLOG_PIDDIR@/rsyslogd.pid"
- #endif
- 
- #ifndef _PATH_TTY