Release 2.0.15.

Closes #351.

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Report a non-security issue with Anope.
+---
+
+<!--
+Please fill in the template below. It will help us process your bug report a lot faster. If you have multiple bugs to report then please open one issue for each bug.
+-->
+
+**Description**
+
+
+
+**Steps to reproduce the issue:**
+
+1.
+2.
+3.
+
+**Describe the results you received:**
+
+
+
+**Describe the results you expected:**
+
+
+
+**Additional information you deem important (e.g. issue happens only occasionally):**
+
+
+
+**Output of `services --version`:**
+

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -0,0 +1,15 @@
+---
+name: Feature request
+about: Request that a new feature is added to Anope.
+---
+
+<!--
+Please fill in the template below. It will help us process your feature request a lot faster. If you have multiple features to request then please open one issue for each feature.
+-->
+
+**Description**
+
+
+
+**Why this would be useful**
+

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,26 @@
+<!--
+Please fill in the template below. It will help us process your pull request a lot faster.
+-->
+
+## Summary
+
+<!--
+Briefly describe what this pull request changes.
+-->
+
+## Rationale
+
+<!--
+Describe why you have made this change.
+-->
+
+## Testing Environment
+
+<!--
+Describe the environment in which you have tested this change:
+-->
+
+I have tested this pull request on:
+
+**Operating system name and version:** <!-- e.g. Linux 3.11 -->
+**Compiler name and version:** <!-- e.g. GCC 4.2.0 -->

.github/SECURITY.md

@@ -0,0 +1,19 @@
+# Security Policy
+
+## Supported Versions
+
+Currently the 2.0 (stable) branch is actively receiving security fixes.
+
+The 2.1 (development) branch is still early in development and currently only receives security fixes when they are synced from the 2.0 branch.
+
+Version | Supported
+------- | ---------
+2.1.x   | :warning:
+2.0.x   | :white_check_mark:
+1.8.x   | :x:
+
+## Reporting a Vulnerability
+
+Please do not report security vulnerabilities on GitHub. Instead, email the details to team@anope.org or get the attention of a developer in our development IRC channel at irc.anope.org #anope-devel and PM them the details.
+
+We will triage your issue as soon as possible and try to release a fixed version within a week of receiving your report.

.github/workflows/ci-linux.yml

@@ -1,24 +1,25 @@
-name: Linux CI
+name: Ubuntu CI
 on:
   - pull_request
   - push
 jobs:
   build:
+    if: "!contains(github.event.head_commit.message, '[skip ubuntu ci]')"
     runs-on: ubuntu-20.04
     env:
       CXX: ${{ matrix.compiler }}
       CXXFLAGS: -std=${{ matrix.standard }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
       - name: Install dependencies
         run: |
           sudo apt-get update --assume-yes
           sudo apt-get install --assume-yes --no-install-recommends \
             clang \
             g++ \
+            gettext \
             git \
-            libc++-dev \
-            libc++abi-dev \
             libgnutls28-dev \
             libldap2-dev \
             libmysqlclient-dev \
@@ -27,20 +28,24 @@ jobs:
             libsqlite3-dev \
             libssl-dev \
             libtre-dev \
-            make
+            ninja-build
+
       - name: Enable extras
         run: |
           for MODULE in m_ldap.cpp m_ldap_authentication.cpp m_ldap_oper.cpp m_mysql.cpp m_regex_pcre.cpp m_regex_pcre2.cpp m_regex_posix.cpp m_regex_tre.cpp m_sql_authentication.cpp m_sql_log.cpp m_sql_oper.cpp m_sqlite.cpp m_ssl_gnutls.cpp m_ssl_openssl.cpp stats
           do
             ln -s ${{ github.workspace }}/modules/extra/$MODULE ${{ github.workspace }}/modules
           done
+
       - name: Run CMake
         run: |
           mkdir build && cd build
-          cmake -DCMAKE_BUILD_TYPE:STRING=DEBUG -DINSTDIR:STRING=${{ github.workspace }}/run ..
+          cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=DEBUG -DINSTDIR:STRING=${{ github.workspace }}/run ..
+
       - name: Build Anope
         run: |
-          make --directory ${{ github.workspace }}/build --jobs $(nproc) --no-print-directory install
+          ninja -C ${{ github.workspace }}/build install
+
     strategy:
       fail-fast: false
       matrix:

CMakeLists.txt

@@ -229,6 +229,12 @@ if(EXTRA_LIBS)
   link_directories(${EXTRA_LIBS})
 endif(EXTRA_LIBS)
 
+# setup conan
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/conanbuildinfo.cmake")
+  include("${CMAKE_CURRENT_SOURCE_DIR}/conanbuildinfo.cmake")
+  conan_basic_setup()
+endif()
+
 # Find gettext
 find_package(Gettext)
 
@@ -502,10 +508,6 @@ if(WIN32)
   install(FILES ${Anope_SOURCE_DIR}/src/win32/anope.bat
     DESTINATION ${BIN_DIR}
   )
-
-  # Package any DLLs in src/win/
-  file(GLOB EXTRA_DLLS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${Anope_SOURCE_DIR}/src/win32/*.dll")
-  install(FILES ${EXTRA_DLLS} DESTINATION ${BIN_DIR})
 endif(WIN32)
 
 install(CODE "file(REMOVE_RECURSE \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/modules\")")

Config

@@ -2,7 +2,7 @@
 #
 # Configuration script for Services.
 #
-# Anope (C) 2003-2023 Anope Team
+# Anope (C) 2003-2024 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for
@@ -193,6 +193,7 @@ if [ ! "$NO_INTRO" ] ; then
 			clear
 			;;
 	esac
+	export MORE='-e'
 	. $SOURCE_DIR/src/version.sh
 	cat $SOURCE_DIR/.BANNER | sed "s/CURVER/$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH$VERSION_EXTRA/" | sed "s@SOURCE_DIR@$SOURCE_DIR@" | $PAGER
 	echo ""

cmake/Anope.cmake

@@ -539,7 +539,7 @@ endmacro(check_functions)
 #   of TRUE is given, periods will be converted to \\. for CPack.
 ###############################################################################
 macro(add_to_cpack_ignored_files ITEM)
-  # Temporary copy of the orignal item
+  # Temporary copy of the original item
   set(REAL_ITEM "${ITEM}")
   # If we have 2+ arguments, assume that the second one was something like TRUE (doesn't matter really) and convert periods so they will be \\. for CPack
   if(${ARGC} GREATER 1)

cmake/FindGettext.cmake

@@ -10,9 +10,9 @@ if(NOT WIN32)
     endif(GETTEXT_LIBRARY)
   endif(GETTEXT_INCLUDE AND GETTEXT_MSGFMT)
 else(NOT WIN32)
-  find_path(GETTEXT_INCLUDE libintl.h ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/include $ENV{VCINSTALLDIR}/include gettext/include ${EXTRA_INCLUDE})
-  find_library(GETTEXT_LIBRARY libintl PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS})
-  find_program(GETTEXT_MSGFMT msgfmt PATHS ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/bin $ENV{VCINSTALLDIR}/bin gettext/bin ${EXTRA_INCLUDE})
+  find_path(GETTEXT_INCLUDE libintl.h)
+  find_library(GETTEXT_LIBRARY gnuintl)
+  find_program(GETTEXT_MSGFMT msgfmt)
   if(GETTEXT_INCLUDE AND GETTEXT_LIBRARY AND GETTEXT_MSGFMT)
     set(GETTEXT_FOUND TRUE)
     set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY})

data/botserv.example.conf

@@ -249,7 +249,7 @@ command { service = "BotServ"; name = "INFO"; command = "botserv/info"; }
  *   botserv/kick/italics - Configures BotServ's italics kicker.
  *   botserv/kick/repeat - Configures BotServ's repeat kicker.
  *   botserv/kick/reverses - Configures BotServ's reverse kicker.
- *   botserv/kick/underlines - Configures BotServ's reverse kicker.
+ *   botserv/kick/underlines - Configures BotServ's underline kicker.
  *   botserv/set/dontkickops - Used for preventing BotServ from kicking channel operators.
  *   botserv/set/dontkickvoices - Used for preventing BotServ from kicking voices.
  *

data/chanserv.example.conf

@@ -93,8 +93,8 @@ module
 	 *                   to be a registered nick, otherwise the channel will be dropped.
 	 * -           none: No defaults
 	 *
-	 * This directive is optional, if left blank, the options will default to keeptopic, cs_secure, securefounder,
-	 * and signkick. If you really want no defaults, use "none" by itself as the option.
+	 * This directive is optional, if left blank, the options will default to keeptopic, peace, cs_secure,
+	 * securefounder, and signkick. If you really want no defaults, use "none" by itself as the option.
 	 */
 	defaults = "keeptopic peace cs_secure securefounder signkick"
 

data/example.conf

@@ -997,6 +997,14 @@ mail
 	 */
 	#dontquoteaddresses = yes
 
+	/*
+	 * The content type to use when sending emails.
+	 *
+	 * This directive is optional, and is generally only needed if you want to
+	 * use HTML or non UTF-8 text in your services emails.
+	 */
+	#content_type = "text/plain; charset=UTF-8"
+
 	/*
 	 * The subject and message of emails sent to users when they register accounts.
 	 *

data/modules.example.conf

@@ -413,6 +413,7 @@ module { name = "help" }
  *
  * Provides the regex engine regex/pcre, which uses version 2 of the Perl Compatible Regular
  * Expressions library. This can not be loaded at the same time as the m_regex_pcre module.
+ */
 #module { name = "m_regex_pcre2" }
 
 /*

data/nickserv.example.conf

@@ -110,7 +110,6 @@ module
 	 * -           msg: Services messages will be sent as PRIVMSGs instead of NOTICEs, requires
 	 *                    options:useprivmsg to be enabled as well
 	 * - ns_keep_modes: Enables keepmodes, which retains user modes across sessions
-	 * -  ns_no_expire: Enables no expire. Unconfirmed expire overrules this.
 	 *
 	 * This directive is optional, if left blank, the options will default to ns_secure, memo_signon, and
 	 * memo_receive. If you really want no defaults, use "none" by itself as the option.
@@ -596,10 +595,11 @@ command { service = "NickServ"; name = "SET URL"; command = "nickserv/set/misc";
 command { service = "NickServ"; name = "SASET URL"; command = "nickserv/saset/misc"; misc_description = _("Associate a URL with this account"); permission = "nickserv/saset/url"; group = "nickserv/admin"; }
 #command { service = "NickServ"; name = "SET DISCORD"; command = "nickserv/set/misc"; misc_description = _("Associate a Discord account with your account"); }
 #command { service = "NickServ"; name = "SASET DISCORD"; command = "nickserv/saset/misc"; misc_description = _("Associate a Discord account with this account"); permission = "nickserv/saset/discord"; group = "nickserv/admin"; }
-#command { service = "NickServ"; name = "SET TWITTER"; command = "nickserv/set/misc"; misc_description = _("Associate a Twitter account with your account"); }
-#command { service = "NickServ"; name = "SASET TWITTER"; command = "nickserv/saset/misc"; misc_description = _("Associate a Twitter account with this account"); permission = "nickserv/saset/twitter"; group = "nickserv/admin"; }
 #command { service = "NickServ"; name = "SET FACEBOOK"; command = "nickserv/set/misc"; misc_description = _("Associate a Facebook URL with your account"); }
 #command { service = "NickServ"; name = "SASET FACEBOOK"; command = "nickserv/saset/misc"; misc_description = _("Associate a Facebook URL with this account"); permission = "nickserv/saset/facebook"; group = "nickserv/admin"; }
+#command { service = "NickServ"; name = "SET MASTODON"; command = "nickserv/set/misc"; misc_description = _("Associate a Mastodon account with your account"); }
+#command { service = "NickServ"; name = "SASET MASTODON"; command = "nickserv/saset/misc"; misc_description = _("Associate a Mastodon account with this account"); permission = "nickserv/saset/mastodon"; group = "nickserv/admin"; }
+
 
 /*
  * ns_status

docs/BUGS

@@ -1 +1 @@
-For all bug reports / updates please see https://bugs.anope.org/
+For all bug reports / updates please see https://github.com/anope/anope/issues

docs/Changes

@@ -1,3 +1,28 @@
+Anope Version 2.0.15
+--------------------
+Fixed a race condition in changing the nick of a user.
+Fixed being able to reset the password of suspended accounts.
+Fixed chanserv/suspend info not being visible to regular users.
+Fixed removing entries by an alias in chanserv/access and chanserv/xop.
+Fixed various grammar issues in messages.
+Made the SASL PLAIN implementation more robust.
+Updated the Dutch translation.
+Updated the French translation.
+Updated the Turkish translation.
+
+Anope Version 2.0.14
+--------------------
+Added support for sqlining channels on UnrealIRCd.
+Fixed a crash when trying to access config for non-loaded modules.
+Fixed detection of the InspIRCd nopartmsg module.
+Fixed not getting memo notifications when authing with SASL.
+Fixed not serialising dontkickops/dontkickvoices in botserv/kick.
+Fixed sending emails with the wrong kind of line terminator.
+Fixed sending log messages from a renamed pseudoclient.
+Fixed telling users their passcode is incorrect when they need to authenticate in nickserv/confirm.
+Fixed the Config script freezing on some versions of util-linux.
+Updated the Windows packaging scripts to use dependencies from Conan.
+
 Anope Version 2.0.13
 --------------------
 Fixed a crash on some compilers when trying to call methods on a null pointer
@@ -142,7 +167,7 @@ Show memo notify settings in ms_info
 Fix some actions bumping channels last used time that shouldn't have
 Add maxlogins configuration directive to limit the number of concurrent logins to one account
 Fix race with auto svsnick on ghost sometimes causing nick collisions instead
-Fix saset langauge reply
+Fix saset language reply
 Show akill/sxlines ids in VIEW
 Fix crash when an oper is configured in both the configuration and via os_oper
 Fix m_ldap reconnect logic not properly setting protocol and network timeout settings
@@ -209,7 +234,7 @@ A Added SQL logging support
 A Added Redis database support
 A Added ability to configure what privileges XOP commands give
 U Updated Dutch language file, from Robby <robby@chat.be>
-U Updated Spanish langauge file, from Isaac Fontal <i_fontal@hotmail.com>
+U Updated Spanish language file, from Isaac Fontal <i_fontal@hotmail.com>
 F Fix build on Solaris and OSX
 F Fixed setting BotServ's default settings in the config
 F Fixed some names of config items, including NickServ's kill protect

docs/Changes.conf

@@ -1,3 +1,11 @@
+Anope Version 2.0.15
+--------------------
+No significant changes.
+
+Anope Version 2.0.14
+--------------------
+Added mail:content_type to allow customizing the content type of emails.
+
 Anope Version 2.0.13
 --------------------
 No significant changes.

docs/INSTALL

@@ -88,10 +88,6 @@ Note: You should also read the README and FAQ files!
 
     Don't forget to /rehash your IRCd to apply changes.
 
-    You may also try our interactive link maker, which is located at:
-
-        https://www.anope.org/ilm.php
-
 4) Starting Anope
 
     Go into the directory where binaries were installed (by default, this is

docs/INSTALL.fr

@@ -96,11 +96,6 @@ Note : Vous devrez également lire les fichiers README et FAQ !
 
     Souvenez-vous de /rehash votre IRCd pour appliquer les changements.
 
-    Vous pouvez également essayer notre créateur de bloc link interactif
-    situé ici :
-
-        https://www.anope.org/ilm.php
-
 4) Mettre en route Anope
 
     Allez dans le répertoire où les fichiers binaires ont été installés

docs/README

@@ -1,7 +1,7 @@
 Anope -- a set of IRC services for IRC networks
 -----------------------------------------------
 
-Anope is          2003-2023 Anope Team    <team@anope.org>.
+Anope is          2003-2024 Anope Team    <team@anope.org>.
 Based on Epona    2000-2002 PegSoft       <epona@pegsoft.net>.
 Based on Services 1996-1999 Andrew Church <achurch@achurch.org>.
 
@@ -252,7 +252,7 @@ Table of Contents
     The more precise you are the sooner you'll be likely to get an answer.
 
     If you think you found a bug, add it to the bug tracking system
-    (https://bugs.anope.org/) and - again - be as precise as possible. Also say
-    whether the bug happens always or under what circumstances, and anything
+    (https://github.com/anope/anope/issues) and - again - be as precise as possible.
+    Also say whether the bug happens always or under what circumstances, and anything
     that could be useful to track your bug down. If you wrote a patch, send
     it over. :)

docs/XMLRPC/xmlrpc.php

@@ -3,7 +3,7 @@
 /**
  * XMLRPC Functions
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  */
 

include/CMakeLists.txt

@@ -6,8 +6,8 @@ set_target_properties(version-bin PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${L
 get_target_property(version_BINARY version-bin LOCATION)
 # Modify version.h from the above executable, with dependencies to version.cpp
 # and all of the source files in the main build
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_build
-  COMMAND ${version_BINARY} ${Anope_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
+  COMMAND version-bin ${Anope_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
   DEPENDS version-bin ${SRC_SRCS}
 )
 # Add version-bin to list of files for CPack to ignore
@@ -61,4 +61,4 @@ if(USE_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 endif(USE_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 
 # Add a custom target to the above file
-add_custom_target(headers DEPENDS version-bin ${CMAKE_CURRENT_BINARY_DIR}/version_build ${PCH_SOURCES_GCH})
+add_custom_target(headers DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h ${PCH_SOURCES_GCH})

include/access.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/account.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/anope.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -548,6 +548,13 @@ namespace Anope
 	 */
 	extern Anope::string Resolve(const Anope::string &host, int type);
 
+	/** Does a blocking dns query and returns all IPs.
+	 * @param host host to look up
+	 * @param type inet addr type
+	 * @return A list of all IPs that the host resolves to
+	 */
+	extern std::vector<Anope::string> ResolveMultiple(const Anope::string &host, int type);
+
 	/** Generate a string of random letters and numbers
 	 * @param len The length of the string returned
 	 */
@@ -565,7 +572,7 @@ class CoreExport sepstream
 	/** Original string.
 	 */
 	Anope::string tokens;
-	/** Seperator value
+	/** Separator value
 	 */
 	char sep;
 	/** Current string position

include/base.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2023 Anope Team <team@anope.org>
+ * (C) 2008-2024 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/bots.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2023 Anope Team <team@anope.org>
+ * (C) 2008-2024 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/channels.h

@@ -1,6 +1,6 @@
 /* Channel support
  *
- * (C) 2008-2023 Anope Team
+ * (C) 2008-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/commands.h

@@ -1,6 +1,6 @@
 /* Declarations for command data.
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/config.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/defs.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/extensible.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/hashcomp.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2002-2011 InspIRCd Development Team
- * (C) 2009-2023 Anope Team <team@anope.org>
+ * (C) 2009-2024 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/language.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2023 Anope Team
+ * (C) 2008-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/lists.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/logger.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/mail.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -32,6 +32,7 @@ namespace Mail
 		Anope::string addr;
 		Anope::string subject;
 		Anope::string message;
+		Anope::string content_type;
 		bool dont_quote_addresses;
 
 		bool success;

include/memo.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/messages.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modes.h

@@ -1,7 +1,7 @@
 /* Mode support
  *
  * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2023 Anope Team <team@anope.org>
+ * (C) 2008-2024 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */
@@ -160,7 +160,7 @@ class CoreExport ChannelModeList : public ChannelMode
 	virtual void OnDel(Channel *chan, const Anope::string &mask) { }
 };
 
-/** This is a mode with a paramater, eg +k/l. These modes should use/inherit from this
+/** This is a mode with a parameter, eg +k/l. These modes should use/inherit from this
 */
 class CoreExport ChannelModeParam : public ChannelMode
 {

include/module.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules.h

@@ -1,6 +1,6 @@
 /* Modular support
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -402,7 +402,6 @@ class CoreExport Module : public Extensible
 	virtual EventReturn OnLoadDatabase() { throw NotImplementedException(); }
 
 	/** Called when anope needs to check passwords against encryption
-	 *  see src/encrypt.c for detailed informations
 	 */
 	virtual EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) { throw NotImplementedException(); }
 	virtual EventReturn OnDecrypt(const Anope::string &hashm, const Anope::string &src, Anope::string &dest) { throw NotImplementedException(); }
@@ -1066,7 +1065,7 @@ class CoreExport Module : public Extensible
 	/** Called when a nickserv/set command is used.
 	 * @param source The source of the command
 	 * @param cmd The command
-	 * @param nc The nickcore being modifed
+	 * @param nc The nickcore being modified
 	 * @param setting The setting passed to the command. Probably ON/OFF.
 	 * @return EVENT_STOP to halt immediately
 	 */

include/modules/bs_badwords.h

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/bs_kick.h

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_entrymsg.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_log.h

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_mode.h

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/dns.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/encryption.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/httpd.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2012-2023 Anope Team
+ * (C) 2012-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/ldap.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2023 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/ns_cert.h

@@ -1,6 +1,6 @@
 /* NickServ core functions
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_forbid.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2023 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_ignore.h

@@ -1,6 +1,6 @@
 /* OperServ ignore interface
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_news.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2023 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_session.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2023 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/chanserv.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2023 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/global.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2023 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/memoserv.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2023 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/nickserv.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2023 Anope Team
+ * (C) 2011-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/redis.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/sasl.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2014-2023 Anope Team
+ * (C) 2014-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/set_misc.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/sql.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/ssl.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2010-2023 Anope Team
+ * (C) 2010-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/suspend.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/xmlrpc.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2010-2023 Anope Team
+ * (C) 2010-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/opertype.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2023 Anope Team <team@anope.org>
+ * (C) 2008-2024 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/protocol.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/regchannel.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2023 Anope Team
+ * (C) 2008-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/regexpr.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/serialize.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/servers.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/service.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -128,6 +128,10 @@ class ServiceReference : public Reference<T>
 	{
 	}
 
+	const Anope::string &GetServiceName() const { return name; }
+
+	const Anope::string &GetServiceType() const { return type; }
+
 	inline void operator=(const Anope::string &n)
 	{
 		this->name = n;

include/services.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/socketengine.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/sockets.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/threadengine.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/timers.h

@@ -1,6 +1,6 @@
 /* Timer include stuff.
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/uplink.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/users.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2003-2023 Anope Team <team@anope.org>
+ * (C) 2003-2024 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  *

include/version.cpp

@@ -1,6 +1,6 @@
 /* Build bumper
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/xline.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2023 Anope Team
+ * (C) 2008-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

language/anope.ca_ES.po

@@ -2760,7 +2760,7 @@ msgstr ""
 
 msgid ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 msgstr ""
 
 #, fuzzy

language/anope.de_DE.po

@@ -2540,7 +2540,7 @@ msgstr ""
 
 msgid ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 msgstr "Alternative Methoden zum Bearbeiten der Kanalzugangsliste sind verfügbar."
 
 msgid "Approve the requested vHost of a user"

language/anope.el_GR.po

@@ -2651,7 +2651,7 @@ msgstr ""
 
 msgid ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 msgstr ""
 
 #

language/anope.en_US.po

@@ -1,5 +1,5 @@
 # Anope IRC Services language file
-# Copyright (C) 2014-2020
+# Copyright (C) 2014-2024
 # This file is distributed under the same license as the Anope IRC Services package.
 # Adam <adam@anope.org>, 2014.
 #
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-19 11:11+0000\n"
-"PO-Revision-Date: 2023-02-19 11:11+0000\n"
+"POT-Creation-Date: 2023-12-17 19:24+0000\n"
+"PO-Revision-Date: 2023-12-17 19:27+0000\n"
 "Last-Translator: Sadie Powell <sadie@witchery.services>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
@@ -16,6 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.4\n"
 
 #, c-format
 msgid "%d channel(s) cleared, and %d channel(s) dropped."
@@ -808,7 +809,7 @@ msgstr ""
 
 msgid ""
 " \n"
-"SQLINE ADD adds the given (nick's) mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick/channel) mask to the SQLINE\n"
 "list for the given reason (which must be given).\n"
 "expiry is specified as an integer followed by one of d\n"
 "(days), h (hours), or m (minutes). Combinations (such as\n"
@@ -821,7 +822,7 @@ msgid ""
 "STATS AKILL command."
 msgstr ""
 " \n"
-"SQLINE ADD adds the given (nick's) mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick/channel) mask to the SQLINE\n"
 "list for the given reason (which must be given).\n"
 "expiry is specified as an integer followed by one of d\n"
 "(days), h (hours), or m (minutes). Combinations (such as\n"
@@ -1705,11 +1706,11 @@ msgstr "A memo informing the user will also be sent."
 
 #, c-format
 msgid ""
-"A notification memo has been sent to %s informing him/her you have\n"
-"read his/her memo."
+"A notification memo has been sent to %s informing them you have\n"
+"read their memo."
 msgstr ""
-"A notification memo has been sent to %s informing him/her you have\n"
-"read his/her memo."
+"A notification memo has been sent to %s informing them you have\n"
+"read their memo."
 
 msgid "A vHost ident must be in the format of a valid ident."
 msgstr "A vHost ident must be in the format of a valid ident."
@@ -2182,18 +2183,18 @@ msgstr ""
 msgid ""
 "Allows Services Operators to manipulate the SNLINE list.  If\n"
 "a user with a realname matching an SNLINE mask attempts to\n"
-"connect, Services will not allow it to pursue his IRC\n"
+"connect, Services will not allow them to pursue their IRC\n"
 "session."
 msgstr ""
 "Allows Services Operators to manipulate the SNLINE list.  If\n"
 "a user with a realname matching an SNLINE mask attempts to\n"
-"connect, Services will not allow it to pursue his IRC\n"
+"connect, Services will not allow them to pursue their IRC\n"
 "session."
 
 msgid ""
 "Allows Services Operators to manipulate the SQLINE list.  If\n"
 "a user with a nick matching an SQLINE mask attempts to\n"
-"connect, Services will not allow it to pursue his IRC\n"
+"connect, Services will not allow them to pursue their IRC\n"
 "session.\n"
 "If the first character of the mask is #, services will\n"
 "prevent the use of matching channels. If the mask is a\n"
@@ -2202,7 +2203,7 @@ msgid ""
 msgstr ""
 "Allows Services Operators to manipulate the SQLINE list.  If\n"
 "a user with a nick matching an SQLINE mask attempts to\n"
-"connect, Services will not allow it to pursue his IRC\n"
+"connect, Services will not allow them to pursue their IRC\n"
 "session.\n"
 "If the first character of the mask is #, services will\n"
 "prevent the use of matching channels. If the mask is a\n"
@@ -2426,10 +2427,10 @@ msgstr ""
 
 msgid ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 msgstr ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 
 msgid "Approve the requested vHost of a user"
 msgstr "Approve the requested vHost of a user"
@@ -3702,12 +3703,12 @@ msgid ""
 "Enables or disables the peace option for a channel.\n"
 "When peace is set, a user won't be able to kick,\n"
 "ban or remove a channel status of a user that has\n"
-"a level superior or equal to his via %s commands."
+"a level superior or equal to theirs via %s commands."
 msgstr ""
 "Enables or disables the peace option for a channel.\n"
 "When peace is set, a user won't be able to kick,\n"
 "ban or remove a channel status of a user that has\n"
-"a level superior or equal to his via %s commands."
+"a level superior or equal to theirs via %s commands."
 
 msgid "Enables or disables the private option for a channel."
 msgstr "Enables or disables the private option for a channel."
@@ -5661,7 +5662,7 @@ msgid ""
 "\"founder\" of the channel. The channel founder is allowed\n"
 "to change all of the channel settings for the channel;\n"
 "%s will also automatically give the founder\n"
-"channel-operator privileges when s/he enters the channel."
+"channel operator privileges when they enter the channel."
 msgstr ""
 "Registers a channel in the %s database.  In order\n"
 "to use this command, you must first be a channel operator\n"
@@ -5673,7 +5674,7 @@ msgstr ""
 "\"founder\" of the channel. The channel founder is allowed\n"
 "to change all of the channel settings for the channel;\n"
 "%s will also automatically give the founder\n"
-"channel-operator privileges when s/he enters the channel."
+"channel operator privileges when they enter the channel."
 
 #, c-format
 msgid ""
@@ -6025,29 +6026,29 @@ msgstr "Sends all services staff a memo containing memo-text."
 msgid ""
 "Sends the named nick or channel a memo containing\n"
 "memo-text. When sending to a nickname, the recipient will\n"
-"receive a notice that he/she has a new memo. The target\n"
+"receive a notice that they have a new memo. The target\n"
 "nickname/channel must be registered."
 msgstr ""
 "Sends the named nick or channel a memo containing\n"
 "memo-text. When sending to a nickname, the recipient will\n"
-"receive a notice that he/she has a new memo. The target\n"
+"receive a notice that they have a new memo. The target\n"
 "nickname/channel must be registered."
 
 msgid ""
 "Sends the named nick or channel a memo containing\n"
 "memo-text. When sending to a nickname, the recipient will\n"
-"receive a notice that he/she has a new memo. The target\n"
+"receive a notice that they have a new memo. The target\n"
 "nickname/channel must be registered.\n"
 "Once the memo is read by its recipient, an automatic notification\n"
-"memo will be sent to the sender informing him/her that the memo\n"
+"memo will be sent to the sender informing them that the memo\n"
 "has been read."
 msgstr ""
 "Sends the named nick or channel a memo containing\n"
 "memo-text. When sending to a nickname, the recipient will\n"
-"receive a notice that he/she has a new memo. The target\n"
+"receive a notice that they have a new memo. The target\n"
 "nickname/channel must be registered.\n"
 "Once the memo is read by its recipient, an automatic notification\n"
-"memo will be sent to the sender informing him/her that the memo\n"
+"memo will be sent to the sender informing them that the memo\n"
 "has been read."
 
 msgid ""
@@ -7267,7 +7268,7 @@ msgid ""
 "functions to be changed. LEVELS DISABLE (or DIS for short)\n"
 "disables an automatic feature or disallows access to a\n"
 "function by anyone, INCLUDING the founder (although, the founder\n"
-"can always reenable it). Use LEVELS SET founder to make a level\n"
+"can always re-enable it). Use LEVELS SET founder to make a level\n"
 "founder only.\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
@@ -7287,7 +7288,7 @@ msgstr ""
 "functions to be changed. LEVELS DISABLE (or DIS for short)\n"
 "disables an automatic feature or disallows access to a\n"
 "function by anyone, INCLUDING the founder (although, the founder\n"
-"can always reenable it). Use LEVELS SET founder to make a level\n"
+"can always re-enable it). Use LEVELS SET founder to make a level\n"
 "founder only.\n"
 " \n"
 "LEVELS LIST shows the current levels for each function or\n"
@@ -8446,8 +8447,8 @@ msgstr "You are over your maximum number of memos (%d). You will be unable to re
 msgid "You can not NOOP Services."
 msgstr "You can not NOOP Services."
 
-msgid "You can not disable the founder privilege because it would be impossible to reenable it at a later time."
-msgstr "You can not disable the founder privilege because it would be impossible to reenable it at a later time."
+msgid "You can not disable the founder privilege because it would be impossible to re-enable it at a later time."
+msgstr "You can not disable the founder privilege because it would be impossible to re-enable it at a later time."
 
 msgid "You can not jupe an already juped server."
 msgstr "You can not jupe an already juped server."

language/anope.es_ES.po

@@ -2475,7 +2475,7 @@ msgstr ""
 
 msgid ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 msgstr ""
 "Están disponibles métodos alternativos de modificar las listas\n"
 "de acceso."

language/anope.hu_HU.po

@@ -2737,7 +2737,7 @@ msgstr ""
 
 msgid ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 msgstr ""
 
 #, fuzzy

language/anope.it_IT.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-22 14:47+0200\n"
-"PO-Revision-Date: 2023-05-23 16:12+0200\n"
+"POT-Creation-Date: 2023-10-04 13:57+0200\n"
+"PO-Revision-Date: 2023-10-04 14:01+0200\n"
 "Last-Translator: Dragone2 <dragone2@risposteinformatiche.it>\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
@@ -813,7 +813,7 @@ msgstr ""
 
 msgid ""
 " \n"
-"SQLINE ADD adds the given (nick's) mask to the SQLINE\n"
+"SQLINE ADD adds the given (nick/channel) mask to the SQLINE\n"
 "list for the given reason (which must be given).\n"
 "expiry is specified as an integer followed by one of d\n"
 "(days), h (hours), or m (minutes). Combinations (such as\n"
@@ -826,7 +826,7 @@ msgid ""
 "STATS AKILL command."
 msgstr ""
 " \n"
-"SQLINE ADD aggiunge la maschera (del nick) specificata alla lista\n"
+"SQLINE ADD aggiunge la maschera (del nick/canale) specificata alla lista\n"
 "SQLINE per il motivo dato (che deve essere indicato).\n"
 "scadenza è specificato come un intero seguito da una lettera,\n"
 "che può essere d (giorni), h (ore), o m (minuti). Le\n"
@@ -2435,10 +2435,10 @@ msgstr ""
 
 msgid ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 msgstr ""
 "Sono disponibili metodi alternativi per la modifica delle\n"
-"liste di accesso dei canali. "
+"liste di accesso dei canali."
 
 msgid "Approve the requested vHost of a user"
 msgstr "Approva il vHost richiesto da un utente"
@@ -6856,7 +6856,7 @@ msgid ""
 "Syncs all modes set on users on the channel with the modes\n"
 "they should have based on their access."
 msgstr ""
-"Sincronizza tutte le modalità impostati sugli utenti di un canale con\n"
+"Sincronizza tutte le modalità impostate sugli utenti di un canale con\n"
 "le modalità che dovrebbero avere in base al loro accesso."
 
 msgid "Syncs the vhost for all nicks in a group"

language/anope.pl_PL.po

@@ -2462,10 +2462,10 @@ msgstr ""
 
 msgid ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 msgstr ""
 "Alternatywne sposoby na modyfikację kanałowych list dostępu\n"
-"są dostępne. "
+"są dostępne."
 
 msgid "Approve the requested vHost of a user"
 msgstr "Akceptuje prośbę o vhost wskazanego użytkownika"

language/anope.pt_PT.po

@@ -2709,7 +2709,7 @@ msgstr ""
 
 msgid ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 msgstr ""
 
 #, fuzzy

language/anope.ru_RU.po

@@ -2810,7 +2810,7 @@ msgstr ""
 
 msgid ""
 "Alternative methods of modifying channel access lists are\n"
-"available. "
+"available."
 msgstr ""
 
 #, fuzzy

modules/CMakeLists.txt

@@ -3,6 +3,40 @@ if(WIN32)
   add_definitions(-DMODULE_COMPILE)
 endif(WIN32)
 
+# enable extra modules if conan is used
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../conanbuildinfo.cmake")
+  function(enable_extra NAME PACKAGE)
+    if(DEFINED "CONAN_${PACKAGE}_ROOT")
+      message("Enabling the ${NAME} module")
+      # copy the modules out of extra so it gets picked up by build_modules
+      file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/extra/${NAME}.cpp" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}")
+    else()
+      message("Unable to enable the ${NAME} module (missing library)")
+    endif()
+  endfunction()
+
+  function(copy_extra NAME)
+    file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/extra/${NAME}.cpp" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}")
+  endfunction()
+
+  enable_extra("m_mysql" "LIBMYSQLCLIENT")
+  enable_extra("m_regex_pcre2" "PCRE2")
+  enable_extra("m_sqlite" "SQLITE3")
+  enable_extra("m_ssl_openssl" "OPENSSL")
+  # this uses Wldap so should always be available
+  copy_extra("m_ldap")
+  # these don't actually have extra dependencies, but require a module which does
+  copy_extra("m_sql_authentication")
+  copy_extra("m_sql_log")
+  copy_extra("m_sql_oper")
+  copy_extra("m_ldap_authentication")
+  copy_extra("m_ldap_oper")
+
+  # Package extra dlls
+  file(GLOB EXTRA_DLLS "${Anope_SOURCE_DIR}/extradll/bin/*.dll" "${Anope_SOURCE_DIR}/extradll/lib/*.dll")
+  install(FILES ${EXTRA_DLLS} DESTINATION ${BIN_DIR})
+endif()
+
 macro(build_modules SRC)
   if(NOT ${SRC} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR} AND EXISTS "${SRC}/CMakeLists.txt")
     add_subdirectory("${SRC}")

modules/bs_autoassign.cpp

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

modules/commands/bs_assign.cpp

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2023 Anope Team
+ * (C) 2003-2024 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.