X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fschroot%2Ffiles%2Fschroot-setup.d%2F99builddsourceslist;h=d96f711e97eb18b08e9681f8d5dd97eb6bae4dbf;hb=11a0f9c15ed03348c1c68b154cc58bdc19b742c5;hp=535c836790bcf89fce7b62df69312f77b0b35cb9;hpb=840177adeb15e1a9f23cff136708eb60a10cd3a7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/schroot/files/schroot-setup.d/99builddsourceslist b/modules/schroot/files/schroot-setup.d/99builddsourceslist
index 535c83679..d96f711e9 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.12 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}
@@ -178,7 +187,6 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
         echo 'APT::Install-Recommends 0;' >> ${APT_CONF}
         echo 'Dir::Etc::SourceList "sources.buildd.list";' >> ${APT_CONF}
         echo 'Acquire::Languages "none";' >> ${APT_CONF}
-        echo 'Acquire::http::AllowRedirect "false";' >> ${APT_CONF}
 
         if [ -n "${APT_KEYS}" ]; then
             for KEY in ${APT_KEYS}; do