From: Julien Cristau <jcristau@debian.org>
Date: Fri, 25 Oct 2019 20:26:59 +0000 (+0200)
Subject: 99builddsourceslist: temporarily add stretch-proposed-updates to stretch-security... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=82858a7527e77d5b2605845afbfef9d5c38effb8;p=mirror%2Fdsa-puppet.git

99builddsourceslist: temporarily add stretch-proposed-updates to stretch-security chroots

Temporarily add stretch-proposed-updates for stretch-security chroots as requested
by the security team to handle Thunderbird and Firefox ESR 68.x releases. This should
be removed with the release of the 9.12 point release.
---

diff --git a/modules/schroot/files/schroot-setup.d/99builddsourceslist b/modules/schroot/files/schroot-setup.d/99builddsourceslist
index ad1354afc..434249026 100755
--- a/modules/schroot/files/schroot-setup.d/99builddsourceslist
+++ b/modules/schroot/files/schroot-setup.d/99builddsourceslist
@@ -140,6 +140,15 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
             domirror "https://security-master.debian.org/debian-security ${SUITE_BASE}/updates COMPONENT" ${APT_LIST}
             domirror "https://security-master.debian.org/debian-security-buildd buildd-${SUITE_BASE}/updates COMPONENT" ${APT_LIST}
 
+            # Temporarily add stretch-proposed-updates for stretch-security chroots as requested
+            # by the security team to handle Thunderbird and Firefox ESR 60.x releases. This should
+            # be removed with the release of the 9.5 point release.
+            if [ ${SUITE_BASE} = "stretch" ] ; then
+                SUITES="${SUITE_BASE}-proposed-updates"
+                [ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE COMPONENT" ${APT_LIST}
+                domirror "http://ftp.debian.org/debian SUITE COMPONENT" ${APT_LIST}
+            fi
+
         elif [ "${SUITE_VARIANT%%-sloppy}" = 'backports' ]; then
             SUITES="${SUITE_BASE}"
             [ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE COMPONENT" ${APT_LIST}