[DRE-commits] [ruby-mysql2] 02/05: skip check for exact versions of the MySQL client library

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-mysql2.

commit fc48e6d19180d6536732577cd6339ba4a0dffe90
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Feb 25 11:49:37 2016 -0300

    skip check for exact versions of the MySQL client library
    
    Closes: #794477
---
 debian/changelog                       |  2 ++
 debian/patches/series                  |  1 +
 debian/patches/trust-library-ABI.patch | 35 ++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0a5f38f..957b1c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ ruby-mysql2 (0.4.3-1) UNRELEASED; urgency=medium
   * Move logic for calling debian/start_mysqld_and_run.sh for running the
     tests inside debian/ruby-tests.rake
   * Add skip-problematic-tests.patch to skip 2 tests (Closes: #815770, #796516)
+  * Add trust-library-ABI.patch: skip check for exact versions of the MySQL
+    client library (Closes: #794477)
 
  -- Christian Hofstaedtler <zeha at debian.org>  Tue, 02 Feb 2016 19:04:34 -0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 07eb89a..df136f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 remove_rpath_compilation_flag.patch
 remove_rubygems_from_examples.patch
 skip-problematic-tests.patch
+trust-library-ABI.patch
diff --git a/debian/patches/trust-library-ABI.patch b/debian/patches/trust-library-ABI.patch
new file mode 100644
index 0000000..11eb31c
--- /dev/null
+++ b/debian/patches/trust-library-ABI.patch
@@ -0,0 +1,35 @@
+Description: Trust library ABI
+ Instead of forcibly checking MySQL client library versions, let's trust the library ABI versioning to work.
+Author: Antonio Terceiro <terceiro at debian.org>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=794477
+Forwarded: not-needed
+Last-Update: 2016-02-25
+---
+--- a/ext/mysql2/client.c
++++ b/ext/mysql2/client.c
+@@ -1267,24 +1267,6 @@ static VALUE rb_mysql_client_prepare_sta
+ }
+ 
+ void init_mysql2_client() {
+-#ifdef _WIN32
+-  /* verify the libmysql we're about to use was the version we were built against
+-     https://github.com/luislavena/mysql-gem/commit/a600a9c459597da0712f70f43736e24b484f8a99 */
+-  int i;
+-  int dots = 0;
+-  const char *lib = mysql_get_client_info();
+-
+-  for (i = 0; lib[i] != 0 && MYSQL_LINK_VERSION[i] != 0; i++) {
+-    if (lib[i] == '.') {
+-      dots++;
+-              /* we only compare MAJOR and MINOR */
+-      if (dots == 2) break;
+-    }
+-    if (lib[i] != MYSQL_LINK_VERSION[i]) {
+-      rb_raise(rb_eRuntimeError, "Incorrect MySQL client library version! This gem was compiled for %s but the client library is %s.", MYSQL_LINK_VERSION, lib);
+-    }
+-  }
+-#endif
+ 
+   /* Initializing mysql library, so different threads could call Client.new */
+   /* without race condition in the library */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-mysql2.git