From d090f5455e7e32f0ccfa010b18afec648259a592 Mon Sep 17 00:00:00 2001
From: Stephen Bennett <spb@users.noreply.github.com>
Date: Mon, 28 Oct 2024 17:15:10 +0000
Subject: [PATCH 1/2] Update Sable and enable more test (#293)

---
 .github/workflows/test-stable.yml | 2 +-
 Makefile                          | 3 ---
 irctest/server_tests/whois.py     | 1 -
 workflows.yml                     | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-stable.yml b/.github/workflows/test-stable.yml
index 3e5c911..76ef5a6 100644
--- a/.github/workflows/test-stable.yml
+++ b/.github/workflows/test-stable.yml
@@ -1140,7 +1140,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: sable
-        ref: e9701e5e8d0c4f278ddd61ce7285f4918ecf99e9
+        ref: 52397dc9e0f27c3ed197f984c00f06639870716d
         repository: Libera-Chat/sable
     - name: Install rust toolchain
       uses: actions-rs/toolchain@v1
diff --git a/Makefile b/Makefile
index dc24586..b85ce66 100644
--- a/Makefile
+++ b/Makefile
@@ -84,15 +84,12 @@ LIMNORIA_SELECTORS := \
 	$(EXTRA_SELECTORS)
 
 # Tests marked with arbitrary_client_tags or react_tag can't pass because Sable does not support client tags yet
-# Tests marked with private_chathistory can't pass because Sable does not implement CHATHISTORY for DMs
-
 SABLE_SELECTORS := \
 	not Ergo \
 	and not deprecated \
 	and not strict \
 	and not arbitrary_client_tags \
 	and not react_tag \
-	and not private_chathistory \
 	and not list and not lusers and not time and not info \
 	$(EXTRA_SELECTORS)
 
diff --git a/irctest/server_tests/whois.py b/irctest/server_tests/whois.py
index 274fe04..475dcf6 100644
--- a/irctest/server_tests/whois.py
+++ b/irctest/server_tests/whois.py
@@ -221,7 +221,6 @@ class WhoisTestCase(_WhoisTestMixin, cases.BaseServerTestCase):
         )
 
     @cases.mark_specifications("RFC2812")
-    @cases.xfailIfSoftware(["Sable"], "https://github.com/Libera-Chat/sable/issues/101")
     def testWhoisMissingUser(self):
         """Test WHOIS on a nonexistent nickname."""
         self.connectClient("qux", name="qux")
diff --git a/workflows.yml b/workflows.yml
index 1995b87..fbf7b95 100644
--- a/workflows.yml
+++ b/workflows.yml
@@ -249,7 +249,7 @@ software:
         name: Sable
         repository: Libera-Chat/sable
         refs:
-            stable: e9701e5e8d0c4f278ddd61ce7285f4918ecf99e9
+            stable: 52397dc9e0f27c3ed197f984c00f06639870716d
             release: null
             devel: master
             devel_release: null

From 2680502dfe496a597bf8fb3cfc08cd3b6a698b17 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Sun, 3 Nov 2024 09:24:05 +0000
Subject: [PATCH 2/2] Allow any extban format on InspIRCd. (#294)

This should stop the mute extban test failing when extbanformat is set to name (which will soon be the default in git master).
---
 irctest/controllers/inspircd.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/irctest/controllers/inspircd.py b/irctest/controllers/inspircd.py
index 36abdfb..b2504dd 100644
--- a/irctest/controllers/inspircd.py
+++ b/irctest/controllers/inspircd.py
@@ -33,7 +33,8 @@ TEMPLATE_CONFIG = """
       class="ServerOperators"
       >
 
-<options casemapping="ascii">
+<options casemapping="ascii"
+         extbanformat="any">
 
 # Disable 'NOTICE #chan :*** foo invited bar into the channel-
 <security announceinvites="none">