SOURCES: phpMyAdmin-config.patch - updated to 2.11.0

[adamg]

Author: adamg                        Date: Wed Aug 22 18:28:14 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 2.11.0

---- Files affected:
SOURCES:
   phpMyAdmin-config.patch (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SOURCES/phpMyAdmin-config.patch
diff -u SOURCES/phpMyAdmin-config.patch:1.15 SOURCES/phpMyAdmin-config.patch:1.16
--- SOURCES/phpMyAdmin-config.patch:1.15	Sun Jul 29 13:02:31 2007
+++ SOURCES/phpMyAdmin-config.patch	Wed Aug 22 20:28:09 2007
@@ -1,22 +1,19 @@
---- libraries/config.default.php.orig	2007-02-28 01:51:14.000000000 +0100
-+++ libraries/config.default.php	2007-02-28 05:46:58.000000000 +0100
-@@ -1,7 +1,7 @@
- <?php
- /* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
+--- phpMyAdmin-2.11.0-all-languages.orig/libraries/config.default.php	2007-08-22 20:04:58.000000000 +0200
++++ phpMyAdmin-2.11.0-all-languages/libraries/config.default.php	2007-08-22 20:05:57.000000000 +0200
+@@ -141,14 +141,14 @@
+  *
+  * @global string $cfg['Servers'][$i]['auth_type']
+  */
+-$cfg['Servers'][$i]['auth_type'] = 'config';
++$cfg['Servers'][$i]['auth_type'] = 'cookie';
  
--/* $Id$ */
-+/* $Id$ */
- // vim: expandtab sw=4 ts=4 sts=4:
+ /**
+  * MySQL user
+  *
+  * @global string $cfg['Servers'][$i]['user']
+  */
+-$cfg['Servers'][$i]['user'] = 'root';
++$cfg['Servers'][$i]['user'] = 'mysql';
  
  /**
-@@ -68,8 +68,8 @@
-                                                     // The controluser is also
-                                                     // used for all relational
-                                                     // features (pmadb)
--$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (valid choices: config, http, HTTP, signon or cookie)
--$cfg['Servers'][$i]['user']          = 'root';      // MySQL user
-+$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (valid choices: config, http, HTTP, signon or cookie)
-+$cfg['Servers'][$i]['user']          = 'mysql';      // MySQL user
- $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
-                                                     // with 'config' auth_type)
- $cfg['Servers'][$i]['SignonSession'] = '';          // Session to use for 'signon' auth method
+  * MySQL password (only needed with 'config' auth_type)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/phpMyAdmin-config.patch?r1=1.15&r2=1.16&f=u