From 0f64c3defb94d5754f15d81e106c340110ad2e96 Mon Sep 17 00:00:00 2001
From: Travis Geiselbrecht <geist@foobox.com>
Date: Mon, 10 Jun 2019 14:55:26 -0700
Subject: [PATCH] [version] bump gcc and other projects to 7.4.0

---
 doit           | 12 ++++++------
 toolvers       | 28 ++++++++++++++--------------
 updatetoolvers | 15 ++++++++-------
 3 files changed, 28 insertions(+), 27 deletions(-)
 rewrite toolvers (68%)

diff --git a/doit b/doit
index 6f182b9..27df135 100755
--- a/doit
+++ b/doit
@@ -190,21 +190,21 @@ log echo "ARCHES='$ARCHES' PARALLEL='$PARALLEL' FETCH='$FETCH' CCACHE='$CCACHE'"
 . toolvers
 
 if [ "$FETCH" = "1" ]; then
-    download-archive binutils $BINVER bz2
+    download-archive binutils $BINVER xz
     download-archive gcc $GCCVER xz "gcc-$GCCVER/"
     download-archive gdb $GDBVER xz
-    download-archive mpfr $MPFRVER bz2
+    download-archive gmp $GMPVER xz
     download-archive mpc $MPCVER gz
-    download-archive gmp $GMPVER bz2
+    download-archive mpfr $MPFRVER xz
 fi
 
 if [ ! -f $OUTDIR/.extracted-stamp ]; then
-    extract-tool binutils $BINVER .bz2 $BINHASH
+    extract-tool binutils $BINVER .xz $BINHASH
     extract-tool gcc $GCCVER .xz $GCCHASH $PATCHES/gcc-patch.txt
     extract-tool gdb $GDBVER .xz $GDBHASH $PATCHES/gdb-patch.txt
-    extract-tool gmp $GMPVER .bz2 $GMPHASH
+    extract-tool gmp $GMPVER .xz $GMPHASH
     extract-tool mpc $MPCVER .gz $MPCHASH
-    extract-tool mpfr $MPFRVER .bz2 $MPFRHASH
+    extract-tool mpfr $MPFRVER .xz $MPFRHASH
     touch $OUTDIR/.extracted-stamp
 fi
 
diff --git a/toolvers b/toolvers
dissimilarity index 68%
index 1663c8b..c2ba7aa 100644
--- a/toolvers
+++ b/toolvers
@@ -1,14 +1,14 @@
-# Rerun updatetoolvers after modifying this file
-GCCVER=7.3.0
-BINVER=2.30
-GDBVER=8.1
-GMPVER=6.1.2
-MPCVER=1.1.0
-MPFRVER=4.0.0
-# Below is autogenerated by updatetoolvers
-GCCHASH=832ca6ae04636adbb430e865a1451adf6979ab44ca1c8374f61fba65645ce15c
-BINHASH=efeade848067e9a03f1918b1da0d37aaffa0b0127a06b5e9236229851d9d0c09
-GDBHASH=af61a0263858e69c5dce51eab26662ff3d2ad9aa68da9583e8143b5426be4b34
-GMPHASH=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2
-MPCHASH=6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
-MPFRHASH=6aa31fbf3bd1f9f95bcfa241590a9d11cb0f874e2bb93b99c9e2de8eaea6d5fd
+# Rerun updatetoolvers after modifying this file
+GCCVER=7.4.0
+BINVER=2.32
+GDBVER=8.3
+GMPVER=6.1.2
+MPCVER=1.1.0
+MPFRVER=4.0.2
+# Below is autogenerated by updatetoolvers
+GCCHASH=eddde28d04f334aec1604456e536416549e9b1aa137fc69204e65eb0c009fe51
+BINHASH=0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
+GDBHASH=802f7ee309dcc547d65a68d61ebd6526762d26c3051f52caebe2189ac1ffd72e
+GMPHASH=87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
+MPCHASH=6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
+MPFRHASH=1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a
diff --git a/updatetoolvers b/updatetoolvers
index 5e64cdc..08b6146 100755
--- a/updatetoolvers
+++ b/updatetoolvers
@@ -5,13 +5,14 @@
 ARCHIVES=archives
 GNU_MIRROR=https://mirrors.kernel.org/gnu
 TOOLVERS_FILE="toolvers"
+KEYRING_FILE=./gnu-keyring.gpg
 . "$TOOLVERS_FILE"
 
 function verify_sig() {
   SIGFILE="$1"
   ARCHIVE="$2"
 
-  if ! gpg -q --verify "$SIGFILE" "$ARCHIVE"; then
+  if ! gpg -q --verify --keyring "$KEYRING_FILE" "$SIGFILE" "$ARCHIVE"; then
     echo "Failed to verify $ARCHIVE, aborting"
     exit 1
   fi
@@ -32,19 +33,19 @@ function fetch_and_verify() {
 }
 
 
-fetch_and_verify "$GNU_MIRROR/binutils/" "binutils-$BINVER.tar.bz2"
+fetch_and_verify "$GNU_MIRROR/binutils/" "binutils-$BINVER.tar.xz"
 fetch_and_verify "$GNU_MIRROR/gcc/gcc-$GCCVER/" "gcc-$GCCVER.tar.xz"
 fetch_and_verify "$GNU_MIRROR/gdb/" "gdb-$GDBVER.tar.xz"
-fetch_and_verify "$GNU_MIRROR/mpfr/" "mpfr-$MPFRVER.tar.bz2"
+fetch_and_verify "$GNU_MIRROR/gmp/" "gmp-$GMPVER.tar.xz"
 fetch_and_verify "$GNU_MIRROR/mpc/" "mpc-$MPCVER.tar.gz"
-fetch_and_verify "$GNU_MIRROR/gmp/" "gmp-$GMPVER.tar.bz2"
+fetch_and_verify "$GNU_MIRROR/mpfr/" "mpfr-$MPFRVER.tar.xz"
 
-BINHASH=$(shasum -a 256 -b "$ARCHIVES/binutils-$BINVER.tar.bz2" | cut -f1 -d' ')
+BINHASH=$(shasum -a 256 -b "$ARCHIVES/binutils-$BINVER.tar.xz" | cut -f1 -d' ')
 GCCHASH=$(shasum -a 256 -b "$ARCHIVES/gcc-$GCCVER.tar.xz" | cut -f1 -d' ')
 GDBHASH=$(shasum -a 256 -b "$ARCHIVES/gdb-$GDBVER.tar.xz" | cut -f1 -d' ')
-MPFRHASH=$(shasum -a 256 -b "$ARCHIVES/mpfr-$MPFRVER.tar.bz2" | cut -f1 -d' ')
+GMPHASH=$(shasum -a 256 -b "$ARCHIVES/gmp-$GMPVER.tar.xz" | cut -f1 -d' ')
 MPCHASH=$(shasum -a 256 -b "$ARCHIVES/mpc-$MPCVER.tar.gz" | cut -f1 -d' ')
-GMPHASH=$(shasum -a 256 -b "$ARCHIVES/gmp-$GMPVER.tar.bz2" | cut -f1 -d' ')
+MPFRHASH=$(shasum -a 256 -b "$ARCHIVES/mpfr-$MPFRVER.tar.xz" | cut -f1 -d' ')
 
 tmp=$(mktemp)
 echo "# Rerun updatetoolvers after modifying this file" > "$tmp"
-- 
2.11.4.GIT