From 448f99c7f2f907e32e636fb2e4c7431b7b4bc061 Mon Sep 17 00:00:00 2001
From: "Peter (Stig) Edwards" <thatsafunnyname@gmail.com>
Date: Fri, 29 May 2026 21:46:21 +0100
Subject: [PATCH 1/2] Support running tests hosts with ipv6 disabled.

---
 test/lib/Connection.cpp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/test/lib/Connection.cpp b/test/lib/Connection.cpp
index d2aff8c8..5c594c1a 100644
--- a/test/lib/Connection.cpp
+++ b/test/lib/Connection.cpp
@@ -49,17 +49,29 @@ Connection::Connection(socket_or_port_t socket_or_port) {
     size = UNIX;
 
   } else {
+    const auto port = get<int>(socket_or_port);
+
+    bool useIPv6 = true;
     if (0 > (sock = socket_ex(AF_INET6, SOCK_STREAM, 0, SOCK_NONBLOCK|SOCK_CLOEXEC))) {
-      throw runtime_error(error({"socket(): ", strerror(errno)}));
+      useIPv6 = false;
+      if (0 > (sock = socket_ex(AF_INET, SOCK_STREAM, 0, SOCK_NONBLOCK|SOCK_CLOEXEC))) {
+        throw runtime_error(error({"socket(): ", strerror(errno)}));
+      }
     }
 
-    const auto port = get<int>(socket_or_port);
-    auto sa = reinterpret_cast<struct sockaddr_in6 *>(&addr);
-    sa->sin6_family = AF_INET6;
-    sa->sin6_port = htons(static_cast<unsigned short>(port));
-    sa->sin6_addr = IN6ADDR_LOOPBACK_INIT;
-
-    size = INET6;
+    if (useIPv6) {
+      auto sa = reinterpret_cast<struct sockaddr_in6 *>(&addr);
+      sa->sin6_family = AF_INET6;
+      sa->sin6_port = htons(static_cast<unsigned short>(port));
+      sa->sin6_addr = IN6ADDR_LOOPBACK_INIT;
+      size = INET6;
+    } else {
+      auto sa = reinterpret_cast<struct sockaddr_in *>(&addr);
+      sa->sin_family = AF_INET;
+      sa->sin_port = htons(static_cast<unsigned short>(port));
+      sa->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+      size = INET;
+    }
   }
 }
 

From 72be81c17e7f7b919824888a6b22e605127f77a0 Mon Sep 17 00:00:00 2001
From: "Peter (Stig) Edwards" <thatsafunnyname@gmail.com>
Date: Fri, 29 May 2026 22:19:26 +0100
Subject: [PATCH 2/2] On freebsd tbb has been replaced by onetbb

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252648
---
 .builds/freebsd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 1f603497..3c21f1ce 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -11,7 +11,7 @@ packages:
   - py311-sphinx
   - py311-m2r
   - rsync
-  - tbb
+  - onetbb
 sources:
   - https://github.com/awesomized/libmemcached
 secrets: