From dd907179bdc8d23523ea564da7bb6711daf31ab8950dc3fb8ce9a0cca19f6915 Mon Sep 17 00:00:00 2001 From: Alexei Podvalsky Date: Fri, 8 Feb 2019 23:44:27 +0000 Subject: [PATCH] Accepting request 672903 from home:awissu:branches:devel:languages:python - Update to 1.4.2: * Fix Django 1.11 compatibility. - Drop MySQL-python-Py_ssize.patch - Update to 1.3.14: * Support static linking of MariaDB Connector/C (#265) * Better converter for Decimal and Float (#267, #268, #273, #286) * Add Connection._get_native_connection for XTA project (#269) * Fix SEGV on MariaDB Connector/C when Connection.close() is called for closed connection. (#270, #272, #276) * Fix Connection.client_flag (#266) * Fix SSCursor may raise same exception twice (#282) * Fixed SSL support is not detected when built with MySQL < 5.1 (#291) - Add obsoletes/provides with "python-" prefix (oldpython macro) - Fix build on openSUSE 42.3 (rename: libmariadb-devel to libmysqlclient-devel) - Switch to fork of MySQLdb1 - Update a package description - Build with python3 and python2 (singlespec) - Mark obsolete packages: python-mysql, python-MySQL-python - Spec file cleanup - Fix build on non-SUSE distros by conditionalizing Recommends: tag - Update to version 1.2.4 + No changelog available - Set correct Group : Development/Languages/Python - Use download Url as source - Spec file general clean-up - Add MySQL-python-1.2.4-dont-use-python-distribute.patch; don't try to use unavailable python-distribute - Remove depreciate AutoReqProv, %{py_requires} and # norootforbuild tags - Add unzip requirement to support tarball format - Add python-Sphinx requirement and generate html documentation - Remove --record-rpm=INSTALLED_FILES option and add %{python_sitearch} in %files instead - Package GPL-2.0, HISTORY and Sphinx documentation - fix the previous fix, patch went upstream - update to 1.2.3 - no upstream changelog available - taking out the reconnect patch as the upstream sources contain a very specific comment that this means trouble - removed usage of deprecated sets module (bnc#462974) - update to 1.2.2 - various bugfixes - much better support for mysql5 - python2.5 support (crude, though, let's keep our patch for a while) - switch from distutils to setuptools - added patch supporting reconnect in mysql5 - update to 1.2.1_p2 - support for some new features of mysql 4.1 and 5.0 - fixes for 64bit bugs due to PEP353 - updated to reflect python changes due to #149809 - converted neededforbuild to BuildRequires - update to 1.2.0 - update to 1.1.9 (MySQL 4.1 support) - updated to 1.1.1 - fixed lib64 build - update to 1.1.0 - drop python 2.1 support - build as user - updated to 0.9.3a2: * Add some support for Python 2.3 datetime classes. * Removed some casts in _mysql_init() that caused problems with Python 2.3. The type for tp_free was changed from destructor to freefunc. Removing the casts make both 2.2 and 2.3 happy. * Fixed the bug that prevented member access. * Embedded server support. Can't get it use InnoDB tables yet. However, MyISAM (default) tables seem to work fine. - one source package for both python versions - added few more files to docs - builds on lib64 - updated to 0.9.2 - use record-rpm - use versioned dependency on python - using build root - file list is correct on lib64 arches - up to 0.9.1 to make it build on python-2.2 - Add mysql-shared to neededforbuild. - initial version 0.9.0 OBS-URL: https://build.opensuse.org/request/show/672903 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-mysqlclient?expand=0&rev=8 --- MySQL-python-Py_ssize.patch | 41 ------------------------------------- mysqlclient-1.3.14.tar.gz | 3 --- mysqlclient-1.4.2.tar.gz | 3 +++ python-mysqlclient.changes | 14 +++++++++---- python-mysqlclient.spec | 4 +--- 5 files changed, 14 insertions(+), 51 deletions(-) delete mode 100644 MySQL-python-Py_ssize.patch delete mode 100644 mysqlclient-1.3.14.tar.gz create mode 100644 mysqlclient-1.4.2.tar.gz diff --git a/MySQL-python-Py_ssize.patch b/MySQL-python-Py_ssize.patch deleted file mode 100644 index 017d633..0000000 --- a/MySQL-python-Py_ssize.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ruN mysqlclient-1.3.13.orig/_mysql.c mysqlclient-1.3.13/_mysql.c ---- mysqlclient-1.3.13.orig/_mysql.c 2017-12-21 14:09:51.000000000 +0300 -+++ mysqlclient-1.3.13/_mysql.c 2018-06-28 01:04:11.433787292 +0300 -@@ -225,7 +225,7 @@ - PyObject *kwargs) { - static char *kwlist[] = {"args", "groups", NULL}; - char **cmd_args_c=NULL, **groups_c=NULL, *s; -- int cmd_argc=0, i, groupc; -+ Py_ssize_t cmd_argc=0, i, groupc; - PyObject *cmd_args=NULL, *groups=NULL, *ret=NULL, *item; - - if (_mysql_server_init_done) { -@@ -249,6 +249,10 @@ - PyErr_SetString(PyExc_TypeError, - "args could not be sized"); - goto finish; -+ } else if (cmd_argc > INT_MAX) { -+ PyErr_SetString(PyExc_ValueError, -+ "more than INT_MAX args, this is unsupported"); -+ goto finish; - } - cmd_args_c = (char **) PyMem_Malloc(cmd_argc*sizeof(char *)); - for (i=0; i< cmd_argc; i++) { -@@ -415,7 +419,7 @@ - else if (PySequence_Check(fun)) { - long flags = fields[i].flags; - PyObject *fun2=NULL; -- int j, n2=PySequence_Size(fun); -+ Py_ssize_t j, n2=PySequence_Size(fun); - if (fields[i].charsetnr != 63) { /* maaagic */ - flags &= ~BINARY_FLAG; - } -@@ -1181,7 +1185,7 @@ - PyObject *args) - { - PyObject *o=NULL, *d=NULL, *r=NULL, *item, *quoted; -- int i, n; -+ Py_ssize_t i, n; - if (!PyArg_ParseTuple(args, "OO:escape_sequence", &o, &d)) - goto error; - if (!PyMapping_Check(d)) { diff --git a/mysqlclient-1.3.14.tar.gz b/mysqlclient-1.3.14.tar.gz deleted file mode 100644 index 0af4e20..0000000 --- a/mysqlclient-1.3.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3981ae9ce545901a36a8b7aed76ed02960a429f75dc53b7ad77fb2f9ab7cd56b -size 91391 diff --git a/mysqlclient-1.4.2.tar.gz b/mysqlclient-1.4.2.tar.gz new file mode 100644 index 0000000..c21a081 --- /dev/null +++ b/mysqlclient-1.4.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b95edaa41d6cc47deecabcdcbb5ab437ad9ae6d8955f5cf10d1847b37e66ef5e +size 85634 diff --git a/python-mysqlclient.changes b/python-mysqlclient.changes index 5018049..b435cbf 100644 --- a/python-mysqlclient.changes +++ b/python-mysqlclient.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 8 23:12:28 UTC 2019 - Alexei Podvalsky + +- Update to 1.4.2: + * Fix Django 1.11 compatibility. +- Drop MySQL-python-Py_ssize.patch + ------------------------------------------------------------------- Mon Dec 10 11:39:10 UTC 2018 - Alexei Podvalsky @@ -5,7 +12,7 @@ Mon Dec 10 11:39:10 UTC 2018 - Alexei Podvalsky * Support static linking of MariaDB Connector/C (#265) * Better converter for Decimal and Float (#267, #268, #273, #286) * Add Connection._get_native_connection for XTA project (#269) - * Fix SEGV on MariaDB Connector/C when Connection.close() is called + * Fix SEGV on MariaDB Connector/C when Connection.close() is called for closed connection. (#270, #272, #276) * Fix Connection.client_flag (#266) * Fix SSCursor may raise same exception twice (#282) @@ -58,7 +65,7 @@ Mon Sep 20 11:51:54 UTC 2010 - coolo@novell.com Thu Sep 16 08:11:10 UTC 2010 - coolo@novell.com - update to 1.2.3 - - no upstream changelog available + - no upstream changelog available - taking out the reconnect patch as the upstream sources contain a very specific comment that this means trouble @@ -172,7 +179,7 @@ Wed Jan 22 14:36:52 CET 2003 - mcihar@suse.cz ------------------------------------------------------------------- Tue Jan 15 18:06:17 CET 2002 - ro@suse.de -- up to 0.9.1 to make it build on python-2.2 +- up to 0.9.1 to make it build on python-2.2 ------------------------------------------------------------------- Sat Dec 29 22:07:39 CET 2001 - schwab@suse.de @@ -184,4 +191,3 @@ Thu Nov 1 16:02:14 CET 2001 - vinil@suse.cz - initial version 0.9.0 - diff --git a/python-mysqlclient.spec b/python-mysqlclient.spec index 3d71168..9fe6b95 100644 --- a/python-mysqlclient.spec +++ b/python-mysqlclient.spec @@ -19,14 +19,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python Name: python-mysqlclient -Version: 1.3.14 +Version: 1.4.2 Release: 0 Summary: Python interface to MySQL License: GPL-2.0-or-later Group: Development/Languages/Python URL: https://github.com/PyMySQL/mysqlclient-python Source: https://files.pythonhosted.org/packages/source/m/mysqlclient/mysqlclient-%{version}.tar.gz -Patch0: MySQL-python-Py_ssize.patch BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} @@ -55,7 +54,6 @@ This package adds Python 3 support and bug fixes to MySQLdb1. %prep %setup -q -n mysqlclient-%{version} -%patch0 -p1 %build %python_build