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

15 files changed, 31 insertions, 250 deletions

diff --git a/sysutils/rsyslog-elasticsearch/Makefile b/sysutils/rsyslog-elasticsearch/Makefile
index 4a6c98edc70..302d6aa0169 100644
--- a/sysutils/rsyslog-elasticsearch/Makefile
+++ b/sysutils/rsyslog-elasticsearch/Makefile
@@ -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
 
diff --git a/sysutils/rsyslog/Makefile.common b/sysutils/rsyslog/Makefile.common
index bd4b0c97450..68672cbae62 100644
--- a/sysutils/rsyslog/Makefile.common
+++ b/sysutils/rsyslog/Makefile.common
@@ -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"
diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo
index 8631b555772..94c7b018ce6 100644
--- a/sysutils/rsyslog/distinfo
+++ b/sysutils/rsyslog/distinfo
@@ -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
diff --git a/sysutils/rsyslog/patches/patch-grammar_lexer.l b/sysutils/rsyslog/patches/patch-grammar_lexer.l
deleted file mode 100644
index 4d7f0f83ac3..00000000000
--- a/sysutils/rsyslog/patches/patch-grammar_lexer.l
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-grammar_lexer.l,v 1.4 2017/02/13 19:59:36 fhajny Exp $
-
-Fix build on BSD.
---- grammar/lexer.l.orig	2017-01-10 09:00:04.000000000 +0000
-+++ grammar/lexer.l
-@@ -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__) && !defined(_AIX)
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonflyBSD__) && !defined(_AIX)
- int fileno(FILE *stream);
- #endif
- 
diff --git a/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c b/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c
deleted file mode 100644
index 86796267cb8..00000000000
--- a/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-plugins_imfile_imfile.c,v 1.5 2016/01/26 15:20:33 fhajny Exp $
-
-Avoid unresolved symbol on inotify-less platforms.
---- plugins/imfile/imfile.c.orig	2016-01-22 07:54:28.000000000 +0000
-+++ plugins/imfile/imfile.c
-@@ -1839,10 +1839,14 @@ BEGINrunInput
- CODESTARTrunInput
- 	DBGPRINTF("imfile: working in %s mode\n",
- 		 (runModConf->opMode == OPMODE_POLLING) ? "polling" : "inotify");
-+#if HAVE_INOTIFY_INIT
- 	if(runModConf->opMode == OPMODE_POLLING)
- 		iRet = doPolling();
- 	else
- 		iRet = do_inotify();
-+#else
-+	iRet = doPolling();
-+#endif
- 
- 	DBGPRINTF("imfile: terminating upon request of rsyslog core\n");
- ENDrunInput
diff --git a/sysutils/rsyslog/patches/patch-plugins_impstats_impstats.c b/sysutils/rsyslog/patches/patch-plugins_impstats_impstats.c
deleted file mode 100644
index ea3d0f06cee..00000000000
--- a/sysutils/rsyslog/patches/patch-plugins_impstats_impstats.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_impstats_impstats.c,v 1.1 2017/02/09 00:18:36 joerg Exp $
-
---- plugins/impstats/impstats.c.orig	2017-02-08 21:16:20.608978307 +0000
-+++ plugins/impstats/impstats.c
-@@ -30,9 +30,7 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/uio.h>
--#if defined(__FreeBSD__)
- #include <sys/stat.h>
--#endif
- #include <errno.h>
- #include <sys/time.h>
- #include <sys/resource.h>
diff --git a/sysutils/rsyslog/patches/patch-plugins_imptcp_imptcp.c b/sysutils/rsyslog/patches/patch-plugins_imptcp_imptcp.c
deleted file mode 100644
index acd9472c3a8..00000000000
--- a/sysutils/rsyslog/patches/patch-plugins_imptcp_imptcp.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-plugins_imptcp_imptcp.c,v 1.1 2015/01/16 16:58:28 fhajny Exp $
-
-Improve portability, fix build on SunOS and BSD.
---- plugins/imptcp/imptcp.c.orig	2015-01-08 14:58:14.000000000 +0000
-+++ plugins/imptcp/imptcp.c
-@@ -585,7 +585,7 @@ EnableKeepAlive(ptcplstn_t *pLstn, int s
- 	if(pLstn->pSrv->iKeepAliveProbes > 0) {
- 		optval = pLstn->pSrv->iKeepAliveProbes;
- 		optlen = sizeof(optval);
--		ret = setsockopt(sock, SOL_TCP, TCP_KEEPCNT, &optval, optlen);
-+		ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT, &optval, optlen);
- 	} else {
- 		ret = 0;
- 	}
-@@ -600,7 +600,7 @@ EnableKeepAlive(ptcplstn_t *pLstn, int s
- 	if(pLstn->pSrv->iKeepAliveTime > 0) {
- 		optval = pLstn->pSrv->iKeepAliveTime;
- 		optlen = sizeof(optval);
--		ret = setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &optval, optlen);
-+		ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen);
- 	} else {
- 		ret = 0;
- 	}
-@@ -615,7 +615,7 @@ EnableKeepAlive(ptcplstn_t *pLstn, int s
- 	if(pLstn->pSrv->iKeepAliveIntvl > 0) {
- 		optval = pLstn->pSrv->iKeepAliveIntvl;
- 		optlen = sizeof(optval);
--		ret = setsockopt(sock, SOL_TCP, TCP_KEEPINTVL, &optval, optlen);
-+		ret = setsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL, &optval, optlen);
- 	} else {
- 		ret = 0;
- 	}
diff --git a/sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c b/sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c
deleted file mode 100644
index c6cf1836c84..00000000000
--- a/sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$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-12-02 10:15:16.000000000 +0000
-+++ plugins/imuxsock/imuxsock.c
-@@ -25,6 +25,9 @@
-  *
-  * A copy of the GPL can be found in the file "COPYING" in this distribution.
-  */
-+#ifdef __sun
-+#define _XPG4_2
-+#endif
- #include "config.h"
- #include "rsyslog.h"
- #include <stdlib.h>
diff --git a/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c b/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
deleted file mode 100644
index 8b73b69dd2a..00000000000
--- a/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.6 2017/05/18 13:27:44 fhajny Exp $
-
-Fix build on BSD.
---- plugins/mmexternal/mmexternal.c.orig	2017-05-15 09:41:19.000000000 +0000
-+++ plugins/mmexternal/mmexternal.c
-@@ -31,7 +31,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <fcntl.h>
--#if defined(_AIX) || defined(__FreeBSD__) || defined(__APPLE__) 
-+#if defined(_AIX) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) || defined(__APPLE__) 
- #include <sys/wait.h>
- #else
- #include <wait.h>
diff --git a/sysutils/rsyslog/patches/patch-plugins_omkafka_omkafka.c b/sysutils/rsyslog/patches/patch-plugins_omkafka_omkafka.c
deleted file mode 100644
index cc9649b6f5c..00000000000
--- a/sysutils/rsyslog/patches/patch-plugins_omkafka_omkafka.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-plugins_omkafka_omkafka.c,v 1.2 2017/07/04 13:31:16 fhajny Exp $
-
-Need strings.h for index().
-O_LARGEFILE not defined on at least NetBSD.
-
---- plugins/omkafka/omkafka.c.orig	2017-06-27 13:40:22.000000000 +0000
-+++ plugins/omkafka/omkafka.c
-@@ -25,6 +25,7 @@
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <strings.h>
- #include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
-@@ -76,6 +77,10 @@ struct kafka_params {
- 	const char *val;
- };
- 
-+#ifndef O_LARGEFILE
-+#define O_LARGEFILE 0
-+#endif
-+
- #if HAVE_ATOMIC_BUILTINS64
- static uint64 clockTopicAccess = 0;
- #else
diff --git a/sysutils/rsyslog/patches/patch-runtime_lookup.c b/sysutils/rsyslog/patches/patch-runtime_lookup.c
deleted file mode 100644
index 6ccde67d935..00000000000
--- a/sysutils/rsyslog/patches/patch-runtime_lookup.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-runtime_lookup.c,v 1.4 2017/07/04 13:31:16 fhajny Exp $
-
-Handle Darwin's pthread_setname_np().
-
---- runtime/lookup.c.orig	2017-06-25 11:46:08.000000000 +0000
-+++ runtime/lookup.c
-@@ -958,10 +958,12 @@ lookupTableDefProcessCnf(struct cnfobj *
- 	strcpy(reloader_thd_name, reloader_prefix);
- 	strcpy(reloader_thd_name + strlen(reloader_prefix), (char*) lu->name);
- 	reloader_thd_name[thd_name_len - 1] = '\0';
--  #ifndef __APPLE__
--     pthread_setname_np(lu->reloader, reloader_thd_name);
--  #else
-+  #if defined(__NetBSD__)
-+     pthread_setname_np(lu->reloader, "%s", reloader_thd_name);
-+  #elif defined(__APPLE__)
-      pthread_setname_np(reloader_thd_name); // must check
-+  #else
-+     pthread_setname_np(lu->reloader, reloader_thd_name);
-   #endif
- #endif
- 	CHKiRet(lookupReadFile(lu->self, lu->name, lu->filename));
diff --git a/sysutils/rsyslog/patches/patch-runtime_nsd__ptcp.c b/sysutils/rsyslog/patches/patch-runtime_nsd__ptcp.c
deleted file mode 100644
index ed669571505..00000000000
--- a/sysutils/rsyslog/patches/patch-runtime_nsd__ptcp.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-runtime_nsd__ptcp.c,v 1.1 2015/01/16 16:58:28 fhajny Exp $
-
-Improve portability, fix build on SunOS and BSD.
---- runtime/nsd_ptcp.c.orig	2015-01-08 14:58:14.000000000 +0000
-+++ runtime/nsd_ptcp.c
-@@ -656,7 +656,7 @@ EnableKeepAlive(nsd_t *pNsd)
- 	if(pThis->iKeepAliveProbes > 0) {
- 		optval = pThis->iKeepAliveProbes;
- 		optlen = sizeof(optval);
--		ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPCNT, &optval, optlen);
-+		ret = setsockopt(pThis->sock, IPPROTO_TCP, TCP_KEEPCNT, &optval, optlen);
- 	} else {
- 		ret = 0;
- 	}
-@@ -671,7 +671,7 @@ EnableKeepAlive(nsd_t *pNsd)
- 	if(pThis->iKeepAliveTime > 0) {
- 		optval = pThis->iKeepAliveTime;
- 		optlen = sizeof(optval);
--		ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPIDLE, &optval, optlen);
-+		ret = setsockopt(pThis->sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen);
- 	} else {
- 		ret = 0;
- 	}
-@@ -686,7 +686,7 @@ EnableKeepAlive(nsd_t *pNsd)
- 	if(pThis->iKeepAliveIntvl > 0) {
- 		optval = pThis->iKeepAliveIntvl;
- 		optlen = sizeof(optval);
--		ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPINTVL, &optval, optlen);
-+		ret = setsockopt(pThis->sock, IPPROTO_TCP, TCP_KEEPINTVL, &optval, optlen);
- 	} else {
- 		ret = 0;
- 	}
diff --git a/sysutils/rsyslog/patches/patch-tools_iminternal.c b/sysutils/rsyslog/patches/patch-tools_iminternal.c
new file mode 100644
index 00000000000..22915eef715
--- /dev/null
+++ b/sysutils/rsyslog/patches/patch-tools_iminternal.c
@@ -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
diff --git a/sysutils/rsyslog/patches/patch-tools_rsyslogd.c b/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
index aabbc160db5..40b63d6c3c6 100644
--- a/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
+++ b/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
@@ -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
diff --git a/sysutils/rsyslog/patches/patch-tools_syslogd.c b/sysutils/rsyslog/patches/patch-tools_syslogd.c
deleted file mode 100644
index c61d9e2f2f6..00000000000
--- a/sysutils/rsyslog/patches/patch-tools_syslogd.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-tools_syslogd.c,v 1.3 2015/01/16 16:58:28 fhajny Exp $
-
-Need errno.h on NetBSD. Fix default PID path.
---- tools/syslogd.c.orig	2014-12-02 10:15:16.000000000 +0000
-+++ tools/syslogd.c
-@@ -58,15 +58,19 @@
- #include <time.h>
- #include <assert.h>
- 
--#ifdef OS_SOLARIS
-+#if defined(OS_SOLARIS) || defined(OS_BSD)
- #	include <errno.h>
-+#else
-+#	include <sys/errno.h>
-+#endif
-+
-+#ifdef OS_SOLARIS
- #	include <fcntl.h>
- #	include <stropts.h>
- #	include <sys/termios.h>
- #	include <sys/types.h>
- #else
- #	include <libgen.h>
--#	include <sys/errno.h>
- #endif
- 
- #include <sys/ioctl.h>