From 63a793a3b148f6898d0bdbc590f60819cec4b789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Uhliarik?= <luhliari@redhat.com>
Date: Fri, 14 Apr 2023 00:35:10 +0200
Subject: [PATCH] new version 2.9.7

use pcre2 instead of deprecated pcre (rhbz #2128330)
---
 .gitignore        |  1 +
 mod_security.spec | 11 ++++++++---
 sources           |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 615dbd0..b53607c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ modsecurity-apache_2.5.12.tar.gz
 /modsecurity-2.9.4.tar.gz
 /modsecurity-2.9.5.tar.gz
 /modsecurity-2.9.6.tar.gz
+/modsecurity-2.9.7.tar.gz
diff --git a/mod_security.spec b/mod_security.spec
index bd4c479..53517d6 100644
--- a/mod_security.spec
+++ b/mod_security.spec
@@ -9,8 +9,8 @@
 
 Summary: Security module for the Apache HTTP Server
 Name: mod_security
-Version: 2.9.6
-Release: 2%{?dist}
+Version: 2.9.7
+Release: 1%{?dist}
 License: ASL 2.0
 URL: http://www.modsecurity.org/
 Source: https://github.com/SpiderLabs/ModSecurity/releases/download/v%{version}/modsecurity-%{version}.tar.gz
@@ -30,8 +30,8 @@ Requires(pre): httpd-filesystem
 BuildRequires: gcc, make, autoconf, automake, libtool
 BuildRequires: httpd-devel
 BuildRequires: perl-generators
+BuildRequires: pcre2-devel
 BuildRequires: pkgconfig(libcurl)
-BuildRequires: pkgconfig(libpcre)
 BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(lua)
 
@@ -70,6 +70,7 @@ This package contains the ModSecurity Audit Log Collector.
            --enable-pcre-match-limit-recursion=1000000 \
            --with-apxs=%{_httpd_apxs} \
            --with-yajl \
+           --with-pcre2 \
            --disable-static
 
 # remove rpath
@@ -143,6 +144,10 @@ install -m0644 mlogc/mlogc-default.conf %{buildroot}%{_sysconfdir}/mlogc.conf
 %endif
 
 %changelog
+* Thu Apr 13 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.9.7-1
+- new version 2.9.7
+- use pcre2 instead of deprecated pcre (rhbz #2128330)
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index 5cc7b9a..9eee122 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (modsecurity-2.9.6.tar.gz) = 54b3316950094b3951fcfdd82bbacd34dfa8f5500b9a772d3296f411711bad0dcad51068b25cb2c196fdc4b2e1095d54701370d25180c0c68cf0913bd7d4ea03
+SHA512 (modsecurity-2.9.7.tar.gz) = a333d142f0dedf332a3cccca8267ccf9193cd4ad5a026b3cdbe0713dd1f3edde33739eae8baced2c63409cc0b220001e0a226ea032874a97c08e4065eb1fbdd5