* [ptxdist] [PATCH 1/2] rsyslog: version bump 8.26.0 -> 8.2012.0
@ 2021-01-28 12:41 Bruno Thomsen
2021-01-28 12:41 ` [ptxdist] [PATCH 2/2] Revert "rsyslog: move to staging" Bruno Thomsen
2021-02-03 7:11 ` [ptxdist] [APPLIED] rsyslog: version bump 8.26.0 -> 8.2012.0 Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Bruno Thomsen @ 2021-01-28 12:41 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen, bth
New configure options in 8.2012.0 has been disabled,
except 2 new options:
- atomic-operations is always enabled.
- libsystemd support is {en,dis}abled with RSYSLOG_SYSTEMD.
Removed options are no longer available in configure.
lmstrmsrv does not exist any longer.
According to changelog the gcc 10 compile issues was
fixed in 8.2010.0 and included in this version.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
rules/rsyslog.in | 4 ++--
rules/rsyslog.make | 46 +++++++++++++++++++++++++++++++++++++---------
2 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/rules/rsyslog.in b/rules/rsyslog.in
index b0d4f36d2..0ba0a9bfa 100644
--- a/rules/rsyslog.in
+++ b/rules/rsyslog.in
@@ -35,13 +35,13 @@ config RSYSLOG_SYSTEMD_UNIT
config RSYSLOG_REGEXP
bool
- # 8.26.0 fails to build without regex support
+ # 8.2012.0 fails to build without regex support
default y
prompt "regular expression support" if BROKEN
config RSYSLOG_INET
bool
- # 8.26.0 fails to run without inet support
+ # 8.2012.0 fails to run without inet support
default y
prompt "networking support" if BROKEN
diff --git a/rules/rsyslog.make b/rules/rsyslog.make
index 28c7a8901..46fe7046a 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.2012.0
+RSYSLOG_MD5 := 2a64947e3d157c0198609aabd37be42f
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) \
+ --disable-aix64bits \
+ --enable-atomic-operations \
$(GLOBAL_LARGE_FILE_OPTION) \
--$(call ptx/endis, PTXCONF_RSYSLOG_REGEXP)-regexp \
+ --disable-fmhash \
+ --disable-fmhash-xxhash \
--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 \
+ --disable-fmhttp \
--$(call ptx/endis, PTXCONF_RSYSLOG_IMDIAG)-imdiag \
--disable-mmnormalize \
--$(call ptx/endis, PTXCONF_RSYSLOG_MMJSONPARSE)-mmjsonparse \
@@ -80,27 +91,42 @@ 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-imhttp \
--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,18 +135,21 @@ 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 \
+ --without-tcl \
--disable-distcheck-workaround
ifdef PTXCONF_RSYSLOG_SYSTEMD_UNIT
@@ -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.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH 2/2] Revert "rsyslog: move to staging"
2021-01-28 12:41 [ptxdist] [PATCH 1/2] rsyslog: version bump 8.26.0 -> 8.2012.0 Bruno Thomsen
@ 2021-01-28 12:41 ` Bruno Thomsen
2021-02-03 7:11 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-02-03 7:11 ` [ptxdist] [APPLIED] rsyslog: version bump 8.26.0 -> 8.2012.0 Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Bruno Thomsen @ 2021-01-28 12:41 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen, bth
Package has been updated, but only tested with gcc 9.
This reverts commit bb2d5d7d127c0763f8ad98c0c7b6cbe815b0bf81.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
rules/rsyslog.in | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/rules/rsyslog.in b/rules/rsyslog.in
index 0ba0a9bfa..883451926 100644
--- a/rules/rsyslog.in
+++ b/rules/rsyslog.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=networking
+## SECTION=networking
menuconfig RSYSLOG
tristate
@@ -18,9 +16,6 @@ menuconfig RSYSLOG
rsyslog is a reliable system and kernel logging daemon with
modular design and high speed message processing.
- STAGING: remove in PTXdist 2022.02.0
- Old version that fails to build with gcc 10. Need updating to new version.
-
if RSYSLOG
config RSYSLOG_SYSTEMD
--
2.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] rsyslog: version bump 8.26.0 -> 8.2012.0
2021-01-28 12:41 [ptxdist] [PATCH 1/2] rsyslog: version bump 8.26.0 -> 8.2012.0 Bruno Thomsen
2021-01-28 12:41 ` [ptxdist] [PATCH 2/2] Revert "rsyslog: move to staging" Bruno Thomsen
@ 2021-02-03 7:11 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2021-02-03 7:11 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen
Thanks, applied as 1568291d5fb31071522d1c8d2846718b41a046b6.
Michael
[sent from post-receive hook]
On Wed, 03 Feb 2021 08:11:33 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> New configure options in 8.2012.0 has been disabled,
> except 2 new options:
> - atomic-operations is always enabled.
> - libsystemd support is {en,dis}abled with RSYSLOG_SYSTEMD.
>
> Removed options are no longer available in configure.
>
> lmstrmsrv does not exist any longer.
>
> According to changelog the gcc 10 compile issues was
> fixed in 8.2010.0 and included in this version.
>
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20210128124111.5290-1-bruno.thomsen@gmail.com>
> [mol: add local systemd service. It was removed upstream]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/projectroot/usr/lib/systemd/system/rsyslog.service b/projectroot/usr/lib/systemd/system/rsyslog.service
> new file mode 100644
> index 000000000000..4e378fdafa8d
> --- /dev/null
> +++ b/projectroot/usr/lib/systemd/system/rsyslog.service
> @@ -0,0 +1,14 @@
> +[Unit]
> +Description=System Logging Service
> +Requires=syslog.socket
> +Documentation=https://www.rsyslog.com/doc/
> +
> +[Service]
> +Type=notify
> +ExecStart=/usr/sbin/rsyslogd -n -iNONE
> +StandardOutput=null
> +Restart=on-failure
> +
> +[Install]
> +WantedBy=multi-user.target
> +Alias=syslog.service
> diff --git a/rules/rsyslog.in b/rules/rsyslog.in
> index b0d4f36d2147..0ba0a9bfa03c 100644
> --- a/rules/rsyslog.in
> +++ b/rules/rsyslog.in
> @@ -35,13 +35,13 @@ config RSYSLOG_SYSTEMD_UNIT
>
> config RSYSLOG_REGEXP
> bool
> - # 8.26.0 fails to build without regex support
> + # 8.2012.0 fails to build without regex support
> default y
> prompt "regular expression support" if BROKEN
>
> config RSYSLOG_INET
> bool
> - # 8.26.0 fails to run without inet support
> + # 8.2012.0 fails to run without inet support
> default y
> prompt "networking support" if BROKEN
>
> diff --git a/rules/rsyslog.make b/rules/rsyslog.make
> index 28c7a8901dbb..46fe7046a3ce 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.2012.0
> +RSYSLOG_MD5 := 2a64947e3d157c0198609aabd37be42f
> 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) \
> + --disable-aix64bits \
> + --enable-atomic-operations \
> $(GLOBAL_LARGE_FILE_OPTION) \
> --$(call ptx/endis, PTXCONF_RSYSLOG_REGEXP)-regexp \
> + --disable-fmhash \
> + --disable-fmhash-xxhash \
> --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 \
> + --disable-fmhttp \
> --$(call ptx/endis, PTXCONF_RSYSLOG_IMDIAG)-imdiag \
> --disable-mmnormalize \
> --$(call ptx/endis, PTXCONF_RSYSLOG_MMJSONPARSE)-mmjsonparse \
> @@ -80,27 +91,42 @@ 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-imhttp \
> --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,18 +135,21 @@ 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 \
> + --without-tcl \
> --disable-distcheck-workaround
>
> ifdef PTXCONF_RSYSLOG_SYSTEMD_UNIT
> @@ -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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] Revert "rsyslog: move to staging"
2021-01-28 12:41 ` [ptxdist] [PATCH 2/2] Revert "rsyslog: move to staging" Bruno Thomsen
@ 2021-02-03 7:11 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2021-02-03 7:11 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen
Thanks, applied as 9b5dd339fb4563a7baf47f5310bad594ec862346.
Michael
[sent from post-receive hook]
On Wed, 03 Feb 2021 08:11:34 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Package has been updated, but only tested with gcc 9.
>
> This reverts commit bb2d5d7d127c0763f8ad98c0c7b6cbe815b0bf81.
>
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20210128124111.5290-2-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/rsyslog.in b/rules/rsyslog.in
> index 0ba0a9bfa03c..88345192667c 100644
> --- a/rules/rsyslog.in
> +++ b/rules/rsyslog.in
> @@ -1,6 +1,4 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=networking
> +## SECTION=networking
>
> menuconfig RSYSLOG
> tristate
> @@ -18,9 +16,6 @@ menuconfig RSYSLOG
> rsyslog is a reliable system and kernel logging daemon with
> modular design and high speed message processing.
>
> - STAGING: remove in PTXdist 2022.02.0
> - Old version that fails to build with gcc 10. Need updating to new version.
> -
> if RSYSLOG
>
> config RSYSLOG_SYSTEMD
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-03 7:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-28 12:41 [ptxdist] [PATCH 1/2] rsyslog: version bump 8.26.0 -> 8.2012.0 Bruno Thomsen
2021-01-28 12:41 ` [ptxdist] [PATCH 2/2] Revert "rsyslog: move to staging" Bruno Thomsen
2021-02-03 7:11 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-02-03 7:11 ` [ptxdist] [APPLIED] rsyslog: version bump 8.26.0 -> 8.2012.0 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox