ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'insp4' into master.

Browse Source
This commit is contained in:
Sadie Powell 2024-06-17 15:43:59 +01:00
commit 4ee868d860
11 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/SECURITY.md vendored
View File

@ -2,13 +2,14 @@
## Supported Versions ## Supported Versions
Currently the v3 (stable) branch is actively receiving security fixes. Support for v2 ended at the end of 2020. Currently the v3 (old stable) and v4 (stable) branches are actively receiving security fixes. Support for v3 will end at the end of 2025.
The v4 branch is still early in development and only receives security fixes when they are synced from the v3 branch. The v5 branch is still early in development and only receives security fixes when they are synced from the v3 and v4 branches.
Version | Supported Version | Supported
------- | --------- ------- | ---------
4.x.y | :warning: 5.x.y | :warning:
4.x.y | :white_check_mark:
3.x.y | :white_check_mark: 3.x.y | :white_check_mark:
2.0.x | :x: 2.0.x | :x:
1.2.y | :x: 1.2.y | :x:

2
configure vendored
View File

@ -4,7 +4,7 @@
# #
# Copyright (C) 2020 Daniel Vassdal <shutter@canternet.org> # Copyright (C) 2020 Daniel Vassdal <shutter@canternet.org>
# Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions> # Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
# Copyright (C) 2013-2022 Sadie Powell <sadie@witchery.services> # Copyright (C) 2013-2022, 2024 Sadie Powell <sadie@witchery.services>
# Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be> # Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
# Copyright (C) 2012 ChrisTX <xpipe@hotmail.de> # Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
# Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org> # Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>

2
docs/AUTHORS.txt
View File

@ -34,8 +34,8 @@ the number of contributions they have made, are:
* Justin Crawford <Justasic@Gmail.com> * Justin Crawford <Justasic@Gmail.com>
* iwalkalone <iwalkalone69@gmail.com> * iwalkalone <iwalkalone69@gmail.com>
* katsklaw * katsklaw
* Dylan Frank <b00mx0r@aureus.pw>
* Val Lorentz <progval+git@progval.net> * Val Lorentz <progval+git@progval.net>
* Dylan Frank <b00mx0r@aureus.pw>
* Wade Cline <wadecline@hotmail.com> * Wade Cline <wadecline@hotmail.com>
* satmd <satmd@satmd.de> * satmd <satmd@satmd.de>
* Steven Van Acker <steven@singularity.be> * Steven Van Acker <steven@singularity.be>

2
include/modules/extban.h
View File

@ -1,7 +1,7 @@
/* /*
* InspIRCd -- Internet Relay Chat Daemon * InspIRCd -- Internet Relay Chat Daemon
* *
* Copyright (C) 2020-2023 Sadie Powell <sadie@witchery.services> * Copyright (C) 2020-2024 Sadie Powell <sadie@witchery.services>
* *
* This file is part of InspIRCd. InspIRCd is free software: you can * 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 * redistribute it and/or modify it under the terms of the GNU General Public

2
make/template/inspircd
View File

@ -6,7 +6,7 @@
# Copyright (C) 2015 Steven Van Acker <steven@singularity.be> # Copyright (C) 2015 Steven Van Acker <steven@singularity.be>
# Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com> # Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com>
# Copyright (C) 2014 Dan Parsons <dparsons@nyip.net> # Copyright (C) 2014 Dan Parsons <dparsons@nyip.net>
# Copyright (C) 2013-2014, 2016-2017, 2019-2021, 2023 Sadie Powell <sadie@witchery.services> # Copyright (C) 2013-2014, 2016-2017, 2019-2021, 2023-2024 Sadie Powell <sadie@witchery.services>
# Copyright (C) 2012 Robby <robby@chatbelgie.be> # Copyright (C) 2012 Robby <robby@chatbelgie.be>
# Copyright (C) 2011 DjSlash <djslash@djslash.org> # Copyright (C) 2011 DjSlash <djslash@djslash.org>
# Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org> # Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>

2
make/template/inspircd.1
View File

@ -1,7 +1,7 @@
.\" .\"
.\" InspIRCd -- Internet Relay Chat Daemon .\" InspIRCd -- Internet Relay Chat Daemon
.\" .\"
.\" Copyright (C) 2014, 2018, 2023 Sadie Powell <sadie@witchery.services> .\" Copyright (C) 2014, 2018, 2024 Sadie Powell <sadie@witchery.services>
.\" .\"
.\" This file is part of InspIRCd. InspIRCd is free software: you can .\" 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 .\" redistribute it and/or modify it under the terms of the GNU General Public

2
src/modules/m_spanningtree/override_map.cpp
View File

@ -2,7 +2,7 @@
* InspIRCd -- Internet Relay Chat Daemon * InspIRCd -- Internet Relay Chat Daemon
* *
* Copyright (C) 2021 Dominic Hamon * Copyright (C) 2021 Dominic Hamon
* Copyright (C) 2018-2023 Sadie Powell <sadie@witchery.services> * Copyright (C) 2018-2024 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw> * Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
* Copyright (C) 2014 Adam <Adam@anope.org> * Copyright (C) 2014 Adam <Adam@anope.org>
* Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com> * Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>

1
tools/convert-unreal-channel
View File

@ -2,6 +2,7 @@
# #
# InspIRCd -- Internet Relay Chat Daemon # InspIRCd -- Internet Relay Chat Daemon
# #
# Copyright (C) 2024 Val Lorentz <progval+git@progval.net>
# Copyright (C) 2024 Sadie Powell <sadie@witchery.services> # Copyright (C) 2024 Sadie Powell <sadie@witchery.services>
# #
# This file is part of InspIRCd. InspIRCd is free software: you can # This file is part of InspIRCd. InspIRCd is free software: you can

1
tools/convert-unreal-tkl
View File

@ -2,6 +2,7 @@
# #
# InspIRCd -- Internet Relay Chat Daemon # InspIRCd -- Internet Relay Chat Daemon
# #
# Copyright (C) 2024 Val Lorentz <progval+git@progval.net>
# Copyright (C) 2024 Sadie Powell <sadie@witchery.services> # Copyright (C) 2024 Sadie Powell <sadie@witchery.services>
# #
# This file is part of InspIRCd. InspIRCd is free software: you can # This file is part of InspIRCd. InspIRCd is free software: you can

2
win/modules/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# #
# InspIRCd -- Internet Relay Chat Daemon # InspIRCd -- Internet Relay Chat Daemon
# #
# Copyright (C) 2021-2023 Sadie Powell <sadie@witchery.services> # Copyright (C) 2021-2024 Sadie Powell <sadie@witchery.services>
# Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com> # Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
# Copyright (C) 2013 Adam <Adam@anope.org> # Copyright (C) 2013 Adam <Adam@anope.org>
# #

2
win/win32service.cpp
View File

@ -1,7 +1,7 @@
/* /*
* InspIRCd -- Internet Relay Chat Daemon * InspIRCd -- Internet Relay Chat Daemon
* *
* Copyright (C) 2022-2023 Sadie Powell <sadie@witchery.services> * Copyright (C) 2022-2024 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2021 Herman <GermanAizek@yandex.ru> * Copyright (C) 2021 Herman <GermanAizek@yandex.ru>
* Copyright (C) 2012-2013 ChrisTX <xpipe@hotmail.de> * Copyright (C) 2012-2013 ChrisTX <xpipe@hotmail.de>
* Copyright (C) 2012 Robby <robby@chatbelgie.be> * Copyright (C) 2012 Robby <robby@chatbelgie.be>