[packages/mysql-proxy] - fix building with libevent 2.1 - rel 2

baggins baggins at pld-linux.org
Tue Apr 4 19:57:42 CEST 2017


commit 29fa83f090173d4b3300f496528d7afa22ba4b29
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Apr 4 19:57:26 2017 +0200

    - fix building with libevent 2.1
    - rel 2

 libevent-2.1.patch | 23 +++++++++++++++++++++++
 mysql-proxy.spec   |  4 +++-
 2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/mysql-proxy.spec b/mysql-proxy.spec
index b9ce761..cc7bbc0 100644
--- a/mysql-proxy.spec
+++ b/mysql-proxy.spec
@@ -27,7 +27,7 @@ Summary:	MySQL Proxy
 Summary(pl.UTF-8):	Proxy MySQL
 Name:		mysql-proxy
 Version:	0.8.4
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/Networking
 Source0:	ftp://mysql.mirror.kangaroot.net/pub/mysql/Downloads/MySQL-Proxy/%{name}-%{version}.tar.gz
@@ -37,6 +37,7 @@ Source2:	%{name}.sysconfig
 Source3:	%{name}.conf
 Source4:	admin-1.lua
 Patch0:		install-examples.patch
+Patch1:		libevent-2.1.patch
 URL:		http://forge.mysql.com/wiki/MySQL_Proxy
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake
@@ -84,6 +85,7 @@ zapytań... i wiele więcej.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e 's/g_build_filename(base_dir, "lib"/g_build_filename(base_dir, "%{_lib}"/g' src/chassis-frontend.c
 %{__sed} -i -e 's/g_build_filename(srv->base_dir, "lib"/g_build_filename(srv->base_dir, "%{_lib}"/g' src/chassis-frontend.c
diff --git a/libevent-2.1.patch b/libevent-2.1.patch
new file mode 100644
index 0000000..e140f02
--- /dev/null
+++ b/libevent-2.1.patch
@@ -0,0 +1,23 @@
+--- mysql-proxy-0.8.4/src/chassis-mainloop.c~	2013-12-23 23:57:16.000000000 +0100
++++ mysql-proxy-0.8.4/src/chassis-mainloop.c	2017-04-04 19:55:23.933963035 +0200
+@@ -99,9 +99,9 @@
+ chassis *chassis_new() {
+ 	chassis *chas;
+ 
+-	if (0 != chassis_check_version(event_get_version(), _EVENT_VERSION)) {
++	if (0 != chassis_check_version(event_get_version(), LIBEVENT_VERSION)) {
+ 		g_critical("%s: chassis is build against libevent %s, but now runs against %s",
+-				G_STRLOC, _EVENT_VERSION, event_get_version());
++				G_STRLOC, LIBEVENT_VERSION, event_get_version());
+ 		return NULL;
+ 	}
+ 
+@@ -116,7 +116,7 @@
+ 
+ 	chas->threads = chassis_event_threads_new();
+ 
+-	chas->event_hdr_version = g_strdup(_EVENT_VERSION);
++	chas->event_hdr_version = g_strdup(LIBEVENT_VERSION);
+ 
+ 	chas->shutdown_hooks = chassis_shutdown_hooks_new();
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql-proxy.git/commitdiff/29fa83f090173d4b3300f496528d7afa22ba4b29



More information about the pld-cvs-commit mailing list