diff --git a/.MySQL-python.metadata b/.MySQL-python.metadata index 9aa7196..fd61758 100644 --- a/.MySQL-python.metadata +++ b/.MySQL-python.metadata @@ -1 +1 @@ -3511bb8c57c6016eeafa531d5c3ea4b548915e3c SOURCES/MySQL-python-1.2.3.tar.gz +b935a26b3cf80338bcc21b8a991081d83eb9c3ae SOURCES/MySQL-python-1.2.5.zip diff --git a/.gitignore b/.gitignore index 894b2a1..59e0180 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/MySQL-python-1.2.3.tar.gz +SOURCES/MySQL-python-1.2.5.zip diff --git a/SOURCES/MySQL-python-no-openssl.patch b/SOURCES/MySQL-python-no-openssl.patch index 438df84..0a90c17 100644 --- a/SOURCES/MySQL-python-no-openssl.patch +++ b/SOURCES/MySQL-python-no-openssl.patch @@ -6,48 +6,48 @@ we can just drop the conditionals, pending some other fix upstream. suitable fix for upstream too.) -diff -Naur MySQL-python-1.2.3.orig/_mysql.c MySQL-python-1.2.3/_mysql.c ---- MySQL-python-1.2.3.orig/_mysql.c 2010-06-17 03:21:56.000000000 -0400 -+++ MySQL-python-1.2.3/_mysql.c 2012-07-14 16:49:31.590349235 -0400 -@@ -475,10 +475,8 @@ - MYSQL *conn = NULL; - PyObject *conv = NULL; - PyObject *ssl = NULL; --#if HAVE_OPENSSL - char *key = NULL, *cert = NULL, *ca = NULL, - *capath = NULL, *cipher = NULL; --#endif - char *host = NULL, *user = NULL, *passwd = NULL, - *db = NULL, *unix_socket = NULL; - unsigned int port = 0; -@@ -519,18 +517,12 @@ - PyErr_Clear();} - - if (ssl) { --#if HAVE_OPENSSL - PyObject *value = NULL; - _stringsuck(ca, value, ssl); - _stringsuck(capath, value, ssl); - _stringsuck(cert, value, ssl); - _stringsuck(key, value, ssl); - _stringsuck(cipher, value, ssl); --#else -- PyErr_SetString(_mysql_NotSupportedError, -- "client library does not have SSL support"); -- return -1; --#endif - } - - Py_BEGIN_ALLOW_THREADS ; -@@ -556,11 +548,9 @@ - if (local_infile != -1) - mysql_options(&(self->connection), MYSQL_OPT_LOCAL_INFILE, (char *) &local_infile); - --#if HAVE_OPENSSL - if (ssl) - mysql_ssl_set(&(self->connection), - key, cert, ca, capath, cipher); --#endif - - conn = mysql_real_connect(&(self->connection), host, user, passwd, db, - port, unix_socket, client_flag); +diff -Naur MySQL-python-1.2.5.orig/_mysql.c MySQL-python-1.2.5/_mysql.c +--- MySQL-python-1.2.5.orig/_mysql.c 2014-01-02 13:52:50.000000000 +0100 ++++ MySQL-python-1.2.5/_mysql.c 2015-10-15 17:14:08.495603713 +0200 +@@ -551,10 +551,8 @@ + MYSQL *conn = NULL; + PyObject *conv = NULL; + PyObject *ssl = NULL; +-#if HAVE_OPENSSL + char *key = NULL, *cert = NULL, *ca = NULL, + *capath = NULL, *cipher = NULL; +-#endif + char *host = NULL, *user = NULL, *passwd = NULL, + *db = NULL, *unix_socket = NULL; + unsigned int port = 0; +@@ -618,18 +616,12 @@ + #endif + + if (ssl) { +-#if HAVE_OPENSSL + PyObject *value = NULL; + _stringsuck(ca, value, ssl); + _stringsuck(capath, value, ssl); + _stringsuck(cert, value, ssl); + _stringsuck(key, value, ssl); + _stringsuck(cipher, value, ssl); +-#else +- PyErr_SetString(_mysql_NotSupportedError, +- "client library does not have SSL support"); +- return -1; +-#endif + } + + Py_BEGIN_ALLOW_THREADS ; +@@ -667,11 +659,9 @@ + if (local_infile != -1) + mysql_options(&(self->connection), MYSQL_OPT_LOCAL_INFILE, (char *) &local_infile); + +-#if HAVE_OPENSSL + if (ssl) + mysql_ssl_set(&(self->connection), + key, cert, ca, capath, cipher); +-#endif + + conn = mysql_real_connect(&(self->connection), host, user, passwd, db, + port, unix_socket, client_flag); diff --git a/SPECS/MySQL-python.spec b/SPECS/MySQL-python.spec index 3b779e0..136396a 100644 --- a/SPECS/MySQL-python.spec +++ b/SPECS/MySQL-python.spec @@ -1,12 +1,12 @@ Summary: An interface to MySQL Name: MySQL-python -Version: 1.2.3 -Release: 11%{?dist} +Version: 1.2.5 +Release: 1%{?dist} License: GPLv2+ Group: Development/Libraries -URL: http://sourceforge.net/projects/mysql-python/ +URL: https://github.com/farcepest/MySQLdb1 -Source0: http://prdownloads.sourceforge.net/mysql-python/MySQL-python-%{version}.tar.gz +Source0: http://pypi.python.org/packages/source/M/%{name}/%{name}-%{version}.zip Patch1: MySQL-python-no-openssl.patch @@ -46,7 +46,7 @@ export libdirname=%{_lib} python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES %files -f INSTALLED_FILES -%doc README doc/* +%doc README.md doc/* %dir %{python_sitearch}/MySQLdb %{python_sitearch}/MySQLdb/*.pyo %{python_sitearch}/MySQLdb/constants/*.pyo @@ -54,6 +54,10 @@ python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES %dir %{python_sitearch}/MySQLdb/constants %changelog +* Thu Oct 15 2015 Jakub Dorňák - 1.2.5-1 +- Update to 1.2.5 + Resolves: #1266849 + * Fri Jan 24 2014 Daniel Mach - 1.2.3-11 - Mass rebuild 2014-01-24