From d5f0633c68e7853c19d6fef3a1fd69666481fed9649936a1251fca754388f977 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Thu, 12 May 2022 15:07:36 +0000 Subject: [PATCH] Accepting request 976679 from home:ecsos:server Update to 5.2.0 OBS-URL: https://build.opensuse.org/request/show/976679 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=373 --- phpMyAdmin-5.1.3-all-languages.tar.xz | 3 - phpMyAdmin-5.1.3-all-languages.tar.xz.asc | 16 ----- phpMyAdmin-5.2.0-all-languages.tar.xz | 3 + phpMyAdmin-5.2.0-all-languages.tar.xz.asc | 16 +++++ phpMyAdmin-config.patch | 73 +++++++++++++---------- phpMyAdmin.changes | 35 ++++++++++- phpMyAdmin.spec | 4 +- 7 files changed, 96 insertions(+), 54 deletions(-) delete mode 100644 phpMyAdmin-5.1.3-all-languages.tar.xz delete mode 100644 phpMyAdmin-5.1.3-all-languages.tar.xz.asc create mode 100644 phpMyAdmin-5.2.0-all-languages.tar.xz create mode 100644 phpMyAdmin-5.2.0-all-languages.tar.xz.asc diff --git a/phpMyAdmin-5.1.3-all-languages.tar.xz b/phpMyAdmin-5.1.3-all-languages.tar.xz deleted file mode 100644 index bcd4da8..0000000 --- a/phpMyAdmin-5.1.3-all-languages.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c562feddc0f8ff5e69629113f273a0d024a65fb928c48e89ce614744d478296f -size 7035048 diff --git a/phpMyAdmin-5.1.3-all-languages.tar.xz.asc b/phpMyAdmin-5.1.3-all-languages.tar.xz.asc deleted file mode 100644 index ef47963..0000000 --- a/phpMyAdmin-5.1.3-all-languages.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEPQalns5zDrcbURwXznUvF4JZvZIFAmIF5jIACgkQznUvF4JZ -vZKbXA/9EmR6BOw4Sg231sdidLKEiAsvFyEaZGiRzq5wIIQP6hj2WbfH6blTd/VX -B+oIxTV9aRqmIExBXsRohd0mpTSJrs/rhmyd7w6NKqSclFX658LOZvWc/wHWgKsF -8jAh8E9uYecjGpgTWfWzVt9YFuDo9z4we556o+VmJ4zWioct1/6+nep2V4YYvoiU -2P0U+u+bdKloVzRnHAiRZ5MVWHo+h0PgHF/4UDowNSDy052+LB+h70MNCm9SKr7u -phV2ZOaeZVu68K55TLtYoEZB+HzJC6IAjhvqJfyj7eU4D/nlB3myh7l0BcDvjr8c -+X0rq+FKkuwVTvLXr4Kqa+UeidetCRhw7CNavkokLW0k0t46suac9Hp9e6MJicNh -k8oATJc5A+ybWpnjhzAomwktl5/AH68yahpTrhFFkrJ1eKP5DV8MCGyee0LVcnos -XQt5EXy504Pq+S9x5mY8hGyVN+QxJzuHHRpS1nYsW9q2jmxrPz66WjAOhNgdmz+d -xuR7FoQqELSmMc1RYL5QucfegjD9h6lej4hVXnVQ2tlc9IXgq9C5Kc2GtrtAr/9H -Ps2D5rKBiED8ruUaNmOtMXm689TCGdidV8Tep6OnyYElmp5pTlhUekCE48010DHF -kAd75qtvP3S/tSfwufVRioTlILkYR1oxiWPrZiEdDGC6rWkY8YM= -=zbN8 ------END PGP SIGNATURE----- diff --git a/phpMyAdmin-5.2.0-all-languages.tar.xz b/phpMyAdmin-5.2.0-all-languages.tar.xz new file mode 100644 index 0000000..4fa0ddc --- /dev/null +++ b/phpMyAdmin-5.2.0-all-languages.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66da31ca295f06182ac3f2e6e96057dc824c459baedf4b29de6ed0d3be039230 +size 7078212 diff --git a/phpMyAdmin-5.2.0-all-languages.tar.xz.asc b/phpMyAdmin-5.2.0-all-languages.tar.xz.asc new file mode 100644 index 0000000..566e911 --- /dev/null +++ b/phpMyAdmin-5.2.0-all-languages.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIyBAABCgAdFiEEPQalns5zDrcbURwXznUvF4JZvZIFAmJ7Q3IACgkQznUvF4JZ +vZJu9g/3d06sEHy3KHJ4DeeMgUYKMm01dfZm3MS5OacdB7Mmw0yF6fvaUDHuFJm9 +EY4A4Na3Z16fmSGjNnc8bJhZVC51a2n2cku3JnPeE3e2IWPLPggQm31PgNtKk1h5 +ct0q7aDQWHbSpappWzvanwSnGR+BRFEdmsvlx5t9XabK2v72+5ak1iyzeTCjJaZI +SProrj3vrYcR7ha1JoISeWmkyvUWVJo1atSOFMwSocIg7l3qmkaOR6a/bsPLHbAB +A5gLgGMzi6mTKceg3AEhfMujWlQdxK/U1SHD1bQJMOoM0Qu+DtOBWOPygcekjijC +1APAoQFBDWIZQFX/0fVJob0EF9L5W3o5DR83UHzw+Lf6uq/THgQiHBb/zwOIXY1k +yLnYeDc3/AX4At14VyaBHwa31Sd+yyaO065j2IrVrEyIwmapime0gJk53KcqGFOs +g43ghRj32FhXLplAtg4hMJF/lflH5umYnFcNZdAsUD3FUE8gRGxKLzsKF3qPHxtI +S4OS8ylYr29413UB2PZv74xFLVieBMDaUsGdxJOTQNaeaRkOjiPxt7qR3LufpC1V +62LFieMcM7CthUZSus2K8GhKkkY+/bz/jSOs6yNdAjO7xF3gi7Cs/YWvaN5ll3Uo +gRSpJOE0h4twgyTHDT6CENjVEfM9gvus7/PAo9SwtJTBHCgv5g== +=+Evr +-----END PGP SIGNATURE----- diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch index 78a064c..a02ec8c 100644 --- a/phpMyAdmin-config.patch +++ b/phpMyAdmin-config.patch @@ -250,40 +250,49 @@ Index: libraries/vendor_config.php =================================================================== --- libraries/vendor_config.php.orig +++ libraries/vendor_config.php -@@ -24,31 +24,31 @@ define('AUTOLOAD_FILE', ROOT_PATH . 'ven - /** - * Directory where cache files are stored. - */ --define('TEMP_DIR', ROOT_PATH . 'tmp' . DIRECTORY_SEPARATOR); -+define('TEMP_DIR', '@tmpdir@' . DIRECTORY_SEPARATOR); +@@ -22,38 +22,38 @@ return [ + /** + * Directory where cache files are stored. + */ +- 'tempDir' => ROOT_PATH . 'tmp' . DIRECTORY_SEPARATOR, ++ 'tempDir' => '@tmpdir@' . DIRECTORY_SEPARATOR, - /** - * Path to changelog file, can be gzip compressed. Useful when you want to - * have documentation somewhere else, eg. /usr/share/doc. - */ --define('CHANGELOG_FILE', ROOT_PATH . 'ChangeLog'); -+define('CHANGELOG_FILE', '@docdir@' . DIRECTORY_SEPARATOR . 'ChangeLog'); + /** + * Path to changelog file, can be gzip compressed. + * Useful when you want to have documentation somewhere else, e.g. /usr/share/doc. + */ +- 'changeLogFile' => ROOT_PATH . 'ChangeLog', ++ 'changeLogFile' => '@docdir@' . DIRECTORY_SEPARATOR . 'ChangeLog', - /** - * Path to license file. Useful when you want to have documentation somewhere - * else, eg. /usr/share/doc. - */ --define('LICENSE_FILE', ROOT_PATH . 'LICENSE'); -+define('LICENSE_FILE', '@docdir@' . DIRECTORY_SEPARATOR . 'LICENSE'); + /** + * Path to license file. Useful when you want to have documentation somewhere else, e.g. /usr/share/doc. + */ +- 'licenseFile' => ROOT_PATH . 'LICENSE', ++ 'licenseFile' => '@docdir@' . DIRECTORY_SEPARATOR . 'LICENSE', - /** - * Directory where SQL scripts to create/upgrade configuration storage reside. - */ --define('SQL_DIR', ROOT_PATH . 'sql' . DIRECTORY_SEPARATOR); -+define('SQL_DIR', '@docdir@' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR); + /** + * Directory where SQL scripts to create/upgrade configuration storage reside. + */ +- 'sqlDir' => ROOT_PATH . 'sql' . DIRECTORY_SEPARATOR, ++ 'sqlDir' => '@docdir@' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR, - /** - * Directory where configuration files are stored. - * It is not used directly in code, just a convenient - * define used further in this file. - */ --define('CONFIG_DIR', ROOT_PATH); -+define('CONFIG_DIR', '@sysconfdir@' . DIRECTORY_SEPARATOR); + /** + * Filename of a configuration file. + */ +- 'configFile' => ROOT_PATH . 'config.inc.php', ++ 'configFile' => '@sysconfdir@' . DIRECTORY_SEPARATOR . 'config.inc.php', - /** - * Filename of a configuration file. + /** + * Filename of custom header file. + */ +- 'customHeaderFile' => ROOT_PATH . 'config.header.inc.php', ++ 'customHeaderFile' => '@sysconfdir@' . DIRECTORY_SEPARATOR . 'config.header.inc.php', + + /** + * Filename of custom footer file. + */ +- 'customFooterFile' => ROOT_PATH . 'config.footer.inc.php', ++ 'customFooterFile' => '@sysconfdir@' . DIRECTORY_SEPARATOR . 'config.footer.inc.php', + + /** + * Default value for check for version upgrades. diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes index 535a247..d6d936c 100644 --- a/phpMyAdmin.changes +++ b/phpMyAdmin.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Thu May 12 13:11:56 UTC 2022 - ecsos + +- Update to 5.2.0 + * Bugfix + - issue #16521 Upgrade Bootstrap to version 5 + - issue #16521 Drop support for Internet Explorer and others + - issue Upgrade to shapefile 3 + - issue #16555 Bump minimum PHP version to 7.2 + - issue Remove the phpseclib dependency + - issue Upgrade Symfony components to version 5.2 + - issue Upgrade to Motranslator 4 + - issue #16005 Improve the performance of the Export logic + - issue #16829 Add NOT LIKE %...% operator to Table search + - issue #16845 Fixed some links not passing through url.php + - issue #16382 Remove apc upload progress method (all upload progress code was removed from the PHP extension) + - issue #16974 Replace zxcvbn by zxcvbn-ts + - issue #15691 Disable the last column checkbox in the column list dropdown instead of not allowing un-check + - issue #16138 Ignore the length of integer types and show a warning on MySQL >= 8.0.18 + - issue Add support for the Mroonga engine + - issue Double click column name to directly copy to clipboard + - issue #16425 Add DELETE FROM table on table operations page + - issue #16482 Add a select all link for table-specific privileges + - issue #14276 Add support for account locking + - issue #17143 Use composer/ca-bundle to manage the CA cert file + - issue #17143 Require the openssl PHP extension + - issue #17171 Remove the printview.css file from themes + - issue #17203 Redesign the export and the import pages + - issue #16197 Replace the master/slave terminology + - issue #17257 Replace libraries/vendor_config.php constants with an array + - issue Add the Bootstrap theme + - issue #17499 Remove stickyfilljs JavaScript dependency +- Rebase phpMyAdmin-config.patch. + ------------------------------------------------------------------- Fri Feb 11 13:09:01 UTC 2022 - ecsos @@ -4896,4 +4930,3 @@ Thu Aug 2 23:51:57 UTC 2001 - rvasice@suse.cz Mon Jun 18 09:49:14 UTC 2001 - rvasice@suse.cz - initial package release (version 2.1.0) - diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 29ba6cc..696fc03 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -25,7 +25,7 @@ %define apache_group nogroup %endif Name: phpMyAdmin -Version: 5.1.3 +Version: 5.2.0 Release: 0 Summary: Administration of MySQL over the web License: GPL-2.0-or-later @@ -137,7 +137,7 @@ 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 *.txt js libraries locale themes templates vendor \ +cp -dR *.php *.ico *.txt 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 \