diff options
author | Tim Orling <ticotimo@gmail.com> | 2022-11-18 09:52:07 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-22 12:26:45 +0000 |
commit | 38a87b464e2e63b961b18f428f38870e3d1acc39 (patch) | |
tree | aff8d3f299308078d7507dc89dd3cdaba450fe1a /meta/recipes-devtools/perl | |
parent | f78f852ef4f786f54f8664f3783573c25dcf4b10 (diff) | |
download | poky-38a87b464e2e63b961b18f428f38870e3d1acc39.tar.gz |
liburi-perl: upgrade 5.08 -> 5.17
* Author changed back from ETHER to OALDERS
* Use CPAN_MIRROR for SRC_URI
* Update HOMEPAGE
* Update RPEPENDS for -ptest
* Patch to skip TODO test cases
For changes, see:
https://metacpan.org/release/OALDERS/URI-5.17/changes
License-Update: whitespace changes
(From OE-Core rev: f5aad6f125b88920c7ff8dc749768fd2c3f40a89)
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl')
-rw-r--r-- | meta/recipes-devtools/perl/liburi-perl/0001-Skip-TODO-test-cases-that-fail.patch | 110 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/liburi-perl_5.17.bb (renamed from meta/recipes-devtools/perl/liburi-perl_5.08.bb) | 34 |
2 files changed, 130 insertions, 14 deletions
diff --git a/meta/recipes-devtools/perl/liburi-perl/0001-Skip-TODO-test-cases-that-fail.patch b/meta/recipes-devtools/perl/liburi-perl/0001-Skip-TODO-test-cases-that-fail.patch new file mode 100644 index 0000000000..68ccd06120 --- /dev/null +++ b/meta/recipes-devtools/perl/liburi-perl/0001-Skip-TODO-test-cases-that-fail.patch | |||
@@ -0,0 +1,110 @@ | |||
1 | From 858daa5047b00e7d5aa795302a9fad5504c8f0b9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tim Orling <tim.orling@konsulko.com> | ||
3 | Date: Thu, 17 Nov 2022 16:33:20 -0800 | ||
4 | Subject: [PATCH] Skip TODO test cases that fail | ||
5 | |||
6 | TODO cases report as "not ok" with ptest-runner | ||
7 | |||
8 | Upstream-Status: Inappropriate [ptest-runner specific] | ||
9 | |||
10 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | ||
11 | |||
12 | --- | ||
13 | t/escape-char.t | 20 ++++++++++---------- | ||
14 | t/iri.t | 18 +++++++++--------- | ||
15 | t/mailto.t | 12 ++++++------ | ||
16 | 3 files changed, 25 insertions(+), 25 deletions(-) | ||
17 | |||
18 | diff --git a/t/escape-char.t b/t/escape-char.t | ||
19 | index c6ce79c..5e62ad5 100644 | ||
20 | --- a/t/escape-char.t | ||
21 | +++ b/t/escape-char.t | ||
22 | @@ -6,16 +6,16 @@ use warnings; | ||
23 | use Test::More; | ||
24 | use URI (); | ||
25 | |||
26 | -TODO: { | ||
27 | - my $str = "http://foo/\xE9"; | ||
28 | - utf8::upgrade($str); | ||
29 | - my $uri = URI->new($str); | ||
30 | - | ||
31 | - local $TODO = 'URI::Escape::escape_char misunderstands utf8'; | ||
32 | - | ||
33 | - # http://foo/%C3%A9 | ||
34 | - is("$uri", 'http://foo/%E9', 'correctly created a URI from a utf8-upgraded string'); | ||
35 | -} | ||
36 | +#TODO: { | ||
37 | +# my $str = "http://foo/\xE9"; | ||
38 | +# utf8::upgrade($str); | ||
39 | +# my $uri = URI->new($str); | ||
40 | +# | ||
41 | +# local $TODO = 'URI::Escape::escape_char misunderstands utf8'; | ||
42 | +# | ||
43 | +# # http://foo/%C3%A9 | ||
44 | +# is("$uri", 'http://foo/%E9', 'correctly created a URI from a utf8-upgraded string'); | ||
45 | +#} | ||
46 | |||
47 | { | ||
48 | my $str = "http://foo/\xE9"; | ||
49 | diff --git a/t/iri.t b/t/iri.t | ||
50 | index 2eb64b2..9c663c9 100644 | ||
51 | --- a/t/iri.t | ||
52 | +++ b/t/iri.t | ||
53 | @@ -6,7 +6,7 @@ use Test::More; | ||
54 | use Config qw( %Config ); | ||
55 | |||
56 | if (defined $Config{useperlio}) { | ||
57 | - plan tests=>26; | ||
58 | + plan tests=>24; | ||
59 | } else { | ||
60 | plan skip_all=>'this perl doesn\'t support PerlIO layers'; | ||
61 | } | ||
62 | @@ -60,17 +60,17 @@ is $u->as_iri, "http://➡.ws/"; | ||
63 | # draft-duerst-iri-bis.txt examples (section 3.7.1): | ||
64 | is(URI->new("http://www.example.org/D%C3%BCrst")->as_iri, "http://www.example.org/D\xFCrst"); | ||
65 | is(URI->new("http://www.example.org/D%FCrst")->as_iri, "http://www.example.org/D%FCrst"); | ||
66 | -TODO: { | ||
67 | - local $TODO = "some chars (like U+202E, RIGHT-TO-LEFT OVERRIDE) need to stay escaped"; | ||
68 | -is(URI->new("http://xn--99zt52a.example.org/%e2%80%ae")->as_iri, "http://\x{7D0D}\x{8C46}.example.org/%e2%80%ae"); | ||
69 | -} | ||
70 | +#TODO: { | ||
71 | +# local $TODO = "some chars (like U+202E, RIGHT-TO-LEFT OVERRIDE) need to stay escaped"; | ||
72 | +#is(URI->new("http://xn--99zt52a.example.org/%e2%80%ae")->as_iri, "http://\x{7D0D}\x{8C46}.example.org/%e2%80%ae"); | ||
73 | +#} | ||
74 | |||
75 | # try some URLs that can't be IDNA encoded (fallback to encoded UTF8 bytes) | ||
76 | $u = URI->new("http://" . ("ü" x 128)); | ||
77 | is $u, "http://" . ("%C3%BC" x 128); | ||
78 | is $u->host, ("\xC3\xBC" x 128); | ||
79 | -TODO: { | ||
80 | - local $TODO = "should ihost decode UTF8 bytes?"; | ||
81 | - is $u->ihost, ("ü" x 128); | ||
82 | -} | ||
83 | +#TODO: { | ||
84 | +# local $TODO = "should ihost decode UTF8 bytes?"; | ||
85 | +# is $u->ihost, ("ü" x 128); | ||
86 | +#} | ||
87 | is $u->as_iri, "http://" . ("ü" x 128); | ||
88 | diff --git a/t/mailto.t b/t/mailto.t | ||
89 | index 79e9a13..c68cfb2 100644 | ||
90 | --- a/t/mailto.t | ||
91 | +++ b/t/mailto.t | ||
92 | @@ -48,12 +48,12 @@ $u = URI->new('mailto:user+detail@example.com'); | ||
93 | is $u->to, 'user+detail@example.com', 'subaddress with `+` parsed correctly'; | ||
94 | is $u, 'mailto:user+detail@example.com', '... and stringification works'; | ||
95 | |||
96 | -TODO: { | ||
97 | - local $TODO = "We can't handle quoted local parts without properly parsing the email addresses"; | ||
98 | - $u = URI->new('mailto:"foo bar+baz"@example.com'); | ||
99 | - is $u->to, '"foo bar+baz"@example.com', 'address with quoted local part containing spaces is parsed correctly'; | ||
100 | - is $u, 'mailto:%22foo%20bar+baz%22@example.com', '... and stringification works'; | ||
101 | -} | ||
102 | +#TODO: { | ||
103 | +# local $TODO = "We can't handle quoted local parts without properly parsing the email addresses"; | ||
104 | +# $u = URI->new('mailto:"foo bar+baz"@example.com'); | ||
105 | +# is $u->to, '"foo bar+baz"@example.com', 'address with quoted local part containing spaces is parsed correctly'; | ||
106 | +# is $u, 'mailto:%22foo%20bar+baz%22@example.com', '... and stringification works'; | ||
107 | +#} | ||
108 | |||
109 | # RFC 5321 (4.1.3) - Address Literals | ||
110 | |||
diff --git a/meta/recipes-devtools/perl/liburi-perl_5.08.bb b/meta/recipes-devtools/perl/liburi-perl_5.17.bb index 5428c9ddf9..5e15004dd0 100644 --- a/meta/recipes-devtools/perl/liburi-perl_5.08.bb +++ b/meta/recipes-devtools/perl/liburi-perl_5.17.bb | |||
@@ -2,19 +2,17 @@ SUMMARY = "Perl module to manipulate and access URI strings" | |||
2 | DESCRIPTION = "This package contains the URI.pm module with friends. \ | 2 | DESCRIPTION = "This package contains the URI.pm module with friends. \ |
3 | The module implements the URI class. URI objects can be used to access \ | 3 | The module implements the URI class. URI objects can be used to access \ |
4 | and manipulate the various components that make up these strings." | 4 | and manipulate the various components that make up these strings." |
5 | 5 | HOMEPAGE = "https://metacpan.org/dist/URI" | |
6 | HOMEPAGE = "http://search.cpan.org/dist/URI/" | ||
7 | SECTION = "libs" | 6 | SECTION = "libs" |
8 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 7 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" |
9 | 8 | ||
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c453e94fae672800f83bc1bd7a38b53f" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d8ca5f628bf2cd180bc4fa044cb8ef41" |
11 | |||
12 | DEPENDS += "perl" | ||
13 | 10 | ||
14 | SRC_URI = "http://www.cpan.org/authors/id/E/ET/ETHER/URI-${PV}.tar.gz" | 11 | SRC_URI = "${CPAN_MIRROR}/authors/id/O/OA/OALDERS/URI-${PV}.tar.gz \ |
12 | file://0001-Skip-TODO-test-cases-that-fail.patch \ | ||
13 | " | ||
15 | 14 | ||
16 | SRC_URI[md5sum] = "cdbbf8f8ccdec5c162c8505077a35c2c" | 15 | SRC_URI[sha256sum] = "5f7e42b769cb27499113cfae4b786c37d49e7c7d32dbb469602cd808308568f8" |
17 | SRC_URI[sha256sum] = "7e2c6fe3b1d5947da334fa558a96e748aaa619213b85bcdce5b5347d4d26c46e" | ||
18 | 16 | ||
19 | S = "${WORKDIR}/URI-${PV}" | 17 | S = "${WORKDIR}/URI-${PV}" |
20 | 18 | ||
@@ -33,18 +31,26 @@ do_install:prepend() { | |||
33 | rm -rf ${B}/t/file.t | 31 | rm -rf ${B}/t/file.t |
34 | } | 32 | } |
35 | 33 | ||
36 | RDEPENDS:${PN} += "perl-module-integer perl-module-mime-base64" | 34 | RDEPENDS:${PN} += "\ |
35 | perl-module-integer \ | ||
36 | perl-module-mime-base64 \ | ||
37 | " | ||
38 | |||
37 | RDEPENDS:${PN}-ptest += " \ | 39 | RDEPENDS:${PN}-ptest += " \ |
40 | libtest-fatal-perl \ | ||
38 | libtest-needs-perl \ | 41 | libtest-needs-perl \ |
39 | perl-module-test-more \ | 42 | libtest-warnings-perl \ |
40 | perl-module-test \ | ||
41 | perl-module-utf8 \ | ||
42 | perl-module-extutils-makemaker \ | ||
43 | perl-module-net-domain \ | ||
44 | perl-module-encode \ | 43 | perl-module-encode \ |
44 | perl-module-encode-encoding \ | ||
45 | perl-module-extutils-makemaker \ | ||
45 | perl-module-extutils-mm-unix \ | 46 | perl-module-extutils-mm-unix \ |
46 | perl-module-file-spec-functions \ | 47 | perl-module-file-spec-functions \ |
48 | perl-module-net-domain \ | ||
47 | perl-module-perlio \ | 49 | perl-module-perlio \ |
50 | perl-module-perlio-encoding \ | ||
51 | perl-module-test \ | ||
52 | perl-module-test-more \ | ||
53 | perl-module-utf8 \ | ||
48 | " | 54 | " |
49 | 55 | ||
50 | BBCLASSEXTEND = "native" | 56 | BBCLASSEXTEND = "native" |