Hello community, here is the log from the commit of package phpMyAdmin.1062 for openSUSE:12.2:Update checked in at 2012-11-20 10:48:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/phpMyAdmin.1062 (Old) and /work/SRC/openSUSE:12.2:Update/.phpMyAdmin.1062.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin.1062", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-10-22 00:44:18.403455820 +0200 +++ /work/SRC/openSUSE:12.2:Update/.phpMyAdmin.1062.new/phpMyAdmin.changes 2012-11-20 10:48:22.000000000 +0100 @@ -0,0 +1,1410 @@ +------------------------------------------------------------------- +Mon Nov 5 12:15:10 UTC 2012 - ch...@computersalat.de + +- update to 3.5.3.0 (2012-10-08) + * sf#3539044 [interface] Browse mode "Show" button gives blank page + if no results anymore + * sf#3534979 [interface] Copy Database Ajax feedback vanishes long + before copying is done + * sf#3527531 [interface] GC-maxlifetime warning incorrectly + displayed + * sf#3526916 [interface] Search fails with JS error when tooltips + disabled + * sf#3544366 [interface] Event comments not saved + * sf#3549084 [edit] Can't enter date directly when editing inline + * sf#3548491 [interface] Inline query editor doesn't work from + search results + * sf#3547825 [edit] BLOB download no longer works + * sf#3541966 [config] Error in generated configuration arrray + * sf#3553551 [GUI] Invalid HTML code in multi submits confirmation + form + * [interface] Designer sometimes places tables on the top menu + * sf#3546277 [core] Call to undefined function __() when config file + has wrong permissions + * sf#3540922 [edit] Error searching table with many fields + * sf#3555104 [edit] Cannot copy a DB with table and views + * sf#3559925 [privileges] Incorrect updating of the list of users + * sf#3561224 [edit] cell edit date field with empty date fills in + current date + * sf#3559955 [edit] current_date from function drop down fails on + update + * sf#3562472 add support for Solaris and FreeBSD system load and + memory display in server status + * sf#3553068 [import] Table import from XML file fails + * replace Highcharts with jqplot for Display chart + * sf#3567684 [edit] Pasting value doesn't clear null checkbox + * sf#3570786 [edit] Datepicker for date and datetime fields is + broken +- fix for bnc#788103 + * PMASA-2012-6 (CVE-2012-5339) + o http://www.phpmyadmin.net/home_page/security/PMASA-2012-6.php + * PMASA-2012-7 (CVE-2012-5368) + o http://www.phpmyadmin.net/home_page/security/PMASA-2012-7.php + +------------------------------------------------------------------- +Tue Aug 21 14:30:51 UTC 2012 - ch...@computersalat.de + +- update to 3.5.2.2 (2012-08-12) + - [security] Fixed XSS vulnerabilities, + see PMASA-2012-4 +- update to 3.5.2.1 (2012-08-03) + - [security] Fixed local path disclosure vulnerability, + see PMASA-2012-3 +- fix for bnc#776701 + * PMASA-2012-4 (CVE-2012-4345) +- fix for bnc#776698 + * PMASA-2012-3 (CVE-2012-4219) + +------------------------------------------------------------------- +Sun Jul 8 15:52:13 UTC 2012 - ch...@computersalat.de + +- udpate to 3.5.2 (2012-07-07) + * bug sf#3521416 [interface] JS error when editing index + * bug sf#3521313 [core] Call to undefined function __() + * bug sf#3521016 [edit] NOW() function incorrectly selected + * bug [GUI] Invalid HTML code on transformation_overview.php + * bug sf#3522930 [browse] Missing validation in Ajax mode + * bug Fix popup message on build SQL of import + * bug sf#3523499 [core] Make X-WebKit-CSP work better + * replace Highcharts with jqplot for query profiling, zoom search + * bug sf#3531584 [interface] No form validation in change password + dialog + * bug sf#3531585 [interface] Broken password validation in copy user + form + * bug sf#3531586 [unterface] Add user form prints JSON when user + presses enter + * bug sf#3534121 [config] duplicate line in config.sample.inc.php + * bug sf#3534311 [interface] Grid editing incorrectly parses + ENUM/SET values + * bug sf#3510196 [core] More clever URL rewriting with ForceSSL +- rebase config patch + +------------------------------------------------------------------- +Sun Jun 3 22:00:45 UTC 2012 - ch...@computersalat.de + +- 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 + +------------------------------------------------------------------- +Thu Apr 26 19:49:16 UTC 2012 - ch...@computersalat.de + +- update to 3.4.11.0 + * bug sf#3486970 [import] Exception on XML import + * bug sf#3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names + in navigation + * bug sf#3512565 [navi] Fixed missing word "Rows" in table list + tooltip after click + +------------------------------------------------------------------- +Mon Apr 2 10:14:55 UTC 2012 - ch...@computersalat.de + +- update to 3.4.10.2 (fix for bnc#755211) + - [security] Fixed local path disclosure vulnerability, + see PMASA-2012-2 + http://www.phpmyadmin.net/home_page/security/PMASA-2012-2.php + +------------------------------------------------------------------- +Thu Feb 23 12:45:22 UTC 2012 - ch...@computersalat.de + +- fix changelog + * rename bugs , patches ("{bug,patch} #....") to fit into + bug naming scheme -> "sf#...." + +------------------------------------------------------------------- +Mon Feb 20 09:50:54 UTC 2012 - ch...@computersalat.de + +- update to 3.4.10.1 (fix for bnc#747841) + * [security] XSS in replication setup, see PMASA-2012-1 +- 3.4.10.0 (2012-02-14) + * sf#3460090 [interface] TextareaAutoSelect feature broken + * sf#3375984 [export] PHP Array export might generate invalid php + code + * sf#3049209 [import] Import from ODS ignores cell that is the same + as cell be fore + * sf#3463933 [display] SELECT DISTINCT displays wrong total records + found + * sf#3458944 [operations] copy table data missing + SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO' + * sf#3469254 [edit] Setting data to NULL and drop-downs + * sf#3477063 [edit] Missing set fields and values in generated + INSERT query + * sf#3460867 [libraries] license issue with TCPDF + (updated to 5.9.145), (fix for bnc#736698) + +------------------------------------------------------------------- +Wed Dec 28 13:41:55 UTC 2011 - ch...@computersalat.de + +- update to 3.4.9 + - sf#3442028 [edit] Inline editing enum fields with null shows no dropdown + - sf#3442004 [interface] DB suggestion not correct for user with underscore + - sf#3438420 [core] Magic quotes removed in PHP 5.4 + - sf#3398788 [session] No feedback when result is empty (signon auth_type) + - sf#3384035 [display] Problems regarding ShowTooltipAliasTB + - sf#3306875 [edit] Can't rename a database that contains views + - sf#3452506 [edit] Unable to move tables with triggers + - sf#3449659 [navi] Fast filter broken with table tree + - sf#3448485 [GUI] Firefox favicon frameset regression + - [core] Better compatibility with mysql extension + - [security] Self-XSS on export options (export server/database/table), + see PMASA-2011-20 + - [security] Self-XSS in setup (host parameter), see PMASA-2011-19 +- fix for bnc#738411 + * PMASA-2011-19 (CVE-2011-4780) + * PMASA-2011-20 (CVE-2011-4782) +- rework config patch + +------------------------------------------------------------------- +Fri Dec 16 08:34:11 UTC 2011 - ch...@computersalat.de + +- fix changelog + * add missing info for bnc#736772 +- fix fdupes + * reduce fdupes to affected files only (./libraries,./themes) + +------------------------------------------------------------------- +Tue Dec 13 14:25:45 UTC 2011 - ch...@computersalat.de ++++ 1213 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.2:Update/.phpMyAdmin.1062.new/phpMyAdmin.changes New: ---- phpMyAdmin-3.5.3-all-languages.tar.bz2 phpMyAdmin-config.patch phpMyAdmin.changes phpMyAdmin.http phpMyAdmin.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ # # spec file for package phpMyAdmin # # Copyright (c) 2012 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/ # 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 License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends Version: 3.5.3 Release: 0 Url: http://www.phpMyAdmin.net Source0: %{name}-%{version}-all-languages.tar.bz2 Source1: %{name}.http Patch0: %{name}-config.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 Requires: php-bz2 Requires: php-gd Requires: php-iconv Requires: php-mbstring Requires: php-mcrypt Requires: php-mysql Requires: php-session Requires: 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 ## rpmlint: # wrong-file-end-of-line-encoding %{__perl} -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php %patch0 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 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 \ $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 ${RPM_BUILD_ROOT}%{ap_docroot}/%{name}/libraries %fdupes ${RPM_BUILD_ROOT}%{ap_docroot}/%{name}/themes %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} %restart_on_update apache2 %postun %restart_on_update apache2 %clean %{__rm} -rf $RPM_BUILD_ROOT %files -f FILELIST %defattr(644,root,root,755) %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} %config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf %changelog ++++++ phpMyAdmin-config.patch ++++++ Index: config.sample.inc.php =================================================================== --- config.sample.inc.php.orig +++ config.sample.inc.php @@ -1,6 +1,6 @@ <?php /* 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/ * @@ -11,57 +11,285 @@ */ /* + * 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 + * 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['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ +$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]['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. ++++++ 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@" # customize suhosin php_admin_value suhosin.post.max_array_index_length 256 php_admin_value suhosin.post.max_totalname_length 8192 php_admin_value suhosin.post.max_vars 2048 php_admin_value suhosin.request.max_array_index_length 256 php_admin_value suhosin.request.max_totalname_length 8192 php_admin_value suhosin.request.max_vars 2048 </IfModule> </Directory> <Directory @ap_docroot@/@name@/libraries> Order allow,deny Deny from all </Directory> -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
