Received: by mail.netbsd.org (Postfix, from userid 605) id C9C0784E98; Tue, 27 Jul 2021 23:21:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1107984D9B for ; Tue, 27 Jul 2021 23:21:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 3ldhdeV0Yock for ; Tue, 27 Jul 2021 23:21:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7527984D8C for ; Tue, 27 Jul 2021 23:21:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6ED34FA95; Tue, 27 Jul 2021 23:21:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1627428083238660" MIME-Version: 1.0 Date: Tue, 27 Jul 2021 23:21:23 +0000 From: "Matthias Scheler" Subject: CVS commit: pkgsrc/databases/py-mysqldb To: pkgsrc-changes@NetBSD.org Reply-To: tron@netbsd.org X-Mailer: log_accum Message-Id: <20210727232123.6ED34FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1627428083238660 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tron Date: Tue Jul 27 23:21:23 UTC 2021 Modified Files: pkgsrc/databases/py-mysqldb: Makefile distinfo Added Files: pkgsrc/databases/py-mysqldb/patches: patch-_mysql.c Log Message: databases/py-mysqldb: Fix build with latest version of MariaDB To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 pkgsrc/databases/py-mysqldb/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/py-mysqldb/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/databases/py-mysqldb/patches/patch-_mysql.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1627428083238660 Content-Disposition: inline Content-Length: 2671 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/py-mysqldb/Makefile diff -u pkgsrc/databases/py-mysqldb/Makefile:1.50 pkgsrc/databases/py-mysqldb/Makefile:1.51 --- pkgsrc/databases/py-mysqldb/Makefile:1.50 Wed Jun 23 20:33:09 2021 +++ pkgsrc/databases/py-mysqldb/Makefile Tue Jul 27 23:21:23 2021 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.50 2021/06/23 20:33:09 nia Exp $ +# $NetBSD: Makefile,v 1.51 2021/07/27 23:21:23 tron Exp $ DISTNAME= MySQL-python-1.2.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/MySQL-python/mysqldb/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= databases python MASTER_SITES= ${MASTER_SITE_PYPI:=M/MySQL-python/} EXTRACT_SUFX= .zip Index: pkgsrc/databases/py-mysqldb/distinfo diff -u pkgsrc/databases/py-mysqldb/distinfo:1.13 pkgsrc/databases/py-mysqldb/distinfo:1.14 --- pkgsrc/databases/py-mysqldb/distinfo:1.13 Tue Nov 3 01:56:27 2015 +++ pkgsrc/databases/py-mysqldb/distinfo Tue Jul 27 23:21:23 2021 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.13 2015/11/03 01:56:27 agc Exp $ +$NetBSD: distinfo,v 1.14 2021/07/27 23:21:23 tron Exp $ SHA1 (MySQL-python-1.2.5.zip) = b935a26b3cf80338bcc21b8a991081d83eb9c3ae RMD160 (MySQL-python-1.2.5.zip) = f6638f1bda4c6a3f721c05a5f0029951d07430a9 SHA512 (MySQL-python-1.2.5.zip) = 37521c6fd855c4cde495cc8ec085aca79c2d441a6e3710759385bf2e2c17f43d3311cf1166663892829d2e3999c419443c358c7031cdda225ac44611ced188d0 Size (MySQL-python-1.2.5.zip) = 108935 bytes +SHA1 (patch-_mysql.c) = ebe33a112bb16de85d0bbc4e090c51527cbcdc1d Added files: Index: pkgsrc/databases/py-mysqldb/patches/patch-_mysql.c diff -u /dev/null pkgsrc/databases/py-mysqldb/patches/patch-_mysql.c:1.1 --- /dev/null Tue Jul 27 23:21:23 2021 +++ pkgsrc/databases/py-mysqldb/patches/patch-_mysql.c Tue Jul 27 23:21:23 2021 @@ -0,0 +1,28 @@ +$NetBSD: patch-_mysql.c,v 1.1 2021/07/27 23:21:23 tron Exp $ + +Use official MySQL API to fix build with latest version of MariaDB + +--- _mysql.c.orig 2014-01-02 13:52:50.000000000 +0000 ++++ _mysql.c 2021-07-28 00:17:13.849678370 +0100 +@@ -40,8 +40,6 @@ + #include "structmember.h" + #if defined(MS_WINDOWS) + #include +-#else +-#include "my_config.h" + #endif + #include "mysql.h" + #include "mysqld_error.h" +@@ -2002,7 +2000,11 @@ + 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 ) { ++ my_bool my_reconnect = reconnect != 0; ++ mysql_options(&self->connection, MYSQL_OPT_RECONNECT, ++ &my_reconnect); ++ } + Py_BEGIN_ALLOW_THREADS + r = mysql_ping(&(self->connection)); + Py_END_ALLOW_THREADS --_----------=_1627428083238660--