Accepting request 489944 from server:php:applications

restore phpMyAdmin-pma.patch, restore previous phpMyAdmin-config.patch (forwarded request 489943 from computersalat)

OBS-URL: https://build.opensuse.org/request/show/489944
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/phpMyAdmin?expand=0&rev=136

phpMyAdmin-config.patch

@@ -60,16 +60,28 @@ Index: config.sample.inc.php
   */
  $i = 0;
  
-@@ -31,38 +74,141 @@ $cfg['Servers'][$i]['auth_type'] = 'cook
+@@ -25,44 +68,153 @@ $i = 0;
- $cfg['Servers'][$i]['host'] = 'localhost';
+  * First server
- $cfg['Servers'][$i]['compress'] = false;
+  */
- $cfg['Servers'][$i]['AllowNoPassword'] = false;
+ $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,82 +104,8 @@ Index: config.sample.inc.php
 -// $cfg['Servers'][$i]['controlport'] = '';
 -// $cfg['Servers'][$i]['controluser'] = 'pma';
 -// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
-+$cfg['Servers'][$i]['controlhost'] = 'localhost';
+-
-+$cfg['Servers'][$i]['controlport'] = '';
+-/* Storage database and tables */
-+$cfg['Servers'][$i]['controluser'] = 'pma';
-+$cfg['Servers'][$i]['controlpass'] = 'pmapass';
-+
-+/* Storage database and tables */
-+/**
-+ * 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';
-+$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';
-+
-+
-+
-+/**
-+ * 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]['port']                     = '';
-+$cfg['Servers'][$i]['socket']                   = '';
-+$cfg['Servers'][$i]['ssl']                      = false;
-+$cfg['Servers'][$i]['extension']                = 'mysqli';
-+$cfg['Servers'][$i]['user']                     = 'root';
-+$cfg['Servers'][$i]['password']                 = '';
-+$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();
-+*/
-+/* 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';
@@ -188,8 +126,29 @@ Index: config.sample.inc.php
 -// $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]['pmadb'] = 'phpmyadmin';
++$cfg['Servers'][$i]['controluser'] = 'pma';
++$cfg['Servers'][$i]['controlpass'] = 'pmapass';
++
++/**
++ * 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';
@@ -209,6 +168,67 @@ Index: config.sample.inc.php
 +$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]['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]['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

@@ -0,0 +1,27 @@
+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']       = '';
+ */
+ 
+ /**

phpMyAdmin.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Apr 22 16:41:39 UTC 2017 - chris@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']
+
 -------------------------------------------------------------------
 Sat Apr  1 18:58:33 UTC 2017 - ecsos@opensuse.org
 

phpMyAdmin.spec

@@ -44,6 +44,8 @@ Source4:        %{name}.http.inc
 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 @@ Currently phpMyAdmin can:
 # 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'