From baef86a27f11ba174d9dca063c42e307c5f1171fcd2169b0d57f7cab086a84d7 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Mon, 16 Dec 2013 18:59:59 +0000 Subject: [PATCH] Accepting request 211105 from home:ecsos update to 4.1.0 and some corrections OBS-URL: https://build.opensuse.org/request/show/211105 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=83 --- phpMyAdmin-4.0.10-all-languages.tar.bz2 | 3 - phpMyAdmin-4.1.0-all-languages.tar.bz2 | 3 + phpMyAdmin-config.patch | 248 +++++++++++++----------- phpMyAdmin.changes | 66 +++++++ phpMyAdmin.spec | 2 +- 5 files changed, 204 insertions(+), 118 deletions(-) delete mode 100644 phpMyAdmin-4.0.10-all-languages.tar.bz2 create mode 100644 phpMyAdmin-4.1.0-all-languages.tar.bz2 diff --git a/phpMyAdmin-4.0.10-all-languages.tar.bz2 b/phpMyAdmin-4.0.10-all-languages.tar.bz2 deleted file mode 100644 index c8c60f1..0000000 --- a/phpMyAdmin-4.0.10-all-languages.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42c6ae9cfe85d866ebc9b1b6b6f26bcb714e1dfabef1580629c5868a77f574db -size 6449048 diff --git a/phpMyAdmin-4.1.0-all-languages.tar.bz2 b/phpMyAdmin-4.1.0-all-languages.tar.bz2 new file mode 100644 index 0000000..e4884bb --- /dev/null +++ b/phpMyAdmin-4.1.0-all-languages.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fc9174ca71e93ffe2794089539566335fe0dd259e6faf68ba44c4dd7be3fa5d +size 6360389 diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch index 2799bbd..859adf7 100644 --- a/phpMyAdmin-config.patch +++ b/phpMyAdmin-config.patch @@ -29,15 +29,15 @@ Index: config.sample.inc.php * This is needed for cookie based authentication to encrypt password in * cookie + * YOU MUST FILL IN THIS FOR COOKIE AUTH! -+ */ + */ +-$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ +$cfg['blowfish_secret'] = ''; + +/* + * Disable the default warning about $cfg['PmaAbsoluteUri'] not being set + * You should use this if and ONLY if the PmaAbsoluteUri auto-detection + * works perfectly. - */ --$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ ++ */ +$cfg['PmaAbsoluteUri_DisableWarning'] = false; + +/* @@ -55,7 +55,7 @@ Index: config.sample.inc.php /* * Servers configuration -@@ -25,43 +66,230 @@ $i = 0; +@@ -25,47 +66,247 @@ $i = 0; * First server */ $i++; @@ -134,97 +134,18 @@ Index: config.sample.inc.php /* * phpMyAdmin configuration storage settings. */ -+$cfg['Servers'][$i]['controlhost'] = ''; -+ ++$cfg['Servers'][$i]['controlhost'] = 'localhost'; + +-/* User used to manipulate with storage */ +-// $cfg['Servers'][$i]['controlhost'] = ''; +-// $cfg['Servers'][$i]['controlport'] = ''; +-// $cfg['Servers'][$i]['controluser'] = 'pma'; +-// $cfg['Servers'][$i]['controlpass'] = 'pmapass'; +// 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'] = ''; -+ -+// 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'] = ''; -+ -+// Bookmark table -+// - leave blank for no bookmark support -+// DEFAULT: 'pma_bookmark' -+$cfg['Servers'][$i]['bookmarktable'] = ''; -+ -+// table to describe the relation between links (see doc) -+// - leave blank for no relation-links support -+// DEFAULT: 'pma_relation' -+$cfg['Servers'][$i]['relation'] = ''; -+ -+// table to describe the display fields -+// - leave blank for no display fields support -+// DEFAULT: 'pma_table_info' -+$cfg['Servers'][$i]['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'] = ''; -+ -+// 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'] = ''; -+ -+// table to store column information -+// - leave blank for no column comments/mime types -+// DEFAULT: 'pma_column_info' -+$cfg['Servers'][$i]['column_info'] = ''; -+ -+// table to store SQL history -+// - leave blank for no SQL query history -+// DEFAULT: 'pma_history' -+$cfg['Servers'][$i]['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'; --/* User used to manipulate with storage */ --// $cfg['Servers'][$i]['controlhost'] = ''; --// $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'; @@ -239,6 +160,102 @@ Index: config.sample.inc.php -// $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'; ++// The password needed for the controluser to login ++// (see $cfg['Servers'][$i]['controluser']) ++$cfg['Servers'][$i]['controlpass'] = ''; ++ ++// 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'; ++ ++// 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'; ++ /* Contrib / Swekey authentication */ -// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; +// The name of the file containing Swekey ids and login names for @@ -253,10 +270,10 @@ Index: config.sample.inc.php + */ + +/* -++$i++; -++$cfg['Servers'][$i]['host'] = 'localhost'; -++$cfg['Servers'][$i]['port'] = ''; -++$cfg['Servers'][$i]['socket'] = ''; ++$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'; @@ -275,28 +292,31 @@ Index: config.sample.inc.php +$cfg['Servers'][$i]['AllowDeny']['order'] = ''; +$cfg['Servers'][$i]['AllowDeny']['rules'] = array(); +*/ - - /* ++ ++/* + * phpMyAdmin configuration storage settings. + */ -+ -+/* -+$cfg['Servers'][$i]['controlhost'] = ''; + + /* ++$cfg['Servers'][$i]['controlhost'] = 'localhost'; +$cfg['Servers'][$i]['controluser'] = ''; +$cfg['Servers'][$i]['controlpass'] = ''; -+$cfg['Servers'][$i]['pmadb'] = ''; -+$cfg['Servers'][$i]['bookmarktable'] = ''; -+$cfg['Servers'][$i]['relation'] = ''; -+$cfg['Servers'][$i]['table_info'] = ''; -+$cfg['Servers'][$i]['table_coords'] = ''; -+$cfg['Servers'][$i]['pdf_pages'] = ''; -+$cfg['Servers'][$i]['column_info'] = ''; -+$cfg['Servers'][$i]['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]['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]['auth_swekey_config'] = '/etc/phpMyAdmin/swekey-pma_02.conf'; +*/ + @@ -314,9 +334,9 @@ Index: config.sample.inc.php +/*************************************** * End of servers configuration */ - + Index: libraries/vendor_config.php -=================================================================== +=================================================================== --- libraries/vendor_config.php.orig +++ libraries/vendor_config.php @@ -17,18 +17,18 @@ if (! defined('PHPMYADMIN')) { diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes index 4b8cd76..77e7909 100644 --- a/phpMyAdmin.changes +++ b/phpMyAdmin.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Sun Dec 15 18:51:58 UTC 2013 - ecsos@schirra.net + +- update to 4.1.0 (2013-12-11) + + rfe #499 On user creation, warn if the user already exists + + Use indeterminate check all checkbox in server privileges + + Break server_status.php functions into smaller functions + + PMA_DBI functions in database_interface.lib.php renamed to be compliant with PEAR standards + + [interface] Make warning about existing config directory clearer + + rfe #1414 Allow specifying controlport + + PMA_DBI functions in database interface libraries renamed to be compliant with PEAR standards + + rfe #1412 Creating a view from an empty set of results + + Improved layout on db and table operations pages + + rfe #1410 Added support for AES_ENCRYPT for blob fields + + rfe #1423 Clarify option text for icon/text settings + + [interface] Upgraded CodeMirror to 3.x series + + rfe #1363 Improved query profiler + + [interface] rfe #1429 Better suggestion for database name + + rfe #1433 Support relations with ndbcluster + - sf#3962 Proper escaping of JSON export + + rfe #1382 Optional ReCAPTCHA support + + rfe #1434 Improvements to the table browsing navigation bar + + rfe #1233 and rfe #1283 Improvements to Relation View interface + + rfe #1397 Use fractional seconds in time, datetime, and timestamp + + rfe #175 Allow cross-database relations + - [core] Dropped support for PHP 5.2. + + rfe #487 and rfe #1405 Find and Replacing column wise + + rfe #1373 Use same create view dialog for editing a view + + rfe #316 Configurable menus; allow user groups with customized menus per group + - sf#4024 Editing field a record is selected by makes pma load forever + - sf#4035 Query "inline" link disappears when turning off "Explain SQL" option + + rfe #1385 Hide tables, functions, procedures, events and views in navigation tree + + rfe #1321 Export view as if it was a table + + Dropped configuration directive: SQP + + Dropped configuration directive: MySQLManual* + + rfe #1041 and bug #2954 Improved support for SSL connections between MySQL and phpMyAdmin + - sf#4056 Language: Vague error message when adding a varchar field + + [setup] rfe #1452 Use type="password" for server passwords + + rfe #1451 HTML5 input tag enhancements + - sf#1193 Text field too small when editing a row longer than $cfg['LimitChars'] + + Privileges tab for table level + - sf#4068 Headline in operations not readable in IE10 + - sf#4000 "Table does not contain unique column" message appears after adding a unique column + + rfe #1428 add 'new database' entry to nav tree + + rfe #1457 Stone Age icon found + + rfe #1463 Filter tables and databases by regular expression + + Change the proxy variable names in the config to remove the VersionCheck prefix from them + + Added an Error Reporting Component + + Javascript files are no longer uglified + - sf#4145 Config screen fails to validate MemoryLimit = -1 (new default) + - sf#4123 Double config including + - sf#4134 After deleting all rows on a page, it returns to a blank page + + Dropped configuration directive: DisableIS, ShowDatabasesCommand + - sf#4152 Not possible to enter % for search in date fields + - sf#3931 IN Clause search does not permit multiple values + - sf#4086 Clicking OK from edit popup opens new tab + - sf#2983 unknown table status: TABLE_TYPE + - sf#4030 ORDER BY SUM(`field`) does not sort DESC + - sf#4133 CSV import breaks when no blank line at end of file + - sf#4153 Unable to import if newline encoding is MAC style + - sf#4096 horizontal scrollbar should not overflow on the left column + - sf#4159 bug with navigation between database and table filter + - sf#4119 Huge session data with $cfg['Error_Handler']['gather'] + - sf#4169 Table list jumps to table on click + - sf#4168 Rename multiple columns is not working + ------------------------------------------------------------------- Fri Dec 6 14:58:34 UTC 2013 - ecsos@schirra.net diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 3296329..13dbd40 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -34,7 +34,7 @@ Name: phpMyAdmin Summary: Administration of MySQL over the web License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends -Version: 4.0.10 +Version: 4.1.0 Release: 0 Url: http://www.phpMyAdmin.net Source0: %{name}-%{version}-all-languages.tar.bz2