json-c is no longer needed, rsyslog uses libfastjson from now on.
Make imkmsg, mmjsonparse and pmciscoios configurable.
Use --disable-unlimited-select as most other distros do and add missing
configure options.
Replace legacy configuration directives and do not load immark by
default.
Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com>
---
projectroot/etc/rsyslog.conf | 6 +++---
rules/rsyslog.in | 21 +++++++++++++++++----
rules/rsyslog.make | 12 ++++++++----
3 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/projectroot/etc/rsyslog.conf b/projectroot/etc/rsyslog.conf
index 94115e46d..a8c6945d4 100644
--- a/projectroot/etc/rsyslog.conf
+++ b/projectroot/etc/rsyslog.conf
@@ -1,8 +1,8 @@
# Begin /etc/rsyslog.conf
-$ModLoad immark # provides --MARK-- message capability
-$ModLoad imuxsock # provides support for local system logging (e.g. via logger
command)
-$ModLoad imklog # provides kernel logging support (previously done by rklogd)
+module(load="imuxsock") # provides support for local system logging (e.g. via
logger command)
+module(load="imklog") # provides kernel logging support (previously done by
rklogd)
+#module(load"immark") # provides --MARK-- message capability
daemon.* -/var/log/daemon.log
kern.* -/var/log/kern.log
diff --git a/rules/rsyslog.in b/rules/rsyslog.in
index 64f1063ea..f99c271eb 100644
--- a/rules/rsyslog.in
+++ b/rules/rsyslog.in
@@ -8,13 +8,13 @@ menuconfig RSYSLOG
select GCCLIBS_GCC_S
select ZLIB
select LIBESTR
- select JSON_C
select LIBFASTJSON
select LIBNET if RSYSLOG_OMUDPSPOOF
select SYSTEMD if RSYSLOG_SYSTEMD
prompt "rsyslog "
help
- FIXME
+ rsyslog is a reliable system and kernel logging daemon with
+ modular design and high speed message processing.
if RSYSLOG
@@ -30,13 +30,13 @@ config RSYSLOG_SYSTEMD_UNIT
config RSYSLOG_REGEXP
bool
- # 8.8.0 fail to build without regex support
+ # 8.25.0 fails to build without regex support
default y
prompt "regular expression support" if BROKEN
config RSYSLOG_INET
bool
- # 8.8.0 fail to run without inet support
+ # 8.25.0 fails to run without inet support
default y
prompt "networking support" if BROKEN
@@ -53,6 +53,11 @@ config RSYSLOG_IMKLOG
default y
prompt "klog input module"
+config RSYSLOG_IMKMSG
+ bool
+ default n
+ prompt "kmsg input module (contrib)"
+
config RSYSLOG_IMMARK
bool
default y
@@ -81,6 +86,10 @@ config RSYSLOG_IMUXSOCK
default y
prompt "unix domain socket input module"
+config RSYSLOG_MMJSONPARSE
+ bool
+ prompt "jsonparse message modification module"
+
config RSYSLOG_OMPROG
bool
prompt "program output module"
@@ -97,6 +106,10 @@ config RSYSLOG_OMUXSOCK
bool
prompt "unix domain socket output module"
+config RSYSLOG_PMCISCOIOS
+ bool
+ prompt "cisco ios parser module"
+
config RSYSLOG_PMLASTMSG
bool
prompt "lastmsg parser module"
diff --git a/rules/rsyslog.make b/rules/rsyslog.make
index c22875dd3..f33046041 100644
--- a/rules/rsyslog.make
+++ b/rules/rsyslog.make
@@ -43,11 +43,11 @@ RSYSLOG_CONF_OPT := \
--$(call ptx/endis, PTXCONF_RSYSLOG_REGEXP)-regexp \
--disable-gssapi-krb5 \
--$(call ptx/endis, PTXCONF_RSYSLOG_IMKLOG)-klog \
- --enable-kmsg \
+ --$(call ptx/endis, PTXCONF_RSYSLOG_IMKMSG)-kmsg \
--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-imjournal \
--$(call ptx/endis, PTXCONF_RSYSLOG_INET)-inet \
--disable-jemalloc \
- --enable-unlimited-select \
+ --disable-unlimited-select \
--disable-debug \
--disable-debug-symbols \
--disable-rtinst \
@@ -62,6 +62,7 @@ RSYSLOG_CONF_OPT := \
--disable-snmp \
--disable-uuid \
--disable-elasticsearch \
+ --disable-elasticsearch-tests \
--disable-gnutls \
--disable-libgcrypt \
--enable-rsyslogrt \
@@ -72,7 +73,7 @@ RSYSLOG_CONF_OPT := \
--disable-mail \
--$(call ptx/endis, PTXCONF_RSYSLOG_IMDIAG)-imdiag \
--disable-mmnormalize \
- --disable-mmjsonparse \
+ --$(call ptx/endis, PTXCONF_RSYSLOG_MMJSONPARSE)-mmjsonparse \
--disable-mmgrok \
--disable-mmaudit \
--disable-mmanon \
@@ -100,7 +101,7 @@ RSYSLOG_CONF_OPT := \
--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-omjournal \
--$(call ptx/endis, PTXCONF_RSYSLOG_PMLASTMSG)-pmlastmsg \
--disable-pmcisconames \
- --disable-pmciscoios \
+ --$(call ptx/endis, PTXCONF_RSYSLOG_PMCISCOIOS)-pmciscoios \
--disable-pmnull \
--disable-pmaixforwardedfrom \
--disable-pmsnare \
@@ -133,6 +134,7 @@ endif
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMDIAG) += imdiag
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMFILE) += imfile
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMKLOG) += imklog
+RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMKMSG) += imkmsg
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_SYSTEMD) += imjournal
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMMARK) += immark
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMPSTATS) += impstats
@@ -148,11 +150,13 @@ RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET) +=
lmstrmsrv
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET) += lmtcpclt
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET) += lmtcpsrv
RSYSLOG_PLUGINS-y += lmzlibw
+RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_MMJSONPARSE) += mmjsonparse
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMPROG) += omprog
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMSTDOUT) += omstdout
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_SYSTEMD) += omjournal
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUDPSPOOF) += omudpspoof
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_OMUXSOCK) += omuxsock
+RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_PMCISCOIOS) += pmciscoios
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_PMLASTMSG) += pmlastmsg
# ----------------------------------------------------------------------------
--
2.12.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
