[Pkg-mysql-commits] r1337 - trunk/debian

[Norbert Tretkowski]

tags 453820 pending
thanks

Author: nobse
Date: 2008-11-02 12:32:47 +0000 (Sun, 02 Nov 2008)
New Revision: 1337

Modified:
   trunk/debian/changelog
   trunk/debian/mysql-server-5.0.postinst
   trunk/debian/watch
Log:
passwords and watch file

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-11-02 12:27:40 UTC (rev 1336)
+++ trunk/debian/changelog	2008-11-02 12:32:47 UTC (rev 1337)
@@ -1,3 +1,10 @@
+mysql-dfsg-5.0 (5.0.51a-17) testing-proposed-updates; urgency=low
+
+  * 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:31:32 +0100
+
 mysql-dfsg-5.0 (5.0.51a-16) unstable; urgency=low
 
   * New patch 60_rpl_test_failure.dpatch from 5.0.54 to fix a race condition

Modified: trunk/debian/mysql-server-5.0.postinst
===================================================================
--- trunk/debian/mysql-server-5.0.postinst	2008-11-02 12:27:40 UTC (rev 1336)
+++ trunk/debian/mysql-server-5.0.postinst	2008-11-02 12:32:47 UTC (rev 1337)
@@ -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

Modified: trunk/debian/watch
===================================================================
--- trunk/debian/watch	2008-11-02 12:27:40 UTC (rev 1336)
+++ trunk/debian/watch	2008-11-02 12:32:47 UTC (rev 1337)
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/-(rc|beta)/$1/" \
-  ftp://ftp.mysql.com/pub/mysql/src/mysql-([\d\.]*(?:-beta|-rc)?).tar.gz debian
+  http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.0/mysql-([\d\.]*(?:-beta|-rc)?).tar.gz debian