Hi,

there is a small bug in cluster-agents that it would be
rather nice to fix for squeeze. The problem is that the
mysql resource agent uses paths different from those
on Debian. The fix is trivial.

1.0.3-4 also adds a build dependency on python to resolve
a build problem - configure bombs out complaining that
python isn't installed. I observed this using pbuilder.
I am unsure why it hasn't cropped up before.

The diff between the 1:1.0.3-3.1 and 1:1.0.3-4 follows.

diff -Nru cluster-agents-1.0.3/debian/changelog 
cluster-agents-1.0.3/debian/changelog
--- cluster-agents-1.0.3/debian/changelog       2010-10-19 19:35:00.000000000 
+0900
+++ cluster-agents-1.0.3/debian/changelog       2011-02-04 07:46:43.000000000 
+0900
@@ -1,3 +1,12 @@
+cluster-agents (1:1.0.3-4) unstable; urgency=low
+
+  * Use correct paths on Debian/GNU Linux in MySQL resource agent
+    (Closes: #608274)
+  * Add build dependency on python
+    - Fixes build failure on both unstable and testing
+
+ -- Simon Horman <ho...@debian.org>  Fri, 04 Feb 2011 07:46:13 +0900
+
 cluster-agents (1:1.0.3-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru cluster-agents-1.0.3/debian/control 
cluster-agents-1.0.3/debian/control
--- cluster-agents-1.0.3/debian/control 2010-10-17 02:13:29.000000000 +0900
+++ cluster-agents-1.0.3/debian/control 2011-02-04 07:46:07.000000000 +0900
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian HA Maintainers 
<debian-ha-maintain...@lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madk...@debian.org>, Anibal Monsalve Salazar 
<ani...@debian.org>, Simon Horman <ho...@debian.org>, Frederik Schüler 
<f...@debian.org>
-Build-Depends: libcluster-glue-dev, cluster-glue-dev, libnet1-dev, debhelper 
(>= 7), docbook-xsl, automake, autoconf, libtool, pkg-config, libglib2.0-dev, 
xsltproc, docbook-xml
+Build-Depends: libcluster-glue-dev, cluster-glue-dev, libnet1-dev, debhelper 
(>= 7), docbook-xsl, automake, autoconf, libtool, pkg-config, libglib2.0-dev, 
xsltproc, docbook-xml, python
 Standards-Version: 3.8.4
 Homepage: http://hg.linux-ha.org/agents/
 XS-Python-Version: current
diff -Nru cluster-agents-1.0.3/debian/patches/mysql-path.patch 
cluster-agents-1.0.3/debian/patches/mysql-path.patch
--- cluster-agents-1.0.3/debian/patches/mysql-path.patch        1970-01-01 
09:00:00.000000000 +0900
+++ cluster-agents-1.0.3/debian/patches/mysql-path.patch        2011-02-04 
07:42:43.000000000 +0900
@@ -0,0 +1,22 @@
+--- x/heartbeat/mysql  2010-07-08 12:21:55.000000000 +0200
++++ x/heartbeat/mysql  2010-12-29 16:23:12.000000000 +0100
+@@ -60,14 +60,14 @@
+ OCF_RESKEY_enable_creation_default=0
+ OCF_RESKEY_additional_parameters_default=""
+ else
+-OCF_RESKEY_binary_default="/usr/bin/safe_mysqld"
+-OCF_RESKEY_config_default="/etc/my.cnf"
++OCF_RESKEY_binary_default="/usr/bin/mysqld_safe"
++OCF_RESKEY_config_default="/etc/mysql/my.cnf"
+ OCF_RESKEY_datadir_default="/var/lib/mysql"
+ OCF_RESKEY_user_default="mysql"
+ OCF_RESKEY_group_default="mysql"
+-OCF_RESKEY_log_default="/var/log/mysqld.log"
+-OCF_RESKEY_pid_default="/var/run/mysql/mysqld.pid"
+-OCF_RESKEY_socket_default="/var/lib/mysql/mysql.sock"
++OCF_RESKEY_log_default="/var/log/mysql.log"
++OCF_RESKEY_pid_default="/var/run/mysqld/mysqld.pid"
++OCF_RESKEY_socket_default="/var/run/mysqld/mysqld.sock"
+ OCF_RESKEY_test_user_default="root"
+ OCF_RESKEY_test_table_default="mysql.user"
+ OCF_RESKEY_test_passwd_default=""
diff -Nru cluster-agents-1.0.3/debian/patches/series 
cluster-agents-1.0.3/debian/patches/series
--- cluster-agents-1.0.3/debian/patches/series  2010-10-19 19:36:12.000000000 
+0900
+++ cluster-agents-1.0.3/debian/patches/series  2011-02-04 07:33:05.000000000 
+0900
@@ -1,2 +1,3 @@
 CVE-2010-3389--bug598549.patch
 spelling-fixes.patch
+mysql-path.patch



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to