.gitignore

@@ -22,4 +22,3 @@ 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

mod_security-2.9.7-send_error_bucket.patch

@@ -1,30 +0,0 @@
-From b2fa083522c70368c7ab911696dcb87dde5dc688 Mon Sep 17 00:00:00 2001
-From: Tomas Korbar <tkorbar@redhat.com>
-Date: Thu, 22 Dec 2022 14:49:34 +0100
-Subject: [PATCH] Clear original response code in send_error_bucket function
-
-If this is left intact, then apache thinks that this code
-was generated during processing of ErrorDocument and does not
-handle it properly
-
-Fix #2849
----
- apache2/apache2_util.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/apache2/apache2_util.c b/apache2/apache2_util.c
-index cdae2b580..520a30f2f 100644
---- a/apache2/apache2_util.c
-+++ b/apache2/apache2_util.c
-@@ -31,6 +31,11 @@ apr_status_t send_error_bucket(modsec_rec *msr, ap_filter_t *f, int status) {
-     /* Set the status line explicitly for the error document */
-     f->r->status_line = ap_get_status_line(status);
- 
-+    /* Clear previously set response code to make clear that this is
-+     * not a recursive error
-+     */
-+    f->r->status = 200;
-+
-     brigade = apr_brigade_create(f->r->pool, f->r->connection->bucket_alloc);
-     if (brigade == NULL) return APR_EGENERAL;
- 

mod_security.spec

@@ -9,9 +9,9 @@
 
 Summary: Security module for the Apache HTTP Server
 Name: mod_security
-Version: 2.9.7
+Version: 2.9.6
-Release: 6%{?dist}
+Release: 1%{?dist}
-License: Apache-2.0
+License: ASL 2.0
 URL: http://www.modsecurity.org/
 Source: https://github.com/SpiderLabs/ModSecurity/releases/download/v%{version}/modsecurity-%{version}.tar.gz
 Source1: mod_security.conf
@@ -20,7 +20,6 @@ Source3: modsecurity_localrules.conf
 Patch0: modsecurity-2.9.3-lua-54.patch
 Patch1: modsecurity-2.9.3-apulibs.patch
 Patch2: mod_security-2.9.3-remote-rules-timeout.patch
-Patch3: mod_security-2.9.7-send_error_bucket.patch
 
 Requires: httpd httpd-mmn = %{_httpd_mmn}
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -31,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)
 
@@ -71,7 +70,6 @@ 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
@@ -145,28 +143,6 @@ install -m0644 mlogc/mlogc-default.conf %{buildroot}%{_sysconfdir}/mlogc.conf
 %endif
 
 %changelog
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.7-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Jan 02 2024 Tomas Korbar <tkorbar@redhat.com> - 2.9.7-4
-- Clear original response code in send_error_bucket function
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jun 02 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.9.7-2
-- SPDX migration
-
-* 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
-
 * Wed Sep 14 2022 Luboš Uhliarik <luhliari@redhat.com> - 2.9.6-1
 - new version 2.9.6
 

sources

@@ -1 +1 @@
-SHA512 (modsecurity-2.9.7.tar.gz) = a333d142f0dedf332a3cccca8267ccf9193cd4ad5a026b3cdbe0713dd1f3edde33739eae8baced2c63409cc0b220001e0a226ea032874a97c08e4065eb1fbdd5
+SHA512 (modsecurity-2.9.6.tar.gz) = 54b3316950094b3951fcfdd82bbacd34dfa8f5500b9a772d3296f411711bad0dcad51068b25cb2c196fdc4b2e1095d54701370d25180c0c68cf0913bd7d4ea03