From 12e4347bf748f7ee9212c45e5d4df885096e0d47 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Tue, 24 Oct 2017 09:51:57 +0100
Subject: [PATCH] alpine: rebuild

Picks up CVE-2017-15650 fix and some other updates.

Adds ipvsadm and bridge-utils (fixes: #2606).

Signed-off-by: Ian Campbell <ijc@docker.com>
---
 tools/alpine/packages         |  2 ++
 tools/alpine/versions.aarch64 | 19 +++++++++++--------
 tools/alpine/versions.x86_64  | 19 +++++++++++--------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/tools/alpine/packages b/tools/alpine/packages
index 3771830ab..fd52d985b 100644
--- a/tools/alpine/packages
+++ b/tools/alpine/packages
@@ -12,6 +12,7 @@ binutils
 binutils-dev
 bison
 blkid
+bridge-utils
 bsd-compat-headers
 btrfs-progs
 btrfs-progs-dev
@@ -50,6 +51,7 @@ installkernel
 iperf3
 iproute2
 iptables
+ipvsadm
 jq
 kmod
 libarchive-tools
diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64
index 3cb9d8d36..a14a42d8f 100644
--- a/tools/alpine/versions.aarch64
+++ b/tools/alpine/versions.aarch64
@@ -1,4 +1,4 @@
-# linuxkit/alpine:28d7666c7476243d43694ab392f79953622b98d4-arm64
+# linuxkit/alpine:dd83bdc4a5fb196685194dfd0cb6f69a4ec5e987-arm64
 # automatically generated list of installed packages
 abuild-3.0.0_rc2-r8
 alpine-baselayout-3.0.4-r0
@@ -9,7 +9,7 @@ argp-standalone-1.3-r2
 attr-2.4.47-r6
 attr-dev-2.4.47-r6
 autoconf-2.69-r0
-automake-1.15-r0
+automake-1.15.1-r0
 bash-4.3.48-r1
 bc-1.06.95-r2
 binutils-2.28-r2
@@ -17,6 +17,7 @@ binutils-dev-2.28-r2
 binutils-libs-2.28-r2
 bison-3.0.4-r0
 blkid-2.28.2-r2
+bridge-utils-1.6-r0
 bsd-compat-headers-0.7.1-r0
 btrfs-progs-4.10.2-r0
 btrfs-progs-dev-4.10.2-r0
@@ -85,6 +86,7 @@ installkernel-3.5-r0
 iperf3-3.1.7-r0
 iproute2-4.10.0-r1
 iptables-1.6.1-r0
+ipvsadm-1.29-r0
 isl-0.17.1-r0
 jq-1.5-r3
 json-c-0.12.1-r0
@@ -107,7 +109,7 @@ libburn-1.4.6-r0
 libbz2-1.0.6-r5
 libc-dev-0.7.1-r0
 libc-utils-0.7.1-r0
-libc6-compat-1.1.16-r13
+libc6-compat-1.1.16-r14
 libcap-2.25-r1
 libcap-ng-0.7.8-r0
 libcap-ng-dev-0.7.8-r0
@@ -142,6 +144,7 @@ libmount-2.28.2-r2
 libnfs-1.11.0-r0
 libnfsidmap-0.25-r1
 libnftnl-libs-1.0.7-r0
+libnl-1.1.4-r0
 libnl3-3.2.28-r0
 libogg-1.3.2-r1
 libpcap-1.8.1-r0
@@ -183,9 +186,9 @@ mpc1-1.0.3-r0
 mpfr3-3.1.5-r0
 mtools-4.0.18-r1
 multipath-tools-0.7.1-r1
-musl-1.1.16-r13
-musl-dev-1.1.16-r13
-musl-utils-1.1.16-r13
+musl-1.1.16-r14
+musl-dev-1.1.16-r14
+musl-utils-1.1.16-r14
 ncurses-dev-6.0_p20170930-r0
 ncurses-libs-6.0_p20170930-r0
 ncurses-terminfo-6.0_p20170930-r0
@@ -254,9 +257,9 @@ util-linux-dev-2.28.2-r2
 vde2-libs-2.3.2-r7
 vim-8.0.0595-r0
 wayland-1.13.0-r0
-wireguard-tools-0.0.20171011-r0
+wireguard-tools-0.0.20171017-r0
 wireless-tools-30_pre9-r0
-wpa_supplicant-2.6-r3
+wpa_supplicant-2.6-r4
 xfsprogs-4.5.0-r0
 xfsprogs-extra-4.5.0-r0
 xfsprogs-libs-4.5.0-r0
diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64
index 71a68593c..831dca9f3 100644
--- a/tools/alpine/versions.x86_64
+++ b/tools/alpine/versions.x86_64
@@ -1,4 +1,4 @@
-# linuxkit/alpine:b3f8da6c6f02440ee9c4c72bbf4dabdf500b1d8c-amd64
+# linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213-amd64
 # automatically generated list of installed packages
 abuild-3.0.0_rc2-r8
 alpine-baselayout-3.0.4-r0
@@ -9,7 +9,7 @@ argp-standalone-1.3-r2
 attr-2.4.47-r6
 attr-dev-2.4.47-r6
 autoconf-2.69-r0
-automake-1.15-r0
+automake-1.15.1-r0
 bash-4.3.48-r1
 bc-1.06.95-r2
 binutils-2.28-r2
@@ -17,6 +17,7 @@ binutils-dev-2.28-r2
 binutils-libs-2.28-r2
 bison-3.0.4-r0
 blkid-2.28.2-r2
+bridge-utils-1.6-r0
 bsd-compat-headers-0.7.1-r0
 btrfs-progs-4.10.2-r0
 btrfs-progs-dev-4.10.2-r0
@@ -87,6 +88,7 @@ installkernel-3.5-r0
 iperf3-3.1.7-r0
 iproute2-4.10.0-r1
 iptables-1.6.1-r0
+ipvsadm-1.29-r0
 isl-0.17.1-r0
 jq-1.5-r3
 json-c-0.12.1-r0
@@ -110,7 +112,7 @@ libburn-1.4.6-r0
 libbz2-1.0.6-r5
 libc-dev-0.7.1-r0
 libc-utils-0.7.1-r0
-libc6-compat-1.1.16-r13
+libc6-compat-1.1.16-r14
 libcap-2.25-r1
 libcap-ng-0.7.8-r0
 libcap-ng-dev-0.7.8-r0
@@ -146,6 +148,7 @@ libmspack-0.5_alpha-r1
 libnfs-1.11.0-r0
 libnfsidmap-0.25-r1
 libnftnl-libs-1.0.7-r0
+libnl-1.1.4-r0
 libnl3-3.2.28-r0
 libogg-1.3.2-r1
 libpcap-1.8.1-r0
@@ -189,9 +192,9 @@ mpc1-1.0.3-r0
 mpfr3-3.1.5-r0
 mtools-4.0.18-r1
 multipath-tools-0.7.1-r1
-musl-1.1.16-r13
-musl-dev-1.1.16-r13
-musl-utils-1.1.16-r13
+musl-1.1.16-r14
+musl-dev-1.1.16-r14
+musl-utils-1.1.16-r14
 ncurses-dev-6.0_p20170930-r0
 ncurses-libs-6.0_p20170930-r0
 ncurses-terminfo-6.0_p20170930-r0
@@ -262,9 +265,9 @@ util-linux-dev-2.28.2-r2
 vde2-libs-2.3.2-r7
 vim-8.0.0595-r0
 wayland-1.13.0-r0
-wireguard-tools-0.0.20171011-r0
+wireguard-tools-0.0.20171017-r0
 wireless-tools-30_pre9-r0
-wpa_supplicant-2.6-r3
+wpa_supplicant-2.6-r4
 xfsprogs-4.5.0-r0
 xfsprogs-extra-4.5.0-r0
 xfsprogs-libs-4.5.0-r0