Include a config file for easier usage of mysql-proxy. Upstream moved the binary as well, so update init.d to reflect new /usr/bin/ location.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 129 insertions, 5 deletions

diff --git a/dev-db/mysql-proxy/ChangeLog b/dev-db/mysql-proxy/ChangeLog
index b7f07101a3bb..5871311bf323 100644
--- a/dev-db/mysql-proxy/ChangeLog
+++ b/dev-db/mysql-proxy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysql-proxy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/ChangeLog,v 1.6 2010/05/14 10:34:29 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/ChangeLog,v 1.7 2010/05/29 20:45:04 robbat2 Exp $
+
+*mysql-proxy-0.8.0-r1 (29 May 2010)
+
+  29 May 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +files/mysql-proxy.confd-0.8.0-r1, +mysql-proxy-0.8.0-r1.ebuild,
+  +files/mysql-proxy.cnf, files/mysql-proxy.initd:
+  Include a config file for easier usage of mysql-proxy. Upstream moved the
+  binary as well, so update init.d to reflect new /usr/bin/ location.
 
 *mysql-proxy-0.8.0 (14 May 2010)
 
diff --git a/dev-db/mysql-proxy/Manifest b/dev-db/mysql-proxy/Manifest
index d731164c7407..851ba9209a65 100644
--- a/dev-db/mysql-proxy/Manifest
+++ b/dev-db/mysql-proxy/Manifest
@@ -1,6 +1,9 @@
+AUX mysql-proxy.cnf 1119 RMD160 68cc13d8da814b01a3969ae3cc7c2ccd21c28319 SHA1 57a01b4672e253277cc4fe4bb6d2317f7881c29c SHA256 a08693337a1521cd3707782b227bfef31f6180b68c5b00f6cbc51842890b562d
 AUX mysql-proxy.confd 365 RMD160 a154ad11ce91238974e645368e05be10c79efe6f SHA1 0b6f1017dea28f4291ed0477e2bf57637a43d567 SHA256 4828001b27499b5de40810ed74dbfe907a6369a11670c523ea3b4898bbb56b5f
-AUX mysql-proxy.initd 550 RMD160 106763943a59bb9e8f720bf40a1e9b2c160dfad8 SHA1 f3fe09ab6e4b345fa6424a92e44c2ce992eb9b11 SHA256 7982e22cc0bdcf9e9fd5e994a8d30d625e9858412987581c88b7d1017cf5e168
+AUX mysql-proxy.confd-0.8.0-r1 391 RMD160 4275410e33c13280a7a4345a737d3a7310fbcbc3 SHA1 dd49907261e45f8672e0b5ce8ba2734bbb7a5395 SHA256 68301473edd001349639dd4b2c826c0f6c5f68b59a32843e9bd4d9429258d2ac
+AUX mysql-proxy.initd 548 RMD160 8ab5be2d49b265e455b79f61109493e9cc9656ea SHA1 9c23423522c30b461eb2f3e6ea1d52c420abc561 SHA256 9ceaf7afa71aa39ded8af1ce24cbef1952800abf6b2878d654bcc8c8df9074f6
 DIST mysql-proxy-0.8.0.tar.gz 756371 RMD160 53ceb23e94929a4aa65adf89cc10b88a7e32fb0c SHA1 a4fede9246c4197ca47963a44ec7ce160637d52d SHA256 0a195fe0f86d12df8d9ffc27e91347680521c8702460bac5ed591608a740bc1c
+EBUILD mysql-proxy-0.8.0-r1.ebuild 1434 RMD160 577b1453115982a5b49c256f1df47d10c82e6bfa SHA1 e540f81f1516868e796cf5c97ea6fc50dcc03c18 SHA256 984a4e79f2e680f1d89d72e47d1185c81d62ae6e73402181ba0438354e266d5c
 EBUILD mysql-proxy-0.8.0.ebuild 1241 RMD160 598b59a448b419b3eb4675f10d1c2d5f0966b541 SHA1 fc2b6b62645c4bea6383ef29d7d933dda0b62206 SHA256 9296dd7ecdfa880a72259ed6acf6c3de11a69de9c3d7fe60f27b753c76c143de
-MISC ChangeLog 1473 RMD160 4d3135ea9aa6ed2ff4a4ae3322c870e1250e10a1 SHA1 35a240bd869783d32b552b2da5e8e45dc69c7a89 SHA256 7da11d042385ebac6e8d96e9b5a098a827b1777008672aa5372b46fa1c9decf6
+MISC ChangeLog 1827 RMD160 a7e648954c3b1b4ad4b6eb36b3e0a5728c444b5f SHA1 c5c07bf3cecb17a4ced3e87e00313e2bcd93fdda SHA256 aecaddcc04ea48d4595afd2b747ce330a039d88f33d1551abbee3a3e49044716
 MISC metadata.xml 633 RMD160 efd7ca376088a162dff4a59a472199c295e67e7d SHA1 6bdbf3cbc0132ab61396b0686b5f0b9cd7e46e94 SHA256 546a964acfb02356fea5e663900d3fc6e79f5d085fcb66e0646715d0750fed92
diff --git a/dev-db/mysql-proxy/files/mysql-proxy.cnf b/dev-db/mysql-proxy/files/mysql-proxy.cnf
new file mode 100644
index 000000000000..785b58c69e29
--- /dev/null
+++ b/dev-db/mysql-proxy/files/mysql-proxy.cnf
@@ -0,0 +1,47 @@
+# MySQL Proxy's configuration file (mysql-proxy.cnf)
+# This file must be 0660 or more restrictive
+# otherwise mysql-proxy will refuse to load
+[mysql-proxy]
+#basedir = ...
+#daemon = true
+#defaults-file = ...
+#event-threads = ...
+keepalive = true
+log-backtrace-on-crash = true
+log-file = /var/log/mysql/mysql-proxy.log
+log-level = warning
+log-use-syslog = true
+#lua-cpath = ...
+#lua-path = ...
+#max-open-files = ...
+pid-file = /var/run/mysql-proxy.pid
+#plugin-dir = ...
+#plugins = admin,proxy,debug,replicant
+#plugins = admin,proxy
+plugins = proxy
+#user = ...
+
+# module: admin
+admin-address = 127.0.0.1:4041
+#admin-lua-script = ...
+#admin-password = ...
+#admin-username = ...
+
+# module: proxy
+#no-proxy = false
+proxy-address = 127.0.0.1:4040
+proxy-backend-addresses = 127.0.0.1:3306
+proxy-fix-bug-25371 = false
+#proxy-lua-script = ...
+#proxy-pool-no-change-user = ...
+#proxy-read-only-backend-addresses = ...
+proxy-skip-profiling = false
+
+# module: replicant
+#replicant-master-address = ...
+#replicant-username = ...
+#replicant-password = ...
+#replicant-read-binlogs = ...
+
+# module: debug
+debug-address = 127.0.0.1:4043
diff --git a/dev-db/mysql-proxy/files/mysql-proxy.confd-0.8.0-r1 b/dev-db/mysql-proxy/files/mysql-proxy.confd-0.8.0-r1
new file mode 100644
index 000000000000..8b86431a3d8f
--- /dev/null
+++ b/dev-db/mysql-proxy/files/mysql-proxy.confd-0.8.0-r1
@@ -0,0 +1,12 @@
+# /etc/conf.d/mysql-proxy: config file for /etc/init.d/mysql-proxy
+
+# location of pidfile
+PIDFILE="/var/run/mysql-proxy.pid"
+
+# general options for mysql-proxy
+# do NOT specify --daemon or --pid-file=... here!
+OPTS="--defaults-file=/etc/mysql/mysql-proxy.cnf"
+
+# if you want mysql-proxy to depend on mysql, enable this:
+#RC_NEED="mysql" # baselayout-1
+#rc_need="mysql" # baselayout-2/OpenRC
diff --git a/dev-db/mysql-proxy/files/mysql-proxy.initd b/dev-db/mysql-proxy/files/mysql-proxy.initd
index d9f37628ff23..ba4e2aedfbd0 100755
--- a/dev-db/mysql-proxy/files/mysql-proxy.initd
+++ b/dev-db/mysql-proxy/files/mysql-proxy.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/files/mysql-proxy.initd,v 1.1 2009/11/21 13:52:45 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/files/mysql-proxy.initd,v 1.2 2010/05/29 20:45:04 robbat2 Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 start() {
 	ebegin "Starting MySQL Proxy"
 	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/mysql-proxy \
+		--exec /usr/bin/mysql-proxy \
 		-- --daemon --pid-file="${PIDFILE}" ${OPTS}
 	eend $?
 }
diff --git a/dev-db/mysql-proxy/mysql-proxy-0.8.0-r1.ebuild b/dev-db/mysql-proxy/mysql-proxy-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..365c7d6404bc
--- /dev/null
+++ b/dev-db/mysql-proxy/mysql-proxy-0.8.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/mysql-proxy-0.8.0-r1.ebuild,v 1.1 2010/05/29 20:45:04 robbat2 Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="A Proxy for the MySQL Client/Server protocol"
+HOMEPAGE="http://forge.mysql.com/wiki/MySQL_Proxy"
+SRC_URI="mirror://mysql/Downloads/MySQL-Proxy/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+RDEPEND=">=dev-libs/libevent-1.4
+	>=dev-libs/glib-2.16
+	>=dev-lang/lua-5.1"
+DEPEND="${RDEPEND}
+	>=virtual/mysql-5.0
+	dev-util/pkgconfig"
+RESTRICT="test"
+
+src_configure() {
+	econf \
+		--includedir=/usr/include/${PN} \
+		--with-mysql \
+		--with-lua \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
+	newconfd "${FILESDIR}"/${PN}.confd-0.8.0-r1 ${PN} || die
+	dodoc ChangeLog NEWS README
+	if useq examples; then
+		docinto examples
+		dodoc examples/*.lua || die
+		dodoc lib/*.lua || die
+	fi
+	# mysql-proxy will refuse to start unless the config file is at most 0660.
+	insinto /etc/mysql
+	insopts -m0660
+	doins "${FILESDIR}"/${PN}.cnf || die
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You might want to have a look at"
+	einfo "http://dev.mysql.com/tech-resources/articles/proxy-gettingstarted.html"
+	einfo "on how to get started with MySQL Proxy."
+	einfo
+}