Makefile, etc/aptsrc.conf: Update for new Debian releases.

diff --git a/Makefile b/Makefile
index 1c0c594e5bdba37e3bd56a785858db60ebb4d258..b09df97752b7780eaf992ffdfda9f905c75e9381 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ PROXY                  = $(shell \
 ## Debian distributions to support.
 CONFIG_VARS            += PRIMARY_DIST DISTS
 PRIMARY_DIST            = stretch
 ## 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
 
 ## Host's native architecture(s).
 CONFIG_VARS            += MYARCH NATIVE_ARCHS

diff --git a/etc/aptsrc.conf b/etc/aptsrc.conf
index 8083c5ac44de2db9961a8b0ccb3e7ceead8cebcc..ab8fcf4facafaa9fd4f22562f98f8c8ea0837b87 100644 (file)
--- a/etc/aptsrc.conf
+++ b/etc/aptsrc.conf
@@ -14,22 +14,28 @@ default
 
 distribution debian
        banner = Debian GNU/Linux.
 
 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[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/
        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[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
        releases[backports] = *-backports
        components = main non-free contrib

+       components[archive-security] = main

        components[security-*] = main
        components[backports] = main
 
        components[security-*] = main
        components[backports] = main