1
0

Accepting request 505810 from Apache:Modules

Fix build in TW (forwarded request 505247 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/505810
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2-mod_security2?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger 2017-06-26 13:52:32 +00:00 committed by Git OBS Bridge
commit 805deb3424
2 changed files with 19 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 21 10:16:28 UTC 2017 - dimstar@opensuse.org
- Update modsecurity-fixes.patch: additionally include netdb.h in
order to have gethostbyname defined.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 23 15:14:11 UTC 2017 - kstreitova@suse.com Thu Mar 23 15:14:11 UTC 2017 - kstreitova@suse.com

View File

@ -1,3 +1,5 @@
Index: modsecurity-2.9.0/apache2/mod_security2.c
===================================================================
--- modsecurity-2.9.0.orig/apache2/mod_security2.c --- modsecurity-2.9.0.orig/apache2/mod_security2.c
+++ modsecurity-2.9.0/apache2/mod_security2.c +++ modsecurity-2.9.0/apache2/mod_security2.c
@@ -457,17 +457,13 @@ static void store_tx_context(modsec_rec @@ -457,17 +457,13 @@ static void store_tx_context(modsec_rec
@ -19,6 +21,8 @@
msr->modsecurity = modsecurity; msr->modsecurity = modsecurity;
msr->r = r; msr->r = r;
Index: modsecurity-2.9.0/apache2/msc_reqbody.c
===================================================================
--- modsecurity-2.9.0.orig/apache2/msc_reqbody.c --- modsecurity-2.9.0.orig/apache2/msc_reqbody.c
+++ modsecurity-2.9.0/apache2/msc_reqbody.c +++ modsecurity-2.9.0/apache2/msc_reqbody.c
@@ -88,7 +88,7 @@ apr_status_t modsecurity_request_body_st @@ -88,7 +88,7 @@ apr_status_t modsecurity_request_body_st
@ -30,16 +34,21 @@
/* Initialise request body processors, if any. */ /* Initialise request body processors, if any. */
Index: modsecurity-2.9.0/apache2/msc_status_engine.c
===================================================================
--- modsecurity-2.9.0.orig/apache2/msc_status_engine.c --- modsecurity-2.9.0.orig/apache2/msc_status_engine.c
+++ modsecurity-2.9.0/apache2/msc_status_engine.c +++ modsecurity-2.9.0/apache2/msc_status_engine.c
@@ -37,6 +37,7 @@ @@ -37,6 +37,8 @@
#if (defined(__linux__) || defined(__gnu_linux__)) #if (defined(__linux__) || defined(__gnu_linux__))
#include <linux/if.h> #include <linux/if.h>
#include <linux/sockios.h> #include <linux/sockios.h>
+#include <sys/ioctl.h> +#include <sys/ioctl.h>
+#include <netdb.h>
#endif #endif
#ifdef HAVE_SYS_UTSNAME_H #ifdef HAVE_SYS_UTSNAME_H
#include <sys/utsname.h> #include <sys/utsname.h>
Index: modsecurity-2.9.0/apache2/msc_remote_rules.c
===================================================================
--- modsecurity-2.9.0.orig/apache2/msc_remote_rules.c --- modsecurity-2.9.0.orig/apache2/msc_remote_rules.c
+++ modsecurity-2.9.0/apache2/msc_remote_rules.c +++ modsecurity-2.9.0/apache2/msc_remote_rules.c
@@ -792,6 +792,7 @@ next: @@ -792,6 +792,7 @@ next:
@ -50,6 +59,8 @@
} }
Index: modsecurity-2.9.0/apache2/msc_util.c
===================================================================
--- modsecurity-2.9.0.orig/apache2/msc_util.c --- modsecurity-2.9.0.orig/apache2/msc_util.c
+++ modsecurity-2.9.0/apache2/msc_util.c +++ modsecurity-2.9.0/apache2/msc_util.c
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@