Release 2.1.9.

This hasn't done anything since the early 1.9 releases I'm not sure
why it hasn't been removed already.

data/anope.example.conf

@@ -414,12 +414,6 @@ options
 	 */
 	readtimeout = 5s
 
-	/*
-	 * Sets the interval between sending warning messages for program errors via
-	 * WALLOPS/GLOBOPS.
-	 */
-	warningtimeout = 4h
-
 	/*
 	 * Sets the (maximum) frequency at which the timeout list is checked. This,
 	 * combined with readtimeout above, determines how accurately timed events,
@@ -823,8 +817,6 @@ opertype
 	 *
 	 * This can be used to automatically oper users who identify for services operator accounts, and is
 	 * useful for setting modes such as Plexus's user mode +N.
-	 *
-	 * Note that some IRCds, such as InspIRCd, do not allow directly setting +o, and this will not work.
 	 */
 	#modes = "+o"
 }

data/nickserv.example.conf

@@ -124,9 +124,9 @@ module
 	/*
 	 * The length of time before a nick's registration expires.
 	 *
-	 * This directive is optional, but recommended. If not set, the default is 90 days.
+	 * This directive is optional, but recommended. If not set, the default is one year.
 	 */
-	expire = 90d
+	expire = 1y
 
 	/*
 	 * Prevents the use of the ACCESS and CERT (excluding their LIST subcommand), DROP, FORBID, SUSPEND

data/stats.standalone.example.conf

@@ -371,12 +371,6 @@ options
 	 */
 	readtimeout = 5s
 
-	/*
-	 * Sets the interval between sending warning messages for program errors via
-	 * WALLOPS/GLOBOPS.
-	 */
-	warningtimeout = 4h
-
 	/*
 	 * If set, Anope will only show /stats o to IRC Operators. This directive
 	 * is optional.

docs/Changes

@@ -1,3 +1,13 @@
+Anope Version 2.1.9
+-------------------
+Bumped the minimum supported version of UnrealIRCd to 6.
+Fixed granting IRC operator status to services operators.
+Fixed making users an IRC operator on InspIRCd.
+Fixed nonicknameownership on InspIRCd v4.
+Fixed some messages not being translatable.
+Fixed the Argon2 module not having test vectors.
+Increased the default nickname expiry period to one year.
+
 Anope Version 2.1.8
 -------------------
 Added account identifiers to the nickserv/info output.

docs/Changes.conf

@@ -1,3 +1,7 @@
+Anope Version 2.1.9
+-------------------
+No significant changes.
+
 Anope Version 2.1.8
 -------------------
 Added module:preservedisplay to the nickserv module.

docs/README

@@ -173,7 +173,7 @@ Table of Contents
         * Plexus 3 or later
         * Ratbox 2.0.6 or later
         * Solanum (all versions)
-        * UnrealIRCd 4 or later
+        * UnrealIRCd 6 or later
 
     Anope could also work with some of the daemons derived by the ones listed
     above, but there's no support for them if they work or don't work.

language/anope.en_US.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Anope\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-18 03:16+0100\n"
-"PO-Revision-Date: 2024-08-18 03:17+0100\n"
+"POT-Creation-Date: 2024-09-26 13:24+0100\n"
+"PO-Revision-Date: 2024-09-26 13:25+0100\n"
 "Last-Translator: Sadie Powell <sadie@witchery.services>\n"
 "Language-Team: English\n"
 "Language: en_US\n"
@@ -2957,6 +2957,14 @@ msgstr ""
 "become the new founder, but if the access list is empty, the\n"
 "channel will be dropped."
 
+#, c-format
+msgid "Changing your usermodes to %s"
+msgstr "Changing your usermodes to %s"
+
+#, c-format
+msgid "Changing your vhost to %s"
+msgstr "Changing your vhost to %s"
+
 msgid "Channel"
 msgstr "Channel"
 
@@ -8494,6 +8502,10 @@ msgstr "You may not change the email of other Services Operators."
 msgid "You may not change the password of other Services Operators."
 msgstr "You may not change the password of other Services Operators."
 
+#, c-format
+msgid "You may not drop %s as it is the display nick for the account."
+msgstr "You may not drop %s as it is the display nick for the account."
+
 msgid "You may not drop other Services Operators' nicknames."
 msgstr "You may not drop other Services Operators' nicknames."
 

modules/extra/enc_argon2.cpp

@@ -139,8 +139,19 @@ public:
 		, argon2dprovider(this, Argon2_d)
 		, argon2iprovider(this, Argon2_i)
 		, argon2idprovider(this, Argon2_id)
-
 	{
+		argon2dprovider.Check({
+			{ "$argon2d$v=19$m=10,t=10,p=1$VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZw$fNS8JrvE8EqKwQ", "" },
+			{ "$argon2d$v=19$m=10,t=10,p=1$VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZw$hTvpprMF0TwszQ", "The quick brown fox jumps over the lazy dog" },
+		});
+		argon2iprovider.Check({
+			{ "$argon2i$v=19$m=10,t=10,p=1$VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZw$neE6hYxRp4TCJA", "" },
+			{ "$argon2i$v=19$m=10,t=10,p=1$VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZw$/JAt4FdP1MFD+A", "The quick brown fox jumps over the lazy dog" },
+		});
+		argon2idprovider.Check({
+			{ "$argon2id$v=19$m=10,t=10,p=1$VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZw$wuNeHixFDS6Tkg", "" },
+			{ "$argon2id$v=19$m=10,t=10,p=1$VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZw$Po8RcmxZ7vHmdg", "The quick brown fox jumps over the lazy dog" },
+		});
 	}
 
 	void OnReload(Configuration::Conf *conf) override

modules/nickserv/nickserv.cpp

@@ -486,7 +486,7 @@ public:
 				"Services Operators can also drop any nickname without needing\n"
 				"to identify for the nick, and may view the access list for\n"
 				"any nickname."));
-		time_t nickserv_expire = Config->GetModule(this)->Get<time_t>("expire", "90d");
+		time_t nickserv_expire = Config->GetModule(this)->Get<time_t>("expire", "1y");
 		if (nickserv_expire >= 86400)
 			source.Reply(_(" \n"
 				"Accounts that are not used anymore are subject to\n"
@@ -554,7 +554,7 @@ public:
 	{
 		if (!na->nc->HasExt("UNCONFIRMED"))
 		{
-			time_t nickserv_expire = Config->GetModule(this)->Get<time_t>("expire", "90d");
+			time_t nickserv_expire = Config->GetModule(this)->Get<time_t>("expire", "1y");
 			if (!na->HasExt("NS_NO_EXPIRE") && nickserv_expire && !Anope::NoExpire && (source.HasPriv("nickserv/auspex") || na->last_seen != Anope::CurTime))
 				info[_("Expires")] = Anope::strftime(na->last_seen + nickserv_expire, source.GetAccount());
 		}

modules/protocol/inspircd.cpp

@@ -102,7 +102,7 @@ class InspIRCdProto final
 private:
 	static Anope::string GetAccountNicks(NickAlias* na)
 	{
-		if (!na)
+		if (!na || Config->GetModule("nickserv")->Get<bool>("nonicknameownership"))
 			return {};
 
 		Anope::string nicks;
@@ -637,6 +637,17 @@ public:
 		}
 	}
 
+	void SendOper(User *u) override
+	{
+		if (spanningtree_proto_ver < 1206)
+			return; // We can't force an oper on this version.
+
+		const Anope::map<Anope::string> tags = {
+			{ "~automatic", "" },
+		};
+		Uplink::Send(tags, "SVSOPER", u->GetUID(), u->Account()->o->ot->GetName());
+	}
+
 	bool IsExtbanValid(const Anope::string &mask) override
 	{
 		bool inverted;

modules/protocol/unrealircd.cpp

@@ -23,7 +23,10 @@ public:
 	PrimitiveExtensibleItem<ModData> ClientModData;
 	PrimitiveExtensibleItem<ModData> ChannelModData;
 
-	UnrealIRCdProto(Module *creator) : IRCDProto(creator, "UnrealIRCd 4+"), ClientModData(creator, "ClientModData"), ChannelModData(creator, "ChannelModData")
+	UnrealIRCdProto(Module *creator)
+		: IRCDProto(creator, "UnrealIRCd 6+")
+		, ClientModData(creator, "ClientModData")
+		, ChannelModData(creator, "ChannelModData")
 	{
 		DefaultPseudoclientModes = "+BioqS";
 		CanSVSNick = true;
@@ -216,21 +219,15 @@ private:
 
 	void SendConnect() override
 	{
-		/*
-		   NICKv2 = Nick Version 2
-		   VHP    = Sends hidden host
-		   UMODE2 = sends UMODE2 on user modes
-		   NICKIP = Sends IP on NICK
-		   SJ3    = Supports SJOIN
-		   NOQUIT = No Quit
-		   TKLEXT = Extended TKL we don't use it but best to have it
-		   MLOCK  = Supports the MLOCK server command
-		   VL     = Version Info
-		   SID    = SID/UID mode
-		*/
 		Uplink::Send("PASS", Config->Uplinks[Anope::CurrentUplink].password);
 
-		Uplink::Send("PROTOCTL", "NICKv2", "VHP", "UMODE2", "NICKIP", "SJOIN", "SJOIN2", "SJ3", "NOQUIT", "TKLEXT", "MLOCK", "SID", "MTAGS", "BIGLINES");
+		// BIGLINES: enable sending lines up to 16384 characters in length.
+		// EAUTH: communicates information about the local server.
+		// MLOCK: enable receiving the MLOCK message when a mode lock changes.
+		// MTAGS: enable receiving IRCv3 message tags.
+		// SID: communicates the unique identifier of the local server.
+		// VHP: enable receiving the vhost in UID.
+		Uplink::Send("PROTOCTL", "BIGLINES", "MLOCK", "MTAGS", "VHP");
 		Uplink::Send("PROTOCTL", "EAUTH=" + Me->GetName() + ",,,Anope-" + Anope::VersionShort());
 		Uplink::Send("PROTOCTL", "SID=" + Me->GetSID());
 
@@ -353,11 +350,8 @@ private:
 
 	void SendLogin(User *u, NickAlias *na) override
 	{
-		/* 3.2.10.4+ treats users logged in with accounts as fully registered, even if -r, so we can not set this here. Just use the timestamp. */
-		if (Servers::Capab.count("ESVID") > 0 && !na->nc->HasExt("UNCONFIRMED"))
+		if (!na->nc->HasExt("UNCONFIRMED"))
 			IRCD->SendMode(Config->GetClient("NickServ"), u, "+d", na->nc->display);
-		else
-			IRCD->SendMode(Config->GetClient("NickServ"), u, "+d", u->signon);
 	}
 
 	void SendLogout(User *u) override
@@ -448,9 +442,7 @@ private:
 
 	bool IsTagValid(const Anope::string &tname, const Anope::string &tvalue) override
 	{
-		if (Servers::Capab.count("MTAGS"))
-			return true;
-		return false;
+		return !!Servers::Capab.count("MTAGS");
 	}
 };
 
@@ -1753,8 +1745,6 @@ public:
 	void OnUserNickChange(User *u, const Anope::string &) override
 	{
 		u->RemoveModeInternal(Me, ModeManager::FindUserModeByName("REGISTERED"));
-		if (Servers::Capab.count("ESVID") == 0)
-			IRCD->SendLogout(u);
 	}
 
 	void OnChannelSync(Channel *c) override

src/config.cpp

@@ -179,7 +179,6 @@ Conf::Conf() : Block("")
 	ValidateNotEmpty("serverinfo", "motd", serverinfo->Get<const Anope::string>("motd"));
 
 	ValidateNotZero("options", "readtimeout", options->Get<time_t>("readtimeout"));
-	ValidateNotZero("options", "warningtimeout", options->Get<time_t>("warningtimeout"));
 
 	ValidateNotZero("networkinfo", "nicklen", networkinfo->Get<unsigned>("nicklen", "1"));
 	ValidateNotZero("networkinfo", "userlen", networkinfo->Get<unsigned>("userlen", "1"));

src/users.cpp

@@ -378,15 +378,16 @@ void User::Identify(NickAlias *na)
 	{
 		if (!this->nc->o->ot->modes.empty())
 		{
-			this->SetModes(NULL, this->nc->o->ot->modes);
-			this->SendMessage(NULL, "Changing your usermodes to \002%s\002", this->nc->o->ot->modes.c_str());
-			UserMode *um = ModeManager::FindUserModeByName("OPER");
+			auto *um = ModeManager::FindUserModeByName("OPER");
 			if (um && !this->HasMode("OPER") && this->nc->o->ot->modes.find(um->mchar) != Anope::string::npos)
 				IRCD->SendOper(this);
+
+			this->SetModes(NULL, this->nc->o->ot->modes);
+			this->SendMessage(NULL, _("Changing your usermodes to \002%s\002"), this->nc->o->ot->modes.c_str());
 		}
 		if (IRCD->CanSetVHost && !this->nc->o->vhost.empty())
 		{
-			this->SendMessage(NULL, "Changing your vhost to \002%s\002", this->nc->o->vhost.c_str());
+			this->SendMessage(NULL, _("Changing your vhost to \002%s\002"), this->nc->o->vhost.c_str());
 			this->SetDisplayedHost(this->nc->o->vhost);
 			IRCD->SendVHost(this, "", this->nc->o->vhost);
 		}
@@ -548,15 +549,16 @@ void User::SetModeInternal(const MessageSource &source, UserMode *um, const Anop
 		{
 			if (!this->nc->o->ot->modes.empty())
 			{
-				this->SetModes(NULL, this->nc->o->ot->modes);
-				this->SendMessage(NULL, "Changing your usermodes to \002%s\002", this->nc->o->ot->modes.c_str());
-				UserMode *oper = ModeManager::FindUserModeByName("OPER");
+				auto *oper = ModeManager::FindUserModeByName("OPER");
 				if (oper && !this->HasMode("OPER") && this->nc->o->ot->modes.find(oper->mchar) != Anope::string::npos)
 					IRCD->SendOper(this);
+
+				this->SetModes(NULL, this->nc->o->ot->modes);
+				this->SendMessage(NULL, _("Changing your usermodes to \002%s\002"), this->nc->o->ot->modes.c_str());
 			}
 			if (IRCD->CanSetVHost && !this->nc->o->vhost.empty())
 			{
-				this->SendMessage(NULL, "Changing your vhost to \002%s\002", this->nc->o->vhost.c_str());
+				this->SendMessage(NULL, _("Changing your vhost to \002%s\002"), this->nc->o->vhost.c_str());
 				this->SetDisplayedHost(this->nc->o->vhost);
 				IRCD->SendVHost(this, "", this->nc->o->vhost);
 			}

src/version.sh

@@ -2,5 +2,5 @@
 
 VERSION_MAJOR=2
 VERSION_MINOR=1
-VERSION_PATCH=8
+VERSION_PATCH=9
 VERSION_EXTRA=""