Skip to content

Commit

Permalink
Merge a756bde into 6a2e93d
Browse files Browse the repository at this point in the history
  • Loading branch information
rjbs committed Jun 30, 2021
2 parents 6a2e93d + a756bde commit 076a9fd
Show file tree
Hide file tree
Showing 6 changed files with 192 additions and 86 deletions.
136 changes: 80 additions & 56 deletions .mailmap
@@ -1,71 +1,95 @@
# https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html#_mapping_authors
Jarkko Hietaniemi <jhi@iki.fi> <jhi@alpha.hut.fi>
Aaron Crane <arc@cpan.org> <perl@aaroncrane.co.uk>
Abhijit Menon-Sen <ams@toroid.org> <ams@toroid.org>
Andy Dougherty <doughera@lafayette.edu> <doughera@lafayette.edu>
Andy Dougherty <doughera@lafayette.edu> Andy Dougherty <doughera.lafayette.edu>
Andy Dougherty <doughera@lafayette.edu> Andy Dougherty <doughera@fractal.phys.lafayette.edu>
Andy Dougherty <doughera@lafayette.edu> Andy Dougherty <doughera@lafcol.lafayette.edu>
Andy Dougherty <doughera@lafayette.edu> Andy Dougherty <doughera@newton.phys.lafayette.edu>
Audrey Tang <cpan@audreyt.org> Autrijus Tang <unknown>
Audrey Tang <cpan@audreyt.org> autrijus@ossf.iis.sinica.edu.tw <autrijus@ossf.iis.sinica.edu.tw>
Ævar Arnfjörð Bjarmason <avar@cpan.org> Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Chad Granum <exodist7@gmail.com> <exodist7@gmail.com>
Chip Salzenberg <chip@atlantic.net> Chip <chip@pobox.com>
Chip Salzenberg <chip@atlantic.net> Chip Salzenberg <chip@ci005.sv2.upperbeyond.com>
Chip Salzenberg <chip@atlantic.net> Chip Salzenberg <chip@perl.com>
Chip Salzenberg <chip@atlantic.net> Chip Salzenberg <chip@pobox.com>
Chip Salzenberg <chip@atlantic.net> Chip Salzenberg <salzench@dun.nielsen.com>
Chip Salzenberg <chip@atlantic.net> Chip Salzenberg <salzench@nielsenmedia.com>
Chris 'BinGOs' Williams <chris@bingosnet.co.uk> <chris@bingosnet.co.uk>
Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Chris BinGOs Williams <chris@bingosnet.co.uk>
Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Chris Williams <chris@bingosnet.co.uk>
Craig A. Berry <craigberry@mac.com> <Craig A. Berry)>
Craig A. Berry <craigberry@mac.com> <craig.a.berry@gmail.com>
Craig Berry <craigberry@mac.com> <craigberry@mac.com>
Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> <ilmari@ilmari.org>
David Golden <xdg@xdg.me> <xdg@xdg.me>
David Mitchell <davem@iabyn.com> <davem@fdisolutions.com>
David Mitchell <davem@iabyn.com> <davem@iabyn.com>
David Nicol <davidnicol@gmail.com> david nicol <whatever@davidnicol.com>
Dominic Dunlop <domo@computer.org> <domo@slipper.ip.lu>
Dominic Dunlop <domo@computer.org> <domo@tcp.ip.lu>
Dominic Hargreaves <dom@earth.li> <dom@semmle.com>
Father Chrysostomos <sprout@cpan.org> Father Chrysostomos <perlbug-followup@perl.org>
Gisle Aas <gisle@aas.no> Gisle Aas <aas@bergen.sn.no>
Gisle Aas <gisle@aas.no> Gisle Aas <gisle@activestate.com>
Gurusamy Sarathy <gsar@cpan.org> <gsar@engin.umich.edu>
H. Merijn Brand <perl5@tux.freedom.nl> <perl5@tux.freedom.nl>
Hugo van der Sanden <hv@crypt.org> <hv@crypt.compulink.co.uk>
Hugo van der Sanden <hv@crypt.org> <hv@crypt.org>
Hugo van der Sanden <hv@crypt.org> <hv@iii.co.uk>
James E Keenan <jkeenan@cpan.org> <jkeen@verizon.net>
James E Keenan <jkeenan@cpan.org> James E. Keenan <jkeenan@cpan.org>
James E Keenan <jkeenan@cpan.org> James Keenan <jkeenan@dromedary-001.ams6.corp.booking.com>
James E Keenan <jkeenan@cpan.org> jkeenan
Jan Dubois <jan@jandubois.com> <jan@jandubois.com>
Jarkko Hietaniemi <jhi@iki.fi> <Jarkko.Hietaniemi@cc.hut.fi>
Jarkko Hietaniemi <jhi@iki.fi> <jhi@cc.hut.fi>
Jarkko Hietaniemi <jhi@iki.fi> <jarkko.hietaniemi@booking.com>
Jarkko Hietaniemi <jhi@iki.fi> <jhi@alpha.hut.fi>
Jarkko Hietaniemi <jhi@iki.fi> <jhi@cc.hut.fi>
Jarkko Hietaniemi <jhi@iki.fi> <jhi@hut.fi>
Karl Williamson <khw@cpan.org> <public@khwilliamson.com>
Karl Williamson <khw@cpan.org> <khw@khw-desktop.(none)>
Jason McIntosh <jmac@jmac.org> <jmac@jmac.org>
Jesse Vincent <jesse@bestpractical.com> Jesse Vincent <jesse@fsck.com>
Jesse Vincent <jesse@fsck.com> <jesse@fsck.com>
Karen Etheridge <ether@cpan.org> <ether@cpan.org>
Karl Williamson <khw@cpan.org> <khw@cpan.org>
Karl Williamson <khw@cpan.org> <khw@karl.(none)>
Karl Williamson <khw@cpan.org> <khw@khw-desktop.(none)>
Karl Williamson <khw@cpan.org> <public@khwilliamson.com>
Karl Williamson <khw@cpan.org> karl williamson (via RT) <perlbug-followup@perl.org>
Father Chrysostomos <sprout@cpan.org> Father Chrysostomos <perlbug-followup@perl.org>
Kurt D. Starsinic <kstar@wolfetech.com> <kstar@www.chapin.edu>
Kurt D. Starsinic <kstar@wolfetech.com> Kurt Starsinic <kstar@cpan.org>
Kurt D. Starsinic <kstar@wolfetech.com> Starsinic, Kurt <Kurt_Starsinic@ml.com>
Leon Timmermans <fawaka@gmail.com> <fawaka@gmail.com>
Matthew Horsfall <wolfsage@gmail.com> <wolfsage@gmail.com>
Max Maischein <cpan@corion.net> <cpan@corion.net>
Neil Bowers <neilb@neilb.org> <neilb@neilb.org>
Nicholas Clark <nick@ccl4.org> <Nicholas Clark (sans From field in mail header)>
Nicholas Clark <nick@ccl4.org> <nicholas@dromedary.ams6.corp.booking.com>
David Mitchell <davem@iabyn.com> <davem@fdisolutions.com>
David Mitchell <davem@iabyn.com> <davem@iabyn.com>
Nicholas Clark <nick@ccl4.org> <nick@ccl4.org>
Nick Ing-Simmons <nik@tiuk.ti.com> <Nick.Ing-Simmons@tiuk.ti.com>
Nick Ing-Simmons <nik@tiuk.ti.com> <nick@ni-s.u-net.com>
Nicolas R <atoomic@cpan.org> <cpan@atoomic.org>
Nicolas R <atoomic@cpan.org> <nicolas@atoomic.org>
Nicolas R <atoomic@cpan.org> ☢ ℕicolas ℝ <nicolas@atoomic.org>
Paul "LeoNerd" Evans <leonerd@leonerd.org.uk> <leonerd@leonerd.org.uk>
Philippe "BooK" Bruhat <book@cpan.org> <book@cpan.org>
Rafael Garcia-Suarez <rgarciasuarez@gmail.com> Rafael Garcia-Suarez <rgs@consttype.org>
Gurusamy Sarathy <gsar@cpan.org> <gsar@engin.umich.edu>
Ricardo Signes <rjbs@semiotic.systems> <rjbs@semiotic.systems>
Ricardo Signes <rjbs@semiotic.systems> <rjbs@cpan.org>
Ricardo Signes <rjbs@semiotic.systems> <rjbs@users.noreply.github.com>
Steve Hay <steve.m.hay@googlemail.com> <SteveHay@planit.com>
Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Chris BinGOs Williams <chris@bingosnet.co.uk>
Chris 'BinGOs' Williams <chris@bingosnet.co.uk> Chris Williams <chris@bingosnet.co.uk>
Steve Hay <steve.m.hay@googlemail.com> <steve.m.hay@googlemail.com>
Stuart Mackintosh <stuart@perlfoundation.org> <stuart@perlfoundation.org>
Todd Rinaldo <toddr@cpanel.net> <toddr@cpanel.net>
Tony Cook <tony@develop-help.com> <tony@develop-help.com>
Tony Cook <tony@develop-help.com> <tony@openbsd32.tony.develop-help.com>
Tony Cook <tony@develop-help.com> <tony@saturn.(none)>
Craig A. Berry <craigberry@mac.com> <craig.a.berry@gmail.com>
Craig A. Berry <craigberry@mac.com> <Craig A. Berry)>
Nick Ing-Simmons <nik@tiuk.ti.com> <nick@ni-s.u-net.com>
Nick Ing-Simmons <nik@tiuk.ti.com> <Nick.Ing-Simmons@tiuk.ti.com>
Ricardo Signes <rjbs@cpan.org> <rjbs@cpan.org>
Ricardo Signes <rjbs@cpan.org> <rjbs@semiotic.systems>
Ricardo Signes <rjbs@cpan.org> <rjbs@users.noreply.github.com>
Yves Orton <demerphq@gmail.com> <demerphq@camel.booking.com>
Yves Orton <demerphq@gmail.com> <demerphq@dromedary.booking.com>
Yves Orton <demerphq@gmail.com> <demerphq@gemini.(none)>
Yves Orton <demerphq@gmail.com> <demerphq@gmail.com>
Yves Orton <demerphq@gmail.com> <yves.orton@booking.com>
Yves Orton <demerphq@gmail.com> yves orton <unknown>
Yves Orton <demerphq@gmail.com> Orton, Yves <yves.orton@de.mci.com>
Yves Orton <demerphq@gmail.com> yves orton <bugs-perl5@bugs6.perl.org>
Yves Orton <demerphq@gmail.com> <demerphq@gmail.com>
Yves Orton <demerphq@gmail.com> <demerphq@dromedary.booking.com>
Yves Orton <demerphq@gmail.com> <demerphq@gemini.(none)>
Yves Orton <demerphq@gmail.com> <demerphq@camel.booking.com>
James E Keenan <jkeenan@cpan.org> James E. Keenan <jkeenan@cpan.org>
James E Keenan <jkeenan@cpan.org> jkeenan
James E Keenan <jkeenan@cpan.org> <jkeen@verizon.net>
James E Keenan <jkeenan@cpan.org> James Keenan <jkeenan@dromedary-001.ams6.corp.booking.com>
Jesse Vincent <jesse@bestpractical.com> Jesse Vincent <jesse@fsck.com>
Chip Salzenberg <chip@atlantic.net> Chip Salzenberg <chip@perl.com>
Chip Salzenberg <chip@atlantic.net> Chip Salzenberg <chip@pobox.com>
Chip Salzenberg <chip@atlantic.net> Chip Salzenberg <salzench@nielsenmedia.com>
Chip Salzenberg <chip@atlantic.net> Chip Salzenberg <salzench@dun.nielsen.com>
Chip Salzenberg <chip@atlantic.net> Chip Salzenberg <chip@ci005.sv2.upperbeyond.com>
Chip Salzenberg <chip@atlantic.net> Chip <chip@pobox.com>
Hugo van der Sanden <hv@crypt.org> <hv@crypt.compulink.co.uk>
Hugo van der Sanden <hv@crypt.org> <hv@iii.co.uk>
Hugo van der Sanden <hv@crypt.org> <hv@crypt.org>
Andy Dougherty <doughera@lafayette.edu> Andy Dougherty <doughera@lafcol.lafayette.edu>
Andy Dougherty <doughera@lafayette.edu> Andy Dougherty <doughera@fractal.phys.lafayette.edu>
Andy Dougherty <doughera@lafayette.edu> Andy Dougherty <doughera.lafayette.edu>
Andy Dougherty <doughera@lafayette.edu> Andy Dougherty <doughera@newton.phys.lafayette.edu>
Gisle Aas <gisle@aas.no> Gisle Aas <gisle@activestate.com>
Gisle Aas <gisle@aas.no> Gisle Aas <aas@bergen.sn.no>
Nicolas R <atoomic@cpan.org> ☢ ℕicolas ℝ <nicolas@atoomic.org>
Nicolas R <atoomic@cpan.org> <nicolas@atoomic.org>
Nicolas R <atoomic@cpan.org> <cpan@atoomic.org>
Ævar Arnfjörð Bjarmason <avar@cpan.org> Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Dominic Hargreaves <dom@earth.li> <dom@semmle.com>
Dominic Dunlop <domo@computer.org> <domo@slipper.ip.lu>
Dominic Dunlop <domo@computer.org> <domo@tcp.ip.lu>
David Nicol <davidnicol@gmail.com> david nicol <whatever@davidnicol.com>
Kurt D. Starsinic <kstar@wolfetech.com> <kstar@www.chapin.edu>
Kurt D. Starsinic <kstar@wolfetech.com> Kurt Starsinic <kstar@cpan.org>
Kurt D. Starsinic <kstar@wolfetech.com> Starsinic, Kurt <Kurt_Starsinic@ml.com>
Audrey Tang <cpan@audreyt.org> Autrijus Tang <unknown>
Audrey Tang <cpan@audreyt.org> autrijus@ossf.iis.sinica.edu.tw <autrijus@ossf.iis.sinica.edu.tw>
Aaron Crane <arc@cpan.org> <perl@aaroncrane.co.uk>
Yves Orton <demerphq@gmail.com> yves orton <unknown>
2 changes: 2 additions & 0 deletions MANIFEST
Expand Up @@ -5369,6 +5369,7 @@ Porting/config.sh Sample config.sh
Porting/config_H Sample config.h
Porting/config_h.pl Reorder config_h.SH after metaconfig
Porting/core-cpan-diff Compare core distros with their CPAN equivalents
Porting/core-team.json Membership of the Perl Core Team
Porting/corecpan.pl Reports outdated dual-lived modules
Porting/corelist.pl Generates data for Module::CoreList
Porting/corelist-diff Tool to produce corelist diffs
Expand Down Expand Up @@ -5403,6 +5404,7 @@ Porting/mksample Generate Porting/config_H and Porting/config.sh
Porting/new-perldelta.pl Generate a new perldelta
Porting/newtests-perldelta.pl Generate Perldelta stub for newly added tests
Porting/perldelta_template.pod Template for creating new perldelta.pod files
Porting/perlgov-team-update Tool to update perlgov from perl-core-teaml
Porting/perlhist_calculate.pl Perform calculations to update perlhist
Porting/pod_lib.pl Code for handling generated pods
Porting/pod_rules.pl generate lists of pod files for Makefiles
Expand Down
10 changes: 10 additions & 0 deletions Porting/README.pod
Expand Up @@ -132,6 +132,11 @@ F<perldelta*> files.

Generates info for Module::CoreList from this perl tree.

=head2 F<core-team.json>

The canonical list of Perl Core Team members, used to build perlgov.pod,
produce election mailings, and all that sort of thing.

=head2 F<deparse-skips.txt>

List of test files to ignore/skip for deparse tests.
Expand Down Expand Up @@ -273,6 +278,11 @@ This script outputs the added tests between the two versions of Perl.

Template for F<perldelta>.

=head2 F<perlgov-team-update>

This produces a new team list for F<perlgov.pod>, but does not, at present,
insert that content into the file.

=head2 F<perlhist_calculate.pl>

Generates info for F<perlhist> from this perl tree.
Expand Down
35 changes: 35 additions & 0 deletions Porting/core-team.json
@@ -0,0 +1,35 @@
{
"inactive": [
"ams@toroid.org",
"doughera@lafayette.edu",
"jan@jandubois.com",
"jesse@fsck.com"
],
"active": [
"book@cpan.org",
"chris@bingosnet.co.uk",
"cpan@corion.net",
"craigberry@mac.com",
"davem@iabyn.com",
"ether@cpan.org",
"exodist7@gmail.com",
"fawaka@gmail.com",
"hv@crypt.org",
"ilmari@ilmari.org",
"jkeenan@cpan.org",
"jmac@jmac.org",
"khw@cpan.org",
"leonerd@leonerd.org.uk",
"neilb@neilb.org",
"nick@ccl4.org",
"nicolas@atoomic.org",
"perl5@tux.freedom.nl",
"rjbs@semiotic.systems",
"steve.m.hay@googlemail.com",
"stuart@perlfoundation.org",
"toddr@cpanel.net",
"tony@develop-help.com",
"wolfsage@gmail.com",
"xdg@xdg.me"
]
}
26 changes: 26 additions & 0 deletions Porting/perlgov-team-update
@@ -0,0 +1,26 @@
#!/usr/bin/env perl
use v5.30.0;
use warnings;
use JSON::PP;

my $file = 'Porting/core-team.json';
my $data = JSON::PP->new->decode(scalar `cat $file`);

my $pod = q{};

for my $key (qw( active inactive )) {
$pod .= qq{=head2 \u$key Members\n\n=over 4\n\n};

my @items = map {; "<$_>" } $data->{$key}->@*;

open(my $fh, '-|', 'git', 'check-mailmap', @items)
or die "error running check-mailmap: $!";

my @lines = <$fh>;

$pod .= "=item $_\n" for sort @lines;

$pod .= "=back\n\n";
}

say $pod;
69 changes: 39 additions & 30 deletions pod/perlgov.pod
Expand Up @@ -482,64 +482,73 @@ Foundation will select a Vote Administrator.

The current members of the Perl Core Team are:

=over
=head2 Active Members

=item * Abhijit Menon-Sen (inactive)
=over 4

=item * Andy Dougherty (inactive)
=item Chad Granum <exodist7@gmail.com>

=item * Chad Granum
=item Chris 'BinGOs' Williams <chris@bingosnet.co.uk>

=item * Chris 'BinGOs' Williams
=item Craig Berry <craigberry@mac.com>

=item * Craig Berry
=item Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>

=item * Dagfinn Ilmari Mannsåker
=item David Golden <xdg@xdg.me>

=item * Dave Mitchell
=item David Mitchell <davem@iabyn.com>

=item * David Golden
=item H. Merijn Brand <perl5@tux.freedom.nl>

=item * H. Merijn Brand
=item Hugo van der Sanden <hv@crypt.org>

=item * Hugo van der Sanden
=item James E Keenan <jkeenan@cpan.org>

=item * James E Keenan
=item Jason McIntosh <jmac@jmac.org>

=item * Jan Dubois (inactive)
=item Karen Etheridge <ether@cpan.org>

=item * Jason McIntosh
=item Karl Williamson <khw@cpan.org>

=item * Jesse Vincent (inactive)
=item Leon Timmermans <fawaka@gmail.com>

=item * Karen Etheridge
=item Matthew Horsfall <wolfsage@gmail.com>

=item * Karl Williamson
=item Max Maischein <cpan@corion.net>

=item * Leon Timmermans
=item Neil Bowers <neilb@neilb.org>

=item * Matthew Horsfall
=item Nicholas Clark <nick@ccl4.org>

=item * Max Maischein
=item Nicolas R <atoomic@cpan.org>

=item * Neil Bowers
=item Paul "LeoNerd" Evans <leonerd@leonerd.org.uk>

=item * Nicholas Clark
=item Philippe "BooK" Bruhat <book@cpan.org>

=item * Nicolas R.
=item Ricardo Signes <rjbs@semiotic.systems>

=item * Paul "LeoNerd" Evans
=item Steve Hay <steve.m.hay@googlemail.com>

=item * Philippe "BooK" Bruhat
=item Stuart Mackintosh <stuart@perlfoundation.org>

=item * Ricardo Signes
=item Todd Rinaldo <toddr@cpanel.net>

=item * Steve Hay
=item Tony Cook <tony@develop-help.com>

=back

=item * Stuart Mackintosh
=head2 Inactive Members

=item * Todd Rinaldo
=over 4

=item * Tony Cook
=item Abhijit Menon-Sen <ams@toroid.org>

=item Andy Dougherty <doughera@lafayette.edu>

=item Jan Dubois <jan@jandubois.com>

=item Jesse Vincent <jesse@fsck.com>

=back

0 comments on commit 076a9fd

Please sign in to comment.