From b39e038743ae18c56e1983f5b3afe26b2daee620 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 3 May 2022 15:55:23 +0100
Subject: Install into /usr/bin instead of /usr/sbin.

We discourage users from running as root so installing into sbin on
system-wide installs doesn't make sense anyway.
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index b6c9c4cf8..2ac2101dc 100755
--- a/configure
+++ b/configure
@@ -217,7 +217,7 @@ if (defined $opt_portable) {
 	$config{SCRIPT_DIR}  = $opt_script_dir  // $config{BASE_DIR};
 } elsif (defined $opt_system) {
 	$config{BASE_DIR}    = $opt_prefix      // '/';
-	$config{BINARY_DIR}  = $opt_binary_dir  // catdir $config{BASE_DIR}, 'usr/sbin';
+	$config{BINARY_DIR}  = $opt_binary_dir  // catdir $config{BASE_DIR}, 'usr/bin';
 	$config{CONFIG_DIR}  = $opt_config_dir  // catdir $config{BASE_DIR}, 'etc/inspircd';
 	$config{DATA_DIR}    = $opt_data_dir    // catdir $config{BASE_DIR}, 'var/lib/inspircd';
 	$config{EXAMPLE_DIR} = $opt_example_dir // catdir $config{BASE_DIR}, 'usr/share/doc/inspircd';
-- 
cgit v1.3.1-10-gc9f91


From e16931ff3754e9d3a8b99f029b336a9303b71a86 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 6 May 2022 09:00:45 +0100
Subject: Fix the argon2 package name on newer versions of Debian.

---
 src/modules/extra/m_argon2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/extra/m_argon2.cpp b/src/modules/extra/m_argon2.cpp
index 9a3826723..189ad4d22 100644
--- a/src/modules/extra/m_argon2.cpp
+++ b/src/modules/extra/m_argon2.cpp
@@ -23,7 +23,7 @@
 
 /// $PackageInfo: require_system("arch") argon2 pkgconf
 /// $PackageInfo: require_system("darwin") argon2 pkg-config
-/// $PackageInfo: require_system("debian" "9.0") libargon2-0 pkg-config
+/// $PackageInfo: require_system("debian" "10.0") libargon2-dev pkg-config
 /// $PackageInfo: require_system("ubuntu" "18.04") libargon2-0-dev pkg-config
 
 
-- 
cgit v1.3.1-10-gc9f91


From a8e6cbf414b4f42f7da3b2ed86914c04bdb45eb8 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sat, 7 May 2022 17:01:53 +0100
Subject: Make linking servers over UNIX sockets less difficult.

Closes #1730.
---
 src/modules/m_spanningtree/utils.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 84d96e098..1a8935e93 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -211,7 +211,8 @@ void SpanningTreeUtilities::RefreshIPCache()
 	for (std::vector<reference<Link> >::iterator i = LinkBlocks.begin(); i != LinkBlocks.end(); ++i)
 	{
 		Link* L = *i;
-		if (!L->Port)
+		bool isunix = L->IPAddr.find('/') != std::string::npos;
+		if (!L->Port && !isunix)
 		{
 			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Ignoring a link block without a port.");
 			/* Invalid link block */
@@ -222,7 +223,7 @@ void SpanningTreeUtilities::RefreshIPCache()
 
 		irc::sockets::sockaddrs dummy;
 		bool ipvalid = irc::sockets::aptosa(L->IPAddr, L->Port, dummy);
-		if ((L->IPAddr == "*") || (ipvalid))
+		if ((L->IPAddr == "*") || (isunix) || (ipvalid))
 			ValidIPs.push_back(L->IPAddr);
 		else if (this->Creator->DNS)
 		{
@@ -267,9 +268,19 @@ void SpanningTreeUtilities::ReadConfiguration()
 		for (std::string s; sep.GetToken(s);)
 			L->AllowMasks.push_back(s);
 
+		const std::string path = tag->getString("path");
+		if (path.empty())
+		{
+			L->IPAddr = tag->getString("ipaddr");
+			L->Port = tag->getUInt("port", 0);
+		}
+		else
+		{
+			L->IPAddr = ServerInstance->Config->Paths.PrependData(path);
+			L->Port = 0;
+		}
+
 		L->Name = tag->getString("name");
-		L->IPAddr = tag->getString("ipaddr");
-		L->Port = tag->getUInt("port", 0);
 		L->SendPass = tag->getString("sendpass", tag->getString("password"));
 		L->RecvPass = tag->getString("recvpass", tag->getString("password"));
 		L->Fingerprint = tag->getString("fingerprint");
-- 
cgit v1.3.1-10-gc9f91