From 6ffdb8731c4e5b529e815be06377c3cbc9961843 Mon Sep 17 00:00:00 2001 From: MetaCPAN Bot Date: Sun, 25 Jun 2023 15:08:20 +0000 Subject: [PATCH 01/49] Update cpanfile.snapshot --- cpanfile.snapshot | 136 +++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/cpanfile.snapshot b/cpanfile.snapshot index 9d6d32f7522..72c3bc8013a 100644 --- a/cpanfile.snapshot +++ b/cpanfile.snapshot @@ -160,10 +160,10 @@ DISTRIBUTIONS perl 5.006001 strict 0 warnings 0 - B-Keywords-1.24 - pathname: R/RU/RURBAN/B-Keywords-1.24.tar.gz + B-Keywords-1.26 + pathname: R/RU/RURBAN/B-Keywords-1.26.tar.gz provides: - B::Keywords 1.24 + B::Keywords 1.26 requirements: B 0 ExtUtils::MakeMaker 0 @@ -2074,10 +2074,10 @@ DISTRIBUTIONS IO::File 0 Test::More 0 URI::Escape 0 - HTTP-Tiny-0.084 - pathname: D/DA/DAGOLDEN/HTTP-Tiny-0.084.tar.gz + HTTP-Tiny-0.086 + pathname: D/DA/DAGOLDEN/HTTP-Tiny-0.086.tar.gz provides: - HTTP::Tiny 0.084 + HTTP::Tiny 0.086 requirements: Carp 0 ExtUtils::MakeMaker 6.17 @@ -2568,42 +2568,42 @@ DISTRIBUTIONS perl 5.010 strict 0 warnings 0 - MCE-1.887 - pathname: M/MA/MARIOROY/MCE-1.887.tar.gz - provides: - MCE 1.887 - MCE::Candy 1.887 - MCE::Channel 1.887 - MCE::Channel::Mutex 1.887 - MCE::Channel::MutexFast 1.887 - MCE::Channel::Simple 1.887 - MCE::Channel::SimpleFast 1.887 - MCE::Channel::Threads 1.887 - MCE::Channel::ThreadsFast 1.887 - MCE::Child 1.887 - MCE::Core::Input::Generator 1.887 - MCE::Core::Input::Handle 1.887 - MCE::Core::Input::Iterator 1.887 - MCE::Core::Input::Request 1.887 - MCE::Core::Input::Sequence 1.887 - MCE::Core::Manager 1.887 - MCE::Core::Validation 1.887 - MCE::Core::Worker 1.887 - MCE::Flow 1.887 - MCE::Grep 1.887 - MCE::Loop 1.887 - MCE::Map 1.887 - MCE::Mutex 1.887 - MCE::Mutex::Channel 1.887 - MCE::Mutex::Channel2 1.887 - MCE::Mutex::Flock 1.887 - MCE::Queue 1.887 - MCE::Relay 1.887 - MCE::Signal 1.887 - MCE::Step 1.887 - MCE::Stream 1.887 - MCE::Subs 1.887 - MCE::Util 1.887 + MCE-1.888 + pathname: M/MA/MARIOROY/MCE-1.888.tar.gz + provides: + MCE 1.888 + MCE::Candy 1.888 + MCE::Channel 1.888 + MCE::Channel::Mutex 1.888 + MCE::Channel::MutexFast 1.888 + MCE::Channel::Simple 1.888 + MCE::Channel::SimpleFast 1.888 + MCE::Channel::Threads 1.888 + MCE::Channel::ThreadsFast 1.888 + MCE::Child 1.888 + MCE::Core::Input::Generator 1.888 + MCE::Core::Input::Handle 1.888 + MCE::Core::Input::Iterator 1.888 + MCE::Core::Input::Request 1.888 + MCE::Core::Input::Sequence 1.888 + MCE::Core::Manager 1.888 + MCE::Core::Validation 1.888 + MCE::Core::Worker 1.888 + MCE::Flow 1.888 + MCE::Grep 1.888 + MCE::Loop 1.888 + MCE::Map 1.888 + MCE::Mutex 1.888 + MCE::Mutex::Channel 1.888 + MCE::Mutex::Channel2 1.888 + MCE::Mutex::Flock 1.888 + MCE::Queue 1.888 + MCE::Relay 1.888 + MCE::Signal 1.888 + MCE::Step 1.888 + MCE::Stream 1.888 + MCE::Subs 1.888 + MCE::Util 1.888 requirements: Carp 0 Errno 0 @@ -6139,32 +6139,32 @@ DISTRIBUTIONS common::sense 3.75 requirements: ExtUtils::MakeMaker 0 - libwww-perl-6.70 - pathname: S/SI/SIMBABQUE/libwww-perl-6.70.tar.gz - provides: - LWP 6.70 - LWP::Authen::Basic 6.70 - LWP::Authen::Digest 6.70 - LWP::Authen::Ntlm 6.70 - LWP::ConnCache 6.70 - LWP::Debug 6.70 - LWP::Debug::TraceHTTP 6.70 - LWP::DebugFile 6.70 - LWP::MemberMixin 6.70 - LWP::Protocol 6.70 - LWP::Protocol::cpan 6.70 - LWP::Protocol::data 6.70 - LWP::Protocol::file 6.70 - LWP::Protocol::ftp 6.70 - LWP::Protocol::gopher 6.70 - LWP::Protocol::http 6.70 - LWP::Protocol::loopback 6.70 - LWP::Protocol::mailto 6.70 - LWP::Protocol::nntp 6.70 - LWP::Protocol::nogo 6.70 - LWP::RobotUA 6.70 - LWP::Simple 6.70 - LWP::UserAgent 6.70 + libwww-perl-6.71 + pathname: O/OA/OALDERS/libwww-perl-6.71.tar.gz + provides: + LWP 6.71 + LWP::Authen::Basic 6.71 + LWP::Authen::Digest 6.71 + LWP::Authen::Ntlm 6.71 + LWP::ConnCache 6.71 + LWP::Debug 6.71 + LWP::Debug::TraceHTTP 6.71 + LWP::DebugFile 6.71 + LWP::MemberMixin 6.71 + LWP::Protocol 6.71 + LWP::Protocol::cpan 6.71 + LWP::Protocol::data 6.71 + LWP::Protocol::file 6.71 + LWP::Protocol::ftp 6.71 + LWP::Protocol::gopher 6.71 + LWP::Protocol::http 6.71 + LWP::Protocol::loopback 6.71 + LWP::Protocol::mailto 6.71 + LWP::Protocol::nntp 6.71 + LWP::Protocol::nogo 6.71 + LWP::RobotUA 6.71 + LWP::Simple 6.71 + LWP::UserAgent 6.71 requirements: Digest::MD5 0 Encode 2.12 From f87f6bfba2b7eac26e34822b36081feb2b33388e Mon Sep 17 00:00:00 2001 From: Olaf Alders Date: Tue, 4 Jul 2023 10:28:59 -0400 Subject: [PATCH 02/49] perltidy --- bin/purge.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/purge.pl b/bin/purge.pl index 9e36de442c3..85def9a3f82 100755 --- a/bin/purge.pl +++ b/bin/purge.pl @@ -50,7 +50,7 @@ =head1 DESCRIPTION elsif ( $opt->list ) { ## no critic (MutatingList) print grep { !/_cache_key_for_user/ } - map { s/\A.+:\s+\$c->add_surrogate_key\((.+?)\);\Z/$1/; $_ } + map { s/\A.+:\s+\$c->add_surrogate_key\((.+?)\);\Z/$1/; $_ } qx{git grep add_surrogate_key lib/MetaCPAN/Web/Controller/}; } else { From bf8ba7d767ad4cc53951e78b274d0c5a19d78ee1 Mon Sep 17 00:00:00 2001 From: MetaCPAN Bot Date: Sun, 2 Jul 2023 15:09:00 +0000 Subject: [PATCH 03/49] Update cpanfile.snapshot --- cpanfile.snapshot | 84 +++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/cpanfile.snapshot b/cpanfile.snapshot index 72c3bc8013a..cb944a3d489 100644 --- a/cpanfile.snapshot +++ b/cpanfile.snapshot @@ -2421,27 +2421,27 @@ DISTRIBUTIONS if 0 perl 5.006 utf8 0 - Log-Any-1.715 - pathname: P/PR/PREACTION/Log-Any-1.715.tar.gz - provides: - Log::Any 1.715 - Log::Any::Adapter 1.715 - Log::Any::Adapter::Base 1.715 - Log::Any::Adapter::Capture 1.715 - Log::Any::Adapter::File 1.715 - Log::Any::Adapter::Multiplex 1.715 - Log::Any::Adapter::Null 1.715 - Log::Any::Adapter::Stderr 1.715 - Log::Any::Adapter::Stdout 1.715 - Log::Any::Adapter::Syslog 1.715 - Log::Any::Adapter::Test 1.715 - Log::Any::Adapter::Util 1.715 - Log::Any::Manager 1.715 - Log::Any::Proxy 1.715 - Log::Any::Proxy::Null 1.715 - Log::Any::Proxy::Test 1.715 - Log::Any::Proxy::WithStackTrace 1.715 - Log::Any::Test 1.715 + Log-Any-1.716 + pathname: P/PR/PREACTION/Log-Any-1.716.tar.gz + provides: + Log::Any 1.716 + Log::Any::Adapter 1.716 + Log::Any::Adapter::Base 1.716 + Log::Any::Adapter::Capture 1.716 + Log::Any::Adapter::File 1.716 + Log::Any::Adapter::Multiplex 1.716 + Log::Any::Adapter::Null 1.716 + Log::Any::Adapter::Stderr 1.716 + Log::Any::Adapter::Stdout 1.716 + Log::Any::Adapter::Syslog 1.716 + Log::Any::Adapter::Test 1.716 + Log::Any::Adapter::Util 1.716 + Log::Any::Manager 1.716 + Log::Any::Proxy 1.716 + Log::Any::Proxy::Null 1.716 + Log::Any::Proxy::Test 1.716 + Log::Any::Proxy::WithStackTrace 1.716 + Log::Any::Test 1.716 requirements: ExtUtils::MakeMaker 0 Log-Dispatch-2.71 @@ -4406,27 +4406,27 @@ DISTRIBUTIONS strict 0 version 0.77 warnings 0 - Perl-Tidy-20230309 - pathname: S/SH/SHANCOCK/Perl-Tidy-20230309.tar.gz - provides: - Perl::Tidy 20230309 - Perl::Tidy::Debugger 20230309 - Perl::Tidy::DevNull 20230309 - Perl::Tidy::Diagnostics 20230309 - Perl::Tidy::FileWriter 20230309 - Perl::Tidy::Formatter 20230309 - Perl::Tidy::HtmlWriter 20230309 - Perl::Tidy::IOScalar 20230309 - Perl::Tidy::IOScalarArray 20230309 - Perl::Tidy::IndentationItem 20230309 - Perl::Tidy::LineBuffer 20230309 - Perl::Tidy::LineSink 20230309 - Perl::Tidy::LineSource 20230309 - Perl::Tidy::Logger 20230309 - Perl::Tidy::Tokenizer 20230309 - Perl::Tidy::VerticalAligner 20230309 - Perl::Tidy::VerticalAligner::Alignment 20230309 - Perl::Tidy::VerticalAligner::Line 20230309 + Perl-Tidy-20230701 + pathname: S/SH/SHANCOCK/Perl-Tidy-20230701.tar.gz + provides: + Perl::Tidy 20230701 + Perl::Tidy::Debugger 20230701 + Perl::Tidy::DevNull 20230701 + Perl::Tidy::Diagnostics 20230701 + Perl::Tidy::FileWriter 20230701 + Perl::Tidy::Formatter 20230701 + Perl::Tidy::HtmlWriter 20230701 + Perl::Tidy::IOScalar 20230701 + Perl::Tidy::IOScalarArray 20230701 + Perl::Tidy::IndentationItem 20230701 + Perl::Tidy::LineBuffer 20230701 + Perl::Tidy::LineSink 20230701 + Perl::Tidy::LineSource 20230701 + Perl::Tidy::Logger 20230701 + Perl::Tidy::Tokenizer 20230701 + Perl::Tidy::VerticalAligner 20230701 + Perl::Tidy::VerticalAligner::Alignment 20230701 + Perl::Tidy::VerticalAligner::Line 20230701 requirements: ExtUtils::MakeMaker 0 perl 5.008 From 9879beba26c5bce213eac1dcff040b7cf8cefdfe Mon Sep 17 00:00:00 2001 From: Leo Lapworth Date: Sat, 8 Jul 2023 17:24:43 +0100 Subject: [PATCH 04/49] Clearer error message about lessc --- lib/MetaCPAN/Middleware/Static.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/MetaCPAN/Middleware/Static.pm b/lib/MetaCPAN/Middleware/Static.pm index 3bbd84b5659..ddda26a5ce5 100644 --- a/lib/MetaCPAN/Middleware/Static.pm +++ b/lib/MetaCPAN/Middleware/Static.pm @@ -105,8 +105,8 @@ sub wrap { }, ); } - elsif (@less_files) { - die "Need 'lessc' executable!"; + else { + die "Need 'lessc' executable set in metacpan_web_local.conf"; } enable sub { From 0ca90a9a9944b8bb7e2bf0e3deba398014277efc Mon Sep 17 00:00:00 2001 From: Leo Lapworth Date: Sat, 8 Jul 2023 17:25:23 +0100 Subject: [PATCH 05/49] Replace `news` (not updated for years) with `sponsor` link Update the sponsor page itself as well to include _how_ to sponsor us, and what we will use the money for. --- root/about/sponsors.tx | 29 +++++++++++++++++++++++++---- root/base.tx | 8 ++++---- root/base/about.tx | 2 +- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/root/about/sponsors.tx b/root/about/sponsors.tx index 6d9fc54259a..283dede2e6a 100644 --- a/root/about/sponsors.tx +++ b/root/about/sponsors.tx @@ -1,7 +1,28 @@ -%% cascade base::about { +%% cascade base::about::markdown { %% title => $title || 'Sponsors', %% } -%% override content -> { +%% override about -> { + +# Sponsoring and sponsors + +## Become a sponsor + +We use OpenCollective to manage donations. Please donate - regular contributions are +ideal (to help us budget), but anything you or your company can contribute is appreciated. + +## Where does the money go? + +As a small open source group of developers we have several things that cost money... + +- Running the servers +- 3rd party system support (to help with the servers, if the open source team are not available) +- Data storage (including backups) +- Tools to help us work together better +- Meta::Hack - getting together once a year or so to push development forward +- Hosting other Perl Toolchain projects + +## Our current and previous big sponsors +
%% } diff --git a/root/base.tx b/root/base.tx index f222af1613c..3430ef77f6c 100644 --- a/root/base.tx +++ b/root/base.tx @@ -61,9 +61,9 @@ %% block header_nav_menu -> {