Temporary fix for CONC-359.

4 files changed, 24 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1463125196a..19f123e1937f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mariadb-10.3
 	pkgver = 10.3.9
-	pkgrel = 1
+	pkgrel = 2
 	url = http://mariadb.org/
 	arch = x86_64
 	license = GPL
@@ -17,9 +17,11 @@ pkgbase = mariadb-10.3
 	makedepends = zlib
 	source = https://ftp.heanet.ie/mirrors/mariadb/mariadb-10.3.9/source/mariadb-10.3.9.tar.gz
 	source = https://ftp.heanet.ie/mirrors/mariadb/mariadb-10.3.9/source/mariadb-10.3.9.tar.gz.asc
+	source = fix_libmariadb_ignored_host.patch
 	validpgpkeys = 199369E5404BD5FC7D2FE43BCBCB082A1BB943DB
 	sha256sums = 561c6969bbd24dbb22d1d196a6b037665389b91e6dab881f39c5616389f156f4
 	sha256sums = SKIP
+	sha256sums = fd186c795c393b6898f28d731390bb14ea8444230c8340a5f4cfbccb16ea10e9
 
 pkgname = libmariadbclient-10.3
 	pkgdesc = MariaDB client libraries
diff --git a/.gitignore b/.gitignore
index 96e632df74c6..a5c4d4eed705 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 !PKGBUILD
 !.SRCINFO
 !mariadb.install
+!fix_libmariadb_ignored_host.patch
diff --git a/PKGBUILD b/PKGBUILD
index 806604d55b50..ba22308e9699 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,16 +5,18 @@
 pkgbase=mariadb-10.3
 pkgname=('libmariadbclient-10.3' 'mariadb-clients-10.3' 'mytop-10.3' 'mariadb-10.3')
 pkgver=10.3.9
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('GPL')
 url='http://mariadb.org/'
 makedepends=('boost' 'bzip2' 'cmake' 'jemalloc' 'libaio' 'libxml2' 'lz4' 'lzo'
              'openssl' 'systemd' 'zlib')
 validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key <package-signing-key@mariadb.org>
-source=("https://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc})
+source=("https://ftp.heanet.ie/mirrors/mariadb/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz"{,.asc}
+        fix_libmariadb_ignored_host.patch)
 sha256sums=('561c6969bbd24dbb22d1d196a6b037665389b91e6dab881f39c5616389f156f4'
-            'SKIP')
+            'SKIP'
+            'fd186c795c393b6898f28d731390bb14ea8444230c8340a5f4cfbccb16ea10e9')
 
 prepare() {
   cd ${pkgbase%-10.3}-$pkgver/
@@ -28,6 +30,10 @@ prepare() {
 
   # let's create the datadir from tmpfiles
   echo 'd @MYSQL_DATADIR@ 0700 @MYSQLD_USER@ @MYSQLD_USER@ -' >> support-files/tmpfiles.conf.in
+
+  # Fix that libmariadb ignores the host from .my.cnf files
+  # More info: https://jira.mariadb.org/browse/CONC-359
+  patch -p0 < ../fix_libmariadb_ignored_host.patch
 }
 
 build() {
diff --git a/fix_libmariadb_ignored_host.patch b/fix_libmariadb_ignored_host.patch
new file mode 100644
index 000000000000..3a19a2834d45
--- /dev/null
+++ b/fix_libmariadb_ignored_host.patch
@@ -0,0 +1,11 @@
+--- libmariadb/libmariadb/mariadb_lib.c.orig	2018-08-30 11:28:43.886487068 +0100
++++ libmariadb/libmariadb/mariadb_lib.c	2018-08-30 11:27:58.819551110 +0100
+@@ -1236,6 +1236,8 @@
+ #endif
+ 
+   /* Some empty-string-tests are done because of ODBC */
++  if (!host || !host[0])
++    host=mysql->options.host;
+   if (!user || !user[0])
+     user=mysql->options.user;
+   if (!passwd)