From: Ladislav Michl <[email protected]> Additionally install required smart-multi-line.fsm and remove local configuration file, which is obsolete anyway. Package comes with its own example syslog-ng.conf.
Signed-off-by: Ladislav Michl <[email protected]> --- projectroot/etc/syslog-ng.conf | 39 ---------------------------------- rules/syslogng.make | 11 +++++++--- 2 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 projectroot/etc/syslog-ng.conf diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf deleted file mode 100644 index 0235b9857..000000000 --- a/projectroot/etc/syslog-ng.conf +++ /dev/null @@ -1,39 +0,0 @@ -# -# syslog-ng configuration -# - -@version: 3.25 - -# -# Options -# - -# sync every 0 lines -options { chain_hostnames(off); flush_lines(0); }; - -# -# Sources -# - -# log source is /dev/log only -source src { unix-stream("/dev/log"); internal(); }; -# source net { udp(); }; - -# -# Destinations -# - -destination syslog { file("/var/log/syslog"); }; - -# -# Filters -# - -#filter f_auth { facility(auth); }; - -# -# Logs -# - -log { source(src); destination(syslog); }; - diff --git a/rules/syslogng.make b/rules/syslogng.make index 0264ddba6..947042623 100644 --- a/rules/syslogng.make +++ b/rules/syslogng.make @@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng # # Paths and names # -SYSLOGNG_VERSION := 4.8.1 -SYSLOG_LIBVERSION := 4.8 -SYSLOGNG_MD5 := 6a5852343f9a34449c3812b474728aa7 +SYSLOGNG_VERSION := 4.10.2 +SYSLOG_LIBVERSION := 4.10 +SYSLOGNG_MD5 := 0c97637b266efcf932b5fdea5f40235e SYSLOGNG := syslog-ng-$(SYSLOGNG_VERSION) SYSLOGNG_SUFFIX := tar.gz SYSLOGNG_URL := https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOGNG_VERSION)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX) @@ -87,6 +87,8 @@ SYSLOGNG_CONF_OPT := \ --disable-java-modules \ --enable-native \ --disable-afsnmp \ + --disable-colored-log \ + --disable-stackdump \ --disable-all-modules \ $(GLOBAL_LARGE_FILE_OPTION) \ --disable-valgrind \ @@ -135,6 +137,9 @@ $(STATEDIR)/syslogng.targetinstall: @$(call install_lib, syslogng, 0, 0, 0644, libsecret-storage) @$(call install_glob, syslogng, 0, 0, -, /usr/lib/syslog-ng, *.so) + @$(call install_copy, syslogng, 0, 0, 0644, -, \ + /usr/share/syslog-ng/smart-multi-line.fsm) + # # config ifdef PTXCONF_SYSLOGNG_CONFIG @$(call install_alternative, syslogng, 0, 0, 0644, /etc/syslog-ng.conf, n) -- 2.47.3
