Hello community,

here is the log from the commit of package phpMyAdmin.5278 for 
openSUSE:13.2:Update checked in at 2016-06-28 19:06:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.2:Update/phpMyAdmin.5278 (Old)
 and      /work/SRC/openSUSE:13.2:Update/.phpMyAdmin.5278.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "phpMyAdmin.5278"

Changes:
--------
New Changes file:

--- /dev/null   2016-06-25 11:41:22.768041005 +0200
+++ /work/SRC/openSUSE:13.2:Update/.phpMyAdmin.5278.new/phpMyAdmin.changes      
2016-06-28 19:06:29.000000000 +0200
@@ -0,0 +1,3392 @@
+-------------------------------------------------------------------
+Thu Jun 23 12:46:03 UTC 2016 - [email protected]
+
+- 4.4.15.7 (2016-06-23)
+  * fix issue Setup script doesn't use input type 'password' in all
+    relevant locations
+- fix for boo#986154
+  * PMASA-2016-17 (CVE-2016-5701, CWE-661)
+    https://www.phpmyadmin.net/security/PMASA-2016-17/
+    - BBCode injection vulnerability
+  * PMASA-2016-19 (CVE-2016-5703, CWE-661)
+    https://www.phpmyadmin.net/security/PMASA-2016-19/
+    - SQL injection attack
+  * PMASA-2016-21 (CVE-2016-5705, CWE-661)
+    https://www.phpmyadmin.net/security/PMASA-2016-21/
+    - Multiple XSS vulnerabilities
+  * PMASA-2016-22 (CVE-2016-5706, CWE-661)
+    https://www.phpmyadmin.net/security/PMASA-2016-22/
+    - DOS attack
+  * PMASA-2016-23 (CVE-2016-5730, CWE-661)
+    https://www.phpmyadmin.net/security/PMASA-2016-23/
+    - Multiple full path disclosure vulnerabilities
+  * PMASA-2016-24 (CVE-2016-5731, CWE-661)
+    https://www.phpmyadmin.net/security/PMASA-2016-24/
+    - XSS through FPD
+  * PMASA-2016-26 (CVE-2016-5733, CWE-661)
+    https://www.phpmyadmin.net/security/PMASA-2016-26/
+    - Multiple XSS vulnerabilities
+  * PMASA-2016-28 (CVE-2016-5739, CWE-661)
+    https://www.phpmyadmin.net/security/PMASA-2016-28/
+    - Referrer leak in transformations
+
+-------------------------------------------------------------------
+Sat May 28 18:57:10 UTC 2016 - [email protected]
+
+- update to 4.4.15.6 (2016-05-25)
+- Security fixes:
+  * PMASA-2016-16 (CVE-2016-5099, CWE-661) [boo#982128]
+    https://www.phpmyadmin.net/security/PMASA-2016-16/
+    - Self XSS vulneratbility, see PMASA-2016-16
+
+-------------------------------------------------------------------
+Tue Mar  1 18:25:15 UTC 2016 - [email protected]
+
+- phpMyAdmin 4.4.15.5:
+  The following vulnerabilities were fixed:
+  * CVE-2016-2560: Multiple XSS vulnerabilities (PMASA-2016-11 boo#968938)
+  * CVE-2016-2561: Multiple XSS vulnerabilities (PMASA-2016-12 boo#968941)
+
+-------------------------------------------------------------------
+Sun Jan 31 14:06:42 UTC 2016 - [email protected]
+
+- unbreak stable release
+- update to 4.4.15.4 (2016-01-29)
+  * gh#11892 Error with PMA 4.4.15.3
+  * gh#11896 Remove hard dependency on phpseclib
+
+-------------------------------------------------------------------
+Thu Jan 28 18:20:05 UTC 2016 - [email protected]
+
+- phpMyAdmin 4.4.15.3
+  The followinng vulnerabilities were fixed: (boo#964024)
+  * CVE-2016-2038: Multiple full path disclosure vulnerabilities
+  * CVE-2016-2039: Unsafe generation of XSRF/CSRF token
+  * CVE-2016-2040: Multiple XSS vulnerabilities
+  * CVE-2016-1927: Insecure password generation in JavaScript
+  * CVE-2016-2041: Unsafe comparison of XSRF/CSRF token
+  * CVE-2016-2042: Multiple full path disclosure vulnerabilities
+  * CVE-2016-2043: XSS vulnerability in normalization page
+- update upstream singing keyring
+
+-------------------------------------------------------------------
+Wed Jan  6 17:36:34 UTC 2016 - [email protected]
+
+- fix for boo#960854
+  * add missing dependency of php-json
+
+-------------------------------------------------------------------
+Tue Dec 29 18:47:04 UTC 2015 - [email protected]
+
+- update to 4.4.15.2 (2015-12-25)
+- Security fixes:
+  * PMASA-2015-5 (CVE-2015-8669, CWE-661 CWE-200) boo#960282
+    https://www.phpmyadmin.net/security/PMASA-2015-6/
+    - [Security] Path disclosure, see PMASA-2015-6
+    
+-------------------------------------------------------------------
+Mon Oct 26 10:32:47 UTC 2015 - [email protected]
+
+- update to 4.4.15.1 (2015-10-23)
+  - gh#11464 phpMyAdmin suggests upgrading to newer version not 
+    usable on that system
+- Security fixes: [boo#951960]
+  * PMASA-2015-5 (CVE-2015-7873, CWE-661 CWE-20)
+    https://www.phpmyadmin.net/security/PMASA-2015-5/
+    - fix issue [security] Content spoofing on url.php
+
+-------------------------------------------------------------------
+Sun Sep 20 20:12:36 UTC 2015 - [email protected]
+
+- update to 4.4.15 (2015-09-20)
+  - gh#11411 Undefined "replace" function on numeric scalar
+  - gh#11421 Stored-proc / routine - broken parameter parsing
+  - fix issue  Missing name for configuration read_as_multibytes
+  - gh#11431 Incorrect "No row selected" message
+  - gh#11447 MySQL 5.5 and the language system variable
+  - gh#11452 Semantics of export and import icons are mixed up
+  - gh#11451 Designer-Bug in move.js on multiple server 
+    configuration
+  - gh#11458 Invalid UTF-8 sequence in argument
+  - gh#11457 Request URI too large
+  - fix issue Invalid argument supplied for foreach()
+  - gh#11461 Foreign key constraints for InnoDB tables with 
+    upper-case letters disabled
+  - gh#11487 Warning when entering Query page
+- change entrys in changelog from sf to gh from 4.13.0 to now
+
+-------------------------------------------------------------------
+Thu Sep 17 09:41:30 UTC 2015 - [email protected]
+
+- boo#945999 enable required apache modules in spec at install
+
+-------------------------------------------------------------------
+Fri Sep 11 09:55:59 UTC 2015 - [email protected]
+
+- update 4.4.14.1 (2015-09-08)
+- Security fixes: [boo#945420]
+  * PMASA-2015-4 (CVE-2015-6830, CWE-661 CWE-307)
+    https://www.phpmyadmin.net/security/PMASA-2015-4/
+    - fix issue [security] reCaptcha bypass
+
+-------------------------------------------------------------------
+Tue Aug 25 10:09:07 UTC 2015 - [email protected]
+
+- update to 4.4.14 (2015-08-20)
+  - gh#11367 Export after search, missing WHERE clause
+  - gh#11380 Incomplete message after import
+  - fix issue Incorrect scalar type declaration 
+    (reported under PHP 7)
+  - gh#11389 ReCaptcha produces deprecated messages under PHP 7
+  - gh#11387 phpseclib < 2.0 produces deprecated messages on PHP 7
+  - gh#11404 "Switch to copied table" doesn't work
+  - gh#11406 Missing quotes after calling "distinct values"
+  - gh#11386 Cannot import database with long data in one column
+  - gh#11410 SPATIAL index option is not clickable
+
+-------------------------------------------------------------------
+Sun Aug  9 06:06:17 UTC 2015 - [email protected]
+
+- update to 4.4.13.1 (2015-08-08)
+  - gh#11368 SQL error when importing phpMyAdmin dump file
+  
+-------------------------------------------------------------------
+Sat Aug  8 10:35:18 UTC 2015 - [email protected]
+
+- update to 4.4.13 (2015-08-07)
+  - gh#1808 "Improve table structure" generates invalid SQL
+  - fix issue Once checked "Show only active" checkbox is always 
+    checked
+  - gh#1813 Delete rows using "Check All" is broken
+  - fix issue Fix PHP 7 possible binding ambiguity
+  - gh#11326 Exported schema includes all the tables of the 
+    database
+  - gh#11339 Results not displayed if query ends in delimiter and 
+    comment
+  - gh#11320 Live edit of data fields is not working always
+  - fix issue Table list in navigation collapses when entering into 
+    a table in another page
+  - gh#11364 JS error while trying to auto navigate to db structure 
+    page when db creation has failed
+
+-------------------------------------------------------------------
+Tue Jul 21 18:11:32 UTC 2015 - [email protected]
+
+- Apache configuration compatible with both 2.2 and 2.4
+
+-------------------------------------------------------------------
+Mon Jul 20 14:45:32 UTC 2015 - [email protected]
+
+- update to 4.4.12 (2015-07-20)
+  - Saved chart image does not have a proper name or an extension
+  - sf#4976 Timepicker CSS issues in Original theme
+  - sf#4975 Move/Copy/Rename operations on Table/Db fail on Drizzle server
+  - sf#4826 Two inline edit windows
+  - sf#4979 Problem when import *.ods file
+  - Add missing head tag
+  - sf#4985 Column headers move when scrolling
+- use smaller xz compressed archive
+- update Apache configuration to be compatible with 2.4
+
+-------------------------------------------------------------------
+Wed Jul  8 06:27:42 UTC 2015 - [email protected]
+
+- update to 4.4.11 (2015-07-06)
+  - fix bug Missing selected/entered values when editing active 
+       options in visual query builder
+  - sf#4969 Autoload from prefs_storage not behaving properly
++++ 3195 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:13.2:Update/.phpMyAdmin.5278.new/phpMyAdmin.changes

New:
----
  phpMyAdmin-4.4.15.7-all-languages.tar.xz
  phpMyAdmin-4.4.15.7-all-languages.tar.xz.asc
  phpMyAdmin-config.patch
  phpMyAdmin-pma.patch
  phpMyAdmin-rpmlintrc
  phpMyAdmin.changes
  phpMyAdmin.http
  phpMyAdmin.keyring
  phpMyAdmin.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
#
# spec file for package phpMyAdmin
#
# Copyright (c) 2016 SUSE LINUX 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/
#


%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
Name:           phpMyAdmin
Version:        4.4.15.7
Release:        0
Summary:        Administration of MySQL over the web
License:        GPL-2.0+
Group:          Productivity/Networking/Web/Frontends
Url:            https://www.phpMyAdmin.net/
Source0:        
https://files.phpmyadmin.net/phpMyAdmin/%{version}/%{name}-%{version}-all-languages.tar.xz
Source1:        
https://files.phpmyadmin.net/phpMyAdmin/%{version}/%{name}-%{version}-all-languages.tar.xz.asc
# http://docs.phpmyadmin.net/en/latest/setup.html#verifying-phpmyadmin-releases
Source2:        https://files.phpmyadmin.net/phpmyadmin.keyring#/%{name}.keyring
Source3:        %{name}.http
Source100:      %{name}-rpmlintrc
# Fix-SuSE: provide useful default config
Patch0:         %{name}-config.patch
# Fix-SUSE: auto config for pma storage
Patch1:         %{name}-pma.patch
BuildRequires:  apache2-devel
BuildRequires:  python-devel
BuildRequires:  xz
#
Requires:       mod_php_any
Requires:       php-bz2
Requires:       php-gd
Requires:       php-iconv
Requires:       php-json
Requires:       php-mbstring
Requires:       php-mcrypt
Requires:       php-mysql
Requires:       php-session
Requires:       php-zlib
# FIXME: use proper Requires(pre/post/preun/...)
PreReq:         coreutils
PreReq:         grep
PreReq:         pwgen
PreReq:         sed
Recommends:     php5-zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
BuildArch:      noarch
%if 0%{?suse_version} > 1020
BuildRequires:  fdupes
%endif

%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
%patch1

# rpmlint: fix incorrect-fsf-address
find . -type f | xargs sed -i -e 's:59 Temple Place\, Suite 330\, Boston\, MA  
02111-1307  USA:51 Franklin Street\, Fifth Floor\, Boston\, MA 02110-1301 USA:g'

find . -type d -exec chmod 755 {} \;
find . -type f -exec chmod 644 {} \;
find . -type f -name '*.orig' -exec rm {} \;
find . -type f -name '.buildinfo' -exec rm {} \;

%build

%install
#%%{__install} -d -m0750 $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name}
install -d -m0755 %{buildroot}%{ap_docroot}/%{name}
cp -dR *.css *.php *.ico js libraries locale themes \
  %{buildroot}%{ap_docroot}/%{name}
# install config to config dir
install -D -m0640 %{buildroot}%{ap_docroot}/%{name}/config.sample.inc.php \
 %{buildroot}%{_sysconfdir}/%{name}/config.inc.php

# fix libraries/vendor_config.php
sed -i -e "s,@docdir@,%{_docdir}/%{name},g" -e 
"s,@sysconfdir@,%{_sysconfdir}/%{name},g" \
  %{buildroot}%{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 %{buildroot}%{ap_docroot}/%{name} -mindepth 1 -maxdepth 1 -type d | sed -e 
"s@$RPM_BUILD_ROOT@@" > FILELIST
find %{buildroot}%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 
'config.inc.php' | sed -e "s@$RPM_BUILD_ROOT@@" >> FILELIST
install -D -m0644 %{SOURCE3} %{buildroot}%{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" %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf

# rpmlint stuff
%if 0%{?suse_version} > 1020
%fdupes %{buildroot}%{ap_docroot}/%{name}/libraries
%fdupes %{buildroot}%{ap_docroot}/%{name}/themes
%endif

# Fix python-bytecode-inconsistent-mtime
rm -rf doc/_ext/configext.pyc
pushd doc/_ext
%py_compile ./
popd

%post
# on `rpm -ivh` PARAM is 1
# on `rpm -Uvh` PARAM is 2
# set PmaAbsoluteUri ### generate blowfish secret
sed -i -e "s,@FQDN@,$(cat %{_sysconfdir}/HOSTNAME)," \
 -e "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s 
-1 46`'/" %{pma_config}
# enable required apache modules
if [ -x /usr/sbin/a2enmod ]; then
  a2enmod -q php5 || a2enmod php5
  a2enmod -q version || a2enmod version
fi
%if 0%{?suse_version} < 1310
%restart_on_update apache2
#%%else
#systemctl try-restart apache2 &>/dev/null
%endif

%postun
%if 0%{?suse_version} < 1310
%restart_on_update apache2
#%%else
#systemctl try-restart apache2 &>/dev/null
%endif

%files -f FILELIST
%defattr(644,root,root,755)
%doc ChangeLog
%doc LICENSE README RELEASE-DATE*
%doc examples doc 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-config.patch ++++++
Index: config.sample.inc.php
===================================================================
--- config.sample.inc.php.orig
+++ config.sample.inc.php
@@ -10,66 +10,237 @@
  * @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.
+ *
+ * Default: ''
+ */
+/* $cfg['PmaAbsoluteUri'] = '';
+
+/**
+ * Disable the default warning that is displayed on the DB Details Structure
+ * page if any of the required Tables for the relationfeatures could not be
+ * found
+ *
+ * Default: false
+ */
+/* $cfg['PmaNoRelation_DisableWarning']  = true;
+
+/**
+ * Zero Configuration mode.
+ *
+ * Enables Zero Configuration mode in which the user will be offered a choice
+ * to create phpMyAdmin configuration storage in the current database or use
+ * the existing one, if already present.
+ *
+ * Note: If there is no central configuration storage defined then you may end
+ * up with different set of phpMyAdmin configuration storage tables for
+ * different databases.
+ *
+ * Default: true
+ */
+$cfg['ZeroConf'] = false;
+
+/**
+ * Disable the default warning that is displayed if Suhosin is detected
+ *
+ * Default: false
+ */
+/* $cfg['SuhosinDisableWarning'] = true;
+
+/**
+ * Default language to use, if not browser-defined or user-defined
+ *
+ * Default: en
+ */
+/* $cfg['DefaultLang'] = 'de';
+
+/**
  * This is needed for cookie based authentication to encrypt password in
  * cookie
+ *
+ * YOU MUST FILL IN THIS FOR COOKIE AUTH!
  */
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$cfg['blowfish_secret'] = '';
 
-/*
+
+/******************************************************************************
  * Servers configuration
+ *
+ * for more info/explanation about these VARS have look at
+ *  libraries/config.default.php
  */
 $i = 0;
 
-/*
+/**
  * 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;
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
 
-/*
- * phpMyAdmin configuration storage settings.
+$cfg['Servers'][$i]['host']                     = 'localhost';
+$cfg['Servers'][$i]['port']                     = '';
+$cfg['Servers'][$i]['socket']                   = '';
+$cfg['Servers'][$i]['ssl']                      = false;
+$cfg['Servers'][$i]['connect_type']             = 'socket';
+$cfg['Servers'][$i]['extension']                = 'mysqli';
+$cfg['Servers'][$i]['compress']                 = false;
+$cfg['Servers'][$i]['auth_type']                = 'cookie';
+$cfg['Servers'][$i]['user']                     = 'root';
+$cfg['Servers'][$i]['password']                 = '';
+$cfg['Servers'][$i]['AllowNoPassword']          = false;
+$cfg['Servers'][$i]['AllowRoot']                = true;
+$cfg['Servers'][$i]['SignonSession']            = '';
+$cfg['Servers'][$i]['SignonURL']                = '';
+$cfg['Servers'][$i]['LogoutURL']                = '';
+$cfg['Servers'][$i]['only_db']                  = '';
+$cfg['Servers'][$i]['verbose']                  = '';
+$cfg['Servers'][$i]['verbose_check']            = true;
+$cfg['Servers'][$i]['AllowDeny']['order']       = '';
+$cfg['Servers'][$i]['AllowDeny']['rules']       = array();
+
+
+/* phpMyAdmin configuration storage settings */
+/**
+ * for more info/explanation about these VARS have look at
+ *  libraries/config.default.php
  */
 
-/* User used to manipulate with storage */
-// $cfg['Servers'][$i]['controlhost'] = '';
-// $cfg['Servers'][$i]['controlport'] = '';
-// $cfg['Servers'][$i]['controluser'] = 'pma';
-// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
+$cfg['Servers'][$i]['controlhost']              = 'localhost';
+$cfg['Servers'][$i]['controlport']              = '';
+/*
+$cfg['Servers'][$i]['controluser']              = 'pma';
+$cfg['Servers'][$i]['controlpass']              = 'pmapass';
+
 
 /* Storage database and tables */
-// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
-// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
-// $cfg['Servers'][$i]['relation'] = 'pma__relation';
-// $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
-// $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
-// $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
-// $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
-// $cfg['Servers'][$i]['history'] = 'pma__history';
-// $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
-// $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
-// $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
-// $cfg['Servers'][$i]['recent'] = 'pma__recent';
-// $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
-// $cfg['Servers'][$i]['users'] = 'pma__users';
-// $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
-// $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
-// $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
-// $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
-/* Contrib / Swekey authentication */
-// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
+
+/**
+ * The name of the database containing the phpMyAdmin configuration storage.
+ *
+ * For a whole set of additional features (bookmarks, comments, SQL-history,
+ * tracking mechanism, PDF-generation, column contents transformation, etc.)
+ * you need to create a set of special tables. Those tables can be located in
+ * your own database, or in a central database for a multi-user installation
+ * (this database would then be accessed by the controluser, so no other user
+ * should have rights to it).
+ *
+ * Default: ''
+ *
+ */
+/* $cfg['Servers'][$i]['pmadb']                    = 'phpmyadmin';
+
+/* Other Storage tables */
+
+$cfg['Servers'][$i]['bookmarktable']            = 'pma__bookmark';
+$cfg['Servers'][$i]['relation']                 = 'pma__relation';
+$cfg['Servers'][$i]['table_info']               = 'pma__table_info';
+$cfg['Servers'][$i]['table_coords']             = 'pma__table_coords';
+$cfg['Servers'][$i]['pdf_pages']                = 'pma__pdf_pages';
+$cfg['Servers'][$i]['column_info']              = 'pma__column_info';
+$cfg['Servers'][$i]['history']                  = 'pma__history';
+$cfg['Servers'][$i]['table_uiprefs']            = 'pma__table_uiprefs';
+$cfg['Servers'][$i]['tracking']                 = 'pma__tracking';
+$cfg['Servers'][$i]['designer_coords']          = 'pma__designer_coords';
+$cfg['Servers'][$i]['userconfig']               = 'pma__userconfig';
+$cfg['Servers'][$i]['recent']                   = 'pma__recent';
+$cfg['Servers'][$i]['favorite']                 = 'pma__favorite';
+$cfg['Servers'][$i]['users']                    = 'pma__users';
+$cfg['Servers'][$i]['usergroups']               = 'pma__usergroups';
+$cfg['Servers'][$i]['navigationhiding']         = 'pma__navigationhiding';
+$cfg['Servers'][$i]['savedsearches']            = 'pma__savedsearches';
+$cfg['Servers'][$i]['central_columns']          = 'pma__central_columns';
+/* $cfg['Servers'][$i]['auth_swekey_config']       = '';
+
+
+
+/***************************************
+ * Second Server
+ */
 
 /*
- * End of servers configuration
+$i++;
+$cfg['Servers'][$i]['host']                     = 'localhost';
+$cfg['Servers'][$i]['port']                     = '';
+$cfg['Servers'][$i]['socket']                   = '';
+$cfg['Servers'][$i]['ssl']                      = false;
+$cfg['Servers'][$i]['connect_type']             = 'socket';
+$cfg['Servers'][$i]['extension']                = 'mysqli';
+$cfg['Servers'][$i]['compress']                 = false;
+$cfg['Servers'][$i]['auth_type']                = 'cookie';
+$cfg['Servers'][$i]['user']                     = 'root';
+$cfg['Servers'][$i]['password']                 = '';
+$cfg['Servers'][$i]['AllowNoPassword']          = false;
+$cfg['Servers'][$i]['AllowRoot']                = true;
+$cfg['Servers'][$i]['SignonSession']            = '';
+$cfg['Servers'][$i]['SignonURL']                = '';
+$cfg['Servers'][$i]['LogoutURL']                = '';
+$cfg['Servers'][$i]['only_db']                  = '';
+$cfg['Servers'][$i]['verbose']                  = '';
+$cfg['Servers'][$i]['verbose_check']            = true;
+$cfg['Servers'][$i]['AllowDeny']['order']       = '';
+$cfg['Servers'][$i]['AllowDeny']['rules']       = array();
+*/
+
+/*
+ * phpMyAdmin configuration storage settings.
  */
 
 /*
+$cfg['Servers'][$i]['controlhost']              = 'localhost';
+$cfg['Servers'][$i]['controlport']              = '';
+$cfg['Servers'][$i]['controluser']              = 'pma';
+$cfg['Servers'][$i]['controlpass']              = 'pmapass';
+$cfg['Servers'][$i]['pmadb']                    = 'phpmyadmin';
+$cfg['Servers'][$i]['bookmarktable']            = 'pma__bookmark';
+$cfg['Servers'][$i]['relation']                 = 'pma__relation';
+$cfg['Servers'][$i]['table_info']               = 'pma__table_info';
+$cfg['Servers'][$i]['table_coords']             = 'pma__table_cords';
+$cfg['Servers'][$i]['pdf_pages']                = 'pma__pdf_pages';
+$cfg['Servers'][$i]['column_info']              = 'pma__column_info';
+$cfg['Servers'][$i]['history']                  = 'pma__history';
+$cfg['Servers'][$i]['table_uiprefs']            = 'pma__table_uiprefs';
+$cfg['Servers'][$i]['tracking']                 = 'pma__tracking';
+$cfg['Servers'][$i]['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]['savedsearches']            = 'pma__savedsearches';
+$cfg['Servers'][$i]['central_columns']          = 'pma__central_columns';
+$cfg['Servers'][$i]['auth_swekey_config']       = '';
+*/
+
+/**
+ * If you have more than one server configured, you can set 
$cfg['ServerDefault']
+ * to any one of them to autoconnect to that server when phpMyAdmin is started,
+ * or set it to 0 to be given a list of servers without logging in
+ * If you have only one server configured, $cfg['ServerDefault'] *MUST* be
+ * set to that server.
+ *
+ * Default server (0 = no default server)
+ */
+$cfg['ServerDefault']       = 1;
+$cfg['Server']              = '0';
+unset($cfg['Servers'][0]);
+
+/**
+ * End of servers configuration
+ */
+
+/******************************************************************************
  * Directories for saving/loading files from server
  */
 $cfg['UploadDir'] = '';
Index: libraries/vendor_config.php
===================================================================
--- libraries/vendor_config.php.orig
+++ libraries/vendor_config.php
@@ -17,18 +17,18 @@ if (! defined('PHPMYADMIN')) {
  * 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
@@ -47,7 +47,7 @@ define('EXAMPLES_DIR', './examples/');
  * It is not used directly in code, just a convenient
  * define used further in this file.
  */
-define('CONFIG_DIR', './');
+define('CONFIG_DIR', '@sysconfdir@/');
 
 /**
  * Filename of a configuration file.
++++++ phpMyAdmin-pma.patch ++++++
Index: sql/create_tables.sql
===================================================================
--- sql/create_tables.sql.orig
+++ sql/create_tables.sql
@@ -27,8 +27,8 @@ USE phpmyadmin;
 -- Privileges
 --
 -- (activate this statement if necessary)
--- GRANT SELECT, INSERT, DELETE, UPDATE, ALTER ON `phpmyadmin`.* TO
---    'pma'@localhost;
+GRANT SELECT, INSERT, DELETE, UPDATE, ALTER ON `phpmyadmin`.* TO
+    'pma'@localhost IDENTIFIED BY 'pmapass';
 
 -- --------------------------------------------------------
 
++++++ phpMyAdmin-rpmlintrc ++++++
addFilter("files-duplicated-waste")
addFilter("files-duplicate")
++++++ 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@:/proc/meminfo:/proc/stat"
    # 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>
  <IfVersion >= 2.4>
    Require all denied
  </IfVersion>
  <IfVersion < 2.4>
    Order allow,deny
    Deny from all
  </IfVersion>
</Directory>


Reply via email to