Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at Fri Feb 25 15:41:07 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/phpMyAdmin/phpMyAdmin.changes 2011-02-24 15:23:45.704322000 +0100 @@ -0,0 +1,769 @@ +------------------------------------------------------------------- +Wed Feb 23 12:10:46 UTC 2011 - chris@computersalat.de + +- update to 3.3.9.2 + - [security] SQL injection, see PMASA-2011-2 +- 3.3.9.1 (2011-02-08) + - [security] Path disclosure, see PMASA-2011-1 +- add macros for ap_usr, ap_grp +- fix perm on sysconfdir + o 0750,root,www + +------------------------------------------------------------------- +Thu Jan 27 20:14:40 UTC 2011 - chris@computersalat.de + +- update to 3.3.9 + - bug [doc] Fix references to MySQL doc + - patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand + - bug #3103853 [js] Double quotes were not escaped in generated js + - bug #3077463 [core] Events were not copied when copying/renaming database + - bug #1762306 [core] Copy database with view of a view + - patch #3117535 [replication] Add quotes to database in initial statement, + thanks to Craig Duncan - duncan3dc + - bug #3112614 [pdf schema] Scratchboard for PDF pages not working + - bug #3125606 [parser] Query for table "level" causes strange display + - bug #3127904 [parser] Close all opened round brackets indents +- removed Authors from spec + +------------------------------------------------------------------- +Fri Dec 3 23:04:41 UTC 2010 - chris@computersalat.de + +- update to 3.3.8.1 + - bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 +- rework config patch + o add AllowNoPassword + +------------------------------------------------------------------- +Wed Oct 27 10:23:50 UTC 2010 - javier@opensuse.org + +- update to 3.3.8 + - bug #3059311 [import] BIGINT field type added to table analysis + - [core] Update library PHPExcel to version 1.7.4 + - bug #3062455 [core] copy procedures and routines before tables + - bug #3062455 [export] with SQL, export procedures and routines before tables + - bug #3056023 [import] USE query not working + - bug #3038193 [display] Error when editing row with GEOMETRY column + - bug #3062454 [interface] Display routines/events also when no tables are defin +ed + - support ARIA storage engine as well as its previous name MARIA + + +------------------------------------------------------------------- +Wed Sep 22 14:03:14 CEST 2010 - mcihar@suse.cz + +- update to 3.3.7 + +------------------------------------------------------------------- +Wed Jul 7 14:48:50 UTC 2010 - chris@computersalat.de + +- update to version 3.3.4 +- bug #2996161 [import] properly escape import value +- bug #2998889 [import] Import button does not work in Catalan +- [browse] Fix handling of sort order if only column is specified. ++ [lang] Greek update, thanks to Panagiotis Papazoglou - panos78 ++ [lang] Updated lot of translation based on work done in master branch. +- bug #3008411 [databases] Last dropped database remains active in navi +- bug #2986383 [parser] Not all data being shown / counted +- bug [synchronize] Rows were deleted in target table regardless of the + "Would you like to delete..." option +- bug [privileges] List of tables not shown when the db name has a wildcard +- bug #3011126 [display] Edit link missing after long query +- patch #3013264 [doc] FAQ 1.40 uses a comma instead of a period, + thanks to Isaac Bennetch - ibennetch +- [engines] Fix getting InnoDB status. +- bug #2986422 [import] Results for query are not displayed + +------------------------------------------------------------------- +Fri May 21 16:59:50 UTC 2010 - chris@computersalat.de + +- update to version 3.3.3 + - patch #2982480 [navi] Do not group if there would be one table in group + - patch #2983492 [sync] When asking to synchronize Structure and Data, + only Structure is done + - patch #2984893 [engines] InnoDB storage page emits a warning + - bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work + - bug #2983066 [interface] Flush table on table operations shows the query twice + - bug #2983060, patch #2987900 [interface] Fix initial state of tables in + designer + - bug #2983062, patch #2989408 [engines] Fix warnings when changing table + engine to Maria + - bug #2974067 [display] non-binary fields shown as hex + - bug #2983065 [operations] Error when changing from Maria to MyISAM engine + - bug #2975408 [tracking] Data too long for column data_sql + - bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL + - bug [edit] Avoid selecting UNHEX function by default for a BLOB column for + which editing is protected + - bug #2994168 [structure] Show auto_increment in uppercase + - bug #2993970 [pdf schema] Page numbering in Table of Contents +- 3.3.2.0 (2010-04-13) + - patch #2969449 [core] Name for MERGE engine varies depending on the + MySQL version, thanks to Dieter Adriaenssens - ruleant + - bug #2966078 [browse] Incorrect LIMIT is saved and sticks while browsing + - bug #2967366 [Structure] Some results of Propose table structure are + shown in hex + - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY + - [navi] Changed link to git repository on main page + - bug #2972232 [menu] Import menu tab not present on main page + - patch #2976790 [menu] Go to the upper level after table DROP, + thanks to Kaarel Nummert - kaarelnu + - patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_ + - patch #2977725 [export] XML wrongly encoded, thanks to Victor Volkov - hanut + - patch #2979234 [import] Create tables with current charset and collation. + - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. + - bug #2973280 [export] Proper handling of temporary directory in XLS export. + - bug #2980582 [interface] Properly format server status parameter. + - bug #2973949 [session] SQL History broken (revert patch #2899969), + thanks to Dieter Adriaenssens - ruleant + - [doc] Be more specific about problems with Suhosin. + +------------------------------------------------------------------- +Fri Mar 26 00:41:30 UTC 2010 - chris@computersalat.de + +- update to version 3.3.1 + - bug #2941037 [core] Database structure not sorted by table correctly + - bug #2948492 [interface] Slide effect masks some fields on search page + - bug #2959746 [interface] Unknown table status: TABLE_TYPE + - bug #2953050 [export] export VIEW as SQL includes INSERT statement + - bug #2942032 [core] Cannot detect PmaAbsoluteUri correctly on Windows + - bug #2961609 [auth] Potential information disclosure at login page + - patch #2961540 [export] Do not export data of MERGE table, + thanks to Dieter Adriaenssens - ruleant + - bug #2961198 [parser] Querying a table named "data" + - bug #2931429 [structure] Editing long triggers + - bug #2970769 [structure] Incorrect reference to mootools-more.js +- cleanup spec + - fixed HEADER + - sort TAGS + - some macros (ap_...) + - updated description + - added postun + o restart_on_update apache2 +- some rpmlint stuff + - fdupes +- reworked patches + - removed blowfish_secret + - removed mysqli.patch + - added config patch + o mods to vendor_config +- replaced Source1 + phpmyadmin.conf > phpMyAdmin.http +- config.inc.php to /etc/phpMyAdmin + +------------------------------------------------------------------- +Wed Mar 10 21:41:47 UTC 2010 - javier@opensuse.org + +- Updated to 3.3.0 + + rfe #2308632 [edit] Use hex for (var)binary fields + + patch #2794819 [navi] Filter for displayed table names + - bug #2794840 [core] Cannot redeclare pma_tableheader() + - rfe #2726479 [core] configurable maximal length of URL + + patch #2724755 [display] Full/partial text links (big T) are back + - bug [display] handle NavigationBarIconic as documented for navi buttons + + rfe #2726479 [export] Export tables preselect + + patch #2805828 [export] PHP array export plugin + + patch #2798592 [import] Progress bar + - bug [gui] Generate Password not working for 'Change Login Information', only for 'Change password' + + [lang] Arabic update + + rfe #2822190 [structure] BOOLEAN is standard SQL + + [lang] German update + + rfe #2813867 [structure] Default sorting order in list of tables + + [import] Added MySQL type-detection functionality to import library + + [import] Added ODS, Excel XLS, Excel XLSX, and XML import modules + + [export] Added Excel XLSX export module + + [core] Added ability for tracking changes made through phpMyAdmin + + rfe #2839504 [engines] Support InnoDB plugin's new row formats + + [core] Added ability for synchronizing databases among servers. + + [lang] #2843101 Dutch update + + [lang] Galician update + + [export] Added MediaWiki export module + + [lang] Turkish update + + [auth] Add custom port configuration in signon + - [core] Removed context from the error handler + - bug #2883633 [export] Export of InnoDB table is incomplete + + rfe #2862575 [status] Order query statistics by % desc, skip rows with 0 + + rfe #2823686 [interface] Increase default height of query window + + rfe #2129902 [structure] Don't hide indexes + + patch #2812070 [interface] Allow selecting a range of rows by holding shift + + [lang] Russian update, thanks to Victor Volkov + + [lang] Greek update, thanks to Panagiotis Papazoglou + + [lang] Norwegian update, thanks to Sven-Erik Andersen + - bug #2929958 [import] Cannot import (French interface) + - [security] Use X-Frame-Options header to protect against ClickJacking. + + [lang] Finnish update, thanks to Jouni Kahkonen + + [lang] Lithuanian update, thanks to Rytis Slatkevicius - rytis_s + - bug #2931939 [status] Seeing "m" as unit is confusing + - bug #2926613 [edit] Copy database shows errors when DB has foreign key + + [lang] Catalan update, thanks to Xavier Navarro + ++++ 572 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/phpMyAdmin/phpMyAdmin.changes calling whatdependson for head-i586 New: ---- phpMyAdmin-3.3.8-config.patch phpMyAdmin-3.3.9.2-all-languages.tar.bz2 phpMyAdmin.changes phpMyAdmin.http phpMyAdmin.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ # # spec file for package phpMyAdmin # # Copyright (c) 2011 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: phpMyAdmin %define apxs %{_sbindir}/apxs2 %define ap_sysconfdir %(%{apxs} -q SYSCONFDIR) %define ap_serverroot %(%{apxs} -q PREFIX) %define ap_docroot %(%{apxs} -q PREFIX)/htdocs %define pma_config %{_sysconfdir}/%{name}/config.inc.php %if 0%{?suse_version} %define ap_usr wwwrun %define ap_grp www %else %define ap_usr nobody %define ap_grp nogroup %endif Summary: Administration of MySQL over the web Version: 3.3.9.2 Release: 1 License: GPLv2+ Group: Productivity/Networking/Web/Frontends Url: http://www.phpMyAdmin.net Source0: %{name}-%{version}-all-languages.tar.bz2 Source1: %{name}.http Patch0: %{name}-3.3.8-config.patch #Patch1: %{name}-2.11.0rc1-blowfish_secret.patch #Patch2: %{name}-3.1.0-mysqli.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwgen coreutils sed grep BuildRequires: apache2-devel %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif # Requires: mod_php_any php-bz2 php-gd php-iconv Requires: php-mbstring php-mcrypt php-mysql php-session php-zlib Recommends: php5-zip %description phpMyAdmin can manage a whole MySQL server (needs a super-user) as well as a single database. To accomplish the latter you'll need a properly set up MySQL user who can read/write only the desired database. It's up to you to look up the appropriate part in the MySQL manual. Currently phpMyAdmin can: * browse and drop databases, tables, views, fields and indexes * create, copy, drop, rename and alter databases, tables, fields and indexes * maintenance server, databases and tables, with proposals on server configuration * execute, edit and bookmark any SQL-statement, even batch-queries * load text files into tables * create^1 and read dumps of tables * export^1 data to various formats: CSV, XML, PDF, ISO/IEC 26300 - OpenDocument Text and Spreadsheet, Word, Excel and L^AT[E]X formats * import data and MySQL structures from Microsoft Excel and OpenDocument spreadsheets, as well as XML, CSV, and SQL files * administer multiple servers * manage MySQL users and privileges * check referential integrity in MyISAM tables * using Query-by-example (QBE), create complex queries automatically connecting required tables * create PDF graphics of your Database layout * search globally in a database or a subset of it * transform stored data into any format using a set of predefined functions, like displaying BLOB-data as image or download-link * track changes on databases, tables and views * support InnoDB tables and foreign keys (see FAQ 3.6) * support mysqli, the improved MySQL extension (see FAQ 1.17) * communicate in 57 different languages * synchronize two databases residing on the same as well as remote servers (see FAQ 9.1) %prep %setup -q -n %{name}-%{version}-all-languages %patch0 -p1 find . -type d -exec chmod 755 {} \; find . -type f -exec chmod 644 {} \; find . -type f -name '*.orig' -exec rm {} \; rm lang/*.sh %{__rm} libraries/.htaccess %build %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 lang libraries pmd 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 \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.inc.php # fix libraries/vendor_config.php %{__sed} -i -e "s,@docdir@,%{_docdir}/%{name},g" -e "s,@sysconfdir@,%{_sysconfdir}/%{name},g" \ $RPM_BUILD_ROOT%{ap_docroot}/%{name}/libraries/vendor_config.php # fix libraries/common.inc.php %{__sed} -i -e "s,@PMA_Config@,%{_sysconfdir}/%{name}/config.inc.php,g" \ $RPM_BUILD_ROOT%{ap_docroot}/%{name}/libraries/common.inc.php # generate file list find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -mindepth 1 -maxdepth 1 -type d | sed -e "s@$RPM_BUILD_ROOT@@" > FILELIST find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config.inc.php' | sed -e "s@$RPM_BUILD_ROOT@@" >> FILELIST %{__install} -D -m0644 %{S:1} $RPM_BUILD_ROOT%{ap_sysconfdir}/conf.d/%{name}.conf # fix paths in http config %{__sed} -i -e "s,@ap_docroot@,%{ap_docroot},g" -e "s,@name@,%{name},g" \ -e "s,@docdir@,%{_docdir},g" $RPM_BUILD_ROOT%{ap_sysconfdir}/conf.d/%{name}.conf # rpmlint stuff %if 0%{?suse_version} > 1020 %fdupes -s ${RPM_BUILD_ROOT} %endif %post # on `rpm -ivh` PARAM is 1 # on `rpm -Uvh` PARAM is 2 # 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} %postun %restart_on_update apache2 %clean %{__rm} -rf $RPM_BUILD_ROOT %files -f FILELIST %defattr(644,root,root,755) %doc CREDITS ChangeLog Documentation.* docs.css %doc LICENSE README RELEASE-DATE* TODO translators.html %doc scripts/*.sql %dir %attr(0750,root,%{ap_grp}) %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/config.inc.php %dir %{ap_docroot}/%{name} %config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf %changelog ++++++ phpMyAdmin-3.3.8-config.patch ++++++ diff -ruN phpMyAdmin-3.3.8-all-languages-orig/config.sample.inc.php phpMyAdmin-3.3.8-all-languages/config.sample.inc.php --- phpMyAdmin-3.3.8-all-languages-orig/config.sample.inc.php 2010-10-25 18:21:44.000000000 +0200 +++ phpMyAdmin-3.3.8-all-languages/config.sample.inc.php 2010-12-03 23:58:26.000000000 +0100 @@ -2,71 +2,278 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * phpMyAdmin sample configuration, you can use it as base for - * manual configuration. For easier setup you can use setup/ + * manual configuration. For easier setup you can use scripts/setup.php * * All directives are explained in Documentation.html and on phpMyAdmin * wiki <http://wiki.phpmyadmin.net>. + */ + +/** + * 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. * - * @version $Id$ - * @package phpMyAdmin + * 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'] = 'https://@FQDN@/phpMyAdmin/'; -/* - * This is needed for cookie based authentication to encrypt password in - * cookie + +/** + * 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'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ +$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; + +/** + * The 'cookie' auth_type uses blowfish algorithm to encrypt the password. If + * at least one server configuration uses 'cookie' auth_type, enter here a + * passphrase that will be used by blowfish. + */ +$cfg['blowfish_secret'] = ''; + + + +/******************************************************************************* * Servers configuration */ $i = 0; -/* - * First server +/*************************************** + * 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 mysqli if your server has it */ -$cfg['Servers'][$i]['extension'] = 'mysql'; -$cfg['Servers'][$i]['AllowNoPassword'] = false; - -/* rajk - for blobstreaming */ -$cfg['Servers'][$i]['bs_garbage_threshold'] = 50; -$cfg['Servers'][$i]['bs_repository_threshold'] = '32M'; -$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600; -$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M'; - -/* User for advanced features */ -// $cfg['Servers'][$i]['controluser'] = 'pma'; -// $cfg['Servers'][$i]['controlpass'] = 'pmapass'; -/* Advanced phpMyAdmin features */ -// $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]['tracking'] = 'pma_tracking'; -// $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords'; -/* Contrib / Swekey authentication */ -// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; +// 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; + +// 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'] = ''; +$cfg['Servers'][$i]['controlpass'] = ''; + +// Authentication method (config, http or cookie based)? +$cfg['Servers'][$i]['auth_type'] = 'http'; + +// 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; + +// 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'] = ''; + +// Database used for Relation, Bookmark and PDF Features +// (see scripts/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'] = ''; + +// 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; + +// whether to allow root login +$cfg['Servers'][$i]['AllowRoot'] = 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(); + + +/*************************************** + * Second Server + */ + +/** +$i++; +$cfg['Servers'][$i]['host'] = ''; +$cfg['Servers'][$i]['port'] = ''; +$cfg['Servers'][$i]['socket'] = ''; +$cfg['Servers'][$i]['ssl'] = false; +$cfg['Servers'][$i]['connect_type'] = 'tcp'; +$cfg['Servers'][$i]['extension'] = 'mysqli'; +$cfg['Servers'][$i]['compress'] = false; +$cfg['Servers'][$i]['controluser'] = ''; +$cfg['Servers'][$i]['controlpass'] = ''; +$cfg['Servers'][$i]['auth_type'] = 'http'; +$cfg['Servers'][$i]['user'] = 'root'; +$cfg['Servers'][$i]['password'] = ''; +$cfg['Servers'][$i]['AllowNoPassword'] = false; +$cfg['Servers'][$i]['SignonSession'] = ''; +$cfg['Servers'][$i]['SignonURL'] = ''; +$cfg['Servers'][$i]['LogoutURL'] = ''; +$cfg['Servers'][$i]['only_db'] = ''; +$cfg['Servers'][$i]['verbose'] = ''; +$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]['verbose_check'] = true; +$cfg['Servers'][$i]['AllowRoot'] = true; +$cfg['Servers'][$i]['AllowDeny']['order'] = ''; +$cfg['Servers'][$i]['AllowDeny']['rules'] = array(); + */ + +// 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 */ -/* - * Directories for saving/loading files from server + +/******************************************************************************* + * Language and character set conversion settings */ + +// Default language to use, if not browser-defined or user-defined +$cfg['DefaultLang'] = 'utf-8'; + +// Default connection collation (used for MySQL >= 4.1) +$cfg['DefaultConnectionCollation'] = 'utf8_unicode_ci'; + +// Default character set to use for recoding of MySQL queries, does not take +// any effect when character sets recoding is switched off by +// $cfg['AllowAnywhereRecoding'] or in language file +// (see $cfg['AvailableCharsets'] to possible choices, you can add your own) +$cfg['DefaultCharset'] = 'utf-8'; + +// Allow character set recoding of MySQL queries, must be also enabled in language +// file to make harder using other language files than Unicode. +// Default value is false to avoid problems on servers without the iconv +// extension and where dl() is not supported +$cfg['AllowAnywhereRecoding'] = false; + +// You can select here which functions will be used for character set conversion. +// Possible values are: +// auto - automatically use available one (first is tested iconv, then +// recode) +// iconv - use iconv or libiconv functions +// recode - use recode_string function +$cfg['RecodingEngine'] = 'auto'; + + +/******************************************************************************* + * Web server upload/save/import directories + */ + +// Directory for uploaded files that can be executed by phpMyAdmin. +// For example './upload'. Leave empty for no upload directory support. +// Use %u for username inclusion. $cfg['UploadDir'] = ''; + +// Directory where phpMyAdmin can save exported data on server. +// For example './save'. Leave empty for no save directory support. +// Use %u for username inclusion. $cfg['SaveDir'] = ''; +// Directory where phpMyAdmin can save temporary files. +// This is needed for MS Excel export, see documentation how to enable that. +$cfg['TempDir'] = ''; + ?> diff -ruN phpMyAdmin-3.3.8-all-languages-orig/libraries/common.inc.php phpMyAdmin-3.3.8-all-languages/libraries/common.inc.php --- phpMyAdmin-3.3.8-all-languages-orig/libraries/common.inc.php 2010-10-25 18:21:44.000000000 +0200 +++ phpMyAdmin-3.3.8-all-languages/libraries/common.inc.php 2010-12-03 23:56:45.000000000 +0100 @@ -536,7 +536,7 @@ * force reading of config file, because we removed sensitive values * in the previous iteration */ -$_SESSION['PMA_Config'] = new PMA_Config('./config.inc.php'); +$_SESSION['PMA_Config'] = new PMA_Config('@PMA_Config@'); if (!defined('PMA_MINIMUM_COMMON')) { $_SESSION['PMA_Config']->checkPmaAbsoluteUri(); diff -ruN phpMyAdmin-3.3.8-all-languages-orig/libraries/config.default.php phpMyAdmin-3.3.8-all-languages/libraries/config.default.php --- phpMyAdmin-3.3.8-all-languages-orig/libraries/config.default.php 2010-10-25 18:21:44.000000000 +0200 +++ phpMyAdmin-3.3.8-all-languages/libraries/config.default.php 2010-12-03 23:56:45.000000000 +0100 @@ -136,7 +136,7 @@ * * @global string $cfg['Servers'][$i]['extension'] */ -$cfg['Servers'][$i]['extension'] = 'mysql'; +$cfg['Servers'][$i]['extension'] = 'mysqli'; /* rajk - added for blobstreaming */ $cfg['Servers'][$i]['bs_garbage_threshold'] = ''; diff -ruN phpMyAdmin-3.3.8-all-languages-orig/libraries/vendor_config.php phpMyAdmin-3.3.8-all-languages/libraries/vendor_config.php --- phpMyAdmin-3.3.8-all-languages-orig/libraries/vendor_config.php 2010-10-25 18:21:44.000000000 +0200 +++ phpMyAdmin-3.3.8-all-languages/libraries/vendor_config.php 2010-12-03 23:56:45.000000000 +0100 @@ -15,18 +15,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 ++++++ phpMyAdmin.http ++++++ <Directory @ap_docroot@/@name@> Options FollowSymLinks AllowOverride None <IfModule mod_php5.c> php_admin_flag register_globals off php_admin_flag magic_quotes_gpc off php_admin_flag allow_url_include off php_admin_flag allow_url_fopen off php_admin_flag zend.ze1_compatibility_mode off php_admin_flag safe_mode Off php_admin_value open_basedir "@ap_docroot@/@name@:/var/lib/php5:/tmp:@docdir@/@name@:/etc/@name@" </IfModule> </Directory> <Directory @ap_docroot@/@name@/libraries> Order allow,deny Deny from all </Directory> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org