From 082e0e308b5cbebd9c7536491c19a69012614b79 Mon Sep 17 00:00:00 2001
From: Duncan Bellamy <dunk@denkimushi.com>
Date: Sun, 18 Aug 2024 14:12:13 +0000
Subject: [PATCH] testing/seastar: update to 22.11.0_git20240815

* drop support for old fmt versions
---
 testing/seastar/20-c-ares-ignore.patch | 28 --------------------------
 testing/seastar/APKBUILD               | 16 +++++++--------
 2 files changed, 7 insertions(+), 37 deletions(-)
 delete mode 100644 testing/seastar/20-c-ares-ignore.patch

diff --git a/testing/seastar/20-c-ares-ignore.patch b/testing/seastar/20-c-ares-ignore.patch
deleted file mode 100644
index 35f1f2d450f..00000000000
--- a/testing/seastar/20-c-ares-ignore.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Holger Jaekel <holger.jaekel@gmx.de>
-Summary: ignore depreciation warnings for ares_fds and ares_process
-----
-
---- a/src/net/dns.cc
-+++ b/src/net/dns.cc
-@@ -501,7 +501,10 @@
-             FD_ZERO(&readers);
-             FD_ZERO(&writers);
- 
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-             n = ares_fds(_channel, &readers, &writers);
-+#pragma GCC diagnostic pop
- 
-             dns_log.trace("ares_fds: {}", n);
- 
-@@ -534,7 +537,10 @@
-                 }
-             }
- 
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-             ares_process(_channel, &readers, &writers);
-+#pragma GCC diagnostic pop
-         } while (n != 0);
-     }
- 
diff --git a/testing/seastar/APKBUILD b/testing/seastar/APKBUILD
index 05990899dd5..e0dfe0fbdcd 100644
--- a/testing/seastar/APKBUILD
+++ b/testing/seastar/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Duncan Bellamy <dunk@denkimushi.com>
 pkgname=seastar
-pkgver=22.11.0_git20240711
+pkgver=22.11.0_git20240815
 pkgrel=0
-_commit="3fdb59979aa919face21390d517846258a83c4aa"
+_commit="e42e382648e459a608bf42f9d8c1d95550182362"
 _ver="${_commit:=$pkgver}"
 pkgdesc="High performance server-side application framework"
 url="https://seastar.io"
@@ -43,8 +43,7 @@ aarch64|x86_64) makedepends="$makedepends dpdk-dev" ;;
 esac
 checkdepends="py3-yaml"
 subpackages="$pkgname-dev $pkgname-testing"
-source="$pkgname-$_ver.tar.gz::https://github.com/scylladb/seastar/archive/$_ver.tar.gz
-	20-c-ares-ignore.patch"
+source="$pkgname-$_ver.tar.gz::https://github.com/scylladb/seastar/archive/$_ver.tar.gz"
 builddir="$srcdir/$pkgname-$_ver"
 
 build() {
@@ -53,7 +52,7 @@ build() {
 		*) 		local _dpdk=OFF ;;
 	esac
 	if [ "$CBUILD" != "$CHOST" ]; then
-		local crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+		local _crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
 	export CXXFLAGS="$CXXFLAGS -DSEASTAR_DEFAULT_ALLOCATOR -Wno-cpp"
 	cmake -B build -G Ninja \
@@ -65,14 +64,14 @@ build() {
 		-DSeastar_DEMOS=OFF \
 		-DSeastar_DOCS=OFF \
 		-DSeastar_DPDK="$_dpdk" \
-		$crossopts
+		$_crossopts
 	cmake --build build
 }
 
 check() {
 	# rest: needs root (doesn't work in container) for hardware access
 	# see also: https://github.com/scylladb/seastar/issues/1826
-	local _tests="chunk_parsers|httpd|request_parser|semaphore|stall_detector|tls|app-template"
+	local _tests="chunk_parsers|dns|httpd|request_parser|semaphore|stall_detector|tls|app-template"
 	# -j2: "Could not initialize seastar: std::runtime_error (Could not setup Async I/O:
 	# "Not enough request capacity in /proc/sys/fs/aio-max-nr. Try increasing that number
 	# "or reducing the amount of logical CPUs available for your application)"
@@ -94,6 +93,5 @@ testing() {
 }
 
 sha512sums="
-e400e5b9f79aae9ba9acc6d5a74bcffc83827b96651d587a5e3515e38dce3f6df8fc5fb8d9f96e7e7e886ab793ed85bc9dac41dd36effdfeaccc013ec1dfb89f  seastar-3fdb59979aa919face21390d517846258a83c4aa.tar.gz
-f40497f08e2f704d5da3fb9d37c8c2aba8a39e047de8664534826287873b1e90ca980b736aa2bf96bfd77bcbcc4ca612353d64c78a7cb566d59ffe55e2365eb0  20-c-ares-ignore.patch
+448ef3c4f0b3db781fd8683b4f6b43183da19582a70982922d1121791faa17d7e34feacd5aa7b412b227cb8f47d014c85f21cb5025cacd50940bfd7fb6856020  seastar-e42e382648e459a608bf42f9d8c1d95550182362.tar.gz
 "