rpm/apache2-mod_security2
SHA256
1
0
Fork 0
forked from pool/apache2-mod_security2
Code Pull Requests Activity

Accepting request 1173611 from Apache:Modules

Browse Source 
- added patches
  fix fix build with gcc14
  + apache2-mod_security2-gcc14.patch (forwarded request 1172451 from pgajdos)

OBS-URL: https://build.opensuse.org/request/show/1173611
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2-mod_security2?expand=0&rev=30
This commit is contained in:
Ana Guerrero 2024-05-13 15:58:23 +00:00 committed by Git OBS Bridge
commit 22a2f6eab5
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
apache2-mod_security2-gcc14.patch Normal file
View File

@ -0,0 +1,35 @@
Index: modsecurity-2.9.7/tests/msc_test.c
===================================================================
--- modsecurity-2.9.7.orig/tests/msc_test.c
+++ modsecurity-2.9.7/tests/msc_test.c
@@ -81,7 +81,7 @@ char DSOLOCAL *real_server_signature = N
int DSOLOCAL remote_rules_fail_action = REMOTE_RULES_ABORT_ON_FAIL;
char DSOLOCAL *remote_rules_fail_message = NULL;
module AP_MODULE_DECLARE_DATA security2_module = {
- NULL,
+ STANDARD20_MODULE_STUFF,
NULL,
NULL,
NULL,
Index: modsecurity-2.9.7/standalone/config.c
===================================================================
--- modsecurity-2.9.7.orig/standalone/config.c
+++ modsecurity-2.9.7/standalone/config.c
@@ -989,7 +989,7 @@ AP_DECLARE(const char *) process_fnmatch
const char *rootpath, *filepath = fname;
/* locate the start of the directories proper */
- status = apr_filepath_root(&rootpath, &filepath, APR_FILEPATH_TRUENAME | APR_FILEPATH_NATIVE, ptemp);
+ status = apr_filepath_root((const char **) &rootpath, (const char **) &filepath, APR_FILEPATH_TRUENAME | APR_FILEPATH_NATIVE, ptemp);
/* we allow APR_SUCCESS and APR_EINCOMPLETE */
if (APR_ERELATIVE == status) {
@@ -1104,7 +1104,7 @@ ProcessInclude:
incpath = w;
/* locate the start of the directories proper */
- status = apr_filepath_root(&rootpath, &incpath, APR_FILEPATH_TRUENAME | APR_FILEPATH_NATIVE, ptemp);
+ status = apr_filepath_root((const char**) &rootpath, (const char **) &incpath, APR_FILEPATH_TRUENAME | APR_FILEPATH_NATIVE, ptemp);
/* we allow APR_SUCCESS and APR_EINCOMPLETE */
if (APR_ERELATIVE == status) {

7
apache2-mod_security2.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 7 13:16:44 UTC 2024 - pgajdos@suse.com
- added patches
fix fix build with gcc14
+ apache2-mod_security2-gcc14.patch
-------------------------------------------------------------------
Tue Feb 20 11:02:36 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

5
apache2-mod_security2.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package apache2-mod_security2
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -36,6 +36,8 @@ Patch1: modsecurity-fixes.patch
Patch2: apache2-mod_security2_tests_conf.patch
# https://github.com/SpiderLabs/ModSecurity/issues/2514
Patch3: modsecurity-2.9.3-input_filtering_errors.patch
# fix build with gcc14
Patch4: apache2-mod_security2-gcc14.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel
BuildRequires: apache2-prefork
@ -68,6 +70,7 @@ mv -v SpiderLabs* rules
%patch -P 1 -p1
%patch -P 2 -p1
%patch -P 3 -p1
%patch4 -p1
%build
aclocal