From e606fa3e70bc407f695e2bbfadd2c6519eda4107 Mon Sep 17 00:00:00 2001
From: Vijay Anusuri <vanusuri@mvista.com>
Date: Tue, 3 Dec 2024 13:06:12 +0530
Subject: mod-wsgi: upgrade 4.9.0 -> 5.0.2

mod-wsgi version 4.9.0 doesn't build against python 3.13
update it to 5.0.2 which does build.

Refreshed configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch for 5.0.2 version.

Signed-off-by: Anand Je Sypureddy <anandje@mvista.com>
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 ...c-allow-PYTHON-values-to-be-passed-via-en.patch | 22 ++++++++++++----------
 .../recipes-support/mod-wsgi/mod-wsgi_git.bb       |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'meta-openstack')

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
index 79aedff..6718a4a 100644
--- 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
@@ -9,14 +9,14 @@ issues.
 
 Updated for 4.9.0: Jeremy Puhlman
 
+Upstream-Status: Pending
 Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
-----
- configure.ac | 41 +++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 41 insertions(+)
-
+---
+ configure.ac | 40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 37a0f86..9b77c7f 100644
+index f994dd7..8774010 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -106,26 +106,38 @@ fi
@@ -58,7 +58,7 @@ index 37a0f86..9b77c7f 100644
  
  if test "${ENABLE_EMBEDDED}" != "yes"; then
  CPPFLAGS3="-DMOD_WSGI_DISABLE_EMBEDDED"
-@@ -137,22 +149,42 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}"
+@@ -137,21 +149,41 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}"
  
  AC_SUBST(CPPFLAGS)
  
@@ -71,9 +71,8 @@ index 37a0f86..9b77c7f 100644
 +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")'`
+     import sysconfig; \
+     stdout.write(sysconfig.get_path("platstdlib") +"/config")'`
 +else
 +PYTHONCFGDIR="${PYTHON_CFGDIR}"
 +fi
@@ -101,7 +100,7 @@ index 37a0f86..9b77c7f 100644
  
  if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then
      PYTHONCFGDIR="${PYTHONCFGDIR}-${PYTHON_LDVERSION}"
-@@ -180,12 +212,20 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
+@@ -179,12 +211,20 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
          LDLIBS1="-lpython${PYTHON_VERSION}"
      fi
  
@@ -122,3 +121,6 @@ index 37a0f86..9b77c7f 100644
  else
      LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
  
+-- 
+2.25.1
+
diff --git a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
index b0daf54..f22a242 100644
--- a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
+++ b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
@@ -9,8 +9,8 @@ HOMEPAGE = "https://github.com/GrahamDumpleton/mod_wsgi"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "df9faf954a1ab6208f45ba6fde90f0b41f605483"
-PV = "4.9.0+git${SRCPV}"
+SRCREV = "1b645ebd7d87f7a27d23690c19e97dbf8dafe6b4"
+PV = "5.0.2+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-- 
cgit v1.2.3-54-g00ecf