diff -Nru phpmyadmin-4.9.5+dfsg1/build.xml phpmyadmin-4.9.7+dfsg1/build.xml --- phpmyadmin-4.9.5+dfsg1/build.xml 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/build.xml 2020-10-15 18:04:00.000000000 +0000 @@ -95,7 +95,7 @@ --report=checkstyle --extensions=php --report-file='${basedir}/build/logs/checkstyle.xml' - --standard=PMAStandard + --standard=PhpMyAdmin ${source}" /> diff -Nru phpmyadmin-4.9.5+dfsg1/ChangeLog phpmyadmin-4.9.7+dfsg1/ChangeLog --- phpmyadmin-4.9.5+dfsg1/ChangeLog 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/ChangeLog 2020-10-15 18:04:00.000000000 +0000 @@ -1,6 +1,14 @@ phpMyAdmin - ChangeLog ====================== +4.9.7 (2020-10-15) +- issue #16397 Fix compatibility problems with older PHP versions (also issue #16399) +- issue #16396 Fix broken two-factor authentication + +4.9.6 (2020-10-09) +- issue [security] Fix XSS vulnerability with the transformation feature (PMASA-2020-5) +- issue [security] Fix SQL injection vulnerability with search feature (PMASA-2020-6) + 4.9.5 (2020-03-20) - issue [security] Fix SQL injection with certain usernames (PMASA-2020-2) - issue [security] Fix SQL injection in particular search situations (PMASA-2020-3) diff -Nru phpmyadmin-4.9.5+dfsg1/CODE_OF_CONDUCT.md phpmyadmin-4.9.7+dfsg1/CODE_OF_CONDUCT.md --- phpmyadmin-4.9.5+dfsg1/CODE_OF_CONDUCT.md 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/CODE_OF_CONDUCT.md 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at info@phpmyadmin.net. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ diff -Nru phpmyadmin-4.9.5+dfsg1/composer.lock phpmyadmin-4.9.7+dfsg1/composer.lock --- phpmyadmin-4.9.5+dfsg1/composer.lock 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/composer.lock 2020-10-15 18:04:01.000000000 +0000 @@ -54,16 +54,16 @@ }, { "name": "google/recaptcha", - "version": "1.2.3", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/google/recaptcha.git", - "reference": "98c4a6573b27e8b0990ea8789c74ea378795134c" + "reference": "614f25a9038be4f3f2da7cbfd778dc5b357d2419" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/recaptcha/zipball/98c4a6573b27e8b0990ea8789c74ea378795134c", - "reference": "98c4a6573b27e8b0990ea8789c74ea378795134c", + "url": "https://api.github.com/repos/google/recaptcha/zipball/614f25a9038be4f3f2da7cbfd778dc5b357d2419", + "reference": "614f25a9038be4f3f2da7cbfd778dc5b357d2419", "shasum": "" }, "require": { @@ -97,7 +97,7 @@ "recaptcha", "spam" ], - "time": "2019-08-16T15:48:25+00:00" + "time": "2020-03-31T17:50:54+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -164,16 +164,16 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.18", + "version": "v2.0.19", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "0a58ef6e3146256cc3dc7cc393927bcc7d1b72db" + "reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/0a58ef6e3146256cc3dc7cc393927bcc7d1b72db", - "reference": "0a58ef6e3146256cc3dc7cc393927bcc7d1b72db", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/446fc9faa5c2a9ddf65eb7121c0af7e857295241", + "reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241", "shasum": "" }, "require": { @@ -209,7 +209,7 @@ "pseudorandom", "random" ], - "time": "2019-01-03T20:59:08+00:00" + "time": "2020-10-15T10:06:57+00:00" }, { "name": "phpmyadmin/motranslator", @@ -317,16 +317,16 @@ }, { "name": "phpmyadmin/sql-parser", - "version": "4.6.1", + "version": "4.7.1", "source": { "type": "git", "url": "https://github.com/phpmyadmin/sql-parser.git", - "reference": "fd339b2b40b7910659c842891eb36d1d15079fcb" + "reference": "550ce6968794e890cfd5b4cbf202e716d78b6a92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/fd339b2b40b7910659c842891eb36d1d15079fcb", - "reference": "fd339b2b40b7910659c842891eb36d1d15079fcb", + "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/550ce6968794e890cfd5b4cbf202e716d78b6a92", + "reference": "550ce6968794e890cfd5b4cbf202e716d78b6a92", "shasum": "" }, "require": { @@ -337,9 +337,7 @@ "phpmyadmin/motranslator": "<3.0" }, "require-dev": { - "phpunit/php-code-coverage": "*", "phpunit/phpunit": "~4.8 || ~5.7 || ~6.5 || ^7.0", - "sami/sami": "^4.0", "squizlabs/php_codesniffer": "~2.9 || ~3.4" }, "suggest": { @@ -376,20 +374,20 @@ "parser", "sql" ], - "time": "2020-03-21T00:16:38+00:00" + "time": "2020-10-15T15:17:59+00:00" }, { "name": "phpseclib/phpseclib", - "version": "2.0.25", + "version": "2.0.29", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "c18159618ed7cd7ff721ac1a8fec7860a475d2f0" + "reference": "497856a8d997f640b4a516062f84228a772a48a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c18159618ed7cd7ff721ac1a8fec7860a475d2f0", - "reference": "c18159618ed7cd7ff721ac1a8fec7860a475d2f0", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/497856a8d997f640b4a516062f84228a772a48a8", + "reference": "497856a8d997f640b4a516062f84228a772a48a8", "shasum": "" }, "require": { @@ -398,7 +396,6 @@ "require-dev": { "phing/phing": "~2.7", "phpunit/phpunit": "^4.8.35|^5.7|^6.0", - "sami/sami": "~2.0", "squizlabs/php_codesniffer": "~2.0" }, "suggest": { @@ -468,7 +465,21 @@ "x.509", "x509" ], - "time": "2020-02-25T04:16:50+00:00" + "funding": [ + { + "url": "https://github.com/terrafrost", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpseclib", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib", + "type": "tidelift" + } + ], + "time": "2020-09-08T04:24:43+00:00" }, { "name": "pragmarx/google2fa", @@ -669,16 +680,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.14.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38" + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", - "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454", + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454", "shasum": "" }, "require": { @@ -690,7 +701,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -723,20 +738,34 @@ "polyfill", "portable" ], - "time": "2020-01-13T11:15:53+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.14.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2" + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2", - "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a", + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a", "shasum": "" }, "require": { @@ -748,7 +777,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -782,20 +815,34 @@ "portable", "shim" ], - "time": "2020-01-13T11:15:53+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-php56", - "version": "v1.14.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "16ec91cb06998b609501b55b7177b7d7c02badb3" + "reference": "13df84e91cd168f247c2f2ec82cc0fa24901c011" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/16ec91cb06998b609501b55b7177b7d7c02badb3", - "reference": "16ec91cb06998b609501b55b7177b7d7c02badb3", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/13df84e91cd168f247c2f2ec82cc0fa24901c011", + "reference": "13df84e91cd168f247c2f2ec82cc0fa24901c011", "shasum": "" }, "require": { @@ -805,7 +852,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -838,20 +889,34 @@ "portable", "shim" ], - "time": "2020-01-13T11:15:53+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-util", - "version": "v1.14.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "ba3cfcea6d0192cae46c62041f61cbb704b526d3" + "reference": "46b910c71e9828f8ec2aa7a0314de1130d9b295a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ba3cfcea6d0192cae46c62041f61cbb704b526d3", - "reference": "ba3cfcea6d0192cae46c62041f61cbb704b526d3", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/46b910c71e9828f8ec2aa7a0314de1130d9b295a", + "reference": "46b910c71e9828f8ec2aa7a0314de1130d9b295a", "shasum": "" }, "require": { @@ -860,7 +925,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -890,7 +959,21 @@ "polyfill", "shim" ], - "time": "2020-01-13T11:15:53+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-14T12:35:20+00:00" }, { "name": "tecnickcom/tcpdf", @@ -1007,6 +1090,7 @@ "i18n", "text" ], + "abandoned": true, "time": "2018-12-05T18:34:18+00:00" }, { @@ -1724,6 +1808,7 @@ "keywords": [ "tokenizer" ], + "abandoned": true, "time": "2017-12-04T08:55:13+00:00" }, { @@ -1912,16 +1997,16 @@ }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -1955,7 +2040,7 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "sebastian/comparator", @@ -2331,16 +2416,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.4", + "version": "3.5.6", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "dceec07328401de6211037abbb18bda423677e26" + "reference": "e97627871a7eab2f70e59166072a6b767d5834e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dceec07328401de6211037abbb18bda423677e26", - "reference": "dceec07328401de6211037abbb18bda423677e26", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e97627871a7eab2f70e59166072a6b767d5834e0", + "reference": "e97627871a7eab2f70e59166072a6b767d5834e0", "shasum": "" }, "require": { @@ -2378,7 +2463,7 @@ "phpcs", "standards" ], - "time": "2020-01-30T22:20:29+00:00" + "time": "2020-08-10T04:50:15+00:00" }, { "name": "symfony/console", @@ -2599,24 +2684,25 @@ }, { "name": "webmozart/assert", - "version": "1.7.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "aed98a490f9a8f78468232db345ab9cf606cf598" + "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598", - "reference": "aed98a490f9a8f78468232db345ab9cf606cf598", + "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", + "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0", + "php": "^5.3.3 || ^7.0 || ^8.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "vimeo/psalm": "<3.6.0" + "phpstan/phpstan": "<0.12.20", + "vimeo/psalm": "<3.9.1" }, "require-dev": { "phpunit/phpunit": "^4.8.36 || ^7.5.13" @@ -2643,7 +2729,7 @@ "check", "validate" ], - "time": "2020-02-14T12:15:55+00:00" + "time": "2020-07-08T17:02:28+00:00" } ], "aliases": [], @@ -2663,5 +2749,6 @@ "platform-dev": [], "platform-overrides": { "php": "5.5" - } + }, + "plugin-api-version": "1.1.0" } diff -Nru phpmyadmin-4.9.5+dfsg1/DCO phpmyadmin-4.9.7+dfsg1/DCO --- phpmyadmin-4.9.5+dfsg1/DCO 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/DCO 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -If you would like to make a contribution to the phpMyAdmin Project, please -certify to the following: -*** -phpMyAdmin Developer's Certificate of Origin. Version 1.0 - -By making a contribution to this project, I certify that: - -(a) The contribution was created in whole or in part by me and I have the - right to submit it under the license of "GNU General Public License or - any later version" ("GPLv2-or-later"); or - -(b) The contribution is based upon previous work that, to the best of my - knowledge, is covered under an appropriate open source license and I have - the right under that license to submit that work with modifications, - whether created in whole or in part by me, under GPLv2-or-later; or - -(c) The contribution was provided directly to me by some other person who - certified (a) or (b) and I have not modified it. - -(d) I understand and agree that this project and the contribution are public - and that a record of the contribution (including all metadata and - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - phpMyAdmin's policies and the requirements of the GPLv2-or-later where - they are relevant. - -(e) I am granting this work to this project under the terms of the - GPLv2-or-later. - - https://www.gnu.org/licenses/gpl-2.0.html - -*** -*** -And please confirm your certification to the above by adding the following -line to your patch: - - Signed-off-by: Jane Smith - -using your real name (sorry, no pseudonyms or anonymous contributions). - -If you are a developer who is authorized to contribute to phpMyAdmin on -behalf of your employer, then please use your corporate email address in the -Signed-off-by tag. If not, then please use a personal email address. - diff -Nru phpmyadmin-4.9.5+dfsg1/debian/autoload.php.tpl phpmyadmin-4.9.7+dfsg1/debian/autoload.php.tpl --- phpmyadmin-4.9.5+dfsg1/debian/autoload.php.tpl 2020-03-31 19:59:41.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/autoload.php.tpl 2020-10-15 21:53:57.000000000 +0000 @@ -9,6 +9,7 @@ require_once 'ReCaptcha/autoload.php'; require_once 'Psr/Container/autoload.php'; @include_once 'tcpdf/tcpdf.php'; +@include_once 'Bacon/BaconQrCode/src/autoload.php'; // @codingStandardsIgnoreFile // @codeCoverageIgnoreStart diff -Nru phpmyadmin-4.9.5+dfsg1/debian/changelog phpmyadmin-4.9.7+dfsg1/debian/changelog --- phpmyadmin-4.9.5+dfsg1/debian/changelog 2020-03-31 19:59:41.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/changelog 2020-10-15 21:53:57.000000000 +0000 @@ -1,3 +1,21 @@ +phpmyadmin (4:4.9.7+dfsg1-1) unstable; urgency=medium + + [ Debian Janitor ] + * Wrap long lines in changelog entries: 4:4.9.5+dfsg1-1. + + [ William Desportes ] + * Bump debhelper-compat to 13 + * Fix 2 typos in debian/doc-base + * Change encoding of sv.po from windows-1252 to UTF-8 + * New upstream version 4.9.7+dfsg1 + * Fixes: CVE-2020-26934, PMASA-2020-5, Closes: #971999 + * Fixes: CVE-2020-26935, PMASA-2020-6, Closes: #972000 + * Adjust patches to allow sql-parser 5.4+ + * Allow bacon qr code to be used + * Adjust open_basedir for BaconQrCode and DASPRiD/Enum dependency + + -- William Desportes Thu, 15 Oct 2020 23:53:57 +0200 + phpmyadmin (4:4.9.5+dfsg1-2) unstable; urgency=medium * Bump motranslator build dependency from 4.x to 5.x @@ -7,7 +25,8 @@ phpmyadmin (4:4.9.5+dfsg1-1) unstable; urgency=medium - * Set upstream metadata fields: Changelog, Documentation, FAQ, Donation, Security-Contact. + * Set upstream metadata fields: Changelog, Documentation, FAQ, Donation, + Security-Contact. * Bump Standards-Version to 4.5.0 * New upstream version 4.9.5 (Closes: #952308) * Fixes: CVE-2020-10802, PMASA-2020-3, Closes: #954665 diff -Nru phpmyadmin-4.9.5+dfsg1/debian/conf/apache.conf phpmyadmin-4.9.7+dfsg1/debian/conf/apache.conf --- phpmyadmin-4.9.5+dfsg1/debian/conf/apache.conf 2020-03-31 19:59:41.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/conf/apache.conf 2020-10-15 21:53:57.000000000 +0000 @@ -9,7 +9,7 @@ # limit libapache2-mod-php to files and directories necessary by pma php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp - php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext/:/usr/share/php/php-php-gettext/:/usr/share/javascript/:/usr/share/php/tcpdf/:/usr/share/doc/phpmyadmin/:/usr/share/php/phpseclib/:/usr/share/php/PhpMyAdmin/:/usr/share/php/Symfony/:/usr/share/php/Twig/:/usr/share/php/Twig-Extensions/:/usr/share/php/ReCaptcha/:/usr/share/php/Psr/Container/:/usr/share/php/Psr/Cache/:/usr/share/php/Psr/Log/:/usr/share/php/Psr/SimpleCache/ + php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext/:/usr/share/php/php-php-gettext/:/usr/share/javascript/:/usr/share/php/tcpdf/:/usr/share/doc/phpmyadmin/:/usr/share/php/phpseclib/:/usr/share/php/PhpMyAdmin/:/usr/share/php/Symfony/:/usr/share/php/Twig/:/usr/share/php/Twig-Extensions/:/usr/share/php/ReCaptcha/:/usr/share/php/Psr/Container/:/usr/share/php/Psr/Cache/:/usr/share/php/Psr/Log/:/usr/share/php/Psr/SimpleCache/:/usr/share/php/Bacon/BaconQrCode/:/usr/share/php/DASPRiD/Enum/ diff -Nru phpmyadmin-4.9.5+dfsg1/debian/control phpmyadmin-4.9.7+dfsg1/debian/control --- phpmyadmin-4.9.5+dfsg1/debian/control 2020-03-31 19:59:41.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/control 2020-10-15 21:53:57.000000000 +0000 @@ -6,7 +6,7 @@ Section: web Priority: optional Standards-Version: 4.5.0 -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), pkg-php-tools (>= 1.7~), phpab, locales-all, @@ -57,7 +57,8 @@ php-gd, php-bz2, php-zip, - php-tcpdf + php-tcpdf, + php-bacon-qr-code Suggests: default-mysql-server | virtual-mysql-server, www-browser, php-recode, diff -Nru phpmyadmin-4.9.5+dfsg1/debian/doc-base phpmyadmin-4.9.7+dfsg1/debian/doc-base --- phpmyadmin-4.9.5+dfsg1/debian/doc-base 2020-03-31 19:59:41.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/doc-base 2020-10-15 21:53:57.000000000 +0000 @@ -1,5 +1,5 @@ Document: phpmyadmin -title: pyMyAdmin documentation +Title: phpMyAdmin documentation Author: phpMyAdmin devel team Abstract: This manual describes how to use phpMyAdmin. Section: Programming diff -Nru phpmyadmin-4.9.5+dfsg1/debian/patches/Bump-compatible-dependency-versions.patch phpmyadmin-4.9.7+dfsg1/debian/patches/Bump-compatible-dependency-versions.patch --- phpmyadmin-4.9.5+dfsg1/debian/patches/Bump-compatible-dependency-versions.patch 2020-03-31 19:59:41.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/patches/Bump-compatible-dependency-versions.patch 2020-10-15 21:53:57.000000000 +0000 @@ -1,5 +1,5 @@ From: Felipe Sateler -Date: Mon, 16 Mar 2020 13:12:15 -0300 +Date: Tue, 13 Oct 2020 10:58:51 +0200 Subject: Bump compatible dependency versions Upstream motranslator bumped major version because support for older php @@ -16,18 +16,20 @@ Forwarded: not-needed --- - composer.json | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + composer.json | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json -index fb4ae67..07f0450 100644 +index fb4ae67..8b5fc02 100644 --- a/composer.json +++ b/composer.json -@@ -47,12 +47,12 @@ +@@ -46,13 +46,13 @@ + "ext-json": "*", "ext-ctype": "*", "ext-hash": "*", - "phpmyadmin/sql-parser": "^4.3.2", +- "phpmyadmin/sql-parser": "^4.3.2", - "phpmyadmin/motranslator": "^4.0", ++ "phpmyadmin/sql-parser": "^5.4", + "phpmyadmin/motranslator": "^5.0", "phpmyadmin/shapefile": "^2.0", "phpseclib/phpseclib": "^2.0", diff -Nru phpmyadmin-4.9.5+dfsg1/debian/po/az.po phpmyadmin-4.9.7+dfsg1/debian/po/az.po --- phpmyadmin-4.9.5+dfsg1/debian/po/az.po 2020-03-31 19:59:41.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/po/az.po 2020-10-15 21:53:57.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin@packages.debian.org\n" "POT-Creation-Date: 2019-10-22 22:04+0200\n" -"PO-Revision-Date: 2015-03-26 23:30+0200\n" -"Last-Translator: Sevdimali İsa \n" +"PO-Revision-Date: 2020-09-29 10:56+0000\n" +"Last-Translator: William Desportes \n" "Language-Team: Azerbaijani \n" "Language: az\n" @@ -17,13 +17,13 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.3-dev\n" +"X-Generator: Weblate 4.3-dev\n" #. Type: multiselect #. Description #: ../templates:2001 msgid "Web server to reconfigure automatically:" -msgstr "Avtomatik olaraq yenidən konfiqurasiya ediləcək web server:" +msgstr "Avtomatik olaraq yenidən konfiqurasiya ediləcək web server:" #. Type: multiselect #. Description diff -Nru phpmyadmin-4.9.5+dfsg1/debian/po/ber.po phpmyadmin-4.9.7+dfsg1/debian/po/ber.po --- phpmyadmin-4.9.5+dfsg1/debian/po/ber.po 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/po/ber.po 2020-10-15 21:53:57.000000000 +0000 @@ -0,0 +1,31 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the phpmyadmin package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: phpmyadmin\n" +"Report-Msgid-Bugs-To: phpmyadmin@packages.debian.org\n" +"POT-Creation-Date: 2019-10-22 22:04+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: ber\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "Web server to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"phpMyAdmin." +msgstr "" diff -Nru phpmyadmin-4.9.5+dfsg1/debian/po/en_GB.po phpmyadmin-4.9.7+dfsg1/debian/po/en_GB.po --- phpmyadmin-4.9.5+dfsg1/debian/po/en_GB.po 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/po/en_GB.po 2020-10-15 21:53:57.000000000 +0000 @@ -0,0 +1,36 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the phpmyadmin package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: phpmyadmin\n" +"Report-Msgid-Bugs-To: phpmyadmin@packages.debian.org\n" +"POT-Creation-Date: 2019-10-22 22:04+0200\n" +"PO-Revision-Date: 2020-08-09 06:43+0000\n" +"Last-Translator: William Desportes \n" +"Language-Team: English (United Kingdom) \n" +"Language: en_GB\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.2-dev\n" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "Web server to reconfigure automatically:" +msgstr "Web server to reconfigure automatically:" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"phpMyAdmin." +msgstr "" +"Please choose the web server that should be automatically configured to run " +"phpMyAdmin." diff -Nru phpmyadmin-4.9.5+dfsg1/debian/po/ml.po phpmyadmin-4.9.7+dfsg1/debian/po/ml.po --- phpmyadmin-4.9.5+dfsg1/debian/po/ml.po 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/po/ml.po 2020-10-15 21:53:57.000000000 +0000 @@ -0,0 +1,37 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the phpmyadmin package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: phpmyadmin\n" +"Report-Msgid-Bugs-To: phpmyadmin@packages.debian.org\n" +"POT-Creation-Date: 2019-10-22 22:04+0200\n" +"PO-Revision-Date: 2020-10-10 15:54+0000\n" +"Last-Translator: Alvin Lazar.C \n" +"Language-Team: Malayalam \n" +"Language: ml\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3-dev\n" + +#. Type: multiselect +#. Description +#: ../templates:2001 +#, fuzzy +msgid "Web server to reconfigure automatically:" +msgstr "യാന്ത്രികമായി വീണ്ടും ക്രമീകരിക്കുന്നതിനുള്ള വെബ് സെർവർ:" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"phpMyAdmin." +msgstr "" +"PhpMyAdmin പ്രവർത്തിപ്പിക്കുന്നതിന് സ്വപ്രേരിതമായി ക്രമീകരിക്കേണ്ട വെബ് സെ" +"ർവർ തിരഞ്ഞെടുക്കുക." diff -Nru phpmyadmin-4.9.5+dfsg1/debian/po/rcf.po phpmyadmin-4.9.7+dfsg1/debian/po/rcf.po --- phpmyadmin-4.9.5+dfsg1/debian/po/rcf.po 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/po/rcf.po 2020-10-15 21:53:57.000000000 +0000 @@ -0,0 +1,31 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the phpmyadmin package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: phpmyadmin\n" +"Report-Msgid-Bugs-To: phpmyadmin@packages.debian.org\n" +"POT-Creation-Date: 2019-10-22 22:04+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: rcf\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "Web server to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"phpMyAdmin." +msgstr "" diff -Nru phpmyadmin-4.9.5+dfsg1/debian/po/sv.po phpmyadmin-4.9.7+dfsg1/debian/po/sv.po --- phpmyadmin-4.9.5+dfsg1/debian/po/sv.po 2020-03-31 19:59:41.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/po/sv.po 2020-10-15 21:53:57.000000000 +0000 @@ -9,7 +9,7 @@ # or http://www.debian.org/intl/l10n/po-debconf/README-trans # Developers do not need to manually edit POT or PO files. # -# Martin gren , 2008. +# Martin Ågren , 2008. msgid "" msgstr "" "Project-Id-Version: phpmyadmin_4:2.11.7.1-1_sv\n" @@ -39,45 +39,45 @@ "Please choose the web server that should be automatically configured to run " "phpMyAdmin." msgstr "" -"Vlj den webbserver som ska konfigureras automatiskt fr att kra phpMyAdmin." +"Välj den webbserver som ska konfigureras automatiskt för att köra phpMyAdmin." #~ msgid "Username for web-based setup system:" -#~ msgstr "Anvndarnamn fr det webbaserade konfigurationssystemet:" +#~ msgstr "Användarnamn för det webbaserade konfigurationssystemet:" #~ msgid "" #~ "The setup system for phpMyAdmin may be used, after installation, from " #~ "http://localhost/phpmyadmin/setup/index.php." #~ msgstr "" -#~ "Efter installationen kan instllningssystemet fr phpMyAdmin anvndas " -#~ "frn http://localhost/phpmyadmin/setup/index.php." +#~ "Efter installationen kan inställningssystemet för phpMyAdmin användas " +#~ "från http://localhost/phpmyadmin/setup/index.php." #~ msgid "" #~ "Access to this system requires identification with a username and a " #~ "password." #~ msgstr "" -#~ "tkomst till detta system krver identifiering med ett anvndarnamn och " -#~ "ett lsenord." +#~ "Åtkomst till detta system kräver identifiering med ett användarnamn och " +#~ "ett lösenord." #~ msgid "" #~ "If you leave this field empty, the default username ('admin') will be " #~ "used." #~ msgstr "" -#~ "Om du lmnar detta flt blankt, kommer standardanvndarnamnet ('admin') " -#~ "att anvndas." +#~ "Om du lämnar detta fält blankt, kommer standardanvändarnamnet ('admin') " +#~ "att användas." #~ msgid "Password for web-based setup system:" -#~ msgstr "Lsenord fr det webbaserade konfigurationssystemet:" +#~ msgstr "Lösenord för det webbaserade konfigurationssystemet:" #~ msgid "" #~ "Usernames and passwords may be managed with the `htpasswd' command and " #~ "are stored in /etc/phpmyadmin/htpasswd.setup." #~ msgstr "" -#~ "Anvndarnamn och lsenord kan hanteras med kommandot \"htpasswd\" och " +#~ "Användarnamn och lösenord kan hanteras med kommandot \"htpasswd\" och " #~ "lagras i /etc/phpmyadmin/htpasswd.setup." #~ msgid "" #~ "If you leave this field empty, access to the web-based setup will be " #~ "disabled." #~ msgstr "" -#~ "Om du lmnar detta flt blankt, kommer tkomst till den webbaserade " +#~ "Om du lämnar detta fält blankt, kommer åtkomst till den webbaserade " #~ "konfigurationen att avaktiveras." diff -Nru phpmyadmin-4.9.5+dfsg1/debian/po/tzm.po phpmyadmin-4.9.7+dfsg1/debian/po/tzm.po --- phpmyadmin-4.9.5+dfsg1/debian/po/tzm.po 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/po/tzm.po 2020-10-15 21:53:57.000000000 +0000 @@ -0,0 +1,31 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the phpmyadmin package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: phpmyadmin\n" +"Report-Msgid-Bugs-To: phpmyadmin@packages.debian.org\n" +"POT-Creation-Date: 2019-10-22 22:04+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: tzm\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "Web server to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"phpMyAdmin." +msgstr "" diff -Nru phpmyadmin-4.9.5+dfsg1/debian/po/ug.po phpmyadmin-4.9.7+dfsg1/debian/po/ug.po --- phpmyadmin-4.9.5+dfsg1/debian/po/ug.po 2020-03-31 19:59:41.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/debian/po/ug.po 2020-10-15 21:53:57.000000000 +0000 @@ -8,19 +8,22 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin@packages.debian.org\n" "POT-Creation-Date: 2019-10-22 22:04+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2020-08-03 18:41+0000\n" +"Last-Translator: Abdusalam <1810010207@s.upc.edu.cn>\n" +"Language-Team: Uyghur \n" "Language: ug\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.2-dev\n" #. Type: multiselect #. Description #: ../templates:2001 msgid "Web server to reconfigure automatically:" -msgstr "" +msgstr "تور مۇلازىمېتىرى ئاپتوماتىك قايتا تەڭشىلىدۇ:" #. Type: multiselect #. Description @@ -29,3 +32,5 @@ "Please choose the web server that should be automatically configured to run " "phpMyAdmin." msgstr "" +"PhpMyAdmin نى ئىجرا قىلىش ئۈچۈن ئاپتوماتىك تەڭشىلىدىغان تور مۇلازىمېتىرنى " +"تاللاڭ." diff -Nru phpmyadmin-4.9.5+dfsg1/doc/conf.py phpmyadmin-4.9.7+dfsg1/doc/conf.py --- phpmyadmin-4.9.5+dfsg1/doc/conf.py 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/doc/conf.py 2020-10-15 18:04:00.000000000 +0000 @@ -51,7 +51,7 @@ # built documents. # # The short X.Y version. -version = '4.9.5' +version = '4.9.7' # The full version, including alpha/beta/rc tags. release = version Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/bookmarks.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/bookmarks.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/charts.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/charts.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/config.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/config.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/copyright.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/copyright.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/credits.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/credits.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/developers.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/developers.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/environment.pickle and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/environment.pickle differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/faq.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/faq.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/glossary.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/glossary.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/import_export.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/import_export.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/index.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/index.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/intro.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/intro.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/other.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/other.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/privileges.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/privileges.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/relations.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/relations.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/require.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/require.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/security.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/security.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/settings.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/settings.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/setup.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/setup.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/themes.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/themes.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/transformations.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/transformations.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/two_factor.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/two_factor.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/user.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/user.doctree differ Binary files /tmp/tmpmh2bn_/8zYfLcaLXv/phpmyadmin-4.9.5+dfsg1/doc/doctrees/vendors.doctree and /tmp/tmpmh2bn_/xu16iUCKsu/phpmyadmin-4.9.7+dfsg1/doc/doctrees/vendors.doctree differ diff -Nru phpmyadmin-4.9.5+dfsg1/doc/html/bookmarks.html phpmyadmin-4.9.7+dfsg1/doc/html/bookmarks.html --- phpmyadmin-4.9.5+dfsg1/doc/html/bookmarks.html 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/doc/html/bookmarks.html 2020-10-15 18:04:00.000000000 +0000 @@ -6,7 +6,7 @@ - Bookmarks — phpMyAdmin 4.9.5 documentation + Bookmarks — phpMyAdmin 4.9.7 documentation @@ -34,7 +34,7 @@
  • previous |
  • - + @@ -164,7 +164,7 @@
  • previous |
  • - + diff -Nru phpmyadmin-4.9.5+dfsg1/doc/html/.buildinfo phpmyadmin-4.9.7+dfsg1/doc/html/.buildinfo --- phpmyadmin-4.9.5+dfsg1/doc/html/.buildinfo 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/doc/html/.buildinfo 2020-10-15 18:04:00.000000000 +0000 @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 1555755b489737f1745bf668466d0be0 +config: fa0070e0068923ae409c637d345b90c3 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff -Nru phpmyadmin-4.9.5+dfsg1/doc/html/charts.html phpmyadmin-4.9.7+dfsg1/doc/html/charts.html --- phpmyadmin-4.9.5+dfsg1/doc/html/charts.html 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/doc/html/charts.html 2020-10-15 18:04:00.000000000 +0000 @@ -6,7 +6,7 @@ - Charts — phpMyAdmin 4.9.5 documentation + Charts — phpMyAdmin 4.9.7 documentation @@ -34,7 +34,7 @@
  • previous |
  • - + @@ -280,7 +280,7 @@
  • previous |
  • - + diff -Nru phpmyadmin-4.9.5+dfsg1/doc/html/config.html phpmyadmin-4.9.7+dfsg1/doc/html/config.html --- phpmyadmin-4.9.5+dfsg1/doc/html/config.html 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/doc/html/config.html 2020-10-15 18:04:00.000000000 +0000 @@ -6,7 +6,7 @@ - Configuration — phpMyAdmin 4.9.5 documentation + Configuration — phpMyAdmin 4.9.7 documentation @@ -34,7 +34,7 @@
  • previous |
  • - + @@ -6193,7 +6193,7 @@
  • previous |
  • - + @@ -133,7 +133,7 @@
  • previous |
  • - + @@ -1335,7 +1335,7 @@
  • previous |
  • - + @@ -99,7 +99,7 @@
  • previous |
  • - + @@ -1996,7 +1996,7 @@
  • previous |
  • - + @@ -2284,7 +2284,7 @@
  • index
  • - + @@ -620,7 +620,7 @@
  • previous |
  • - + @@ -450,7 +450,7 @@
  • previous |
  • - + diff -Nru phpmyadmin-4.9.5+dfsg1/doc/html/index.html phpmyadmin-4.9.7+dfsg1/doc/html/index.html --- phpmyadmin-4.9.5+dfsg1/doc/html/index.html 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/doc/html/index.html 2020-10-15 18:04:00.000000000 +0000 @@ -6,7 +6,7 @@ - Welcome to phpMyAdmin’s documentation! — phpMyAdmin 4.9.5 documentation + Welcome to phpMyAdmin’s documentation! — phpMyAdmin 4.9.7 documentation @@ -30,7 +30,7 @@
  • next |
  • - + @@ -210,7 +210,7 @@
  • next |
  • - + @@ -177,7 +177,7 @@
  • previous |
  • - + @@ -138,7 +138,7 @@
  • previous |
  • - + diff -Nru phpmyadmin-4.9.5+dfsg1/doc/html/privileges.html phpmyadmin-4.9.7+dfsg1/doc/html/privileges.html --- phpmyadmin-4.9.5+dfsg1/doc/html/privileges.html 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/doc/html/privileges.html 2020-10-15 18:04:00.000000000 +0000 @@ -6,7 +6,7 @@ - User management — phpMyAdmin 4.9.5 documentation + User management — phpMyAdmin 4.9.7 documentation @@ -34,7 +34,7 @@
  • previous |
  • - + @@ -168,7 +168,7 @@
  • previous |
  • - + diff -Nru phpmyadmin-4.9.5+dfsg1/doc/html/relations.html phpmyadmin-4.9.7+dfsg1/doc/html/relations.html --- phpmyadmin-4.9.5+dfsg1/doc/html/relations.html 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/doc/html/relations.html 2020-10-15 18:04:00.000000000 +0000 @@ -6,7 +6,7 @@ - Relations — phpMyAdmin 4.9.5 documentation + Relations — phpMyAdmin 4.9.7 documentation @@ -34,7 +34,7 @@
  • previous |
  • - + @@ -174,7 +174,7 @@
  • previous |
  • - + diff -Nru phpmyadmin-4.9.5+dfsg1/doc/html/require.html phpmyadmin-4.9.7+dfsg1/doc/html/require.html --- phpmyadmin-4.9.5+dfsg1/doc/html/require.html 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/doc/html/require.html 2020-10-15 18:04:00.000000000 +0000 @@ -6,7 +6,7 @@ - Requirements — phpMyAdmin 4.9.5 documentation + Requirements — phpMyAdmin 4.9.7 documentation @@ -34,7 +34,7 @@
  • previous |
  • - + @@ -154,7 +154,7 @@
  • previous |
  • - + @@ -83,7 +83,7 @@
  • index
  • - + @@ -201,7 +201,7 @@
  • previous |
  • - + @@ -110,7 +110,7 @@
  • previous |
  • - + diff -Nru phpmyadmin-4.9.5+dfsg1/doc/html/setup.html phpmyadmin-4.9.7+dfsg1/doc/html/setup.html --- phpmyadmin-4.9.5+dfsg1/doc/html/setup.html 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/doc/html/setup.html 2020-10-15 18:04:00.000000000 +0000 @@ -6,7 +6,7 @@ - Installation — phpMyAdmin 4.9.5 documentation + Installation — phpMyAdmin 4.9.7 documentation @@ -34,7 +34,7 @@
  • previous |
  • - + @@ -1424,7 +1424,7 @@
  • previous |
  • - + @@ -204,7 +204,7 @@
  • previous |
  • - + diff -Nru phpmyadmin-4.9.5+dfsg1/doc/html/transformations.html phpmyadmin-4.9.7+dfsg1/doc/html/transformations.html --- phpmyadmin-4.9.5+dfsg1/doc/html/transformations.html 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/doc/html/transformations.html 2020-10-15 18:04:00.000000000 +0000 @@ -6,7 +6,7 @@ - Transformations — phpMyAdmin 4.9.5 documentation + Transformations — phpMyAdmin 4.9.7 documentation @@ -34,7 +34,7 @@
  • previous |
  • - + @@ -225,7 +225,7 @@
  • previous |
  • - + diff -Nru phpmyadmin-4.9.5+dfsg1/doc/html/two_factor.html phpmyadmin-4.9.7+dfsg1/doc/html/two_factor.html --- phpmyadmin-4.9.5+dfsg1/doc/html/two_factor.html 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/doc/html/two_factor.html 2020-10-15 18:04:00.000000000 +0000 @@ -6,7 +6,7 @@ - Two-factor authentication — phpMyAdmin 4.9.5 documentation + Two-factor authentication — phpMyAdmin 4.9.7 documentation @@ -34,7 +34,7 @@
  • previous |
  • - + @@ -160,7 +160,7 @@
  • previous |
  • - + diff -Nru phpmyadmin-4.9.5+dfsg1/doc/html/user.html phpmyadmin-4.9.7+dfsg1/doc/html/user.html --- phpmyadmin-4.9.5+dfsg1/doc/html/user.html 2020-03-21 04:08:44.000000000 +0000 +++ phpmyadmin-4.9.7+dfsg1/doc/html/user.html 2020-10-15 18:04:00.000000000 +0000 @@ -6,7 +6,7 @@ - User Guide — phpMyAdmin 4.9.5 documentation + User Guide — phpMyAdmin 4.9.7 documentation @@ -34,7 +34,7 @@
  • previous |
  • - + @@ -151,7 +151,7 @@
  • previous |
  • - + @@ -127,7 +127,7 @@
  • previous |
  • - +