CVS commit: pkgsrc/sysutils

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

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Mon Jan 15 11:01:16 UTC 2018

Modified Files:
        pkgsrc/sysutils/rsyslog: Makefile.common distinfo
        pkgsrc/sysutils/rsyslog-elasticsearch: Makefile
        pkgsrc/sysutils/rsyslog/patches: patch-tools_rsyslogd.c
Added Files:
        pkgsrc/sysutils/rsyslog/patches: patch-tools_iminternal.c
Removed Files:
        pkgsrc/sysutils/rsyslog/patches: patch-grammar_lexer.l
            patch-plugins_imfile_imfile.c patch-plugins_impstats_impstats.c
            patch-plugins_imptcp_imptcp.c patch-plugins_imuxsock_imuxsock.c
            patch-plugins_mmexternal_mmexternal.c
            patch-plugins_omkafka_omkafka.c patch-runtime_lookup.c
            patch-runtime_nsd__ptcp.c patch-tools_syslogd.c

Log Message:
Update sysutils/rsyslog* to 8.32.0.

- rsyslogd: add capability to specify that no pid file shall be
  written
- ompgsql: considerable enhancements
- build system: removed --enable-rtinst configure option
- pmrfc3164: support for headerless messages
- omhiredis: add option to use RPUSH instead of LPUSH
- mmexternal improvements
- omprog: refactored, code shared with mmexternal moved to common
  object
- logctl tool: refactor to support newer rsyslog standards
- imfile: added support for Solaris File Event notification (FEN)
- core/action: new parameter "action.errorfile"
- imfile: added new module parameter "sortFiles"
- imuxsock: improved status reporting: socket name received from
  systemd
- build system: added new testbench configure switches
- mmpstrucdata: new parameter "sd_name.lowercase"
- omfile: add module-global option "dynafile.donotsuspend"
- testbench: add a capability to turn off libfaketime tests via
  configure
- testbench: name valgrind tests consistently
- RainerScript: add function parse_json()
- RainerScript: add function substring()
- RainerScript: add function http_request()
- RainerScript: add function previous_is_suspended()
- Patches from BSD projects have been imported
- script bugfix: invalid function names were silently ignored
- rainerscript: add int2hex() function
- rainerscript: add is_time() function
- RainerScript: add function script_error() and error-reporting
  support
- testbench: fixed build problem of testbench tools under Alpine Linux
- added --enable-libsystemd configure option to enforce use of
  libsystemd
- core/glbl: remove long-unused option $optimizeforuniprocessor
- core/queue: emit better status messages at rsyslog shutdown
- fixed a couple of build issues with gcc-7 (in less frequently used
  modules)
- fixed a couple of build issues on the arm platform (actually
  raspbian)
- impstats: fix invalid counter definitions for getrusage() reporting
- imudp bugfix: potential segfault in ratelimiting
- imptcp bugfix: access to free'ed memory
- mmanon bugfix: fix wrong ipv6 embedded recognition
- imfile bugfix: not detecting files in directory when wildcards are
  used.
- script bugfix: improper string-to-number conversion for negative
  numbers
- core/action bugfix: 100% CPU utilization on suspension of output
  module
- core/variables bugfix: bare $! cannot be used in set statement
- core bugfix: auto commit of actions improperly handled
- core bugfix: filename length limitation of 199 bytes
- core bugfix: undefined behavior due to integer overflow
- core bugfix: race on LocalHostIP property during startup
- bugfix: potential segfault on startup
- omhiredis bugfix: rsyslog segfault on startup if no template is
  specified
- omprog bugfix: argv[0] not set when using binary without arguments
- core: refactoring of rsyslog's cstr "class"
- parent directory creation function refactored
- mmsnmptrapd bugfix: potential misadressing
- imkafka: fix potential small ressource leak
- imkafka bugfix: do not emit error message on regular state
- omkafka: expose operational status to user where useful
- omkafka bugfix: potential message duplication
- omkafka: fix multithreading
- omkafka bugfix: potential misadressing
- omkafka bugfix: build fails with older versions of librdkafka
- omgssapi bugfix: fix compiler warnings with gcc-7
- dnscache bugfix: entries were cached based on IP AND port number
- omkafka bugfix: fixed memory leak
- mmdblookup bugfix: replace thread-unsafe strtok() by thread-safe
  counterpart
- pmnormalize bugfix: remove unsave "strcat" implementation
- rainerscript bugfix: ltrim() and rtrim function misadressing
- imklog bugfix: local host IP was hardcoded to 127.0.0.1
- cleanup: remove obsolete pre-KSI GuardTime signature interface
- cleanup: obsolete defintion SOL_TCP replaced by newer IPPROTO_TCP
- lookup tables: fixed undefined behavior detected by UBSan


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/sysutils/rsyslog/Makefile.common
cvs rdiff -u -r1.31 -r1.32 pkgsrc/sysutils/rsyslog/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/rsyslog-elasticsearch/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/sysutils/rsyslog/patches/patch-grammar_lexer.l \
    pkgsrc/sysutils/rsyslog/patches/patch-runtime_lookup.c
cvs rdiff -u -r1.5 -r0 \
    pkgsrc/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/rsyslog/patches/patch-plugins_impstats_impstats.c \
    pkgsrc/sysutils/rsyslog/patches/patch-plugins_imptcp_imptcp.c \
    pkgsrc/sysutils/rsyslog/patches/patch-runtime_nsd__ptcp.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c \
    pkgsrc/sysutils/rsyslog/patches/patch-plugins_omkafka_omkafka.c
cvs rdiff -u -r1.6 -r0 \
    pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/rsyslog/patches/patch-tools_iminternal.c
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/rsyslog/patches/patch-tools_syslogd.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.34 pkgsrc/sysutils/rsyslog/Makefile.common:1.35
--- pkgsrc/sysutils/rsyslog/Makefile.common:1.34        Fri Jan 12 09:08:05 2018
+++ pkgsrc/sysutils/rsyslog/Makefile.common     Mon Jan 15 11:01:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2018/01/12 09:08:05 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.35 2018/01/15 11:01:16 fhajny Exp $
 # used by sysutils/rsyslog/Makefile
 # used by sysutils/rsyslog-dbi/Makefile
 # used by sysutils/rsyslog-elasticsearch/Makefile
@@ -14,7 +14,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-DISTNAME=              rsyslog-8.31.0
+DISTNAME=              rsyslog-8.32.0
 CATEGORIES=            sysutils
 MASTER_SITES=          http://www.rsyslog.com/files/download/rsyslog/
 
@@ -54,3 +54,4 @@ BUILDLINK_DEPMETHOD.libuuid+=         build
 .include "../../sysutils/liblogging/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libfastjson+=    libfastjson>=0.99.7
 .include "../../textproc/libfastjson/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"

Index: pkgsrc/sysutils/rsyslog/distinfo
diff -u pkgsrc/sysutils/rsyslog/distinfo:1.31 pkgsrc/sysutils/rsyslog/distinfo:1.32
--- pkgsrc/sysutils/rsyslog/distinfo:1.31       Thu Nov 30 22:19:36 2017
+++ pkgsrc/sysutils/rsyslog/distinfo    Mon Jan 15 11:01:16 2018
@@ -1,20 +1,11 @@
-$NetBSD: distinfo,v 1.31 2017/11/30 22:19:36 fhajny Exp $
+$NetBSD: distinfo,v 1.32 2018/01/15 11:01:16 fhajny Exp $
 
-SHA1 (rsyslog-8.31.0.tar.gz) = c2bab629fd7ec5b852a42b9ffacc4f1e4dd90f8c
-RMD160 (rsyslog-8.31.0.tar.gz) = 1865f462afbac0b4bc28f116e86f0c64d87ce766
-SHA512 (rsyslog-8.31.0.tar.gz) = aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7
-Size (rsyslog-8.31.0.tar.gz) = 2498675 bytes
+SHA1 (rsyslog-8.32.0.tar.gz) = 7b6aa9ba85eda7ff9ba72d27d30e84397cec44f0
+RMD160 (rsyslog-8.32.0.tar.gz) = 1d6ba0dee62188ce359d307a430fbcb2e5750849
+SHA512 (rsyslog-8.32.0.tar.gz) = eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac
+Size (rsyslog-8.32.0.tar.gz) = 2478990 bytes
 SHA1 (patch-configure) = df356c47b6c19c96b923978a5b194724fc0f10ba
-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) = 498fc31e687e50e6aee821c64e029f9407e902ef
-SHA1 (patch-plugins_omkafka_omkafka.c) = e0cb97ae66807efe3d58db929beabf7292cbf28d
-SHA1 (patch-runtime_lookup.c) = d6d0e629193546d088f98282d04c11f434644d22
-SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437
+SHA1 (patch-tools_iminternal.c) = 76e140343456b120cd9f0743e6f10e78f9baaa5d
 SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341
-SHA1 (patch-tools_rsyslogd.c) = 0776a632143a2dbbb3bf00159e4e3376c55418ff
-SHA1 (patch-tools_syslogd.c) = 6855271d05da979d53ae7cee167163a563922b00
+SHA1 (patch-tools_rsyslogd.c) = b2a295da0b6b667d8913bf9e73f6b2e87923e8be

Index: pkgsrc/sysutils/rsyslog-elasticsearch/Makefile
diff -u pkgsrc/sysutils/rsyslog-elasticsearch/Makefile:1.12 pkgsrc/sysutils/rsyslog-elasticsearch/Makefile:1.13
--- pkgsrc/sysutils/rsyslog-elasticsearch/Makefile:1.12 Mon Jan  1 21:18:53 2018
+++ pkgsrc/sysutils/rsyslog-elasticsearch/Makefile      Mon Jan 15 11:01:16 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2018/01/01 21:18:53 adam Exp $
+# $NetBSD: Makefile,v 1.13 2018/01/15 11:01:16 fhajny Exp $
 #
 
 RSYSLOG_MOD=   elasticsearch
 PKGNAME=       ${DISTNAME:S/rsyslog/rsyslog-${RSYSLOG_MOD}/}
-PKGREVISION=   1
 
 DEPENDS+=      rsyslog>=${PKGVERSION_NOREV}:../../sysutils/rsyslog
 

Index: pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
diff -u pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c:1.5 pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c:1.6
--- pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c:1.5  Mon Feb 13 19:59:36 2017
+++ pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c      Mon Jan 15 11:01:16 2018
@@ -1,18 +1,10 @@
-$NetBSD: patch-tools_rsyslogd.c,v 1.5 2017/02/13 19:59:36 fhajny Exp $
+$NetBSD: patch-tools_rsyslogd.c,v 1.6 2018/01/15 11:01:16 fhajny Exp $
 
-Need errno.h on NetBSD. Default PID file path.
---- tools/rsyslogd.c.orig      2017-01-10 09:00:04.000000000 +0000
+Default PID file path.
+
+--- tools/rsyslogd.c.orig      2018-01-09 08:40:30.000000000 +0000
 +++ tools/rsyslogd.c
-@@ -33,7 +33,7 @@
- #else
- #  include <syslog.h>
- #endif
--#ifdef OS_SOLARIS
-+#if defined(OS_SOLARIS) || defined(OS_BSD)
- #     include <errno.h>
- #else
- #     include <sys/errno.h>
-@@ -146,7 +146,7 @@ void rsyslogdDoDie(int sig);
+@@ -148,7 +148,7 @@ void rsyslogdDoDie(int sig);
  #if defined(_AIX)  /* AIXPORT : Add _AIX */
  #     define PATH_PIDFILE "/etc/rsyslogd.pid"
  #else

Added files:

Index: pkgsrc/sysutils/rsyslog/patches/patch-tools_iminternal.c
diff -u /dev/null pkgsrc/sysutils/rsyslog/patches/patch-tools_iminternal.c:1.1
--- /dev/null   Mon Jan 15 11:01:16 2018
+++ pkgsrc/sysutils/rsyslog/patches/patch-tools_iminternal.c    Mon Jan 15 11:01:16 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_iminternal.c,v 1.1 2018/01/15 11:01:16 fhajny Exp $
+
+NetBSD lacks pthread_mutex_timedlock.
+
+--- tools/iminternal.c.orig    2018-01-08 12:42:31.000000000 +0000
++++ tools/iminternal.c
+@@ -88,7 +88,7 @@ rsRetVal iminternalAddMsg(smsg_t *pMsg)
+        */
+       to.tv_sec = time(NULL) + 1;
+       to.tv_nsec = 0;
+-      #if !defined(__APPLE__)
++      #if !defined(__APPLE__) && !defined(__NetBSD__)
+       r = pthread_mutex_timedlock(&mutList, &to);
+       #else
+       r = pthread_mutex_trylock(&mutList); // must check