mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bruno Thomsen <bruno.thomsen@gmail.com>
Subject: Re: [ptxdist] [APPLIED] rsyslog: version bump 8.2012.0 -> 8.2406.0
Date: Mon,  5 Aug 2024 08:50:07 +0200	[thread overview]
Message-ID: <20240805065007.891621-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20240726123837.3776-1-bruno.thomsen@gmail.com>

Thanks, applied as 1e2a022381440a1e5aa7d79eb1d866ae059314e9.

Michael

[sent from post-receive hook]

On Mon, 05 Aug 2024 08:50:06 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Disable new configuration parameters.
> Remove systemdsystemunitdir as it's no longer supported.
> 
> https://github.com/rsyslog/rsyslog/blob/v8-stable/ChangeLog
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20240726123837.3776-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/rsyslog.make b/rules/rsyslog.make
> index 25c09f549980..22bb871721d8 100644
> --- a/rules/rsyslog.make
> +++ b/rules/rsyslog.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RSYSLOG) += rsyslog
>  #
>  # Paths and names
>  #
> -RSYSLOG_VERSION	:= 8.2012.0
> -RSYSLOG_MD5	:= 2a64947e3d157c0198609aabd37be42f
> +RSYSLOG_VERSION	:= 8.2406.0
> +RSYSLOG_MD5	:= 9bb2673cf15181b16e3f7c7bb5ad23fd
>  RSYSLOG		:= rsyslog-$(RSYSLOG_VERSION)
>  RSYSLOG_SUFFIX	:= tar.gz
>  RSYSLOG_URL	:= https://www.rsyslog.com/files/download/rsyslog/$(RSYSLOG).$(RSYSLOG_SUFFIX)
> @@ -42,7 +42,10 @@ RSYSLOG_CONF_OPT	:= \
>  	$(GLOBAL_LARGE_FILE_OPTION) \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_REGEXP)-regexp \
>  	--disable-fmhash \
> +	--disable-libcap-ng \
>  	--disable-fmhash-xxhash \
> +	--disable-ffaup \
> +	--disable-fmunflatten \
>  	--disable-gssapi-krb5 \
>  	--disable-root-tests \
>  	--$(call ptx/endis, PTXCONF_RSYSLOG_IMKLOG)-klog \
> @@ -73,6 +76,7 @@ RSYSLOG_CONF_OPT	:= \
>  	--disable-gnutls \
>  	--disable-gnutls-tests \
>  	--disable-libgcrypt \
> +	--disable-libzstd \
>  	--enable-rsyslogrt \
>  	--enable-rsyslogd \
>  	--disable-extended-tests \
> @@ -136,13 +140,20 @@ RSYSLOG_CONF_OPT	:= \
>  	--disable-omhdfs \
>  	--disable-omkafka \
>  	--disable-imkafka \
> +	--disable-omazureeventhubs-tests \
>  	--disable-kafka-tests \
>  	--disable-kafka-static \
> +	--disable-omazureeventhubs \
> +	--disable-qpidproton_static \
>  	--disable-ommongodb \
> +	--disable-imdtls \
> +	--disable-omdtls \
>  	--disable-imczmq \
>  	--disable-omczmq \
>  	--disable-omrabbitmq \
> +	--disable-imhiredis \
>  	--disable-omhiredis \
> +	--disable-redis-tests \
>  	--disable-omhttpfs \
>  	--disable-omamqp1 \
>  	--disable-omtcl \
> @@ -152,12 +163,6 @@ RSYSLOG_CONF_OPT	:= \
>  	--without-tcl \
>  	--disable-distcheck-workaround
>  
> -ifdef PTXCONF_RSYSLOG_SYSTEMD_UNIT
> -RSYSLOG_CONF_OPT += --with-systemdsystemunitdir=/usr/lib/systemd/system
> -else
> -RSYSLOG_CONF_OPT += --without-systemdsystemunitdir
> -endif
> -
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMDIAG)	+= imdiag
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMFILE)	+= imfile
>  RSYSLOG_PLUGINS-$(PTXCONF_RSYSLOG_IMKLOG)	+= imklog



      reply	other threads:[~2024-08-05  6:59 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-26 12:38 [ptxdist] [PATCH] " Bruno Thomsen
2024-08-05  6:50 ` Michael Olbrich [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240805065007.891621-1-m.olbrich@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=bruno.thomsen@gmail.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox