Package: debian-cd
Version: 3.17
Severity: normal
Hi,
We now have https for daily images[1], so please consider applying (and
testing!) the attached, untested patch.
1. https://lists.debian.org/debian-boot/2016/01/msg00032.html
Mraw,
KiBi.
>From a4ec2be603f60730c48c497231d1e9c0ba02463f Mon Sep 17 00:00:00 2001
From: Cyril Brulebois
Date: Sun, 3 Jan 2016 01:03:24 +0100
Subject: [PATCH] Switch d-i.debian.org URIs from http to https.
---
debian/changelog | 3 +++
tools/boot/jessie/boot-alpha | 2 +-
tools/boot/jessie/boot-arm | 4 ++--
tools/boot/jessie/boot-arm64 | 2 +-
tools/boot/jessie/boot-hppa| 2 +-
tools/boot/jessie/boot-hurd| 2 +-
tools/boot/jessie/boot-ia64| 2 +-
tools/boot/jessie/boot-kfreebsd| 4 ++--
tools/boot/jessie/boot-mips| 2 +-
tools/boot/jessie/boot-mipsel | 2 +-
tools/boot/jessie/boot-powerpc | 2 +-
tools/boot/jessie/boot-ppc64el | 2 +-
tools/boot/jessie/boot-s390x | 2 +-
tools/boot/jessie/boot-sparc | 2 +-
tools/boot/jessie/boot-x86 | 4 ++--
tools/boot/stretch/boot-alpha | 2 +-
tools/boot/stretch/boot-arm| 4 ++--
tools/boot/stretch/boot-arm64 | 2 +-
tools/boot/stretch/boot-hppa | 2 +-
tools/boot/stretch/boot-hurd | 2 +-
tools/boot/stretch/boot-ia64 | 2 +-
tools/boot/stretch/boot-kfreebsd | 4 ++--
tools/boot/stretch/boot-mips | 2 +-
tools/boot/stretch/boot-mipsel | 2 +-
tools/boot/stretch/boot-powerpc| 2 +-
tools/boot/stretch/boot-ppc64el| 2 +-
tools/boot/stretch/boot-s390x | 2 +-
tools/boot/stretch/boot-sparc | 2 +-
tools/boot/stretch/boot-x86| 4 ++--
tools/boot/wheezy/boot-alpha | 2 +-
tools/boot/wheezy/boot-arm | 4 ++--
tools/boot/wheezy/boot-hppa| 2 +-
tools/boot/wheezy/boot-hurd| 2 +-
tools/boot/wheezy/boot-ia64| 2 +-
tools/boot/wheezy/boot-kfreebsd| 4 ++--
tools/boot/wheezy/boot-mips| 2 +-
tools/boot/wheezy/boot-mipsel | 2 +-
tools/boot/wheezy/boot-powerpc | 2 +-
tools/boot/wheezy/boot-s390-common | 4 ++--
tools/boot/wheezy/boot-sparc | 2 +-
tools/boot/wheezy/boot-x86 | 4 ++--
41 files changed, 53 insertions(+), 50 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8af16ef..d75a4f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,9 @@ debian-cd (3.1.18) UNRELEASED; urgency=medium
* Drop the remaining s390 bits from stretch and jessie. (s390x remains.)
* Drop the d390oco loader from stretch and jessie.
+ [ Cyril Brulebois ]
+ * Switch d-i.debian.org URIs from http to https.
+
-- Steve McIntyre <93...@debian.org> Mon, 20 Apr 2015 12:36:57 +0100
debian-cd (3.1.17) unstable; urgency=medium
diff --git a/tools/boot/jessie/boot-alpha b/tools/boot/jessie/boot-alpha
index 8908967..762ae2e 100755
--- a/tools/boot/jessie/boot-alpha
+++ b/tools/boot/jessie/boot-alpha
@@ -26,7 +26,7 @@ N=$1
CDDIR=$2
BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then
-DI_WWW_HOME="http://d-i.debian.org/daily-images/alpha/daily/cdrom/";
+DI_WWW_HOME="https://d-i.debian.org/daily-images/alpha/daily/cdrom/";
try_di_image_cache
fi
diff --git a/tools/boot/jessie/boot-arm b/tools/boot/jessie/boot-arm
index 80da3cb..d34c155 100755
--- a/tools/boot/jessie/boot-arm
+++ b/tools/boot/jessie/boot-arm
@@ -20,9 +20,9 @@ if [ "$DI_WWW_HOME" = "default" ];then
# do *not* do that - these defs are parsed out by other scripts that
# won't cope with that
if [ "$ARCH" = armel ]; then
-DI_WWW_HOME="http://d-i.debian.org/daily-images/armel/daily";
+DI_WWW_HOME="https://d-i.debian.org/daily-images/armel/daily";
elif [ "$ARCH" = armhf ]; then
-DI_WWW_HOME="http://d-i.debian.org/daily-images/armhf/daily";
+DI_WWW_HOME="https://d-i.debian.org/daily-images/armhf/daily";
else
echo "$0: unknown arch $ARCH; abort"
exit 1
diff --git a/tools/boot/jessie/boot-arm64 b/tools/boot/jessie/boot-arm64
index 5cd35da..66e2815 100755
--- a/tools/boot/jessie/boot-arm64
+++ b/tools/boot/jessie/boot-arm64
@@ -18,7 +18,7 @@ CDDIR=$2
BOOTDIR=
INSTALLDIR="install.a64"
if [ "$DI_WWW_HOME" = "default" ];then
-DI_WWW_HOME="http://d-i.debian.org/daily-images/arm64/daily";
+DI_WWW_HOME="https://d-i.debian.org/daily-images/arm64/daily";
try_di_image_cache
fi
diff --git a/tools/boot/jessie/boot-hppa b/tools/boot/jessie/boot-hppa
index 84fa250..8e66f50 100755
--- a/tools/boot/jessie/boot-hppa
+++ b/tools/boot/jessie/boot-hppa
@@ -14,7 +14,7 @@ set -e
N=$1
CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then
-DI_WWW_HOME="http://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6";
+DI_WWW_HOME="https://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6";
try_di_image_cache
fi
diff --git a/tools/boot/jessie/boot-hurd b/tools/boot/jessie/boot-hurd
index 89ef3f6..f64b091 100644
--- a/tools/boot/jessie/boot-hurd
+++ b/to