Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2015-01-07 09:38:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin" Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2014-12-31 11:22:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2015-01-07 09:39:01.000000000 +0100 @@ -1,0 +2,32 @@ +Mon Jan 5 23:54:17 UTC 2015 - [email protected] + +- rework config patch + * fix for pma storage config (disabled by default) +- add phpMyAdmin-pma.patch + * fix create_tables.sql +- fix restart_on_update + +------------------------------------------------------------------- +Mon Jan 5 16:03:43 UTC 2015 - [email protected] + +- update to 4.3.5 (2015-01-05) + - fix bug Auto-configuration: tables were not created + automatically + - sf#4677 Advanced feature checker does not check for + favorite tables feature + - sf#4678 Some of the data stored in configuration storage + are not deleted upon db or table delete + - sf#4679 Setup does not allow providing a name for + favorites table + - sf#4680 Number of favorite table are not configurable in setup + - sf#4681 'Central columns table' field in setup does not have + a description + - sf#4318 Default connection collation and sorting + - sf#4683 Relational data is not properly updated on table rename + - sf#4655 Undefined index: collation_connection (second patch) + - sf#4682 4.3.3 & 4.3.4 Import sql created by mysqldump fails on + foreign keys + - sf#4676 Auto-configuration issues + - sf#4416 New lines are removed when grid editing (part two: TEXT) + +------------------------------------------------------------------- Old: ---- phpMyAdmin-4.3.4-all-languages.tar.bz2 New: ---- phpMyAdmin-4.3.5-all-languages.tar.bz2 phpMyAdmin-pma.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.m5Y27N/_old 2015-01-07 09:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.m5Y27N/_new 2015-01-07 09:39:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package phpMyAdmin # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,13 +34,16 @@ Summary: Administration of MySQL over the web License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends -Version: 4.3.4 +Version: 4.3.5 Release: 0 Url: http://www.phpMyAdmin.net Source0: http://sourceforge.net/projects/phpmyadmin/files/%{name}-%{version}-all-languages.tar.bz2 Source1: %{name}.http Source100: %{name}-rpmlintrc +# Fix-SuSE: provide useful default config Patch0: %{name}-config.patch +# Fix-SUSE: auto config for pma storage +Patch1: %{name}-pma.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwgen coreutils sed grep @@ -101,7 +104,8 @@ ## rpmlint: # wrong-file-end-of-line-encoding %{__perl} -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php -%patch0 -p1 +%patch0 +%patch1 find . -type d -exec chmod 755 {} \; find . -type f -exec chmod 644 {} \; @@ -151,10 +155,18 @@ # set PmaAbsoluteUri ### generate blowfish secret %{__sed} -i -e "s,@FQDN@,$(cat /etc/HOSTNAME)," \ -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{pma_config} +%if 0%{?suse_version} < 1310 %restart_on_update apache2 +#%else +#systemctl try-restart apache2 &>/dev/null +%endif %postun +%if 0%{?suse_version} < 1310 %restart_on_update apache2 +#%else +#systemctl try-restart apache2 &>/dev/null +%endif %clean %{__rm} -rf $RPM_BUILD_ROOT ++++++ phpMyAdmin-4.3.4-all-languages.tar.bz2 -> phpMyAdmin-4.3.5-all-languages.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin-4.3.4-all-languages.tar.bz2 /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin-4.3.5-all-languages.tar.bz2 differ: char 11, line 1 ++++++ phpMyAdmin-config.patch ++++++ --- /var/tmp/diff_new_pack.m5Y27N/_old 2015-01-07 09:39:02.000000000 +0100 +++ /var/tmp/diff_new_pack.m5Y27N/_new 2015-01-07 09:39:02.000000000 +0100 @@ -1,11 +1,13 @@ -diff -Pdpru phpMyAdmin-4.3.3-all-languages.orig/config.sample.inc.php phpMyAdmin-4.3.3-all-languages/config.sample.inc.php ---- phpMyAdmin-4.3.3-all-languages.orig/config.sample.inc.php 2014-12-21 12:40:25.000000000 +0100 -+++ phpMyAdmin-4.3.3-all-languages/config.sample.inc.php 2014-12-21 14:03:33.519929409 +0100 -@@ -10,6 +10,46 @@ +Index: config.sample.inc.php +=================================================================== +--- config.sample.inc.php.orig ++++ config.sample.inc.php +@@ -10,66 +10,237 @@ * @package PhpMyAdmin */ -+/* +-/* ++/** + * Your phpMyAdmin url + * + * Complete the variable below with the full url ie @@ -20,35 +22,69 @@ + * test is to browse a table, then edit a row and save it. There will be + * an error message if phpMyAdmin cannot auto-detect the correct value. + * -+ * If the auto-detection code does work properly, you can set to true the -+ * $cfg['PmaAbsoluteUri_DisableWarning'] variable below. ++ * Default: '' + */ -+$cfg['PmaAbsoluteUri'] = ''; ++/* $cfg['PmaAbsoluteUri'] = ''; + -+/* -+ * Disable the default warning about $cfg['PmaAbsoluteUri'] not being set -+ * You should use this if and ONLY if the PmaAbsoluteUri auto-detection -+ * works perfectly. ++/** ++ * Disable the default warning that is displayed on the DB Details Structure ++ * page if any of the required Tables for the relationfeatures could not be ++ * found ++ * ++ * Default: false + */ -+$cfg['PmaAbsoluteUri_DisableWarning'] = false; ++/* $cfg['PmaNoRelation_DisableWarning'] = true; + -+/* -+ * Disable the default warning that is displayed on the DB Details Structure page if -+ * any of the required Tables for the relationfeatures could not be found ++/** ++ * Zero Configuration mode. ++ * ++ * Enables Zero Configuration mode in which the user will be offered a choice ++ * to create phpMyAdmin configuration storage in the current database or use ++ * the existing one, if already present. ++ * ++ * Note: If there is no central configuration storage defined then you may end ++ * up with different set of phpMyAdmin configuration storage tables for ++ * different databases. ++ * ++ * Default: true + */ -+$cfg['PmaNoRelation_DisableWarning'] = false; ++$cfg['ZeroConf'] = false; + -+/* ++/** + * Disable the default warning that is displayed if Suhosin is detected + * -+ * @global boolean $cfg['SuhosinDisableWarning'] ++ * Default: false + */ -+$cfg['SuhosinDisableWarning'] = true; ++/* $cfg['SuhosinDisableWarning'] = true; + - /* ++/** ++ * Default language to use, if not browser-defined or user-defined ++ * ++ * Default: en ++ */ ++/* $cfg['DefaultLang'] = 'de'; ++ ++/** * This is needed for cookie based authentication to encrypt password in * cookie -@@ -25,45 +65,265 @@ $i = 0; ++ * ++ * YOU MUST FILL IN THIS FOR COOKIE AUTH! + */ +-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ ++$cfg['blowfish_secret'] = ''; + +-/* ++ ++/****************************************************************************** + * Servers configuration ++ * ++ * for more info/explanation about these VARS have look at ++ * libraries/config.default.php + */ + $i = 0; + +-/* ++/** * First server */ $i++; @@ -59,88 +95,47 @@ -$cfg['Servers'][$i]['connect_type'] = 'tcp'; -$cfg['Servers'][$i]['compress'] = false; -$cfg['Servers'][$i]['AllowNoPassword'] = false; -+ -+// MySQL hostname or IP address -+$cfg['Servers'][$i]['host'] = 'localhost'; -+ -+// MySQL port - leave blank for default port -+$cfg['Servers'][$i]['port'] = ''; -+ -+// Path to the socket - leave blank for default socket -+$cfg['Servers'][$i]['socket'] = ''; -+ -+// Use SSL for connecting to MySQL server? -+$cfg['Servers'][$i]['ssl'] = false; -+ -+// How to connect to MySQL server ('tcp' or 'socket') -+$cfg['Servers'][$i]['connect_type'] = 'socket'; -+ -+// The PHP MySQL extension to use ('mysql' or 'mysqli') -+$cfg['Servers'][$i]['extension'] = 'mysqli'; -+ -+// Use compressed protocol for the MySQL connection (requires PHP >= 4.3.0) -+$cfg['Servers'][$i]['compress'] = false; -+ -+// Authentication method (config, http or cookie based)? -+$cfg['Servers'][$i]['auth_type'] = 'cookie'; -+ -+// MySQL user -+$cfg['Servers'][$i]['user'] = 'root'; -+ -+// MySQL password (only needed with 'config' auth_type) -+$cfg['Servers'][$i]['password'] = ''; -+ -+// Allow access without password -+$cfg['Servers'][$i]['AllowNoPassword'] = false; -+ -+// whether to allow root login -+$cfg['Servers'][$i]['AllowRoot'] = true; -+ -+// Session to use for 'signon' authentication method -+$cfg['Servers'][$i]['SignonSession'] = ''; -+ -+// URL where to redirect user to login for 'signon' authentication method -+$cfg['Servers'][$i]['SignonURL'] = ''; -+ -+// URL where to redirect user after logout -+$cfg['Servers'][$i]['LogoutURL'] = ''; -+ -+// If set to a db-name, only this db is displayed in left frame -+// It may also be an array of db-names, where sorting order is relevant. -+$cfg['Servers'][$i]['only_db'] = ''; -+ -+// Verbose name for this host - leave blank to show the hostname -+$cfg['Servers'][$i]['verbose'] = ''; -+ -+// set to false if you know that your pma_* tables -+// are up to date. This prevents compatibility -+// checks and thereby increases performance. -+$cfg['Servers'][$i]['verbose_check'] = true; -+ -+// Host authentication order, leave blank to not use -+$cfg['Servers'][$i]['AllowDeny']['order'] = ''; -+ -+// Host authentication rules, leave blank for defaults -+$cfg['Servers'][$i]['AllowDeny']['rules'] = array(); - /* - * phpMyAdmin configuration storage settings. +-/* +- * phpMyAdmin configuration storage settings. ++$cfg['Servers'][$i]['host'] = 'localhost'; ++$cfg['Servers'][$i]['port'] = ''; ++$cfg['Servers'][$i]['socket'] = ''; ++$cfg['Servers'][$i]['ssl'] = false; ++$cfg['Servers'][$i]['connect_type'] = 'socket'; ++$cfg['Servers'][$i]['extension'] = 'mysqli'; ++$cfg['Servers'][$i]['compress'] = false; ++$cfg['Servers'][$i]['auth_type'] = 'cookie'; ++$cfg['Servers'][$i]['user'] = 'root'; ++$cfg['Servers'][$i]['password'] = ''; ++$cfg['Servers'][$i]['AllowNoPassword'] = false; ++$cfg['Servers'][$i]['AllowRoot'] = true; ++$cfg['Servers'][$i]['SignonSession'] = ''; ++$cfg['Servers'][$i]['SignonURL'] = ''; ++$cfg['Servers'][$i]['LogoutURL'] = ''; ++$cfg['Servers'][$i]['only_db'] = ''; ++$cfg['Servers'][$i]['verbose'] = ''; ++$cfg['Servers'][$i]['verbose_check'] = true; ++$cfg['Servers'][$i]['AllowDeny']['order'] = ''; ++$cfg['Servers'][$i]['AllowDeny']['rules'] = array(); ++ ++ ++/* phpMyAdmin configuration storage settings */ ++/** ++ * for more info/explanation about these VARS have look at ++ * libraries/config.default.php */ - /* User used to manipulate with storage */ +-/* User used to manipulate with storage */ -// $cfg['Servers'][$i]['controlhost'] = ''; -// $cfg['Servers'][$i]['controlport'] = ''; -// $cfg['Servers'][$i]['controluser'] = 'pma'; -// $cfg['Servers'][$i]['controlpass'] = 'pmapass'; -+$cfg['Servers'][$i]['controlhost'] = 'localhost'; -+$cfg['Servers'][$i]['controlport'] = ''; -+// MySQL control user settings (this user must have read-only -+// access to the "mysql/user" and "mysql/db" tables). -+// The controluser is also used for all relational features (pmadb) -+$cfg['Servers'][$i]['controluser'] = ''; -+// The password needed for the controluser to login -+// (see $cfg['Servers'][$i]['controluser']) -+$cfg['Servers'][$i]['controlpass'] = ''; ++$cfg['Servers'][$i]['controlhost'] = 'localhost'; ++$cfg['Servers'][$i]['controlport'] = ''; ++/* ++$cfg['Servers'][$i]['controluser'] = 'pma'; ++$cfg['Servers'][$i]['controlpass'] = 'pmapass'; + /* Storage database and tables */ @@ -164,190 +159,130 @@ -// $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns'; -/* Contrib / Swekey authentication */ -// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; -+// Database used for Relation, Bookmark and PDF Features -+// (see _docdir/examples/create_tables.sql) -+// - leave blank for no support -+// DEFAULT: 'phpmyadmin' -+$cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; -+ -+// Bookmark table -+// - leave blank for no bookmark support -+// DEFAULT: 'pma_bookmark' -+$cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark'; -+ -+// table to describe the relation between links (see doc) -+// - leave blank for no relation-links support -+// DEFAULT: 'pma_relation' -+$cfg['Servers'][$i]['relation'] = 'pma__relation'; -+ -+// table to describe the display fields -+// - leave blank for no display fields support -+// DEFAULT: 'pma_table_info' -+$cfg['Servers'][$i]['table_info'] = 'pma__table_info'; -+ -+// table to describe the tables position for the PDF schema -+// - leave blank for no PDF schema support -+// DEFAULT: 'pma_table_coords' -+$cfg['Servers'][$i]['table_coords'] = 'pma__table_coords'; -+ -+// table to describe pages of relationpdf -+// - leave blank if you don't want to use this -+// DEFAULT: 'pma_pdf_pages' -+$cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages'; -+ -+// table to store column information -+// - leave blank for no column comments/mime types -+// DEFAULT: 'pma_column_info' -+$cfg['Servers'][$i]['column_info'] = 'pma__column_info'; -+ -+// table to store SQL history -+// - leave blank for no SQL query history -+// DEFAULT: 'pma_history' -+$cfg['Servers'][$i]['history'] = 'pma__history'; -+ -+// Table to store user interface enhancement data. -+// - Leave blank to disable. -+// DEFAULT: 'pma_table_uiprefs' -+$cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs'; -+ -+// Table to store version/change tracking data -+// - leave blank to disable -+// DEFAULT: 'pma_tracking' -+$cfg['Servers'][$i]['tracking'] = 'pma__tracking'; -+ -+// Table in which to store information for the designer feature. -+// DEFAULT: 'pma_designer_coords' -+$cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords'; -+ -+// Table to store user preferences -- allows users to set most -+// preferences by themselves and store them in the phpMyAdmin -+// configuration storage database. -+// If you don't allow for storing preferences in pmadb, users can -+// still personalize phpMyAdmin, but settings will be saved in -+// browser's local storage, or, it is is unavailable, until the end -+// of session. -+// DEFAULT: 'pma_userconfig' -+$cfg['Servers'][$i]['userconfig'] = 'pma__userconfig'; -+ -+// Table to store a list of recently used tables to be shown in the -+// left navigation frame. It helps you to jump across table directly, -+// without the need to select the database, and then select the table. -+// Using $cfg['LeftRecentTable'] you can configure the maximum number -+// of recent tables shown. -+// Without configuring the storage, you can still access the recently -+// used tables, but it will disappear after you logout. -+// DEFAULT: 'pma_recent' -+$cfg['Servers'][$i]['recent'] = 'pma__recent'; -+ -+// -+$cfg['Servers'][$i]['favorite'] = 'pma__favorite'; -+ -+// You can create different user groups with menu items attached to them. -+// Users can be assigned to these groups and the logged in user -+// would only see menu items configured to the usergroup he is assigned to. -+// To do this it needs two tables “usergroups” (storing allowed menu items for each user group) -+// and “users” (storing users and their assignments to user groups). -+// DEFAULT: 'pma_users' -+// DEFAULT: 'pma_usergroups' -+$cfg['Servers'][$i]['users'] = 'pma__users'; -+$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups'; -+ -+// You can hide/show items in the navigation tree. -+// DEFAULT: 'pma_navigationhiding' -+$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; -+ -+// Since release 4.2.0 you can save and load query-by-example searches from the Database > Query panel. -+$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches'; -+ -+// Since release 4.3.0 you can have a central list of columns per database. -+// You can add/remove columns to the list as per your requirement. -+// These columns in the central list will be available to use while you create a new column -+// for a table or create a table itself. You can select a column from central list -+// while creating a new column, it will save you from writing the same column definition -+// over again or from writing different names for similar column. -+$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns'; -+ -+// The name of the file containing Swekey ids and login names for -+// hardware authentication. Leave the string empty to deactivate this -+// feature. -+// see _docdir/examples/swekey.sample.conf -+//$cfg['Servers'][$i]['auth_swekey_config'] = '/etc/phpMyAdmin/swekey-pma.conf'; ++ ++/** ++ * The name of the database containing the phpMyAdmin configuration storage. ++ * ++ * For a whole set of additional features (bookmarks, comments, SQL-history, ++ * tracking mechanism, PDF-generation, column contents transformation, etc.) ++ * you need to create a set of special tables. Those tables can be located in ++ * your own database, or in a central database for a multi-user installation ++ * (this database would then be accessed by the controluser, so no other user ++ * should have rights to it). ++ * ++ * Default: '' ++ * ++ */ ++/* $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; ++ ++/* Other Storage tables */ ++ ++$cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark'; ++$cfg['Servers'][$i]['relation'] = 'pma__relation'; ++$cfg['Servers'][$i]['table_info'] = 'pma__table_info'; ++$cfg['Servers'][$i]['table_coords'] = 'pma__table_coords'; ++$cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages'; ++$cfg['Servers'][$i]['column_info'] = 'pma__column_info'; ++$cfg['Servers'][$i]['history'] = 'pma__history'; ++$cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs'; ++$cfg['Servers'][$i]['tracking'] = 'pma__tracking'; ++$cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords'; ++$cfg['Servers'][$i]['userconfig'] = 'pma__userconfig'; ++$cfg['Servers'][$i]['recent'] = 'pma__recent'; ++$cfg['Servers'][$i]['favorite'] = 'pma__favorite'; ++$cfg['Servers'][$i]['users'] = 'pma__users'; ++$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups'; ++$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; ++$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches'; ++$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns'; ++/* $cfg['Servers'][$i]['auth_swekey_config'] = ''; + + -+/* ++ ++/*************************************** + * Second Server + */ -+ -+/* + + /* +- * End of servers configuration +$i++; -+$cfg['Servers'][$i]['host'] = 'localhost'; -+$cfg['Servers'][$i]['port'] = ''; -+$cfg['Servers'][$i]['socket'] = ''; -+$cfg['Servers'][$i]['ssl'] = false; -+$cfg['Servers'][$i]['connect_type'] = 'socket'; -+$cfg['Servers'][$i]['extension'] = 'mysqli'; -+$cfg['Servers'][$i]['compress'] = false; -+$cfg['Servers'][$i]['auth_type'] = 'cookie'; -+$cfg['Servers'][$i]['user'] = 'root'; -+$cfg['Servers'][$i]['password'] = ''; -+$cfg['Servers'][$i]['AllowNoPassword'] = false; -+$cfg['Servers'][$i]['AllowRoot'] = true; -+$cfg['Servers'][$i]['SignonSession'] = ''; -+$cfg['Servers'][$i]['SignonURL'] = ''; -+$cfg['Servers'][$i]['LogoutURL'] = ''; -+$cfg['Servers'][$i]['only_db'] = ''; -+$cfg['Servers'][$i]['verbose'] = ''; -+$cfg['Servers'][$i]['verbose_check'] = true; -+$cfg['Servers'][$i]['AllowDeny']['order'] = ''; -+$cfg['Servers'][$i]['AllowDeny']['rules'] = array(); ++$cfg['Servers'][$i]['host'] = 'localhost'; ++$cfg['Servers'][$i]['port'] = ''; ++$cfg['Servers'][$i]['socket'] = ''; ++$cfg['Servers'][$i]['ssl'] = false; ++$cfg['Servers'][$i]['connect_type'] = 'socket'; ++$cfg['Servers'][$i]['extension'] = 'mysqli'; ++$cfg['Servers'][$i]['compress'] = false; ++$cfg['Servers'][$i]['auth_type'] = 'cookie'; ++$cfg['Servers'][$i]['user'] = 'root'; ++$cfg['Servers'][$i]['password'] = ''; ++$cfg['Servers'][$i]['AllowNoPassword'] = false; ++$cfg['Servers'][$i]['AllowRoot'] = true; ++$cfg['Servers'][$i]['SignonSession'] = ''; ++$cfg['Servers'][$i]['SignonURL'] = ''; ++$cfg['Servers'][$i]['LogoutURL'] = ''; ++$cfg['Servers'][$i]['only_db'] = ''; ++$cfg['Servers'][$i]['verbose'] = ''; ++$cfg['Servers'][$i]['verbose_check'] = true; ++$cfg['Servers'][$i]['AllowDeny']['order'] = ''; ++$cfg['Servers'][$i]['AllowDeny']['rules'] = array(); +*/ -+ ++ +/* + * phpMyAdmin configuration storage settings. -+ */ -+ -+/* -+$cfg['Servers'][$i]['controlhost'] = 'localhost'; -+$cfg['Servers'][$i]['controluser'] = ''; -+$cfg['Servers'][$i]['controlpass'] = ''; -+$cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; -+$cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark'; -+$cfg['Servers'][$i]['relation'] = 'pma__relation'; -+$cfg['Servers'][$i]['table_info'] = 'pma__table_info'; -+$cfg['Servers'][$i]['table_coords'] = 'pma__table_cords'; -+$cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages'; -+$cfg['Servers'][$i]['column_info'] = 'pma__column_info'; -+$cfg['Servers'][$i]['history'] = 'pma__history'; -+$cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs'; -+$cfg['Servers'][$i]['tracking'] = 'pma__tracking'; -+$cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords'; -+$cfg['Servers'][$i]['userconfig'] = 'pma__userconfig'; -+$cfg['Servers'][$i]['recent'] = 'pma__recent'; -+$cfg['Servers'][$i]['users'] = 'pma__users'; -+$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups'; -+$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; -+$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches'; -+$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns'; -+$cfg['Servers'][$i]['auth_swekey_config'] = '/etc/phpMyAdmin/swekey-pma_02.conf'; + */ + + /* ++$cfg['Servers'][$i]['controlhost'] = 'localhost'; ++$cfg['Servers'][$i]['controlport'] = ''; ++$cfg['Servers'][$i]['controluser'] = 'pma'; ++$cfg['Servers'][$i]['controlpass'] = 'pmapass'; ++$cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; ++$cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark'; ++$cfg['Servers'][$i]['relation'] = 'pma__relation'; ++$cfg['Servers'][$i]['table_info'] = 'pma__table_info'; ++$cfg['Servers'][$i]['table_coords'] = 'pma__table_cords'; ++$cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages'; ++$cfg['Servers'][$i]['column_info'] = 'pma__column_info'; ++$cfg['Servers'][$i]['history'] = 'pma__history'; ++$cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs'; ++$cfg['Servers'][$i]['tracking'] = 'pma__tracking'; ++$cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords'; ++$cfg['Servers'][$i]['userconfig'] = 'pma__userconfig'; ++$cfg['Servers'][$i]['recent'] = 'pma__recent'; ++$cfg['Servers'][$i]['users'] = 'pma__users'; ++$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups'; ++$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; ++$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches'; ++$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns'; ++$cfg['Servers'][$i]['auth_swekey_config'] = ''; +*/ + -+ -+// If you have more than one server configured, you can set $cfg['ServerDefault'] -+// to any one of them to autoconnect to that server when phpMyAdmin is started, -+// or set it to 0 to be given a list of servers without logging in -+// If you have only one server configured, $cfg['ServerDefault'] *MUST* be -+// set to that server. -+ -+// Default server (0 = no default server) -+$cfg['ServerDefault'] = 1; -+$cfg['Server'] = '0'; ++/** ++ * If you have more than one server configured, you can set $cfg['ServerDefault'] ++ * to any one of them to autoconnect to that server when phpMyAdmin is started, ++ * or set it to 0 to be given a list of servers without logging in ++ * If you have only one server configured, $cfg['ServerDefault'] *MUST* be ++ * set to that server. ++ * ++ * Default server (0 = no default server) ++ */ ++$cfg['ServerDefault'] = 1; ++$cfg['Server'] = '0'; +unset($cfg['Servers'][0]); - - /* - * End of servers configuration -diff -Pdpru phpMyAdmin-4.3.3-all-languages.orig/libraries/vendor_config.php phpMyAdmin-4.3.3-all-languages/libraries/vendor_config.php ---- phpMyAdmin-4.3.3-all-languages.orig/libraries/vendor_config.php 2014-12-21 12:40:25.000000000 +0100 -+++ phpMyAdmin-4.3.3-all-languages/libraries/vendor_config.php 2014-12-21 13:40:18.587272010 +0100 ++ ++/** ++ * End of servers configuration ++ */ ++ ++/****************************************************************************** + * Directories for saving/loading files from server + */ + $cfg['UploadDir'] = ''; +Index: libraries/vendor_config.php +=================================================================== +--- libraries/vendor_config.php.orig ++++ libraries/vendor_config.php @@ -17,18 +17,18 @@ if (! defined('PHPMYADMIN')) { * Path to changelog file, can be gzip compressed. Useful when you want to * have documentation somewhere else, eg. /usr/share/doc. ++++++ phpMyAdmin-pma.patch ++++++ Index: examples/create_tables.sql =================================================================== --- examples/create_tables.sql.orig +++ examples/create_tables.sql @@ -27,8 +27,8 @@ USE phpmyadmin; -- Privileges -- -- (activate this statement if necessary) --- GRANT SELECT, INSERT, DELETE, UPDATE, ALTER ON `phpmyadmin`.* TO --- 'pma'@localhost; +GRANT SELECT, INSERT, DELETE, UPDATE, ALTER ON `phpmyadmin`.* TO + 'pma'@localhost IDENTIFIED BY 'pmapass'; -- -------------------------------------------------------- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
