From 638ca57c1d842b3d8467c863a339d6c5ba56df4b Mon Sep 17 00:00:00 2001 From: Paul Rapa Date: Wed, 19 Oct 2016 12:08:29 +1100 Subject: [PATCH 1/3] Remove sha1 from main Release file as it is not longer trustworthy in 16.04 --- lib/freight/apt.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/freight/apt.sh b/lib/freight/apt.sh index ad6040c..3616a65 100644 --- a/lib/freight/apt.sh +++ b/lib/freight/apt.sh @@ -169,13 +169,10 @@ EOF do SIZE="$(apt_filesize "$DISTCACHE/$FILE")" echo " $(apt_md5 "$DISTCACHE/$FILE" ) $SIZE $FILE" >&3 - echo " $(apt_sha1 "$DISTCACHE/$FILE" ) $SIZE $FILE" >&4 echo " $(apt_sha256 "$DISTCACHE/$FILE" ) $SIZE $FILE" >&5 - done 3>"$TMP/md5sums" 4>"$TMP/sha1sums" 5>"$TMP/sha256sums" + done 3>"$TMP/md5sums" 5>"$TMP/sha256sums" echo "MD5Sum:" cat "$TMP/md5sums" - echo "SHA1:" - cat "$TMP/sha1sums" echo "SHA256:" cat "$TMP/sha256sums" From 77e81a5d53c40be211fce1a6e878c9cb6986441a Mon Sep 17 00:00:00 2001 From: Paul Rapa Date: Thu, 3 Nov 2016 14:14:42 +1100 Subject: [PATCH 2/3] Remove All Sha1 and Md5sum signatures --- lib/freight/apt.sh | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/lib/freight/apt.sh b/lib/freight/apt.sh index 3616a65..c51f4b3 100644 --- a/lib/freight/apt.sh +++ b/lib/freight/apt.sh @@ -156,6 +156,7 @@ Origin: $ORIGIN Label: $LABEL Suite: $SUITE Codename: $DIST +Date: $(date -R) Components: $(echo "$COMPS" | tr \\n " ") Architectures: $ARCHS EOF @@ -168,11 +169,8 @@ EOF while read FILE do SIZE="$(apt_filesize "$DISTCACHE/$FILE")" - echo " $(apt_md5 "$DISTCACHE/$FILE" ) $SIZE $FILE" >&3 echo " $(apt_sha256 "$DISTCACHE/$FILE" ) $SIZE $FILE" >&5 - done 3>"$TMP/md5sums" 5>"$TMP/sha256sums" - echo "MD5Sum:" - cat "$TMP/md5sums" + done 5>"$TMP/sha256sums" echo "SHA256:" cat "$TMP/sha256sums" @@ -256,8 +254,6 @@ apt_cache_binary() { grep -v "^(Essential|Filename|MD5Sum|SHA1|SHA256|Size)" cat < Date: Mon, 3 Apr 2017 11:55:09 +1000 Subject: [PATCH 3/3] Fix Date command --- lib/freight/apt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freight/apt.sh b/lib/freight/apt.sh index c51f4b3..04f9af8 100644 --- a/lib/freight/apt.sh +++ b/lib/freight/apt.sh @@ -156,7 +156,7 @@ Origin: $ORIGIN Label: $LABEL Suite: $SUITE Codename: $DIST -Date: $(date -R) +Date: $(date -R -u) Components: $(echo "$COMPS" | tr \\n " ") Architectures: $ARCHS EOF