commit mysql-proxy 0.8.5-7

3 files changed, 63 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f950254dcca4..9a42e5b039a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,26 @@
+# 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 = 6
+	pkgrel = 7
 	url = http://dev.mysql.com/downloads/mysql-proxy/
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = libmysqlclient
+	makedepends = libmariadbclient
 	depends = lua51
 	depends = glib2
 	depends = libevent
 	backup = etc/mysql/proxy.cnf
 	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 = mysql-proxy.service
 	source = proxy.cnf
 	sha256sums = e5bac3df8bca2eed41cdbf09439264b34c77339cfe1eda506b0d76eaa2d2b2d5
 	sha256sums = SKIP
+	sha256sums = 6e99e92283bf521ee3b45f14a3469025f608533d00b9d0bc724f78c90cc4a0ee
 	sha256sums = 197099f1b064fd36f8051909d3a20684575b2296a9b24886538e5286d9410e4b
 	sha256sums = 95170a086c5da94c8b1362fd5cd1ad3c9e75abe950faed362d0bd3710894ac94
 
diff --git a/0001-fix-build-with-libevent-2.1.patch b/0001-fix-build-with-libevent-2.1.patch
new file mode 100644
index 000000000000..3dd5b99982ed
--- /dev/null
+++ b/0001-fix-build-with-libevent-2.1.patch
@@ -0,0 +1,46 @@
+From a36f01a19195eeb821965bcbc0a89a12b4656ae9 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Fri, 15 Sep 2017 23:32:36 +0200
+Subject: [PATCH 1/1] fix build with libevent 2.1
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+---
+ deps/libevent.event-config.h.cmake | 2 +-
+ src/chassis-mainloop.c             | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/deps/libevent.event-config.h.cmake b/deps/libevent.event-config.h.cmake
+index 9c4a8ca..74d4937 100644
+--- a/deps/libevent.event-config.h.cmake
++++ b/deps/libevent.event-config.h.cmake
+@@ -32,4 +32,4 @@
+ #cmakedefine _EVENT_HAVE_TIMERISSET

+ #cmakedefine _EVENT_HAVE_TIMERCLEAR

+ 

+-#define _EVENT_VERSION "libevent-1.4.11-stable"

++#define EVENT__VERSION "libevent-1.4.11-stable"

+diff --git a/src/chassis-mainloop.c b/src/chassis-mainloop.c
+index 433cbfe..ed6f364 100644
+--- a/src/chassis-mainloop.c
++++ b/src/chassis-mainloop.c
+@@ -99,9 +99,9 @@ int chassis_check_version(const char *lib_version, const char *hdr_version) {
+ chassis *chassis_new() {
+ 	chassis *chas;
+ 
+-	if (0 != chassis_check_version(event_get_version(), _EVENT_VERSION)) {
++	if (0 != chassis_check_version(event_get_version(), EVENT__VERSION)) {
+ 		g_critical("%s: chassis is build against libevent %s, but now runs against %s",
+-				G_STRLOC, _EVENT_VERSION, event_get_version());
++				G_STRLOC, EVENT__VERSION, event_get_version());
+ 		return NULL;
+ 	}
+ 
+@@ -116,7 +116,7 @@ chassis *chassis_new() {
+ 
+ 	chas->threads = chassis_event_threads_new();
+ 
+-	chas->event_hdr_version = g_strdup(_EVENT_VERSION);
++	chas->event_hdr_version = g_strdup(EVENT__VERSION);
+ 
+ 	chas->shutdown_hooks = chassis_shutdown_hooks_new();
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 17888f54925b..c0adec2260e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,30 +4,38 @@
 
 pkgname=mysql-proxy
 pkgver=0.8.5
-pkgrel=6
+pkgrel=7
 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=('libmysqlclient')
+makedepends=('libmariadbclient')
 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'
 	'mysql-proxy.service'
 	'proxy.cnf')
 sha256sums=('e5bac3df8bca2eed41cdbf09439264b34c77339cfe1eda506b0d76eaa2d2b2d5'
             'SKIP'
+            '6e99e92283bf521ee3b45f14a3469025f608533d00b9d0bc724f78c90cc4a0ee'
             '197099f1b064fd36f8051909d3a20684575b2296a9b24886538e5286d9410e4b'
             '95170a086c5da94c8b1362fd5cd1ad3c9e75abe950faed362d0bd3710894ac94')
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -Np1 < "${srcdir}"/0001-fix-build-with-libevent-2.1.patch
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	./configure \
 		--prefix=/usr \
 		--datadir=/usr/share/${pkgname} \
-		--with-lua=lua5.1
+		--with-lua=lua51
 	make
 }