summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap42
-rwxr-xr-xconfigure8
-rw-r--r--docs/conf/modules.conf.example4
3 files changed, 52 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..fa8fc8ee6
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,42 @@
+Adam <Adam@anope.org> Adam <adam@inspircd.org>
+Adam <Adam@anope.org> Adam <adam@sigterm.info>
+Attila Molnar <attilamolnar@hush.com> attilamolnar <am63770@gmail.com>
+Attila Molnar <attilamolnar@hush.com> attilamolnar <attilamolnar@hush.com>
+blitmap <blitternet@gmail.com> Pogs McPoggerson <sir.pogsalot@gmail.com>
+blitmap <blitternet@gmail.com> Sir Poggles <sir.pogsalot@gmail.com>
+blitmap <blitternet@gmail.com> Sir Pogsalot <sir.pogsalot@gmail.com>
+ChrisTX <xpipe@hotmail.de> ChrisTX <chris@rev-crew.info>
+Craig Edwards <brain@inspircd.org> (no author) <(no author)@e03df62e-2008-0410-955e-edbf42e46eb7>
+Craig Edwards <brain@inspircd.org> brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
+Craig Edwards <brain@inspircd.org> root <root@e03df62e-2008-0410-955e-edbf42e46eb7>
+Craig McLure <craig@frostycoolslug.com> frostycoolslug <frostycoolslug@e03df62e-2008-0410-955e-edbf42e46eb7>
+Daniel De Graaf <danieldg@inspircd.org> danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>
+Daniel Vassdal <shutter@canternet.org> Daniel Vassdal <daniel@daniel-VirtualBox.(none)>
+Daniel Vassdal <shutter@canternet.org> ShutterQuick <shutter@canternet.org>
+Dennis Friis <peavey@inspircd.org> peavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>
+DjSlash <djslash@djslash.org> Rutger <djslash+github@djslash.org>
+Geoff Bricker <geoff.bricker@gmail.com> bricker <bricker@e03df62e-2008-0410-955e-edbf42e46eb7>
+jackmcbarn <jackmcbarn@inspircd.org> Jackmcbarn <jackmcbarn@jackmcbarn.no-ip.org>
+John Brooks <special@inspircd.org> special <special@e03df62e-2008-0410-955e-edbf42e46eb7>
+Justin Crawford <Justasic@Gmail.com> Justasic <Justasic@gmail.com>
+Matt Smith <dz@inspircd.org> dz <dz@e03df62e-2008-0410-955e-edbf42e46eb7>
+Oliver Lupton <om@inspircd.org> om <om@e03df62e-2008-0410-955e-edbf42e46eb7>
+Pippijn van Steenhoven <pip88nl@gmail.com> pippijn <pippijn@e03df62e-2008-0410-955e-edbf42e46eb7>
+Robby <robby@chatbelgie.be> Robby- <robby@chat.be>
+Robby <robby@chatbelgie.be> Robby- <robbyke@gmail.com>
+Robin Burchell <robin+git@viroteck.net> Robin Burchell <viroteck@viroteck.net>
+Robin Burchell <robin+git@viroteck.net> w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>
+Thomas Stagner <aquanight@inspircd.org> aquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7>
+Uli Schlachter <psychon@inspircd.org> psychon <psychon@e03df62e-2008-0410-955e-edbf42e46eb7>
+William Pitcock <nenolod@dereferenced.org> nenolod <nenolod@e03df62e-2008-0410-955e-edbf42e46eb7>
+
+# The identities of the following people could not be verified:
+#
+# burlex <burlex@e03df62e-2008-0410-955e-edbf42e46eb7>
+# eggy <eggy@e03df62e-2008-0410-955e-edbf42e46eb7>
+# fez <fez@e03df62e-2008-0410-955e-edbf42e46eb7>
+# jamie <jamie@e03df62e-2008-0410-955e-edbf42e46eb7>
+# katsklaw <katsklaw@e03df62e-2008-0410-955e-edbf42e46eb7>
+# Philouuu <philsliders@laptop.(none)> / PhilSliderS <philsliders@laptop.(none)>
+# randomdan <randomdan@e03df62e-2008-0410-955e-edbf42e46eb7>
+# typobox43 <typobox43@e03df62e-2008-0410-955e-edbf42e46eb7>
diff --git a/configure b/configure
index b380b5700..8b9689b29 100755
--- a/configure
+++ b/configure
@@ -733,6 +733,14 @@ to a newer 3.x or 4.x (or whatever is available currently) version.
FOO2
}
+if ($^O eq 'openbsd') {
+ print <<__OPENBSD_WARNING__;
+\e[1;32mWARNING!\e[0m OpenBSD 6.5 changed Make to no longer look for BSDmakefile when
+searching for the makefile. If the version of OpenBSD you are using is 6.5 or
+newer then you will need to run '\e[1;32mmake -f BSDmakefile\e[0m' or '\e[1;32mgmake\e[0m' instead.
+__OPENBSD_WARNING__
+}
+
################################################################################
# HELPER FUNCTIONS #
################################################################################
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 003b4d04b..b39ee5d2b 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -1604,7 +1604,7 @@
# as shown below: #
#<securehost exception="*@*.netsplit.de">
#<securehost exception="*@*.ircdriven.com">
-#<securehost exception="*@*.irc-source.com">
+#<securehost exception="*@*.ircs.me">
# #
# Define the following variable to change how long a user must wait #
# before issuing a LIST. If not defined, defaults to 60 seconds. #
@@ -1695,7 +1695,7 @@
# You can optionally let the user know that their command was blocked.
#
# You may also let SHUN affect opers (defaults to no).
-#<shun enabledcommands="PING PONG QUIT PART JOIN" notifyuser="yes" affectopers="no">
+#<shun enabledcommands="ADMIN PING PONG QUIT PART JOIN" notifyuser="yes" affectopers="no">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# SSL channel mode module: Adds support for SSL-only channels via