From ff82631d6f3f2e52c375368ef913426b27cc30d1 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Mon, 20 Nov 2017 21:29:50 +0000
Subject: [PATCH] Backport fix from master: Make update_popcon deal with https
 on popcon.d.o

---
 debian/changelog    | 1 +
 tools/update_popcon | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e1fe931..5812be51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
       to ensure this works.
     + Fix size calculation for EFI image
     + Make tools/update_popcon exit with errors when it fails
+    + Make tools/update_popcon deal with https on popcon.d.o
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 20 Apr 2015 12:36:57 +0100
 
diff --git a/tools/update_popcon b/tools/update_popcon
index 988c92c0..19af2486 100755
--- a/tools/update_popcon
+++ b/tools/update_popcon
@@ -7,6 +7,11 @@
 
 DATE=`date`
 
+dir=/etc/ssl/ca-debian
+if [ -d $dir ]; then
+    capath="--capath $dir"
+fi
+
 # Determine temp dir to use
 if [ "$BDIR"x = ""x ] ; then
     if [ "$TMPDIR"x != ""x ] ; then
@@ -33,7 +38,7 @@ dl_file () {
     DIST=$1
     SITE="http://popcon.debian.org/"
 
-    curl -s --head $SITE/$DIST/by_inst > $TDIR/$DIST.head
+    curl -L $capath -s --head $SITE/$DIST/by_inst > $TDIR/$DIST.head
     error=$?
     if [ $error -ne 0 ] ; then
         echo "Failed to download correctly: curl error $error on HEAD" >&2
@@ -42,7 +47,7 @@ dl_file () {
     HEAD_SIZE=`cat $TDIR/$DIST.head | \
                awk '/^Content-Length/ {gsub("\r","");print $2}'`
 
-    curl -s $SITE/$DIST/by_inst > $TDIR/$DIST
+    curl -L $capath -s $SITE/$DIST/by_inst > $TDIR/$DIST
     error=$?
     DL_SIZE=`stat -c %s $TDIR/$DIST`
     if [ $error -ne 0 ] ; then