Hello community, here is the log from the commit of package apache2-mod_wsgi for openSUSE:Factory checked in at 2015-02-03 11:40:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2-mod_wsgi (Old) and /work/SRC/openSUSE:Factory/.apache2-mod_wsgi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_wsgi" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2-mod_wsgi/apache2-mod_wsgi.changes 2014-11-12 00:22:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache2-mod_wsgi.new/apache2-mod_wsgi.changes 2015-02-03 11:40:24.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Jan 30 18:12:20 UTC 2015 - [email protected] + +- Fix build failure on SLE 12 (Apache 2.4.10) + + add wsgi_fixVersionCheck.patch + + build failed due to improper version check + +------------------------------------------------------------------- +Thu Jan 29 23:52:14 UTC 2015 - [email protected] + +- Update to version 4.4.6 + - Upstream release notes: + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.6.html + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.5.html + + http://modwsgi.readthedocs.org/en/latest/release-notes/version-4.4.4.html + ..... + - As of version 4.2.7 mod_wsgi is effected by + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758035 + +------------------------------------------------------------------- Old: ---- mod_wsgi-4.2.5.tar.gz New: ---- mod_wsgi-4.4.6.tar.gz wsgi_fixVersionCheck.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_wsgi.spec ++++++ --- /var/tmp/diff_new_pack.iJuPwA/_old 2015-02-03 11:40:25.000000000 +0100 +++ /var/tmp/diff_new_pack.iJuPwA/_new 2015-02-03 11:40:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_wsgi # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define modname mod_wsgi Name: apache2-mod_wsgi -Version: 4.2.5 +Version: 4.4.6 Release: 0 Summary: Python WSGI adapter module for Apache License: Apache-2.0 @@ -26,6 +26,8 @@ Url: https://github.com/GrahamDumpleton/mod_wsgi #Source: https://github.com/GrahamDumpleton/mod_wsgi/archive/%%{version}.tar.gz Source: %{modname}-%{version}.tar.gz +## Work around for inconsistent Apache source tree in SLE 12, see bnc#915479 +Patch0: wsgi_fixVersionCheck.patch BuildRequires: python-devel Provides: %{modname} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,6 +52,7 @@ %prep %setup -q -n %{modname}-%{version} +%patch0 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -83,7 +86,7 @@ %files %defattr(-,root,root) -%doc LICENCE README.rst docs/release-notes +%doc LICENSE README.rst docs/release-notes %dir %{apache_libexecdir} %{apache_libexecdir}/%{modname}.so ++++++ mod_wsgi-4.2.5.tar.gz -> mod_wsgi-4.4.6.tar.gz ++++++ ++++ 8197 lines of diff (skipped) ++++++ wsgi_fixVersionCheck.patch ++++++ >From c440dfa6000b8c608147cce98d163ead19e63643 Mon Sep 17 00:00:00 2001 From: Robert Schweikert <[email protected]> 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
