From 7960fd976ef95b43761790a34dd8329d84969f30 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Sun, 15 Aug 2021 11:48:46 +0100
Subject: [PATCH] Use $CODENAME/updates for security pre-bullseye

or $CODENAME-security for bullseye onwards.

Backported from master
---
 debian/changelog    | 10 ++++++++++
 tools/apt-selection |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2dcee774..b0b5d554 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debian-cd (3.1.35+deb11u1) UNRELEASED; urgency=medium
+
+  [ Steve McIntyre ]
+  Backports from master for bullseye builds:
+
+  * Use $CODENAME/updates for security pre-bullseye, or
+    $CODENAME-security for bullseye onwards.
+
+ -- Steve McIntyre <93sam@debian.org>  Mon, 26 Jul 2021 01:02:03 +0100
+
 debian-cd (3.1.35) unstable; urgency=medium
 
   [ Steve McIntyre ]
diff --git a/tools/apt-selection b/tools/apt-selection
index 209e0c5b..4cf424cf 100755
--- a/tools/apt-selection
+++ b/tools/apt-selection
@@ -95,7 +95,12 @@ if [ ! -e "$APTTMP/$THIS_PKGSET/apt/sources.list" ]; then
 
 	# Security mirror ...
 	if [ -n "$SECURITY" ]; then
-		echo "$ADEB file:${SECURITY:-$MIRROR} $CODENAME/updates $sections" \
+		case $CODENAME in
+			stretch|buster) SEC=$CODENAME/updates;;
+			*)		SEC=$CODENAME-security;;
+		esac
+
+		echo "$ADEB file:${SECURITY:-$MIRROR} $SEC $sections" \
 		>> $APTTMP/$THIS_PKGSET/apt/sources.list
 	fi