From 168cdcfeb376c76e180a84513565540385747ea3 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 10 Jun 2024 03:24:21 +0100
Subject: [PATCH] Makefile, etc/aptsrc.conf: Update for new Debian releases.

---
 Makefile        |  2 +-
 etc/aptsrc.conf | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 1c0c594..b09df97 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ PROXY			 = $(shell \
 ## Debian distributions to support.
 CONFIG_VARS		+= PRIMARY_DIST DISTS
 PRIMARY_DIST		 = stretch
-DISTS			 = $(PRIMARY_DIST) buster bullseye sid
+DISTS			 = $(PRIMARY_DIST) buster bullseye bookworm sid
 
 ## Host's native architecture(s).
 CONFIG_VARS		+= MYARCH NATIVE_ARCHS
diff --git a/etc/aptsrc.conf b/etc/aptsrc.conf
index 8083c5a..ab8fcf4 100644
--- a/etc/aptsrc.conf
+++ b/etc/aptsrc.conf
@@ -14,22 +14,28 @@ default
 
 distribution debian
 	banner = Debian GNU/Linux.
+	uri[archive] = http://archive.debian.org/debian/
 	uri[base] = %debmirror/debian/
 	uri[updates] = %debmirror/debian/
 	uri[backports] = %debmirror/debian/
+	uri[archive-security] = http://archive.debian.org/debian-security/
 	uri[security-mirror] = %debmirror/debian-security/
 	uri[security-upstream] = http://security.debian.org/debian-security/
 	uri[nsecurity-mirror] = %debmirror/debian-security/
 	uri[nsecurity-upstream] = http://security.debian.org/debian-security/
+	release[updates] = %RELEASE-updates
+	release[archive-security] = %RELEASE/updates
 	release[security-*] = %RELEASE/updates
 	release[nsecurity-*] = %RELEASE-security
-	release[updates] = %RELEASE-updates
-	releases[base] = stable testing unstable stretch buster bullseye sid
-	releases[updates] = stable testing stretch buster bullseye
-	releases[security-*] = stable testing stretch buster
-	releases[nsecurity-*] = bullseye
+	releases[archive] = stretch
+	releases[base] = oldstable stable testing unstable buster bullseye bookworm sid
+	releases[updates] = oldstable stable testing buster bullseye bookworm
+	releases[archive-security] = stretch
+	releases[security-*] = oldstable stable testing buster
+	releases[nsecurity-*] = bullseye bookworm
 	releases[backports] = *-backports
 	components = main non-free contrib
+	components[archive-security] = main
 	components[security-*] = main
 	components[backports] = main
 
-- 
2.11.0