ping ... ________________________________________ 发件人: wen heping <wenheping2...@hotmail.com> 发送时间: 2021年5月25日 15:40 收件人: ports@openbsd.org; afre...@openbsd.org 主题: 回复: [UPDATE] www/p5-Mojo to p5-Mojolicious-8.73
Hi, Here is a updated patch for www/p5-Mojo, compare to previous patch: i) Update to 9.18 ii) Update RUN_DEPENDS and TEST_DEPENDS iii) Update patch It build and run well on my amd64-6.9 system, 1 of 103 tests failed. daemon_ipv6_tls.t failed. ________________________________________ 发件人: owner-po...@openbsd.org <owner-po...@openbsd.org> 代表 Andrew Hewus Fresh <and...@afresh1.com> 发送时间: 2021年2月8日 11:54 收件人: ports@openbsd.org 主题: [UPDATE] www/p5-Mojo to p5-Mojolicious-8.73 This update to Mojolicious 8.73 makes more of the test for the p5-Mojo-Pg update pass. However, even with this patch that adjusts expectations for libressl, there are some IPv6 TLS tests that fail. However, I cloned the mojo git repo and checked out the original commit of t/mojo/daemon_ipv6_tls.t and it failed just the same as described in this issue. I don't see that v8.13 fixed anything. https://apac01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fmojolicious%2Fmojo%2Fissues%2F1326&data=04%7C01%7C%7C5c9cb550816e4970591808d8cbe57e8d%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C637483533815791283%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=7EWm7A3lL%2B%2Fv0kEuOSa1ttAxC6fUE1KaFtWzowwkPMs%3D&reserved=0 After a bit more testing, I couldn't figure out why these tests weren't getting content as starting a daemon with the same options and both curl and ftp(1) get the content as expected and changing out ipv6 or removing TLS and these tests pass just fine. It's only when it's both IPv6 and TLS that it fails. In any case, this doesn't seem any worse than what we have. Comments, OK? Index: Makefile =================================================================== RCS file: /cvs/ports/www/p5-Mojo/Makefile,v retrieving revision 1.37 diff -u -p -r1.37 Makefile --- Makefile 30 Dec 2020 12:09:55 -0000 1.37 +++ Makefile 8 Feb 2021 03:45:57 -0000 @@ -4,11 +4,10 @@ COMMENT = next generation web framework MODULES = cpan PKG_ARCH = * -DISTNAME = Mojolicious-8.22 -REVISION = 0 +DISTNAME = Mojolicious-8.73 CATEGORIES = www -# Perl +# Artistic 2.0 PERMIT_PACKAGE = Yes HOMEPAGE = https://apac01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fmojolicious.org%2F&data=04%7C01%7C%7C5c9cb550816e4970591808d8cbe57e8d%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C637483533815801247%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=WWQKIk%2FnBES1yMjEp7mWBKPqOfJePUCWUMs%2B9GvCq98%3D&reserved=0 Index: distinfo =================================================================== RCS file: /cvs/ports/www/p5-Mojo/distinfo,v retrieving revision 1.27 diff -u -p -r1.27 distinfo --- distinfo 25 Jul 2019 20:45:03 -0000 1.27 +++ distinfo 8 Feb 2021 03:45:57 -0000 @@ -1,2 +1,2 @@ -SHA256 (Mojolicious-8.22.tar.gz) = huNKUPfa63r0NlXXs7/kO7CRJCFr+vMBbm/ZdcPySFQ= -SIZE (Mojolicious-8.22.tar.gz) = 764431 +SHA256 (Mojolicious-8.73.tar.gz) = Yf4vtZn66Uf8UF1roQuasggsuxmwCU/LXSshR4wQHoU= +SIZE (Mojolicious-8.73.tar.gz) = 2195846 Index: patches/patch-t_mojo_ioloop_tls_t =================================================================== RCS file: patches/patch-t_mojo_ioloop_tls_t diff -N patches/patch-t_mojo_ioloop_tls_t --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-t_mojo_ioloop_tls_t 8 Feb 2021 03:45:57 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: t/mojo/ioloop_tls.t +--- t/mojo/ioloop_tls.t.orig ++++ t/mojo/ioloop_tls.t +@@ -334,7 +334,7 @@ $loop->start; + is $server, 'accepted', 'right result'; + is $client, 'connected', 'right result'; + ok !$client_err, 'no error'; +-my $expect = $version eq 'TLSv1_3' ? 'TLS_AES_256_GCM_SHA384' : 'AES256-SHA'; ++my $expect = $version eq 'TLSv1_3' ? 'AEAD-CHACHA20-POLY1305-SHA256' : 'AES256-SHA'; + is $cipher, $expect, "$expect has been negotiatied"; + + # Ignore missing client certificate Index: patches/patch-t_mojo_tls_t =================================================================== RCS file: patches/patch-t_mojo_tls_t diff -N patches/patch-t_mojo_tls_t --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-t_mojo_tls_t 8 Feb 2021 03:45:57 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: t/mojo/tls.t +--- t/mojo/tls.t.orig ++++ t/mojo/tls.t +@@ -57,7 +57,7 @@ subtest 'Built-in certificate (custom event loop and c + })->wait; + is ref $client_result, 'IO::Socket::SSL', 'right class'; + is ref $server_result, 'IO::Socket::SSL', 'right class'; +- my $expect = $server_result->get_sslversion eq 'TLSv1_3' ? 'TLS_AES_256_GCM_SHA384' : 'AES256-SHA'; ++ my $expect = $server_result->get_sslversion eq 'TLSv1_3' ? 'AEAD-CHACHA20-POLY1305-SHA256' : 'AES256-SHA'; + is $client_result->get_cipher, $expect, "$expect has been negotiatied"; + is $server_result->get_cipher, $expect, "$expect has been negotiatied"; + }; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/p5-Mojo/pkg/PLIST,v retrieving revision 1.14 diff -u -p -r1.14 PLIST --- pkg/PLIST 3 Mar 2019 01:20:31 -0000 1.14 +++ pkg/PLIST 8 Feb 2021 03:45:57 -0000 @@ -85,6 +85,8 @@ ${P5SITE}/Mojo/UserAgent/Server.pm ${P5SITE}/Mojo/UserAgent/Transactor.pm ${P5SITE}/Mojo/Util.pm ${P5SITE}/Mojo/WebSocket.pm +${P5SITE}/Mojo/resources/ +${P5SITE}/Mojo/resources/html_entities.txt ${P5SITE}/Mojolicious/ ${P5SITE}/Mojolicious.pm ${P5SITE}/Mojolicious/Command/ @@ -94,6 +96,7 @@ ${P5SITE}/Mojolicious/Command/Author/cpa ${P5SITE}/Mojolicious/Command/Author/generate/ ${P5SITE}/Mojolicious/Command/Author/generate.pm ${P5SITE}/Mojolicious/Command/Author/generate/app.pm +${P5SITE}/Mojolicious/Command/Author/generate/dockerfile.pm ${P5SITE}/Mojolicious/Command/Author/generate/lite_app.pm ${P5SITE}/Mojolicious/Command/Author/generate/makefile.pm ${P5SITE}/Mojolicious/Command/Author/generate/plugin.pm @@ -128,6 +131,7 @@ ${P5SITE}/Mojolicious/Plugin/EPRenderer. ${P5SITE}/Mojolicious/Plugin/HeaderCondition.pm ${P5SITE}/Mojolicious/Plugin/JSONConfig.pm ${P5SITE}/Mojolicious/Plugin/Mount.pm +${P5SITE}/Mojolicious/Plugin/NotYAMLConfig.pm ${P5SITE}/Mojolicious/Plugin/TagHelpers.pm ${P5SITE}/Mojolicious/Plugins.pm ${P5SITE}/Mojolicious/Renderer.pm @@ -146,21 +150,42 @@ ${P5SITE}/Mojolicious/resources/ ${P5SITE}/Mojolicious/resources/public/ ${P5SITE}/Mojolicious/resources/public/favicon.ico ${P5SITE}/Mojolicious/resources/public/mojo/ +${P5SITE}/Mojolicious/resources/public/mojo/bootstrap/ +${P5SITE}/Mojolicious/resources/public/mojo/bootstrap/bootstrap.css +${P5SITE}/Mojolicious/resources/public/mojo/bootstrap/bootstrap.js ${P5SITE}/Mojolicious/resources/public/mojo/failraptor.png +${P5SITE}/Mojolicious/resources/public/mojo/fontawesome/ +${P5SITE}/Mojolicious/resources/public/mojo/fontawesome/fontawesome.css +${P5SITE}/Mojolicious/resources/public/mojo/highlight.js/ +${P5SITE}/Mojolicious/resources/public/mojo/highlight.js/highlight-mojo-dark.css +${P5SITE}/Mojolicious/resources/public/mojo/highlight.js/highlight.min.js +${P5SITE}/Mojolicious/resources/public/mojo/highlight.js/mojolicious.min.js ${P5SITE}/Mojolicious/resources/public/mojo/jquery/ ${P5SITE}/Mojolicious/resources/public/mojo/jquery/jquery.js -${P5SITE}/Mojolicious/resources/public/mojo/logo-black-2x.png -${P5SITE}/Mojolicious/resources/public/mojo/logo-black.png ${P5SITE}/Mojolicious/resources/public/mojo/logo-white-2x.png ${P5SITE}/Mojolicious/resources/public/mojo/logo-white.png ${P5SITE}/Mojolicious/resources/public/mojo/logo.png +${P5SITE}/Mojolicious/resources/public/mojo/mojo.css ${P5SITE}/Mojolicious/resources/public/mojo/noraptor.png ${P5SITE}/Mojolicious/resources/public/mojo/notfound.png ${P5SITE}/Mojolicious/resources/public/mojo/pinstripe-dark.png ${P5SITE}/Mojolicious/resources/public/mojo/pinstripe-light.png -${P5SITE}/Mojolicious/resources/public/mojo/prettify/ -${P5SITE}/Mojolicious/resources/public/mojo/prettify/prettify-mojo-dark.css -${P5SITE}/Mojolicious/resources/public/mojo/prettify/run_prettify.js +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/ +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-brands-400.eot +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-brands-400.svg +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-brands-400.ttf +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-brands-400.woff +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-brands-400.woff2 +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-regular-400.eot +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-regular-400.svg +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-regular-400.ttf +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-regular-400.woff +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-regular-400.woff2 +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-solid-900.eot +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-solid-900.svg +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-solid-900.ttf +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-solid-900.woff +${P5SITE}/Mojolicious/resources/public/mojo/webfonts/fa-solid-900.woff2 ${P5SITE}/Mojolicious/resources/templates/ ${P5SITE}/Mojolicious/resources/templates/mojo/ ${P5SITE}/Mojolicious/resources/templates/mojo/debug.html.ep @@ -244,6 +269,7 @@ ${P5SITE}/ojo.pm @man man/man3p/Mojolicious::Command::Author::cpanify.3p @man man/man3p/Mojolicious::Command::Author::generate.3p @man man/man3p/Mojolicious::Command::Author::generate::app.3p +@man man/man3p/Mojolicious::Command::Author::generate::dockerfile.3p @man man/man3p/Mojolicious::Command::Author::generate::lite_app.3p @man man/man3p/Mojolicious::Command::Author::generate::makefile.3p @man man/man3p/Mojolicious::Command::Author::generate::plugin.3p @@ -276,6 +302,7 @@ ${P5SITE}/ojo.pm @man man/man3p/Mojolicious::Plugin::HeaderCondition.3p @man man/man3p/Mojolicious::Plugin::JSONConfig.3p @man man/man3p/Mojolicious::Plugin::Mount.3p +@man man/man3p/Mojolicious::Plugin::NotYAMLConfig.3p @man man/man3p/Mojolicious::Plugin::TagHelpers.3p @man man/man3p/Mojolicious::Plugins.3p @man man/man3p/Mojolicious::Renderer.3p