Revert "99builddsourceslist: temporarily add stretch-proposed-updates to stretch...

Debian 9.6 is out, so the temporary workaround is no longer necessary.

This reverts commit 6817281d2e8f2d2a0991b7517d451e6c7e38734a.

diff --git a/modules/schroot/files/schroot-setup.d/99builddsourceslist b/modules/schroot/files/schroot-setup.d/99builddsourceslist
index 4342490..ad1354a 100755 (executable)
--- a/modules/schroot/files/schroot-setup.d/99builddsourceslist
+++ b/modules/schroot/files/schroot-setup.d/99builddsourceslist
@@ -140,15 +140,6 @@ 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}