CVS commit: pkgsrc/www/ap2-python

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Wed Nov  6 16:49:48 UTC 2019

Modified Files:
        pkgsrc/www/ap2-python: distinfo
Added Files:
        pkgsrc/www/ap2-python/patches: patch-src___apachemodule.c

Log Message:
First step to make this buildable with python 3.7


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/ap2-python/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/ap2-python/patches/patch-src___apachemodule.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/ap2-python/distinfo
diff -u pkgsrc/www/ap2-python/distinfo:1.9 pkgsrc/www/ap2-python/distinfo:1.10
--- pkgsrc/www/ap2-python/distinfo:1.9  Wed Nov  4 02:46:48 2015
+++ pkgsrc/www/ap2-python/distinfo      Wed Nov  6 16:49:48 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 02:46:48 agc Exp $
+$NetBSD: distinfo,v 1.10 2019/11/06 16:49:48 martin Exp $
 
 SHA1 (mod_python-3.5.0.tgz) = 9208bb813172ab51d601d78e439ea552f676d2d1
 RMD160 (mod_python-3.5.0.tgz) = 03315af0843892059a11758209f350c82164acc3
@@ -7,3 +7,4 @@ Size (mod_python-3.5.0.tgz) = 571403 byt
 SHA1 (patch-configure) = 721dc5200205889106c502247a4b4a4a6995b4e2
 SHA1 (patch-configure.in) = 1c77f43224f3c9ae555f91ac4479c60121ad950b
 SHA1 (patch-dist_version.sh) = 9f3dbf596238aa106e06ec1c8b27a90619ef4978
+SHA1 (patch-src___apachemodule.c) = 3f9bfe10c48a2f64e5528e77205d9bdbeaaded07

Added files:

Index: pkgsrc/www/ap2-python/patches/patch-src___apachemodule.c
diff -u /dev/null pkgsrc/www/ap2-python/patches/patch-src___apachemodule.c:1.1
--- /dev/null   Wed Nov  6 16:49:48 2019
+++ pkgsrc/www/ap2-python/patches/patch-src___apachemodule.c    Wed Nov  6 16:49:48 2019
@@ -0,0 +1,21 @@
+$NetBSD: patch-src___apachemodule.c,v 1.1 2019/11/06 16:49:48 martin Exp $
+
+Add support for python 3.7, based on
+https://github.com/grisha/mod_python/pull/80/commits/8fb45feab94152a6aae3492aed4b81c363a912bd
+
+--- src/_apachemodule.c.orig   2019-11-06 16:27:40.549245378 +0100
++++ src/_apachemodule.c        2019-11-06 16:27:44.529287280 +0100
+@@ -851,8 +851,13 @@ PyObject *_apache_module_init()
+ #else
+     m = PyModule_Create(&_apache_moduledef);
+     PyObject *name = PyUnicode_FromString("_apache");
++#if PY_MINOR_VERSION >= 7
++    PyObject *modules = PyImport_GetModuleDict();
++    _PyImport_FixupExtensionObject(m, name, name, modules);
++#else
+     _PyImport_FixupExtensionObject(m, name, name);
+ #endif
++#endif
+     d = PyModule_GetDict(m);
+     Mp_ServerReturn = PyErr_NewException("_apache.SERVER_RETURN", NULL, NULL);
+     if (Mp_ServerReturn == NULL)