Eric Schirra
d5738e9737
- Update to 5.0.4 - issue #16245 Fix failed Zoom search clears existing values - issue Fixed a PHP error when reporting a particular JS error - issue #16326 Fixed latitude and longitude swap for geometries in edit mode - issue #16032 Fix CREATE TABLE not being tracked when auto tracking is enabled - issue #16397 Fix compatibility problems with older PHP versions (also issue #16399) - issue #16396 Fix broken two-factor authentication - Changes from 5.0.3 - https://github.com/phpmyadmin/phpmyadmin/blob/RELEASE_5_0_3/ChangeLog - Changes from 5.0.2 - https://github.com/phpmyadmin/phpmyadmin/blob/RELEASE_5_0_2/ChangeLog - Changes from 5.0.1 - https://github.com/phpmyadmin/phpmyadmin/blob/RELEASE_5_0_1/ChangeLog - Changes from 5.0.0 - https://github.com/phpmyadmin/phpmyadmin/blob/RELEASE_5_0_0/ChangeLog - Set php >= 7.4 as recommends because: Due to changes in the MySQL authentication method, PHP versions prior to 7.4 are unable to authenticate to a MySQL 8.0 or newer server (our tests show the problem actually began with MySQL 8.0.11). This relates to a PHP bug https://bugs.php.net/bug.php?id=76243. - Remove Suggests: php-mcrypt as described in boo#1050980 - Change tmpdir from ap_docroot/tmp to localstatedir/cache/phpMyAdmin. OBS-URL: https://build.opensuse.org/request/show/847420 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=360
290 lines
11 KiB
Diff
290 lines
11 KiB
Diff
Index: config.sample.inc.php
|
|
===================================================================
|
|
--- config.sample.inc.php.orig
|
|
+++ config.sample.inc.php
|
|
@@ -12,13 +12,56 @@
|
|
declare(strict_types=1);
|
|
|
|
/**
|
|
+ * 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['PmaNoRelation_DisableWarning'] = true;
|
|
+
|
|
+/**
|
|
+ * 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['ZeroConf'] = false;
|
|
+
|
|
+/**
|
|
+ * Disable the default warning that is displayed if Suhosin is detected
|
|
+ *
|
|
+ * Default: false
|
|
+ */
|
|
+/* $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. Needs to be 32 chars long.
|
|
+ *
|
|
+ * 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;
|
|
|
|
@@ -26,44 +69,153 @@ $i = 0;
|
|
* First server
|
|
*/
|
|
$i++;
|
|
-/* Authentication type */
|
|
-$cfg['Servers'][$i]['auth_type'] = 'cookie';
|
|
-/* Server parameters */
|
|
-$cfg['Servers'][$i]['host'] = 'localhost';
|
|
-$cfg['Servers'][$i]['compress'] = false;
|
|
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
|
|
+
|
|
+$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 */
|
|
-// $cfg['Servers'][$i]['controlhost'] = '';
|
|
-// $cfg['Servers'][$i]['controlport'] = '';
|
|
-// $cfg['Servers'][$i]['controluser'] = 'pma';
|
|
-// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
|
|
-
|
|
-/* Storage database and tables */
|
|
-// $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_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]['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]['designer_settings'] = 'pma__designer_settings';
|
|
-// $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
|
|
+$cfg['Servers'][$i]['controlhost'] = 'localhost';
|
|
+$cfg['Servers'][$i]['controlport'] = '';
|
|
+/*
|
|
+$cfg['Servers'][$i]['controluser'] = 'pma';
|
|
+$cfg['Servers'][$i]['controlpass'] = 'pmapass';
|
|
+
|
|
+/**
|
|
+ * 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]['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]['designer_settings'] = 'pma__designer_settings';
|
|
+$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
|
|
+/* $cfg['Servers'][$i]['auth_swekey_config'] = '';
|
|
+
|
|
+
|
|
+
|
|
+/**
|
|
+ * Second Server
|
|
+ */
|
|
+
|
|
+/*
|
|
+$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();
|
|
+*/
|
|
+
|
|
+/*
|
|
+ * phpMyAdmin configuration storage settings.
|
|
+ */
|
|
+
|
|
+/*
|
|
+$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]['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]['designer_settings'] = 'pma__designer_settings';
|
|
+$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
|
|
+$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';
|
|
+unset($cfg['Servers'][0]);
|
|
|
|
/**
|
|
* End of servers configuration
|
|
Index: libraries/vendor_config.php
|
|
===================================================================
|
|
--- libraries/vendor_config.php.orig
|
|
+++ libraries/vendor_config.php
|
|
@@ -24,31 +24,31 @@ define('AUTOLOAD_FILE', ROOT_PATH . 'ven
|
|
/**
|
|
* Directory where cache files are stored.
|
|
*/
|
|
-define('TEMP_DIR', ROOT_PATH . 'tmp/');
|
|
+define('TEMP_DIR', '@tmpdir@/');
|
|
|
|
/**
|
|
* Path to changelog file, can be gzip compressed. Useful when you want to
|
|
* have documentation somewhere else, eg. /usr/share/doc.
|
|
*/
|
|
-define('CHANGELOG_FILE', ROOT_PATH . 'ChangeLog');
|
|
+define('CHANGELOG_FILE', '@docdir@/ChangeLog');
|
|
|
|
/**
|
|
* Path to license file. Useful when you want to have documentation somewhere
|
|
* else, eg. /usr/share/doc.
|
|
*/
|
|
-define('LICENSE_FILE', ROOT_PATH . 'LICENSE');
|
|
+define('LICENSE_FILE', '@docdir@/LICENSE');
|
|
|
|
/**
|
|
* Directory where SQL scripts to create/upgrade configuration storage reside.
|
|
*/
|
|
-define('SQL_DIR', ROOT_PATH . 'sql/');
|
|
+define('SQL_DIR', '@docdir@/sql/');
|
|
|
|
/**
|
|
* Directory where configuration files are stored.
|
|
* It is not used directly in code, just a convenient
|
|
* define used further in this file.
|
|
*/
|
|
-define('CONFIG_DIR', ROOT_PATH);
|
|
+define('CONFIG_DIR', '@sysconfdir@/');
|
|
|
|
/**
|
|
* Filename of a configuration file.
|