[Pkg-mysql-commits] r1336 - branches/experimental-5.0/debian

[Norbert Tretkowski]

tags 453820 pending
thanks

Author: nobse
Date: 2008-11-02 12:27:40 +0000 (Sun, 02 Nov 2008)
New Revision: 1336

Modified:
   branches/experimental-5.0/debian/changelog
   branches/experimental-5.0/debian/mysql-server-5.0.postinst
Log:
Don't use commented out passwords.

Modified: branches/experimental-5.0/debian/changelog
===================================================================
--- branches/experimental-5.0/debian/changelog	2008-11-02 12:23:40 UTC (rev 1335)
+++ branches/experimental-5.0/debian/changelog	2008-11-02 12:27:40 UTC (rev 1336)
@@ -20,9 +20,10 @@
     + debian/patches/91_SECURITY_CVE-2007-5925.dpatch
     + debian/patches/92_SECURITY_CVE-2008-2079.dpatch
     + debian/patches/93_SECURITY_CVE-2008-3963.dpatch
-  * Update debian/watch file.
+  * Don't 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:21:46 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Sun, 02 Nov 2008 13:25:40 +0100
 
 mysql-dfsg-5.0 (5.0.51a-16) unstable; urgency=low
 

Modified: branches/experimental-5.0/debian/mysql-server-5.0.postinst
===================================================================
--- branches/experimental-5.0/debian/mysql-server-5.0.postinst	2008-11-02 12:23:40 UTC (rev 1335)
+++ branches/experimental-5.0/debian/mysql-server-5.0.postinst	2008-11-02 12:27:40 UTC (rev 1336)
@@ -174,7 +174,7 @@
     # recreate the credentials file if not present or without mysql_upgrade stanza
     dc=$mysql_cfgdir/debian.cnf; 
     if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then
-        pass="`sed -n 's/password *= *// p' $dc | head -n 1`"
+	pass="`sed -n 's/^[ 	]*password *= *// p' $dc | head -n 1`"
     else
 	pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`;
         if [ ! -d "$mysql_cfgdir" ]; then install -o 0 -g 0 -m 0755 -d $mysql_cfgdir; fi