[PR PATCH] mod_wsgi: update to 4.9.4.

[PR PATCH] mod_wsgi: update to 4.9.4.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1180 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages mod_wsgi-4.9.4
https://github.com/void-linux/void-packages/pull/40243

mod_wsgi: update to 4.9.4.
Current version is ftbfs

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40243.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mod_wsgi-4.9.4-40243.patch --]
[-- Type: text/x-diff, Size: 6792 bytes --]

From fa8ba54a36efe336c58a98b4f8e96586fea6a9b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 29 Oct 2022 22:39:36 +0700
Subject: [PATCH] mod_wsgi: update to 4.9.4.

---
 srcpkgs/mod_wsgi/INSTALL.msg                |  9 ----
 srcpkgs/mod_wsgi/patches/cross-python.patch | 46 +++++++++++----------
 srcpkgs/mod_wsgi/template                   |  6 ++-
 3 files changed, 29 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/mod_wsgi/INSTALL.msg

diff --git a/srcpkgs/mod_wsgi/INSTALL.msg b/srcpkgs/mod_wsgi/INSTALL.msg
deleted file mode 100644
index b3a307070096..000000000000
--- a/srcpkgs/mod_wsgi/INSTALL.msg
+++ /dev/null
@@ -1,9 +0,0 @@
-To enable ${PKGNAME} in the Apache HTTP server, add the following line
-into /etc/httpd/httpd.conf:
-
-	LoadModule wsgi_module modules/mod_wsgi.so
-
-and reload the Apache daemon with:
-
-	# sv restart apache
-
diff --git a/srcpkgs/mod_wsgi/patches/cross-python.patch b/srcpkgs/mod_wsgi/patches/cross-python.patch
index eea650fcb15d..b445c1e22779 100644
--- a/srcpkgs/mod_wsgi/patches/cross-python.patch
+++ b/srcpkgs/mod_wsgi/patches/cross-python.patch
@@ -1,22 +1,22 @@
-diff --git configure.ac configure.ac
-index 63d1bbc..543ecc0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -100,26 +100,25 @@ fi
+Index: mod_wsgi-4.9.4/configure.ac
+===================================================================
+--- mod_wsgi-4.9.4.orig/configure.ac
++++ mod_wsgi-4.9.4/configure.ac
+@@ -106,26 +106,25 @@ fi
  
  AC_SUBST(PYTHON)
  
 -PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \
 +if test x"${PYTHON_VERSION}" = x""; then
 +  PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \
-     from distutils import sysconfig; \
+     import sysconfig; \
      stdout.write(sysconfig.get_config_var("VERSION"))'`
 +fi
  
 -PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \
 +if test x"${PYTHON_LDVERSION}" = x""; then
 +  PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \
-     from distutils import sysconfig; \
+     import sysconfig; \
      stdout.write(sysconfig.get_config_var("LDVERSION") or "")'`
 +fi
  
@@ -25,37 +25,37 @@ index 63d1bbc..543ecc0 100644
  fi
  
 -CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \
--    from distutils import sysconfig; \
+-    import sysconfig; \
 -    stdout.write("-I" + sysconfig.get_config_var("INCLUDEPY"))'`
 +CPPFLAGS1=$($PYTHON-config --includes)
  
 -CPPFLAGS2=`${PYTHON} -c 'from sys import stdout; \
--    from distutils import sysconfig; \
+-    import sysconfig; \
 -    stdout.write(" ".join(filter(lambda x: x.startswith("-D"), \
 -    sysconfig.get_config_var("CFLAGS").split())))'`
-+CPPFLAGS2=$($PYTHON-config --cflags | tr ' \t' '\n\n' | grep '^-D' | tr '\n' ' ')
++CPPFLAGS2=`${PYTHON}-config --cflags | tr ' \t' '\n\n' | grep '^-D' | paste -s`
  
  if test "${ENABLE_EMBEDDED}" != "yes"; then
  CPPFLAGS3="-DMOD_WSGI_DISABLE_EMBEDDED"
-@@ -131,66 +130,7 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}"
+@@ -137,70 +136,7 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPP
  
  AC_SUBST(CPPFLAGS)
  
 -PYTHONLIBDIR=`${PYTHON} -c 'from sys import stdout; \
--    from distutils import sysconfig; \
+-    import sysconfig; \
 -    stdout.write(sysconfig.get_config_var("LIBDIR"))'`
 -PYTHONCFGDIR=`${PYTHON} -c 'from sys import stdout; \
 -    import distutils.sysconfig; \
 -    stdout.write(distutils.sysconfig.get_python_lib(plat_specific=1, \
 -    standard_lib=1) +"/config")'`
 -PYTHONFRAMEWORKDIR=`${PYTHON} -c 'from sys import stdout; \
--    from distutils import sysconfig; \
+-    import sysconfig; \
 -    stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKDIR"))'`
 -PYTHONFRAMEWORKPREFIX=`${PYTHON} -c 'from sys import stdout; \
--    from distutils import sysconfig; \
+-    import sysconfig; \
 -    stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKPREFIX"))'`
 -PYTHONFRAMEWORK=`${PYTHON} -c 'from sys import stdout; \
--    from distutils import sysconfig; \
+-    import sysconfig; \
 -    stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
 -
 -if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then
@@ -64,8 +64,12 @@ index 63d1bbc..543ecc0 100644
 -
 -if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
 -        "${ENABLE_FRAMEWORK}" != "yes"; then
--    LDFLAGS1="-L${PYTHONLIBDIR}"
--    LDFLAGS2="-L${PYTHONCFGDIR}"
+-    if test "${PYTHONLIBDIR}" != "${APXS_LIBDIR}" ; then
+-        LDFLAGS1="-L${PYTHONLIBDIR}"
+-    fi
+-    if test "${PYTHONCFGDIR}" != "${APXS_LIBDIR}" ; then
+-        LDFLAGS2="-L${PYTHONCFGDIR}"
+-    fi
 -
 -    LDLIBS1="-lpython${PYTHON_LDVERSION}"
 -
@@ -81,10 +85,10 @@ index 63d1bbc..543ecc0 100644
 -    fi
 -
 -    LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
--        from distutils import sysconfig; \
+-        import sysconfig; \
 -        stdout.write(sysconfig.get_config_var("LIBS"))'`
 -    LDLIBS3=`${PYTHON} -c 'from sys import stdout; \
--        from distutils import sysconfig; \
+-        import sysconfig; \
 -        stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
 -else
 -    LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
@@ -92,13 +96,13 @@ index 63d1bbc..543ecc0 100644
 -    VERSION="${PYTHON_VERSION}"
 -    STRING="${PYTHONFRAMEWORKDIR}/Versions/${VERSION}/${PYTHONFRAMEWORK}"
 -    LDFLAGS2=`${PYTHON} -c "from sys import stdout; \
--        from distutils import sysconfig; \
+-        import sysconfig; \
 -        stdout.write(sysconfig.get_config_var(
 -        \"LINKFORSHARED\").replace(\"${STRING}\", ''))" | \
 -        sed -e 's/-Wl,-stack_size,[[0-9]]*//'`
 -
 -    LDLIBS1=`${PYTHON} -c 'from sys import stdout; \
--        from distutils import sysconfig; \
+-        import sysconfig; \
 -        stdout.write(sysconfig.get_config_var("LIBS"))'`
 -fi
 +PYTHONLIBDIR=$($PYTHON-config --ldflags)
diff --git a/srcpkgs/mod_wsgi/template b/srcpkgs/mod_wsgi/template
index 28872edf8d52..5728135ec107 100644
--- a/srcpkgs/mod_wsgi/template
+++ b/srcpkgs/mod_wsgi/template
@@ -1,6 +1,6 @@
 # Template file for 'mod_wsgi'
 pkgname=mod_wsgi
-version=4.7.1
+version=4.9.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="python3 perl automake libtool"
@@ -11,9 +11,11 @@ license="Apache-2.0"
 homepage="https://modwsgi.readthedocs.io/en/develop/"
 changelog="https://modwsgi.readthedocs.io/en/latest/release-notes/version-${version}.html"
 distfiles="https://github.com/GrahamDumpleton/${pkgname}/archive/${version}.tar.gz"
-checksum=2674e506719afe60fbc0547c832e8948d6caa2e054d40d336309993e6e867d35
+checksum=ee926a3fd5675890b908ebc23db1f8f7f03dc3459241abdcf35d46c68e1be29b
 lib32disabled=yes
 
+LDFLAGS=-lpython3
+
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
 		cp -a ${XBPS_CROSS_BASE}/usr/bin/apxs ${wrksrc}

Re: mod_wsgi: update to 4.9.4.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 236 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40243#issuecomment-1297811880

Comment:
I made a similar update in #39917, feel free to close it if you want to continue the work here

Re: [PR PATCH] [Closed]: mod_wsgi: update to 4.9.4.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1030 bytes --]

There's a closed pull request on the void-packages repository

mod_wsgi: update to 4.9.4.
https://github.com/void-linux/void-packages/pull/40243

Description:
Current version is ftbfs

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->