From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Fri, 17 Feb 2023 16:36:39 +0100
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1pT2mt-00AE7Q-KK
	for lore@lore.pengutronix.de; Fri, 17 Feb 2023 16:36:39 +0100
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1pT2ms-0004fG-Ny; Fri, 17 Feb 2023 16:36:38 +0100
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1pT2mI-0002U0-UB; Fri, 17 Feb 2023 16:36:02 +0100
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1pT2mH-005cL0-00; Fri, 17 Feb 2023 16:36:02 +0100
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1pT2mH-005QLQ-AV; Fri, 17 Feb 2023 16:36:01 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Fri, 17 Feb 2023 16:36:01 +0100
Message-Id: <20230217153601.1291809-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20230216091921.1816952-1-artur@4wiebe.de>
References: <20230216091921.1816952-1-artur@4wiebe.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] systemd: regexp matching support using pcre2
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Artur Wiebe <artur@4wiebe.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as 09ac86f71cfccb32b57afe7fb8f1b040e4f67468.

Michael

[sent from post-receive hook]

On Fri, 17 Feb 2023 16:36:00 +0100, Artur Wiebe <artur@4wiebe.de> wrote:
> Signed-off-by: Artur Wiebe <artur@4wiebe.de>
> Message-Id: <20230216091921.1816952-1-artur@4wiebe.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/systemd.in b/rules/systemd.in
> index 17997574b62e..e18bdb24f3c1 100644
> --- a/rules/systemd.in
> +++ b/rules/systemd.in
> @@ -23,6 +23,7 @@ menuconfig SYSTEMD
>  	select XZ		if SYSTEMD_XZ
>  	select LZ4		if SYSTEMD_LZ4
>  	select ZSTD		if SYSTEMD_ZSTD
> +	select PCRE2		if SYSTEMD_PCRE2
>  	select LIBMICROHTTPD	if SYSTEMD_MICROHTTPD
>  	select LIBSECCOMP	if SYSTEMD_SECCOMP
>  	select IPTABLES		if SYSTEMD_IPMASQUERADE
> @@ -180,6 +181,10 @@ config SYSTEMD_ZSTD
>  	bool
>  	prompt "ZSTD compressed journal support"
>  
> +config SYSTEMD_PCRE2
> +	bool
> +	prompt "regexp matching support using pcre2"
> +
>  config SYSTEMD_JOURNAL_REMOTE
>  	bool
>  	select SYSTEMD_MICROHTTPD
> diff --git a/rules/systemd.make b/rules/systemd.make
> index 7e085f49de69..298b05702d4e 100644
> --- a/rules/systemd.make
> +++ b/rules/systemd.make
> @@ -151,7 +151,7 @@ SYSTEMD_CONF_OPT	:= \
>  	-Doss-fuzz=false \
>  	-Dp11kit=false \
>  	-Dpam=false \
> -	-Dpcre2=false \
> +	-Dpcre2=$(call ptx/truefalse,PTXCONF_SYSTEMD_PCRE2) \
>  	-Dpolkit=$(call ptx/truefalse,PTXCONF_SYSTEMD_POLKIT) \
>  	-Dportabled=false \
>  	-Dpstore=false \