Date: Wednesday, December 11, 2019 @ 09:50:07 Author: arojas Revision: 536788
Update to 4.6.8, drop python2 Modified: mod_wsgi/trunk/PKGBUILD Deleted: mod_wsgi/trunk/python-3.8.patch ------------------+ PKGBUILD | 57 +++++++------------------------ python-3.8.patch | 97 ----------------------------------------------------- 2 files changed, 13 insertions(+), 141 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-12-11 09:48:25 UTC (rev 536787) +++ PKGBUILD 2019-12-11 09:50:07 UTC (rev 536788) @@ -1,62 +1,31 @@ -# Maintainer: Alexander F Rødseth <[email protected]> +# Maintainer: +# Contributor: Alexander F Rødseth <[email protected]> # Contributor: Andrea Scarpino <[email protected]> # Contributor: Ryan Coyner <[email protected]> -pkgbase=mod_wsgi -pkgname=($pkgbase 'mod_wsgi2') -pkgver=4.5.24 -pkgrel=4 +pkgname=mod_wsgi +pkgver=4.6.8 +pkgrel=1 pkgdesc='Python WSGI adapter module for Apache' arch=('x86_64') url='http://www.modwsgi.org/' license=('APACHE') -makedepends=('apache' 'git' 'python' 'python2') +depends=('apache' 'python') +conflicts=('mod_wsgi2') +makedepends=('apache' 'python') install='mod_wsgi.install' -source=("git+https://github.com/GrahamDumpleton/mod_wsgi#tag=$pkgver"; - python-3.8.patch) -md5sums=('SKIP' - '73ac9f44d14c04e4bd14eeb506313ec4') +source=($pkgname-$pkgver.tar.gz::"https://github.com/GrahamDumpleton/mod_wsgi/archive/$pkgver.tar.gz";) +sha256sums=('a22394cb4e8f9add252b94364a16eb74820829159b29afda10117715473cd577') -prepare() { - cp -r "$pkgbase" py2 - patch -Np1 -d "$pkgbase" <python-3.8.patch -} - build() { - # Configure and build mod_wsgi for py2 - cd py2 + cd $pkgname-$pkgver ./configure \ --prefix=/usr \ --with-apxs=/usr/bin/apxs \ - --with-python=/usr/bin/python2 - - make - - # Configure and build mod_wsgi for py3 - cd "$srcdir/$pkgbase" - ./configure \ - --prefix=/usr \ - --with-apxs=/usr/bin/apxs \ --with-python=/usr/bin/python - make } -package_mod_wsgi() { - pkgdesc='Python WSGI adapter module for Apache' - depends=('apache' 'python') - conflicts=('mod_wsgi2') - - make -C "$pkgbase" DESTDIR="$pkgdir" install +package() { + make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install } - -package_mod_wsgi2() { - pkgdesc='Python2 WSGI adapter module for Apache' - depends=('apache' 'python2') - conflicts=('mod_wsgi') - - make -C py2 DESTDIR="$pkgdir" install -} - -# getver: github.com/GrahamDumpleton/mod_wsgi -# vim: ts=2 sw=2 et: Deleted: python-3.8.patch =================================================================== --- python-3.8.patch 2019-12-11 09:48:25 UTC (rev 536787) +++ python-3.8.patch 2019-12-11 09:50:07 UTC (rev 536788) @@ -1,97 +0,0 @@ -From 0f34844009075391c55419a3afb90e469facf35e Mon Sep 17 00:00:00 2001 -From: Graham Dumpleton <[email protected]> -Date: Tue, 14 May 2019 16:14:07 +1000 -Subject: [PATCH] Changed functions to pre/post actions when forking. - ---- - src/server/mod_wsgi.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c -index 2e4bb24d..bf55945a 100644 ---- a/src/server/mod_wsgi.c -+++ b/src/server/mod_wsgi.c -@@ -4345,8 +4345,13 @@ static void wsgi_python_child_init(apr_pool_t *p) - * do it if Python was initialised in parent process. - */ - -- if (wsgi_python_initialized && !wsgi_python_after_fork) -+ if (wsgi_python_initialized && !wsgi_python_after_fork) { -+#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7) -+ PyOS_AfterFork_Child(); -+#else - PyOS_AfterFork(); -+#endif -+ } - - /* Finalise any Python objects required by child process. */ - -@@ -10422,6 +10427,12 @@ static int wsgi_start_process(apr_pool_t *p, WSGIDaemonProcess *daemon) - wsgi_exit_daemon_process(0); - } - -+ if (wsgi_python_initialized) { -+#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7) -+ PyOS_AfterFork_Parent(); -+#endif -+ } -+ - apr_pool_note_subprocess(p, &daemon->process, APR_KILL_AFTER_TIMEOUT); - apr_proc_other_child_register(&daemon->process, wsgi_manage_process, - daemon, NULL, p); - -From b03b02df6318afe26052db5b0365732152cacea2 Mon Sep 17 00:00:00 2001 -From: Graham Dumpleton <[email protected]> -Date: Tue, 14 May 2019 16:14:42 +1000 -Subject: [PATCH] Use official APIs for accessing interpreter list. - ---- - src/server/wsgi_interp.c | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/src/server/wsgi_interp.c b/src/server/wsgi_interp.c -index 4a948509..3fbca04b 100644 ---- a/src/server/wsgi_interp.c -+++ b/src/server/wsgi_interp.c -@@ -338,9 +338,10 @@ static PyObject *ShutdownInterpreter_call( - - PyThreadState_Swap(NULL); - -- tstate = tstate->interp->tstate_head; -+ tstate = PyInterpreterState_ThreadHead(tstate->interp); -+ - while (tstate) { -- tstate_next = tstate->next; -+ tstate_next = PyThreadState_Next(tstate); - if (tstate != tstate_save) { - PyThreadState_Swap(tstate); - PyThreadState_Clear(tstate); -@@ -436,9 +437,13 @@ InterpreterObject *newInterpreterObject(const char *name) - */ - - if (!name) { -+#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7) -+ interp = PyInterpreterState_Main(); -+#else - interp = PyInterpreterState_Head(); -- while (interp->next) -- interp = interp->next; -+ while (PyInterpreterState_Next(interp)) -+ interp = PyInterpreterState_Next(interp); -+#endif - - name = ""; - } -@@ -1883,9 +1888,10 @@ static void Interpreter_dealloc(InterpreterObject *self) - - PyThreadState_Swap(NULL); - -- tstate = tstate->interp->tstate_head; -+ tstate = PyInterpreterState_ThreadHead(tstate->interp); -+ - while (tstate) { -- tstate_next = tstate->next; -+ tstate_next = PyThreadState_Next(tstate); - if (tstate != tstate_save) { - PyThreadState_Swap(tstate); - PyThreadState_Clear(tstate);
