From 261a5449bbce875b95ef827d97d4e4b9168c6d49 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Tue, 13 Feb 2018 15:17:33 +0100 Subject: [PATCH] Revert "99builddsourceslist: access the security archive using https" This reverts commit f77a22de23c38230527be61375482971dea55fef. This doesn't work, we also need ca-certificate in the chroot :-( --- .../files/schroot-setup.d/99builddsourceslist | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/schroot/files/schroot-setup.d/99builddsourceslist b/modules/schroot/files/schroot-setup.d/99builddsourceslist index d9dc92d0d..7a613913c 100755 --- a/modules/schroot/files/schroot-setup.d/99builddsourceslist +++ b/modules/schroot/files/schroot-setup.d/99builddsourceslist @@ -137,8 +137,8 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then [ -n "${debian_mirror}" ] && domirror "${debian_mirror} ${SUITE_BASE} COMPONENT" ${APT_LIST} domirror "http://ftp.debian.org/debian ${SUITE_BASE} COMPONENT" ${APT_LIST} [ -n "${security_mirror}" ] && domirror "${security_mirror} ${SUITE_BASE}/updates COMPONENT" ${APT_LIST} - 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} + domirror "http://security-master.debian.org/debian-security ${SUITE_BASE}/updates COMPONENT" ${APT_LIST} + domirror "http://security-master.debian.org/debian-security-buildd buildd-${SUITE_BASE}/updates COMPONENT" ${APT_LIST} 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) @@ -207,10 +207,10 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then echo deb ${security_mirror} ${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} echo deb-src ${security_mirror} ${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} fi - echo deb https://security-master.debian.org/debian-security ${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} - echo deb-src https://security-master.debian.org/debian-security ${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} - echo deb https://security-master.debian.org/debian-security-buildd buildd-${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} - echo deb-src https://security-master.debian.org/debian-security-buildd buildd-${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} + echo deb http://security-master.debian.org/debian-security ${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} + echo deb-src http://security-master.debian.org/debian-security ${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} + echo deb http://security-master.debian.org/debian-security-buildd buildd-${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} + echo deb-src http://security-master.debian.org/debian-security-buildd buildd-${SUITE_BASE}/updates main contrib >> ${APT_LIST_AUTO} elif [ ${SUITE_VARIANT%%-sloppy} = 'backports' ]; then : > ${APT_LIST_AUTO} if [ -n "${debian_mirror}" ]; then -- 2.20.1