Mailmap and copyright update for Ariadne

mquin · Jun 1, 2021 · 3fc0499 · 3fc0499
1 parent 6adc24e
commit 3fc0499
Show file tree

Hide file tree

Showing 48 changed files with 51 additions and 50 deletions.
diff --git a/.mailmap b/.mailmap
@@ -1,5 +1,8 @@
 Aaron Sethman <[email protected]> androsyn <devnull@localhost>
 Alexander Færøy <[email protected]> Alexander F?r?y <[email protected]>
+Ariadne Conill <[email protected]> <[email protected]>
+Ariadne Conill <[email protected]> <[email protected]>
+Ariadne Conill <[email protected]> nenolod <devnull@localhost>
 Brett Greenham <[email protected]> B.Greenham <[email protected]>
 Chris Mills <[email protected]> TheChrisAM <[email protected]>
 Chris Mills <[email protected]> freenode!ChrisAM <[email protected]>
@@ -15,7 +18,5 @@ Valeriy Yatsko <[email protected]> <[email protected]>
 Valeriy Yatsko <[email protected]> <[email protected]>
 Valeriy Yatsko <[email protected]> <[email protected]>
 Valeriy Yatsko <[email protected]> <[email protected]>
-William Pitcock <[email protected]> <[email protected]>
-William Pitcock <[email protected]> nenolod <devnull@localhost>
 Christine Dodrill <[email protected]> <[email protected]>
 Christine Dodrill <[email protected]> <[email protected]>
diff --git a/CREDITS b/CREDITS
@@ -10,10 +10,10 @@ tomaw, Tom Wesley <[email protected]>
 The Charybdis team was:
 
 amdj, Aaron Jones <aaronmdjones -at- gmail.com>
+Ariadne, Ariadne Conill <ariadne -at- dereferenced.org>
 Elizafox, Elizabeth Myers <elizabeth -at- interlinked.me>
 jdhore, JD Horelick <jdhore1 -at- gmail.com>
 jilles, Jilles Tjoelker <jilles -at- stack.nl>
-kaniini, William Pitcock <nenolod -at- dereferenced.org>
 mr_flea, Keith Buck <mr_flea -at- esper.net>
 viatsko, Valerii Iatsko <dwr -at- codingbox.io>
 

diff --git a/authd/authd.c b/authd/authd.c
@@ -1,5 +1,5 @@
 /* authd/authd.c - main code for authd
- * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/authd/authd.h b/authd/authd.h
@@ -1,5 +1,5 @@
 /* authd/dns.h - header for authd DNS functions
- * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/authd/dns.c b/authd/dns.c
@@ -1,5 +1,5 @@
 /* authd/dns.c - authd DNS functions
- * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/authd/dns.h b/authd/dns.h
@@ -1,5 +1,5 @@
 /* authd/dns.h - header for authd DNS functions
- * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/doc/credits-past.txt b/doc/credits-past.txt
@@ -174,6 +174,7 @@ recent releases of Hybrid, in nick alphabetical order:
 
 A1kmm, Andrew Miller <[email protected]>
 AndroSyn, Aaron Sethman <[email protected]>
+Ariadne, Ariadne Conill <[email protected]>
 bane, Dragan Dosen <[email protected]>
 bysin, Ben Kittridge <[email protected]>
 cosine, Patrick Alken <[email protected]>
@@ -187,7 +188,6 @@ jv, Jakub Vlasek <[email protected]>
 k9, Jeremy Chadwick <[email protected]>
 kre, Dinko Korunic <[email protected]>
 madmax, Paul Lomax <[email protected]>
-nenolod, William Pitcock <[email protected]>
 Riedel, Dennis Vink, <[email protected]>
 scuzzy, David Todd <[email protected]>
 spookey, David Colburn <[email protected]>
@@ -239,9 +239,9 @@ network configurations.
 The Charybdis core team, listed in nick-alphabetical order:
 
 amdj, Aaron Jones <aaronmdjones -at- gmail.com>
+Ariadne, Ariadne Conill <ariadne -at- dereferenced.org>
 Elizafox, Elizabeth Myers <elizabeth -at- interlinked.me>
 jilles, Jilles Tjoelker <jilles -at- stack.nl>
-kaniini, William Pitcock <nenolod -at- dereferenced.org>
 mr_flea, Keith Buck <mr_flea -at- esper.net>
 
 The following people are also project members, listed in nick-alphabetical

diff --git a/doc/features/account-notify.txt b/doc/features/account-notify.txt
@@ -1,7 +1,7 @@
 account-notify client capability specification
 ----------------------------------------------
 
-Copyright (c) 2010 William Pitcock <nenolod@atheme.org>.
+Copyright (c) 2010 Ariadne Conill <ariadne@dereferenced.org>.
 
 Unlimited redistribution and modification of this document is allowed
 provided that the above copyright notice and this permission notice

diff --git a/doc/technical/capab.txt b/doc/technical/capab.txt
@@ -1,5 +1,5 @@
 Server capabilities
-William Pitcock <nenolod -at- nenolod.net>
+Ariadne Conill <ariadne -at- dereferenced.org>
 -------------------
 
 Not all TSora IRCd's support these.

diff --git a/extensions/chm_nonotice.c b/extensions/chm_nonotice.c
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * chm_nonotice: block NOTICEs (+T mode).
  *
- * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2012 Ariadne Conill <ariadne@dereferenced.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/include/authproc.h b/include/authproc.h
@@ -5,7 +5,7 @@
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
  *  Copyright (C) 1996-2002 Hybrid Development Team
  *  Copyright (C) 2002-2012 ircd-ratbox development team
- *  Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
+ *  Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/include/capability.h b/include/capability.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>.
+ * Copyright (c) 2012 Ariadne Conill <ariadne@dereferenced.org>.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/include/client.h b/include/client.h
@@ -5,7 +5,7 @@
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
  *  Copyright (C) 1996-2002 Hybrid Development Team
  *  Copyright (C) 2002-2004 ircd-ratbox development team
- *  Copyright (C) 2005 William Pitcock and Jilles Tjoelker
+ *  Copyright (C) 2005 Ariadne Conill and Jilles Tjoelker
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/include/dns.h b/include/dns.h
@@ -5,7 +5,7 @@
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
  *  Copyright (C) 1996-2002 Hybrid Development Team
  *  Copyright (C) 2002-2012 ircd-ratbox development team
- *  Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
+ *  Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/include/ircd_linker.h b/include/ircd_linker.h
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * ircd_linker.h: IRCd symbol table linking and maintainance
  *
- * Copyright (c) 2006 William Pitcock <[email protected]>
+ * Copyright (c) 2006 Ariadne Conill <[email protected]>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are

diff --git a/include/msgbuf.h b/include/msgbuf.h
@@ -1,6 +1,6 @@
 /*
  * solanum - an advanced ircd.
- * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>.
+ * Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/include/privilege.h b/include/privilege.h
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  * USA
  *
- * Copyright (c) 2008 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2008 Ariadne Conill <ariadne@dereferenced.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/include/snomask.h b/include/snomask.h
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * snomask.h: Management for user server-notice masks.
  *
- * Copyright (c) 2006 William Pitcock <[email protected]>
+ * Copyright (c) 2006 Ariadne Conill <[email protected]>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are

diff --git a/include/substitution.h b/include/substitution.h
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * markup.h: parses markup into human-readable strings
  *
- * Copyright (c) 2006-2007 William Pitcock <[email protected]>
+ * Copyright (c) 2006-2007 Ariadne Conill <[email protected]>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are

diff --git a/include/wsproc.h b/include/wsproc.h
@@ -2,7 +2,7 @@
  *  wsproc.h: An interface to the solanum websocket helper daemon
  *  Copyright (C) 2007 Aaron Sethman <[email protected]>
  *  Copyright (C) 2007 ircd-ratbox development team
- *  Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
+ *  Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/ircd/authproc.c b/ircd/authproc.c
@@ -4,7 +4,7 @@
  *
  *  Copyright (C) 2005 Aaron Sethman <[email protected]>
  *  Copyright (C) 2005-2012 ircd-ratbox development team
- *  Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
+ *  Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/ircd/capability.c b/ircd/capability.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>.
+ * Copyright (c) 2012 Ariadne Conill <ariadne@dereferenced.org>.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/ircd/client.c b/ircd/client.c
@@ -5,7 +5,7 @@
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
  *  Copyright (C) 1996-2002 Hybrid Development Team
  *  Copyright (C) 2002-2005 ircd-ratbox development team
- *  Copyright (C) 2007 William Pitcock
+ *  Copyright (C) 2007 Ariadne Conill <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/ircd/dns.c b/ircd/dns.c
@@ -4,7 +4,7 @@
  *
  *  Copyright (C) 2005 Aaron Sethman <[email protected]>
  *  Copyright (C) 2005-2012 ircd-ratbox development team
- *  Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
+ *  Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/ircd/logger.c b/ircd/logger.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003 Lee H <[email protected]>
  * Copyright (C) 2003-2005 ircd-ratbox development team
- * Copyright (C) 2008 William Pitcock <[email protected]>
+ * Copyright (C) 2008 Ariadne Conill <[email protected]>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are

diff --git a/ircd/msgbuf.c b/ircd/msgbuf.c
@@ -1,6 +1,6 @@
 /*
  * solanum - an advanced ircd.
- * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>.
+ * Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/ircd/operhash.c b/ircd/operhash.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2005 Lee Hardy <lee -at- leeh.co.uk>
  * Copyright (C) 2005-2016 ircd-ratbox development team
- * Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are

diff --git a/ircd/parse.c b/ircd/parse.c
@@ -5,7 +5,7 @@
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
  *  Copyright (C) 1996-2002 Hybrid Development Team
  *  Copyright (C) 2002-2005 ircd-ratbox development team
- *  Copyright (C) 2007-2016 William Pitcock
+ *  Copyright (C) 2007-2016 Ariadne Conill <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/ircd/privilege.c b/ircd/privilege.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  * USA
  *
- * Copyright (c) 2008 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2008 Ariadne Conill <ariadne@dereferenced.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/ircd/snomask.c b/ircd/snomask.c
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * snomask.c: Management for user server-notice masks.
  *
- * Copyright (c) 2006 William Pitcock <[email protected]>
+ * Copyright (c) 2006 Ariadne Conill <[email protected]>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are

diff --git a/ircd/substitution.c b/ircd/substitution.c
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * substitution.c: parses substitution-keyword expansions
  *
- * Copyright (c) 2006-2007 William Pitcock <[email protected]>
+ * Copyright (c) 2006-2007 Ariadne Conill <[email protected]>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are

diff --git a/ircd/whowas.c b/ircd/whowas.c
@@ -5,7 +5,7 @@
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
  *  Copyright (C) 1996-2002 Hybrid Development Team
  *  Copyright (C) 2002-2012 ircd-ratbox development team
- *  Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
+ *  Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/librb/include/rb_dictionary.h b/librb/include/rb_dictionary.h
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * rb_dictionary.h: Dictionary-based storage.
  *
- * Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
+ * Copyright (c) 2007 Ariadne Conill <ariadne -at- dereferenced.org>
  * Copyright (c) 2007 Jilles Tjoelker <jilles -at- stack.nl>
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/librb/include/rb_radixtree.h b/librb/include/rb_radixtree.h
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * rb_radixtree.h: Dictionary-based storage.
  *
- * Copyright (c) 2007-2016 William Pitcock <nenolod -at- dereferenced.org>
+ * Copyright (c) 2007-2016 Ariadne Conill <ariadne -at- dereferenced.org>
  * Copyright (c) 2007-2016 Jilles Tjoelker <jilles -at- stack.nl>
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/librb/src/dictionary.c b/librb/src/dictionary.c
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * rb_dictionary.c: Dictionary-based information storage.
  *
- * Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
+ * Copyright (c) 2007 Ariadne Conill <ariadne -at- dereferenced.org>
  * Copyright (c) 2007 Jilles Tjoelker <jilles -at- stack.nl>
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/librb/src/mbedtls.c b/librb/src/mbedtls.c
@@ -4,7 +4,7 @@
  *
  *  Copyright (C) 2007-2008 ircd-ratbox development team
  *  Copyright (C) 2007-2008 Aaron Sethman <[email protected]>
- *  Copyright (C) 2015 William Pitcock <nenolod@dereferenced.org>
+ *  Copyright (C) 2015 Ariadne Conill <ariadne@dereferenced.org>
  *  Copyright (C) 2016 Aaron Jones <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify

diff --git a/librb/src/radixtree.c b/librb/src/radixtree.c
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * rb_radixtree.c: Dictionary-based information storage.
  *
- * Copyright (c) 2007-2016 William Pitcock <nenolod -at- dereferenced.org>
+ * Copyright (c) 2007-2016 Ariadne Conill <ariadne -at- dereferenced.org>
  * Copyright (c) 2007-2016 Jilles Tjoelker <jilles -at- stack.nl>
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/modules/cap_account_tag.c b/modules/cap_account_tag.c
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * cap_account_tag.c: implement the account-tag IRCv3.2 capability
  *
- * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/modules/cap_server_time.c b/modules/cap_server_time.c
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * cap_server_time.c: implement the server-time IRCv3.2 capability
  *
- * Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/modules/chm_nocolour.c b/modules/chm_nocolour.c
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * chm_nocolour: strip colours (+c mode).
  *
- * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2012 Ariadne Conill <ariadne@dereferenced.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/modules/chm_noctcp.c b/modules/chm_noctcp.c
@@ -2,7 +2,7 @@
  * Solanum: a slightly advanced ircd
  * chm_noctcp: block non-action CTCP (+C mode).
  *
- * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2012 Ariadne Conill <ariadne@dereferenced.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

diff --git a/modules/m_cap.c b/modules/m_cap.c
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2005 Lee Hardy <[email protected]>
  *  Copyright (C) 2005 ircd-ratbox development team
- *  Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
+ *  Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are

diff --git a/modules/m_chghost.c b/modules/m_chghost.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005 William Pitcock <nenolod -at- nenolod.net>
+ * Copyright (c) 2005 Ariadne Conill <ariadne -at- dereferenced.org>
  * and Jilles Tjoelker <jilles -at- stack.nl>
  * All rights reserved.
  *