@@ -9,16 +9,16 @@ Upstream-Status: Inappropriate [ptest-runner specific]
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
- t/escape-char.t | 20 ++++++++++----------
- t/iri.t | 18 +++++++++---------
- t/mailto.t | 12 ++++++------
- 3 files changed, 25 insertions(+), 25 deletions(-)
+ t/escape-char.t | 22 +++++++++++-----------
+ t/iri.t | 22 +++++++++++-----------
+ t/mailto.t | 18 +++++++++---------
+ 3 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/t/escape-char.t b/t/escape-char.t
-index c6ce79c..5e62ad5 100644
+index 5a5ad11..098bd5f 100644
--- a/t/escape-char.t
+++ b/t/escape-char.t
-@@ -6,16 +6,16 @@ use warnings;
+@@ -6,17 +6,17 @@ use warnings;
use Test::More;
use URI ();
@@ -30,7 +30,8 @@ index c6ce79c..5e62ad5 100644
- local $TODO = 'URI::Escape::escape_char misunderstands utf8';
-
- # http://foo/%C3%A9
-- is("$uri", 'http://foo/%E9', 'correctly created a URI from a utf8-upgraded string');
+- is("$uri", 'http://foo/%E9',
+- 'correctly created a URI from a utf8-upgraded string');
-}
+#TODO: {
+# my $str = "http://foo/\xE9";
@@ -40,35 +41,40 @@ index c6ce79c..5e62ad5 100644
+# local $TODO = 'URI::Escape::escape_char misunderstands utf8';
+#
+# # http://foo/%C3%A9
-+# is("$uri", 'http://foo/%E9', 'correctly created a URI from a utf8-upgraded string');
++# is("$uri", 'http://foo/%E9',
++# 'correctly created a URI from a utf8-upgraded string');
+#}
{
my $str = "http://foo/\xE9";
diff --git a/t/iri.t b/t/iri.t
-index cf983d6..884b36e 100644
+index 1f76c19..2411e87 100644
--- a/t/iri.t
+++ b/t/iri.t
@@ -6,7 +6,7 @@ use Test::More;
use Config qw( %Config );
if (defined $Config{useperlio}) {
-- plan tests=>30;
-+ plan tests=>28;
- } else {
- plan skip_all=>"this perl doesn't support PerlIO layers";
+- plan tests => 30;
++ plan tests => 28;
}
-@@ -67,17 +67,17 @@ is $u->as_iri, "http://➡.ws/";
- # draft-duerst-iri-bis.txt examples (section 3.7.1):
- is(URI->new("http://www.example.org/D%C3%BCrst")->as_iri, "http://www.example.org/D\xFCrst");
- is(URI->new("http://www.example.org/D%FCrst")->as_iri, "http://www.example.org/D%FCrst");
+ else {
+ plan skip_all => "this perl doesn't support PerlIO layers";
+@@ -70,19 +70,19 @@ is(URI->new("http://www.example.org/D%C3%BCrst")->as_iri,
+ "http://www.example.org/D\xFCrst");
+ is(URI->new("http://www.example.org/D%FCrst")->as_iri,
+ "http://www.example.org/D%FCrst");
-TODO: {
-- local $TODO = "some chars (like U+202E, RIGHT-TO-LEFT OVERRIDE) need to stay escaped";
--is(URI->new("http://xn--99zt52a.example.org/%e2%80%ae")->as_iri, "http://\x{7D0D}\x{8C46}.example.org/%e2%80%ae");
+- local $TODO
+- = "some chars (like U+202E, RIGHT-TO-LEFT OVERRIDE) need to stay escaped";
+- is(URI->new("http://xn--99zt52a.example.org/%e2%80%ae")->as_iri,
+- "http://\x{7D0D}\x{8C46}.example.org/%e2%80%ae");
-}
+#TODO: {
-+# local $TODO = "some chars (like U+202E, RIGHT-TO-LEFT OVERRIDE) need to stay escaped";
-+#is(URI->new("http://xn--99zt52a.example.org/%e2%80%ae")->as_iri, "http://\x{7D0D}\x{8C46}.example.org/%e2%80%ae");
++# local $TODO
++# = "some chars (like U+202E, RIGHT-TO-LEFT OVERRIDE) need to stay escaped";
++# is(URI->new("http://xn--99zt52a.example.org/%e2%80%ae")->as_iri,
++# "http://\x{7D0D}\x{8C46}.example.org/%e2%80%ae");
+#}
# try some URLs that can't be IDNA encoded (fallback to encoded UTF8 bytes)
@@ -85,24 +91,30 @@ index cf983d6..884b36e 100644
+#}
is $u->as_iri, "http://" . ("ü" x 128);
diff --git a/t/mailto.t b/t/mailto.t
-index 79e9a13..c68cfb2 100644
+index 92e4111..60f1c97 100644
--- a/t/mailto.t
+++ b/t/mailto.t
-@@ -48,12 +48,12 @@ $u = URI->new('mailto:user+detail@example.com');
+@@ -48,15 +48,15 @@ $u = URI->new('mailto:user+detail@example.com');
is $u->to, 'user+detail@example.com', 'subaddress with `+` parsed correctly';
- is $u, 'mailto:user+detail@example.com', '... and stringification works';
+ is $u, 'mailto:user+detail@example.com', '... and stringification works';
-TODO: {
-- local $TODO = "We can't handle quoted local parts without properly parsing the email addresses";
+- local $TODO
+- = "We can't handle quoted local parts without properly parsing the email addresses";
- $u = URI->new('mailto:"foo bar+baz"@example.com');
-- is $u->to, '"foo bar+baz"@example.com', 'address with quoted local part containing spaces is parsed correctly';
-- is $u, 'mailto:%22foo%20bar+baz%22@example.com', '... and stringification works';
+- is $u->to, '"foo bar+baz"@example.com',
+- 'address with quoted local part containing spaces is parsed correctly';
+- is $u, 'mailto:%22foo%20bar+baz%22@example.com',
+- '... and stringification works';
-}
+#TODO: {
-+# local $TODO = "We can't handle quoted local parts without properly parsing the email addresses";
++# local $TODO
++# = "We can't handle quoted local parts without properly parsing the email addresses";
+# $u = URI->new('mailto:"foo bar+baz"@example.com');
-+# is $u->to, '"foo bar+baz"@example.com', 'address with quoted local part containing spaces is parsed correctly';
-+# is $u, 'mailto:%22foo%20bar+baz%22@example.com', '... and stringification works';
++# is $u->to, '"foo bar+baz"@example.com',
++# 'address with quoted local part containing spaces is parsed correctly';
++# is $u, 'mailto:%22foo%20bar+baz%22@example.com',
++# '... and stringification works';
+#}
# RFC 5321 (4.1.3) - Address Literals
similarity index 92%
rename from meta-perl/recipes-perl/liburi/liburi-perl_5.35.bb
rename to meta-perl/recipes-perl/liburi/liburi-perl_5.40.bb
@@ -12,7 +12,7 @@ SRC_URI = "${CPAN_MIRROR}/authors/id/O/OA/OALDERS/URI-${PV}.tar.gz \
file://0001-Skip-TODO-test-cases-that-fail.patch \
"
-SRC_URI[sha256sum] = "89648964ce5ae006726951f42f718576fbefe9e98a41bd2212d57386163092d2"
+SRC_URI[sha256sum] = "ef5d2ef099a1a24a6e83ffe543de73337805d3d39c00b84fa205d725ad1a1b63"
S = "${UNPACKDIR}/URI-${PV}"
@@ -34,6 +34,7 @@ do_install:prepend() {
RDEPENDS:${PN} += "\
perl-module-integer \
perl-module-mime-base64 \
+ perl-module-unicode-normalize \
"
RDEPENDS:${PN}-ptest += " \
Fixes CVE-2026-19953. URI::_idna now loads Unicode::Normalize, add it to RDEPENDS. Refresh the ptest patch which skips the TODO tests. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> --- .../0001-Skip-TODO-test-cases-that-fail.patch | 72 +++++++++++-------- ...iburi-perl_5.35.bb => liburi-perl_5.40.bb} | 3 +- 2 files changed, 44 insertions(+), 31 deletions(-) rename meta-perl/recipes-perl/liburi/{liburi-perl_5.35.bb => liburi-perl_5.40.bb} (92%)