5 Jul
2018
5 Jul
'18
4 p.m.
Module: check_mk
Branch: master
Commit: ca7f44f718ecbf245824774476f17aa14746c5a0
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca7f44f718ecbf…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jul 5 15:52:01 2018 +0200
Another fix for compiling mod_wsgi with SLES12SP0
Change-Id: I4868d8daa141fc7fe753525413af52d574963e38
---
omd/packages/mod_wsgi/Makefile | 5 +++
.../mod_wsgi/patches/0001-wsgi_fixVersionCheck.dif | 38 ++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/omd/packages/mod_wsgi/Makefile b/omd/packages/mod_wsgi/Makefile
index c72dd7d..4cf27cb 100644
--- a/omd/packages/mod_wsgi/Makefile
+++ b/omd/packages/mod_wsgi/Makefile
@@ -29,6 +29,11 @@ endif
build: check-python
tar xzf $(DIR).tar.gz
+ set -e ; for p in patches/*.dif ; do \
+ echo "applying $$p..." ; \
+ patch -p1 -b -d $(DIR) < $$p ; \
+ done
+
set -e ; \
export PYTHONPATH="$$PYTHONPATH:$(PACKAGE_PYTHON_PYTHONPATH)" ; \
export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS)" ; \
diff --git a/omd/packages/mod_wsgi/patches/0001-wsgi_fixVersionCheck.dif
b/omd/packages/mod_wsgi/patches/0001-wsgi_fixVersionCheck.dif
new file mode 100644
index 0000000..16fa7c6
--- /dev/null
+++ b/omd/packages/mod_wsgi/patches/0001-wsgi_fixVersionCheck.dif
@@ -0,0 +1,38 @@
+From c440dfa6000b8c608147cce98d163ead19e63643 Mon Sep 17 00:00:00 2001
+From: Robert Schweikert <rjschwei(a)suse.com>
+Date: Fri, 30 Jan 2015 12:40:40 -0500
+Subject: [PATCH] - Fix the version check for the presence of the trailers +
+ Currently the minor version of the version check is set such that for
+ version 2.4.10 (minor 37) the entries trailers_in and trailers_out are
+ expected in the request_rec struct. However these members of the struct
+ do not show up until 2.4.12 (minor 41). + This fixes a compile error when
+ building against 2.4.10
+
+---
+ src/server/mod_wsgi.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c
+index 30ddbe5..4813af8 100644
+--- a/src/server/mod_wsgi.c
++++ b/src/server/mod_wsgi.c
+@@ -11440,7 +11440,7 @@ static int wsgi_hook_daemon_handler(conn_rec *c)
+
+ int queue_timeout_occurred = 0;
+
+-#if ! (AP_MODULE_MAGIC_AT_LEAST(20120211, 37) || \
++#if ! (AP_MODULE_MAGIC_AT_LEAST(20120211, 41) || \
+ (AP_SERVER_MAJORVERSION_NUMBER == 2 && \
+ AP_SERVER_MINORVERSION_NUMBER <= 2 && \
+ AP_MODULE_MAGIC_AT_LEAST(20051115, 36)))
+@@ -11539,7 +11539,7 @@ static int wsgi_hook_daemon_handler(conn_rec *c)
+ r->proto_input_filters = c->input_filters;
+ r->input_filters = r->proto_input_filters;
+
+-#if AP_MODULE_MAGIC_AT_LEAST(20120211, 37) || \
++#if AP_MODULE_MAGIC_AT_LEAST(20120211, 41) || \
+ (AP_SERVER_MAJORVERSION_NUMBER == 2 && \
+ AP_SERVER_MINORVERSION_NUMBER <= 2 && \
+ AP_MODULE_MAGIC_AT_LEAST(20051115, 36))
+--
+1.8.4.5