Accepting request 847421 from server:php:applications

OBS-URL: https://build.opensuse.org/request/show/847421 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/phpMyAdmin?expand=0&rev=170
2020-11-25 18:29:36 +00:00 · 2020-11-25 18:29:36 +00:00 · a4ed46c15e
commit a4ed46c15e
parent 255a824de9 d5738e9737
9 changed files with 88 additions and 46 deletions
--- a/phpMyAdmin-4.9.7-all-languages.tar.xz
+++ b/phpMyAdmin-4.9.7-all-languages.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:294ae6f299d88eb83c99464fab2266cb18bd0fcb54bfd0384016af4961291fba
-size 6147004
--- a/phpMyAdmin-4.9.7-all-languages.tar.xz.asc
+++ b/phpMyAdmin-4.9.7-all-languages.tar.xz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEPQalns5zDrcbURwXznUvF4JZvZIFAl+Ij3cACgkQznUvF4JZ
-vZLkfBAAnX3MpAIhznBq590nk1QvpWiwm1JUgu7uKtEBq9nEoTFFiCEWvRkqTXxY
-x2fFpkP2U/+mPD8je9pYKMqIinG2pwNGbuMAM4c8chz6P/GpaEIpQGZEG5Y9RRl6
-wujv7PTct+KJuv1qbBiIIxaqJWASHUrVF6WqPiz7I5iBcx9OJvGwwAc9jYe0EUpL
-InTjQBvjqtM7tuHFbH7Ry6dVIfS7E/v8M5EflpcDraAcLSo3jtnxnhAheQoPUSHD
-htw5ED73jOpKhy5MwRjC43gcuodTRjfq9Dw/HfEamczFR5zwn8VINdHEyUQIpcuq
-XItZNVZigOf5KH+wrIt0JnRZxjTMMKiLVAqRw4GQmLvv5KSYpWEr5K/24b7R962U
-GGGuILmCmRd0LdUOotsvhbolfo4vwIaNrIlnYA4MQ8wD7Pp2gPYaLntUtUpcej8d
-++Zd6wnJggjUq58f/hXZTUChWf8p+yEoGuoihHC1PXEmJSmeO/4JanAHEJg5Ljml
-STNu6cDO41dgzUrdYvEeEQmAbjJNVqByOaYDJwVuMFGD0dlsdIWPcw0F/RfFvRVQ
-QpBz87wahZNe/fhuTTQFGc6fjo1wfIVCUDRujZe/vtF4rhCRoJiJuIW4vn9gSw5A
-/z6qlDxRpcUKDnAKZwtDfmavuk7gk2rHoKXAnEQcAW4G1FOcmfI=
-=gg8A
-----END PGP SIGNATURE-----
--- a/phpMyAdmin-5.0.4-all-languages.tar.xz
+++ b/phpMyAdmin-5.0.4-all-languages.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1578c1a08e594da4f4f62e676ccbdbd17784c3de769b094ba42c35bf05c057db
+size 8049828
--- a/phpMyAdmin-5.0.4-all-languages.tar.xz.asc
+++ b/phpMyAdmin-5.0.4-all-languages.tar.xz.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEPQalns5zDrcbURwXznUvF4JZvZIFAl+IkKIACgkQznUvF4JZ
+vZIKthAAmKzDsYGLYg0FfFMRFWYmjQoGvPD09S7Cn6evhRbjBQ0iamhHTJSwg2C3
+oHNEToP93WLB20qR2Ne1a/LkmzUXA3vRkMVFLkeGvy4wgDjz8KLTmiRdEPhVPMhk
+UViNRP4PhgkSHcukcIBzFxIy8LBTUkClTciMWxg8T5sfcwuo7e2CEeTh+5JeX1ak
+gwLGIWGskQsZAIDMtC4dVlBJq32KOD14YnawnFqpjY2JDEPJw1YptCM3tUGJHAxF
+EDxeLJzhfyEd9cB2BCuP3HEjxxIfm7k4FYOYZ6atj1Hy+w1A5fX/xWVNCcMlcsPT
+jzfCiWUNAw3zxEAbbPDJ6dBE0g6Acj6nsZ94uAFtstv7Sjce9cIRsqi7zdOY1qfs
+aQZ65a/K0U/l3ILWrBEiYcGHs2xzIl2wlwI9bXog2crFJNK/smVFn1XFXzQEzuzi
+hUeBMk1upO5gFnvODm0Xsb07jTFNm6oxptk/2lEETh1u4uk9Np41nG+lYrJab9Yf
+MFE0OkRMqVk++VG4kuxiFmVjOttaRGhFkusHxHUXg/4FLvYMWmibnkPzVwVlMSSN
+nPmsKOyrodOq6pNIzo8NO2EUL1iQOokKVxJmc9rz4KKHkP7hYguIJYlWWURgYA8Q
+CCJbZRBDNAVdfpih5mu7A3wt4O/2Ct2NRxNUHB0GUZBEcm5BscI=
+=Xk32
+-----END PGP SIGNATURE-----
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@ -2,8 +2,8 @@ Index: config.sample.inc.php
 ===================================================================
 --- config.sample.inc.php.orig
 +++ config.sample.inc.php
-@@ -11,13 +11,56 @@
-  */
+@@ -12,13 +12,56 @@
+ declare(strict_types=1);
 
 /**
 + * Disable the default warning that is displayed on the DB Details Structure
@ -60,7 +60,7 @@ Index: config.sample.inc.php
  */
 $i = 0;
 
-@@ -25,44 +68,153 @@ $i = 0;
+@@ -26,44 +69,153 @@ $i = 0;
  * First server
  */
 $i++;
@ -250,24 +250,31 @@ Index: libraries/vendor_config.php
 ===================================================================
 --- libraries/vendor_config.php.orig
 +++ libraries/vendor_config.php
-@@ -28,25 +28,25 @@ define('TEMP_DIR', './tmp/');
+@@ -24,31 +24,31 @@ define('AUTOLOAD_FILE', ROOT_PATH . 'ven
+ /**
+  * Directory where cache files are stored.
+  */
+-define('TEMP_DIR', ROOT_PATH . 'tmp/');
+define('TEMP_DIR', '@tmpdir@/');
+ 
+ /**
  * 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', ROOT_PATH . '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', ROOT_PATH . 'LICENSE');
 +define('LICENSE_FILE', '@docdir@/LICENSE');
 
 /**
  * Directory where SQL scripts to create/upgrade configuration storage reside.
  */
-define('SQL_DIR', './sql/');
+-define('SQL_DIR', ROOT_PATH . 'sql/');
 +define('SQL_DIR', '@docdir@/sql/');
 
 /**
@ -275,7 +282,7 @@ Index: libraries/vendor_config.php
  * It is not used directly in code, just a convenient
  * define used further in this file.
  */
-define('CONFIG_DIR', '');
+-define('CONFIG_DIR', ROOT_PATH);
 +define('CONFIG_DIR', '@sysconfdir@/');
 
 /**
--- a/phpMyAdmin-pma.patch
+++ b/phpMyAdmin-pma.patch
@ -17,7 +17,7 @@ Index: config.sample.inc.php
 ===================================================================
 --- config.sample.inc.php.orig
 +++ config.sample.inc.php
-@@ -200,7 +200,6 @@ $cfg['Servers'][$i]['savedsearches']
+@@ -201,7 +201,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';
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Mon Nov  9 13:22:27 UTC 2020 - ecsos <ecsos@opensuse.org>
+
+- Update to 5.0.4
+  - issue #16245 Fix failed Zoom search clears existing values
+  - issue        Fixed a PHP error when reporting a particular JS error
+  - issue #16326 Fixed latitude and longitude swap for geometries in edit mode
+  - issue #16032 Fix CREATE TABLE not being tracked when auto tracking is enabled
+  - issue #16397 Fix compatibility problems with older PHP versions (also issue #16399)
+  - issue #16396 Fix broken two-factor authentication
+
+- Changes from 5.0.3
+  - https://github.com/phpmyadmin/phpmyadmin/blob/RELEASE_5_0_3/ChangeLog
+
+- Changes from 5.0.2
+  - https://github.com/phpmyadmin/phpmyadmin/blob/RELEASE_5_0_2/ChangeLog
+
+- Changes from 5.0.1
+  - https://github.com/phpmyadmin/phpmyadmin/blob/RELEASE_5_0_1/ChangeLog
+
+- Changes from 5.0.0
+  - https://github.com/phpmyadmin/phpmyadmin/blob/RELEASE_5_0_0/ChangeLog
+
+- Set php >= 7.4 as recommends because:
+  Due to changes in the MySQL authentication method, PHP versions 
+  prior to 7.4 are unable to authenticate to a MySQL 8.0 or newer 
+  server (our tests show the problem actually began with MySQL 8.0.11).
+  This relates to a PHP bug https://bugs.php.net/bug.php?id=76243.
+- Remove Suggests: php-mcrypt as described in boo#1050980
+- Change tmpdir from ap_docroot/tmp to localstatedir/cache/phpMyAdmin.
+
 -------------------------------------------------------------------
 Fri Oct 16 07:56:11 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>

--- a/phpMyAdmin.http
+++ b/phpMyAdmin.http
@ -32,14 +32,9 @@
        </IfModule>
    </IfVersion>

-    <IfModule mod_php5.c>
-        Include @ap_sysconfdir@/conf.d/@name@.inc
-        php_admin_value open_basedir "@ap_docroot@/@name@:/var/lib/php5:/tmp:@docdir@/@name@:/etc/@name@:/proc/meminfo:/proc/stat"
-    </IfModule>
-
    <IfModule mod_php7.c>
        Include @ap_sysconfdir@/conf.d/@name@.inc
-        php_admin_value open_basedir "@ap_docroot@/@name@:/var/lib/php7:/tmp:@docdir@/@name@:/etc/@name@:/proc/meminfo:/proc/stat"
+        php_admin_value open_basedir "@ap_docroot@/@name@:@ap_tmpdir@:/var/lib/php7:/tmp:@docdir@/@name@:/etc/@name@:/proc/meminfo:/proc/stat"
    </IfModule>

 </Directory>
@ -82,7 +77,7 @@

 </Directory>

-<Directory @ap_docroot@/@name@/tmp>
+<Directory @ap_tmpdir@>

    <IfVersion < 2.4>
        Order allow,deny
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@ -21,6 +21,7 @@
 %define ap_serverroot %(%{apxs} -q PREFIX)
 %define ap_docroot_old %{ap_serverroot}/htdocs
 %define ap_docroot %{_datadir}
+%define ap_tmpdir %{_localstatedir}/cache/%{name}
 %define pma_config %{_sysconfdir}/%{name}/config.inc.php
 %if 0%{?suse_version}
 %define ap_usr wwwrun
@ -30,7 +31,7 @@
 %define ap_grp nogroup
 %endif
 Name:           phpMyAdmin
-Version:        4.9.7
+Version:        5.0.4
 Release:        0
 Summary:        Administration of MySQL over the web
 License:        GPL-2.0-or-later
@ -65,12 +66,9 @@ PreReq:         coreutils
 PreReq:         grep
 PreReq:         pwgen
 PreReq:         sed
-Recommends:     mod_php_any >= 5.5
+Recommends:     mod_php_any >= 7.4
 Recommends:     php-curl
 Recommends:     php-zip
-### will be removed with php >= 7.2
-## boo#1050980
-Suggests:       php-mcrypt
 BuildArch:      noarch

 %description
@ -135,16 +133,16 @@ find . ! -name '*.sh' ! -name '*-query' -type f -exec chmod 644 {} \;
 %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 templates vendor \
+cp -dR *.css *.php *.ico *.yml js libraries locale themes templates vendor \
  %{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
-# install TempDir
-install -d -m0770 %{buildroot}%{ap_docroot}/%{name}/tmp
+# install TempDir (now in cache)
+install -d -m0770 %{buildroot}%{ap_tmpdir}

 # fix libraries/vendor_config.php
-sed -i -e "s,@docdir@,%{_docdir}/%{name},g" -e "s,@sysconfdir@,%{_sysconfdir}/%{name},g" \
+sed -i -e "s,@docdir@,%{_docdir}/%{name},g" -e "s,@sysconfdir@,%{_sysconfdir}/%{name},g" -e "s,@tmpdir@,%{ap_tmpdir},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" \
@ -157,7 +155,7 @@ install -D -m0644 %{SOURCE3} %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf
 install -D -m0644 %{SOURCE4} %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.inc
 # fix paths in http config
 sed -i -e "s,@ap_docroot@,%{ap_docroot},g" -e "s,@name@,%{name},g" \
- -e "s,@docdir@,%{_docdir},g" -e "s,@ap_sysconfdir@,%{ap_sysconfdir},g" %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf
+ -e "s,@docdir@,%{_docdir},g" -e "s,@ap_sysconfdir@,%{ap_sysconfdir},g" -e "s,@ap_tmpdir@,%{ap_tmpdir},g" %{buildroot}%{ap_sysconfdir}/conf.d/%{name}.conf

 # rpmlint stuff
 %fdupes %{buildroot}%{ap_docroot}/%{name}/libraries
@ -170,6 +168,12 @@ if [ -d "%{ap_docroot_old}/%{name}/tmp" ]; then
  echo "info: removing %{ap_docroot_old}/%{name}/tmp for ap_docroot change"
  rm -rf "%{ap_docroot_old}/%{name}/tmp" || :
 fi
+# removing tmp/twig before ap_tmpdir change
+# a new one will be created anyway in new ap_docroot (like after a clean install)
+if [ -d "%{ap_docroot}/%{name}/tmp" ]; then
+  echo "info: removing %{ap_docroot}/%{name}/tmp for ap_tmpdir change"
+  rm -rf "%{ap_docroot}/%{name}/tmp" || :
+fi

 %preun
 if [ $1 -eq 0 ]; then
@ -177,6 +181,11 @@ if [ -d "%{ap_docroot}/%{name}/tmp" ]; then
  echo "info: removing %{ap_docroot}/%{name}/tmp for clean uninstall"
  rm -rf "%{ap_docroot}/%{name}/tmp" || :
 fi
+# Now the new tmpdir must also delete.
+if [ -d "%{ap_tmpdir}" ]; then
+  echo "info: removing %{ap_tmpdir} for clean uninstall"
+  rm -rf "%{ap_tmpdir}" || :
+fi
 fi

 %post
@ -243,7 +252,7 @@ fi
 %doc README RELEASE-DATE*
 %doc examples doc sql
 %dir %attr(0750,root,%{ap_grp}) %{_sysconfdir}/%{name}
-%dir %attr(0770,root,%{ap_grp}) %{ap_docroot}/%{name}/tmp
+%dir %attr(0770,root,www) %{ap_tmpdir}
 %config(noreplace) %{_sysconfdir}/%{name}/config.inc.php
 %dir %{ap_docroot}/%{name}
 %config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf