From b154591a5825980a7b47710abd98f682c13ebcb9 Mon Sep 17 00:00:00 2001
From: Bram Matthys <syzop@vulnscan.org>
Date: Wed, 11 May 2022 06:38:33 +0200
Subject: [PATCH] Some source files indicated the license was "GPLv2", which
 was meant to be (and is now clarified to be) "GPLv2 or later". Reported by
 libsys in https://bugs.unrealircd.org/view.php?id=6099

---
 src/conf_preprocessor.c            | 2 +-
 src/crashreport.c                  | 2 +-
 src/ircd_vars.c                    | 2 +-
 src/modulemanager.c                | 2 +-
 src/modules/certfp.c               | 2 +-
 src/modules/chanmodes/history.c    | 2 +-
 src/modules/channeldb.c            | 2 +-
 src/modules/chathistory.c          | 2 +-
 src/modules/connthrottle.c         | 2 +-
 src/modules/extbans/timedban.c     | 2 +-
 src/modules/geoip_base.c           | 2 +-
 src/modules/geoip_classic.c        | 2 +-
 src/modules/geoip_maxmind.c        | 2 +-
 src/modules/history_backend_mem.c  | 2 +-
 src/modules/history_backend_null.c | 2 +-
 src/modules/ident_lookup.c         | 2 +-
 src/modules/operinfo.c             | 2 +-
 src/modules/reputation.c           | 2 +-
 src/modules/sinfo.c                | 2 +-
 src/modules/svso.c                 | 2 +-
 src/modules/targetfloodprot.c      | 2 +-
 src/modules/tls_antidos.c          | 2 +-
 src/modules/tls_cipher.c           | 2 +-
 src/modules/unreal_server_compat.c | 2 +-
 src/modules/websocket.c            | 2 +-
 src/modules/whox.c                 | 2 +-
 src/operclass.c                    | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/conf_preprocessor.c b/src/conf_preprocessor.c
index 9be3338d3..c3cac00af 100644
--- a/src/conf_preprocessor.c
+++ b/src/conf_preprocessor.c
@@ -1,6 +1,6 @@
 /* UnrealIRCd configuration preprocessor
  * (C) Copyright 2019 Bram Matthys ("Syzop") and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  *
  * Technically this isn't a 100% true preprocessor, but to the end user
  * it will certainly look like it, hence the name.
diff --git a/src/crashreport.c b/src/crashreport.c
index f3ac0f5fb..3992ff188 100644
--- a/src/crashreport.c
+++ b/src/crashreport.c
@@ -1,6 +1,6 @@
 /* UnrealIRCd crash reporter code.
  * (C) Copyright 2015-2019 Bram Matthys ("Syzop") and the UnrealIRCd Team.
- * License: GPLv2
+ * License: GPLv2 or later
  */
 
 #include "unrealircd.h"
diff --git a/src/ircd_vars.c b/src/ircd_vars.c
index 6dec95055..d54b71361 100644
--- a/src/ircd_vars.c
+++ b/src/ircd_vars.c
@@ -1,7 +1,7 @@
 /************************************************************************
  * UnrealIRCd - Unreal Internet Relay Chat Daemon - src/ircd_vars.c
  * (c) 2021- Bram Matthys and The UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  */
 #include "unrealircd.h"
 
diff --git a/src/modulemanager.c b/src/modulemanager.c
index 47b91f3f2..0ceac998e 100644
--- a/src/modulemanager.c
+++ b/src/modulemanager.c
@@ -1,6 +1,6 @@
 /* UnrealIRCd module manager.
  * (C) Copyright 2019 Bram Matthys ("Syzop") and the UnrealIRCd Team.
- * License: GPLv2
+ * License: GPLv2 or later
  * See https://www.unrealircd.org/docs/Module_manager for user documentation.
  */
 
diff --git a/src/modules/certfp.c b/src/modules/certfp.c
index c389b9e45..d7076a90e 100644
--- a/src/modules/certfp.c
+++ b/src/modules/certfp.c
@@ -6,7 +6,7 @@
  *
  * (C) Copyright 2014-2015 The UnrealIRCd team (Syzop, DBoyz, Nath and others)
  * 
- * License: GPLv2
+ * License: GPLv2 or later
  */
 
 #include "unrealircd.h"
diff --git a/src/modules/chanmodes/history.c b/src/modules/chanmodes/history.c
index 9cdc73eeb..dd829e0e0 100644
--- a/src/modules/chanmodes/history.c
+++ b/src/modules/chanmodes/history.c
@@ -1,7 +1,7 @@
 /*
  * modules/chanmodes/history - Channel History
  * (C) Copyright 2009-2019 Bram Matthys (Syzop) and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  */
 #include "unrealircd.h"
 
diff --git a/src/modules/channeldb.c b/src/modules/channeldb.c
index 4a7ad3105..08d472539 100644
--- a/src/modules/channeldb.c
+++ b/src/modules/channeldb.c
@@ -1,7 +1,7 @@
 /*
  * Stores channel settings for +P channels in a .db file
  * (C) Copyright 2019 Syzop, Gottem and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  */
 
 #include "unrealircd.h"
diff --git a/src/modules/chathistory.c b/src/modules/chathistory.c
index d13c32d3f..9c75ff6e5 100644
--- a/src/modules/chathistory.c
+++ b/src/modules/chathistory.c
@@ -1,6 +1,6 @@
 /* src/modules/chathistory.c - IRCv3 CHATHISTORY command.
  * (C) Copyright 2021 Bram Matthys (Syzop) and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  *
  * This implements the "CHATHISTORY" command, the CAP and 005 token.
  * https://ircv3.net/specs/extensions/chathistory
diff --git a/src/modules/connthrottle.c b/src/modules/connthrottle.c
index 5b35e2a18..a229e1cf4 100644
--- a/src/modules/connthrottle.c
+++ b/src/modules/connthrottle.c
@@ -1,7 +1,7 @@
 /*
  * connthrottle - Connection throttler
  * (C) Copyright 2004-2020 Bram Matthys (Syzop) and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  * See https://www.unrealircd.org/docs/Connthrottle
  */
 
diff --git a/src/modules/extbans/timedban.c b/src/modules/extbans/timedban.c
index af20c524b..a04103773 100644
--- a/src/modules/extbans/timedban.c
+++ b/src/modules/extbans/timedban.c
@@ -1,7 +1,7 @@
 /*
  * timedban - Timed bans that are automatically unset.
  * (C) Copyright 2009-2017 Bram Matthys (Syzop) and the UnrealIRCd team.
- * License: GPLv2
+ * License: GPLv2 or later
  *
  * This module adds an extended ban ~t:time:mask
  * Where 'time' is the time in minutes after which the ban will be removed.
diff --git a/src/modules/geoip_base.c b/src/modules/geoip_base.c
index 1cf2ea190..7b65418bc 100644
--- a/src/modules/geoip_base.c
+++ b/src/modules/geoip_base.c
@@ -2,7 +2,7 @@
  * GEOIP Base module, needed for all geoip functions
  * as this stores the geo information in ModData.
  * (C) Copyright 2021-.. Syzop and The UnrealIRCd Team
- * License: GPLv2
+ * License: GPLv2 or later
  */
 
 #include "unrealircd.h"
diff --git a/src/modules/geoip_classic.c b/src/modules/geoip_classic.c
index c7299fc6b..7476669e8 100644
--- a/src/modules/geoip_classic.c
+++ b/src/modules/geoip_classic.c
@@ -1,6 +1,6 @@
 /* GEOIP Classic module
  * (C) Copyright 2021 Bram Matthys and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  */
 
 #include "unrealircd.h"
diff --git a/src/modules/geoip_maxmind.c b/src/modules/geoip_maxmind.c
index 06581f3c0..61e9e3235 100644
--- a/src/modules/geoip_maxmind.c
+++ b/src/modules/geoip_maxmind.c
@@ -1,6 +1,6 @@
 /* GEOIP maxmind module
  * (C) Copyright 2021 Bram Matthys and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  */
 
 #include "unrealircd.h"
diff --git a/src/modules/history_backend_mem.c b/src/modules/history_backend_mem.c
index 9fd511758..a288c5609 100644
--- a/src/modules/history_backend_mem.c
+++ b/src/modules/history_backend_mem.c
@@ -1,6 +1,6 @@
 /* src/modules/history_backend_mem.c - History Backend: memory
  * (C) Copyright 2019-2021 Bram Matthys (Syzop) and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  */
 #include "unrealircd.h"
 
diff --git a/src/modules/history_backend_null.c b/src/modules/history_backend_null.c
index 7136ce260..e5fd55342 100644
--- a/src/modules/history_backend_null.c
+++ b/src/modules/history_backend_null.c
@@ -1,6 +1,6 @@
 /* src/modules/history_backend_null.c - History Backend: null / none
  * (C) Copyright 2019 Bram Matthys (Syzop) and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  */
 #include "unrealircd.h"
 
diff --git a/src/modules/ident_lookup.c b/src/modules/ident_lookup.c
index c729bcc74..9fbe9c15b 100644
--- a/src/modules/ident_lookup.c
+++ b/src/modules/ident_lookup.c
@@ -1,6 +1,6 @@
 /* src/modules/ident_lookup.c - Ident lookups (RFC1413)
  * (C) Copyright 2019 Bram Matthys (Syzop) and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  */
 #include "unrealircd.h"
 
diff --git a/src/modules/operinfo.c b/src/modules/operinfo.c
index 8d4a2c6d6..0b0167694 100644
--- a/src/modules/operinfo.c
+++ b/src/modules/operinfo.c
@@ -1,7 +1,7 @@
 /*
  * Store oper login in ModData, used by WHOIS and for auditting purposes.
  * (C) Copyright 2021-.. Syzop and The UnrealIRCd Team
- * License: GPLv2
+ * License: GPLv2 or later
  */
 
 #include "unrealircd.h"
diff --git a/src/modules/reputation.c b/src/modules/reputation.c
index 7757eec23..b509d2a9a 100644
--- a/src/modules/reputation.c
+++ b/src/modules/reputation.c
@@ -1,7 +1,7 @@
 /*
  * reputation - Provides a scoring system for "known users".
  * (C) Copyright 2015-2019 Bram Matthys (Syzop) and the UnrealIRCd team.
- * License: GPLv2
+ * License: GPLv2 or later
  *
  * How this works is simple:
  * Every 5 minutes the IP address of all the connected users receive
diff --git a/src/modules/sinfo.c b/src/modules/sinfo.c
index d297001c3..5af22f0f5 100644
--- a/src/modules/sinfo.c
+++ b/src/modules/sinfo.c
@@ -1,7 +1,7 @@
 /*
  * cmd_sinfo - Server information
  * (C) Copyright 2019 Bram Matthys (Syzop) and the UnrealIRCd team.
- * License: GPLv2
+ * License: GPLv2 or later
  */
 
 #include "unrealircd.h"
diff --git a/src/modules/svso.c b/src/modules/svso.c
index 316711dd3..2eebb8b93 100644
--- a/src/modules/svso.c
+++ b/src/modules/svso.c
@@ -1,6 +1,6 @@
 /* src/modules/svso.c - Grant IRCOp rights (for Services)
  * (C) Copyright 2022 Bram Matthys (Syzop) and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  */
 #include "unrealircd.h"
 
diff --git a/src/modules/targetfloodprot.c b/src/modules/targetfloodprot.c
index 5d7d6ac2e..c76f0c727 100644
--- a/src/modules/targetfloodprot.c
+++ b/src/modules/targetfloodprot.c
@@ -1,6 +1,6 @@
 /* Target flood protection
  * (C)Copyright 2020 Bram Matthys and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  */
    
 #include "unrealircd.h"
diff --git a/src/modules/tls_antidos.c b/src/modules/tls_antidos.c
index b3f6d9124..65d70ab43 100644
--- a/src/modules/tls_antidos.c
+++ b/src/modules/tls_antidos.c
@@ -5,7 +5,7 @@
  *
  * (C) Copyright 2015- Bram Matthys and the UnrealIRCd team.
  * 
- * License: GPLv2
+ * License: GPLv2 or later
  */
 
 #include "unrealircd.h"
diff --git a/src/modules/tls_cipher.c b/src/modules/tls_cipher.c
index a7e84be0d..6e1c0b763 100644
--- a/src/modules/tls_cipher.c
+++ b/src/modules/tls_cipher.c
@@ -1,7 +1,7 @@
 /*
  * Store TLS cipher in ModData
  * (C) Copyright 2021-.. Syzop and The UnrealIRCd Team
- * License: GPLv2
+ * License: GPLv2 or later
  */
 
 #include "unrealircd.h"
diff --git a/src/modules/unreal_server_compat.c b/src/modules/unreal_server_compat.c
index b768761df..70d5f0439 100644
--- a/src/modules/unreal_server_compat.c
+++ b/src/modules/unreal_server_compat.c
@@ -1,7 +1,7 @@
 /*
  * unreal_server_compat - Compatibility with pre-U6 servers
  * (C) Copyright 2016-2021 Bram Matthys (Syzop)
- * License: GPLv2
+ * License: GPLv2 or later
  *
  * Currently the only purpose of this module is to rewrite MODE
  * and SJOIN lines to older servers so any bans/exempts/invex
diff --git a/src/modules/websocket.c b/src/modules/websocket.c
index 111b0e48e..fd9148e54 100644
--- a/src/modules/websocket.c
+++ b/src/modules/websocket.c
@@ -1,7 +1,7 @@
 /*
  * websocket - WebSocket support (RFC6455)
  * (C)Copyright 2016 Bram Matthys and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  * This module was sponsored by Aberrant Software Inc.
  */
    
diff --git a/src/modules/whox.c b/src/modules/whox.c
index 67ab533fc..596a278b2 100644
--- a/src/modules/whox.c
+++ b/src/modules/whox.c
@@ -3,7 +3,7 @@
  * was originally made for tircd and modified to work with u4.
  * - 2018 i <ircd@servx.org>
  * - 2019 Bram Matthys (Syzop) <syzop@vulnscan.org>
- * License: GPLv2
+ * License: GPLv2 or later
  */
 
 #include "unrealircd.h"
diff --git a/src/operclass.c b/src/operclass.c
index 028a1411d..9551eb036 100644
--- a/src/operclass.c
+++ b/src/operclass.c
@@ -1,6 +1,6 @@
 /** Oper classes code.
  * (C) Copyright 2015-present tmcarthur and the UnrealIRCd team
- * License: GPLv2
+ * License: GPLv2 or later
  */
 
 #include "unrealircd.h"