From 28206b8cc52766f1135f363a0cf83f038fb15851 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 27 Apr 2022 20:45:21 +0100 Subject: [PATCH 01/10] Remove an obsolete workaround for Windows packaging. [skip alpine ci] [skip macos ci] [skip ubuntu ci] --- win/conanfile.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/win/conanfile.txt b/win/conanfile.txt index 1a1620413..aa21c794c 100644 --- a/win/conanfile.txt +++ b/win/conanfile.txt @@ -1,4 +1,4 @@ -# Last updated: 2022-04-24 +# Last updated: 2022-04-27 # # Modules we can't legally ship: geo_maxmind, ssl_mbedtls, ssl_openssl # Modules which don't apply to Windows: regex_posix, sslrehashsignal @@ -14,7 +14,6 @@ libpq/14.2 pcre/8.45 re2/20220201 sqlite3/3.38.1 -zlib/1.2.12 # force override to fix a conflict between libmysqlclient and pcre [options] argon2:shared=True From bce6e2422e2ea5d1187a307670df60f8359134af Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 28 Apr 2022 09:42:42 +0100 Subject: [PATCH 02/10] Document the 'G' WHO flag. --- docs/conf/helpop.conf.example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf.example index a61a02753..1e930461c 100644 --- a/docs/conf/helpop.conf.example +++ b/docs/conf/helpop.conf.example @@ -298,6 +298,8 @@ The following flags use to match against the specified user data: A Show users who have an away message matching . a Show users who have an account name matching . + G Show users who are connecting from a country code matching . + Requires the geoban module. h Show users who have a hostname matching . If the 'x' modifier is specified then this will match against the real hostname instead of the display hostname. From f6489c34568525cd587c552ffd148d149ad03328 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 28 Apr 2022 17:44:40 +0100 Subject: [PATCH 03/10] Skip bots when generating the authors list. --- tools/mkauthors | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/mkauthors b/tools/mkauthors index 63bf58f27..58bc436a9 100755 --- a/tools/mkauthors +++ b/tools/mkauthors @@ -33,6 +33,7 @@ use make::console; my %authors; for my $author (split /\n+/, `git log --pretty='%aN <%aE>' HEAD`) { $author = $1 if $author =~ /^(.+) <(?:unknown\@email.invalid|\S+\@users.noreply.github.com)>$/; + next if $author =~ /\[bot\]$/; $authors{$author} ||= 0; $authors{$author} += 1; From bddfb460e5b614c19628022f9aef1bfabef0c943 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 28 Apr 2022 17:58:38 +0100 Subject: [PATCH 04/10] Fix updating the copyright headers. --- tools/mkheaders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mkheaders b/tools/mkheaders index ece9e7af0..dfeb7fdfa 100755 --- a/tools/mkheaders +++ b/tools/mkheaders @@ -59,7 +59,7 @@ for my $path (@paths) { my ($copyright, $indent, @lines); for my $line (<$fh>) { chomp $line; - if ($line =~ /^([^0-9A-Za-z]+\s)Copyright\s+\(C\)\s+[^<]+\s+<[^>]+>$/) { + if ($line =~ /^([^0-9A-Za-z]+\s)Copyright\s+\(C\)\s+[^<]+(\s+<[^>]+>)?$/) { $copyright = scalar @lines; $indent = $1; } else { From 8845fb1ccb6e2c2d4d4bfae6031e3a1236a8054b Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 28 Apr 2022 17:59:34 +0100 Subject: [PATCH 05/10] Update the mailmap. --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index ab738fb7f..206fa522f 100644 --- a/.mailmap +++ b/.mailmap @@ -44,6 +44,7 @@ satmd satmd satmd satmd Thomas Stagner aquanight Uli Schlachter psychon +Val Lorentz Valentin Lorentz # The identities of the following people could not be verified. If you have an # email address for them please contact Sadie. From ceecef0d82a54ef0369f5be7dc723bc66117000e Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 28 Apr 2022 18:31:38 +0100 Subject: [PATCH 06/10] Update the platforms with packages in the readme. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a070c7b2..ea9dffcd7 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Most InspIRCd users running a UNIX-like system build from source. A guide about Building from source on Windows is generally not recommended but [a guide is available](https://github.com/inspircd/inspircd/blob/master/win/README.txt) if you wish to do this. -If you are running on CentOS 7/8, Debian 10/11/12, Ubuntu 18.04/20.04, or Windows 7+ binary packages are available from [the downloads page](https://github.com/inspircd/inspircd/releases/latest). +If you are running on CentOS 7, Debian 10/11/12, Rocky Linux 8, Ubuntu 18.04/20.04/22.04, or Windows 8+ binary packages are available from [the downloads page](https://github.com/inspircd/inspircd/releases/latest). A [Docker](https://www.docker.com) image is also available. See [the inspircd-docker repository](https://github.com/inspircd/inspircd-docker) for more information. From 43d14b8eda945f1e4afcc402c953767ed6a2b4c0 Mon Sep 17 00:00:00 2001 From: InspIRCd Robot Date: Thu, 28 Apr 2022 18:45:52 +0100 Subject: [PATCH 07/10] Update author list. --- docs/AUTHORS.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/AUTHORS.txt b/docs/AUTHORS.txt index b7761be82..ff763b50d 100644 --- a/docs/AUTHORS.txt +++ b/docs/AUTHORS.txt @@ -1,4 +1,4 @@ -Since the first commit in January 2003 102 people have submitted patches, +Since the first commit in January 2003 103 people have submitted patches, commits, and other useful contributions to InspIRCd. These people, ordered by the number of contributions they have made, are: @@ -33,10 +33,11 @@ the number of contributions they have made, are: * blitmap * jamie * Justin Crawford + * iwalkalone * katsklaw * Dylan Frank - * iwalkalone * Steven Van Acker + * Val Lorentz * Dan Parsons * Googolplexed * Mantas Mikulėnas @@ -58,7 +59,6 @@ the number of contributions they have made, are: * Michael Hazell * Molly Miller * PhilSliderS - * Valentin Lorentz * eggy * md_5 * satmd @@ -81,6 +81,7 @@ the number of contributions they have made, are: * Florian Praden * Garrett Holmstrom * Herman + * James Wheare * Joel Sing * Jordyn/The Linux Geek * Josh Soref From ffac4ab32314ae3274451a8817d62d0741dd2273 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 28 Apr 2022 18:46:24 +0100 Subject: [PATCH 08/10] Update module descriptions. --- src/modules/m_deaf.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp index f49553f0b..c29ef182a 100644 --- a/src/modules/m_deaf.cpp +++ b/src/modules/m_deaf.cpp @@ -190,7 +190,7 @@ class ModuleDeaf Version GetVersion() CXX11_OVERRIDE { - return Version("Adds user mode d (deaf) which prevents users from receiving channel messages.", VF_VENDOR); + return Version("Adds user modes d (deaf) and D (privdeaf) which prevents users from receiving channel (deaf) or private (privdeaf) messages.", VF_VENDOR); } }; From 346ec99c430cbb4e57df0bc288a36316efc4e9ec Mon Sep 17 00:00:00 2001 From: InspIRCd Robot Date: Thu, 28 Apr 2022 18:49:16 +0100 Subject: [PATCH 09/10] Update copyright headers. --- include/configreader.h | 2 +- include/ctables.h | 2 +- include/inspircd.h | 2 +- include/mode.h | 2 +- include/modules.h | 2 +- include/modules/invite.h | 2 +- include/modules/ircv3_batch.h | 2 +- include/modules/ircv3_replies.h | 2 +- include/modules/ircv3_servertime.h | 2 +- include/modules/sql.h | 2 +- include/modules/ssl.h | 2 +- include/modules/who.h | 2 +- include/numericbuilder.h | 2 +- include/numerics.h | 2 +- include/token_list.h | 2 +- include/typedefs.h | 2 +- make/console.pm | 2 +- make/directive.pm | 2 +- make/template/apparmor | 2 +- src/channels.cpp | 2 +- src/configparser.cpp | 2 +- src/configreader.cpp | 2 +- src/coremods/core_channel/cmd_invite.cpp | 2 +- src/coremods/core_channel/cmd_kick.cpp | 2 +- src/coremods/core_channel/cmd_names.cpp | 2 +- src/coremods/core_channel/cmd_topic.cpp | 2 +- src/coremods/core_channel/core_channel.cpp | 2 +- src/coremods/core_channel/invite.h | 2 +- src/coremods/core_list.cpp | 2 +- src/coremods/core_who.cpp | 2 +- src/coremods/core_whowas.cpp | 3 ++- src/coremods/core_xline/cmd_eline.cpp | 2 +- src/coremods/core_xline/cmd_gline.cpp | 2 +- src/coremods/core_xline/cmd_kline.cpp | 2 +- src/coremods/core_xline/cmd_qline.cpp | 2 +- src/coremods/core_xline/cmd_zline.cpp | 2 +- src/helperfuncs.cpp | 2 +- src/inspircd.cpp | 2 +- src/inspstring.cpp | 2 +- src/listmode.cpp | 2 +- src/mode.cpp | 2 +- src/modulemanager.cpp | 2 +- src/modules/extra/m_geo_maxmind.cpp | 2 +- src/modules/extra/m_regex_re2.cpp | 2 +- src/modules/extra/m_ssl_gnutls.cpp | 2 +- src/modules/extra/m_ssl_openssl.cpp | 4 ++-- src/modules/m_allowinvite.cpp | 4 ++-- src/modules/m_botmode.cpp | 2 +- src/modules/m_cban.cpp | 2 +- src/modules/m_chanfilter.cpp | 2 +- src/modules/m_chanlog.cpp | 2 +- src/modules/m_channames.cpp | 2 +- src/modules/m_check.cpp | 2 +- src/modules/m_chgname.cpp | 2 +- src/modules/m_commonchans.cpp | 2 +- src/modules/m_connectban.cpp | 2 +- src/modules/m_deaf.cpp | 4 ++-- src/modules/m_delaymsg.cpp | 1 + src/modules/m_dnsbl.cpp | 2 +- src/modules/m_geoban.cpp | 2 +- src/modules/m_hidelist.cpp | 4 ++-- src/modules/m_httpd_stats.cpp | 2 +- src/modules/m_ircv3.cpp | 2 +- src/modules/m_knock.cpp | 2 +- src/modules/m_ojoin.cpp | 2 +- src/modules/m_operprefix.cpp | 2 +- src/modules/m_override.cpp | 2 +- src/modules/m_permchannels.cpp | 2 +- src/modules/m_remove.cpp | 2 +- src/modules/m_rline.cpp | 2 +- src/modules/m_rmode.cpp | 2 +- src/modules/m_sasl.cpp | 2 +- src/modules/m_servprotect.cpp | 2 +- src/modules/m_shun.cpp | 2 +- src/modules/m_spanningtree/addline.cpp | 4 ++-- src/modules/m_spanningtree/commands.h | 2 +- src/modules/m_spanningtree/main.cpp | 2 +- src/modules/m_spanningtree/save.cpp | 2 +- src/modules/m_spanningtree/treeserver.cpp | 2 +- src/modules/m_spanningtree/treesocket2.cpp | 2 +- src/modules/m_spanningtree/uid.cpp | 2 +- src/modules/m_sslinfo.cpp | 2 +- src/modules/m_svshold.cpp | 4 ++-- src/modules/m_timedbans.cpp | 4 ++-- src/modules/m_uninvite.cpp | 2 +- src/socketengines/socketengine_poll.cpp | 2 +- src/users.cpp | 2 +- src/xline.cpp | 2 +- tools/mkauthors | 2 +- tools/mkheaders | 2 +- tools/test-build | 2 +- 91 files changed, 99 insertions(+), 97 deletions(-) diff --git a/include/configreader.h b/include/configreader.h index 62e3cf46a..96370bd06 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -5,7 +5,7 @@ * Copyright (C) 2018 Chris Novakovic * Copyright (C) 2013-2014, 2016 Attila Molnar * Copyright (C) 2013 Daniel Vassdal - * Copyright (C) 2012-2014, 2016-2021 Sadie Powell + * Copyright (C) 2012-2014, 2016-2022 Sadie Powell * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009-2010 Daniel De Graaf * Copyright (C) 2008 Thomas Stagner diff --git a/include/ctables.h b/include/ctables.h index 8e8b711e6..fee98728a 100644 --- a/include/ctables.h +++ b/include/ctables.h @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2012-2015, 2018 Attila Molnar - * Copyright (C) 2012-2013, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2012-2013, 2017-2018, 2020, 2022 Sadie Powell * Copyright (C) 2012 Robby * Copyright (C) 2009-2010 Daniel De Graaf * Copyright (C) 2008 Thomas Stagner diff --git a/include/inspircd.h b/include/inspircd.h index e199b44de..68cc647f8 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -5,7 +5,7 @@ * Copyright (C) 2018 linuxdaemon * Copyright (C) 2013 Daniel Vassdal * Copyright (C) 2012-2016, 2018 Attila Molnar - * Copyright (C) 2012-2014, 2017-2019 Sadie Powell + * Copyright (C) 2012-2014, 2017-2019, 2022 Sadie Powell * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012 ChrisTX * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/include/mode.h b/include/mode.h index d406859c6..8342a0c51 100644 --- a/include/mode.h +++ b/include/mode.h @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2013-2016 Attila Molnar - * Copyright (C) 2012-2013, 2017-2021 Sadie Powell + * Copyright (C) 2012-2013, 2017-2022 Sadie Powell * Copyright (C) 2012 Robby * Copyright (C) 2009 Daniel De Graaf * Copyright (C) 2008 Thomas Stagner diff --git a/include/modules.h b/include/modules.h index 9106fd7b6..abeb4c7c0 100644 --- a/include/modules.h +++ b/include/modules.h @@ -5,7 +5,7 @@ * Copyright (C) 2019 iwalkalone * Copyright (C) 2013 Adam * Copyright (C) 2012-2016, 2018 Attila Molnar - * Copyright (C) 2012-2013, 2017-2021 Sadie Powell + * Copyright (C) 2012-2013, 2017-2022 Sadie Powell * Copyright (C) 2012 Robby * Copyright (C) 2009-2010 Daniel De Graaf * Copyright (C) 2009 Uli Schlachter diff --git a/include/modules/invite.h b/include/modules/invite.h index 20d06e3fb..762a74dc9 100644 --- a/include/modules/invite.h +++ b/include/modules/invite.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2019 Sadie Powell + * Copyright (C) 2019, 2022 Sadie Powell * Copyright (C) 2015 Attila Molnar * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/include/modules/ircv3_batch.h b/include/modules/ircv3_batch.h index 02677c250..ac79745bd 100644 --- a/include/modules/ircv3_batch.h +++ b/include/modules/ircv3_batch.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2018-2020 Sadie Powell + * Copyright (C) 2018-2020, 2022 Sadie Powell * Copyright (C) 2018 Attila Molnar * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/include/modules/ircv3_replies.h b/include/modules/ircv3_replies.h index 05f3a7d63..dd47d97c3 100644 --- a/include/modules/ircv3_replies.h +++ b/include/modules/ircv3_replies.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2019-2021 Sadie Powell + * Copyright (C) 2019-2022 Sadie Powell * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public diff --git a/include/modules/ircv3_servertime.h b/include/modules/ircv3_servertime.h index d2d6655d3..42752fede 100644 --- a/include/modules/ircv3_servertime.h +++ b/include/modules/ircv3_servertime.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2018-2019 Sadie Powell + * Copyright (C) 2018-2019, 2022 Sadie Powell * Copyright (C) 2018 Attila Molnar * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/include/modules/sql.h b/include/modules/sql.h index 396c32f2c..636f3286f 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -3,7 +3,7 @@ * * Copyright (C) 2015 Daniel Vassdal * Copyright (C) 2014 Attila Molnar - * Copyright (C) 2013, 2017-2019, 2021 Sadie Powell + * Copyright (C) 2013, 2017-2019, 2021-2022 Sadie Powell * Copyright (C) 2012 Robby * Copyright (C) 2010 Daniel De Graaf * diff --git a/include/modules/ssl.h b/include/modules/ssl.h index 58a8bbbc4..edd75b138 100644 --- a/include/modules/ssl.h +++ b/include/modules/ssl.h @@ -4,7 +4,7 @@ * Copyright (C) 2020 Matt Schatz * Copyright (C) 2019 B00mX0r * Copyright (C) 2018 Dylan Frank - * Copyright (C) 2013, 2017-2019, 2021 Sadie Powell + * Copyright (C) 2013, 2017-2019, 2021-2022 Sadie Powell * Copyright (C) 2013, 2015-2016 Attila Molnar * Copyright (C) 2012 Robby * Copyright (C) 2012 ChrisTX diff --git a/include/modules/who.h b/include/modules/who.h index 6e8fa024b..5be3e651f 100644 --- a/include/modules/who.h +++ b/include/modules/who.h @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 linuxdaemon - * Copyright (C) 2018, 2021 Sadie Powell + * Copyright (C) 2018, 2021-2022 Sadie Powell * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public diff --git a/include/numericbuilder.h b/include/numericbuilder.h index 658b9ddbf..cb06b324c 100644 --- a/include/numericbuilder.h +++ b/include/numericbuilder.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2018-2020 Sadie Powell + * Copyright (C) 2018-2020, 2022 Sadie Powell * Copyright (C) 2015-2016 Attila Molnar * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/include/numerics.h b/include/numerics.h index ee2c3399d..0c7f0ffe2 100644 --- a/include/numerics.h +++ b/include/numerics.h @@ -3,7 +3,7 @@ * * Copyright (C) 2017 B00mX0r * Copyright (C) 2016 Attila Molnar - * Copyright (C) 2013, 2015-2018, 2020-2021 Sadie Powell + * Copyright (C) 2013, 2015-2018, 2020-2022 Sadie Powell * Copyright (C) 2013 Adam * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009 Uli Schlachter diff --git a/include/token_list.h b/include/token_list.h index 8472d5f6e..74c2de0d9 100644 --- a/include/token_list.h +++ b/include/token_list.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2017, 2021 Sadie Powell + * Copyright (C) 2017, 2021-2022 Sadie Powell * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public diff --git a/include/typedefs.h b/include/typedefs.h index 18d903ea4..50670a279 100644 --- a/include/typedefs.h +++ b/include/typedefs.h @@ -1,8 +1,8 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2013-2014, 2016, 2018 Attila Molnar * Copyright (C) 2013, 2016, 2018, 2020-2021 Sadie Powell - * Copyright (C) 2012-2014, 2016, 2018 Attila Molnar * Copyright (C) 2012 Robby * Copyright (C) 2009-2010 Daniel De Graaf * Copyright (C) 2007 Dennis Friis diff --git a/make/console.pm b/make/console.pm index 16439dcf3..bb200b4f2 100644 --- a/make/console.pm +++ b/make/console.pm @@ -1,7 +1,7 @@ # # InspIRCd -- Internet Relay Chat Daemon # -# Copyright (C) 2014-2017, 2019-2021 Sadie Powell +# Copyright (C) 2014-2017, 2019-2022 Sadie Powell # # This file is part of InspIRCd. InspIRCd is free software: you can # redistribute it and/or modify it under the terms of the GNU General Public diff --git a/make/directive.pm b/make/directive.pm index c30d78f68..ed3f88fc2 100644 --- a/make/directive.pm +++ b/make/directive.pm @@ -1,7 +1,7 @@ # # InspIRCd -- Internet Relay Chat Daemon # -# Copyright (C) 2016-2021 Sadie Powell +# Copyright (C) 2016-2022 Sadie Powell # # This file is part of InspIRCd. InspIRCd is free software: you can # redistribute it and/or modify it under the terms of the GNU General Public diff --git a/make/template/apparmor b/make/template/apparmor index 9bdf6915d..0a927cd12 100644 --- a/make/template/apparmor +++ b/make/template/apparmor @@ -2,7 +2,7 @@ # # InspIRCd -- Internet Relay Chat Daemon # -# Copyright (C) 2020-2021 Sadie Powell +# Copyright (C) 2020-2022 Sadie Powell # # This file is part of InspIRCd. InspIRCd is free software: you can # redistribute it and/or modify it under the terms of the GNU General Public diff --git a/src/channels.cpp b/src/channels.cpp index 4373a1b63..709f8fe4a 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2017 B00mX0r - * Copyright (C) 2013-2014, 2016-2020 Sadie Powell + * Copyright (C) 2013-2014, 2016-2020, 2022 Sadie Powell * Copyright (C) 2013 Adam * Copyright (C) 2012-2016, 2018 Attila Molnar * Copyright (C) 2012, 2019 Robby diff --git a/src/configparser.cpp b/src/configparser.cpp index e5a12d319..e6de3942a 100644 --- a/src/configparser.cpp +++ b/src/configparser.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2018 linuxdaemon - * Copyright (C) 2013-2014, 2016-2021 Sadie Powell + * Copyright (C) 2013-2014, 2016-2022 Sadie Powell * Copyright (C) 2013 ChrisTX * Copyright (C) 2012-2014 Attila Molnar * Copyright (C) 2012 Robby diff --git a/src/configreader.cpp b/src/configreader.cpp index 138e5f9cc..fe00853b3 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2019 Matt Schatz * Copyright (C) 2013-2016 Attila Molnar - * Copyright (C) 2013-2014, 2016-2021 Sadie Powell + * Copyright (C) 2013-2014, 2016-2022 Sadie Powell * Copyright (C) 2013 Daniel Vassdal * Copyright (C) 2012 Robby * Copyright (C) 2012 Justin Crawford diff --git a/src/coremods/core_channel/cmd_invite.cpp b/src/coremods/core_channel/cmd_invite.cpp index a83fe1c1e..5384f7e6b 100644 --- a/src/coremods/core_channel/cmd_invite.cpp +++ b/src/coremods/core_channel/cmd_invite.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2018, 2020 Sadie Powell + * Copyright (C) 2018, 2020, 2022 Sadie Powell * Copyright (C) 2018 linuxdaemon * Copyright (C) 2017 B00mX0r * Copyright (C) 2013-2016, 2018 Attila Molnar diff --git a/src/coremods/core_channel/cmd_kick.cpp b/src/coremods/core_channel/cmd_kick.cpp index 0440f9cfb..2b83a06b8 100644 --- a/src/coremods/core_channel/cmd_kick.cpp +++ b/src/coremods/core_channel/cmd_kick.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2017-2018, 2021 Sadie Powell + * Copyright (C) 2017-2018, 2021-2022 Sadie Powell * Copyright (C) 2017 B00mX0r * Copyright (C) 2013-2014, 2016 Attila Molnar * Copyright (C) 2012, 2019 Robby diff --git a/src/coremods/core_channel/cmd_names.cpp b/src/coremods/core_channel/cmd_names.cpp index e2594d33d..fc92c8e5b 100644 --- a/src/coremods/core_channel/cmd_names.cpp +++ b/src/coremods/core_channel/cmd_names.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2021 Valentin Lorentz + * Copyright (C) 2021 Val Lorentz * Copyright (C) 2018-2019 Sadie Powell * Copyright (C) 2018 Dylan Frank * Copyright (C) 2013-2016 Attila Molnar diff --git a/src/coremods/core_channel/cmd_topic.cpp b/src/coremods/core_channel/cmd_topic.cpp index 020d0c66e..1dec5b6e1 100644 --- a/src/coremods/core_channel/cmd_topic.cpp +++ b/src/coremods/core_channel/cmd_topic.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 Matt Schatz - * Copyright (C) 2017-2018 Sadie Powell + * Copyright (C) 2017-2018, 2022 Sadie Powell * Copyright (C) 2017 B00mX0r * Copyright (C) 2013-2016 Attila Molnar * Copyright (C) 2012, 2019 Robby diff --git a/src/coremods/core_channel/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp index 452fcfb95..3970bf1a4 100644 --- a/src/coremods/core_channel/core_channel.cpp +++ b/src/coremods/core_channel/core_channel.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2019 Robby * Copyright (C) 2018 linuxdaemon * Copyright (C) 2018 Dylan Frank - * Copyright (C) 2017-2020 Sadie Powell + * Copyright (C) 2017-2020, 2022 Sadie Powell * Copyright (C) 2014-2015, 2018 Attila Molnar * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/src/coremods/core_channel/invite.h b/src/coremods/core_channel/invite.h index 1f95b4795..201326604 100644 --- a/src/coremods/core_channel/invite.h +++ b/src/coremods/core_channel/invite.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2018-2019 Sadie Powell + * Copyright (C) 2018-2019, 2022 Sadie Powell * Copyright (C) 2015 Attila Molnar * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/src/coremods/core_list.cpp b/src/coremods/core_list.cpp index ea9485f8a..f3ee5b106 100644 --- a/src/coremods/core_list.cpp +++ b/src/coremods/core_list.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2017-2020 Sadie Powell + * Copyright (C) 2017-2020, 2022 Sadie Powell * Copyright (C) 2015 Daniel Vassdal * Copyright (C) 2013-2016 Attila Molnar * Copyright (C) 2012 Robby diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp index 97920ead9..4140711a3 100644 --- a/src/coremods/core_who.cpp +++ b/src/coremods/core_who.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2019 linuxdaemon * Copyright (C) 2018 Adam - * Copyright (C) 2017-2019, 2021 Sadie Powell + * Copyright (C) 2017-2019, 2021-2022 Sadie Powell * Copyright (C) 2013-2014, 2016 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/coremods/core_whowas.cpp b/src/coremods/core_whowas.cpp index d80a3a3d2..20dfee6e1 100644 --- a/src/coremods/core_whowas.cpp +++ b/src/coremods/core_whowas.cpp @@ -1,9 +1,10 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2022 Val Lorentz * Copyright (C) 2013, 2017-2018, 2020-2021 Sadie Powell * Copyright (C) 2012-2016 Attila Molnar - * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2012 Robby * Copyright (C) 2010 Craig Edwards * Copyright (C) 2009 Uli Schlachter * Copyright (C) 2009 Daniel De Graaf diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp index e7fcf7328..a300c2a5b 100644 --- a/src/coremods/core_xline/cmd_eline.cpp +++ b/src/coremods/core_xline/cmd_eline.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 Matt Schatz - * Copyright (C) 2018, 2021 Sadie Powell + * Copyright (C) 2018, 2021-2022 Sadie Powell * Copyright (C) 2018 linuxdaemon * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012, 2014 Attila Molnar diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp index 204da7d01..9b3c6d687 100644 --- a/src/coremods/core_xline/cmd_gline.cpp +++ b/src/coremods/core_xline/cmd_gline.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 Matt Schatz - * Copyright (C) 2018, 2021 Sadie Powell + * Copyright (C) 2018, 2021-2022 Sadie Powell * Copyright (C) 2018 linuxdaemon * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012, 2014 Attila Molnar diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp index 2e9a2610e..2e857f6c4 100644 --- a/src/coremods/core_xline/cmd_kline.cpp +++ b/src/coremods/core_xline/cmd_kline.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 Matt Schatz - * Copyright (C) 2018, 2021 Sadie Powell + * Copyright (C) 2018, 2021-2022 Sadie Powell * Copyright (C) 2018 linuxdaemon * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012, 2014 Attila Molnar diff --git a/src/coremods/core_xline/cmd_qline.cpp b/src/coremods/core_xline/cmd_qline.cpp index 882c5d995..5ef3f18c5 100644 --- a/src/coremods/core_xline/cmd_qline.cpp +++ b/src/coremods/core_xline/cmd_qline.cpp @@ -2,8 +2,8 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 Matt Schatz + * Copyright (C) 2018, 2022 Sadie Powell * Copyright (C) 2018 linuxdaemon - * Copyright (C) 2018 Sadie Powell * Copyright (C) 2014 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009 Uli Schlachter diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp index 5737d717d..724cd4ced 100644 --- a/src/coremods/core_xline/cmd_zline.cpp +++ b/src/coremods/core_xline/cmd_zline.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2019 Matt Schatz * Copyright (C) 2018 linuxdaemon - * Copyright (C) 2017-2018 Sadie Powell + * Copyright (C) 2017-2018, 2022 Sadie Powell * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012, 2014 Attila Molnar * Copyright (C) 2009 Uli Schlachter diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 3aadb6080..74c72e744 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -6,7 +6,7 @@ * Copyright (C) 2013 Daniel Vassdal * Copyright (C) 2013 Adam * Copyright (C) 2012-2015 Attila Molnar - * Copyright (C) 2012-2014, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2012-2014, 2017-2018, 2020, 2022 Sadie Powell * Copyright (C) 2012, 2018 Robby * Copyright (C) 2012 ChrisTX * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 4e4f8caeb..b1d4b2d09 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2021 Valentin Lorentz + * Copyright (C) 2021 Val Lorentz * Copyright (C) 2020 Matt Schatz * Copyright (C) 2018 Chris Novakovic * Copyright (C) 2013, 2017-2021 Sadie Powell diff --git a/src/inspstring.cpp b/src/inspstring.cpp index 812719b08..ad4ed69c2 100644 --- a/src/inspstring.cpp +++ b/src/inspstring.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2017-2018 Sadie Powell + * Copyright (C) 2017, 2022 Sadie Powell * Copyright (C) 2013-2014 Attila Molnar * Copyright (C) 2012 Robby * Copyright (C) 2010 Craig Edwards diff --git a/src/listmode.cpp b/src/listmode.cpp index 83e12fb14..09abfcd96 100644 --- a/src/listmode.cpp +++ b/src/listmode.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2018 linuxdaemon * Copyright (C) 2018 B00mX0r - * Copyright (C) 2017-2019 Sadie Powell + * Copyright (C) 2017-2019, 2022 Sadie Powell * Copyright (C) 2013-2014, 2016 Attila Molnar * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/src/mode.cpp b/src/mode.cpp index 7ac165bf4..abd30a505 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2019 Matt Schatz * Copyright (C) 2017 B00mX0r - * Copyright (C) 2016-2019, 2021 Sadie Powell + * Copyright (C) 2016-2019, 2021-2022 Sadie Powell * Copyright (C) 2012-2016, 2018 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012 Shawn Smith diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp index c8ce6b57e..fad415fcd 100644 --- a/src/modulemanager.cpp +++ b/src/modulemanager.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013, 2015, 2019-2020 Sadie Powell + * Copyright (C) 2013, 2015, 2019-2020, 2022 Sadie Powell * Copyright (C) 2013 Adam * Copyright (C) 2012-2013, 2015 Attila Molnar * Copyright (C) 2012 Robby diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp index c8764a367..53123cbb6 100644 --- a/src/modules/extra/m_geo_maxmind.cpp +++ b/src/modules/extra/m_geo_maxmind.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2019-2021 Sadie Powell + * Copyright (C) 2019-2022 Sadie Powell * Copyright (C) 2019 Matt Schatz * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp index 1c4c65158..19a826f00 100644 --- a/src/modules/extra/m_regex_re2.cpp +++ b/src/modules/extra/m_regex_re2.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 linuxdaemon - * Copyright (C) 2013-2014, 2016-2017, 2019, 2021 Sadie Powell + * Copyright (C) 2013-2014, 2016-2017, 2019, 2021-2022 Sadie Powell * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 8b0f127a3..ce0c921ac 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2020 Matt Schatz * Copyright (C) 2019 linuxdaemon - * Copyright (C) 2013-2014, 2016-2021 Sadie Powell + * Copyright (C) 2013-2014, 2016-2022 Sadie Powell * Copyright (C) 2013 Daniel Vassdal * Copyright (C) 2012-2017 Attila Molnar * Copyright (C) 2012-2013, 2016 Adam diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 3bbffebcf..10fed5f30 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -4,9 +4,9 @@ * Copyright (C) 2020 Matt Schatz * Copyright (C) 2019 linuxdaemon * Copyright (C) 2017 Wade Cline - * Copyright (C) 2014, 2016 Adam + * Copyright (C) 2016 Adam * Copyright (C) 2014 Julien Vehent - * Copyright (C) 2013-2014, 2016-2021 Sadie Powell + * Copyright (C) 2013-2014, 2016-2022 Sadie Powell * Copyright (C) 2012-2017 Attila Molnar * Copyright (C) 2012 Robby * Copyright (C) 2012 ChrisTX diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp index fda4af4a8..f74b4332e 100644 --- a/src/modules/m_allowinvite.cpp +++ b/src/modules/m_allowinvite.cpp @@ -1,8 +1,8 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013, 2017, 2021 Sadie Powell - * Copyright (C) 2012-2013, 2016 Attila Molnar + * Copyright (C) 2013, 2017, 2021-2022 Sadie Powell + * Copyright (C) 2012-2013 Attila Molnar * Copyright (C) 2012 Robby * Copyright (C) 2010 Craig Edwards * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp index 5f455270c..ac4df8744 100644 --- a/src/modules/m_botmode.cpp +++ b/src/modules/m_botmode.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2013, 2017-2021 Sadie Powell * Copyright (C) 2012, 2015 Attila Molnar * Copyright (C) 2012 Shawn Smith * Copyright (C) 2012 Robby diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 2020009ed..a434c70e3 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2020 Michael * Copyright (C) 2019 Matt Schatz * Copyright (C) 2018 linuxdaemon - * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2013, 2017-2018, 2020, 2022 Sadie Powell * Copyright (C) 2012-2013, 2016 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009 John Brooks diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index a2b643917..efbea8592 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 linuxdaemon - * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2013, 2017-2020, 2022 Sadie Powell * Copyright (C) 2012-2014 Attila Molnar * Copyright (C) 2012, 2018 Robby * Copyright (C) 2009 Daniel De Graaf diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp index 68e6673a8..b8d78659f 100644 --- a/src/modules/m_chanlog.cpp +++ b/src/modules/m_chanlog.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2018 linuxdaemon - * Copyright (C) 2013, 2018 Sadie Powell + * Copyright (C) 2013, 2018, 2022 Sadie Powell * Copyright (C) 2012-2014, 2018 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2010 Craig Edwards diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp index 99e837768..bdd3f58fc 100644 --- a/src/modules/m_channames.cpp +++ b/src/modules/m_channames.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013, 2017 Sadie Powell + * Copyright (C) 2013, 2017, 2022 Sadie Powell * Copyright (C) 2013 Daniel Vassdal * Copyright (C) 2012-2014 Attila Molnar * Copyright (C) 2012 Robby diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 0934f006d..115d75cdf 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2021 Herman * Copyright (C) 2020 Matt Schatz * Copyright (C) 2013-2014, 2016 Attila Molnar - * Copyright (C) 2013, 2018-2021 Sadie Powell + * Copyright (C) 2013, 2018-2022 Sadie Powell * Copyright (C) 2012, 2019 Robby * Copyright (C) 2010 Craig Edwards * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp index abc549971..2a19dc63f 100644 --- a/src/modules/m_chgname.cpp +++ b/src/modules/m_chgname.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2018 Matt Schatz - * Copyright (C) 2013, 2018 Sadie Powell + * Copyright (C) 2013, 2018, 2022 Sadie Powell * Copyright (C) 2012-2013, 2016 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009 Uli Schlachter diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp index 9b97bd66a..baf682dd9 100644 --- a/src/modules/m_commonchans.cpp +++ b/src/modules/m_commonchans.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013, 2017, 2019-2020 Sadie Powell + * Copyright (C) 2013, 2017, 2019-2020, 2022 Sadie Powell * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012 Attila Molnar * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp index 80705bf81..216fbf511 100644 --- a/src/modules/m_connectban.cpp +++ b/src/modules/m_connectban.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2019 Matt Schatz * Copyright (C) 2014 Googolplexed - * Copyright (C) 2013, 2017-2021 Sadie Powell + * Copyright (C) 2013, 2017-2022 Sadie Powell * Copyright (C) 2012-2014 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp index c29ef182a..fe9b161d3 100644 --- a/src/modules/m_deaf.cpp +++ b/src/modules/m_deaf.cpp @@ -3,9 +3,9 @@ * * Copyright (C) 2019 linuxdaemon * Copyright (C) 2019 Matt Schatz - * Copyright (C) 2013, 2017, 2021 Sadie Powell + * Copyright (C) 2013, 2017, 2021-2022 Sadie Powell * Copyright (C) 2012-2014, 2016 Attila Molnar - * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2012 Robby * Copyright (C) 2009 Daniel De Graaf * Copyright (C) 2008, 2010 Craig Edwards * Copyright (C) 2007 Robin Burchell diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp index b860bfe07..a4af45fe4 100644 --- a/src/modules/m_delaymsg.cpp +++ b/src/modules/m_delaymsg.cpp @@ -1,6 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2022 iwalkalone * Copyright (C) 2013, 2017-2020 Sadie Powell * Copyright (C) 2012-2015 Attila Molnar * Copyright (C) 2012, 2019 Robby diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 8777b6f24..1b18866ed 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2018-2020 Matt Schatz * Copyright (C) 2018-2019 linuxdaemon - * Copyright (C) 2013, 2017-2021 Sadie Powell + * Copyright (C) 2013, 2017-2022 Sadie Powell * Copyright (C) 2013, 2015-2016 Adam * Copyright (C) 2012-2016 Attila Molnar * Copyright (C) 2012, 2018 Robby diff --git a/src/modules/m_geoban.cpp b/src/modules/m_geoban.cpp index 1e0e6cd74..c42befce4 100644 --- a/src/modules/m_geoban.cpp +++ b/src/modules/m_geoban.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2020 Matt Schatz - * Copyright (C) 2019, 2021 Sadie Powell + * Copyright (C) 2019, 2021-2022 Sadie Powell * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public diff --git a/src/modules/m_hidelist.cpp b/src/modules/m_hidelist.cpp index e495c148b..519f1dd69 100644 --- a/src/modules/m_hidelist.cpp +++ b/src/modules/m_hidelist.cpp @@ -2,8 +2,8 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2018 linuxdaemon - * Copyright (C) 2017-2018 Sadie Powell - * Copyright (C) 2014, 2016 Attila Molnar + * Copyright (C) 2017-2018, 2022 Sadie Powell + * Copyright (C) 2014 Attila Molnar * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index f0b8ce5e6..3ee6c4ef7 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -6,7 +6,7 @@ * Copyright (C) 2018 Matt Schatz * Copyright (C) 2016 Johanna A * Copyright (C) 2013-2016 Attila Molnar - * Copyright (C) 2013, 2017, 2019-2021 Sadie Powell + * Copyright (C) 2013, 2017, 2019-2022 Sadie Powell * Copyright (C) 2012 Robby * Copyright (C) 2009 Uli Schlachter * Copyright (C) 2009 Daniel De Graaf diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp index 58b6fd244..4c13a79c0 100644 --- a/src/modules/m_ircv3.cpp +++ b/src/modules/m_ircv3.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2021 Herman - * Copyright (C) 2013, 2018-2019 Sadie Powell + * Copyright (C) 2013, 2018-2019, 2022 Sadie Powell * Copyright (C) 2012-2013, 2015, 2018 Attila Molnar * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp index 135d61611..b18fab879 100644 --- a/src/modules/m_knock.cpp +++ b/src/modules/m_knock.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2017 B00mX0r - * Copyright (C) 2013, 2018, 2020 Sadie Powell + * Copyright (C) 2013, 2018, 2020, 2022 Sadie Powell * Copyright (C) 2012-2013, 2016, 2018 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp index 4074a5370..cc373a4f8 100644 --- a/src/modules/m_ojoin.cpp +++ b/src/modules/m_ojoin.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 Robby - * Copyright (C) 2013, 2017-2018, 2020-2021 Sadie Powell + * Copyright (C) 2013, 2017-2018, 2020-2022 Sadie Powell * Copyright (C) 2012-2014, 2016 Attila Molnar * Copyright (C) 2010 Craig Edwards * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp index b3e8a525c..1f7131e38 100644 --- a/src/modules/m_operprefix.cpp +++ b/src/modules/m_operprefix.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013, 2017 Sadie Powell + * Copyright (C) 2013, 2017, 2022 Sadie Powell * Copyright (C) 2012-2016 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009-2010 Craig Edwards diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 33add918a..37982db77 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -6,7 +6,7 @@ * Copyright (C) 2017 B00mX0r * Copyright (C) 2017 Adam * Copyright (C) 2016 Sheogorath - * Copyright (C) 2013, 2017, 2020-2021 Sadie Powell + * Copyright (C) 2013, 2017, 2020-2022 Sadie Powell * Copyright (C) 2013 Daniel Vassdal * Copyright (C) 2012-2015 Attila Molnar * Copyright (C) 2012 Shawn Smith diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp index 5e4720233..3f425961e 100644 --- a/src/modules/m_permchannels.cpp +++ b/src/modules/m_permchannels.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2014 Justin Crawford - * Copyright (C) 2013-2014, 2017-2021 Sadie Powell + * Copyright (C) 2013-2014, 2017-2022 Sadie Powell * Copyright (C) 2013-2014, 2016 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012, 2014 Adam diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index 8532f84d5..4308911e6 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2017 B00mX0r - * Copyright (C) 2013, 2018, 2020-2021 Sadie Powell + * Copyright (C) 2013, 2018, 2020-2022 Sadie Powell * Copyright (C) 2012-2014, 2016 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012 Justin Crawford diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 9d6028b09..d8da60be6 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2018 linuxdaemon * Copyright (C) 2017, 2019 Matt Schatz - * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2013, 2017-2018, 2020, 2022 Sadie Powell * Copyright (C) 2012-2013, 2016 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp index ff5097c40..f39e9db06 100644 --- a/src/modules/m_rmode.cpp +++ b/src/modules/m_rmode.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2019 Robby * Copyright (C) 2013-2014, 2016 Attila Molnar - * Copyright (C) 2013, 2017-2018 Sadie Powell + * Copyright (C) 2013, 2017-2018, 2022 Sadie Powell * Copyright (C) 2013 Daniel Vassdal * * This file is part of InspIRCd. InspIRCd is free software: you can diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 69d33e25c..05cc30c22 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -5,7 +5,7 @@ * Copyright (C) 2016 Adam * Copyright (C) 2014 Mantas Mikulėnas * Copyright (C) 2013-2016, 2018 Attila Molnar - * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2013, 2017-2020, 2022 Sadie Powell * Copyright (C) 2013 Daniel Vassdal * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp index 75417f12c..52fbfd6f4 100644 --- a/src/modules/m_servprotect.cpp +++ b/src/modules/m_servprotect.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013, 2017-2018, 2020-2021 Sadie Powell + * Copyright (C) 2013, 2017-2018, 2020-2022 Sadie Powell * Copyright (C) 2012-2016 Attila Molnar * Copyright (C) 2012 Robby * Copyright (C) 2009 Daniel De Graaf diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index d258987cd..8268f632c 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2019 Matt Schatz * Copyright (C) 2018 linuxdaemon * Copyright (C) 2017 B00mX0r - * Copyright (C) 2013, 2017-2018, 2020-2021 Sadie Powell + * Copyright (C) 2013, 2017-2018, 2020-2022 Sadie Powell * Copyright (C) 2012-2013, 2015-2016 Attila Molnar * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012 Jens Voss diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp index b14c9cb23..274fbd62f 100644 --- a/src/modules/m_spanningtree/addline.cpp +++ b/src/modules/m_spanningtree/addline.cpp @@ -2,9 +2,9 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 Matt Schatz - * Copyright (C) 2018 Sadie Powell + * Copyright (C) 2018, 2022 Sadie Powell * Copyright (C) 2013-2014 Attila Molnar - * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2012 Robby * Copyright (C) 2009 Uli Schlachter * Copyright (C) 2009 Daniel De Graaf * Copyright (C) 2008, 2010 Craig Edwards diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h index 9cb098373..b6edab158 100644 --- a/src/modules/m_spanningtree/commands.h +++ b/src/modules/m_spanningtree/commands.h @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2013, 2018-2019 Sadie Powell + * Copyright (C) 2013, 2018-2019, 2022 Sadie Powell * Copyright (C) 2012-2016 Attila Molnar * Copyright (C) 2012 Robby * Copyright (C) 2010 Daniel De Graaf diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 49f5dc920..9fd6226c3 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2021 Herman * Copyright (C) 2020 Matt Schatz * Copyright (C) 2019 linuxdaemon - * Copyright (C) 2013, 2017-2021 Sadie Powell + * Copyright (C) 2013, 2017-2022 Sadie Powell * Copyright (C) 2013, 2016 Adam * Copyright (C) 2012-2016, 2018 Attila Molnar * Copyright (C) 2012 Robby diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp index 584e779f5..52726ab4d 100644 --- a/src/modules/m_spanningtree/save.cpp +++ b/src/modules/m_spanningtree/save.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2018 Sadie Powell + * Copyright (C) 2018, 2022 Sadie Powell * Copyright (C) 2013-2015 Attila Molnar * Copyright (C) 2012 Robby * Copyright (C) 2010 Craig Edwards diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp index d0afe6c5d..684756084 100644 --- a/src/modules/m_spanningtree/treeserver.cpp +++ b/src/modules/m_spanningtree/treeserver.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2018-2020 Sadie Powell + * Copyright (C) 2018-2020, 2022 Sadie Powell * Copyright (C) 2017 B00mX0r * Copyright (C) 2013-2016 Attila Molnar * Copyright (C) 2012, 2019 Robby diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index 809418768..90921536e 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2019 linuxdaemon - * Copyright (C) 2013, 2018-2020 Sadie Powell + * Copyright (C) 2013, 2018-2020, 2022 Sadie Powell * Copyright (C) 2013 Adam * Copyright (C) 2012-2016, 2018 Attila Molnar * Copyright (C) 2012, 2019 Robby diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp index f8ba7f994..79afdff5b 100644 --- a/src/modules/m_spanningtree/uid.cpp +++ b/src/modules/m_spanningtree/uid.cpp @@ -1,7 +1,7 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2017-2019 Sadie Powell + * Copyright (C) 2017-2019, 2022 Sadie Powell * Copyright (C) 2013 Adam * Copyright (C) 2012-2016 Attila Molnar * Copyright (C) 2012 Robby diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index bc5ffea7a..005091aca 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2021 Molly Miller * Copyright (C) 2020 Matt Schatz * Copyright (C) 2019 linuxdaemon - * Copyright (C) 2013, 2017-2021 Sadie Powell + * Copyright (C) 2013, 2017-2022 Sadie Powell * Copyright (C) 2012-2016 Attila Molnar * Copyright (C) 2012 Robby * Copyright (C) 2010 Adam diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index 593d2dcae..d04281f26 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -2,9 +2,9 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2021 Herman - * Copyright (C) 2019-2020 Matt Schatz + * Copyright (C) 2019 Matt Schatz * Copyright (C) 2018 linuxdaemon - * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2013, 2017-2018, 2020, 2022 Sadie Powell * Copyright (C) 2012, 2019 Robby * Copyright (C) 2012, 2014, 2016 Attila Molnar * Copyright (C) 2009 Daniel De Graaf diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 6c442bba0..328b0184f 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -2,10 +2,10 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2020 iwalkalone - * Copyright (C) 2019 Matt Schatz * Copyright (C) 2018 linuxdaemon * Copyright (C) 2017 B00mX0r - * Copyright (C) 2013, 2017-2018, 2020-2021 Sadie Powell + * Copyright (C) 2016, 2019 Matt Schatz + * Copyright (C) 2013, 2017-2018, 2020-2022 Sadie Powell * Copyright (C) 2013 Daniel Vassdal * Copyright (C) 2012-2016 Attila Molnar * Copyright (C) 2012, 2019 Robby diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp index a03205013..fa8c7a617 100644 --- a/src/modules/m_uninvite.cpp +++ b/src/modules/m_uninvite.cpp @@ -2,7 +2,7 @@ * InspIRCd -- Internet Relay Chat Daemon * * Copyright (C) 2017 B00mX0r - * Copyright (C) 2013, 2018-2020 Sadie Powell + * Copyright (C) 2013, 2018-2020, 2022 Sadie Powell * Copyright (C) 2012-2016 Attila Molnar * Copyright (C) 2012 Robby * Copyright (C) 2009-2010 Daniel De Graaf diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp index 14e8f9385..9f868dba3 100644 --- a/src/socketengines/socketengine_poll.cpp +++ b/src/socketengines/socketengine_poll.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2014-2015 Attila Molnar * Copyright (C) 2014, 2017 Adam - * Copyright (C) 2013, 2016-2017 Sadie Powell + * Copyright (C) 2013, 2016-2017, 2022 Sadie Powell * Copyright (C) 2012 Robby * Copyright (C) 2009-2010 Daniel De Graaf * Copyright (C) 2009 Uli Schlachter diff --git a/src/users.cpp b/src/users.cpp index f45217410..737995f46 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2019 linuxdaemon * Copyright (C) 2018 systocrat * Copyright (C) 2018 Dylan Frank - * Copyright (C) 2013, 2016-2021 Sadie Powell + * Copyright (C) 2013, 2016-2022 Sadie Powell * Copyright (C) 2013 Daniel Vassdal * Copyright (C) 2013 ChrisTX * Copyright (C) 2013 Adam diff --git a/src/xline.cpp b/src/xline.cpp index e01ef65b1..4de33f768 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2021 Herman * Copyright (C) 2019 Matt Schatz - * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2013, 2017-2020, 2022 Sadie Powell * Copyright (C) 2013 Adam * Copyright (C) 2012-2014, 2016 Attila Molnar * Copyright (C) 2012, 2019 Robby diff --git a/tools/mkauthors b/tools/mkauthors index 58bc436a9..8cefc31d8 100755 --- a/tools/mkauthors +++ b/tools/mkauthors @@ -2,7 +2,7 @@ # # InspIRCd -- Internet Relay Chat Daemon # -# Copyright (C) 2021 Sadie Powell +# Copyright (C) 2021-2022 Sadie Powell # # This file is part of InspIRCd. InspIRCd is free software: you can # redistribute it and/or modify it under the terms of the GNU General Public diff --git a/tools/mkheaders b/tools/mkheaders index dfeb7fdfa..4d1419d8f 100755 --- a/tools/mkheaders +++ b/tools/mkheaders @@ -2,7 +2,7 @@ # # InspIRCd -- Internet Relay Chat Daemon # -# Copyright (C) 2020-2021 Sadie Powell +# Copyright (C) 2020-2022 Sadie Powell # # This file is part of InspIRCd. InspIRCd is free software: you can # redistribute it and/or modify it under the terms of the GNU General Public diff --git a/tools/test-build b/tools/test-build index 35491d27a..44452f8e6 100755 --- a/tools/test-build +++ b/tools/test-build @@ -2,7 +2,7 @@ # # InspIRCd -- Internet Relay Chat Daemon # -# Copyright (C) 2013-2016, 2019-2021 Sadie Powell +# Copyright (C) 2013-2016, 2019-2022 Sadie Powell # # This file is part of InspIRCd. InspIRCd is free software: you can # redistribute it and/or modify it under the terms of the GNU General Public From b36bfce84f7e2c15850ab220407f5bf8ab7ad3ff Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 28 Apr 2022 18:50:30 +0100 Subject: [PATCH 10/10] Release v3.13.0. --- include/moduledefs.h | 2 +- src/version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/moduledefs.h b/include/moduledefs.h index c16c11583..003740994 100644 --- a/include/moduledefs.h +++ b/include/moduledefs.h @@ -22,7 +22,7 @@ class Module; /** The version of the InspIRCd ABI which is presently in use. */ -#define MODULE_ABI 3018UL +#define MODULE_ABI 3019UL /** Stringifies the value of a symbol. */ #define MODULE_STRINGIFY_SYM1(DEF) MODULE_STRINGIFY_SYM2(DEF) diff --git a/src/version.sh b/src/version.sh index a089e703b..4eab03551 100755 --- a/src/version.sh +++ b/src/version.sh @@ -1,2 +1,2 @@ #!/bin/sh -echo "InspIRCd-3.12.0" +echo "InspIRCd-3.13.0"