Page MenuHomeFreeBSD
Files F111381379

D11054.id31125.diff
No OneTemporary
Actions

D11054.id31125.diff
View Options

Index: head/databases/py-MySQLdb/Makefile
===================================================================
--- head/databases/py-MySQLdb/Makefile
+++ head/databases/py-MySQLdb/Makefile
@@ -10,13 +10,17 @@
MAINTAINER= python@FreeBSD.org
COMMENT= Access a MySQL database through Python
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/GPL-2.0
+
USES= python:2 mysql
USE_PYTHON= distutils autoplist
USE_GITHUB= yes
GH_ACCOUNT= farcepest
GH_PROJECT= ${PORTNAME}1
-CONFLICTS= py*-MySQLdb-[0-9]* py*-MySQLdb5[0-9]-[0-9]* py*-mysqlclient-[0-9]*
+CONFLICTS= ${PYTHON_PKGNAMEPREFIX}-MySQLdb5[0-9]-[0-9]* \
+ ${PYTHON_PKGNAMEPREFIX}-mysqlclient-[0-9]*
PORTDOCS= *
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
@@ -37,5 +41,6 @@
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
+ ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_mysql.so
.include <bsd.port.mk>
Index: head/databases/py-MySQLdb/files/patch-_mysql.c
===================================================================
--- head/databases/py-MySQLdb/files/patch-_mysql.c
+++ head/databases/py-MySQLdb/files/patch-_mysql.c
@@ -1,7 +1,7 @@
---- _mysql.c.orig 2014-03-18 19:07:07.000000000 +0400
-+++ _mysql.c 2014-03-18 19:07:40.000000000 +0400
-@@ -102,6 +102,10 @@ static int _mysql_server_init_done = 0;
- #define check_server_init(x) if (!_mysql_server_init_done) _mysql_server_init_done = 1
+--- _mysql.c.orig 2014-01-02 19:15:03 UTC
++++ _mysql.c
+@@ -124,6 +124,10 @@ static int _mysql_server_init_done = 0;
+ #define HAVE_MYSQL_OPT_TIMEOUTS 1
#endif
+#if MYSQL_VERSION_ID >= 50500
@@ -11,3 +11,14 @@
PyObject *
_mysql_Exception(_mysql_ConnectionObject *c)
{
+@@ -2002,7 +2006,9 @@ _mysql_ConnectionObject_ping(
+ int r, reconnect = -1;
+ if (!PyArg_ParseTuple(args, "|I", &reconnect)) return NULL;
+ check_connection(self);
+- if ( reconnect != -1 ) self->connection.reconnect = reconnect;
++ if (reconnect != -1) {
++ mysql_options(&self->connection, MYSQL_OPT_RECONNECT, &reconnect);
++ }
+ Py_BEGIN_ALLOW_THREADS
+ r = mysql_ping(&(self->connection));
+ Py_END_ALLOW_THREADS

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 4, 2:01 AM (12 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16958918
Default Alt Text
D11054.id31125.diff (2 KB)

Event Timeline