mod-wsgi: uprev to use git and latest release

Apache2 was just uprev'd to the latest release in meta-oe so we should
really matching this. Additionally the version we are replacing had
build issue with the latest gcc, so the uprev solves these as well.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 135 insertions, 11 deletions

diff --git a/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch b/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch
new file mode 100644
index 0000000..4683db0
--- /dev/null
+++ b/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch
@@ -0,0 +1,125 @@
+From a2b1b01045f908815090904239f24eb696d9dbd2 Mon Sep 17 00:00:00 2001
+From: Mark Asselstine <mark.asselstine@windriver.com>
+Date: Thu, 5 Jan 2017 16:51:02 -0500
+Subject: [PATCH] configure.ac: allow PYTHON values to be passed via env
+
+This allows the recipe to specify specific values instead of them
+being 'discovered' which may lead to host contamination or similar
+issues.
+
+Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
+---
+ configure.ac | 41 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 41 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 25afe44..b5a9e03 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -100,26 +100,38 @@ fi
+ 
+ AC_SUBST(PYTHON)
+ 
++if test -z "${PYTHON_VERSION}"; then
+ PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \
+     from distutils import sysconfig; \
+     stdout.write(sysconfig.get_config_var("VERSION"))'`
++fi
+ 
++if test -z "${PYTHON_LDVERSION}"; then
+ PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \
+     from distutils import sysconfig; \
+     stdout.write(sysconfig.get_config_var("LDVERSION") or "")'`
++fi
+ 
+ if test x"${PYTHON_LDVERSION}" = x""; then
+     PYTHON_LDVERSION=${PYTHON_VERSION}
+ fi
+ 
++if test -z "${PYTHON_INCLUDEPY}"; then
+ CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \
+     from distutils import sysconfig; \
+     stdout.write("-I" + sysconfig.get_config_var("INCLUDEPY"))'`
++else
++CPPFLAGS1="${PYTHON_INCLUDEPY}"
++fi
+ 
++if test -z "${PYTHON_CFLAGS}"; then
+ CPPFLAGS2=`${PYTHON} -c 'from sys import stdout; \
+     from distutils import sysconfig; \
+     stdout.write(" ".join(filter(lambda x: x.startswith("-D"), \
+     sysconfig.get_config_var("CFLAGS").split())))'`
++else
++CPPFLAGS2="${PYTHON_CFLAGS}"
++fi
+ 
+ if test "${ENABLE_EMBEDDED}" != "yes"; then
+ CPPFLAGS3="-DMOD_WSGI_DISABLE_EMBEDDED"
+@@ -131,22 +143,43 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}"
+ 
+ AC_SUBST(CPPFLAGS)
+ 
++if test -z "${PYTHON_LIBDIR}"; then
+ PYTHONLIBDIR=`${PYTHON} -c 'from sys import stdout; \
+     from distutils import sysconfig; \
+     stdout.write(sysconfig.get_config_var("LIBDIR"))'`
++else
++PYTHONLIBDIR="${PYTHON_LIBDIR}"
++fi
++if test -z "${PYTHON_CFGDIR}"; then
+ PYTHONCFGDIR=`${PYTHON} -c 'from sys import stdout; \
+     import distutils.sysconfig; \
+     stdout.write(distutils.sysconfig.get_python_lib(plat_specific=1, \
+     standard_lib=1) +"/config")'`
++else
++PYTHONCFGDIR="${PYTHON_CFGDIR}"
++fi
++if test -z "${PYTHON_FRAMEWORKDIR}"; then
+ PYTHONFRAMEWORKDIR=`${PYTHON} -c 'from sys import stdout; \
+     from distutils import sysconfig; \
+     stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKDIR"))'`
++else
++PYTHONFRAMEWORKDIR="${PYTHON_FRAMEWORKDIR}"
++fi
++
++if test -z "${PYTHON_FRAMEWORKPREFIX}"; then
+ PYTHONFRAMEWORKPREFIX=`${PYTHON} -c 'from sys import stdout; \
+     from distutils import sysconfig; \
+     stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKPREFIX"))'`
++else
++PYTHONFRAMEWORKPREFIX="${PYTHON_FRAMEWORKPREFIX}"
++fi
++if test -z "${PYTHON_FRAMEWORK}"; then
+ PYTHONFRAMEWORK=`${PYTHON} -c 'from sys import stdout; \
+     from distutils import sysconfig; \
+     stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
++else
++PYTHONFRAMEWORK="${PYTHON_FRAMEWORK}"
++fi
+ 
+ if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then
+     PYTHONCFGDIR="${PYTHONCFGDIR}-${PYTHON_LDVERSION}"
+@@ -170,12 +203,20 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
+         LDLIBS1="-lpython${PYTHON_VERSION}"
+     fi
+ 
++    if test -z "${PYTHON_LIBS}"; then
+     LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
+         from distutils import sysconfig; \
+         stdout.write(sysconfig.get_config_var("LIBS"))'`
++    else
++    LDLIBS2="${PYTHON_LIBS}"
++    fi
++    if test -z "${PYTHON_SYSLIBS}"; then
+     LDLIBS3=`${PYTHON} -c 'from sys import stdout; \
+         from distutils import sysconfig; \
+         stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
++    else
++    LDLIBS3="${PYTHON_SYSLIBS}"
++    fi
+ else
+     LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
+ 
+-- 
+2.7.4
+
diff --git a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_3.4.bb b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
index c221b6b..eab28b0 100644
--- a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_3.4.bb
+++ b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
@@ -7,23 +7,22 @@ DESCRIPTION = "\
 
 HOMEPAGE = "http://code.google.com/p/modwsgi/"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRCREV = "f22376f5141e8505f183b1b48f276c31168e2b6a"
+PV = "4.5.13+git${SRCPV}"
+
+S = "${WORKDIR}/git"
 
 SRCNAME = "mod_wsgi"
 SRC_URI = "\
-        http://modwsgi.googlecode.com/files/${SRCNAME}-${PV}.tar.gz \
-        file://configure_var.patch \
-        file://build-fix-builds-that-have-separated-build-dir.patch \
+        git://github.com/GrahamDumpleton/mod_wsgi.git \
+        file://configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch \        
         "
 
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-SRC_URI[md5sum] = "f42d69190ea0c337ef259cbe8d94d985"
-SRC_URI[sha256sum] = "ae85c98e9e146840ab3c3e4490e6774f9bef0f99b9f679fca786b2adb5b4b6e8"
-
-inherit autotools distutils-base
+inherit autotools-brokensep distutils-base
 
-DEPENDS += "apache2-native apache2 python-native"
+DEPENDS += "apache2-native apache2 python"
 RDEPENDS_${PN} = "python"
 
 EXTRA_OECONF = "\