do not hard-code MySQL administrator username

cacti/cacti-setup.sh

@@ -4,17 +4,19 @@
 ##
 
 #   determine MySQL root password
+username=`grep "^user" @l_prefix@/etc/mysql/my.pwd |\
+          sed -e 's;^user[^=]*= *;;' -e 's; *$;;'`
 password=`grep "^password" @l_prefix@/etc/mysql/my.pwd |\
           sed -e 's;^password[^=]*= *;;' -e 's; *$;;'`
 
 #   create the MySQL database for Cacti
-@l_prefix@/bin/mysqladmin --user=root --password=$password create cacti
+@l_prefix@/bin/mysqladmin --user=$username --password=$password create cacti
 
 #   create the default Cacti database schema
-@l_prefix@/bin/mysql --user=root --password=$password cacti <@l_prefix@/share/cacti/cacti.sql
+@l_prefix@/bin/mysql --user=$username --password=$password cacti <@l_prefix@/share/cacti/cacti.sql
 
 #   create a MySQL username/password for Cacti
-@l_prefix@/bin/mysql --user=root --password=$password mysql <<EOF
+@l_prefix@/bin/mysql --user=$username --password=$password mysql <<EOF
 GRANT ALL ON cacti.* TO cacti@localhost IDENTIFIED BY 'cacti';
 FLUSH PRIVILEGES;
 EOF

cacti/cacti.spec

@@ -33,7 +33,7 @@ Class:        PLUS
 Group:        Database
 License:      GPL
 Version:      0.8.6h
-Release:      20060104
+Release:      20060815
 
 #   list of sources
 Source0:      http://www.cacti.net/downloads/cacti-%{version}.tar.gz

sympa/sympa-setup.sh

@@ -3,7 +3,9 @@
 ##  sympa-setup.sh -- Sympa MySQL Setup Utility
 ##
 
-#   determine MySQL root password
+#   determine MySQL administrator username/password
+mysql_username=`grep "^user" @l_prefix@/etc/mysql/my.pwd |\
+          sed -e 's;^user[^=]*= *;;' -e 's; *$;;'`
 mysql_password=`grep "^password" @l_prefix@/etc/mysql/my.pwd |\
           sed -e 's;^password[^=]*= *;;' -e 's; *$;;'`
 
@@ -16,12 +18,12 @@ case "$cmd" in
     install )
         #   create the default Sympa database schema
         @l_prefix@/bin/mysql \
-            --user=root --password=$mysql_password \
+            --user=$mysql_username --password=$mysql_password \
             mysql <@l_prefix@/share/sympa/script/create_db.mysql
 
         #   create a MySQL username/password for Sympa
         @l_prefix@/bin/mysql \
-            --user=root --password=$mysql_password \
+            --user=$mysql_username --password=$mysql_password \
             mysql <<EOF
         GRANT ALL ON sympa.* TO sympa@localhost IDENTIFIED BY '$sympa_password';
         FLUSH PRIVILEGES;
@@ -29,7 +31,7 @@ EOF
         ;;
     uninstall )
         @l_prefix@/bin/mysql \
-            --user=root --password=$mysql_password \
+            --user=$mysql_username --password=$mysql_password \
             mysql <<EOF
         DROP DATABASE sympa;
 EOF

sympa/sympa.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        Mail
 License:      GPL
 Version:      5.2.1
-Release:      20060605
+Release:      20060815
 
 #   list of sources
 Source0:      http://www.sympa.org/distribution/sympa-%{version}.tar.gz

wordpress/wordpress-setup.sh

@@ -4,12 +4,14 @@
 ##
 
 #   determine MySQL root password
+username=`grep "^user" @l_prefix@/etc/mysql/my.pwd |\
+          sed -e 's;^user[^=]*= *;;' -e 's; *$;;'`
 password=`grep "^password" @l_prefix@/etc/mysql/my.pwd |\
           sed -e 's;^password[^=]*= *;;' -e 's; *$;;'`
 
 #   create the MySQL database for Wordpress
-@l_prefix@/bin/mysqladmin --user=root --password=$password create wordpress
-@l_prefix@/bin/mysql --user=root --password=$password mysql <<EOF
+@l_prefix@/bin/mysqladmin --user=$username --password=$password create wordpress
+@l_prefix@/bin/mysql --user=$username --password=$password mysql <<EOF
 GRANT ALL ON wordpress.* TO wordpress@localhost IDENTIFIED BY 'wordpress';
 FLUSH PRIVILEGES;
 EOF

wordpress/wordpress.spec

@@ -33,7 +33,7 @@ Class:        PLUS
 Group:        Web
 License:      GPL
 Version:      2.0.4
-Release:      20060805
+Release:      20060815
 
 #   list of sources
 Source0:      ftp://ftp.openpkg.org/sources/CPY/VERSIONED/wordpress/wordpress-%{version}.tar.gz