--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: lnav@packages.debian.org, carnil@debian.org
Control: affects -1 + src:lnav
Hi Release team,
Please unblock package lnav
[ Reason ]
This update hotfixes an issue in the testsuite of lnav, which starts
to fail with curl 7.88.1 as now present in bookworm, but did not
7.78.0. Specifically found to be working with 7.87.0-2 but not anymore
once 7.88.1-1 was accepted. The bug is at #1032539. Saying it is a
hotfix, because it only changes the expeced error from curl to be
CURLUE_BAD_IPV6 instead of the initially CURLUE_BAD_PORT_NUMBER. I
think we cannot expect curl here to be at fault, because upstream
commit applied in 7.88.1
https://github.com/curl/curl/commit/8b27799f8c5e51187533edb04c66dd9079e1c478
addresses that the port number function does not need to fully verify
the IPv6 address.
[ Impact ]
If not accepted lnav will be autoremoved from bookworm later on.
[ Tests ]
The previously newly failing test passes now. Manually checking with
SELECT parse_url('https://bad@[fe::') on the query part gives as
expected now as well:
✘ error: invalid URL: “https://bad@[fe::”; │
reason: Bad IPv6 address
[ Risks ]
Low, the patch does really only fixes the error expected on the new
curl version which will be present in bookworm. While it was not nice
to have this that late in release cycle for lnav, it does not uncover
a problem in lnav itself, but in the testsuite.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
Nothing to be added. There might follow a better fix from upstream
which we might have or not have then for bookworm.
unblock lnav/0.11.1-3
Regards,
Salvatore
diff -Nru lnav-0.11.1/debian/changelog lnav-0.11.1/debian/changelog
--- lnav-0.11.1/debian/changelog 2023-01-22 20:41:56.000000000 +0100
+++ lnav-0.11.1/debian/changelog 2023-03-31 20:40:20.000000000 +0200
@@ -1,3 +1,16 @@
+lnav (0.11.1-3) unstable; urgency=medium
+
+ * Upload to unstable
+
+ -- Salvatore Bonaccorso <carnil@debian.org> Fri, 31 Mar 2023 20:40:20 +0200
+
+lnav (0.11.1-3~exp1) experimental; urgency=medium
+
+ * test_sql_str_func.sh: Correct expected output on bad IPv6 address
+ (Closes: #1032539)
+
+ -- Salvatore Bonaccorso <carnil@debian.org> Fri, 31 Mar 2023 17:52:44 +0200
+
lnav (0.11.1-2) unstable; urgency=medium
* Add Build-Depends on tzdata.
diff -Nru lnav-0.11.1/debian/patches/series lnav-0.11.1/debian/patches/series
--- lnav-0.11.1/debian/patches/series 2023-01-22 20:41:56.000000000 +0100
+++ lnav-0.11.1/debian/patches/series 2023-03-31 20:40:20.000000000 +0200
@@ -4,3 +4,4 @@
disable-broken-test_logfile-test.patch
disable-test_sql.patch
disable-broken-test_listview.patch
+test_sql_str_func.sh-Correct-expected-output-on-bad-.patch
diff -Nru lnav-0.11.1/debian/patches/test_sql_str_func.sh-Correct-expected-output-on-bad-.patch lnav-0.11.1/debian/patches/test_sql_str_func.sh-Correct-expected-output-on-bad-.patch
--- lnav-0.11.1/debian/patches/test_sql_str_func.sh-Correct-expected-output-on-bad-.patch 1970-01-01 01:00:00.000000000 +0100
+++ lnav-0.11.1/debian/patches/test_sql_str_func.sh-Correct-expected-output-on-bad-.patch 2023-03-31 20:40:20.000000000 +0200
@@ -0,0 +1,33 @@
+From 8b511514851901cb29ebf3fb96b626bffe37292d Mon Sep 17 00:00:00 2001
+From: Salvatore Bonaccorso <carnil@debian.org>
+Date: Fri, 31 Mar 2023 15:51:13 +0200
+Subject: [PATCH] test_sql_str_func.sh: Correct expected output on bad IPv6
+ address
+
+The test checks https://bad@[fe:: which since curl 7.88.1 reports back
+"Bad IPv6 address" (CURLUE_BAD_IPV6). Previously it reported back "Port
+number was not a decimal number between 0 and 65535"
+(CURLUE_BAD_PORT_NUMBER).
+
+Curl upstream changed in
+https://github.com/curl/curl/commit/8b27799f8c5e51187533edb04c66dd9079e1c478
+the port number function extraction, as the port number function does
+not need to fully verify the IPv6 address.
+
+Fixes: #1128
+Link: https://bugs.debian.org/1032539
+Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
+---
+ ...sql_str_func.sh_3855d2cc0ab29171cae8e722f130adec25eae36e.err | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/expected/test_sql_str_func.sh_3855d2cc0ab29171cae8e722f130adec25eae36e.err b/test/expected/test_sql_str_func.sh_3855d2cc0ab29171cae8e722f130adec25eae36e.err
+index e3d40abf40a2..a7c2bb2abd74 100644
+--- a/test/expected/test_sql_str_func.sh_3855d2cc0ab29171cae8e722f130adec25eae36e.err
++++ b/test/expected/test_sql_str_func.sh_3855d2cc0ab29171cae8e722f130adec25eae36e.err
+@@ -1 +1 @@
+-error: sqlite3_exec failed -- lnav-error:{"level":"error","message":{"str":"invalid URL: “https://bad@[fe::”","attrs":[]},"reason":{"str":"Port number was not a decimal number between 0 and 65535","attrs":[]},"snippets":[],"help":{"str":"","attrs":[]}}
++error: sqlite3_exec failed -- lnav-error:{"level":"error","message":{"str":"invalid URL: “https://bad@[fe::”","attrs":[]},"reason":{"str":"Bad IPv6 address","attrs":[]},"snippets":[],"help":{"str":"","attrs":[]}}
+--
+2.40.0
+
--- End Message ---