From: Aurelien Jarno Date: Mon, 20 Aug 2018 17:43:17 +0000 (+0200) Subject: 99builddsourceslist: temporarily add stretch-proposed-updates to stretch-security... X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6817281d2e8f2d2a0991b7517d451e6c7e38734a;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 60.x releases. This should be removed with the release of the 9.5 point release. --- diff --git a/modules/schroot/files/schroot-setup.d/99builddsourceslist b/modules/schroot/files/schroot-setup.d/99builddsourceslist index d9dc92d0d..506a55cb4 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 # Hack: for kfreebsd-* the base suite for jessie-backports and jessie-backports-sloppy is jessie-kfreebsd (and not jessie) if echo "${CHROOT_ALIAS}" | grep -q 'kfreebsd-\w\+-sbuild$' ; then