summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sysutils/rsyslog/Makefile.common4
-rw-r--r--sysutils/rsyslog/PLIST3
-rw-r--r--sysutils/rsyslog/distinfo23
-rw-r--r--sysutils/rsyslog/patches/patch-grammar_lexer.l15
-rw-r--r--sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf4
-rw-r--r--sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c6
-rw-r--r--sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c4
-rw-r--r--sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c4
-rw-r--r--sysutils/rsyslog/patches/patch-tools_rsyslogd.831
-rw-r--r--sysutils/rsyslog/patches/patch-tools_rsyslogd.c19
-rw-r--r--sysutils/rsyslog/patches/patch-tools_syslogd.c13
11 files changed, 74 insertions, 52 deletions
diff --git a/sysutils/rsyslog/Makefile.common b/sysutils/rsyslog/Makefile.common
index 23c0515f8d3..79b875dd818 100644
--- a/sysutils/rsyslog/Makefile.common
+++ b/sysutils/rsyslog/Makefile.common
@@ -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 --git a/sysutils/rsyslog/PLIST b/sysutils/rsyslog/PLIST
index 17a89933296..179cdd8cda5 100644
--- a/sysutils/rsyslog/PLIST
+++ b/sysutils/rsyslog/PLIST
@@ -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 @@ man/man8/rsyslogd.8
sbin/msggen
sbin/rsyslog_diag_hostname
sbin/rsyslogd
-sbin/zpipe
share/examples/rc.d/rsyslogd
share/examples/rsyslog/rsyslog.conf
diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo
index d5754881fc6..a148ee0e9f3 100644
--- a/sysutils/rsyslog/distinfo
+++ b/sysutils/rsyslog/distinfo
@@ -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 --git a/sysutils/rsyslog/patches/patch-grammar_lexer.l b/sysutils/rsyslog/patches/patch-grammar_lexer.l
index 679233c138e..aa0f191b653 100644
--- a/sysutils/rsyslog/patches/patch-grammar_lexer.l
+++ b/sysutils/rsyslog/patches/patch-grammar_lexer.l
@@ -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 --git a/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf b/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf
index 3cc5bf9ec6e..a75bc5c77a8 100644
--- a/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf
+++ b/sysutils/rsyslog/patches/patch-platform_redhat_rsyslog.conf
@@ -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 --git a/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c b/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c
index 9bda4c9207b..776e828417e 100644
--- a/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c
+++ b/sysutils/rsyslog/patches/patch-plugins_imfile_imfile.c
@@ -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 --git a/sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c b/sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c
index 2f8f2820e5b..c6cf1836c84 100644
--- a/sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c
+++ b/sysutils/rsyslog/patches/patch-plugins_imuxsock_imuxsock.c
@@ -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 --git a/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c b/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
index 2c4fb0fef50..7e2d6febb2a 100644
--- a/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
+++ b/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
@@ -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 --git a/sysutils/rsyslog/patches/patch-tools_rsyslogd.8 b/sysutils/rsyslog/patches/patch-tools_rsyslogd.8
new file mode 100644
index 00000000000..a5e7380f9a8
--- /dev/null
+++ b/sysutils/rsyslog/patches/patch-tools_rsyslogd.8
@@ -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 --git a/sysutils/rsyslog/patches/patch-tools_rsyslogd.c b/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
index c08735c40a2..f603a13d12a 100644
--- a/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
+++ b/sysutils/rsyslog/patches/patch-tools_rsyslogd.c
@@ -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 --git a/sysutils/rsyslog/patches/patch-tools_syslogd.c b/sysutils/rsyslog/patches/patch-tools_syslogd.c
index 57f91278b5d..da7b78bc048 100644
--- a/sysutils/rsyslog/patches/patch-tools_syslogd.c
+++ b/sysutils/rsyslog/patches/patch-tools_syslogd.c
@@ -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 @@ Need errno.h on NetBSD. Fix default PID path.
#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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 08:46:51 +0000