--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: debian-cd: please switch d-i.debian.org URIs from http to https.
- From: Cyril Brulebois <kibi@debian.org>
- Date: Sun, 03 Jan 2016 01:05:12 +0100
- Message-id: <20160103000512.16629.36326.reportbug@chloe>
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 <kibi@debian.org>
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 <93sam@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/tools/boot/jessie/boot-hurd
@@ -16,7 +16,7 @@ N=$1
CDDIR=$2
BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/hurd-i386/daily/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/hurd-i386/daily/";
try_di_image_cache
fi
diff --git a/tools/boot/jessie/boot-ia64 b/tools/boot/jessie/boot-ia64
index 6e09440..24cd5f8 100755
--- a/tools/boot/jessie/boot-ia64
+++ b/tools/boot/jessie/boot-ia64
@@ -13,7 +13,7 @@ N=$1
CDDIR=$2
BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/ia64/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/ia64/daily";
try_di_image_cache
fi
diff --git a/tools/boot/jessie/boot-kfreebsd b/tools/boot/jessie/boot-kfreebsd
index ceb437b..eae3695 100644
--- a/tools/boot/jessie/boot-kfreebsd
+++ b/tools/boot/jessie/boot-kfreebsd
@@ -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" = kfreebsd-i386 ]; then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-i386/daily/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-i386/daily/";
else
- DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-amd64/daily/";
fi
try_di_image_cache
fi
diff --git a/tools/boot/jessie/boot-mips b/tools/boot/jessie/boot-mips
index 8249213..23e68fe 100755
--- a/tools/boot/jessie/boot-mips
+++ b/tools/boot/jessie/boot-mips
@@ -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/mips/daily/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/mips/daily/";
try_di_image_cache
fi
diff --git a/tools/boot/jessie/boot-mipsel b/tools/boot/jessie/boot-mipsel
index dd2e75d..d89f890 100755
--- a/tools/boot/jessie/boot-mipsel
+++ b/tools/boot/jessie/boot-mipsel
@@ -16,7 +16,7 @@ set -e
N=$1
CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/mipsel/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/mipsel/daily";
try_di_image_cache
fi
diff --git a/tools/boot/jessie/boot-powerpc b/tools/boot/jessie/boot-powerpc
index d8b3034..b4bbba9 100755
--- a/tools/boot/jessie/boot-powerpc
+++ b/tools/boot/jessie/boot-powerpc
@@ -15,7 +15,7 @@ N=$1
CDDIR=$2
INSTALLDIR=$CDDIR/install
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/powerpc/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/powerpc/daily";
try_di_image_cache
fi
diff --git a/tools/boot/jessie/boot-ppc64el b/tools/boot/jessie/boot-ppc64el
index 6f90e45..aa6feda 100755
--- a/tools/boot/jessie/boot-ppc64el
+++ b/tools/boot/jessie/boot-ppc64el
@@ -25,7 +25,7 @@ N=$1
CDDIR=$2
INSTALLDIR=$CDDIR/install
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/ppc64el/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/ppc64el/daily";
try_di_image_cache
fi
diff --git a/tools/boot/jessie/boot-s390x b/tools/boot/jessie/boot-s390x
index c9f73ad..f9b40dd 100755
--- a/tools/boot/jessie/boot-s390x
+++ b/tools/boot/jessie/boot-s390x
@@ -36,7 +36,7 @@ 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" = s390x ]; then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/s390x/daily";
fi
try_di_image_cache
fi
diff --git a/tools/boot/jessie/boot-sparc b/tools/boot/jessie/boot-sparc
index 8f41171..fea5bac 100755
--- a/tools/boot/jessie/boot-sparc
+++ b/tools/boot/jessie/boot-sparc
@@ -11,7 +11,7 @@ set -e
N=$1
CDDIR=$2
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/sparc/daily/cdrom/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/sparc/daily/cdrom/";
try_di_image_cache
fi
diff --git a/tools/boot/jessie/boot-x86 b/tools/boot/jessie/boot-x86
index c6d397c..7450c25 100644
--- a/tools/boot/jessie/boot-x86
+++ b/tools/boot/jessie/boot-x86
@@ -40,9 +40,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" = i386 ]; then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/i386/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/i386/daily";
else
- DI_WWW_HOME="http://d-i.debian.org/daily-images/amd64/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/amd64/daily";
fi
try_di_image_cache
else
diff --git a/tools/boot/stretch/boot-alpha b/tools/boot/stretch/boot-alpha
index 5df3885..f3d58bc 100755
--- a/tools/boot/stretch/boot-alpha
+++ b/tools/boot/stretch/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/stretch/boot-arm b/tools/boot/stretch/boot-arm
index e502d06..7d729f6 100755
--- a/tools/boot/stretch/boot-arm
+++ b/tools/boot/stretch/boot-arm
@@ -21,10 +21,10 @@ 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";
CUT=3
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";
CUT=3
else
echo "$0: unknown arch $ARCH; abort"
diff --git a/tools/boot/stretch/boot-arm64 b/tools/boot/stretch/boot-arm64
index 5cd35da..66e2815 100755
--- a/tools/boot/stretch/boot-arm64
+++ b/tools/boot/stretch/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/stretch/boot-hppa b/tools/boot/stretch/boot-hppa
index ecaeec4..ad57ea0 100755
--- a/tools/boot/stretch/boot-hppa
+++ b/tools/boot/stretch/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/stretch/boot-hurd b/tools/boot/stretch/boot-hurd
index 60f5dbe..400203e 100644
--- a/tools/boot/stretch/boot-hurd
+++ b/tools/boot/stretch/boot-hurd
@@ -16,7 +16,7 @@ N=$1
CDDIR=$2
BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/hurd-i386/daily/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/hurd-i386/daily/";
try_di_image_cache
fi
diff --git a/tools/boot/stretch/boot-ia64 b/tools/boot/stretch/boot-ia64
index 971d4db..fcdeb11 100755
--- a/tools/boot/stretch/boot-ia64
+++ b/tools/boot/stretch/boot-ia64
@@ -13,7 +13,7 @@ N=$1
CDDIR=$2
BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/ia64/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/ia64/daily";
try_di_image_cache
fi
diff --git a/tools/boot/stretch/boot-kfreebsd b/tools/boot/stretch/boot-kfreebsd
index ffe6aad..7cff2bb 100644
--- a/tools/boot/stretch/boot-kfreebsd
+++ b/tools/boot/stretch/boot-kfreebsd
@@ -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" = kfreebsd-i386 ]; then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-i386/daily/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-i386/daily/";
else
- DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-amd64/daily/";
fi
try_di_image_cache
fi
diff --git a/tools/boot/stretch/boot-mips b/tools/boot/stretch/boot-mips
index 3aec342..8a8b6f4 100755
--- a/tools/boot/stretch/boot-mips
+++ b/tools/boot/stretch/boot-mips
@@ -15,7 +15,7 @@ N=$1
CDDIR=$2
INSTALLDIR="install"
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/mips/daily/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/mips/daily/";
try_di_image_cache
fi
diff --git a/tools/boot/stretch/boot-mipsel b/tools/boot/stretch/boot-mipsel
index f39cf0a..8cc86ba 100755
--- a/tools/boot/stretch/boot-mipsel
+++ b/tools/boot/stretch/boot-mipsel
@@ -16,7 +16,7 @@ set -e
N=$1
CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/mipsel/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/mipsel/daily";
try_di_image_cache
fi
diff --git a/tools/boot/stretch/boot-powerpc b/tools/boot/stretch/boot-powerpc
index 36801bb..4922841 100755
--- a/tools/boot/stretch/boot-powerpc
+++ b/tools/boot/stretch/boot-powerpc
@@ -15,7 +15,7 @@ N=$1
CDDIR=$2
INSTALLDIR=$CDDIR/install
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/powerpc/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/powerpc/daily";
try_di_image_cache
fi
diff --git a/tools/boot/stretch/boot-ppc64el b/tools/boot/stretch/boot-ppc64el
index 6f90e45..aa6feda 100755
--- a/tools/boot/stretch/boot-ppc64el
+++ b/tools/boot/stretch/boot-ppc64el
@@ -25,7 +25,7 @@ N=$1
CDDIR=$2
INSTALLDIR=$CDDIR/install
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/ppc64el/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/ppc64el/daily";
try_di_image_cache
fi
diff --git a/tools/boot/stretch/boot-s390x b/tools/boot/stretch/boot-s390x
index 30eab52..72919d2 100755
--- a/tools/boot/stretch/boot-s390x
+++ b/tools/boot/stretch/boot-s390x
@@ -36,7 +36,7 @@ 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" = s390x ]; then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/s390x/daily";
fi
try_di_image_cache
fi
diff --git a/tools/boot/stretch/boot-sparc b/tools/boot/stretch/boot-sparc
index fa8715e..9d05e82 100755
--- a/tools/boot/stretch/boot-sparc
+++ b/tools/boot/stretch/boot-sparc
@@ -11,7 +11,7 @@ set -e
N=$1
CDDIR=$2
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/sparc/daily/cdrom/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/sparc/daily/cdrom/";
try_di_image_cache
fi
diff --git a/tools/boot/stretch/boot-x86 b/tools/boot/stretch/boot-x86
index bd70865..f681d6e 100644
--- a/tools/boot/stretch/boot-x86
+++ b/tools/boot/stretch/boot-x86
@@ -40,9 +40,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" = amd64 ]; then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/amd64/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/amd64/daily";
else
- DI_WWW_HOME="http://d-i.debian.org/daily-images/i386/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/i386/daily";
fi
try_di_image_cache
else
diff --git a/tools/boot/wheezy/boot-alpha b/tools/boot/wheezy/boot-alpha
index 74b2650..eb0a924 100755
--- a/tools/boot/wheezy/boot-alpha
+++ b/tools/boot/wheezy/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/";
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}";
DI_WWW_HOME=""
diff --git a/tools/boot/wheezy/boot-arm b/tools/boot/wheezy/boot-arm
index c735db8..9793ff8 100755
--- a/tools/boot/wheezy/boot-arm
+++ b/tools/boot/wheezy/boot-arm
@@ -17,9 +17,9 @@ N=$1
CDDIR=$2
if [ "$DI_WWW_HOME" = "default" ];then
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";
else
- DI_WWW_HOME="http://d-i.debian.org/daily-images/armhf/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/armhf/daily";
fi
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}";
diff --git a/tools/boot/wheezy/boot-hppa b/tools/boot/wheezy/boot-hppa
index 315976d..8547729 100755
--- a/tools/boot/wheezy/boot-hppa
+++ b/tools/boot/wheezy/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";
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}";
DI_WWW_HOME=""
diff --git a/tools/boot/wheezy/boot-hurd b/tools/boot/wheezy/boot-hurd
index ed99282..63e746b 100644
--- a/tools/boot/wheezy/boot-hurd
+++ b/tools/boot/wheezy/boot-hurd
@@ -16,7 +16,7 @@ N=$1
CDDIR=$2
BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/hurd-i386/daily/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/hurd-i386/daily/";
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}";
DI_WWW_HOME=""
diff --git a/tools/boot/wheezy/boot-ia64 b/tools/boot/wheezy/boot-ia64
index bd6a5ec..0ab2a9b 100755
--- a/tools/boot/wheezy/boot-ia64
+++ b/tools/boot/wheezy/boot-ia64
@@ -13,7 +13,7 @@ N=$1
CDDIR=$2
BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/ia64/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/ia64/daily";
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}";
DI_WWW_HOME=""
diff --git a/tools/boot/wheezy/boot-kfreebsd b/tools/boot/wheezy/boot-kfreebsd
index 99a760f..574b423 100644
--- a/tools/boot/wheezy/boot-kfreebsd
+++ b/tools/boot/wheezy/boot-kfreebsd
@@ -17,9 +17,9 @@ CDDIR=$2
BOOTDIR=
if [ "$DI_WWW_HOME" = "default" ];then
if [ "$ARCH" = kfreebsd-i386 ]; then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-i386/daily/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-i386/daily/";
else
- DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-amd64/daily/";
fi
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}";
diff --git a/tools/boot/wheezy/boot-mips b/tools/boot/wheezy/boot-mips
index f8a3de8..c04b700 100755
--- a/tools/boot/wheezy/boot-mips
+++ b/tools/boot/wheezy/boot-mips
@@ -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/mips/daily/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/mips/daily/";
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}";
DI_WWW_HOME=""
diff --git a/tools/boot/wheezy/boot-mipsel b/tools/boot/wheezy/boot-mipsel
index c63a6b7..7e7f161 100755
--- a/tools/boot/wheezy/boot-mipsel
+++ b/tools/boot/wheezy/boot-mipsel
@@ -16,7 +16,7 @@ set -e
N=$1
CDROOT=$2
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/mipsel/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/mipsel/daily";
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}";
DI_WWW_HOME=""
diff --git a/tools/boot/wheezy/boot-powerpc b/tools/boot/wheezy/boot-powerpc
index 0da3016..b4a19b8 100755
--- a/tools/boot/wheezy/boot-powerpc
+++ b/tools/boot/wheezy/boot-powerpc
@@ -15,7 +15,7 @@ N=$1
CDDIR=$2
INSTALLDIR=$CDDIR/install
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/powerpc/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/powerpc/daily";
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}";
DI_WWW_HOME=""
diff --git a/tools/boot/wheezy/boot-s390-common b/tools/boot/wheezy/boot-s390-common
index 84c4040..3200fb2 100644
--- a/tools/boot/wheezy/boot-s390-common
+++ b/tools/boot/wheezy/boot-s390-common
@@ -36,9 +36,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" = s390 ]; then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/s390/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/s390/daily";
else
- DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/s390x/daily";
fi
if [ -n "$DI_DIR" -a -e "$DI_DIR/~${DI_WWW_HOME#*~}" ] ; then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}";
diff --git a/tools/boot/wheezy/boot-sparc b/tools/boot/wheezy/boot-sparc
index f15a501..935bd3f 100755
--- a/tools/boot/wheezy/boot-sparc
+++ b/tools/boot/wheezy/boot-sparc
@@ -11,7 +11,7 @@ set -e
N=$1
CDDIR=$2
if [ "$DI_WWW_HOME" = "default" ];then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/sparc/daily/cdrom/";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/sparc/daily/cdrom/";
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}";
DI_WWW_HOME=""
diff --git a/tools/boot/wheezy/boot-x86 b/tools/boot/wheezy/boot-x86
index 70bf93f..1ae2980 100644
--- a/tools/boot/wheezy/boot-x86
+++ b/tools/boot/wheezy/boot-x86
@@ -21,9 +21,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" = i386 ]; then
- DI_WWW_HOME="http://d-i.debian.org/daily-images/i386/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/i386/daily";
else
- DI_WWW_HOME="http://d-i.debian.org/daily-images/amd64/daily";
+ DI_WWW_HOME="https://d-i.debian.org/daily-images/amd64/daily";
fi
if [ -n "$DI_DIR" ];then
DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}";
--
2.1.4
--- End Message ---
--- Begin Message ---
Source: debian-cd
Source-Version: 3.1.18
We believe that the bug you reported is fixed in the latest version of
debian-cd, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 809698@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Steve McIntyre <93sam@debian.org> (supplier of updated debian-cd package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Mon, 20 Apr 2015 12:36:57 +0100
Source: debian-cd
Binary: debian-cd
Architecture: source all
Version: 3.1.18
Distribution: unstable
Urgency: medium
Maintainer: Debian CD Group <debian-cd@lists.debian.org>
Changed-By: Steve McIntyre <93sam@debian.org>
Description:
debian-cd - Tools for building (Official) Debian CD set
Closes: 744155 768977 783569 795844 798908 808958 809497 809698 818176 820479
Changes:
debian-cd (3.1.18) unstable; urgency=medium
.
[ Steve McIntyre ]
* Start stretch, simply copying jessie for now
* Remove mention of desktop choice from yaboot boot messages
(Closes: #783569)
* Add YA syslinux package to Recommends.
* Fix handlinkg of LOGOPNG when we've got "doppelganer" initramfs files
* Add support for debian-edu builds
* Change cpp usage in the Makefile to make error handling more reliable
* tools/sort_deps: Improve handling of too-large packages. Previously,
the code would only check sizes for packages explicitly listed but
packages brought in due to dependency resolution would not be
checked. Now fixed.
* Try to make VOLIDs shorter when given long alpha / beta release names
in DEBVERSION
* Add firmware bundles in cpio.gz format too to help netboot users.
Thanks to Alex Owen for the patch, slightly tweaked.
* Add kernels and other bits to armel/armhf images (Closes: #795844)
* Do similar for mips images, now r4k-ip22 cdrom images are no longer
built.
* Remove old obsolete pre-d-i function install_language and all callers.
* parse_isolinux: Support grub menuentry shortcuts for UEFI boot menus.
Closes: #798908
* Create checksums for firmware images
* Switch references to d-i.debian.org to use https instead of http.
Closes: #809698. Also use --ca-directory /etc/ssl/ca-debian/ with wget
to ensure this works.
* Add Recommends: syslinux-utils in case a user wants to use SPLASHPNG
(and hence ppmtolss16) for their own splash images. Closes: #768977
* Update Standards-Version to 3.9.6
.
[ Didier Raboud ]
* For stretch, swap amd64 and i386 to let the first be the norm, and the
latter be the special case, this copes with the similar change in d-i
* Add management of arch detection from d-i in isolinux, fix booting from
help files and isolinux.cfg overwriting
.
[ Cyril Brulebois ]
* Make amd64 the default arch in the easy-build.sh script.
* Make stretch the default suite in the easy-build.sh script.
.
[ Philipp Kern ]
* Load the s390x initrd at 0x01000000 to allow kernels larger than
8 MiB (and smaller than 16 MiB) to be loaded via the ins loader.
* Drop the remaining s390 bits from stretch and jessie. (s390x remains.)
* Drop the d390oco loader from stretch and jessie.
.
[ John Paul Adrian Glaubitz ]
* Add initial sparc64 support
.
[ Samuel Thibault ]
* include espeakup on cd1, not speakup, and alsa-utils. Closes: #809497
* Minor tweaks to hurd boot setup. Closes: #818176
.
[ Ben Hutchings ]
* Add 686 kernels to replace 586 for i386 CDs. Closes: #808958
.
[ Nicholas D Steeves ]
* Change dependency on btrfs-tools to btrfs-progs. Closes: #820479
.
[ Helge Deller ]
* Update hppa support. Closes: #744155
.
[ Philipp Hahn ]
* Fix size calculation for EFI image
Checksums-Sha1:
3c33349a3db32ba1f44ea554aa0d391730f12351 1694 debian-cd_3.1.18.dsc
37f45a9dafe3125dbf922d2980fb3a2f92cdcf3f 985968 debian-cd_3.1.18.tar.xz
616dd910bba1076a8e71d0112cb35ea4fda11e92 1006760 debian-cd_3.1.18_all.deb
Checksums-Sha256:
3719dce7c60d6ed830c5d0c1aaf4ede95b1013eeee24ff5a4faefec49637838c 1694 debian-cd_3.1.18.dsc
a4811e8b0b66072e5898452587f26aadf3f4f4567080804d71d1cd2865b0e3ed 985968 debian-cd_3.1.18.tar.xz
7dc0063bcd5bab5db0f2bfe859e95c3b6f20f29be323fd22fde6d695d19145c2 1006760 debian-cd_3.1.18_all.deb
Files:
3ac5b149ad405e835b5387879664ffdb 1694 admin extra debian-cd_3.1.18.dsc
0efab22e0ef206d540e138cfa7e1daf0 985968 admin extra debian-cd_3.1.18.tar.xz
e5a64786813da3aa9214aec49fa77018 1006760 admin extra debian-cd_3.1.18_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJXLRJOAAoJEFh5eVc0QmhOs9wQAKFQYzvWL0J2ABI0g3vHMbR8
EmqEy67Lp2wdDUT/gUqwoSV8PQUfMzI+WN0IkQPJjwazUOAKZnvu9MUbxVWlriNv
LSKvR8tu58ms7HF0BrXw/imyJsyLDDiUZxlCK69T9T1wCe2L1w7ylbSRfXv79zWy
qUZVPNjepqHn+KOW50CB6mGIWd8ESAVm8y7q6cPMKhenSslD7t/oRY3XTNj2LYzl
NchDItTupX9kV5i8lWuxRwO9xIAMBQRQCcydKuFJkQ8oLvcMBz1FuW1GHhgeHp80
e5q8Vemw7McNODTH0nTT3+bzlQCPPtiNduUelcQ4VmexKQ0d4cURLwZBt/03QUra
rvnrNb2GtoH982Y4FMIvNLR+R3rm7ohIaB+2tcY23q6p0JX7XzKHRLFnrFoBle3l
kaT0f+VZYxFc6+mPvQKbyI2/DjmLlO49QEeAPWFsS+UCD7idFIbibVcvJmtONl3C
xNwPOPpSmmU7JO+BBZKih09JogOnD8OgHwvQt/c5KrvVsQ1gPXmOaEuOqKKZBXlu
VHH9OQuWlAsBxv3KcBSo8u735urWulrPb7LCX/NSd9MXtSuBpb1Arvy33Bvyk11D
11TOBlhiFeCjl5uSxW+9lUmbpFC/1ZD0WvsHNdAQkOyCaqT2X/5joCkzFuLJWXdZ
FwQjFm789fDhSJF/eE1w
=R7o9
-----END PGP SIGNATURE-----
--- End Message ---