Skip to content

Add default value for APT security repo suite #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gbp merged 2 commits into from
Nov 20, 2025
Merged

Add default value for APT security repo suite #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4953a18
Add default value for APT security repo suite
gbp Nov 10, 2025
0e766fe
Remove Buster and add Trixie
sagepe Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions bin/install-site.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,17 +141,14 @@ update_apt_sources() {
esac
elif [ x"$DISTRIBUTION" = x"debian" ] ; then
case "$DISTVERSION" in
buster)
BACKPORTS=false
SECURITY="$DISTVERSION/updates"
;;
bullseye)
BACKPORTS=false
SECURITY="$DISTVERSION-security"
;;
bookworm)
BACKPORTS=false
SECURITY="$DISTVERSION-security"
;;
trixie)
BACKPORTS=false
;;
*)
notice_msg "Unsupported distribution and version combination $DISTRIBUTION $DISTVERSION"
Expand All @@ -170,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
Suites: $DISTVERSION-security
Components: main contrib non-free
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg

Expand Down Expand Up @@ -200,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
Expand Down
13 changes: 5 additions & 8 deletions shlib/installfns
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,17 +141,14 @@ update_apt_sources() {
esac
elif [ x"$DISTRIBUTION" = x"debian" ] ; then
case "$DISTVERSION" in
buster)
BACKPORTS=false
SECURITY="$DISTVERSION/updates"
;;
bullseye)
BACKPORTS=false
SECURITY="$DISTVERSION-security"
;;
bookworm)
BACKPORTS=false
SECURITY="$DISTVERSION-security"
;;
trixie)
BACKPORTS=false
;;
*)
notice_msg "Unsupported distribution and version combination $DISTRIBUTION $DISTVERSION"
Expand All @@ -170,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
Suites: $DISTVERSION-security
Components: main contrib non-free
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg

Expand Down Expand Up @@ -200,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
Expand Down
Loading