Hello community,
here is the log from the commit of package phpMyAdmin for openSUSE:Factory
checked in at 2017-04-24 09:50:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old)
and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin"
Mon Apr 24 09:50:30 2017 rev:136 rq:489944 version:4.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2017-04-11
09:39:58.757018686 +0200
+++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes
2017-04-24 09:50:37.184377246 +0200
@@ -1,0 +2,9 @@
+Sat Apr 22 16:41:39 UTC 2017 - ch...@computersalat.de
+
+- restore phpMyAdmin-pma.patch
+ * because it is NOT upstream and needed for configuration storage
+- restore previous phpMyAdmin-config.patch
+ * merge with upstream config VAR changes
+ - removed $cfg['Servers'][$i]['designer_coords']
+
+-------------------------------------------------------------------
New:
----
phpMyAdmin-pma.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
--- /var/tmp/diff_new_pack.RRmqZS/_old 2017-04-24 09:50:38.772152681 +0200
+++ /var/tmp/diff_new_pack.RRmqZS/_new 2017-04-24 09:50:38.776152115 +0200
@@ -44,6 +44,8 @@
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
@@ -113,6 +115,7 @@
# 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'
++++++ phpMyAdmin-config.patch ++++++
--- /var/tmp/diff_new_pack.RRmqZS/_old 2017-04-24 09:50:38.816146459 +0200
+++ /var/tmp/diff_new_pack.RRmqZS/_new 2017-04-24 09:50:38.816146459 +0200
@@ -60,16 +60,28 @@
*/
$i = 0;
-@@ -31,38 +74,141 @@ $cfg['Servers'][$i]['auth_type'] = 'cook
- $cfg['Servers'][$i]['host'] = 'localhost';
- $cfg['Servers'][$i]['compress'] = false;
- $cfg['Servers'][$i]['AllowNoPassword'] = false;
+@@ -25,44 +68,153 @@ $i = 0;
+ * First server
+ */
+ $i++;
+-/* Authentication type */
+-$cfg['Servers'][$i]['auth_type'] = 'cookie';
+-/* Server parameters */
+-$cfg['Servers'][$i]['host'] = 'localhost';
+-$cfg['Servers'][$i]['compress'] = false;
+-$cfg['Servers'][$i]['AllowNoPassword'] = false;
++
++$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'] = '';
@@ -92,12 +104,34 @@
-// $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';
+-// $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
+-// $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
+$cfg['Servers'][$i]['controlhost'] = 'localhost';
+$cfg['Servers'][$i]['controlport'] = '';
++/*
+$cfg['Servers'][$i]['controluser'] = 'pma';
+$cfg['Servers'][$i]['controlpass'] = 'pmapass';
+
-+/* Storage database and tables */
+/**
+ * The name of the database containing the phpMyAdmin configuration storage.
+ *
@@ -111,45 +145,50 @@
+ * Default: ''
+ *
+ */
-+//$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';
-+$cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
-+$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
++/* $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]['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]['designer_settings'] = 'pma__designer_settings';
++$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
++/* $cfg['Servers'][$i]['auth_swekey_config'] = '';
+
+
+
+/**
+ * Second Server
+ */
-
++
+/*
+$i++;
-+$cfg['Servers'][$i]['auth_type'] = 'cookie';
-+$cfg['Servers'][$i]['host'] = 'localhost';
-+$cfg['Servers'][$i]['compress'] = false;
-+$cfg['Servers'][$i]['AllowNoPassword'] = false;
++$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'] = '';
@@ -160,55 +199,36 @@
+$cfg['Servers'][$i]['AllowDeny']['order'] = '';
+$cfg['Servers'][$i]['AllowDeny']['rules'] = array();
+*/
-+/* User used to manipulate with storage */
++
+/*
-+$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';
--// $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
--// $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
++ * phpMyAdmin configuration storage settings.
++ */
++
+/*
-+$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';
-+$cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
-+$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
++$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]['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]['designer_settings'] = 'pma__designer_settings';
++$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
++$cfg['Servers'][$i]['auth_swekey_config'] = '';
+*/
+
+/**
++++++ 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';
-- --------------------------------------------------------
Index: config.sample.inc.php
===================================================================
--- config.sample.inc.php.orig
+++ config.sample.inc.php
@@ -200,7 +200,6 @@ $cfg['Servers'][$i]['savedsearches']
$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
$cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
-$cfg['Servers'][$i]['auth_swekey_config'] = '';
*/
/**
