Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2012-06-05 15:34:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2012-05-03 10:59:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2012-06-05 15:34:20.000000000 +0200 @@ -1,0 +2,38 @@ +Sun Jun 3 22:00:45 UTC 2012 - [email protected] + +- update to 3.5.1.0 (2012-05-03) + * bug sf#3510784 [edit] Limit clause ignored when sort order is + remembered + * bug sf#3511471 [interface] View name not seen in navi panel + (MySQL 5.1) + * bug sf#3512916 [display] Right frame reloads after displaying SQL + result(zero rows) + * bug [interface] Fixed missing Codemirror for inline query edit + when exporting a result set + * bug sf#3514490 [auth] Multiple Navigation panels bug still present + * bug sf#3515181 [users] Error in create user + underscore + create + database + * bug sf#3515666 [display] Profiling chart shows wrong data + * bug sf#3516037 [auth] JS includes missing in auth config error page + * bug sf#3516183 [display] Missing image extension + * bug [display] Added missing icons in original theme + * bug sf#3516761 [edit] Query error after search + * bug sf#3516405 [display] Chart title is getting wrong within chart + export + * bug sf#3517021 [interface] Header links except 'More' hide after + closing dialog + * bug sf#3516817 [interface] "More" actions in table structure + * bug sf#3518484 [privileges] PMA_sqlAddSlashes() does not quote the + table names correctly + * bug sf#3518983 [designer] Error messages do not appear in the + Designer + * bug sf#3519747 [interface] Suhosin patch warning incorrectly + displayed + * bug sf#3520107 [interface] Server status page: Incorrect dialog box + titles + * bug sf#3516089 [structure] DROP does not work on defective VIEWs +- rebase config patch + * remove version from patch name + * add missing options + +------------------------------------------------------------------- Old: ---- phpMyAdmin-3.4.11-all-languages.tar.bz2 phpMyAdmin-3.4.9-config.patch New: ---- phpMyAdmin-3.5.1-all-languages.tar.bz2 phpMyAdmin-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.uW7L71/_old 2012-06-05 15:34:21.000000000 +0200 +++ /var/tmp/diff_new_pack.uW7L71/_new 2012-06-05 15:34:21.000000000 +0200 @@ -34,12 +34,12 @@ Summary: Administration of MySQL over the web License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends -Version: 3.4.11 +Version: 3.5.1 Release: 0 Url: http://www.phpMyAdmin.net Source0: %{name}-%{version}-all-languages.tar.bz2 Source1: %{name}.http -Patch0: %{name}-3.4.9-config.patch +Patch0: %{name}-config.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwgen coreutils sed grep @@ -109,7 +109,7 @@ %install #%{__install} -d -m0750 $RPM_BUILD_ROOT%{_sysconfdir}/%{name} %{__install} -d -m0755 $RPM_BUILD_ROOT%{ap_docroot}/%{name} -%{__cp} -dR *.css *.php *.html *.ico js libraries locale pmd themes \ +%{__cp} -dR *.css *.php *.html *.ico js libraries locale themes \ $RPM_BUILD_ROOT%{ap_docroot}/%{name} # install config to config dir %{__install} -D -m0640 $RPM_BUILD_ROOT%{ap_docroot}/%{name}/config.sample.inc.php \ @@ -152,10 +152,9 @@ %files -f FILELIST %defattr(644,root,root,755) -%doc CREDITS ChangeLog Documentation.* docs.css -%doc LICENSE README RELEASE-DATE* TODO -%doc contrib -%doc scripts +%doc ChangeLog Documentation.* docs.css +%doc LICENSE README RELEASE-DATE* +%doc examples %dir %attr(0750,root,%{ap_grp}) %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/config.inc.php %dir %{ap_docroot}/%{name} ++++++ phpMyAdmin-3.4.11-all-languages.tar.bz2 -> phpMyAdmin-3.5.1-all-languages.tar.bz2 ++++++ ++++ 112253 lines of diff (skipped) ++++++ phpMyAdmin-config.patch ++++++ Index: config.sample.inc.php =================================================================== --- config.sample.inc.php.orig +++ config.sample.inc.php @@ -10,59 +10,286 @@ * @package PhpMyAdmin */ +/** + * Your phpMyAdmin url + * + * Complete the variable below with the full url ie + * https://www.your_web.net/path_to_your_phpMyAdmin_directory/ + * + * It must contain characters that are valid for a URL, and the path is + * case sensitive on some Web servers, for example Unix-based servers. + * + * In most cases you can leave this variable empty, as the correct value + * will be detected automatically. However, we recommend that you do + * test to see that the auto-detection code works in your system. A good + * 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. + */ +$cfg['PmaAbsoluteUri'] = ''; + /* * This is needed for cookie based authentication to encrypt password in * cookie */ -$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ +/* 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['PmaAbsoluteUri_DisableWarning'] = false; + +/** + * 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 + */ +$cfg['PmaNoRelation_DisableWarning'] = false; + +/** + * Disable the default warning that is displayed if Suhosin is detected + * + * @global boolean $cfg['SuhosinDisableWarning'] + */ +$cfg['SuhosinDisableWarning'] = true; /* * Servers configuration */ $i = 0; -/* +/*************************************** * First server */ $i++; -/* Authentication type */ -$cfg['Servers'][$i]['auth_type'] = 'cookie'; -/* Server parameters */ -$cfg['Servers'][$i]['host'] = 'localhost'; -$cfg['Servers'][$i]['connect_type'] = 'tcp'; -$cfg['Servers'][$i]['compress'] = false; -/* Select mysql if your server does not have mysqli */ -$cfg['Servers'][$i]['extension'] = 'mysqli'; -$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. */ -/* 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'; -// $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]['table_uiprefs'] = 'pma_table_uiprefs'; +$cfg['Servers'][$i]['controlhost'] = ''; + +// 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'; + /* 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 +// 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'; + + +/*************************************** + * 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'] = ''; +$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]['auth_swekey_config'] = '/etc/phpMyAdmin/swekey-pma_02.conf'; + */ + +// 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 @@ -14,18 +14,18 @@ * Path to changelog file, can be gzip compressed. Useful when you want to * have documentation somewhere else, eg. /usr/share/doc. */ -define('CHANGELOG_FILE', './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', './LICENSE'); +define('LICENSE_FILE', '@docdir@/LICENSE'); /** * Path to config file generated using setup script. */ -define('SETUP_CONFIG_FILE', './config/config.inc.php'); +define('SETUP_CONFIG_FILE', '@sysconfdir@/config.inc.php'); /** * Whether setup requires writable directory where config @@ -43,7 +43,7 @@ define('CONFIG_DIR', './'); /** * Filename of a configuration file. */ -define('CONFIG_FILE', CONFIG_DIR . 'config.inc.php'); +define('CONFIG_FILE', SETUP_CONFIG_FILE ); /** * Filename of custom header file. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
