Fri Dec 12 12:47:46 2014 UTC ()
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


(fhajny)
diff -r1.3 -r1.4 pkgsrc/sysutils/rsyslog/Makefile.common
diff -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/PLIST
diff -r1.2 -r1.3 pkgsrc/sysutils/rsyslog/distinfo
diff -r1.2 -r1.3 pkgsrc/sysutils/rsyslog/patches/patch-grammar_lexer.l
diff -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf
diff -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c
diff -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c
diff -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
diff -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
diff -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/patches/patch-tools_syslogd.c
diff -r0 -r1.1 pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.8

cvs diff -r1.3 -r1.4 pkgsrc/sysutils/rsyslog/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/Makefile.common 2014/10/26 21:11:09 1.3
+++ pkgsrc/sysutils/rsyslog/Makefile.common 2014/12/12 12:47:46 1.4
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile.common,v 1.3 2014/10/26 21:11:09 fhajny Exp $ 1# $NetBSD: Makefile.common,v 1.4 2014/12/12 12:47:46 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-gnutls/Makefile 4# used by sysutils/rsyslog-gnutls/Makefile
5# used by sysutils/rsyslog-gssapi/Makefile 5# used by sysutils/rsyslog-gssapi/Makefile
6# used by sysutils/rsyslog-libgcrypt/Makefile 6# used by sysutils/rsyslog-libgcrypt/Makefile
7# used by sysutils/rsyslog-mysql/Makefile 7# used by sysutils/rsyslog-mysql/Makefile
8# used by sysutils/rsyslog-pgsql/Makefile 8# used by sysutils/rsyslog-pgsql/Makefile
9# used by sysutils/rsyslog-rabbitmq/Makefile 9# used by sysutils/rsyslog-rabbitmq/Makefile
10# used by sysutils/rsyslog-snmp/Makefile 10# used by sysutils/rsyslog-snmp/Makefile
11 11
12.include "../../mk/bsd.prefs.mk" 12.include "../../mk/bsd.prefs.mk"
13 13
14DISTNAME= rsyslog-8.4.2 14DISTNAME= rsyslog-8.6.0
15CATEGORIES= sysutils 15CATEGORIES= sysutils
16MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ 16MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
17 17
18MAINTAINER?= filip@joyent.com 18MAINTAINER?= filip@joyent.com
19HOMEPAGE= http://www.rsyslog.com/ 19HOMEPAGE= http://www.rsyslog.com/
20LICENSE= gnu-gpl-v3 20LICENSE= gnu-gpl-v3
21COMMENT?= Enhanced syslogd for Unix - the ${RSYSLOG_MOD} module 21COMMENT?= Enhanced syslogd for Unix - the ${RSYSLOG_MOD} module
22 22
23DISTINFO_FILE= ${.CURDIR}/../../sysutils/rsyslog/distinfo 23DISTINFO_FILE= ${.CURDIR}/../../sysutils/rsyslog/distinfo
24PATCHDIR= ${.CURDIR}/../../sysutils/rsyslog/patches 24PATCHDIR= ${.CURDIR}/../../sysutils/rsyslog/patches
25 25
26BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils 26BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
27 27

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/PLIST 2014/09/05 07:15:41 1.1
+++ pkgsrc/sysutils/rsyslog/PLIST 2014/12/12 12:47:46 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2014/09/05 07:15:41 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.2 2014/12/12 12:47:46 fhajny Exp $
2lib/rsyslog/imdiag.la 2lib/rsyslog/imdiag.la
3lib/rsyslog/imfile.la 3lib/rsyslog/imfile.la
4${PLIST.klog}lib/rsyslog/imklog.la 4${PLIST.klog}lib/rsyslog/imklog.la
5lib/rsyslog/immark.la 5lib/rsyslog/immark.la
6lib/rsyslog/impstats.la 6lib/rsyslog/impstats.la
7${PLIST.solaris}lib/rsyslog/imsolaris.la 7${PLIST.solaris}lib/rsyslog/imsolaris.la
8lib/rsyslog/imtcp.la 8lib/rsyslog/imtcp.la
9lib/rsyslog/imudp.la 9lib/rsyslog/imudp.la
10lib/rsyslog/imuxsock.la 10lib/rsyslog/imuxsock.la
11lib/rsyslog/lmnet.la 11lib/rsyslog/lmnet.la
12lib/rsyslog/lmnetstrms.la 12lib/rsyslog/lmnetstrms.la
13lib/rsyslog/lmnsd_ptcp.la 13lib/rsyslog/lmnsd_ptcp.la
14lib/rsyslog/lmregexp.la 14lib/rsyslog/lmregexp.la
@@ -17,16 +17,15 @@ lib/rsyslog/lmtcpclt.la @@ -17,16 +17,15 @@ lib/rsyslog/lmtcpclt.la
17lib/rsyslog/lmtcpsrv.la 17lib/rsyslog/lmtcpsrv.la
18lib/rsyslog/lmzlibw.la 18lib/rsyslog/lmzlibw.la
19lib/rsyslog/mmexternal.la 19lib/rsyslog/mmexternal.la
20lib/rsyslog/mmjsonparse.la 20lib/rsyslog/mmjsonparse.la
21lib/rsyslog/mmnormalize.la 21lib/rsyslog/mmnormalize.la
22lib/rsyslog/ommail.la 22lib/rsyslog/ommail.la
23lib/rsyslog/omstdout.la 23lib/rsyslog/omstdout.la
24lib/rsyslog/omtesting.la 24lib/rsyslog/omtesting.la
25man/man5/rsyslog.conf.5 25man/man5/rsyslog.conf.5
26man/man8/rsyslogd.8 26man/man8/rsyslogd.8
27sbin/msggen 27sbin/msggen
28sbin/rsyslog_diag_hostname 28sbin/rsyslog_diag_hostname
29sbin/rsyslogd 29sbin/rsyslogd
30sbin/zpipe 
31share/examples/rc.d/rsyslogd 30share/examples/rc.d/rsyslogd
32share/examples/rsyslog/rsyslog.conf 31share/examples/rsyslog/rsyslog.conf

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/rsyslog/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/distinfo 2014/10/26 21:11:09 1.2
+++ pkgsrc/sysutils/rsyslog/distinfo 2014/12/12 12:47:46 1.3
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.2 2014/10/26 21:11:09 fhajny Exp $ 1$NetBSD: distinfo,v 1.3 2014/12/12 12:47:46 fhajny Exp $
2 2
3SHA1 (rsyslog-8.4.2.tar.gz) = f68f92a1fa3d8fca6f4fc3dc4a7acbabc1774612 3SHA1 (rsyslog-8.6.0.tar.gz) = 06e912c8d48a9736ab2a1810f4f7c76a20abb0eb
4RMD160 (rsyslog-8.4.2.tar.gz) = 0cca89d75b754f06360ad1a44b1f31167fdb64ca 4RMD160 (rsyslog-8.6.0.tar.gz) = 12f53341404fd20ded9f9de50b2e57aedef89205
5Size (rsyslog-8.4.2.tar.gz) = 1938563 bytes 5Size (rsyslog-8.6.0.tar.gz) = 1975854 bytes
6SHA1 (patch-grammar_lexer.l) = e9702023a7899fe6a3fe8c6902fb9127b3eb29bc 6SHA1 (patch-grammar_lexer.l) = d52518e8b962820a030e01fcf5d00c1e3f1377ec
7SHA1 (patch-platform_redhat_rsyslog.conf) = 775c523e3eae6641b30cc09c4044e46ae87fa7a4 7SHA1 (patch-platform_redhat_rsyslog.conf) = a61cf6750e21bfb8ddb4fd8150b98835231cb950
8SHA1 (patch-plugins_imfile_imfile.c) = 390aa8febed6693bf69bc1c1764521eae0250477 8SHA1 (patch-plugins_imfile_imfile.c) = 6909e68e700d61099d9200fd26072bd7f199639f
9SHA1 (patch-plugins_imuxsock_imuxsock.c) = 2516941970ac1b4c42d7a326a2bd824052bc9b0b 9SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da
10SHA1 (patch-plugins_mmexternal_mmexternal.c) = 4f5d13c1206f0c5d00458ee93cb0791ac150fc30 10SHA1 (patch-plugins_mmexternal_mmexternal.c) = 12053abfd32553c4c29faa131b803e7edfaa3803
11SHA1 (patch-tools_rsyslogd.c) = 99f63b04195ca7fb753d2900a4d68918a54914f5 11SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341
12SHA1 (patch-tools_syslogd.c) = 9244710cd24377d7a36c24148250935f58dee5da 12SHA1 (patch-tools_rsyslogd.c) = 7d33c23a7c5b61317e2857df11b7b62e6c8f188b
 13SHA1 (patch-tools_syslogd.c) = 94a53b2a2cfbc2b57c29d90c276fa4877fdfd2f2

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/rsyslog/patches/Attic/patch-grammar_lexer.l (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/patches/Attic/patch-grammar_lexer.l 2014/10/26 21:11:09 1.2
+++ pkgsrc/sysutils/rsyslog/patches/Attic/patch-grammar_lexer.l 2014/12/12 12:47:46 1.3
@@ -1,23 +1,14 @@ @@ -1,23 +1,14 @@
1$NetBSD: patch-grammar_lexer.l,v 1.2 2014/10/26 21:11:09 fhajny Exp $ 1$NetBSD: patch-grammar_lexer.l,v 1.3 2014/12/12 12:47:46 fhajny Exp $
2 2
3Fix build on BSD. 3Fix build on BSD.
4--- grammar/lexer.l.orig 2014-10-02 10:27:30.000000000 +0000 4--- grammar/lexer.l.orig 2014-12-02 10:15:16.000000000 +0000
5+++ grammar/lexer.l 5+++ grammar/lexer.l
6@@ -31,7 +31,7 @@ 6@@ -95,7 +95,7 @@ extern int yydebug;
7 %{ 
8 #include "config.h" 
9 #include "parserif.h" 
10-extern char *strdup(__const char*); /* somehow we may not get this from string.h... */ 
11+// extern char *strdup(__const char*); /* somehow we may not get this from string.h... */ 
12 %} 
13  
14 %option noyywrap nodefault case-insensitive yylineno 
15@@ -92,7 +92,7 @@ extern int yydebug; 
16 /* somehow, I need these prototype even though the headers are  7 /* somehow, I need these prototype even though the headers are
17 * 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...
18 */ 9 */
19-#if !defined(__FreeBSD__) 10-#if !defined(__FreeBSD__)
20+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonflyBSD__) 11+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonflyBSD__)
21 int fileno(FILE *stream); 12 int fileno(FILE *stream);
22 #endif 13 #endif
23  14

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf 2014/09/05 07:15:41 1.1
+++ pkgsrc/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf 2014/12/12 12:47:46 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-platform_redhat_rsyslog.conf,v 1.1 2014/09/05 07:15:41 fhajny Exp $ 1$NetBSD: patch-platform_redhat_rsyslog.conf,v 1.2 2014/12/12 12:47:46 fhajny Exp $
2 2
3Fix sample config file. Auto-select kernel logging module. 3Fix sample config file. Auto-select kernel logging module.
4--- platform/redhat/rsyslog.conf.orig 2014-07-14 12:54:54.000000000 +0000 4--- platform/redhat/rsyslog.conf.orig 2014-11-17 15:08:14.000000000 +0000
5+++ platform/redhat/rsyslog.conf 5+++ platform/redhat/rsyslog.conf
6@@ -4,15 +4,14 @@ 6@@ -4,15 +4,14 @@
7 * like we have with the default config. For more advanced  7 * like we have with the default config. For more advanced
8 * things, RainerScript configuration is suggested. 8 * things, RainerScript configuration is suggested.
9 * 9 *
10- * For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html 10- * For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
11- * or latest version online at http://www.rsyslog.com/doc/rsyslog_conf.html  11- * or latest version online at http://www.rsyslog.com/doc/rsyslog_conf.html
12+ * For more information see http://www.rsyslog.com/doc/rsyslog_conf.html 12+ * For more information see http://www.rsyslog.com/doc/rsyslog_conf.html
13 * If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html 13 * If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
14 */ 14 */
15  15
16 #### MODULES #### 16 #### MODULES ####
17  17

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/patches/Attic/patch-plugins_imfile_imfile.c (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/patches/Attic/patch-plugins_imfile_imfile.c 2014/09/05 07:15:41 1.1
+++ pkgsrc/sysutils/rsyslog/patches/Attic/patch-plugins_imfile_imfile.c 2014/12/12 12:47:46 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-plugins_imfile_imfile.c,v 1.1 2014/09/05 07:15:41 fhajny Exp $ 1$NetBSD: patch-plugins_imfile_imfile.c,v 1.2 2014/12/12 12:47:46 fhajny Exp $
2 2
3Avoid unresolved symbol on inotify-less platforms. 3Avoid unresolved symbol on inotify-less platforms.
4--- plugins/imfile/imfile.c.orig 2014-07-15 13:34:03.000000000 +0000 4--- plugins/imfile/imfile.c.orig 2014-12-02 10:15:16.000000000 +0000
5+++ plugins/imfile/imfile.c 5+++ plugins/imfile/imfile.c
6@@ -1348,11 +1348,14 @@ BEGINrunInput 6@@ -1709,11 +1709,14 @@ BEGINrunInput
7 CODESTARTrunInput 7 CODESTARTrunInput
8 DBGPRINTF("imfile: working in %s mode\n",  8 DBGPRINTF("imfile: working in %s mode\n",
9 (runModConf->opMode == OPMODE_POLLING) ? "polling" : "inotify"); 9 (runModConf->opMode == OPMODE_POLLING) ? "polling" : "inotify");
10+#if HAVE_INOTIFY_INIT 10+#if HAVE_INOTIFY_INIT
11 if(runModConf->opMode == OPMODE_POLLING) 11 if(runModConf->opMode == OPMODE_POLLING)
12 iRet = doPolling(); 12 iRet = doPolling();
13 else 13 else
14 iRet = do_inotify(); 14 iRet = do_inotify();
15- 15-
16+#else 16+#else
17+ iRet = doPolling(); 17+ iRet = doPolling();
18+#endif 18+#endif
19 DBGPRINTF("imfile: terminating upon request of rsyslog core\n"); 19 DBGPRINTF("imfile: terminating upon request of rsyslog core\n");

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/patches/Attic/patch-plugins_imuxsock_imuxsock.c (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/patches/Attic/patch-plugins_imuxsock_imuxsock.c 2014/09/05 07:15:41 1.1
+++ pkgsrc/sysutils/rsyslog/patches/Attic/patch-plugins_imuxsock_imuxsock.c 2014/12/12 12:47:46 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-plugins_imuxsock_imuxsock.c,v 1.1 2014/09/05 07:15:41 fhajny Exp $ 1$NetBSD: patch-plugins_imuxsock_imuxsock.c,v 1.2 2014/12/12 12:47:46 fhajny Exp $
2 2
3Define _XPG4_2 on SunOS to pick up CMSG_* macros. 3Define _XPG4_2 on SunOS to pick up CMSG_* macros.
4 4
5--- plugins/imuxsock/imuxsock.c.orig 2014-08-18 09:14:06.000000000 +0000 5--- plugins/imuxsock/imuxsock.c.orig 2014-12-02 10:15:16.000000000 +0000
6+++ plugins/imuxsock/imuxsock.c 6+++ plugins/imuxsock/imuxsock.c
7@@ -25,6 +25,9 @@ 7@@ -25,6 +25,9 @@
8 * 8 *
9 * A copy of the GPL can be found in the file "COPYING" in this distribution. 9 * A copy of the GPL can be found in the file "COPYING" in this distribution.
10 */ 10 */
11+#ifdef __sun 11+#ifdef __sun
12+#define _XPG4_2 12+#define _XPG4_2
13+#endif 13+#endif
14 #include "config.h" 14 #include "config.h"
15 #include "rsyslog.h" 15 #include "rsyslog.h"
16 #include <stdlib.h> 16 #include <stdlib.h>

cvs diff -r1.1 -r1.2 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 2014/09/05 07:15:41 1.1
+++ pkgsrc/sysutils/rsyslog/patches/Attic/patch-plugins_mmexternal_mmexternal.c 2014/12/12 12:47:46 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.1 2014/09/05 07:15:41 fhajny Exp $ 1$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.2 2014/12/12 12:47:46 fhajny Exp $
2 2
3Fix build on BSD. 3Fix build on BSD.
4--- plugins/mmexternal/mmexternal.c.orig 2014-08-18 09:14:06.000000000 +0000 4--- plugins/mmexternal/mmexternal.c.orig 2014-11-25 15:45:35.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-#include <wait.h> 10-#include <wait.h>
11+#include <sys/wait.h> 11+#include <sys/wait.h>
12 #include <sys/uio.h> 12 #include <sys/uio.h>
13 #include "conf.h" 13 #include "conf.h"
14 #include "syslogd-types.h" 14 #include "syslogd-types.h"

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c 2014/09/05 07:15:41 1.1
+++ pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.c 2014/12/12 12:47:46 1.2
@@ -1,14 +1,23 @@ @@ -1,14 +1,23 @@
1$NetBSD: patch-tools_rsyslogd.c,v 1.1 2014/09/05 07:15:41 fhajny Exp $ 1$NetBSD: patch-tools_rsyslogd.c,v 1.2 2014/12/12 12:47:46 fhajny Exp $
2 2
3Need errno.h on NetBSD. 3Need errno.h on NetBSD. Default PID file path.
4--- tools/rsyslogd.c.orig 2014-08-18 09:14:06.000000000 +0000 4--- tools/rsyslogd.c.orig 2014-12-02 10:15:16.000000000 +0000
5+++ tools/rsyslogd.c 5+++ tools/rsyslogd.c
6@@ -26,7 +26,7 @@ 6@@ -27,7 +27,7 @@
7  
8 #include <signal.h> 7 #include <signal.h>
 8 #include <sys/wait.h>
9 #include <liblogging/stdlog.h> 9 #include <liblogging/stdlog.h>
10-#ifdef OS_SOLARIS 10-#ifdef OS_SOLARIS
11+#if defined(OS_SOLARIS) || defined(__NetBSD__) 11+#if defined(OS_SOLARIS) || defined(__NetBSD__)
12 # include <errno.h> 12 # include <errno.h>
13 #else 13 #else
14 # include <sys/errno.h> 14 # include <sys/errno.h>
 15@@ -84,7 +84,7 @@ void rsyslogdDoDie(int sig);
 16
 17
 18 #ifndef PATH_PIDFILE
 19-# define PATH_PIDFILE "/var/run/rsyslogd.pid"
 20+# define PATH_PIDFILE "@RSYSLOG_PIDDIR@/rsyslogd.pid"
 21 #endif
 22
 23 /* global data items */

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/rsyslog/patches/Attic/patch-tools_syslogd.c (expand / switch to unified diff)

--- pkgsrc/sysutils/rsyslog/patches/Attic/patch-tools_syslogd.c 2014/09/05 07:15:41 1.1
+++ pkgsrc/sysutils/rsyslog/patches/Attic/patch-tools_syslogd.c 2014/12/12 12:47:46 1.2
@@ -1,36 +1,27 @@ @@ -1,36 +1,27 @@
1$NetBSD: patch-tools_syslogd.c,v 1.1 2014/09/05 07:15:41 fhajny Exp $ 1$NetBSD: patch-tools_syslogd.c,v 1.2 2014/12/12 12:47:46 fhajny Exp $
2 2
3Need errno.h on NetBSD. Fix default PID path. 3Need errno.h on NetBSD. Fix default PID path.
4--- tools/syslogd.c.orig 2014-07-15 13:34:03.000000000 +0000 4--- tools/syslogd.c.orig 2014-12-02 10:15:16.000000000 +0000
5+++ tools/syslogd.c 5+++ tools/syslogd.c
6@@ -58,15 +58,19 @@ 6@@ -58,15 +58,19 @@
7 #include <time.h> 7 #include <time.h>
8 #include <assert.h> 8 #include <assert.h>
9  9
10-#ifdef OS_SOLARIS 10-#ifdef OS_SOLARIS
11+#if defined(OS_SOLARIS) || defined(__NetBSD__) 11+#if defined(OS_SOLARIS) || defined(__NetBSD__)
12 # include <errno.h> 12 # include <errno.h>
13+#else 13+#else
14+# include <sys/errno.h> 14+# include <sys/errno.h>
15+#endif 15+#endif
16+ 16+
17+#ifdef OS_SOLARIS 17+#ifdef OS_SOLARIS
18 # include <fcntl.h> 18 # include <fcntl.h>
19 # include <stropts.h> 19 # include <stropts.h>
20 # include <sys/termios.h> 20 # include <sys/termios.h>
21 # include <sys/types.h> 21 # include <sys/types.h>
22 #else 22 #else
23 # include <libgen.h> 23 # include <libgen.h>
24-# include <sys/errno.h> 24-# include <sys/errno.h>
25 #endif 25 #endif
26  26
27 #include <sys/ioctl.h> 27 #include <sys/ioctl.h>
28@@ -135,7 +139,7 @@ void rsyslogdDoDie(int sig); 
29  
30  
31 #ifndef _PATH_LOGPID 
32-# define _PATH_LOGPID "/var/run/rsyslogd.pid" 
33+# define _PATH_LOGPID "@RSYSLOG_PIDDIR@/rsyslogd.pid" 
34 #endif 
35  
36 #ifndef _PATH_TTY 

File Added: pkgsrc/sysutils/rsyslog/patches/patch-tools_rsyslogd.8
$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