This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Re: Beyond 5.10
authorAbigail <abigail@abigail.be>
Thu, 5 Jul 2007 21:55:20 +0000 (23:55 +0200)
committerSteve Hay <SteveHay@planit.com>
Fri, 6 Jul 2007 16:24:07 +0000 (16:24 +0000)
Message-ID: <20070705195520.GB1314@abigail.nl>

Cleans up Porting/checkAUTHORS.pl and adds missing alias mappings
to it, and adds missing entries to AUTHORS.

p4raw-id: //depot/perl@31543

AUTHORS
Porting/checkAUTHORS.pl

diff --git a/AUTHORS b/AUTHORS
index b2c0f86..8b27d6b 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -41,6 +41,7 @@ Alex Waugh                    <alex@alexwaugh.com>
 Alexander Gough                        <alex-p5p@earth.li>
 Alexander Klimov               <ask@wisdom.weizmann.ac.il>
 Alexander Smishlajev           <als@turnhere.com>
+Alexandr Ciornii                <alexchorny@gmail.com>
 Alexey Mahotkin                        <alexm@netli.com>
 Alexey Toptygin                        <alexeyt@freeshell.org>
 Alexey Tourbin                 <at@altlinux.ru>
@@ -60,6 +61,7 @@ andrew deryabin                       <djsf@technarchy.ru>
 Andrew Hamm                    <AHamm@civica.com.au>
 Andrew M. Langmead             <aml@world.std.com>
 Andrew Pimlott                 <pimlott@idiomtech.com>
+Andrew Savige                   <ajsavige@yahoo.com.au>
 Andrew Vignaux                 <ajv@nz.sangacorp.com>
 Andrew Wilcox                  <awilcox@maine.com>
 Andrey Sapozhnikov             <sapa@icb.chel.su>
@@ -84,6 +86,7 @@ Barrie Slaymaker              <barries@slaysys.com>
 Barry Friedman
 Bas van Sisseren               <bas@quarantainenet.nl>
 Beau Cox
+Ben Carter                      <bcarter@gumdrop.flyinganvil.org>
 Ben Tilly                      <ben_tilly@operamail.com>
 Benjamin Goldberg              <goldbb2@earthlink.net>
 Benjamin Holzman               <bah@ecnvantage.com>
@@ -95,6 +98,8 @@ Bill Campbell                 <bill@celestial.com>
 Bill Glicker                   <billg@burrelles.com>
 Billy Constantine              <wdconsta@cs.adelaide.edu.au>
 Blair Zajac                    <blair@orcaware.com>
+Brandon Black                   <blblack@gmail.com>
+Bo Lindbergh                    <blgl@hagernas.com>
 Bob Dalgleish                  <Robert.Dalgleish@sk.sympatico.ca>
 Bob Wilkinson
 Boris Zentner                  <bzm@2bz.de>
@@ -145,12 +150,16 @@ Chip Turner                       <cturner@redhat.com>
 chocolateboy                   <chocolateboy@chocolatey.com>
 Chris Ball                     <chris@cpan.org>
 Chris Bongaarts                        <cab@tc.umn.edu>
+Chris Dolan                     <chris@chrisdolan.net>
 Chris Faylor                   <cgf@bbc.com>
 Chris Heath                    <chris@heathens.co.nz>
+Chris Lightfoot                 <chris@ex-parrot.com>
 Chris Nandor                   <pudge@pobox.com>
 Chris Pepper
 Chris Wick                     <cwick@lmc.com>
 Christian Kirsch               <ck@held.mind.de>
+Christian Winter                <bitpoet@linux-config.de>
+Christophe Grosjean             <christophe.grosjean@gmail.com>
 Christopher Chan-Nui           <channui@austin.ibm.com>
 Christopher Davis              <ckd@loiosh.kei.com>
 chromatic                      <chromatic@wgz.org>
@@ -209,6 +218,7 @@ David Dyck                  <david.dyck@fluke.com>
 David Cannings                 <lists@edeca.net>
 David F. Haertig               <dfh@dwroll.lucent.com>
 David Favor                    <david@davidfavor.com>
+David Feldman                   <david.feldman@tudor.com>
 David Filo
 David Glasser                  <me@davidglasser.net>
 David H. Adler                 <dha@panix.com>
@@ -216,6 +226,7 @@ David Hammen                        <hammen@gothamcity.jsc.nasa.gov>
 David J. Fiander               <davidf@mks.com>
 David Kerry                    <davidk@tor.securecomputing.com>
 David Landgren                 <david@landgren.net>
+David Leadbeater                <dgl@dgl.cx>
 David Manura                   <dm.list@math2.org>
 David Mitchell                 <davem@iabyn.nospamdeletethisbit.com>
 David Muir Sharnoff            <muir@idiom.com>
@@ -228,6 +239,7 @@ Davin Milun                 <milun@cs.Buffalo.EDU>
 Dean Roehrich                  <roehrich@cray.com>
 deekoo                         <deekoo@tentacle.net>
 Dennis Marsa                   <dennism@cyrix.com>
+Devin Heitmueller               <devin.heitmueller@gmail.com>
 DH                             <crazyinsomniac@yahoo.com>
 Diab Jerius                    <dj@head-cfa.harvard.edu>
 dLux                           <dlux@spam.sch.bme.hu>
@@ -245,6 +257,7 @@ Drago Goricanec                     <drago@raptor.otsd.ts.fujitsu.co.jp>
 Duncan Findlay                 <duncf@debian.org>
 Ed Mooring                     <mooring@Lynx.COM>
 Ed Peschko                     <epeschko@den-mdev1>
+Ed Santiago                     <esm@pobox.com>
 Edmund Bacon
 Edward Avis                    <ed@membled.com>
 Edward Moy                     <emoy@apple.com>
@@ -264,6 +277,7 @@ Eryq                                <eryq@zeegee.com>
 Etienne Grossman               <etienne@isr.isr.ist.utl.pt>
 Eugene Alterman                        <Eugene.Alterman@bremer-inc.com>
 Fabien Tassin                  <tassin@eerie.fr>
+Father Chrysostomos             <sprout@cpan.org>
 Felix Gallo                    <fgallo@etoys.com>
 Fergal Daly                    <fergal@esatclear.ie>
 Florent Guillaume
@@ -283,11 +297,13 @@ Geoffrey F. Green         <geoff-public@stuebegreen.com>
 Georg Schwarz                  <geos@epost.de>
 George Necula                  <necula@eecs.berkeley.edu>
 Geraint A Edwards              <gedge@serf.org>
+Gerard Goossen                  <gerard@tty.nl>
 Gerben Wierda                  <G.C.Th.Wierda@AWT.nl>
 Gerd Knops                     <gerti@BITart.com>
 Gerrit P. Haase                        <gp@familiehaase.de>
 Giles Lean                     <giles@nemeton.com.au>
 Gisle Aas                      <gisle@aas.no>
+Glenn Linderman                 <perl@nevcal.com>
 Gordon J. Miller               <gjm@cray.com>
 Grace Lee                      <grace@hal.com>
 Graham Barr                    <gbarr@pobox.com>
@@ -392,6 +408,7 @@ Jeremy Madea                        <jmadea@inktomi.com>
 Jerome Abela                   <abela@hsc.fr>
 Jerrad Pierce                  <belg4mit@MIT.EDU>
 Jerry D. Hedden                        <jdhedden@cpan.org>
+Jesse Vincent                   <jesse@fsck.com>
 Jesús Quiroga                  <jquiroga@pobox.com>
 Jim Anderson                   <jander@ml.com>
 Jim Avera                      <avera@hal.com>
@@ -450,6 +467,7 @@ Jose Auguste-Etienne                <Jose.auguste-etienne@cgss-guyane.fr>
 Joseph N. Hall                 <joseph@cscaper.com>
 Joseph S. Myers                        <jsm28@hermes.cam.ac.uk>
 Joshua ben Jore                        <jjore@cpan.org>
+Joshua Juran                    <jjuran@gmail.com>
 Joshua Rodd                    <joshua@rodd.us>
 Joshua Pritikin                        <joshua.pritikin@db.com>
 Joost van Baal                 <J.E.vanBaal@uvt.nl>
@@ -458,6 +476,7 @@ Juan Gallego                        <Little.Boss@physics.mcgill.ca>
 Juerd Waalboer                 <juerd@cpan.org>
 Juha Laiho                     <juha.laiho@Elma.Net>
 Julian Yip                     <julian@imoney.com>
+juna                            <ggl.20.jj...@spamgourmet.com>
 Jungshik Shin                  <jshin@mailaps.org>
 Justin Banks                   <justinb@cray.com>
 John E. Malmberg               <wb8tyw@qsl.net>
@@ -545,9 +564,11 @@ Mark P. Lutz                       <mark.p.lutz@boeing.com>
 Mark Pease                     <peasem@primenet.com>
 Mark Pizzolato                 <mark@infocomm.com>
 Mark R. Levinson               <mrl@isc.upenn.edu>
+Mark Stosberg                   <mark@summersault.com>
 Mark-Jason Dominus             <mjd@plover.com>
 Martien Verbruggen             <mgjv@comdyn.com.au>
 Martijn Koster                 <mak@excitecorp.com>
+Martin Hasch                    <mhasch@cpan.org>
 Martin Husemann                        <martin@duskware.de>
 Martin J. Bligh                        <mbligh@us.ibm.com>
 Martin Jost                    <Martin.Jost@icn.siemens.de>
@@ -558,18 +579,21 @@ Martti Rahkila                    <martti.rahkila@hut.fi>
 Marty Lucich                   <marty@netcom.com>
 Marty Pauley                   <marty+p5p@kasei.com>
 Martyn Pearce                  <martyn@inpharmatica.co.uk>
+Marvin Humphrey                 <marvin@rectangular.com>
 Masahiro KAJIURA               <masahiro.kajiura@toshiba.co.jp>
 Mathias Koerber                        <mathias@dnssec1.singnet.com.sg>
 Mathieu Arnold                 <m@absolight.fr>
 Mats Peterson                  <mats@sm6sxl.net>
 Matt Kimball
 Matt Sergeant                  <matt@sergeant.org>
+Matt Taggart                    <taggart@debian.org>
 Matthew Black                  <black@csulb.edu>
 Matthew Green                  <mrg@splode.eterna.com.au>
 Matthew Sachs                  <matthewg@zevils.com>
 Matthew T Harden               <mthard@mthard1.monsanto.com>
 Matthias Ulrich Neeracher      <neeracher@mac.com>
 Matthias Urlichs               <smurf@noris.net>
+Matthijs van Duin               <xmath@cpan.org>
 Mattia Barbon                  <mbarbon@dsi.unive.it>
 Maurizio Loreti                        <maurizio.loreti@pd.infn.it>
 Max Baker                      <max@warped.org>
@@ -578,6 +602,7 @@ Merijn Broeren                      <merijnb@iloquent.nl>
 Michael A Chase                        <mchase@ix.netcom.com>
 Michael Carman                 <mjcarman@home.com>
 Michael Cook                   <mcook@cognex.com>
+Michael Cummings                <mcummings@gentoo.org>
 Michael De La Rue              <mikedlr@tardis.ed.ac.uk>
 Michael Engel                  <engel@nms1.cc.huji.ac.il>
 Michael G Schwern              <schwern@pobox.com>
@@ -631,6 +656,7 @@ Olivier Thauvin                     <olivier.thauvin@aerov.jussieu.fr>
 Owen Taylor                    <owt1@cornell.edu>
 parv                           <parv@pair.com>
 Pascal Rigaux                  <pixel@mandriva.com>
+Patrick Dugnolle                <patrick.dugnolle@bnpparibas.com>
 Patrick Hayes                  <Patrick.Hayes.CAP_SESA@renault.fr>
 Patrick O'Brien                        <pdo@cs.umd.edu>
 Paul A Sand                    <pas@unh.edu>
@@ -666,6 +692,7 @@ Peter Wolfe                 <wolfe@teloseng.com>
 Petter Reinholdtsen            <pere@hungry.com>
 Phil Lobbes                    <phil@perkpartners.com>
 Philip Hazel                   <ph10@cus.cam.ac.uk>
+Philip M. Gollucci              <pgollucci@p6m7g8.com>
 Philip Newton                  <pne@cpan.org>
 Philippe M. Chiasson           <gozer@ActiveState.com>
 Piers Cawley                   <pdcawley@bofh.org.uk>
@@ -703,6 +730,7 @@ Richard L. England          <richard_england@mentorg.com>
 Richard L. Maus, Jr.           <rmaus@monmouth.com>
 Richard Soderberg              <p5-authors@crystalflame.net>
 Richard Yeh                    <rcyeh@cco.caltech.edu>
+Richardo Signes                 <rjbs-perl-p5p@lists.manxome.org>
 Rick Delaney                   <rick@consumercontact.com>
 Rick Pluta
 Rickard Westman
@@ -747,6 +775,7 @@ Sean Sheedy                 <seans@ncube.com>
 Sebastian Wittmeier            <Sebastian.Wittmeier@ginko.de>
 Sébastien Aperghis-Tramoni     <sebastien@aperghis.net>
 Sebastien Barre                        <Sebastien.Barre@utc.fr>
+Sebastian Steinlechner          <steinlechner@gmx.net>
 Sherm Pendley                  <sherm@dot-app.org>
 Shigeya Suzuki                 <shigeya@foretune.co.jp>
 Shimpei Yamashita              <shimpei@socrates.patnet.caltech.edu>
@@ -761,6 +790,7 @@ Sisyphus                    <sisyphus1@optusnet.com.au>
 Slaven Rezic                   <slaven@rezic.de>
 Solar Designer                 <solar@openwall.com>
 Spider Boardman                        <spider@orb.nashua.nh.us>
+Sreeji K Das                    <sreeji_k@yahoo.com>
 Stas Bekman                    <stas@stason.org>
 Steffen Müller                 <7k8lrvf02@sneakemail.com>
 Steffen Ullrich                        <coyote.frank@gmx.net>
index 62b8a43..bbd825b 100644 (file)
@@ -27,182 +27,90 @@ Specify stdin as - if needs be. Remember that option names can be abbreviated.
 EOS
 }
 
-my %map = reverse (
-                  # "Correct" => "Alias"
-                  adi => "enache\100rdslink.ro",
-                  alanbur => "alan.burlison\100sun.com",
-                  ams => "ams\100wiw.org",
-                  chip => "chip\100pobox.com",
-                  davem => "davem\100fdgroup.com",
-                  doughera => " doughera\100lafayette.edu",
-                  gbarr => "gbarr\100pobox.com",
-                  gsar => "gsar\100activestate.com",
-                  hv => "hv\100crypt.compulink.co.uk",
-                  jhi => "jhi\100iki.fi",
-                  merijn => "h.m.brand\100xs4all.nl",
-                  mhx => "mhx-perl\100gmx.net",
-                  nicholas => "nick\100unfortu.net",
-                  nick => "nick\100ing-simmons.net",
-                  pudge => "pudge\100pobox.com",
-                  rgs => "rgarciasuarez\100free.fr",
-                  sky => "sky\100nanisky.com", 
-                  steveh => "steve.hay\100uk.radan.com",
-                  stevep => "steve\100fisharerojo.org",
-                  gisle => "gisle\100activestate.com",
-                  "abigail\100abigail.nl"=> "abigail\100foad.org",
-                  "chromatic\100wgz.org" => "chromatic\100rmci.net",
-                  "slaven\100rezic.de" => "slaven.rezic\100berlin.de",
-                  "mjtg\100cam.ac.uk" => "mjtg\100cus.cam.ac.uk",
-                  "robin.barker\100npl.co.uk" => "rmb1\100cise.npl.co.uk",
-                  "paul.marquess\100btinternet.com"
-                  => "paul_marquess\100yahoo.co.uk",
-                  "wolfgang.laun\100chello.at" =>
-                  "wolfgang.laun\100alcatel.at",
-                  "t.jenness\100jach.hawaii.edu" => "timj\100jach.hawaii.edu",
-                  "abe\100ztreet.demon.nl" => "abeltje\100cpan.org",
-                  "nospam-abuse\100bloodgate.com" => "tels\100bloodgate.com",
-                  "jfriedl\100yahoo.com" => "jfriedl\100yahoo-inc.com",
-                  "japhy\100pobox.com" => "japhy\100pobox.org",
-                  "gellyfish\100gellyfish.com" => "jns\100gellyfish.com",
-                  "jcromie\100divsol.com" => "jcromie\100cpan.org",
-                  "demerphq\100gmail.com" => "demerphq\100hotmail.com",
-                  "rick\100consumercontact.com" => "rick\100bort.ca",
-                  "vkonovalov\100spb.lucent.com"
-                  => "vkonovalov\100peterstar.ru",
-                  "rjk\100linguist.dartmouth.edu"
-                  => "rjk\100linguist.thayer.dartmouth.edu",
-                  "domo\100computer.org" => "shouldbedomo\100mac.com",
-                  "kane\100dwim.org" => "kane\100xs4all.net",
-                  "allens\100cpan.org" => "easmith\100beatrice.rutgers.edu",
-                  "spoon\100cpan.org" => "spoon\100dellah.org",
-                  "ben_tilly\100operamail.com" => "btilly\100gmail.com",
-                  "mbarbon\100dsi.unive.it" => "mattia.barbon\100libero.it",
-                  "tassilo.parseval\100post.rwth-aachen.de" =>
-                  "tassilo.von.parseval\100rwth-aachen.de",
-                  "dcd\100tc.fluke.com" => "david.dyck\100fluke.com",
-                  "kroepke\100dolphin-services.de"
-                  => "kay\100dolphin-services.de",
-                  "sebastien\100aperghis.net" => "maddingue\100free.fr",
-                  "radu\100netsoft.ro" => "rgreab\100fx.ro",
-                  "rick\100consumercontact.com"
-                  => "rick.delaney\100rogers.com",
-                  "p5-authors\100crystalflame.net"
-                  => "perl\100crystalflame.net",
-                  "stef\100mongueurs.net" => "stef\100payrard.net",
-                  "kstar\100wolfetech.com" => "kstar\100cpan.org",
-                  "7k8lrvf02\100sneakemail.com" =>
-                  "kjx9zthh3001\100sneakemail.com",
-                  "mgjv\100comdyn.com.au" => "mgjv\100tradingpost.com.au",
-                  "thomas.dorner\100start.de" => "tdorner\100amadeus.net",
-                  "ajohnson\100nvidia.com" => "ajohnson\100wischip.com",
-                  "phil\100perkpartners.com" => "phil\100finchcomputer.com",
-                  "tom.horsley\100mail.ccur.com" => "tom.horsley\100ccur.com",
-                  "rootbeer\100teleport.com" => "rootbeer\100redcat.com",
-                  "cp\100onsitetech.com" => "publiustemp-p5p\100yahoo.com",
-                  "epeschko\100den-mdev1" => "esp5\100pge.com",
-                  "pimlott\100idiomtech.com" => "andrew\100pimlott.net",
-                  "fugazi\100zyx.net" => "larrysh\100cpan.org",
-                  "merijnb\100iloquent.nl" => "merijnb\100iloquent.com",
-                  "whatever\100davidnicol.com" => "davidnicol\100gmail.com",
-                  "rmgiroux\100acm.org" => "rmgiroux\100hotmail.com",
-                  "smcc\100mit.edu" => "smcc\100ocf.berkeley.edu",
-                  "schubiger\100cpan.org" => "steven\100accognoscere.org",
-                  "richard.foley\100ubsw.com"
-                  => "richard.foley\100t-online.de",
-                  "damian\100cs.monash.edu.au" => "damian\100conway.org",
-                  "gp\100familiehaase.de" => "gerrit\100familiehaase.de",
-                  "juerd\100cpan.org" => "juerd\100convolution.nl",
-                  "paul.green\100stratus.com"
-                  => "paul_greenvos\100vos.stratus.com",
-                  "alian\100cpan.org" => "alian\100alianwebserver.com",
-                  "david.dyck\100fluke.com" => "dcd\100tc.fluke.com",
-                  # Maybe we should special case this to get real names out?
-                  "perlbug\100perl.org" => "perlbug-followup\100perl.org",
-                 );
-
-# Make sure these are all lower case.
-
-$map{"autrijus\100egb.elixus.org"} = $map{"autrijus\100geb.elixus.org"}
-  = $map{"autrijus\100gmail.com"} = $map{"autrijus\100ossf.iis.sinica.edu.tw"}
-  = $map{"autrijus\100autrijus.org"} = "cpan\100audreyt.org";
-$map{"ilya\100math.ohio-state.edu"} = $map{"ilya\100math.berkeley.edu"}
-  = $map{"ilya\100math.berkeley.edu"} = "nospam-abuse\100ilyaz.org";
-$map{"philip.newton\100gmx.net"} = $map{"philip.newton\100datenrevision.de"}
-  = $map{"pnewton\100gmx.de"} = "pne\100cpan.org",
-$map{"simon\100pembro4.pmb.ox.ac.uk"} = $map{"simon\100brecon.co.uk"}
-  = $map{"simon\100othersideofthe.earth.li"} = $map{"simon\100cozens.net"}
-  = $map{"simon\100netthink.co.uk"} = "simon\100simon-cozens.org";
-$map{"spider\100web.zk3.dec.com"} = $map{"spider\100leggy.zk3.dec.com"}
-  = $map{"spider-perl\100orb.nashua.nh.us"}
-  = $map{"spider\100peano.zk3.dec.com"}
-  = "spider\100orb.nashua.nh.us";
-$map{"andreas.koenig.gmwojprw\100franz.ak.mind.de"}
-  = $map{"a.koenig\100mind.de"} =  "andreas.koenig\100anima.de";
-$map{"japhy\100perlmonk.org"} = $map{"japhy\100cpan.org"}
-  = "japhy\100pobox.com";
-$map{"rmbarker\100cpan.org"} = "robin.barker\100npl.co.uk";
-$map{"yves.orton\100de.mci.com"} = $map{"yves.orton\100mciworldcom.de"}
-  = "demerphq\100gmail.com";
-$map{"jim.cromie\100gmail.com"} = "jcromie\100divsol.com";
-$map{"perl_dummy\100bloodgate.com"} = "nospam-abuse\100bloodgate.com";
-$map{"paul.marquess\100ntlworld.com"} = "paul.marquess\100btinternet.com";
-$map{"konovalo\100mail.wplus.net"} = $map{"vadim\100vkonovalov.ru"}
-  = "vkonovalov\100spb.lucent.com";
-$map{"kane\100cpan.org"} = "kane\100dwim.org";
-$map{"rs\100crystalflame.net"} = "p5-authors\100crystalflame.net";
-$map{"(srezic\100iconmobile.com)"} = "slaven\100rezic.de";
-$map{"perl\100dellah.anu.edu.au"} = "spoon\100cpan.org";
-$map{"rjk-perl-p5p\100tamias.net"} = "rjk\100linguist.dartmouth.edu";
-$map{"sts\100accognoscere.org"} = "schubiger\100cpan.org";
-$map{"s.payrard\100wanadoo.fr"} = "stef\100mongueurs.net";
-$map{"richard.foley\100ubs.com"} = "richard.foley\100ubsw.com";
-$map{"jerry\100hedden.us"} = $map{"jdhedden\100" . "1979.usna.com"} =
-$map{"jdhedden\100gmail.com"} = $map{"jdhedden\100yahoo.com"}
-  = "jdhedden\100cpan.org";
-# I assume that Ton Hospel's lack of e-mail address in AUTHORS is deliberate
-$map{"me-02\100ton.iguana.be"} = $map{"perl-5.8.0\100ton.iguana.be"}
-  = $map{"perl5-porters\100ton.iguana.be"} = "!";
-# No real name for these address
-$map{$_} = "?" foreach ("grommel\100sears.com", "pxm\100nubz.org",
-                       "padre\100elte.hu",
-                       "nothingmuch\100woobling.org", "bob\100starlabs.net",
-                       "bbucklan\100jpl-devvax.jpl.nasa.gov",
-                       "bilbo\100ua.fm", "mats\100sm5sxl.net",
-                       "chris\100ex-parrot.com", 
-                       "kaminsky\100math.huji.ac.il",
-                       "bonefish\100cs.tu-berlin.de",
-                       "bstrand\100switchmanagement.com",
-                       "glasser\100tang-eleven-seventy-nine.mit.edu",
-                       "raf\100tradingpost.com.au", "erik\100cs.uni-jena.de",
-                       "jms\100mathras.comcast.net", "kvr\100centrum.cz",
-                       "perlbug\100veggiechinese.net",
-                       "scott\100perlcode.org",
-                      );
-# We don't have an e-mail address for Beau Cox
-$map{"beau\100beaucox.com"} = "?";
-
-$map{"rgarciasuarez\100mandrakesoft.com"}
-  = $map{"rgarciasuarez\100mandriva.com"}
-  = $map{"rgarciasuarez\100gmail.com"}
-  = $map{"raphel.garcia-suarez\100hexaflux.com"} = "rgs";
-$map{"jhietaniemi\100gmail.com"} = $map{"jhi\100kosh.hut.fi"}
-  = $map{"jhi\100cc.hut.fi"} = $map{"jarkko.hietaniemi\100nokia.com"} = "jhi";
-$map{"nick\100ccl4.org"} = $map{"nick\100talking.bollo.cx"}
-  = $map{"nick\100plum.flirble.org"} = $map{"nick\100babyhippo.co.uk"}
-  = $map{"nick\100bagpuss.unfortu.net"} = "nicholas";
-$map{"craig.berry\100psinetcs.com"} = $map{"craig.berry\100metamorgs.com"}
-  = $map{"craig.berry\100signaltreesolutions.com"}
-  = $map{"craigberry\100mac.com"} = "craigb";
-$map{"davem\100iabyn.nospamdeletethisbit.com" }
-  = $map{"davem\100fdgroup.co.uk"} = $map{"davem\100fdisolutions.com"}
- = "davem";
-$map{"alan.burlison\100uk.sun.com"} = "alanbur";
-$map{"artur\100contiller.se"} = $map{"arthur\100contiller.se"} = "sky";
-$map{"h.m.brand\100hccnet.nl"} = $map{"merijn\100l1.procura.nl"} = "merijn";
-$map{"nik\100tiuk.ti.com"} = $map{"nick.ing-simmons\100elixent.com"} = "nick";
-$map{"hv\100crypt.org"} = "hv";
-$map{"gisle\100aas.no"} = "gisle";
-$map{"gsar\100cpan.org"} = "gsar";
+
+my $prev = "";
+my %map;
+
+while (<DATA>) {
+    chomp;
+    s/\\100/\@/g;
+    $_ = lc;
+    if (my ($correct, $alias) = /^\s*([^#\s]\S*)\s+(.*\S)/) {
+        if ($correct eq '+') {$correct = $prev} else {$prev = $correct}
+        $map {$alias} = $correct;
+    }
+}
+
+#
+# Email addresses for we do not have names.
+#
+$map {$_} = "?" for 
+    "alexander_bluhm\100genua.de",
+    "alexander_gernler\100genua.de",
+    "ammon\100rhythm.com",
+    "bah\100longitude.com",
+    "bbucklan\100jpl-devvax.jpl.nasa.gov",
+    "bilbo\100ua.fm",
+    "bob\100starlabs.net",
+    "bonefish\100cs.tu-berlin.de",
+    "bstrand\100switchmanagement.com",
+    "cygwin\100cygwin.com",
+    "david\100dhaller.de",
+    "dformosa\100dformosa.zeta.org.au",
+    "dgay\100acm.org",
+    "erik\100cs.uni-jena.de",
+    "glasser\100tang-eleven-seventy-nine.mit.edu",
+    "gml4410\100ggr.co.uk",
+    "grommel\100sears.com",
+    "ilya\100juil.nonet",
+    "info\100lingo.kiev.ua",
+    "jms\100mathras.comcast.net",
+    "kan\100dcit.cz",
+    "kaminsky\100math.huji.ac.il",
+    "knew-p5p\100pimb.org",
+    "kvr\100centrum.cz",
+    "mauzo\100csv.warwick.ac.uk",
+    "merijnb\100ms.com",
+    "mlelstv\100serpens.de",
+    "p.boven\100sara.nl",
+    "padre\100elte.hu",
+    "perlbug\100veggiechinese.net",
+    "pm\100capmon.dk",
+    "premchai21\100yahoo.com",
+    "pxm\100nubz.org",
+    "raf\100tradingpost.com.au",
+    "scott\100perlcode.org",
+    "smoketst\100hp46t243.cup.hp.com",
+    "yath-perlbug\100yath.de",
+;
+
+#
+# Email addresses for people that don't have an email address in AUTHORS
+# Presumably deliberately?
+# 
+
+$map {$_} = '!' for
+     # Iain Truskett has passed away.
+     "perl\100dellah.anu.edu.au",
+     "spoon\100dellah.org",
+     "spoon\100cpan.org",
+
+     # Ton Hospel
+     "me-02\100ton.iguana.be",
+     "perl-5.8.0\100ton.iguana.be",
+     "perl5-porters\100ton.iguana.be",
+
+     # Beau Cox
+     "beau\100beaucox.com",
+
+     # Randy W. Sims 
+     "ml-perl\100thepierianspring.org",
+
+     # Yuval Kogman
+     "nothingmuch\100woobling.org",
+
+;
+
 
 if (@authors) {
   my %raw;
@@ -330,3 +238,229 @@ sub process {
 }
 
 
+__DATA__
+
+#
+# List of mappings. First entry the "correct" email address, as appears
+# in the AUTHORS file. Second is any "alias" mapped to it.
+#
+# If the "correct" email address is a '+', the entry above is reused; 
+# this for addresses with more than one alias.
+#
+# Note that all entries are in lowercase. Further, no '@' signs should
+# appear; use \100 instead.
+#
+#
+#  Committers.
+#
+adi                                     enache\100rdslink.ro
+alanbur                                 alan.burlison\100sun.com
++                                       alan.burlison\100uk.sun.com
+ams                                     ams\100wiw.org
+chip                                    chip\100pobox.com
+craigb                                  craig.berry\100psinetcs.com
++                                       craig.berry\100metamorgs.com
++                                       craig.berry\100signaltreesolutions.com
++                                       craigberry\100mac.com
+davem                                   davem\100fdgroup.com
++                                       davem\100iabyn.nospamdeletethisbit.com
++                                       davem\100fdgroup.co.uk
++                                       davem\100fdisolutions.com
++                                       davem\100iabyn.com
+demerphq                                demerphq\100gmail.com
++                                       yves.orton\100de.mci.com
++                                       yves.orton\100mciworldcom.de
+doughera                                doughera\100lafayette.edu
+gbarr                                   gbarr\100pobox.com
+gisle                                   gisle\100activestate.com
++                                       gisle\100aas.no
+gsar                                    gsar\100activestate.com
++                                       gsar\100cpan.org
+hv                                      hv\100crypt.compulink.co.uk
++                                       hv\100crypt.org
+jhi                                     jhi\100iki.fi
++                                       jhietaniemi\100gmail.com
++                                       jhi\100kosh.hut.fi
++                                       jhi\100cc.hut.fi
++                                       jarkko.hietaniemi\100nokia.com
+merijn                                  h.m.brand\100xs4all.nl
++                                       h.m.brand\100hccnet.nl
++                                       merijn\100l1.procura.nl
+mhx                                     mhx-perl\100gmx.net
+nicholas                                nick\100unfortu.net
++                                       nick\100ccl4.org
++                                       nick\100talking.bollo.cx
++                                       nick\100plum.flirble.org
++                                       nick\100babyhippo.co.uk
++                                       nick\100bagpuss.unfortu.net
+nick                                    nick\100ing-simmons.net
++                                       nik\100tiuk.ti.com
++                                       nick.ing-simmons\100elixent.com
+pudge                                   pudge\100pobox.com
+rgs                                     rgarciasuarez\100free.fr
++                                       rgarciasuarez\100mandrakesoft.com
++                                       rgarciasuarez\100mandriva.com
++                                       rgarciasuarez\100gmail.com
++                                       raphel.garcia-suarez\100hexaflux.com
+sky                                     sky\100nanisky.com
++                                       artur\100contiller.se
++                                       arthur\100contiller.se
+steveh                                  steve.hay\100uk.radan.com
+stevep                                  steve\100fisharerojo.org
++                                       steve.peters\100gmail.com
+
+#
+# Mere mortals.
+#
+7k8lrvf02\100sneakemail.com             kjx9zthh3001\100sneakemail.com
++                                       dtr8sin02\100sneakemail.com
++                                       rt8363b02\100sneakemail.com
++                                       o6hhmk002\100sneakemail.com
+
+abe\100ztreet.demon.nl                  abeltje\100cpan.org
+abigail\100abigail.be                   abigail\100foad.org
++                                       abigail\100abigail.nl
+ajohnson\100nvidia.com                  ajohnson\100wischip.com
+alexm\100netli.com                      alexm\100w-m.ru
+alian\100cpan.org                       alian\100alianwebserver.com
+allens\100cpan.org                      easmith\100beatrice.rutgers.edu
+andreas.koenig\100anima.de        andreas.koenig.gmwojprw\100franz.ak.mind.de
++                                 andreas.koenig.7os6vvqr\100franz.ak.mind.de
++                                       a.koenig\100mind.de
+anno4000\100lublin.zrz.tu-berlin.de     anno4000\100mailbox.tu-berlin.de
++                                       siegel\100zrz.tu-berlin.de
+ash\100cpan.org                         ash_cpan\100firemirror.com
+avarab\100gmail.com                     avar\100cpan.org
+
+bah\100ecnvantage.com                   bholzman\100longitude.com
+ben_tilly\100operamail.com              btilly\100gmail.com
+
+chromatic\100wgz.org                    chromatic\100rmci.net
+clkao\100clkao.org                      clkao\100bestpractical.com
+cp\100onsitetech.com                    publiustemp-p5p\100yahoo.com
++                                       publiustemp-p5p3\100yahoo.com
+cpan\100audreyt.org                     autrijus\100egb.elixus.org
++                                       autrijus\100geb.elixus.org
++                                       autrijus\100gmail.com
++                                       autrijus\100ossf.iis.sinica.edu.tw
++                                       autrijus\100autrijus.org
++                                       audreyt\100audreyt.org
+
+damian\100cs.monash.edu.au              damian\100conway.org
+david.dyck\100fluke.com                 dcd\100tc.fluke.com
+demerphq\100gmail.com                   demerphq\100hotmail.com
+domo\100computer.org                    shouldbedomo\100mac.com
+
+epeschko\100den-mdev1                   esp5\100pge.com
+
+fugazi\100zyx.net                       larrysh\100cpan.org
+
+gellyfish\100gellyfish.com              jns\100gellyfish.com
+gp\100familiehaase.de                   gerrit\100familiehaase.de
+grazz\100pobox.com                      grazz\100nyc.rr.com
+
+hio\100ymir.co.jp                       hio\100hio.jp
+
+japhy\100pobox.com                      japhy\100pobox.org
++                                       japhy\100perlmonk.org
++                                       japhy\100cpan.org
+jari.aalto\100poboxes.com               jari.aalto\100cante.net
+jcromie\100divsol.com                   jcromie\100cpan.org
++                                       jim.cromie\100gmail.com
+jdhedden\100cpan.org                    jerry\100hedden.us
++                                       jdhedden\1001979.usna.com
++                                       jdhedden\100gmail.com
++                                       jdhedden\100yahoo.com
+jfriedl\100yahoo.com                    jfriedl\100yahoo-inc.com
+jjore\100cpan.org                       twists\100gmail.com
+juerd\100cpan.org                       juerd\100convolution.nl
+
+kane\100dwim.org                        kane\100xs4all.net
++                                       kane\100cpan.org
++                                       kane\100xs4all.nl
++                                       jos\100dwim.org
++                                       jib\100ripe.net
+kroepke\100dolphin-services.de          kay\100dolphin-services.de
+kstar\100wolfetech.com                  kstar\100cpan.org
+
+mats\100sm6sxl.net                      mats\100sm5sxl.net
+mbarbon\100dsi.unive.it                 mattia.barbon\100libero.it
+mcmahon\100ibiblio.org                  mcmahon\100metalab.unc.edu
+merijnb\100iloquent.nl                  merijnb\100iloquent.com
+mgjv\100comdyn.com.au                   mgjv\100tradingpost.com.au
+michael.schroeder\100informatik.uni-erlangen.de mls\100suse.de
+mike\100stok.co.uk                      mike\100exegenix.com
+mjtg\100cam.ac.uk                       mjtg\100cus.cam.ac.uk
+
+nospam-abuse\100bloodgate.com           tels\100bloodgate.com
++                                       perl_dummy\100bloodgate.com
+nospam-abuse\100ilyaz.org               ilya\100math.ohio-state.edu
++                                       ilya\100math.berkeley.edu
++                                       ilya\100math.berkeley.edu
+
+p5-authors\100crystalflame.net          perl\100crystalflame.net
++                                       rs\100crystalflame.net
+paul.green\100stratus.com               paul_greenvos\100vos.stratus.com
+paul.marquess\100btinternet.com         paul_marquess\100yahoo.co.uk
++                                       paul.marquess\100ntlworld.com
++                                       paul.marquess\100openwave.com
+pcg\100goof.com                         schmorp\100schmorp.de
+# Maybe we should special case this to get real names out?
+perlbug\100perl.org                     perlbug-followup\100perl.org
++                                       bugs-perl5\100bugs6.perl.org
+phil\100perkpartners.com                phil\100finchcomputer.com
+pimlott\100idiomtech.com                andrew\100pimlott.net
+pne\100cpan.org                         philip.newton\100gmx.net
++                                       philip.newton\100datenrevision.de
++                                       pnewton\100gmx.de
+
+radu\100netsoft.ro                      rgreab\100fx.ro
+richard.foley\100ubsw.com               richard.foley\100t-online.de
++                                       richard.foley\100ubs.com
++                                       richard.foley\100rfi.net
+rick\100consumercontact.com             rick\100bort.ca
++                                       rick.delaney\100rogers.com
+rjk\100linguist.dartmouth.edu           rjk\100linguist.thayer.dartmouth.edu
++                                       rjk-perl-p5p\100tamias.net
+rmgiroux\100acm.org                     rmgiroux\100hotmail.com
+robin.barker\100npl.co.uk               rmb1\100cise.npl.co.uk
++                                       rmbarker\100cpan.org
+rootbeer\100teleport.com                rootbeer\100redcat.com
+
+schubiger\100cpan.org                   steven\100accognoscere.org
++                                       sts\100accognoscere.org
+schwern\100pobox.com                    schwern\100gmail.com
+sebastien\100aperghis.net               maddingue\100free.fr
++                                       saper\100cpan.org
+simon\100simon-cozens.org               simon\100pembro4.pmb.ox.ac.uk
++                                       simon\100brecon.co.uk
++                                       simon\100othersideofthe.earth.li
++                                       simon\100cozens.net
++                                       simon\100netthink.co.uk
+slaven\100rezic.de                      slaven.rezic\100berlin.de
++                                       (srezic\100iconmobile.com)
+smcc\100mit.edu                         smcc\100ocf.berkeley.edu
++                                       smcc\100csua.berkeley.edu
+spider\100orb.nashua.nh.us              spider\100web.zk3.dec.com
++                                       spider\100leggy.zk3.dec.com
++                                       spider-perl\100orb.nashua.nh.us
++                                       spider\100peano.zk3.dec.com
+stef\100mongueurs.net                   stef\100payrard.net
++                                       s.payrard\100wanadoo.fr
+
+tassilo.parseval\100post.rwth-aachen.de tassilo.von.parseval\100rwth-aachen.de
+thomas.dorner\100start.de               tdorner\100amadeus.net
+tjenness\100cpan.org                    t.jenness\100jach.hawaii.edu
++                                       timj\100jach.hawaii.edu
+tom.horsley\100mail.ccur.com            tom.horsley\100ccur.com
+
+vkonovalov\100lucent.com                vkonovalov\100peterstar.ru
++                                       konovalo\100mail.wplus.net
++                                       vadim\100vkonovalov.ru
++                                       vkonovalov\100spb.lucent.com
++                                       vkonovalov\100alcatel-lucent.com
+
+whatever\100davidnicol.com              davidnicol\100gmail.com
+wolfgang.laun\100alcatel.at             wolfgang.laun\100chello.at
++                                       wolfgang.laun\100thalesgroup.com
++                                       wolfgang.laun\100gmail.com