net/py-maxminddb: fix C extension initialization refcounting and unwi…

…nding
pfsense · Jan 9, 2023 · a21364e · a21364e
1 parent a9a3acd
commit a21364e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/net/py-maxminddb/Makefile b/net/py-maxminddb/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	maxminddb
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net python geography
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,14 +14,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
-USES=		compiler:c11 localbase python:3.6+
+USES=		compiler:c11 localbase python:3.7+
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
 GH_PROJECT=	MaxMind-DB-Reader-python
 
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	allflavors autoplist concurrent distutils
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/maxminddb/extension*.so
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/net/py-maxminddb/files/patch-extension_maxminddb.c b/net/py-maxminddb/files/patch-extension_maxminddb.c
@@ -0,0 +1,10 @@
+--- extension/maxminddb.c.orig	2023-01-09 13:42:35 UTC
++++ extension/maxminddb.c
+@@ -737,6 +737,7 @@ PyMODINIT_FUNC PyInit_extension(void) {
+     if (PyType_Ready(&Metadata_Type)) {
+         return NULL;
+     }
++    Py_INCREF(&Metadata_Type);
+     PyModule_AddObject(m, "Metadata", (PyObject *)&Metadata_Type);
+
+     PyObject *error_mod = PyImport_ImportModule("maxminddb.errors");