From b8dd21075d6a63f2d4f75052b84440a0cded9c2e Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Sat, 26 Jan 2019 21:36:57 +0000
Subject: [PATCH] Fix ordering for checksums in update-cd

Make sure compress the .jigdo files *before* we checksum them!
---
 update-cd | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/update-cd b/update-cd
index d2156a13..9cd1497e 100755
--- a/update-cd
+++ b/update-cd
@@ -178,10 +178,12 @@ make_cd () {
             $OUT ${BASENAME}.template \
             "Debian ${DEBIAN_KERNEL} $VER - $OFFICIAL $THISARCH $FIRSTVER->$VER update $TYPEUP #$THISNUM"
         echo $SNAPSHOT >> ${JIGDODIR}/${BASENAME}.jigdo
-        # Make sure that the ISO is as new/newer than the jigdo file; #587774
-        touch ${ISODIR}/${BASENAME}.iso
 
-        MD5=`cat ${JIGDODIR}/${BASENAME}.jigdo | \
+	# Make sure we compres the jigdo file *before* we checksum it
+        gzip -9 ${JIGDODIR}/${BASENAME}.jigdo
+        mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo
+
+        MD5=`zcat ${JIGDODIR}/${BASENAME}.jigdo | \
             awk '/Image Hex MD5Sum/ {print $5}'`
         echo "$MD5  ${BASENAME}.iso" >> ${JIGDODIR}/MD5SUMS.update
         echo "$MD5  ${BASENAME}.iso" >> ${ISODIR}/MD5SUMS.update
@@ -192,7 +194,7 @@ make_cd () {
             (cd ${BTDIR} && md5sum ${BASENAME}.iso.torrent >> MD5SUMS.update)
         fi
         for SHA_SIZE in 1 256 512; do
-            SHA=`cat ${JIGDODIR}/${BASENAME}.jigdo | \
+            SHA=`zcat ${JIGDODIR}/${BASENAME}.jigdo | \
                 awk "/Image Hex SHA${SHA_SIZE}Sum/ {print \\$5}"`
             if [ "$SHA"x = ""x ] ; then
                 echo "SHA fail"
@@ -206,8 +208,9 @@ make_cd () {
                 (cd ${BTDIR} && sha${SHA_SIZE}sum ${BASENAME}.iso.torrent >> SHA${SHA_SIZE}SUMS.update)
             fi
         done
-        gzip -9 ${JIGDODIR}/${BASENAME}.jigdo
-        mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo
+
+        # Make sure that the ISO is as new/newer than the jigdo file; #587774
+        touch ${ISODIR}/${BASENAME}.iso
     else
 	set +e
         ${MKISOFS} -J -joliet-long -r -V "Debian $VER update $TYPEUP" -o \