diff --git a/phpMyAdmin-4.4.15.2-all-languages.tar.xz b/phpMyAdmin-4.4.15.2-all-languages.tar.xz deleted file mode 100644 index 941f5a9..0000000 --- a/phpMyAdmin-4.4.15.2-all-languages.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27c528ea446f1704e80592c77473a6307b52332008e17eaf14d28ebe5e636a70 -size 5596188 diff --git a/phpMyAdmin-4.4.15.2-all-languages.tar.xz.asc b/phpMyAdmin-4.4.15.2-all-languages.tar.xz.asc deleted file mode 100644 index ccbb482..0000000 --- a/phpMyAdmin-4.4.15.2-all-languages.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJWfauLAAoJEP78ZdGBr2RKhTIP/1AJziP7mY8WQ7ZtGV4NLSR+ -AOGFFce1Abh7i2vghwrQU6epttAQyRqMDN4Wf+vu0eKlLEwddHmkYOjsnsO9Dc/M -IlhjbkNme1loKgIYnU+3+6cI91QPCTVxwvAlEbWmtuh1hI10ecyMTf92P7Sau56o -05p6lQvtxVKQ4XNKzl9bCD8jwv34FJAPKqu4a2OnLB0YOgxFOP9C8QdVBJm6FVa4 -eDrvxtFf29lC3nFsGWa2gn6VTUKF9gMfFFpuOtnIPaxyLfloRTcpzOjqatZOdXwO -pQHQD9bcffDJrmo6xF9nirN08H+6x7hm4xHtZf3V5tmioAKFcUaedDy3tE5Ul0GG -PfJV5zXeIoMxh4icfdK4koPpqojLZWbA2qXCYS4kifAqd7/7mx4RrUfqjs7iMJOh -SQYRHzH0cBExvBjBUPl2ZFVI2HKsaFS2E0AK13WnanZFiil8ZvFTTUUPomP8gnsV -P9MvsAGG5KNH4cRETaUDD2ch9K6FDy2vtAXtabZBh4WhMQobiKczIlpbnjuFSKD4 -W6tpN9l8k0sWsvSzNIQqYaWzzMlVkAPhTPxWu1gjQp6WOeN3yaqzZ04ttiHSxY8p -Z0m5wtsSH4udmJ+4Q+8RmI6oig2g6PgMftoJilr0eKF5eyWu1jc5fmSLg2tDP4OO -vapxjAjeet2XUShRFq20 -=6fd9 ------END PGP SIGNATURE----- diff --git a/phpMyAdmin-4.5.3.1-all-languages.tar.xz b/phpMyAdmin-4.5.3.1-all-languages.tar.xz new file mode 100644 index 0000000..d8725f0 --- /dev/null +++ b/phpMyAdmin-4.5.3.1-all-languages.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75be3589b5e4800afb21581761478ddc5b888d6a09d5235a0ba997401d04fc00 +size 5757736 diff --git a/phpMyAdmin-4.5.3.1-all-languages.tar.xz.asc b/phpMyAdmin-4.5.3.1-all-languages.tar.xz.asc new file mode 100644 index 0000000..8ec454a --- /dev/null +++ b/phpMyAdmin-4.5.3.1-all-languages.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJWfaJRAAoJEP78ZdGBr2RKy1QP/jjSHIKkyTX+RG6BFySayK02 +0kN2G4WS9BtcGCtwEVVo5HmnQ3+KRw8U03wIiDhK7aODKsZqfShSl/VHRFo1X2n3 +AGkcjtQ/bM8ClxF5RfvP5z22L9ChEGaN7To9xV3Xrq9v7KFA0GAQGtC6JojHqZn2 +diOxB6M7x2Uxa7faF4u+p5DQMzB7oyjDBwFcKTs26K3YNRXpOFVnQlt0jjGAQF3w +LZByoXrx40CmIDgw88vPuQifHQKz/thA7PAPIrDGq8jyNXTAIncFChahqBbYUsFg +RmSBe/2K0UYRd5HGUCA984r9TNbp4DAoA88SJf6rgzy2ZozXhXjW/M7k0OlBt4np +W5SZ1RmrMdYStzAvSZ98zglXJr7uxEJxthGRZ8+QiUVt8IS5DGHHQmyg4Wc+xWWG +BtLl2hPsm3QCy1dDIj5QUOcdCEESTFhZ0x/43vt8jGIlp6rCxA6j+Mi8cAcA8VSU +qnN9BRs3PE3kU862EgTeTmQIMZL5Od2il3OHamXaaLD62DmbitjjnrbHXpP2AfML +gUDr61AlmVBKhrlqVDwREsKwJgI3xXA3iWFdl+B8ixEyMvVLUbpALGk/CvzYJ5qp +FIgsk6mfw/78JfBWd0eIgKMP6ICq9Og0ehVMsD1yIqnmQkaSdSENHb2Z4cGmeywa +f2HteGhZ0/6wVFODnJF6 +=PNwT +-----END PGP SIGNATURE----- diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch index 106a802..a66b387 100644 --- a/phpMyAdmin-config.patch +++ b/phpMyAdmin-config.patch @@ -2,12 +2,10 @@ Index: config.sample.inc.php =================================================================== --- config.sample.inc.php.orig +++ config.sample.inc.php -@@ -10,66 +10,237 @@ - * @package PhpMyAdmin +@@ -11,13 +11,76 @@ */ --/* -+/** + /** + * Your phpMyAdmin url + * + * Complete the variable below with the full url ie @@ -72,10 +70,9 @@ Index: config.sample.inc.php */ -$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 @@ -83,8 +80,7 @@ Index: config.sample.inc.php */ $i = 0; --/* -+/** +@@ -25,47 +88,158 @@ $i = 0; * First server */ $i++; @@ -95,9 +91,7 @@ Index: config.sample.inc.php -$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'] = ''; @@ -119,9 +113,10 @@ Index: config.sample.inc.php +$cfg['Servers'][$i]['AllowDeny']['order'] = ''; +$cfg['Servers'][$i]['AllowDeny']['rules'] = array(); + -+ -+/* phpMyAdmin configuration storage settings */ -+/** + + /** + * phpMyAdmin configuration storage settings. ++ * + * for more info/explanation about these VARS have look at + * libraries/config.default.php */ @@ -157,6 +152,8 @@ Index: config.sample.inc.php -// $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'; -/* Contrib / Swekey authentication */ -// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; + @@ -195,16 +192,17 @@ Index: config.sample.inc.php +$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 + */ - - /* -- * End of servers configuration ++ ++/* +$i++; +$cfg['Servers'][$i]['host'] = 'localhost'; +$cfg['Servers'][$i]['port'] = ''; @@ -230,9 +228,9 @@ Index: config.sample.inc.php + +/* + * phpMyAdmin configuration storage settings. - */ - - /* ++ */ ++ ++/* +$cfg['Servers'][$i]['controlhost'] = 'localhost'; +$cfg['Servers'][$i]['controlport'] = ''; +$cfg['Servers'][$i]['controluser'] = 'pma'; @@ -255,6 +253,8 @@ Index: config.sample.inc.php +$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'] = ''; +*/ + @@ -270,15 +270,14 @@ Index: config.sample.inc.php +$cfg['ServerDefault'] = 1; +$cfg['Server'] = '0'; +unset($cfg['Servers'][0]); -+ -+/** -+ * End of servers configuration -+ */ -+ -+/****************************************************************************** - * Directories for saving/loading files from server + + /** + * End of servers configuration +@@ -155,3 +329,4 @@ $cfg['SaveDir'] = ''; + * You can find more configuration options in the documentation + * in the doc/ folder or at . */ - $cfg['UploadDir'] = ''; ++ Index: libraries/vendor_config.php =================================================================== --- libraries/vendor_config.php.orig @@ -305,11 +304,11 @@ Index: libraries/vendor_config.php /** * Whether setup requires writable directory where config -@@ -47,7 +47,7 @@ define('EXAMPLES_DIR', './examples/'); +@@ -46,7 +46,7 @@ define('SQL_DIR', './sql/'); * It is not used directly in code, just a convenient * define used further in this file. */ --define('CONFIG_DIR', './'); +-define('CONFIG_DIR', ''); +define('CONFIG_DIR', '@sysconfdir@/'); /** diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes index 454610c..3160066 100644 --- a/phpMyAdmin.changes +++ b/phpMyAdmin.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon Jan 4 21:39:35 UTC 2016 - astieger@suse.com + +- phpMyAdmin 4.5.3.1: + * Minimum requirement is PHP 5.5 +- Highlights of the 4.5.x.x series: + * Improvements to the Console feature + * Include structure in PDF export + * Validate data before import + * Support CHECKSUM TABLE operation + * Improved operations regarding partitions + * Alter privileges when renaming or copying a database or table + * Several improvements related to speed and responsiveness + * Improved print view + * Use CTRL or ALT plus arrow keys to navigate in grid editor + * Use plain-English destinations for + $cfg['NavigationTreeDefaultTabTable'], $cfg['DefaultTabServer'], + $cfg['DefaultTabDatabase'], and $cfg['DefaultTabTable']. + The old style values will still work, but this makes it easier for + new users to easily understand the destination links. + * Integrate SQL debugging into Console + * Restore row editing when no unique/primary key exists + * Allow exporting one file per table and one file per database + * Improvements to using multiple servers with the auth_type cookie + * Support virtual columns (MySQL 5.7.5+) + * Add or improve support for several MariaDB features including + process list and virtual/persistent columns + * Improved handling of cached data when upgrading phpMyAdmin + * Add SHA256 security password support + ------------------------------------------------------------------- Tue Dec 29 18:47:04 UTC 2015 - ecsos@opensuse.org diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 07745d6..8779ff8 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -1,7 +1,7 @@ # # spec file for package phpMyAdmin # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -29,7 +29,7 @@ %define ap_grp nogroup %endif Name: phpMyAdmin -Version: 4.4.15.2 +Version: 4.5.3.1 Release: 0 Summary: Administration of MySQL over the web License: GPL-2.0+ @@ -48,7 +48,7 @@ BuildRequires: apache2-devel BuildRequires: python-devel BuildRequires: xz # -Requires: mod_php_any +Requires: mod_php_any >= 5.5 Requires: php-bz2 Requires: php-gd Requires: php-iconv