Merge branch 'insp4' into master.

12 files changed, 11 insertions, 15 deletions

diff --git a/.github/workflows/ci-alpine.yml b/.github/workflows/ci-alpine.yml
index a23e40898..efbfd8892 100644
--- a/.github/workflows/ci-alpine.yml
+++ b/.github/workflows/ci-alpine.yml
@@ -41,7 +41,7 @@ jobs:
 
       - name: Run configure
         run: |
-          ./configure --enable-extras "argon2 geo_maxmind ldap log_json log_syslog mysql pgsql regex_pcre regex_posix regex_re2 sqlite3 ssl_gnutls ssl_openssl sslrehashsignal"
+          ./configure --enable-extras "argon2 geo_maxmind ldap log_json log_syslog mysql pgsql regex_pcre2 regex_posix regex_re2 sqlite3 ssl_gnutls ssl_openssl sslrehashsignal"
           ./configure --development --disable-auto-extras --disable-ownership --socketengine ${{ matrix.socketengine }}
 
       - name: Build core
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index 191c207b3..f1f3caa55 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Run configure
         run: |
-          ./configure --enable-extras "argon2 geo_maxmind ldap log_json log_syslog mysql pgsql regex_pcre regex_posix regex_re2 sqlite3 ssl_gnutls ssl_openssl sslrehashsignal"
+          ./configure --enable-extras "argon2 geo_maxmind ldap log_json log_syslog mysql pgsql regex_pcre2 regex_posix regex_re2 sqlite3 ssl_gnutls ssl_openssl sslrehashsignal"
           ./configure --development --disable-auto-extras --socketengine ${{ matrix.socketengine }}
 
       - name: Build core
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index db57872c9..b2fb906af 100644
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Run configure
         run: |
-          ./configure --enable-extras "argon2 geo_maxmind ldap log_json log_syslog mysql pgsql regex_pcre regex_posix regex_re2 sqlite3 ssl_gnutls ssl_openssl sslrehashsignal"
+          ./configure --enable-extras "argon2 geo_maxmind ldap log_json log_syslog mysql pgsql regex_pcre2 regex_posix regex_re2 sqlite3 ssl_gnutls ssl_openssl sslrehashsignal"
           ./configure --development --disable-auto-extras --socketengine ${{ matrix.socketengine }}
 
       - name: Build core
diff --git a/.gitignore b/.gitignore
index a5ae7893e..c636cfc23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@
 /src/modules/m_log_syslog.cpp
 /src/modules/m_mysql.cpp
 /src/modules/m_pgsql.cpp
-/src/modules/m_regex_pcre.cpp
+/src/modules/m_regex_pcre2.cpp
 /src/modules/m_regex_posix.cpp
 /src/modules/m_regex_re2.cpp
 /src/modules/m_sqlite3.cpp
diff --git a/configure b/configure
index 6a1c0ded9..1f52339ba 100755
--- a/configure
+++ b/configure
@@ -394,7 +394,7 @@ if (prompt_bool $interactive, $question, 0) {
 		'm_ldap.cpp'            => "echo '#include <ldap.h>' | $config{CXX} -E -",
 		'm_log_json.cpp'        => 'pkg-config --exists RapidJSON',
 		'm_log_syslog.cpp'      => undef,
-		'm_regex_pcre.cpp'      => 'pkg-config --exists libpcre2-8',
+		'm_regex_pcre2.cpp'     => 'pkg-config --exists libpcre2-8',
 		'm_regex_posix.cpp'     => undef,
 		'm_regex_re2.cpp'       => 'pkg-config --exists re2',
 		'm_sqlite3.cpp'         => 'pkg-config --exists sqlite3',
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 7e6d7ee0d..886560b43 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -989,7 +989,7 @@
 # Valid engines are:                                                  #
 #                                                                     #
 # glob   - Glob patterns, provided via regex_glob.                    #
-# pcre   - PCRE regexps, provided via regex_pcre, needs libpcre2.     #
+# pcre   - PCRE regexps, provided via regex_pcre2, needs libpcre2.    #
 # posix  - POSIX regexps, provided via regex_posix, not available     #
 #          on Windows, no dependencies on other operating systems.    #
 # stdregex - stdlib regexps, provided via regex_stdlib, see comment   #
@@ -1943,7 +1943,7 @@
 # Expressions). You need libpcre2 installed to compile and load this
 # module. You must have at least 1 provider loaded to use the filter or
 # R-line modules.
-#<module name="regex_pcre">
+#<module name="regex_pcre2">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Regular Expression Provider for RE2 Regular Expressions.
diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf.example
index 1a53dcfdd..b1406e431 100644
--- a/docs/conf/services/anope.conf.example
+++ b/docs/conf/services/anope.conf.example
@@ -3,7 +3,3 @@
 
 # This file inherits from the generic config to avoid repetition.
 <include file="examples/services/generic.conf.example">
-
-# /GLOBAL <message>
-# Sends a global notice.
-<alias text="GLOBAL" format="*" replace="SQUERY $requirement :GLOBAL $2-" requires="Global" service="yes" operonly="yes">
diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf.example
index 9896eb566..c2e569a48 100644
--- a/docs/conf/services/atheme.conf.example
+++ b/docs/conf/services/atheme.conf.example
@@ -9,7 +9,6 @@
 <alias text="ALIS"      replace="SQUERY $requirement :$2-" requires="ALIS"      service="yes">
 <alias text="CHANFIX"   replace="SQUERY $requirement :$2-" requires="ChanFix"   service="yes">
 <alias text="GAMESERV"  replace="SQUERY $requirement :$2-" requires="GameServ"  service="yes">
-<alias text="GLOBAL"    replace="SQUERY $requirement :$2-" requires="Global"    service="yes" operonly="yes">
 <alias text="GROUPSERV" replace="SQUERY $requirement :$2-" requires="GroupServ" service="yes">
 <alias text="HELPSERV"  replace="SQUERY $requirement :$2-" requires="HelpServ"  service="yes">
 <alias text="INFOSERV"  replace="SQUERY $requirement :$2-" requires="InfoServ"  service="yes">
@@ -18,7 +17,6 @@
 
 # Short hand aliases for services pseudoclients.
 <alias text="CF" replace="SQUERY $requirement :$2-" requires="ChanFix"   service="yes">
-<alias text="GL" replace="SQUERY $requirement :$2-" requires="Global"    service="yes" operonly="yes">
 <alias text="GS" replace="SQUERY $requirement :$2-" requires="GroupServ" service="yes">
 <alias text="IS" replace="SQUERY $requirement :$2-" requires="InfoServ"  service="yes">
 <alias text="LS" replace="SQUERY $requirement :$2-" requires="ALIS"      service="yes">
diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf.example
index 5db7196db..7adf5d5be 100644
--- a/docs/conf/services/generic.conf.example
+++ b/docs/conf/services/generic.conf.example
@@ -6,6 +6,7 @@
 # Long hand aliases for services pseudoclients.
 <alias text="BOTSERV"  replace="SQUERY $requirement :$2-" requires="BotServ"  service="yes">
 <alias text="CHANSERV" replace="SQUERY $requirement :$2-" requires="ChanServ" service="yes">
+<alias text="GLOBAL"   replace="SQUERY $requirement :$2-" requires="Global"   service="yes" operonly="yes">
 <alias text="HOSTSERV" replace="SQUERY $requirement :$2-" requires="HostServ" service="yes">
 <alias text="MEMOSERV" replace="SQUERY $requirement :$2-" requires="MemoServ" service="yes">
 <alias text="NICKSERV" replace="SQUERY $requirement :$2-" requires="NickServ" service="yes">
@@ -15,6 +16,7 @@
 # Short hand aliases for services pseudoclients.
 <alias text="BS" replace="SQUERY $requirement :$2-" requires="BotServ"  service="yes">
 <alias text="CS" replace="SQUERY $requirement :$2-" requires="ChanServ" service="yes">
+<alias text="GL" replace="SQUERY $requirement :$2-" requires="Global"   service="yes" operonly="yes">
 <alias text="HS" replace="SQUERY $requirement :$2-" requires="HostServ" service="yes">
 <alias text="MS" replace="SQUERY $requirement :$2-" requires="MemoServ" service="yes">
 <alias text="NS" replace="SQUERY $requirement :$2-" requires="NickServ" service="yes">
diff --git a/src/modules/extra/README b/src/modules/extra/README
index 7e3c3e99c..5cdb675d7 100644
--- a/src/modules/extra/README
+++ b/src/modules/extra/README
@@ -1,5 +1,5 @@
 This directory stores modules which require external libraries to compile.
-For example, m_regex_pcre requires the PCRE2 library.
+For example, m_regex_pcre2 requires the PCRE2 library.
 
 To compile any of these modules first ensure you have the required dependencies
 (read the online documentation at https://docs.inspircd.org) and then symlink
diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre2.cpp
index 35bc39b0f..35bc39b0f 100644
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre2.cpp
diff --git a/win/modules/CMakeLists.txt b/win/modules/CMakeLists.txt
index 100bfcffb..dfa6c583d 100644
--- a/win/modules/CMakeLists.txt
+++ b/win/modules/CMakeLists.txt
@@ -46,7 +46,7 @@ if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
 	enable_extra("log_json" "RAPIDJSON")
 	enable_extra("mysql" "LIBMYSQLCLIENT")
 	enable_extra("pgsql" "LIBPQ")
-	enable_extra("regex_pcre" "PCRE2")
+	enable_extra("regex_pcre2" "PCRE2")
 	enable_extra("regex_posix" "PCRE2")
 	enable_extra("regex_re2" "RE2")
 	enable_extra("ssl_openssl" "OPENSSL")