From bc3ab094d40141842343fa18a10c99d592daaeb2 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sun, 11 Nov 2018 01:44:50 +0100 Subject: [PATCH] Revert "99builddsourceslist: temporarily add stretch-proposed-updates to stretch-security chroots" Debian 9.6 is out, so the temporary workaround is no longer necessary. This reverts commit 6817281d2e8f2d2a0991b7517d451e6c7e38734a. --- .../schroot/files/schroot-setup.d/99builddsourceslist | 9 --------- 1 file changed, 9 deletions(-) diff --git a/modules/schroot/files/schroot-setup.d/99builddsourceslist b/modules/schroot/files/schroot-setup.d/99builddsourceslist index 434249026..ad1354afc 100755 --- 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} -- 2.20.1