Version in base suite: 5.0.4+dfsg2-2 Base version: phpmyadmin_5.0.4+dfsg2-2 Target version: phpmyadmin_5.0.4+dfsg2-2+deb11u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/p/phpmyadmin/phpmyadmin_5.0.4+dfsg2-2.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/p/phpmyadmin/phpmyadmin_5.0.4+dfsg2-2+deb11u1.dsc changelog | 6 ++++++ patches/Fix-SQL-query-server-error.patch | 24 ++++++++++++++++++++++++ patches/series | 1 + 3 files changed, 31 insertions(+) diff -Nru phpmyadmin-5.0.4+dfsg2/debian/changelog phpmyadmin-5.0.4+dfsg2/debian/changelog --- phpmyadmin-5.0.4+dfsg2/debian/changelog 2021-01-23 16:25:13.000000000 +0000 +++ phpmyadmin-5.0.4+dfsg2/debian/changelog 2022-06-19 16:58:24.000000000 +0000 @@ -1,3 +1,9 @@ +phpmyadmin (4:5.0.4+dfsg2-2+deb11u1) bullseye; urgency=medium + + * Add a patch for error 500 with some SQL queries (Closes: #1012847) + + -- William Desportes Sun, 19 Jun 2022 18:58:24 +0200 + phpmyadmin (4:5.0.4+dfsg2-2) unstable; urgency=medium * Add a patch for CVE-2021-21252 diff -Nru phpmyadmin-5.0.4+dfsg2/debian/patches/Fix-SQL-query-server-error.patch phpmyadmin-5.0.4+dfsg2/debian/patches/Fix-SQL-query-server-error.patch --- phpmyadmin-5.0.4+dfsg2/debian/patches/Fix-SQL-query-server-error.patch 1970-01-01 00:00:00.000000000 +0000 +++ phpmyadmin-5.0.4+dfsg2/debian/patches/Fix-SQL-query-server-error.patch 2022-06-19 16:56:52.000000000 +0000 @@ -0,0 +1,24 @@ +From: William Desportes +Date: Wed, 15 Jun 2022 19:01:40 +0200 +Subject: Fix - (500 Internal Server Error) with some SQL queries + +Origin: upstream +Applied-Upstream: https://github.com/phpmyadmin/phpmyadmin/commit/16f81e47eab289b13bf39ed2ca6c3c0b0c923845 +Bug-Debian: https://bugs.debian.org/1012847 +--- + libraries/classes/Display/Results.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php +index 42cdc0f..cd79aba 100644 +--- a/libraries/classes/Display/Results.php ++++ b/libraries/classes/Display/Results.php +@@ -2138,7 +2138,7 @@ class Results + + $draggable_html .= ' class="' . implode(' ', $th_class) . '"'; + +- $draggable_html .= ' data-column="' . htmlspecialchars($fields_meta->name) ++ $draggable_html .= ' data-column="' . htmlspecialchars((string) $fields_meta->name) + . '">' . $order_link . $comments . ''; + + return $draggable_html; diff -Nru phpmyadmin-5.0.4+dfsg2/debian/patches/series phpmyadmin-5.0.4+dfsg2/debian/patches/series --- phpmyadmin-5.0.4+dfsg2/debian/patches/series 2021-01-23 09:53:51.000000000 +0000 +++ phpmyadmin-5.0.4+dfsg2/debian/patches/series 2022-06-19 16:56:52.000000000 +0000 @@ -9,3 +9,4 @@ Remove-dfsg-zxcvbn-js.patch CVE-2021-21252.patch Remove-metro-fonts.patch +Fix-SQL-query-server-error.patch