[Python-modules-commits] r23702 - in packages/python-mysqldb/trunk/debian (4 files)

[zigo at users.alioth.debian.org]

    Date: Friday, March 15, 2013 @ 05:50:45
  Author: zigo
Revision: 23702

Added patch from Mika Pfl?\195?\188ger <debian at mikapflueger.de>:
  * Team upload.
  * debian/patches/05_ssl.patch: Add upstream patch to force building
    SSL support with newer MySQL client libraries. Thanks to Eldon Koyle
    for isolating the fix in the upstream VCS. (Closes: #678169)
  * Delete now obsolete debian/patches/README.source which referred to
    dpatch.

Added:
  packages/python-mysqldb/trunk/debian/patches/05_ssl.patch
Modified:
  packages/python-mysqldb/trunk/debian/changelog
  packages/python-mysqldb/trunk/debian/patches/series
Deleted:
  packages/python-mysqldb/trunk/debian/README.source

Deleted: packages/python-mysqldb/trunk/debian/README.source
===================================================================
--- packages/python-mysqldb/trunk/debian/README.source	2013-03-13 19:12:19 UTC (rev 23701)
+++ packages/python-mysqldb/trunk/debian/README.source	2013-03-15 05:50:45 UTC (rev 23702)
@@ -1,2 +0,0 @@
-This package uses dpatch for its patch management, see
-/usr/share/doc/dpatch/README.source.gz if you are unfamiliar with it.

Modified: packages/python-mysqldb/trunk/debian/changelog
===================================================================
--- packages/python-mysqldb/trunk/debian/changelog	2013-03-13 19:12:19 UTC (rev 23701)
+++ packages/python-mysqldb/trunk/debian/changelog	2013-03-15 05:50:45 UTC (rev 23702)
@@ -1,3 +1,14 @@
+python-mysqldb (1.2.3-2) unstable; urgency=low
+
+  * Team upload.
+  * debian/patches/05_ssl.patch: Add upstream patch to force building
+    SSL support with newer MySQL client libraries. Thanks to Eldon Koyle
+    for isolating the fix in the upstream VCS. (Closes: #678169)
+  * Delete now obsolete debian/patches/README.source which referred to
+    dpatch.
+
+ -- Mika Pflüger <debian at mikapflueger.de>  Mon, 11 Mar 2013 18:03:06 +0100
+
 python-mysqldb (1.2.3-1) unstable; urgency=low
 
   * Merge with package from Ubuntu, thanks to Mario Limonciello.

Added: packages/python-mysqldb/trunk/debian/patches/05_ssl.patch
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/05_ssl.patch	                        (rev 0)
+++ packages/python-mysqldb/trunk/debian/patches/05_ssl.patch	2013-03-15 05:50:45 UTC (rev 23702)
@@ -0,0 +1,21 @@
+Description: Force HAVE_OPENSSL if the client library is 5.5 or newer.
+Origin: http://sourceforge.net/p/mysql-python/svn/656/tree//branches/MySQLdb-1.2/MySQLdb/_mysql.c?diff=5059d1f5bfc09e26e1a66617:655
+Bug: http://sourceforge.net/p/mysql-python/bugs/323/
+Reviewed-by: Eldon Koyle <ekoyle at gmail.com>
+Last-Update: 2013-03-11
+
+Index: python-mysqldb-argh/_mysql.c
+===================================================================
+--- python-mysqldb-argh.orig/_mysql.c	2010-06-17 09:21:56.000000000 +0200
++++ python-mysqldb-argh/_mysql.c	2013-03-11 18:30:38.839269635 +0100
+@@ -102,6 +102,10 @@
+ #define check_server_init(x) if (!_mysql_server_init_done) _mysql_server_init_done = 1
+ #endif
+ 
++#if MYSQL_VERSION_ID >= 50500
++#define HAVE_OPENSSL 1
++#endif
++
+ PyObject *
+ _mysql_Exception(_mysql_ConnectionObject *c)
+ {

Modified: packages/python-mysqldb/trunk/debian/patches/series
===================================================================
--- packages/python-mysqldb/trunk/debian/patches/series	2013-03-13 19:12:19 UTC (rev 23701)
+++ packages/python-mysqldb/trunk/debian/patches/series	2013-03-15 05:50:45 UTC (rev 23702)
@@ -1,2 +1,3 @@
 01_converters_boolean.patch
 03_converters_set2str.patch
+05_ssl.patch