From 53b24469e2e7b64c9dcc23f7ecc71588493465d69c2a2babac850a5927092662 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Tue, 22 Nov 2022 13:12:10 +0000 Subject: [PATCH] Accepting request 1010887 from home:coolo:branches:openSUSE:Factory - Switch from unmaintained pcre 8.45 to pcre2 10 OBS-URL: https://build.opensuse.org/request/show/1010887 OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=272 --- haproxy.changes | 5 +++++ haproxy.spec | 14 +++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/haproxy.changes b/haproxy.changes index 26b578f..205413e 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 14 11:20:34 UTC 2022 - Stephan Kulow + +- Switch from unmaintained pcre 8.45 to pcre2 10 + ------------------------------------------------------------------- Mon Sep 26 13:19:38 UTC 2022 - mrueckert@suse.de diff --git a/haproxy.spec b/haproxy.spec index ef96ff6..be5ccca 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -35,11 +35,7 @@ %bcond_with systemd %endif -%if 0%{?suse_version} > 1140 -%bcond_without pcre_jit -%else -%bcond_with pcre_jit -%endif +%bcond_with pcre2_jit %bcond_without apparmor %if 0%{?suse_version} > 1320 @@ -76,7 +72,7 @@ BuildRequires: libgcrypt-devel %if %{with lua} BuildRequires: lua-devel >= 5.3 %endif -BuildRequires: pcre-devel +BuildRequires: pcre2-devel BuildRequires: zlib-devel BuildRequires: openssl-devel BuildRequires: pkg-config @@ -143,9 +139,9 @@ the most work done from every CPU cycle. make %{?_smp_mflags} \ TARGET=linux-glibc \ CPU="%{_target_cpu}" \ - USE_PCRE=1 \ - %if %{with pcre_jit} - USE_PCRE_JIT=1 \ + USE_PCRE2=1 \ + %if %{with pcre2_jit} + USE_PCRE2_JIT=1 \ %endif %ifarch %ix86 USE_REGPARM=1 \