From 4953a18a137c2e1480e8949d7d70ea5f87861572 Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Mon, 10 Nov 2025 09:57:49 +0000
Subject: [PATCH 1/2] Add default value for APT security repo suite

Add fallback default based on distribution version to allow unsupported
distributions to install software when explicit security suite config is
not available.
---
 bin/install-site.sh | 4 +---
 shlib/installfns    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/bin/install-site.sh b/bin/install-site.sh
index 82885c78..62727577 100755
--- a/bin/install-site.sh
+++ b/bin/install-site.sh
@@ -147,11 +147,9 @@ update_apt_sources() {
                 ;;
             bullseye)
                 BACKPORTS=false
-                SECURITY="$DISTVERSION-security"
                 ;;
             bookworm)
                 BACKPORTS=false
-                SECURITY="$DISTVERSION-security"
                 ;;
             *)
                 notice_msg "Unsupported distribution and version combination $DISTRIBUTION $DISTVERSION"
@@ -170,7 +168,7 @@ Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
 # Security Updates:
 Types: deb deb-src
 URIs: http://deb.debian.org/debian-security
-Suites: $SECURITY
+Suites: ${SECURITY:-"$DISTVERSION-security"}
 Components: main contrib non-free
 Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
 
diff --git a/shlib/installfns b/shlib/installfns
index 2cac6181..e603c573 100755
--- a/shlib/installfns
+++ b/shlib/installfns
@@ -147,11 +147,9 @@ update_apt_sources() {
                 ;;
             bullseye)
                 BACKPORTS=false
-                SECURITY="$DISTVERSION-security"
                 ;;
             bookworm)
                 BACKPORTS=false
-                SECURITY="$DISTVERSION-security"
                 ;;
             *)
                 notice_msg "Unsupported distribution and version combination $DISTRIBUTION $DISTVERSION"
@@ -170,7 +168,7 @@ Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
 # Security Updates:
 Types: deb deb-src
 URIs: http://deb.debian.org/debian-security
-Suites: $SECURITY
+Suites: ${SECURITY:-"$DISTVERSION-security"}
 Components: main contrib non-free
 Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
 

From 0e766fed0251b14e0ab06dcc1e40c83dd5121141 Mon Sep 17 00:00:00 2001
From: Sam Pearson <sam@sgp.me.uk>
Date: Tue, 18 Nov 2025 14:40:47 +0000
Subject: [PATCH 2/2] Remove Buster and add Trixie

This also removes logic around the name of the security suite as with
the end of support for Buster this is now standardised again.
---
 bin/install-site.sh | 11 +++++------
 shlib/installfns    | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/bin/install-site.sh b/bin/install-site.sh
index 62727577..3be51f68 100755
--- a/bin/install-site.sh
+++ b/bin/install-site.sh
@@ -141,16 +141,15 @@ update_apt_sources() {
         esac
     elif [ x"$DISTRIBUTION" = x"debian" ] ; then
         case "$DISTVERSION" in
-            buster)
-                BACKPORTS=false
-                SECURITY="$DISTVERSION/updates"
-                ;;
             bullseye)
                 BACKPORTS=false
                 ;;
             bookworm)
                 BACKPORTS=false
                 ;;
+            trixie)
+                BACKPORTS=false
+                ;;
             *)
                 notice_msg "Unsupported distribution and version combination $DISTRIBUTION $DISTVERSION"
                 ;;
@@ -168,7 +167,7 @@ Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
 # Security Updates:
 Types: deb deb-src
 URIs: http://deb.debian.org/debian-security
-Suites: ${SECURITY:-"$DISTVERSION-security"}
+Suites: $DISTVERSION-security
 Components: main contrib non-free
 Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
 
@@ -198,7 +197,7 @@ update_mysociety_apt_sources() {
     # We build packages targetted at Debian releases.
     # Try and select the most appropritate ones for Ubuntu.
     case "$DISTVERSION" in
-        focal|jammy|buster|bullseye|bookworm)
+        focal|jammy|bullseye|bookworm|trixie)
             cat > /etc/apt/sources.list.d/mysociety.sources <<EOF
 Types: deb
 URIs: http://debian.mysociety.org
diff --git a/shlib/installfns b/shlib/installfns
index e603c573..96a2d9e3 100755
--- a/shlib/installfns
+++ b/shlib/installfns
@@ -141,16 +141,15 @@ update_apt_sources() {
         esac
     elif [ x"$DISTRIBUTION" = x"debian" ] ; then
         case "$DISTVERSION" in
-            buster)
-                BACKPORTS=false
-                SECURITY="$DISTVERSION/updates"
-                ;;
             bullseye)
                 BACKPORTS=false
                 ;;
             bookworm)
                 BACKPORTS=false
                 ;;
+            trixie)
+                BACKPORTS=false
+                ;;
             *)
                 notice_msg "Unsupported distribution and version combination $DISTRIBUTION $DISTVERSION"
                 ;;
@@ -168,7 +167,7 @@ Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
 # Security Updates:
 Types: deb deb-src
 URIs: http://deb.debian.org/debian-security
-Suites: ${SECURITY:-"$DISTVERSION-security"}
+Suites: $DISTVERSION-security
 Components: main contrib non-free
 Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
 
@@ -198,7 +197,7 @@ update_mysociety_apt_sources() {
     # We build packages targetted at Debian releases.
     # Try and select the most appropritate ones for Ubuntu.
     case "$DISTVERSION" in
-        focal|jammy|buster|bullseye|bookworm)
+        focal|jammy|bullseye|bookworm|trixie)
             cat > /etc/apt/sources.list.d/mysociety.sources <<EOF
 Types: deb
 URIs: http://debian.mysociety.org