[Pkg-mysql-commits] r1392 - in trunk/debian: . patches

[Norbert Tretkowski]

tags 511929 pending
thanks

Author: nobse
Date: 2009-01-24 22:03:06 +0000 (Sat, 24 Jan 2009)
New Revision: 1392

Added:
   trunk/debian/patches/10_mysql_secure_installation.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
Log:
Fix mysql_secure_installation so it does not fail on passwords which need quoting.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-01-09 13:24:31 UTC (rev 1391)
+++ trunk/debian/changelog	2009-01-24 22:03:06 UTC (rev 1392)
@@ -1,3 +1,10 @@
+mysql-dfsg-5.0 (5.0.51a-22) UNRELEASED; urgency=low
+
+  * Fix mysql_secure_installation so it does not fail on passwords which need
+    quoting. (closes: #511929)
+
+ -- Norbert Tretkowski <nobse at debian.org>  Sat, 24 Jan 2009 23:01:04 +0100
+
 mysql-dfsg-5.0 (5.0.51a-21) testing-proposed-updates; urgency=low
 
   * Ask for MySQL root password at high priority, because otherwise all
@@ -19,7 +26,7 @@
 
   * New patch 50_fix_mysqldump2.dpatch from 5.0.60 to fix dumping databases
     from mysql 4.0 server. (closes: #507789)
-  * Don't create a guest account during bootstrap. (closes: #463704)
+  * Do not create a guest account during bootstrap. (closes: #463704)
 
  -- Norbert Tretkowski <nobse at debian.org>  Thu, 04 Dec 2008 23:07:19 +0100
 
@@ -35,7 +42,7 @@
 
 mysql-dfsg-5.0 (5.0.51a-17) testing-proposed-updates; urgency=low
 
-  * Don't use commented out passwords from debian.cnf. (closes: #453820)
+  * Do not use commented out passwords from debian.cnf. (closes: #453820)
   * Update watch file to recognize releases > 5.0.45.
 
  -- Norbert Tretkowski <nobse at debian.org>  Sun, 02 Nov 2008 13:31:32 +0100

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2009-01-09 13:24:31 UTC (rev 1391)
+++ trunk/debian/patches/00list	2009-01-24 22:03:06 UTC (rev 1392)
@@ -1,5 +1,6 @@
 01_MAKEFILES__Docs_Images_Makefile.in.dpatch
 01_MAKEFILES__Docs_Makefile.in.dpatch
+10_mysql_secure_installation.dpatch
 25_mysys__default.c.dpatch
 33_scripts__mysql_create_system_tables__no_test.dpatch
 37_scripts__mysqld_safe.sh__syslog.dpatch

Added: trunk/debian/patches/10_mysql_secure_installation.dpatch
===================================================================
--- trunk/debian/patches/10_mysql_secure_installation.dpatch	                        (rev 0)
+++ trunk/debian/patches/10_mysql_secure_installation.dpatch	2009-01-24 22:03:06 UTC (rev 1392)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_mysql_secure_installation.dpatch by Norbert Tretkowski <nobse at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't fail on passwords which needs quoting
+
+ at DPATCH@
+--- mysql-dfsg-5.0-5.0.51a.orig/scripts/mysql_secure_installation.sh	2008-01-11 15:43:40.000000000 +0100
++++ mysql-dfsg-5.0-5.0.51a/scripts/mysql_secure_installation.sh	2009-01-24 22:58:45.000000000 +0100
+@@ -47,7 +47,7 @@
+     echo "# mysql_secure_installation config file" >$config
+     echo "[mysql]" >>$config
+     echo "user=root" >>$config
+-    echo "password=$rootpass" >>$config
++    echo "password='$rootpass'" >>$config
+ }
+ 
+ get_root_password() {