diff -Nru phpmyadmin-5.1.4+dfsg1/debian/autoload.php.tpl phpmyadmin-5.1.4+dfsg1/debian/autoload.php.tpl --- phpmyadmin-5.1.4+dfsg1/debian/autoload.php.tpl 2022-05-24 23:08:00.000000000 +0000 +++ phpmyadmin-5.1.4+dfsg1/debian/autoload.php.tpl 2022-12-16 20:49:30.000000000 +0000 @@ -15,6 +15,7 @@ require_once 'Williamdes/MariaDBMySQLKBS/autoload.php'; // Suggest +if (stream_resolve_include_path('CodeLts/U2F-php-server/autoload.php')) { include_once 'CodeLts/U2F-php-server/autoload.php'; } if (stream_resolve_include_path('tcpdf/autoload.php')) { include_once 'tcpdf/autoload.php'; } // @codingStandardsIgnoreFile diff -Nru phpmyadmin-5.1.4+dfsg1/debian/changelog phpmyadmin-5.1.4+dfsg1/debian/changelog --- phpmyadmin-5.1.4+dfsg1/debian/changelog 2022-05-24 23:12:07.000000000 +0000 +++ phpmyadmin-5.1.4+dfsg1/debian/changelog 2022-12-16 20:53:08.000000000 +0000 @@ -1,22 +1,37 @@ -phpmyadmin (4:5.1.4+dfsg1-1+focal1) focal; urgency=medium +phpmyadmin (4:5.1.4+dfsg1-2+focal1) focal; urgency=medium - * New upstream version 5.1.4+dfsg1 + * Add support for php-code-lts-u2f-php-server + * Revert "Depend on libjs-jquery-tablesorter" - -- William Desportes Wed, 25 May 2022 01:12:07 +0200 + -- William Desportes Fri, 16 Dec 2022 21:53:08 +0100 -phpmyadmin (4:5.1.3+dfsg1-1+focal2) focal; urgency=medium +phpmyadmin (4:5.1.4+dfsg1-2) unstable; urgency=medium - * Add a patch to allow focal versions of symfony + [ Kristijan Fremen Velkovski ] + * Added translation using Weblate (Macedonian) - -- William Desportes Mon, 14 Feb 2022 11:40:40 +0100 + [ Ugnius Vaičeskas ] + * Added translation using Weblate (Lithuanian) -phpmyadmin (4:5.1.3+dfsg1-1+focal1) focal; urgency=medium + [ Sean Dylan Patterson ] + * Added translation using Weblate (Afrikaans) - * New upstream version 5.1.3 - * Revert "Use dh-sequence-{phpcomposer,sphinxdoc} packages" - * Fix d/p/series and update patches + [ William Desportes ] + * Depend on libjs-jquery-tablesorter - -- William Desportes Sat, 12 Feb 2022 19:33:25 +0100 + [ AefghThreenine ] + * Added translation using Weblate (Thai) + * Translated using Weblate (Thai) + + [ William Desportes ] + * Add autoload for php-code-lts-u2f-php-server + * Add a patch to update documentation for 2FA packages + * Add a patch to suggest ext-sodium + * Add php-code-lts-u2f-php-server and php-curl to tests + * Widen a lintian override + * Make build requirements force the versions in unstable + + -- William Desportes Fri, 16 Dec 2022 18:28:37 +0100 phpmyadmin (4:5.1.4+dfsg1-1) unstable; urgency=medium diff -Nru phpmyadmin-5.1.4+dfsg1/debian/control phpmyadmin-5.1.4+dfsg1/debian/control --- phpmyadmin-5.1.4+dfsg1/debian/control 2022-05-24 23:08:00.000000000 +0000 +++ phpmyadmin-5.1.4+dfsg1/debian/control 2022-12-16 20:52:17.000000000 +0000 @@ -10,6 +10,8 @@ minify, php-bz2, php-cli, + php-code-lts-u2f-php-server, + php-curl, php-gd, php-google-recaptcha, php-mariadb-mysql-kbs, @@ -17,7 +19,7 @@ php-mysql, php-nikic-fast-route, php-phpmyadmin-motranslator, - php-phpmyadmin-shapefile, + php-phpmyadmin-shapefile (<< 3), php-phpmyadmin-sql-parser, php-phpseclib, php-symfony-config, @@ -25,7 +27,7 @@ php-symfony-expression-language, php-tcpdf, php-twig (>= 2.9), - php-twig-i18n-extension, + php-twig-i18n-extension (<< 4), php-zip, phpab, phpunit, diff -Nru phpmyadmin-5.1.4+dfsg1/debian/patches/Recommend-ext-sodium-as-an-alternative-to-paragonie-sodiu.patch phpmyadmin-5.1.4+dfsg1/debian/patches/Recommend-ext-sodium-as-an-alternative-to-paragonie-sodiu.patch --- phpmyadmin-5.1.4+dfsg1/debian/patches/Recommend-ext-sodium-as-an-alternative-to-paragonie-sodiu.patch 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-5.1.4+dfsg1/debian/patches/Recommend-ext-sodium-as-an-alternative-to-paragonie-sodiu.patch 2022-12-16 20:49:30.000000000 +0000 @@ -0,0 +1,24 @@ +From: William Desportes +Date: Fri, 16 Dec 2022 05:14:21 +0100 +Subject: Recommend ext-sodium as an alternative to paragonie/sodium_compat + +Origin: vendor +Forwarded: not-needed +--- + composer.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/composer.json b/composer.json +index e8c9711..27dd36e 100644 +--- a/composer.json ++++ b/composer.json +@@ -78,7 +78,8 @@ + "tecnickcom/tcpdf": "For PDF support", + "pragmarx/google2fa-qrcode": "For 2FA authentication", + "code-lts/u2f-php-server": "For FIDO U2F authentication", +- "paragonie/sodium_compat": "For modern encryption support" ++ "paragonie/sodium_compat": "For modern encryption support", ++ "ext-sodium": "For modern encryption support" + }, + "require-dev": { + "code-lts/u2f-php-server": "^1.2", diff -Nru phpmyadmin-5.1.4+dfsg1/debian/patches/series phpmyadmin-5.1.4+dfsg1/debian/patches/series --- phpmyadmin-5.1.4+dfsg1/debian/patches/series 2022-05-24 23:08:54.000000000 +0000 +++ phpmyadmin-5.1.4+dfsg1/debian/patches/series 2022-12-16 20:49:30.000000000 +0000 @@ -12,3 +12,5 @@ Drop-symfony-polyfill-ctype-mbstring.patch Allow-symfony-focal-versions.patch Disable-testDownloadHeader-tests.patch +Update-documentation-for-2FA-packages.patch +Recommend-ext-sodium-as-an-alternative-to-paragonie-sodiu.patch diff -Nru phpmyadmin-5.1.4+dfsg1/debian/patches/Update-documentation-for-2FA-packages.patch phpmyadmin-5.1.4+dfsg1/debian/patches/Update-documentation-for-2FA-packages.patch --- phpmyadmin-5.1.4+dfsg1/debian/patches/Update-documentation-for-2FA-packages.patch 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-5.1.4+dfsg1/debian/patches/Update-documentation-for-2FA-packages.patch 2022-12-16 20:49:30.000000000 +0000 @@ -0,0 +1,72 @@ +From: William Desportes +Date: Fri, 16 Dec 2022 05:02:31 +0100 +Subject: Update documentation to add missing packages for 2FA + +Origin: vendor +Forwarded: not-needed +--- + doc/two_factor.rst | 4 ++-- + libraries/classes/TwoFactor.php | 6 +++--- + templates/preferences/two_factor/main.twig | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/doc/two_factor.rst b/doc/two_factor.rst +index 06c85c6..7c6d183 100644 +--- a/doc/two_factor.rst ++++ b/doc/two_factor.rst +@@ -15,13 +15,13 @@ manually; the typical way of doing so is with the command: + + .. code-block:: sh + +- composer require pragmarx/google2fa-qrcode ++ apt install php-pragmarx-google2fa-qrcode + + Or when using a hardware security key with FIDO U2F: + + .. code-block:: sh + +- composer require code-lts/u2f-php-server ++ apt install php-code-lts-u2f-php-server + + Authentication Application (2FA) + -------------------------------- +diff --git a/libraries/classes/TwoFactor.php b/libraries/classes/TwoFactor.php +index 869ec1f..79dcedd 100644 +--- a/libraries/classes/TwoFactor.php ++++ b/libraries/classes/TwoFactor.php +@@ -140,19 +140,19 @@ class TwoFactor + if (! class_exists(Google2FA::class)) { + $result[] = [ + 'class' => Application::getName(), +- 'dep' => 'pragmarx/google2fa-qrcode', ++ 'dep' => 'php-pragmarx-google2fa-qrcode', + ]; + } + if (! class_exists('BaconQrCode\Renderer\Image\Png')) { + $result[] = [ + 'class' => Application::getName(), +- 'dep' => 'bacon/bacon-qr-code', ++ 'dep' => 'php-bacon-qr-code', + ]; + } + if (! class_exists(U2FServer::class)) { + $result[] = [ + 'class' => Key::getName(), +- 'dep' => 'code-lts/u2f-php-server', ++ 'dep' => 'php-code-lts-u2f-php-server', + ]; + } + +diff --git a/templates/preferences/two_factor/main.twig b/templates/preferences/two_factor/main.twig +index b875e44..a88490d 100644 +--- a/templates/preferences/two_factor/main.twig ++++ b/templates/preferences/two_factor/main.twig +@@ -9,7 +9,7 @@ + {% if enabled %} + {% if num_backends == 0 %} +

{% trans "Two-factor authentication is not available, please install optional dependencies to enable authentication backends." %}

+-

{% trans "Following composer packages are missing:" %}

++

{% trans "Following APT packages are missing:" %}

+
    + {% for item in missing %} +
  • {{ item.dep }} ({{ item.class }})
    • diff -Nru phpmyadmin-5.1.4+dfsg1/debian/po/af.po phpmyadmin-5.1.4+dfsg1/debian/po/af.po --- phpmyadmin-5.1.4+dfsg1/debian/po/af.po 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-5.1.4+dfsg1/debian/po/af.po 2022-12-16 20:49:30.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: 2022-07-18 20:19+0000\n" +"Last-Translator: Sean Dylan Patterson \n" +"Language-Team: Afrikaans \n" +"Language: af\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.14-dev\n" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "Web server to reconfigure automatically:" +msgstr "Webbediener om outomaties te herkonfigureer:" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"phpMyAdmin." +msgstr "" +"Kies asseblief die webbediener wat outomaties gekonfigureer moet word om " +"phpMyAdmin te laat loop." diff -Nru phpmyadmin-5.1.4+dfsg1/debian/po/lt.po phpmyadmin-5.1.4+dfsg1/debian/po/lt.po --- phpmyadmin-5.1.4+dfsg1/debian/po/lt.po 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-5.1.4+dfsg1/debian/po/lt.po 2022-12-16 20:49:30.000000000 +0000 @@ -0,0 +1,38 @@ +# 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: 2022-07-05 15:20+0000\n" +"Last-Translator: Ugnius Vaičeskas \n" +"Language-Team: Lithuanian \n" +"Language: lt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n % 10 == 1 && (n % 100 < 11 || n % 100 > " +"19)) ? 0 : ((n % 10 >= 2 && n % 10 <= 9 && (n % 100 < 11 || n % 100 > 19)) ? " +"1 : 2);\n" +"X-Generator: Weblate 4.13.1-dev\n" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "Web server to reconfigure automatically:" +msgstr "Automatiškai perkonfigūruojamas žiniatinklio serveris:" + +#. Type: multiselect +#. Description +#: ../templates:2001 +msgid "" +"Please choose the web server that should be automatically configured to run " +"phpMyAdmin." +msgstr "" +"Prašome pasirinkti žiniatinklio serverį, kuris turėtų būti automatiškai " +"sukonfigūruotas paleisti „phpMyAdmin“." diff -Nru phpmyadmin-5.1.4+dfsg1/debian/po/mk.po phpmyadmin-5.1.4+dfsg1/debian/po/mk.po --- phpmyadmin-5.1.4+dfsg1/debian/po/mk.po 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-5.1.4+dfsg1/debian/po/mk.po 2022-12-16 20:49:30.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: 2022-05-27 05:16+0000\n" +"Last-Translator: Kristijan Fremen Velkovski \n" +"Language-Team: Macedonian \n" +"Language: mk\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%10==1 ? 0 : 1;\n" +"X-Generator: Weblate 4.13-dev\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 "" +"Изберете го веб серверот што ќе се автоматски конфигурира да работи со " +"phpMyAdmin." diff -Nru phpmyadmin-5.1.4+dfsg1/debian/po/th.po phpmyadmin-5.1.4+dfsg1/debian/po/th.po --- phpmyadmin-5.1.4+dfsg1/debian/po/th.po 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-5.1.4+dfsg1/debian/po/th.po 2022-12-16 20:49:30.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: 2022-11-07 11:07+0000\n" +"Last-Translator: AefghThreenine \n" +"Language-Team: Thai \n" +"Language: th\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 4.14.2\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 "" +"กรุณาเลือกเว็บเซิร์ฟเวอร์ที่ต้องการกำหนดค่าให้เรียกใช้ phpMyAdmin " +"แบบอัตโนมัติ" diff -Nru phpmyadmin-5.1.4+dfsg1/debian/source/lintian-overrides phpmyadmin-5.1.4+dfsg1/debian/source/lintian-overrides --- phpmyadmin-5.1.4+dfsg1/debian/source/lintian-overrides 2022-05-19 22:50:49.000000000 +0000 +++ phpmyadmin-5.1.4+dfsg1/debian/source/lintian-overrides 2022-12-16 20:49:30.000000000 +0000 @@ -2,7 +2,7 @@ # They are files manually copied form some node modules by the phpMyAdmin team phpmyadmin source: source-is-missing js/dist/server/status/monitor.js phpmyadmin source: source-is-missing js/vendor/* -phpmyadmin source: source-is-missing debian/missing-sources/ol/* +phpmyadmin source: source-is-missing debian/missing-sources/* phpmyadmin source: very-long-line-length-in-source-file js/vendor/* phpmyadmin source: very-long-line-length-in-source-file debian/missing-sources/* phpmyadmin source: very-long-line-length-in-source-file js/dist/* diff -Nru phpmyadmin-5.1.4+dfsg1/debian/tests/control phpmyadmin-5.1.4+dfsg1/debian/tests/control --- phpmyadmin-5.1.4+dfsg1/debian/tests/control 2022-05-14 22:25:44.000000000 +0000 +++ phpmyadmin-5.1.4+dfsg1/debian/tests/control 2022-12-16 20:49:30.000000000 +0000 @@ -1,3 +1,11 @@ Tests: phpunit Restrictions: allow-stderr -Depends: php-bz2, php-gd, php-tcpdf, php-zip, phpab, phpunit, @ +Depends: php-bz2, + php-code-lts-u2f-php-server, + php-curl, + php-gd, + php-tcpdf, + php-zip, + phpab, + phpunit, + @