From 7fda4d17324cbd4cce08dba9fafecdc4f22212a3 Mon Sep 17 00:00:00 2001 From: Vadim Kaushan Date: Sat, 18 May 2019 13:57:27 +0300 Subject: [PATCH 1/3] Update Ubuntu version for {x86_64, i686}-unknown-linux-gnu docker images --- docker/i686-unknown-linux-gnu/Dockerfile | 2 +- docker/x86_64-unknown-linux-gnu/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/i686-unknown-linux-gnu/Dockerfile b/docker/i686-unknown-linux-gnu/Dockerfile index 7398ac45d..f3e5bfaad 100644 --- a/docker/i686-unknown-linux-gnu/Dockerfile +++ b/docker/i686-unknown-linux-gnu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:12.04 +FROM ubuntu:16.04 RUN apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/docker/x86_64-unknown-linux-gnu/Dockerfile b/docker/x86_64-unknown-linux-gnu/Dockerfile index 7de6e79c1..613224c1e 100644 --- a/docker/x86_64-unknown-linux-gnu/Dockerfile +++ b/docker/x86_64-unknown-linux-gnu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:12.04 +FROM ubuntu:16.04 RUN apt-get update && \ apt-get install -y --no-install-recommends \ From 66133634ded99d9b3cace1ad3d53e078f4b162f6 Mon Sep 17 00:00:00 2001 From: Vadim Kaushan Date: Sat, 18 May 2019 14:19:23 +0300 Subject: [PATCH 2/3] Fix dropbear build script --- docker/dropbear.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/dropbear.sh b/docker/dropbear.sh index 868b09110..f8a89d6e7 100644 --- a/docker/dropbear.sh +++ b/docker/dropbear.sh @@ -24,7 +24,7 @@ main() { pushd $td - curl -L https://matt.ucc.asn.au/dropbear/dropbear-$version.tar.bz2 | \ + curl -L https://matt.ucc.asn.au/dropbear/releases/dropbear-$version.tar.bz2 | \ tar --strip-components=1 -xj # Remove some unwanted message From 4c6bdb8939bd75e082c8c708a78eb71e91e07c73 Mon Sep 17 00:00:00 2001 From: Vadim Kaushan Date: Sat, 18 May 2019 14:37:18 +0300 Subject: [PATCH 3/3] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7db1a1617..94cec7282 100644 --- a/README.md +++ b/README.md @@ -209,7 +209,7 @@ worst, "hang" (never terminate). | `i686-linux-android` [5] | N/A | 4.9 | 1.0.2p | ✓ | N/A | ✓ | | `i686-pc-windows-gnu` | N/A | 7.3.0 | N/A | ✓ | N/A | ✓ | | `i686-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2p | | N/A | | -| `i686-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2p | ✓ | N/A | ✓ | +| `i686-unknown-linux-gnu` | 2.23 | 5.4.0 | 1.0.2g | ✓ | N/A | ✓ | | `i686-unknown-linux-musl` | 1.1.20 | 6.3.0 | 1.0.2p | | N/A | ✓ | | `mips-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2p | ✓ | 2.8.0 | ✓ | | `mips-unknown-linux-musl` | 1.1.20 | 6.3.0 | 1.0.2p | ✓ | 2.8.0 | ✓ | @@ -233,7 +233,7 @@ worst, "hang" (never terminate). | `x86_64-sun-solaris` [1] | 2.11 | 5.3.0 | 1.0.2p | ✓ | N/A | | | `x86_64-unknown-dragonfly` [1] [2] | 4.6.0 | 5.3.0 | 1.0.2p | ✓ | N/A | | | `x86_64-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2p | | N/A | | -| `x86_64-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2p | ✓ | N/A | ✓ | +| `x86_64-unknown-linux-gnu` | 2.23 | 5.4.0 | 1.0.2g | ✓ | N/A | ✓ | | `x86_64-unknown-linux-musl` | 1.1.20 | 6.3.0 | 1.0.2p | | N/A | ✓ | | `x86_64-unknown-netbsd`[1] | 7.0 | 5.3.0 | 1.0.2p | ✓ | N/A | |