Index: head/databases/py-mysqlclient/Makefile =================================================================== --- head/databases/py-mysqlclient/Makefile (revision 529329) +++ head/databases/py-mysqlclient/Makefile (revision 529330) @@ -1,33 +1,34 @@ # $FreeBSD$ PORTNAME= mysqlclient DISTVERSION= 1.4.6 +PORTREVISION= 1 CATEGORIES= databases python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTVERSIONPREFIX= v -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fluffy@FreeBSD.org COMMENT= MySQL database connector for Python LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c11 iconv mysql python ssl USE_PYTHON= distutils autoplist USE_GITHUB= yes GH_ACCOUNT= pymysql GH_PROJECT= ${PORTNAME}-python CONFLICTS= py*-MySQLdb-[0-9]* py*-MySQLdb5[0-9]-[0-9]* py*-MySQLdb PORTDOCS= * DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} OPTIONS_DEFINE= DOCS post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} .include Index: head/databases/py-mysqlclient/files/patch-gitc67dbd41f =================================================================== --- head/databases/py-mysqlclient/files/patch-gitc67dbd41f (nonexistent) +++ head/databases/py-mysqlclient/files/patch-gitc67dbd41f (revision 529330) @@ -0,0 +1,32 @@ +From c67dbd41f13f5302120ad40fee94ea6c7ffc2bfc Mon Sep 17 00:00:00 2001 +From: Jason Fried +Date: Wed, 5 Feb 2020 03:38:25 -0800 +Subject: [PATCH] Add some gc safety around _mysql__fetch_row (#348) + +Users of gc.get_referrers() could cause a SystemError to be raised if this function is running in a different python thread. +--- + MySQLdb/_mysql.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/MySQLdb/_mysql.c b/MySQLdb/_mysql.c +index 13280ac..1556fda 100644 +--- MySQLdb/_mysql.c ++++ MySQLdb/_mysql.c +@@ -1373,9 +1373,15 @@ _mysql_ResultObject_fetch_row( + convert_row = row_converters[how]; + if (maxrows) { + if (!(r = PyTuple_New(maxrows))) goto error; +- rowsadded = _mysql__fetch_row(self, &r, skiprows, maxrows, +- convert_row); ++ ++ // see: https://docs.python.org/3/library/gc.html#gc.get_referrers ++ // This function can get a reference to the tuple r, and if that ++ // code is preempted while holding a ref to r, the _PyTuple_Resize ++ // will raise a SystemError because the ref count is 2. ++ PyObject_GC_UnTrack(r); ++ rowsadded = _mysql__fetch_row(self, &r, skiprows, maxrows, convert_row); + if (rowsadded == -1) goto error; ++ PyObject_GC_Track(r); + } else { + if (self->use) { + maxrows = 1000; Property changes on: head/databases/py-mysqlclient/files/patch-gitc67dbd41f ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property