commit mysql-proxy 0.8.5-8

3 files changed, 63 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a42e5b039a1..65d7b2d6584d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,12 @@
-# Generated by mksrcinfo v8
-# Fri Sep 15 21:34:45 UTC 2017
 pkgbase = mysql-proxy
 	pkgdesc = Monitors, analyzes and transformations communication between the MySQL client and server
 	pkgver = 0.8.5
-	pkgrel = 7
+	pkgrel = 8
 	url = http://dev.mysql.com/downloads/mysql-proxy/
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = libmariadbclient
+	makedepends = mariadb-libs
 	depends = lua51
 	depends = glib2
 	depends = libevent
@@ -16,11 +14,14 @@ pkgbase = mysql-proxy
 	source = http://cdn.mysql.com/Downloads/MySQL-Proxy/mysql-proxy-0.8.5.tar.gz
 	source = http://cdn.mysql.com/Downloads/MySQL-Proxy/mysql-proxy-0.8.5.tar.gz.asc
 	source = 0001-fix-build-with-libevent-2.1.patch
+	source = 0002-mariadb.patch
 	source = mysql-proxy.service
 	source = proxy.cnf
+	validpgpkeys = A4A9406876FCBD3C456770C88C718D3B5072E1F5
 	sha256sums = e5bac3df8bca2eed41cdbf09439264b34c77339cfe1eda506b0d76eaa2d2b2d5
 	sha256sums = SKIP
 	sha256sums = 6e99e92283bf521ee3b45f14a3469025f608533d00b9d0bc724f78c90cc4a0ee
+	sha256sums = 097322a02dc1c52bed30813ff93c2b37e164188a31cbf98116a48fb150a42577
 	sha256sums = 197099f1b064fd36f8051909d3a20684575b2296a9b24886538e5286d9410e4b
 	sha256sums = 95170a086c5da94c8b1362fd5cd1ad3c9e75abe950faed362d0bd3710894ac94
 
diff --git a/0002-mariadb.patch b/0002-mariadb.patch
new file mode 100644
index 000000000000..c426d7c8d750
--- /dev/null
+++ b/0002-mariadb.patch
@@ -0,0 +1,53 @@
+diff --git a/src/network-mysqld-packet.c b/src/network-mysqld-packet.c
+index 3e5740b..5c81e49 100644
+--- a/src/network-mysqld-packet.c
++++ b/src/network-mysqld-packet.c
+@@ -97,7 +97,7 @@ int network_mysqld_proto_get_com_query_result(network_packet *packet, network_my
+ 			err = err || network_mysqld_proto_get_ok_packet(packet, ok_packet);
+ 
+ 			if (!err) {
+-				if (ok_packet->server_status & SERVER_MORE_RESULTS_EXISTS) {
++				if (ok_packet->server_status & SERVER_MORE_RESULTS_EXIST) {
+ 			
+ 				} else {
+ 					is_finished = 1;
+@@ -167,7 +167,7 @@ int network_mysqld_proto_get_com_query_result(network_packet *packet, network_my
+ 
+ 				if (!err) {
+ #if MYSQL_VERSION_ID >= 50000
+-					/* 5.5 may send a SERVER_MORE_RESULTS_EXISTS as part of the first 
++					/* 5.5 may send a SERVER_MORE_RESULTS_EXIST as part of the first 
+ 					 * EOF together with SERVER_STATUS_CURSOR_EXISTS. In that case,
+ 					 * we aren't finished. (#61998)
+ 					 *
+@@ -180,7 +180,7 @@ int network_mysqld_proto_get_com_query_result(network_packet *packet, network_my
+ 					 */
+ 					if (use_binary_row_data &&
+ 					    eof_packet->server_status & SERVER_STATUS_CURSOR_EXISTS &&
+-					    !(eof_packet->server_status & SERVER_MORE_RESULTS_EXISTS)) {
++					    !(eof_packet->server_status & SERVER_MORE_RESULTS_EXIST)) {
+ 						is_finished = 1;
+ 					} else {
+ 						query->state = PARSE_COM_QUERY_RESULT;
+@@ -234,7 +234,7 @@ int network_mysqld_proto_get_com_query_result(network_packet *packet, network_my
+ 					}
+ 					query->warning_count = eof_packet->warnings;
+ 
+-					if (query->server_status & SERVER_MORE_RESULTS_EXISTS) {
++					if (query->server_status & SERVER_MORE_RESULTS_EXIST) {
+ 						query->state = PARSE_COM_QUERY_INIT;
+ 					} else {
+ 						is_finished = 1;
+diff --git a/plugins/admin/admin-plugin.c b/plugins/admin/admin-plugin.c
+index e3e36a1..1521deb 100644
+--- a/plugins/admin/admin-plugin.c
++++ b/plugins/admin/admin-plugin.c
+@@ -208,7 +208,7 @@ NETWORK_MYSQLD_PLUGIN_PROTO(server_con_init) {
+ 	challenge->server_version_str = g_strdup("5.0.99-agent-admin");
+ 	challenge->server_version     = 50099;
+ 	challenge->charset            = 0x08; /* latin1 */
+-	challenge->capabilities       = CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION | CLIENT_LONG_PASSWORD;
++	challenge->capabilities       = CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION;
+ 	challenge->server_status      = SERVER_STATUS_AUTOCOMMIT;
+ 	challenge->thread_id          = 1;
+ 
diff --git a/PKGBUILD b/PKGBUILD
index c0adec2260e7..c21872b29312 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,22 +4,24 @@
 
 pkgname=mysql-proxy
 pkgver=0.8.5
-pkgrel=7
+pkgrel=8
 pkgdesc='Monitors, analyzes and transformations communication between the MySQL client and server'
 arch=('i686' 'x86_64')
 url='http://dev.mysql.com/downloads/mysql-proxy/'
 license=('GPL')
 depends=('lua51' 'glib2' 'libevent')
-makedepends=('libmariadbclient')
+makedepends=('mariadb-libs')
 validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
 backup=('etc/mysql/proxy.cnf')
 source=("http://cdn.mysql.com/Downloads/MySQL-Proxy/${pkgname}-${pkgver}.tar.gz"{,.asc}
         '0001-fix-build-with-libevent-2.1.patch'
+        '0002-mariadb.patch'
 	'mysql-proxy.service'
 	'proxy.cnf')
 sha256sums=('e5bac3df8bca2eed41cdbf09439264b34c77339cfe1eda506b0d76eaa2d2b2d5'
             'SKIP'
             '6e99e92283bf521ee3b45f14a3469025f608533d00b9d0bc724f78c90cc4a0ee'
+            '097322a02dc1c52bed30813ff93c2b37e164188a31cbf98116a48fb150a42577'
             '197099f1b064fd36f8051909d3a20684575b2296a9b24886538e5286d9410e4b'
             '95170a086c5da94c8b1362fd5cd1ad3c9e75abe950faed362d0bd3710894ac94')
 
@@ -27,6 +29,7 @@ prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	patch -Np1 < "${srcdir}"/0001-fix-build-with-libevent-2.1.patch
+	patch -Np1 < "${srcdir}"/0002-mariadb.patch
 }
 
 build() {