[mysql-proxy/el6/master] New upstream release: MySQL 0.8.1
Dominic Hopf
dmaphy at fedoraproject.org
Sat Feb 12 18:27:24 UTC 2011
commit 3c380bef12f9d054b9496412cb332235771e9573
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date: Sat Feb 12 19:06:01 2011 +0100
New upstream release: MySQL 0.8.1
.gitignore | 2 +-
mysql-proxy.init | 5 +++-
mysql-proxy.spec | 62 +++++++++++++++++++++++++++++++++++++++---------
mysql-proxy.sysconfig | 3 ++
sources | 2 +-
5 files changed, 59 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fb47dbf..02a2979 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-mysql-proxy-0.7.2.tar.gz
+/mysql-proxy-0.8.1.tar.gz
diff --git a/mysql-proxy.init b/mysql-proxy.init
index 445605f..37dba26 100644
--- a/mysql-proxy.init
+++ b/mysql-proxy.init
@@ -20,6 +20,9 @@ fi
[ ${NETWORKING} = "no" ] && exit 0
# Set default mysql-proxy configuration.
+ADMIN_USER="admin"
+ADMIN_PASSWD=""
+ADMIN_LUA_SCRIPT="/usr/lib/mysql-proxy/lua/admin.lua"
PROXY_OPTIONS="--daemon"
PROXY_PID=/var/run/mysql-proxy.pid
PROXY_USER="mysql-proxy"
@@ -33,7 +36,7 @@ RETVAL=0
start() {
echo -n $"Starting $prog: "
- daemon $prog $PROXY_OPTIONS --pid-file $PROXY_PID --user $PROXY_USER
+ daemon $prog $PROXY_OPTIONS --pid-file=$PROXY_PID --user=$PROXY_USER --admin-username="$ADMIN_USER" --admin-lua-script="$ADMIN_LUA_SCRIPT" --admin-password="$ADMIN_PASSWORD"
RETVAL=$?
echo
if [ $RETVAL -eq 0 ]; then
diff --git a/mysql-proxy.spec b/mysql-proxy.spec
index dc318bb..c07542f 100644
--- a/mysql-proxy.spec
+++ b/mysql-proxy.spec
@@ -1,5 +1,5 @@
Name: mysql-proxy
-Version: 0.7.2
+Version: 0.8.1
Release: 1%{?dist}
Summary: A proxy for the MySQL Client/Server protocol
@@ -9,9 +9,8 @@ URL: http://forge.mysql.com/wiki/MySQL_Proxy
# I haven't found a link to a direct download location, only to mirrors
Source0: http://mysql.he.net/Downloads/MySQL-Proxy/%{name}-%{version}.tar.gz
-Source1: %{name}.init
-Source2: %{name}.sysconfig
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source1: %{name}.init
+Source2: %{name}.sysconfig
BuildRequires: lua-devel
BuildRequires: libevent-devel
@@ -31,12 +30,32 @@ Requires(postun): initscripts
MySQL Proxy is a simple program that sits between your client and MySQL
server(s) that can monitor, analyze or transform their communication.
Its flexibility allows for unlimited uses, common ones include: load balancing,
-failover, query analysis, query filtering and modification and many more.
+fail-over, query analysis, query filtering and modification and many more.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+
+%description devel
+Development files for %{name}
+
%prep
%setup -q -n %{name}-%{version}
-sed -i 's/g_build_filename(base_dir, "lib"/g_build_filename(base_dir, "%{_lib}"/g' src/chassis.c
-sed -i 's/g_build_filename(srv->base_dir, "lib"/g_build_filename(srv->base_dir, "%{_lib}"/g' src/chassis.c
+
+# dirty hack to make sure mysql-proxy looks at correct location for its plugins
+# ideally this should be replaced with autoconf variables
+# reported upstream as #58888
+sed -i 's#g_build_filename(base_dir, "lib"#g_build_filename(base_dir, "%{_lib}"#g' src/chassis-frontend.c
+sed -i 's#g_build_filename(srv->base_dir, "lib"#g_build_filename(srv->base_dir, "%{_lib}"#g' src/chassis-frontend.c
+
+cp %{SOURCE1} %{name}.init
+cp %{SOURCE2} %{name}.sysconfig
+sed -i 's#/usr/lib#%{_libdir}#g' %{name}.init
+sed -i 's#/usr/lib#%{_libdir}#g' %{name}.sysconfig
+
%build
%configure
@@ -52,28 +71,33 @@ rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -type f -name \*.la -exec rm -v {} \;
rm -v examples/Makefile* examples/CMakeLists.txt
-install -Dp -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
-install -Dp -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+install -Dp -m 0755 %{name}.init %{buildroot}%{_initrddir}/%{name}
+install -Dp -m 0644 %{name}.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+
%clean
rm -rf %{buildroot}
+
%pre
getent group %{name} &>/dev/null || groupadd -r %{name} &>/dev/null
getent passwd %{name} &>/dev/null || \
useradd -r -g %{name} -d / -s /sbin/nologin \
-c "MySQL-Proxy user" %{name} &>/dev/null || :
+
%post
ldconfig
/sbin/chkconfig --add %{name} || :
+
%preun
if [ "$1" = 0 ] ; then
/sbin/service %{name} stop > /dev/null 2>&1
/sbin/chkconfig --del %{name} || :
fi
+
%postun
ldconfig
if [ "$1" -ge 1 ]; then
@@ -85,16 +109,30 @@ fi
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS
%doc examples/
-%{_sbindir}/%{name}
+%{_bindir}/%{name}
%{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_bindir}/mysql-binlog-dump
%{_bindir}/mysql-myisam-dump
-%{_libdir}/libmysql-chassis.so*
-%{_libdir}/libmysql-proxy.so*
+%{_libdir}/libmysql-*.so.*
%{_libdir}/%{name}
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/*.h
+%{_libdir}/libmysql-*.so
+%{_libdir}/pkgconfig/mysql-chassis.pc
+%{_libdir}/pkgconfig/mysql-proxy.pc
+
+
%changelog
+* Sun Oct 17 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.8.1-1
+- Upstream released new version
+
+* Sun Jan 31 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.8.0-1
+- Upstream released new version
+
* Wed Aug 12 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 0.7.2-1
- Upstream released new version
diff --git a/mysql-proxy.sysconfig b/mysql-proxy.sysconfig
index 0457530..e4d8e5f 100644
--- a/mysql-proxy.sysconfig
+++ b/mysql-proxy.sysconfig
@@ -1,4 +1,7 @@
# Options for mysql-proxy
+ADMIN_USER="admin"
+ADMIN_PASSWORD=""
+ADMIN_LUA_SCRIPT="/usr/lib/mysql-proxy/lua/admin.lua"
PROXY_USER="mysql-proxy"
PROXY_OPTIONS="--daemon --log-level=info --log-use-syslog"
diff --git a/sources b/sources
index 386c2a4..8540e54 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85caf142acfb4ee7ae5a8bce175579f7 mysql-proxy-0.7.2.tar.gz
+9e489c41f6246c24316f238b0172bef9 mysql-proxy-0.8.1.tar.gz
More information about the scm-commits
mailing list