From a5ed0cf40a3a5deedfcdebcebefe508504d1632f Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Tue, 19 Jun 2018 10:27:55 +0100
Subject: [PATCH] alpine: Bump to containerd v1.1.1-rc.1

Signed-off-by: Ian Campbell <ijc@docker.com>
---
 tools/alpine/Dockerfile       |  2 +-
 tools/alpine/versions.aarch64 | 30 +++++++++++++++---------------
 tools/alpine/versions.s390x   | 30 +++++++++++++++---------------
 tools/alpine/versions.x86_64  | 28 ++++++++++++++--------------
 4 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile
index b0ac56180..7b695e395 100644
--- a/tools/alpine/Dockerfile
+++ b/tools/alpine/Dockerfile
@@ -54,7 +54,7 @@ RUN go get -u github.com/LK4D4/vndr
 # Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and
 # `test/pkg/containerd/Dockerfile` when changing this.
 ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
-ENV CONTAINERD_COMMIT=v1.1.1-rc.0
+ENV CONTAINERD_COMMIT=v1.1.1-rc.1
 RUN mkdir -p $GOPATH/src/github.com/containerd && \
   cd $GOPATH/src/github.com/containerd && \
   git clone https://github.com/containerd/containerd.git && \
diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64
index fd7a20cc1..00007239b 100644
--- a/tools/alpine/versions.aarch64
+++ b/tools/alpine/versions.aarch64
@@ -1,4 +1,4 @@
-# linuxkit/alpine:feb9760984b371182ac18cfc978963a25177ffa9-arm64
+# linuxkit/alpine:8a99b84b99a3d3082fbdba657bb4628a1f253b6f-arm64
 # automatically generated list of installed packages
 abuild-3.1.0-r4
 alpine-baselayout-3.0.5-r2
@@ -25,7 +25,7 @@ btrfs-progs-4.13.2-r0
 btrfs-progs-dev-4.13.2-r0
 btrfs-progs-libs-4.13.2-r0
 build-base-0.5-r0
-busybox-1.27.2-r10
+busybox-1.27.2-r11
 busybox-initscripts-3.1-r2
 bzip2-1.0.6-r6
 ca-certificates-20171114-r0
@@ -74,7 +74,7 @@ git-2.15.2-r0
 glib-2.54.2-r0
 gmp-6.1.2-r1
 gmp-dev-6.1.2-r1
-gnupg-2.2.3-r0
+gnupg-2.2.3-r1
 gnutls-3.6.1-r0
 go-1.9.4-r0
 go1.10-1.10-r0
@@ -130,7 +130,7 @@ libexecinfo-dev-1.1-r0
 libfdisk-2.31-r0
 libffi-3.2.1-r4
 libgcc-6.4.0-r5
-libgcrypt-1.8.1-r0
+libgcrypt-1.8.3-r0
 libgmpxx-6.1.2-r1
 libgomp-6.4.0-r5
 libgpg-error-1.27-r1
@@ -152,11 +152,11 @@ libnl3-3.2.28-r1
 libogg-1.3.3-r1
 libpcap-1.8.1-r1
 libpng-1.6.34-r1
-libressl-2.6.4-r2
-libressl-dev-2.6.4-r2
-libressl2.6-libcrypto-2.6.4-r2
-libressl2.6-libssl-2.6.4-r2
-libressl2.6-libtls-2.6.4-r2
+libressl-2.6.5-r0
+libressl-dev-2.6.5-r0
+libressl2.6-libcrypto-2.6.5-r0
+libressl2.6-libssl-2.6.5-r0
+libressl2.6-libtls-2.6.5-r0
 libsasl-2.1.26-r11
 libseccomp-2.3.2-r1
 libseccomp-dev-2.3.2-r1
@@ -218,7 +218,7 @@ pax-utils-1.2.2-r1
 pcre-8.41-r1
 pcre2-10.30-r0
 pcsc-lite-libs-1.8.22-r0
-perl-5.26.2-r0
+perl-5.26.2-r1
 pigz-2.3.4-r2
 pinentry-1.0.0-r0
 pixman-0.34.0-r3
@@ -251,7 +251,7 @@ socat-1.7.3.2-r3
 spice-server-0.14.0-r6
 sqlite-libs-3.21.0-r1
 squashfs-tools-4.3-r4
-ssl_client-1.27.2-r10
+ssl_client-1.27.2-r11
 strace-4.19-r0
 sudo-1.8.21_p2-r1
 swig-3.0.12-r1
@@ -271,12 +271,12 @@ vim-8.0.1359-r0
 wayland-libs-client-1.14.0-r2
 wayland-libs-cursor-1.14.0-r2
 wayland-libs-server-1.14.0-r2
-wireguard-tools-0.0.20180519-r0
+wireguard-tools-0.0.20180613-r0
 wireless-tools-30_pre9-r0
 wpa_supplicant-2.6-r8
-xfsprogs-4.14.0-r0
-xfsprogs-extra-4.14.0-r0
-xfsprogs-libs-4.14.0-r0
+xfsprogs-4.14.0-r1
+xfsprogs-extra-4.14.0-r1
+xfsprogs-libs-4.14.0-r1
 xorriso-1.4.8-r0
 xz-5.2.3-r1
 xz-dev-5.2.3-r1
diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x
index fb396c73a..5430a1d67 100644
--- a/tools/alpine/versions.s390x
+++ b/tools/alpine/versions.s390x
@@ -1,4 +1,4 @@
-# linuxkit/alpine:8c9ca0f61b97867d2680214b99999675c859c8e1-s390x
+# linuxkit/alpine:ed0f780519d8ec06662ced70bbb65ef0362238e9-s390x
 # automatically generated list of installed packages
 abuild-3.1.0-r4
 alpine-baselayout-3.0.5-r2
@@ -25,7 +25,7 @@ btrfs-progs-4.13.2-r0
 btrfs-progs-dev-4.13.2-r0
 btrfs-progs-libs-4.13.2-r0
 build-base-0.5-r0
-busybox-1.27.2-r10
+busybox-1.27.2-r11
 busybox-initscripts-3.1-r2
 bzip2-1.0.6-r6
 ca-certificates-20171114-r0
@@ -74,7 +74,7 @@ git-2.15.2-r0
 glib-2.54.2-r0
 gmp-6.1.2-r1
 gmp-dev-6.1.2-r1
-gnupg-2.2.3-r0
+gnupg-2.2.3-r1
 gnutls-3.6.1-r0
 go-1.9.4-r0
 go1.10-1.10-r0
@@ -126,7 +126,7 @@ libevent-2.1.8-r2
 libfdisk-2.31-r0
 libffi-3.2.1-r4
 libgcc-6.4.0-r5
-libgcrypt-1.8.1-r0
+libgcrypt-1.8.3-r0
 libgmpxx-6.1.2-r1
 libgomp-6.4.0-r5
 libgpg-error-1.27-r1
@@ -148,11 +148,11 @@ libnl3-3.2.28-r1
 libogg-1.3.3-r1
 libpcap-1.8.1-r1
 libpng-1.6.34-r1
-libressl-2.6.4-r2
-libressl-dev-2.6.4-r2
-libressl2.6-libcrypto-2.6.4-r2
-libressl2.6-libssl-2.6.4-r2
-libressl2.6-libtls-2.6.4-r2
+libressl-2.6.5-r0
+libressl-dev-2.6.5-r0
+libressl2.6-libcrypto-2.6.5-r0
+libressl2.6-libssl-2.6.5-r0
+libressl2.6-libtls-2.6.5-r0
 libsasl-2.1.26-r11
 libseccomp-2.3.2-r1
 libseccomp-dev-2.3.2-r1
@@ -212,7 +212,7 @@ pax-utils-1.2.2-r1
 pcre-8.41-r1
 pcre2-10.30-r0
 pcsc-lite-libs-1.8.22-r0
-perl-5.26.2-r0
+perl-5.26.2-r1
 pigz-2.3.4-r2
 pinentry-1.0.0-r0
 pixman-0.34.0-r3
@@ -245,7 +245,7 @@ socat-1.7.3.2-r3
 spice-server-0.14.0-r6
 sqlite-libs-3.21.0-r1
 squashfs-tools-4.3-r4
-ssl_client-1.27.2-r10
+ssl_client-1.27.2-r11
 strace-4.19-r0
 sudo-1.8.21_p2-r1
 swig-3.0.12-r1
@@ -265,12 +265,12 @@ vim-8.0.1359-r0
 wayland-libs-client-1.14.0-r2
 wayland-libs-cursor-1.14.0-r2
 wayland-libs-server-1.14.0-r2
-wireguard-tools-0.0.20180519-r0
+wireguard-tools-0.0.20180613-r0
 wireless-tools-30_pre9-r0
 wpa_supplicant-2.6-r8
-xfsprogs-4.14.0-r0
-xfsprogs-extra-4.14.0-r0
-xfsprogs-libs-4.14.0-r0
+xfsprogs-4.14.0-r1
+xfsprogs-extra-4.14.0-r1
+xfsprogs-libs-4.14.0-r1
 xorriso-1.4.8-r0
 xz-5.2.3-r1
 xz-dev-5.2.3-r1
diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64
index 19437c28c..07630f579 100644
--- a/tools/alpine/versions.x86_64
+++ b/tools/alpine/versions.x86_64
@@ -1,4 +1,4 @@
-# linuxkit/alpine:6d3165faaf08e34ed4e21333d4669b5fbdbc2a23-amd64
+# linuxkit/alpine:f43a74d6693a8f11d4016a8fc6dcb87365b71eb6-amd64
 # automatically generated list of installed packages
 abuild-3.1.0-r4
 alpine-baselayout-3.0.5-r2
@@ -25,7 +25,7 @@ btrfs-progs-4.13.2-r0
 btrfs-progs-dev-4.13.2-r0
 btrfs-progs-libs-4.13.2-r0
 build-base-0.5-r0
-busybox-1.27.2-r10
+busybox-1.27.2-r11
 busybox-initscripts-3.1-r2
 bzip2-1.0.6-r6
 ca-certificates-20171114-r0
@@ -75,7 +75,7 @@ git-2.15.2-r0
 glib-2.54.2-r0
 gmp-6.1.2-r1
 gmp-dev-6.1.2-r1
-gnupg-2.2.3-r0
+gnupg-2.2.3-r1
 gnutls-3.6.1-r0
 go-1.9.4-r0
 go1.10-1.10-r0
@@ -157,11 +157,11 @@ libogg-1.3.3-r1
 libpcap-1.8.1-r1
 libpciaccess-0.13.5-r1
 libpng-1.6.34-r1
-libressl-2.6.4-r2
-libressl-dev-2.6.4-r2
-libressl2.6-libcrypto-2.6.4-r2
-libressl2.6-libssl-2.6.4-r2
-libressl2.6-libtls-2.6.4-r2
+libressl-2.6.5-r0
+libressl-dev-2.6.5-r0
+libressl2.6-libcrypto-2.6.5-r0
+libressl2.6-libssl-2.6.5-r0
+libressl2.6-libtls-2.6.5-r0
 libsasl-2.1.26-r11
 libseccomp-2.3.2-r1
 libseccomp-dev-2.3.2-r1
@@ -226,7 +226,7 @@ pax-utils-1.2.2-r1
 pcre-8.41-r1
 pcre2-10.30-r0
 pcsc-lite-libs-1.8.22-r0
-perl-5.26.2-r0
+perl-5.26.2-r1
 pigz-2.3.4-r2
 pinentry-1.0.0-r0
 pixman-0.34.0-r3
@@ -258,7 +258,7 @@ socat-1.7.3.2-r3
 spice-server-0.14.0-r6
 sqlite-libs-3.21.0-r1
 squashfs-tools-4.3-r4
-ssl_client-1.27.2-r10
+ssl_client-1.27.2-r11
 strace-4.19-r0
 sudo-1.8.21_p2-r1
 swig-3.0.12-r1
@@ -279,12 +279,12 @@ vim-8.0.1359-r0
 wayland-libs-client-1.14.0-r2
 wayland-libs-cursor-1.14.0-r2
 wayland-libs-server-1.14.0-r2
-wireguard-tools-0.0.20180519-r0
+wireguard-tools-0.0.20180613-r0
 wireless-tools-30_pre9-r0
 wpa_supplicant-2.6-r8
-xfsprogs-4.14.0-r0
-xfsprogs-extra-4.14.0-r0
-xfsprogs-libs-4.14.0-r0
+xfsprogs-4.14.0-r1
+xfsprogs-extra-4.14.0-r1
+xfsprogs-libs-4.14.0-r1
 xorriso-1.4.8-r0
 xz-5.2.3-r1
 xz-dev-5.2.3-r1