From 6b4838ad208cd3447d2c8d6535827e0dfc74a145 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Tue, 14 Nov 2023 02:16:35 -0800
Subject: [PATCH] Update "sq" availability matrix (yes trixie, no mantic)

https://tracker.debian.org/news/1478171/rust-sequoia-sq-0310-1-migrated-to-testing/
https://packages.ubuntu.com/sq -> https://launchpad.net/bugs/2036122 (back in "noble" though)
---
 Dockerfile-curl.template      | 6 +++---
 debian/trixie/curl/Dockerfile | 1 +
 ubuntu/mantic/curl/Dockerfile | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile-curl.template b/Dockerfile-curl.template
index bc1c8c7a..5b42b07f 100644
--- a/Dockerfile-curl.template
+++ b/Dockerfile-curl.template
@@ -8,14 +8,14 @@ RUN set -eux; \
 		gnupg \
 		netbase \
 {{ if [
-	# we want versions of "sq" that contain https://gitlab.com/sequoia-pgp/sequoia/-/commit/b41e1504cd29097328cb21f95808c9972188499e (and thus "sq keyserver" subcommands)
+	# we want versions of "sq" that contain https://gitlab.com/sequoia-pgp/sequoia/-/commit/b41e1504cd29097328cb21f95808c9972188499e (and thus "sq keyserver" subcommands; 0.26+)
 	# https://packages.debian.org/sq
-	# https://packages.ubuntu.com/sq
 	"bullseye", # 0.24
 	"buster",   # no sq
+	# https://packages.ubuntu.com/sq
+	"mantic",   # no sq
 	"jammy",    # 0.25
 	"focal",    # no sq
-	"trixie",   # no sq, https://github.com/docker-library/buildpack-deps/pull/149#issuecomment-1692238397
 	empty # trailing comma
 ] | index(env.codename) then "" else ( -}}
 		sq \
diff --git a/debian/trixie/curl/Dockerfile b/debian/trixie/curl/Dockerfile
index 46e2ec3a..6e72c357 100644
--- a/debian/trixie/curl/Dockerfile
+++ b/debian/trixie/curl/Dockerfile
@@ -13,6 +13,7 @@ RUN set -eux; \
 		curl \
 		gnupg \
 		netbase \
+		sq \
 		wget \
 	; \
 	rm -rf /var/lib/apt/lists/*
diff --git a/ubuntu/mantic/curl/Dockerfile b/ubuntu/mantic/curl/Dockerfile
index 436fa064..6b75df32 100644
--- a/ubuntu/mantic/curl/Dockerfile
+++ b/ubuntu/mantic/curl/Dockerfile
@@ -13,7 +13,6 @@ RUN set -eux; \
 		curl \
 		gnupg \
 		netbase \
-		sq \
 		wget \
 # https://bugs.debian.org/929417
 		tzdata \