Merge branch 'insp3' into master.

9 files changed, 16 insertions, 9 deletions

diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp
index ffeeab049..5c6d003f2 100644
--- a/src/modules/extra/m_ldap.cpp
+++ b/src/modules/extra/m_ldap.cpp
@@ -26,6 +26,7 @@
 /// $PackageInfo: require_system("arch") libldap
 /// $PackageInfo: require_system("centos") openldap-devel
 /// $PackageInfo: require_system("debian") libldap2-dev
+/// $PackageInfo: require_system("rocky") openldap-devel
 /// $PackageInfo: require_system("ubuntu") libldap2-dev
 
 
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index b2715dba8..f64807d6d 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -31,10 +31,10 @@
 /// $LinkerFlags: execute("mysql_config --libs_r" "MYSQL_LDFLAGS" "-lmysqlclient")
 
 /// $PackageInfo: require_system("arch") mariadb-libs
-/// $PackageInfo: require_system("centos" "6.0" "6.99") mysql-devel
-/// $PackageInfo: require_system("centos" "7.0") mariadb-devel
-/// $PackageInfo: require_system("darwin") mysql-connector-c
+/// $PackageInfo: require_system("centos") mysql-devel
+/// $PackageInfo: require_system("darwin") mysql-client
 /// $PackageInfo: require_system("debian") libmysqlclient-dev
+/// $PackageInfo: require_system("rocky") mysql-devel
 /// $PackageInfo: require_system("ubuntu") libmysqlclient-dev
 
 
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 71c4299de..645528395 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -31,8 +31,9 @@
 
 /// $PackageInfo: require_system("arch") postgresql-libs
 /// $PackageInfo: require_system("centos") postgresql-devel
-/// $PackageInfo: require_system("darwin") postgresql
+/// $PackageInfo: require_system("darwin") libpq
 /// $PackageInfo: require_system("debian") libpq-dev
+/// $PackageInfo: require_system("rocky") postgresql-devel
 /// $PackageInfo: require_system("ubuntu") libpq-dev
 
 
diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp
index 8d528baaa..df30ed7c5 100644
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -23,6 +23,7 @@
 /// $PackageInfo: require_system("centos") pcre2-devel
 /// $PackageInfo: require_system("darwin") pcre2
 /// $PackageInfo: require_system("debian") libpcre2-dev
+/// $PackageInfo: require_system("rocky") pcre2-devel
 /// $PackageInfo: require_system("ubuntu") libpcre2-dev
 
 
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index bfcb80928..f26134df1 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -30,8 +30,9 @@
 
 /// $PackageInfo: require_system("arch") pkgconf sqlite
 /// $PackageInfo: require_system("centos") pkgconfig sqlite-devel
-/// $PackageInfo: require_system("darwin") pkg-config sqlite3
+/// $PackageInfo: require_system("darwin") pkg-config sqlite
 /// $PackageInfo: require_system("debian") libsqlite3-dev pkg-config
+/// $PackageInfo: require_system("rocky") pkgconfig sqlite-devel
 /// $PackageInfo: require_system("ubuntu") libsqlite3-dev pkg-config
 
 #include "inspircd.h"
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 3a1401636..4b26bbc03 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -36,6 +36,7 @@
 /// $PackageInfo: require_system("centos") gnutls-devel pkgconfig
 /// $PackageInfo: require_system("darwin") gnutls pkg-config
 /// $PackageInfo: require_system("debian") gnutls-bin libgnutls28-dev pkg-config
+/// $PackageInfo: require_system("rocky") gnutls-devel pkgconfig
 /// $PackageInfo: require_system("ubuntu") gnutls-bin libgnutls28-dev pkg-config
 
 #include "inspircd.h"
diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp
index 61625404f..daf0318b3 100644
--- a/src/modules/extra/m_ssl_mbedtls.cpp
+++ b/src/modules/extra/m_ssl_mbedtls.cpp
@@ -22,8 +22,8 @@
 
 /// $PackageInfo: require_system("arch") mbedtls
 /// $PackageInfo: require_system("darwin") mbedtls
-/// $PackageInfo: require_system("debian" "9.0") libmbedtls-dev
-/// $PackageInfo: require_system("ubuntu" "16.04") libmbedtls-dev
+/// $PackageInfo: require_system("debian") libmbedtls-dev
+/// $PackageInfo: require_system("ubuntu") libmbedtls-dev
 
 
 #include "inspircd.h"
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 64dbc8b64..bd23bb5ba 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -36,6 +36,7 @@
 /// $PackageInfo: require_system("centos") openssl-devel pkgconfig
 /// $PackageInfo: require_system("darwin") openssl@1.1 pkg-config
 /// $PackageInfo: require_system("debian") libssl-dev openssl pkg-config
+/// $PackageInfo: require_system("rocky") openssl-devel pkgconfig
 /// $PackageInfo: require_system("ubuntu") libssl-dev openssl pkg-config
 
 
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index d73801031..26feb2d8e 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -25,6 +25,7 @@
 
 #include "inspircd.h"
 #include "extension.h"
+#include "numerichelper.h"
 
 enum
 {
@@ -53,7 +54,7 @@ public:
 		auto* target = ServerInstance->Users.Find(parameters[0], true);
 		if (!target)
 		{
-			user->WriteNotice("*** No such nickname: '" + parameters[0] + "'");
+			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
 			return CmdResult::FAILURE;
 		}
 
@@ -113,7 +114,7 @@ public:
 
 		if (!target)
 		{
-			user->WriteNotice("*** No such nickname: '" + parameters[0] + "'");
+			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
 			return CmdResult::FAILURE;
 		}