This fixes a compile error with gcc-10 en passant.
Signed-off-by: Uwe Kleine-König <u.kleine-koe...@pengutronix.de>
---
rules/rsyslog.in | 1 +
rules/rsyslog.make | 48 ++++++++++++++++++++++++++++++++++++----------
2 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/rules/rsyslog.in b/rules/rsyslog.in
index 74f6395679f1..157c60e3bae4 100644
--- a/rules/rsyslog.in
+++ b/rules/rsyslog.in
@@ -7,6 +7,7 @@ menuconfig RSYSLOG
select LIBC_PTHREAD
select GCCLIBS_GCC_S
select ZLIB
+ select LIBCURL
select LIBESTR
select LIBFASTJSON
select LIBNET if RSYSLOG_OMUDPSPOOF
diff --git a/rules/rsyslog.make b/rules/rsyslog.make
index 28c7a8901dbb..0c7f15c5be5b 100644
--- a/rules/rsyslog.make
+++ b/rules/rsyslog.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RSYSLOG) += rsyslog
#
# Paths and names
#
-RSYSLOG_VERSION := 8.26.0
-RSYSLOG_MD5 := abe20d1621d1e73326c08b964a556ed7
+RSYSLOG_VERSION := 8.2008.0
+RSYSLOG_MD5 := 9b6ae1a517231764ad4fbd68181cc23e
RSYSLOG := rsyslog-$(RSYSLOG_VERSION)
RSYSLOG_SUFFIX := tar.gz
RSYSLOG_URL :=
http://www.rsyslog.com/files/download/rsyslog/$(RSYSLOG).$(RSYSLOG_SUFFIX)
@@ -37,31 +37,41 @@ RSYSLOG_LICENSE_FILES := \
RSYSLOG_CONF_TOOL := autoconf
RSYSLOG_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ --enable-compile-warnings=yes \
+ --disable-Werror \
+ --enable-atomic-operations \
$(GLOBAL_LARGE_FILE_OPTION) \
--$(call ptx/endis, PTXCONF_RSYSLOG_REGEXP)-regexp \
+ --disable-fmhash \
--disable-gssapi-krb5 \
+ --disable-root-tests \
--$(call ptx/endis, PTXCONF_RSYSLOG_IMKLOG)-klog \
--$(call ptx/endis, PTXCONF_RSYSLOG_IMKMSG)-kmsg \
--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-imjournal \
+ --$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-libsystemd \
--$(call ptx/endis, PTXCONF_RSYSLOG_INET)-inet \
--disable-jemalloc \
--disable-unlimited-select \
--disable-debug \
--disable-debug-symbols \
- --disable-rtinst \
--disable-debugless \
--disable-valgrind \
- --disable-memcheck \
--disable-diagtools \
--disable-usertools \
--disable-mysql \
--disable-pgsql \
--disable-libdbi \
--disable-snmp \
+ --disable-snmp-tests \
--disable-uuid \
--disable-elasticsearch \
+ --disable-clickhouse \
+ --disable-omhttp \
--disable-elasticsearch-tests \
+ --disable-clickhouse-tests \
+ --disable-openssl \
--disable-gnutls \
+ --disable-gnutls-tests \
--disable-libgcrypt \
--enable-rsyslogrt \
--enable-rsyslogd \
@@ -69,6 +79,7 @@ RSYSLOG_CONF_OPT := \
--disable-mysql-tests \
--disable-pgsql-tests \
--disable-mail \
+ --enable-fmhttp \
--$(call ptx/endis, PTXCONF_RSYSLOG_IMDIAG)-imdiag \
--disable-mmnormalize \
--$(call ptx/endis, PTXCONF_RSYSLOG_MMJSONPARSE)-mmjsonparse \
@@ -80,27 +91,41 @@ RSYSLOG_CONF_OPT := \
--disable-mmcount \
--disable-mmsequence \
--disable-mmdblookup \
+ --disable-mmdarwin \
--disable-mmfields \
--disable-mmpstrucdata \
--disable-mmrfc5424addhmac \
+ --disable-omfile-hardened \
--disable-relp \
- --disable-guardtime \
- --disable-gt-ksi \
+ --disable-ksi-ls12 \
--disable-liblogging-stdlog \
--disable-rfc3195 \
--disable-testbench \
+ --disable-libfaketime \
+ --disable-default-tests \
+ --disable-helgrind \
+ --disable-imbatchreport \
+ --disable-pmdb2diag \
--$(call ptx/endis, PTXCONF_RSYSLOG_IMFILE)-imfile \
+ --disable-imfile-tests \
+ --disable-imdocker \
+ --disable-imdocker-tests \
+ --disable-imtuxedoulog \
+ --disable-improg \
--disable-imsolaris \
--$(call ptx/endis, PTXCONF_RSYSLOG_IMPTCP)-imptcp \
--$(call ptx/endis, PTXCONF_RSYSLOG_IMPSTATS)-impstats \
+ --disable-impcap \
--$(call ptx/endis, PTXCONF_RSYSLOG_OMPROG)-omprog \
--$(call ptx/endis, PTXCONF_RSYSLOG_OMUDPSPOOF)-omudpspoof \
--$(call ptx/endis, PTXCONF_RSYSLOG_OMSTDOUT)-omstdout \
--$(call ptx/endis, PTXCONF_RSYSLOG_SYSTEMD)-omjournal \
+ --disable-journal-tests \
--$(call ptx/endis, PTXCONF_RSYSLOG_PMLASTMSG)-pmlastmsg \
--disable-pmcisconames \
--$(call ptx/endis, PTXCONF_RSYSLOG_PMCISCOIOS)-pmciscoios \
--disable-pmnull \
+ --disable-pmnormalize \
--disable-pmaixforwardedfrom \
--disable-pmsnare \
--disable-pmpanngfw \
@@ -109,19 +134,23 @@ RSYSLOG_CONF_OPT := \
--disable-mmsnmptrapd \
--disable-omhdfs \
--disable-omkafka \
+ --disable-imkafka \
--disable-kafka-tests \
+ --disable-kafka-static \
--disable-ommongodb \
- --disable-imzmq3 \
--disable-imczmq \
- --disable-omzmq3 \
--disable-omczmq \
--disable-omrabbitmq \
--disable-omhiredis \
--disable-omhttpfs \
--disable-omamqp1 \
--disable-omtcl \
+ --disable-mmkubernetes \
+ --disable-mmtaghostname \
--disable-generate-man-pages \
- --disable-distcheck-workaround
+ --disable-distcheck-workaround \
+ --without-valgrind-testbench \
+ --without-tcl
ifdef PTXCONF_RSYSLOG_SYSTEMD_UNIT
RSYSLOG_CONF_OPT += --with-systemdsystemunitdir=/usr/lib/systemd/system
@@ -144,7 +173,6 @@ RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET) += lmnet
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET) += lmnetstrms
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET) += lmnsd_ptcp
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_REGEXP) += lmregexp
-RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET) += lmstrmsrv
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET) += lmtcpclt
RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_INET) += lmtcpsrv
RSYSLOG_PLUGINS-y += lmzlibw
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
