From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 16 Feb 2023 10:19:37 +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 ) id 1pSaQV-009EPo-8K for lore@lore.pengutronix.de; Thu, 16 Feb 2023 10:19:37 +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 ) id 1pSaQT-0008DI-3m; Thu, 16 Feb 2023 10:19:37 +0100 Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.219]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pSaQG-0008CV-2e for ptxdist@pengutronix.de; Thu, 16 Feb 2023 10:19:24 +0100 ARC-Seal: i=1; a=rsa-sha256; t=1676539163; cv=none; d=strato.com; s=strato-dkim-0002; b=UgAhSjO+1skVphmy2EpBEgSPCWnFxJAwK5h6vJ8847dgzoc0919v9w74+BIO20o1se i2+jQ/SguxbpoPhWD8SDyf5j0jRy7gqZruqjI7mv+Z1+QnAI4t66naHb+Gxb36zFNoP8 4+JTwkZUihjtz2zYVJW89TLVX4Cf2C4oc6W9JadvACRQag8Q0ujQBvDJM/yVDWdRK0Kx Ys1lWBqEuHBSmbcqbcFDZiAVK4KAMWWl83+hkjwMJS6UKQsEEgCae4mx1jvyWojkl1C5 L2qfF7bZXvi5QhwS2tcWJ+iAotmG6+dsHbNUTt+M/PgJMXxCycQ1/mwPbYYo5pfaE+C6 MvbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1676539163; s=strato-dkim-0002; d=strato.com; h=Message-Id:Date:Subject:Cc:To:From:Cc:Date:From:Subject:Sender; bh=R8I12StPzwvwqAYRKaH1wehA/IvEQ5UhEVA+kdiwcqM=; b=X9iLzq4rcpaoB8Br2QmqLvAtgGjFAxyxh9qQICDQhvHIjqRL511BZs4x+NGLFOTVrm Vo5bOyKIjl19klqrM2t1p4aTzb/9qhn7K9Wj/lZCr2degjAfiwPJVR2X/aXxAvpvlpfI Tzq6xG4kdhQj+9hdGO2F8u6ZEwcxyrtkZuoKg7mFk+yfipXFCqiHROEIZV8bhJDH03Ny wuX3y7jCnRKgzsWkMfaZKbFemI3hECB1bGgf/Ge6wEFc+7CHjl/wq7xQ8meH3rDAl8ap 0UJbHR/sX1TKNLVARzczO2FPc0F5cS5vjAh/VtblCONj2lbmO7XynLFhwmXkovbMRnxH eeVg== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1676539163; s=strato-dkim-0002; d=4wiebe.de; h=Message-Id:Date:Subject:Cc:To:From:Cc:Date:From:Subject:Sender; bh=R8I12StPzwvwqAYRKaH1wehA/IvEQ5UhEVA+kdiwcqM=; b=Kwo2jzwnAHR5Km+iFGEarGQGK1qVuzf40z1iXI5CmZe5FgyrOQ3n4wOzcnCUsm4I7T u0zKtZcDX5Rt+esmXLKYZKGyo06fua4SxRthFGHVPzg7SpGWOsHtFKir3gr8kJKcbG+L AOzy6H6SR/pFPn5q+kP9klpoQAPMVZ7m7sZ3xBmeB8aMKbbiQWv+3TzBcXvW+/LG9jU7 xH8l21yVjOYnaic7MucVmpMw1mphvVMk2yGVDEzm90vQWo958H17k22sGSaf3p/lSfus kQzzwBOdq9hw444sKDy1qxKR703eEGd8HLrz/lVE0ujAgu8Gt50Z2m08I0fJ0M6+XsQW kaaw== X-RZG-AUTH: ":Km0JfEyhft8wzIIhFLJpRLyPODuSc5X4exbBROmid4/wfXDMnRC7+d+KSEHszNCVD9EpD4Hn" Received: from home by smtp.strato.de (RZmta 49.3.0 DYNA|AUTH) with ESMTPSA id y8413az1G9JNWJd (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Thu, 16 Feb 2023 10:19:23 +0100 (CET) Received: from tuxedo.. (localhost.localdomain [127.0.0.1]) by home (Postfix) with ESMTP id 297881A0352; Thu, 16 Feb 2023 10:19:23 +0100 (CET) From: Artur Wiebe To: ptxdist@pengutronix.de Date: Thu, 16 Feb 2023 10:19:21 +0100 Message-Id: <20230216091921.1816952-1-artur@4wiebe.de> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="us-ascii" X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.7 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Artur Wiebe Sender: "ptxdist" 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 Signed-off-by: Artur Wiebe --- rules/systemd.in | 5 +++++ rules/systemd.make | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rules/systemd.in b/rules/systemd.in index 17997574b..e18bdb24f 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 7e085f49d..298b05702 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 \ -- 2.39.1