py-mod_wsgi: updated to 4.6.4

Version 4.6.4:
Bugs Fixed
In more recent Python versions, the config directory in the Python installation incorporates the platform name. This directory was added as an additional directory to search for Python shared libraries when installing using the setup.py file or pip. It should not even be needed for newer Python versions but still check for older Python versions. The only issue arising from the wrong directory, not incorporating the platform name, being used, was a linker warning about the directory not being present.

Installing mod_wsgi on Windows would fail as hadn’t exclude mod_wsgi daemon mode specific code from Windows build. This would result in compile time error about wsgi_daemon_process being undefined. This problem was introduced to Windows in version 4.6.0. A prior attempt to fix this in 4.6.3 missed one place in the code which needed to be changed.


Version 4.6.3
Bugs Fixed

When compiled for Python 2.6, when run mod_wsgi would fail to load into Apache due to misisng symbol PyFrame_GetLineNumber. This was only introduced in Python 2.7. Use alternate way to get line number which still yields correct answer. This issue was introduced in mod_wsgi version 4.6.0 in fix to have correct line numbers generated for stack traces on shutdown due to request timeout.

Installing mod_wsgi on Windows would fail as hadn’t exclude mod_wsgi daemon mode specific code from Windows build. This would result in compile time error about wsgi_daemon_process being undefined. This problem was introduced to Windows in version 4.6.0.

When using runmodwsgi management command integration for Django, the file containing the WSGI application entry point was specified via a full filesystem path, rather than by module import path. This meant that relative imports from that file would fail. The file is now imported as a module path based on what WSGI_APPLICATION is set to in the Django settings module. This means the file is imported as part of package for the project and relative imports will work.

3 files changed, 23 insertions, 16 deletions

diff --git a/www/py-mod_wsgi/Makefile b/www/py-mod_wsgi/Makefile
index bff10ada93c..e1ba6ac200d 100644
--- a/www/py-mod_wsgi/Makefile
+++ b/www/py-mod_wsgi/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2018/01/01 10:23:09 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2018/04/14 09:34:15 adam Exp $
 
-DISTNAME=	mod_wsgi-4.5.24
+DISTNAME=	mod_wsgi-4.6.4
 PKGNAME=	${PYPKGPREFIX}-${APACHE_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_PYPI:=m/mod_wsgi/}
@@ -10,22 +10,15 @@ HOMEPAGE=	http://www.modwsgi.org/
 COMMENT=	WSGI module for apache
 LICENSE=	apache-2.0
 
-DEPENDS+=	${PYPKGPREFIX}-mod_wsgi-metrics>=1.0.0:../../www/py-mod_wsgi-metrics
-
 APACHE_MODULE=		yes
 MESSAGE_SUBST+=		PYSITELIB=${PYSITELIB}
 MESSAGE_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX}
 PLIST_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX}
 
-# __init__.py is the same as in mod_wsgi-metrics; remove it to avoid conflict
-post-extract:
-	${RM} -f ${WRKSRC}/src/__init__.py
-
 post-install:
-	cd ${DESTDIR}${PREFIX}/bin/ && \
+	cd ${DESTDIR}${PREFIX}/bin && \
 		${MV} mod_wsgi-express mod_wsgi-express${PYVERSSUFFIX} || ${TRUE}
 
-.include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-mod_wsgi/PLIST b/www/py-mod_wsgi/PLIST
index 183c0356721..446a29e4167 100644
--- a/www/py-mod_wsgi/PLIST
+++ b/www/py-mod_wsgi/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.10 2017/12/17 15:38:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2018/04/14 09:34:15 adam Exp $
 bin/mod_wsgi-express${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/mod_wsgi/__init__.py
+${PYSITELIB}/mod_wsgi/__init__.pyc
+${PYSITELIB}/mod_wsgi/__init__.pyo
 ${PYSITELIB}/mod_wsgi/docs/.buildinfo
 ${PYSITELIB}/mod_wsgi/docs/__init__.py
 ${PYSITELIB}/mod_wsgi/docs/__init__.pyc
@@ -130,6 +134,11 @@ ${PYSITELIB}/mod_wsgi/docs/_sources/release-notes/version-4.5.6.rst.txt
 ${PYSITELIB}/mod_wsgi/docs/_sources/release-notes/version-4.5.7.rst.txt
 ${PYSITELIB}/mod_wsgi/docs/_sources/release-notes/version-4.5.8.rst.txt
 ${PYSITELIB}/mod_wsgi/docs/_sources/release-notes/version-4.5.9.rst.txt
+${PYSITELIB}/mod_wsgi/docs/_sources/release-notes/version-4.6.0.rst.txt
+${PYSITELIB}/mod_wsgi/docs/_sources/release-notes/version-4.6.1.rst.txt
+${PYSITELIB}/mod_wsgi/docs/_sources/release-notes/version-4.6.2.rst.txt
+${PYSITELIB}/mod_wsgi/docs/_sources/release-notes/version-4.6.3.rst.txt
+${PYSITELIB}/mod_wsgi/docs/_sources/release-notes/version-4.6.4.rst.txt
 ${PYSITELIB}/mod_wsgi/docs/_sources/reporting-bugs.rst.txt
 ${PYSITELIB}/mod_wsgi/docs/_sources/requirements.rst.txt
 ${PYSITELIB}/mod_wsgi/docs/_sources/security-issues.rst.txt
@@ -312,6 +321,11 @@ ${PYSITELIB}/mod_wsgi/docs/release-notes/version-4.5.6.html
 ${PYSITELIB}/mod_wsgi/docs/release-notes/version-4.5.7.html
 ${PYSITELIB}/mod_wsgi/docs/release-notes/version-4.5.8.html
 ${PYSITELIB}/mod_wsgi/docs/release-notes/version-4.5.9.html
+${PYSITELIB}/mod_wsgi/docs/release-notes/version-4.6.0.html
+${PYSITELIB}/mod_wsgi/docs/release-notes/version-4.6.1.html
+${PYSITELIB}/mod_wsgi/docs/release-notes/version-4.6.2.html
+${PYSITELIB}/mod_wsgi/docs/release-notes/version-4.6.3.html
+${PYSITELIB}/mod_wsgi/docs/release-notes/version-4.6.4.html
 ${PYSITELIB}/mod_wsgi/docs/reporting-bugs.html
 ${PYSITELIB}/mod_wsgi/docs/requirements.html
 ${PYSITELIB}/mod_wsgi/docs/search.html
diff --git a/www/py-mod_wsgi/distinfo b/www/py-mod_wsgi/distinfo
index d74543dc537..d0fdba9584c 100644
--- a/www/py-mod_wsgi/distinfo
+++ b/www/py-mod_wsgi/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2017/12/16 07:46:30 adam Exp $
+$NetBSD: distinfo,v 1.12 2018/04/14 09:34:15 adam Exp $
 
-SHA1 (mod_wsgi-4.5.24.tar.gz) = aa79e6ba516902c667e989b2b22a193929264029
-RMD160 (mod_wsgi-4.5.24.tar.gz) = 5e08e31b4c5cdf874d8bd96dc84ca9755faadf83
-SHA512 (mod_wsgi-4.5.24.tar.gz) = ad61c4e3c807297eedb6640c2b309c621fcc2eb5b2f23aa52e0d0ef418b3f13dd4f5a688bd368b4b41839396c5791e17bd266a19b5690975bef1d6acf81b4ac6
-Size (mod_wsgi-4.5.24.tar.gz) = 2551779 bytes
+SHA1 (mod_wsgi-4.6.4.tar.gz) = f6f79306567d47206b99b16c32fc8eb6ddb1508f
+RMD160 (mod_wsgi-4.6.4.tar.gz) = cac96781568022578ceefa7b73e69505b6626b48
+SHA512 (mod_wsgi-4.6.4.tar.gz) = 25c5666679f45c7c921b45f53d61362fcb91e14202fa79b8bd6aa0935b0d63e751d2b18d1ccbe57acdfb12dfeed354da3bde465c71ca55e95bcb098cff85e60b
+Size (mod_wsgi-4.6.4.tar.gz) = 2593324 bytes