This commit was manufactured by cvs2git to create branch 'DEVEL'.

Cherrypick from master 2009-10-30 23:11:26 UTC shadzik <shadzik@pld-linux.org> '- php_admin_value works only with mod_php':
    phpMyAdmin-ServerSelectDisplayName-config.patch -> 1.1
    phpMyAdmin-ServerSelectDisplayName.patch -> 1.1
    phpMyAdmin-lighttpd.conf -> 1.1
    phpMyAdmin.conf -> 1.7

diff --git a/phpMyAdmin-ServerSelectDisplayName-config.patch b/phpMyAdmin-ServerSelectDisplayName-config.patch
new file mode 100644 (file)
index 0000000..983954a
--- /dev/null
+++ b/phpMyAdmin-ServerSelectDisplayName-config.patch
@@ -0,0 +1,18 @@
+*** libraries/config.default.php.orig  Tue Aug 19 00:56:44 2008
+--- libraries/config.default.php       Tue Aug 19 00:56:08 2008
+***************
+*** 80,85 ****
+--- 80,92 ----
+  $i = 1;
+  
+  /**
++  * Display name
++  *
++  * @global string $cfg['Servers'][$i]['display']
++  */
++ $cfg['Servers'][$i]['display'] = 'localhost';
++ 
++ /**
+   * MySQL hostname or IP address
+   *
+   * @global string $cfg['Servers'][$i]['host']

diff --git a/phpMyAdmin-ServerSelectDisplayName.patch b/phpMyAdmin-ServerSelectDisplayName.patch
new file mode 100644 (file)
index 0000000..cd27329
--- /dev/null
+++ b/phpMyAdmin-ServerSelectDisplayName.patch
@@ -0,0 +1,19 @@
+*** libraries/select_server.lib.php.org        Tue Aug 19 00:41:59 2008
+--- libraries/select_server.lib.php    Tue Aug 19 00:42:35 2008
+***************
+*** 62,68 ****
+          if (!empty($server['verbose'])) {
+              $label = $server['verbose'];
+          } else {
+!             $label = $server['host'];
+              if (!empty($server['port'])) {
+                  $label .= ':' . $server['port'];
+              }
+--- 62,68 ----
+          if (!empty($server['verbose'])) {
+              $label = $server['verbose'];
+          } else {
+!             $label = isset($server['display']) ? $server['display'] : $server['host'];
+              if (!empty($server['port'])) {
+                  $label .= ':' . $server['port'];
+              }

diff --git a/phpMyAdmin-lighttpd.conf b/phpMyAdmin-lighttpd.conf
new file mode 100644 (file)
index 0000000..a95077c
--- /dev/null
+++ b/phpMyAdmin-lighttpd.conf
@@ -0,0 +1,3 @@
+alias.url += (
+        "/myadmin/"   => "/usr/share/phpMyAdmin/",
+)

diff --git a/phpMyAdmin.conf b/phpMyAdmin.conf
new file mode 100644 (file)
index 0000000..7ef24e8
--- /dev/null
+++ b/phpMyAdmin.conf
@@ -0,0 +1,9 @@
+Alias /myadmin /usr/share/phpMyAdmin
+<Directory "/usr/share/phpMyAdmin">
+       Options FollowSymLinks
+       AllowOverride None
+       Order allow,deny
+       Allow from all
+       # uncomment if using apache-mod_php
+       #php_admin_value open_basedir "/etc/webapps/phpMyAdmin/:/usr/share/phpMyAdmin/:/usr/share/phpMyAdmin/css/..:/tmp"
+</Directory>