From 95ce6386aaea25a72fb42d065d3f1291d8855e6a Mon Sep 17 00:00:00 2001
From: Avi Deitcher <avi@deitcher.net>
Date: Tue, 13 Apr 2021 13:46:33 +0300
Subject: [PATCH] Update Alpine base to 3.13; go-compile rebuilt with
 mod=vendor option, go bumped to 1.16

Signed-off-by: Avi Deitcher <avi@deitcher.net>
---
 .gitignore                      |   1 +
 docs/releasing.md               |   5 +-
 tools/alpine/Dockerfile         |  31 +-
 tools/alpine/README.md          |  43 +++
 tools/alpine/go-compile.sh      |   6 +-
 tools/alpine/packages           |   2 +-
 tools/alpine/packages.repo.edge |   1 +
 tools/alpine/versions.aarch64   | 562 +++++++++++++++----------------
 tools/alpine/versions.s390x     | 554 +++++++++++++++----------------
 tools/alpine/versions.x86_64    | 571 ++++++++++++++++----------------
 10 files changed, 914 insertions(+), 862 deletions(-)
 create mode 100644 tools/alpine/README.md
 create mode 100644 tools/alpine/packages.repo.edge

diff --git a/.gitignore b/.gitignore
index f2e4cf72b..90fb1e939 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ Dockerfile.media
 *-cmdline
 *-state
 artifacts/*
+tools/alpine/iid
diff --git a/docs/releasing.md b/docs/releasing.md
index d3bd579de..bc96fe1a1 100644
--- a/docs/releasing.md
+++ b/docs/releasing.md
@@ -112,6 +112,7 @@ other packages:
 cd $LK_ROOT/tools
 ../scripts/update-component-sha.sh --image linuxkit/alpine:$LK_ALPINE
 git checkout alpine/versions.aarch64 alpine/versions.s390x
+git checkout grub/Dockerfile
 
 git commit -a -s -m "tools: Update to the latest linuxkit/alpine"
 git push $LK_REMOTE rel_$LK_RELEASE
@@ -122,6 +123,8 @@ make forcepush
 Note, the `git checkout` reverts the changes made by
 `update-component-sha.sh` to files which are accidentally updated and
 the `make forcepush` will skip building the alpine base.
+Also, `git checkout` of `grub`. This is a bit old and only can be built with specific
+older versions of packages like `gcc`, and should not be updated.
 
 Then, on the other build machines in turn:
 
@@ -275,5 +278,3 @@ This completes the release, but you are not done, one more step is required.
 Create a PR which bumps the version number in the top-level `Makefile`
 to `$LK_RELEASE+` to make sure that the version reported by `linuxkit
 version` gets updated.
-
-
diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile
index 419770e1e..039981cae 100644
--- a/tools/alpine/Dockerfile
+++ b/tools/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12 AS mirror
+FROM alpine:3.13 AS mirror
 
 # update base image
 RUN apk update && apk upgrade -a
@@ -7,11 +7,30 @@ RUN apk update && apk upgrade -a
 COPY Dockerfile /Dockerfile
 COPY packages* /tmp/
 
-# mirror packages
+# mirror packages - both generic and repository specific ones
 RUN cat /tmp/packages.$(uname -m) >> /tmp/packages && \
    mkdir -p /mirror/$(apk --print-arch) && \
    apk fetch --recursive -o /mirror/$(apk --print-arch) $(apk info; cat /tmp/packages)
 
+# these are the repository-specific ones, if they exist
+RUN for repopkgs in /tmp/packages.repo.*; do \
+        repo=${repopkgs##*repo.} && archspecific=/tmp/packages.$(uname -m).repo.${repo} && mergedfile=/tmp/packages.merged.${repo} && repofile=/tmp/repositories.${repo} && \
+	cachedir=/tmp/cache/${repo} && \
+	mkdir -p ${cachedir} && \
+        cp ${repopkgs} ${mergedfile} && \
+        if [ -f ${archspecific} ]; then cat ${archspecific} >> ${mergedfile}; fi && \
+        sed "s#alpine/[^\/]*/#alpine/${repo}/#g" /etc/apk/repositories > ${repofile} && \
+        apk update --repositories-file=${repofile} --cache-dir ${cachedir} && \
+        apk fetch --repositories-file=${repofile} --cache-dir ${cachedir} --recursive -o /mirror/$(apk --print-arch) $(cat ${mergedfile}); done
+
+# we CANNOT allow musl-dev or musl > 1.2.2-r0, which ships with alpine:3.13, because 1.2.2-r2, which ships with alpine:edge / alpine:3.14
+#   uses the new faccessat2 system call which gives errors, see https://wiki.alpinelinux.org/wiki/Draft_Release_Notes_for_Alpine_3.14.0#faccessat2
+RUN target="1.2.2-r0" && \
+    verlte() { [  "$1" = $(printf '%s\n%s' "$1" "$2" | sort -V | head -n1) ] ; } && \
+    for file in /mirror/$(apk --print-arch)/musl-*.apk; do \
+    version=$(tar -xf ${file}  -O .PKGINFO | awk '$1 == "pkgver" {print $3}') && \
+    if ! verlte ${version} ${target} ; then echo "removing ${file}" && rm ${file}; fi; done
+
 # install abuild and sudo for signing
 RUN apk add --no-cache abuild sudo
 
@@ -39,8 +58,10 @@ RUN go get -u github.com/LK4D4/vndr
 # checkout and compile containerd
 # Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and
 # `test/pkg/containerd/Dockerfile` when changing this.
+# when building, note that containerd does not use go modules in the below commit,
+# while go1.16 defaults to using it, so must disable with GO111MODULE=off
 ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
-ENV CONTAINERD_COMMIT=v1.4.1
+ENV CONTAINERD_COMMIT=v1.4.4
 RUN mkdir -p $GOPATH/src/github.com/containerd && \
   cd $GOPATH/src/github.com/containerd && \
   git clone https://github.com/containerd/containerd.git && \
@@ -48,7 +69,7 @@ RUN mkdir -p $GOPATH/src/github.com/containerd && \
   git checkout $CONTAINERD_COMMIT
 RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev
 RUN cd $GOPATH/src/github.com/containerd/containerd && \
-  make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper"
+  GO111MODULE=off make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper"
 
 # Checkout and compile iucode-tool for Intel CPU microcode
 # On non-x86_64 create a dummy file to copy below.
@@ -70,7 +91,7 @@ RUN set -e && \
         cp iucode_tool /iucode_tool; \
     fi
 
-FROM alpine:3.11
+FROM alpine:3.13
 
 COPY --from=mirror /etc/apk/repositories /etc/apk/repositories
 COPY --from=mirror /etc/apk/repositories.upstream /etc/apk/repositories.upstream
diff --git a/tools/alpine/README.md b/tools/alpine/README.md
new file mode 100644
index 000000000..ee4716808
--- /dev/null
+++ b/tools/alpine/README.md
@@ -0,0 +1,43 @@
+# LinuxKit Alpine
+
+`linuxkit/alpine` is the base image for almost all other packages built by linuxkit, including builders, tools and actual container images
+that are used in various parts of linuxkit yaml files.
+
+This provides a reliable, consistent and repetable build.
+
+This directory contains the source of `linuxkit/alpine`.
+
+## Building
+
+To build, run:
+
+```
+make build
+```
+
+## Pushing
+
+To push, run:
+
+```
+make push
+```
+
+For a proper release process, see [docs/releasing.md](../../docs/releasing.md).
+
+## Updating Sources and Packages
+
+The base build for `linuxkit/alpine` is [library/alpine](https://hub.docker.io/_/alpine). The specific version is set in two `FROM` lines in
+the [Dockerfile](./Dockerfile) in this directory.
+
+The packages installed come from several sources:
+
+* [packages](./packages) - this file contains the list of packages to mirror locally in `linuxkit/alpine`, and will be available to all downstream users of `linuxkit/alpine`. These are installed using the default `apk` package version for the specific version of alpine. For example, if the line starts with `FROM alpine:3.13` and `packages` contains `file`, then it will run simply `apk add file`. The packages listed in [packages](./packages) are installed on all architectures.
+* `packages.<arch>` - these files contain the list of packages to mirror locally in `linuxkit/alpine`, like `packages`, but only for the specified architecture. For example, [packages.x86_64](./packages.x86_64) contains packages to be installed only on `linuxkit/alpine` for `x84_64`.
+* `packages.repo.<name>` - these files contain the list of packages to mirror locally in `linuxkit/alpine`, like `packages`, but to pull those packages from the provided `<name>` of Alpine's `apk` repo. For example, `packages.repo.edge` installs packages from Alpine's `edge` package repository.
+* `packages.<arch>.repo.<name>` - these files contain the list of packages to mirror locally in `linuxkit/alpine` for a specific architecture, like `packages.<arch>`, but to pull those packages from the provided `<name>` of Alpine's `apk` repor. For example, `packages.x86_64.repo.edge` installs packages from Alpine's `edge` package repository, hut only when building for `86_64`.
+
+In addition, the [Dockerfile](./Dockerfile) may install certain packages directly from source, if they are not available in the `apk` repositories, or the versions are
+insufficient.
+
+The final versions of packages installed are available in `versions.<arch>`.
diff --git a/tools/alpine/go-compile.sh b/tools/alpine/go-compile.sh
index 4ebdce8be..bc8edd421 100755
--- a/tools/alpine/go-compile.sh
+++ b/tools/alpine/go-compile.sh
@@ -13,6 +13,9 @@ dir="$1"
 
 cd "$dir"
 
+# Use '-mod=vendor' for builds which have switched to go modules
+[ -f go.mod -a -d vendor ] && export GOFLAGS="-mod=vendor"
+
 # lint before building
 >&2 echo "gofmt..."
 test -z $(gofmt -s -l .| grep -v .pb. | grep -v vendor/ | tee /dev/stderr)
@@ -33,4 +36,5 @@ go test
 
 [ "${REQUIRE_CGO}" = 1 ] || export CGO_ENABLED=0
 
-go install -buildmode pie -ldflags "-s -w ${ldflags} -extldflags \"-fno-PIC -static\""
+go install -buildmode pie -ldflags "-linkmode=external -s -w ${ldflags} -extldflags \"-fno-PIC -static\""
+
diff --git a/tools/alpine/packages b/tools/alpine/packages
index e5b766f04..6c08ff9b3 100644
--- a/tools/alpine/packages
+++ b/tools/alpine/packages
@@ -49,7 +49,6 @@ gettext-dev
 git
 gmp-dev
 gnupg
-go
 grep
 hvtools
 installkernel
@@ -68,6 +67,7 @@ libcap-ng-dev
 libedit-dev
 libressl-dev
 libseccomp-dev
+libseccomp-static
 libtirpc-dev
 libtool
 linux-headers
diff --git a/tools/alpine/packages.repo.edge b/tools/alpine/packages.repo.edge
new file mode 100644
index 000000000..4023f2095
--- /dev/null
+++ b/tools/alpine/packages.repo.edge
@@ -0,0 +1 @@
+go
diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64
index df57a4b95..553fdca96 100644
--- a/tools/alpine/versions.aarch64
+++ b/tools/alpine/versions.aarch64
@@ -1,369 +1,359 @@
-# linuxkit/alpine:8c590aca93e31c975d93e08bc66ebffc1157baa3-arm64
+# linuxkit/alpine:6b51a56743e4f8b923a52b908bea216749b08bec-arm64
 # automatically generated list of installed packages
-abuild-3.6.0-r0
-alpine-baselayout-3.2.0-r7
+abuild-3.7.0-r0
+alpine-baselayout-3.2.0-r8
 alpine-keys-2.2-r0
-alsa-lib-1.2.2-r0
-apk-tools-2.10.5-r1
+apk-tools-2.12.5-r0
 argon2-libs-20190702-r1
 argp-standalone-1.3-r4
 attr-2.4.48-r0
 attr-dev-2.4.48-r0
-audit-2.8.5-r0
-audit-libs-2.8.5-r0
-audit-openrc-2.8.5-r0
-autoconf-2.69-r2
-automake-1.16.2-r0
-bash-5.0.17-r0
+audit-2.8.5-r3
+audit-libs-2.8.5-r3
+audit-openrc-2.8.5-r3
+autoconf-2.69-r3
+automake-1.16.3-r0
+bash-5.1.0-r0
 bc-1.07.1-r1
-binutils-2.34-r1
-binutils-dev-2.34-r1
-binutils-gold-2.34-r1
-bison-3.6.2-r0
-blkid-2.35.2-r0
-bridge-utils-1.6-r0
-brotli-libs-1.0.9-r1
+binutils-2.35.2-r1
+binutils-dev-2.35.2-r1
+binutils-gold-2.35.2-r1
+bison-3.7.4-r0
+blkid-2.36.1-r1
+bridge-utils-1.7-r0
+brotli-libs-1.0.9-r3
 bsd-compat-headers-0.7.2-r3
-btrfs-progs-5.6.1-r0
-btrfs-progs-dev-5.6.1-r0
-btrfs-progs-libs-5.6.1-r0
+btrfs-progs-5.10-r0
+btrfs-progs-dev-5.10-r0
+btrfs-progs-libs-5.10-r0
 build-base-0.5-r2
-busybox-1.31.1-r19
+busybox-1.32.1-r6
 busybox-initscripts-3.2-r2
 bzip2-1.0.8-r1
-ca-certificates-20191127-r4
-ca-certificates-bundle-20191127-r4
-cairo-1.16.0-r2
-cdparanoia-libs-10.2-r8
-cdrkit-1.1.11-r2
-cfdisk-2.35.2-r0
-cifs-utils-6.10-r1
-clang-10.0.0-r2
-clang-dev-10.0.0-r2
-clang-extra-tools-10.0.0-r2
-clang-libs-10.0.0-r2
-clang-static-10.0.0-r2
-cmake-3.17.2-r0
-coreutils-8.32-r0
-cryptsetup-2.3.2-r1
-cryptsetup-libs-2.3.2-r1
-cryptsetup-openrc-2.3.2-r1
-curl-7.69.1-r1
-db-5.3.28-r1
-dbus-libs-1.12.18-r0
-device-mapper-2.02.186-r1
-device-mapper-event-libs-2.02.186-r1
-device-mapper-libs-2.02.186-r1
-device-mapper-udev-2.02.186-r1
-dhcpcd-8.1.6-r0
-dhcpcd-openrc-8.1.6-r0
+ca-certificates-20191127-r5
+ca-certificates-bundle-20191127-r5
+cdrkit-1.1.11-r3
+cfdisk-2.36.1-r1
+cifs-utils-6.12-r0
+clang-10.0.1-r0
+clang-dev-10.0.1-r0
+clang-extra-tools-10.0.1-r0
+clang-libs-10.0.1-r0
+clang-static-10.0.1-r0
+cmake-3.18.4-r1
+coreutils-8.32-r2
+cryptsetup-2.3.4-r1
+cryptsetup-libs-2.3.4-r1
+cryptsetup-openrc-2.3.4-r1
+curl-7.76.1-r0
+dbus-libs-1.12.20-r1
+device-mapper-2.02.187-r1
+device-mapper-event-libs-2.02.187-r1
+device-mapper-libs-2.02.187-r1
+device-mapper-udev-2.02.187-r1
+dhcpcd-8.1.6-r1
+dhcpcd-openrc-8.1.6-r1
 diffutils-3.7-r0
 dosfstools-4.1-r1
-dtc-1.6.0-r0
-e2fsprogs-1.45.6-r0
-e2fsprogs-dev-1.45.6-r0
-e2fsprogs-extra-1.45.6-r0
-e2fsprogs-libs-1.45.6-r0
-elfutils-dev-0.179-r0
-ethtool-5.6-r0
+dtc-1.6.0-r1
+e2fsprogs-1.45.7-r0
+e2fsprogs-dev-1.45.7-r0
+e2fsprogs-extra-1.45.7-r0
+e2fsprogs-libs-1.45.7-r0
+elfutils-dev-0.182-r0
+ethtool-5.10-r0
 eudev-3.2.9-r3
 eudev-libs-3.2.9-r3
 eudev-openrc-3.2.9-r3
-expat-2.2.9-r1
+expat-2.2.10-r1
 expect-5.45.4-r0
-fakeroot-1.24-r0
-file-5.38-r0
-findmnt-2.35.2-r0
-findutils-4.7.0-r0
+fakeroot-1.25.3-r3
+file-5.39-r0
+findmnt-2.36.1-r1
+findutils-4.8.0-r0
 flex-2.6.4-r2
 flex-dev-2.6.4-r2
 flex-libs-2.6.4-r2
-fontconfig-2.13.1-r2
 fortify-headers-1.1-r0
-freetype-2.10.2-r0
-fribidi-1.0.9-r0
 fts-1.2.7-r1
 fts-dev-1.2.7-r1
-g++-9.3.0-r2
-gc-8.0.4-r1
-gcc-9.3.0-r2
-gdbm-1.13-r1
-gettext-0.20.2-r0
-gettext-asprintf-0.20.2-r0
-gettext-dev-0.20.2-r0
-gettext-libs-0.20.2-r0
-git-2.26.2-r0
-git-perl-2.26.2-r0
-glib-2.64.6-r0
-gmp-6.2.0-r0
-gmp-dev-6.2.0-r0
-gnupg-2.2.23-r0
-gnutls-3.6.15-r0
-go-1.13.14-r0
-graphite2-1.3.14-r0
-grep-3.4-r0
-gst-plugins-base-1.16.2-r3
-gstreamer-1.16.2-r2
+g++-10.2.1_pre1-r3
+gc-8.0.4-r4
+gcc-10.2.1_pre1-r3
+gdbm-1.19-r0
+gettext-0.20.2-r2
+gettext-asprintf-0.20.2-r2
+gettext-dev-0.20.2-r2
+gettext-libs-0.20.2-r2
+git-2.30.2-r0
+git-perl-2.30.2-r0
+glib-2.66.8-r0
+gmp-6.2.1-r0
+gmp-dev-6.2.1-r0
+gnupg-2.2.27-r0
+gnutls-3.7.1-r0
+go-1.16.3-r0
+grep-3.6-r0
 guile-2.0.14-r2
 guile-libs-2.0.14-r2
-harfbuzz-2.6.6-r0
-hexdump-2.35.2-r0
+hexdump-2.36.1-r1
 hvtools-4.11.9-r1
-installkernel-3.5-r0
-iperf3-3.7-r2
-iperf3-openrc-3.7-r2
-iproute2-5.6.0-r0
-iptables-1.8.4-r2
-iptables-openrc-1.8.4-r2
+ifupdown-ng-0.11.2-r0
+ifupdown-ng-ethtool-0.11.2-r0
+ifupdown-ng-iproute2-0.11.2-r0
+ifupdown-ng-wireguard-0.11.2-r0
+inih-52-r1
+installkernel-3.5-r1
+ip6tables-1.8.6-r0
+ip6tables-openrc-1.8.6-r0
+iperf3-3.9-r1
+iperf3-openrc-3.9-r1
+iproute2-5.10.0-r1
+iproute2-minimal-5.10.0-r1
+iproute2-ss-5.10.0-r1
+iproute2-tc-5.10.0-r1
+iptables-1.8.6-r0
+iptables-openrc-1.8.6-r0
 ipvsadm-1.31-r0
-isl-0.18-r0
+isl22-0.22-r0
 jq-1.6-r1
-json-c-0.14-r1
-keyutils-1.6.1-r1
-keyutils-libs-1.6.1-r1
-kmod-27-r0
-kmod-libs-27-r0
-kmod-openrc-27-r0
+json-c-0.15-r1
+keyutils-1.6.3-r0
+keyutils-libs-1.6.3-r0
+kmod-28-r0
+kmod-libs-28-r0
+kmod-openrc-28-r0
 krb5-conf-1.0-r2
-krb5-dev-1.18.2-r0
-krb5-libs-1.18.2-r0
-krb5-server-ldap-1.18.2-r0
+krb5-dev-1.18.3-r1
+krb5-libs-1.18.3-r1
+krb5-server-ldap-1.18.3-r1
 libacl-2.2.53-r0
 libaio-0.3.112-r1
-libarchive-3.4.3-r1
-libarchive-tools-3.4.3-r1
-libassuan-2.5.3-r0
-libatomic-9.3.0-r2
+libarchive-3.5.1-r0
+libarchive-tools-3.5.1-r0
+libassuan-2.5.4-r0
+libatomic-10.2.1_pre1-r3
 libattr-2.4.48-r0
-libblkid-2.35.2-r0
+libblkid-2.36.1-r1
 libbsd-0.10.0-r0
 libburn-1.5.2-r0
 libbz2-1.0.8-r1
 libc-dev-0.7.2-r3
 libc-utils-0.7.2-r3
-libc6-compat-1.1.24-r9
-libcap-2.27-r0
-libcap-ng-0.7.10-r1
-libcap-ng-dev-0.7.10-r1
-libcom_err-1.45.6-r0
-libcrypto1.1-1.1.1g-r0
-libcurl-7.69.1-r1
-libdrm-2.4.102-r0
-libedit-20191231.3.1-r0
-libedit-dev-20191231.3.1-r0
-libelf-0.179-r0
-libepoxy-1.5.4-r0
-libevent-2.1.11-r1
-libfdisk-2.35.2-r0
-libfdt-1.6.0-r0
+libc6-compat-1.2.2-r0
+libcap-2.46-r0
+libcap-ng-0.8.2-r0
+libcap-ng-dev-0.8.2-r0
+libcom_err-1.45.7-r0
+libcrypto1.1-1.1.1k-r0
+libcurl-7.76.1-r0
+libdrm-2.4.104-r0
+libeconf-0.3.8-r0
+libedit-20191231.3.1-r1
+libedit-dev-20191231.3.1-r1
+libelf-0.182-r0
+libepoxy-1.5.5-r0
+libevent-2.1.12-r1
+libfdisk-2.36.1-r1
+libfdt-1.6.0-r1
 libffi-3.3-r2
-libgcc-9.3.0-r2
-libgcrypt-1.8.5-r0
-libgmpxx-6.2.0-r0
-libgomp-9.3.0-r2
-libgpg-error-1.37-r0
-libgphobos-9.3.0-r2
-libintl-0.20.2-r0
+libgcc-10.2.1_pre1-r3
+libgcc-10.3.1_git20210424-r0
+libgcrypt-1.8.7-r0
+libgmpxx-6.2.1-r0
+libgomp-10.2.1_pre1-r3
+libgpg-error-1.41-r0
+libgphobos-10.2.1_pre1-r3
+libintl-0.20.2-r2
 libisoburn-1.5.2-r0
 libisofs-1.5.2-r0
-libjpeg-turbo-2.0.5-r0
-libksba-1.4.0-r0
-libldap-2.4.50-r0
+libjpeg-turbo-2.1.0-r0
+libksba-1.5.0-r0
+libldap-2.4.57-r1
 libltdl-2.4.6-r7
-libmagic-5.38-r0
-libmnl-1.0.4-r0
-libmount-2.35.2-r0
-libnfsidmap-2.4.3-r1
-libnftnl-libs-1.1.6-r0
+libmagic-5.39-r0
+libmnl-1.0.4-r1
+libmount-2.36.1-r1
+libnfsidmap-2.5.2-r0
+libnftnl-libs-1.1.8-r0
 libnl3-3.5.0-r0
-libogg-1.3.4-r0
-libpcap-1.9.1-r2
+libpcap-1.10.0-r0
 libpng-1.6.37-r1
-libressl-dev-3.1.2-r0
-libressl3.1-libcrypto-3.1.2-r0
-libressl3.1-libssl-3.1.2-r0
-libressl3.1-libtls-3.1.2-r0
-libsasl-2.1.27-r6
-libseccomp-2.4.3-r0
-libseccomp-dev-2.4.3-r0
-libsecret-0.20.3-r0
-libsmartcols-2.35.2-r0
-libssl1.1-1.1.1g-r0
-libstdc++-9.3.0-r2
+libressl-dev-3.1.5-r0
+libressl3.1-libcrypto-3.1.5-r0
+libressl3.1-libssl-3.1.5-r0
+libressl3.1-libtls-3.1.5-r0
+libsasl-2.1.27-r10
+libseccomp-2.5.1-r1
+libseccomp-dev-2.5.1-r1
+libseccomp-static-2.5.1-r1
+libsecret-0.20.4-r0
+libsmartcols-2.36.1-r1
+libssl1.1-1.1.1k-r0
+libstdc++-10.2.1_pre1-r3
+libstdc++-10.3.1_git20210424-r0
 libtasn1-4.16.0-r1
-libtheora-1.1.1-r14
-libtirpc-1.2.6-r0
-libtirpc-conf-1.2.6-r0
-libtirpc-dev-1.2.6-r0
-libtirpc-nokrb-1.2.6-r0
+libtirpc-1.3.1-r0
+libtirpc-conf-1.3.1-r0
+libtirpc-dev-1.3.1-r0
+libtirpc-nokrb-1.3.1-r0
 libtls-standalone-2.9.1-r1
 libtool-2.4.6-r7
-libucontext-0.11-r0
-libucontext-dev-0.11-r0
+libucontext-1.0-r0
+libucontext-dev-1.0-r0
 libunistring-0.9.10-r0
-libunwind-1.4.0-r0
-libunwind-dev-1.4.0-r0
-libusb-1.0.23-r0
-libuuid-2.35.2-r0
-libuv-1.38.1-r0
+libunwind-1.5.0-r1
+libunwind-dev-1.5.0-r1
+libusb-1.0.24-r1
+libuuid-2.36.1-r1
+libuv-1.40.0-r0
 libverto-0.3.1-r1
-libvorbis-1.3.6-r2
-libwbclient-4.12.7-r0
-libx11-1.6.12-r0
+libwbclient-4.13.7-r0
+libx11-1.7.0-r0
 libxau-1.0.9-r0
 libxcb-1.14-r1
-libxdamage-1.1.5-r0
 libxdmcp-1.1.3-r0
-libxext-1.3.4-r0
-libxfixes-5.0.3-r2
-libxft-2.3.3-r0
-libxkbcommon-0.10.0-r1
-libxml2-2.9.10-r5
-libxrender-0.9.10-r3
-libxshmfence-1.3-r0
-libxv-1.0.11-r2
-libxxf86vm-1.1.4-r2
-linux-headers-5.4.5-r1
-llvm10-10.0.0-r2
-llvm10-dev-10.0.0-r2
-llvm10-libs-10.0.0-r2
-llvm10-static-10.0.0-r2
-lsblk-2.35.2-r0
+libxkbcommon-1.0.3-r0
+libxml2-2.9.10-r6
+linux-headers-5.7.8-r0
+llvm10-10.0.1-r1
+llvm10-dev-10.0.1-r1
+llvm10-libs-10.0.1-r1
+llvm10-static-10.0.1-r1
+lsblk-2.36.1-r1
 lsscsi-0.31-r0
-lua5.3-libs-5.3.5-r6
-luajit-5.1.20190925-r0
-luajit-dev-5.1.20190925-r0
-lvm2-libs-2.02.186-r1
+lua5.3-libs-5.3.6-r0
+luajit-2.2.0-r3
+luajit-dev-2.2.0-r3
+lvm2-libs-2.02.187-r1
 lz4-libs-1.9.2-r0
 lzip-1.21-r0
 lzo-2.10-r2
-m4-1.4.18-r1
+m4-1.4.18-r2
 make-4.3-r0
-mcookie-2.35.2-r0
-mesa-20.0.7-r0
-mesa-egl-20.0.7-r0
-mesa-gbm-20.0.7-r0
-mesa-gl-20.0.7-r0
-mesa-glapi-20.0.7-r0
-mpc1-1.1.0-r1
-mpc1-dev-1.1.0-r1
-mpfr-dev-4.0.2-r4
-mpfr4-4.0.2-r4
-mtools-4.0.24-r0
-multipath-tools-0.8.4-r1
-multipath-tools-openrc-0.8.4-r1
-musl-1.1.24-r9
-musl-dev-1.1.24-r9
-musl-utils-1.1.24-r9
-ncurses-dev-6.2_p20200523-r0
-ncurses-libs-6.2_p20200523-r0
-ncurses-terminfo-base-6.2_p20200523-r0
-nettle-3.5.1-r1
-nfs-utils-2.4.3-r1
-nfs-utils-openrc-2.4.3-r1
-nghttp2-libs-1.41.0-r0
+mcookie-2.36.1-r1
+mesa-20.3.3-r0
+mesa-gbm-20.3.3-r0
+mpc1-1.2.0-r0
+mpc1-dev-1.2.0-r0
+mpfr-dev-4.1.0-r0
+mpfr4-4.1.0-r0
+mtools-4.0.26-r0
+multipath-tools-0.8.5-r0
+multipath-tools-openrc-0.8.5-r0
+musl-1.2.2-r0
+musl-dev-1.2.2-r0
+musl-utils-1.2.2-r0
+ncurses-dev-6.2_p20210109-r0
+ncurses-libs-6.2_p20210109-r0
+ncurses-terminfo-base-6.2_p20210109-r0
+nettle-3.7.2-r0
+nfs-utils-2.5.2-r0
+nfs-utils-openrc-2.5.2-r0
+nghttp2-libs-1.42.0-r1
 npth-1.6-r0
-oniguruma-6.9.5-r1
-open-iscsi-2.1.0-r2
-open-iscsi-libs-2.1.0-r2
-open-iscsi-openrc-2.1.0-r2
+oniguruma-6.9.6-r0
+open-iscsi-2.1.3-r0
+open-iscsi-libs-2.1.3-r0
+open-iscsi-openrc-2.1.3-r0
 open-isns-lib-0.100-r0
-openntpd-6.2_p3-r3
-openrc-0.42.1-r11
-openresolv-3.10.0-r0
-openssh-client-8.3_p1-r0
-openssh-keygen-8.3_p1-r0
-openssh-server-8.3_p1-r0
-openssh-server-common-8.3_p1-r0
-openssl-1.1.1g-r0
-openssl-dev-1.1.1g-r0
-opus-1.3.1-r0
-orc-0.4.31-r2
-p11-kit-0.23.20-r5
-pango-1.44.7-r2
+openntpd-6.8_p1-r0
+openrc-0.42.1-r19
+openresolv-3.12.0-r0
+openssh-client-8.4_p1-r3
+openssh-keygen-8.4_p1-r3
+openssh-server-8.4_p1-r3
+openssh-server-common-8.4_p1-r3
+openssl-1.1.1k-r0
+openssl-dev-1.1.1k-r0
+p11-kit-0.23.22-r0
+partx-2.36.1-r1
 patch-2.7.6-r6
 pcre-8.44-r0
-pcre2-10.35-r0
-pcsc-lite-libs-1.8.26-r0
-perl-5.30.3-r0
-perl-error-0.17029-r0
-perl-git-2.26.2-r0
+pcre2-10.36-r0
+pcsc-lite-libs-1.9.0-r0
+perl-5.32.0-r0
+perl-error-0.17029-r1
+perl-git-2.30.2-r0
 pigz-2.4-r1
-pinentry-1.1.0-r2
+pinentry-1.1.1-r0
 pixman-0.40.0-r2
-pkgconf-1.7.2-r0
-popt-1.16-r7
-python2-2.7.18-r0
-python3-3.8.5-r0
-qemu-5.0.0-r2
-qemu-aarch64-5.0.0-r2
-qemu-arm-5.0.0-r2
-qemu-guest-agent-5.0.0-r2
-qemu-img-5.0.0-r2
-qemu-ppc64le-5.0.0-r2
-qemu-system-aarch64-5.0.0-r2
-qemu-system-arm-5.0.0-r2
-qemu-system-x86_64-5.0.0-r2
-readline-8.0.4-r0
-rhash-libs-1.3.9-r1
+pkgconf-1.7.3-r0
+popt-1.18-r0
+python2-2.7.18-r1
+python3-3.8.8-r0
+qemu-5.2.0-r3
+qemu-aarch64-5.2.0-r3
+qemu-arm-5.2.0-r3
+qemu-guest-agent-5.2.0-r3
+qemu-img-5.2.0-r3
+qemu-ppc64le-5.2.0-r3
+qemu-system-aarch64-5.2.0-r3
+qemu-system-arm-5.2.0-r3
+qemu-system-x86_64-5.2.0-r3
+readline-8.1.0-r0
+rhash-libs-1.4.1-r0
 rpcbind-1.2.5-r0
 rpcbind-openrc-1.2.5-r0
-rsync-3.1.3-r3
-rsync-openrc-3.1.3-r3
-samba-util-libs-4.12.7-r0
-scanelf-1.2.6-r0
+rsync-3.2.3-r1
+rsync-openrc-3.2.3-r1
+s6-ipcserver-2.10.0.0-r0
+samba-util-libs-4.13.7-r0
+scanelf-1.2.8-r0
 sed-4.8-r0
-setpriv-2.35.2-r0
-sfdisk-2.35.2-r0
+setpriv-2.36.1-r1
+sfdisk-2.36.1-r1
 sg3_utils-1.45-r0
-sgdisk-1.0.5-r0
+sgdisk-1.0.7-r0
+skalibs-2.10.0.0-r0
 slang-2.3.2-r0
 slang-dev-2.3.2-r0
 snappy-1.1.8-r2
-sntpc-0.9-r6
-socat-1.7.3.4-r0
-spice-server-0.14.3-r0
-sqlite-libs-3.32.1-r0
-squashfs-tools-4.4-r0
-ssl_client-1.31.1-r19
-strace-5.6-r0
-swig-4.0.1-r0
+sntpc-0.9-r7
+sntpc-openrc-0.9-r7
+socat-1.7.4.1-r0
+sqlite-libs-3.34.1-r0
+squashfs-tools-4.4-r1
+ssl_client-1.32.1-r6
+strace-5.10-r0
+swig-4.0.2-r0
 talloc-2.3.1-r0
-tar-1.32-r1
-tcl-8.6.10-r0
-tcpdump-4.9.3-r1
+tar-1.34-r0
+tcl-8.6.10-r1
+tcpdump-4.99.0-r0
 tevent-0.10.2-r0
 tini-0.19.0-r0
-tzdata-2020a-r0
-udev-init-scripts-33-r1
-udev-init-scripts-openrc-33-r1
-usbredir-0.8.0-r1
+tzdata-2021a-r0
+udev-init-scripts-34-r0
+udev-init-scripts-openrc-34-r0
 userspace-rcu-0.12.1-r0
-util-linux-2.35.2-r0
-util-linux-dev-2.35.2-r0
+util-linux-2.36.1-r1
+util-linux-dev-2.36.1-r1
+util-linux-openrc-2.36.1-r1
+utmps-0.1.0.0-r0
+utmps-openrc-0.1.0.0-r0
 vde2-libs-2.3.2-r12
-vim-8.2.0735-r0
+vim-8.2.2320-r0
 virglrenderer-0.8.2-r1
-wayland-libs-client-1.18.0-r4
-wayland-libs-egl-1.18.0-r4
-wayland-libs-server-1.18.0-r4
-wireguard-tools-1.0.20200510-r0
-wireguard-tools-wg-1.0.20200510-r0
-wireguard-tools-wg-quick-1.0.20200510-r0
+wayland-libs-server-1.18.0-r5
+wireguard-tools-1.0.20200827-r1
+wireguard-tools-wg-1.0.20200827-r1
+wireguard-tools-wg-quick-1.0.20200827-r1
 wireless-tools-30_pre9-r1
-wpa_supplicant-2.9-r5
-wpa_supplicant-openrc-2.9-r5
-xfsprogs-5.6.0-r1
-xfsprogs-extra-5.6.0-r1
+wpa_supplicant-2.9-r11
+wpa_supplicant-openrc-2.9-r11
+xfsprogs-5.10.0-r0
+xfsprogs-extra-5.10.0-r0
+xkeyboard-config-2.31-r0
 xorriso-1.5.2-r0
-xxd-8.2.0735-r0
+xxd-8.2.2320-r0
 xz-5.2.5-r0
 xz-dev-5.2.5-r0
 xz-libs-5.2.5-r0
-zfs-0.8.4-r0
-zfs-libs-0.8.4-r0
-zfs-openrc-0.8.4-r0
+zfs-2.0.1-r0
+zfs-libs-2.0.1-r0
+zfs-openrc-2.0.1-r0
 zlib-1.2.11-r3
 zlib-dev-1.2.11-r3
 zlib-static-1.2.11-r3
-zstd-libs-1.4.5-r0
+zstd-libs-1.4.5-r3
diff --git a/tools/alpine/versions.s390x b/tools/alpine/versions.s390x
index 7e57dec7e..7e9baa9a3 100644
--- a/tools/alpine/versions.s390x
+++ b/tools/alpine/versions.s390x
@@ -1,362 +1,358 @@
-# linuxkit/alpine:5136b5b3650e0bed7cb19ce1efc2c2c66afe90ab-s390x
+# linuxkit/alpine:1a9b46af412628b96bebae06d99a03bd0d7fe53a-s390x
 # automatically generated list of installed packages
-abuild-3.6.0-r0
-alpine-baselayout-3.2.0-r7
+abuild-3.7.0-r0
+alpine-baselayout-3.2.0-r8
 alpine-keys-2.2-r0
-alsa-lib-1.2.2-r0
-apk-tools-2.10.5-r1
+apk-tools-2.12.5-r0
 argon2-libs-20190702-r1
 argp-standalone-1.3-r4
 attr-2.4.48-r0
 attr-dev-2.4.48-r0
-audit-2.8.5-r0
-audit-libs-2.8.5-r0
-audit-openrc-2.8.5-r0
-autoconf-2.69-r2
-automake-1.16.2-r0
-bash-5.0.17-r0
+audit-2.8.5-r3
+audit-libs-2.8.5-r3
+audit-openrc-2.8.5-r3
+autoconf-2.69-r3
+automake-1.16.3-r0
+bash-5.1.0-r0
 bc-1.07.1-r1
-binutils-2.34-r1
-binutils-dev-2.34-r1
-bison-3.6.2-r0
-blkid-2.35.2-r0
-bridge-utils-1.6-r0
-brotli-libs-1.0.9-r1
+binutils-2.35.2-r1
+binutils-dev-2.35.2-r1
+bison-3.7.4-r0
+blkid-2.36.1-r1
+bridge-utils-1.7-r0
+brotli-libs-1.0.9-r3
 bsd-compat-headers-0.7.2-r3
-btrfs-progs-5.6.1-r0
-btrfs-progs-dev-5.6.1-r0
-btrfs-progs-libs-5.6.1-r0
+btrfs-progs-5.10-r0
+btrfs-progs-dev-5.10-r0
+btrfs-progs-libs-5.10-r0
 build-base-0.5-r2
-busybox-1.31.1-r19
+busybox-1.32.1-r6
 busybox-initscripts-3.2-r2
 bzip2-1.0.8-r1
-ca-certificates-20191127-r4
-ca-certificates-bundle-20191127-r4
-cairo-1.16.0-r2
-cdparanoia-libs-10.2-r8
-cdrkit-1.1.11-r2
-cfdisk-2.35.2-r0
-cifs-utils-6.10-r1
-clang-10.0.0-r2
-clang-dev-10.0.0-r2
-clang-extra-tools-10.0.0-r2
-clang-libs-10.0.0-r2
-clang-static-10.0.0-r2
-cmake-3.17.2-r0
-coreutils-8.32-r0
-cryptsetup-2.3.2-r1
-cryptsetup-libs-2.3.2-r1
-cryptsetup-openrc-2.3.2-r1
-curl-7.69.1-r1
-db-5.3.28-r1
-dbus-libs-1.12.18-r0
-device-mapper-2.02.186-r1
-device-mapper-event-libs-2.02.186-r1
-device-mapper-libs-2.02.186-r1
-device-mapper-udev-2.02.186-r1
-dhcpcd-8.1.6-r0
-dhcpcd-openrc-8.1.6-r0
+ca-certificates-20191127-r5
+ca-certificates-bundle-20191127-r5
+cdrkit-1.1.11-r3
+cfdisk-2.36.1-r1
+cifs-utils-6.12-r0
+clang-10.0.1-r0
+clang-dev-10.0.1-r0
+clang-extra-tools-10.0.1-r0
+clang-libs-10.0.1-r0
+clang-static-10.0.1-r0
+cmake-3.18.4-r1
+coreutils-8.32-r2
+cryptsetup-2.3.4-r1
+cryptsetup-libs-2.3.4-r1
+cryptsetup-openrc-2.3.4-r1
+curl-7.76.1-r0
+dbus-libs-1.12.20-r1
+device-mapper-2.02.187-r1
+device-mapper-event-libs-2.02.187-r1
+device-mapper-libs-2.02.187-r1
+device-mapper-udev-2.02.187-r1
+dhcpcd-8.1.6-r1
+dhcpcd-openrc-8.1.6-r1
 diffutils-3.7-r0
 dosfstools-4.1-r1
-dtc-1.6.0-r0
-e2fsprogs-1.45.6-r0
-e2fsprogs-dev-1.45.6-r0
-e2fsprogs-extra-1.45.6-r0
-e2fsprogs-libs-1.45.6-r0
-elfutils-dev-0.179-r0
-ethtool-5.6-r0
+dtc-1.6.0-r1
+e2fsprogs-1.45.7-r0
+e2fsprogs-dev-1.45.7-r0
+e2fsprogs-extra-1.45.7-r0
+e2fsprogs-libs-1.45.7-r0
+elfutils-dev-0.182-r0
+ethtool-5.10-r0
 eudev-3.2.9-r3
 eudev-libs-3.2.9-r3
 eudev-openrc-3.2.9-r3
-expat-2.2.9-r1
+expat-2.2.10-r1
 expect-5.45.4-r0
-fakeroot-1.24-r0
-file-5.38-r0
-findmnt-2.35.2-r0
-findutils-4.7.0-r0
+fakeroot-1.25.3-r3
+file-5.39-r0
+findmnt-2.36.1-r1
+findutils-4.8.0-r0
 flex-2.6.4-r2
 flex-dev-2.6.4-r2
 flex-libs-2.6.4-r2
-fontconfig-2.13.1-r2
 fortify-headers-1.1-r0
-freetype-2.10.2-r0
-fribidi-1.0.9-r0
 fts-1.2.7-r1
 fts-dev-1.2.7-r1
-g++-9.3.0-r2
-gc-8.0.4-r1
-gcc-9.3.0-r2
-gdbm-1.13-r1
-gettext-0.20.2-r0
-gettext-asprintf-0.20.2-r0
-gettext-dev-0.20.2-r0
-gettext-libs-0.20.2-r0
-git-2.26.2-r0
-git-perl-2.26.2-r0
-glib-2.64.6-r0
-gmp-6.2.0-r0
-gmp-dev-6.2.0-r0
-gnupg-2.2.23-r0
-gnutls-3.6.15-r0
-go-1.13.14-r0
-graphite2-1.3.14-r0
-grep-3.4-r0
-gst-plugins-base-1.16.2-r3
-gstreamer-1.16.2-r2
+g++-10.2.1_pre1-r3
+gc-8.0.4-r4
+gcc-10.2.1_pre1-r3
+gcc-10.3.1_git20210424-r0
+gdbm-1.19-r0
+gettext-0.20.2-r2
+gettext-asprintf-0.20.2-r2
+gettext-dev-0.20.2-r2
+gettext-libs-0.20.2-r2
+git-2.30.2-r0
+git-perl-2.30.2-r0
+glib-2.66.8-r0
+gmp-6.2.1-r0
+gmp-dev-6.2.1-r0
+gnupg-2.2.27-r0
+gnutls-3.7.1-r0
+go-1.16.3-r0
+grep-3.6-r0
 guile-2.0.14-r2
 guile-libs-2.0.14-r2
-harfbuzz-2.6.6-r0
-hexdump-2.35.2-r0
+hexdump-2.36.1-r1
 hvtools-4.11.9-r1
-installkernel-3.5-r0
-iperf3-3.7-r2
-iperf3-openrc-3.7-r2
-iproute2-5.6.0-r0
-iptables-1.8.4-r2
-iptables-openrc-1.8.4-r2
+ifupdown-ng-0.11.2-r0
+ifupdown-ng-ethtool-0.11.2-r0
+ifupdown-ng-iproute2-0.11.2-r0
+ifupdown-ng-wireguard-0.11.2-r0
+inih-52-r1
+installkernel-3.5-r1
+ip6tables-1.8.6-r0
+ip6tables-openrc-1.8.6-r0
+iperf3-3.9-r1
+iperf3-openrc-3.9-r1
+iproute2-5.10.0-r1
+iproute2-minimal-5.10.0-r1
+iproute2-ss-5.10.0-r1
+iproute2-tc-5.10.0-r1
+iptables-1.8.6-r0
+iptables-openrc-1.8.6-r0
 ipvsadm-1.31-r0
-isl-0.18-r0
+isl22-0.22-r0
 jq-1.6-r1
-json-c-0.14-r1
-keyutils-1.6.1-r1
-keyutils-libs-1.6.1-r1
-kmod-27-r0
-kmod-libs-27-r0
-kmod-openrc-27-r0
+json-c-0.15-r1
+keyutils-1.6.3-r0
+keyutils-libs-1.6.3-r0
+kmod-28-r0
+kmod-libs-28-r0
+kmod-openrc-28-r0
 krb5-conf-1.0-r2
-krb5-dev-1.18.2-r0
-krb5-libs-1.18.2-r0
-krb5-server-ldap-1.18.2-r0
+krb5-dev-1.18.3-r1
+krb5-libs-1.18.3-r1
+krb5-server-ldap-1.18.3-r1
 libacl-2.2.53-r0
 libaio-0.3.112-r1
-libarchive-3.4.3-r1
-libarchive-tools-3.4.3-r1
-libassuan-2.5.3-r0
-libatomic-9.3.0-r2
+libarchive-3.5.1-r0
+libarchive-tools-3.5.1-r0
+libassuan-2.5.4-r0
+libatomic-10.2.1_pre1-r3
+libatomic-10.3.1_git20210424-r0
 libattr-2.4.48-r0
-libblkid-2.35.2-r0
+libblkid-2.36.1-r1
 libbsd-0.10.0-r0
 libburn-1.5.2-r0
 libbz2-1.0.8-r1
 libc-dev-0.7.2-r3
 libc-utils-0.7.2-r3
-libc6-compat-1.1.24-r9
-libcap-2.27-r0
-libcap-ng-0.7.10-r1
-libcap-ng-dev-0.7.10-r1
-libcom_err-1.45.6-r0
-libcrypto1.1-1.1.1g-r0
-libcurl-7.69.1-r1
-libdrm-2.4.102-r0
-libedit-20191231.3.1-r0
-libedit-dev-20191231.3.1-r0
-libelf-0.179-r0
-libepoxy-1.5.4-r0
-libevent-2.1.11-r1
-libfdisk-2.35.2-r0
-libfdt-1.6.0-r0
+libc6-compat-1.2.2-r0
+libcap-2.46-r0
+libcap-ng-0.8.2-r0
+libcap-ng-dev-0.8.2-r0
+libcom_err-1.45.7-r0
+libcrypto1.1-1.1.1k-r0
+libcurl-7.76.1-r0
+libdrm-2.4.104-r0
+libeconf-0.3.8-r0
+libedit-20191231.3.1-r1
+libedit-dev-20191231.3.1-r1
+libelf-0.182-r0
+libepoxy-1.5.5-r0
+libevent-2.1.12-r1
+libfdisk-2.36.1-r1
+libfdt-1.6.0-r1
 libffi-3.3-r2
-libgcc-9.3.0-r2
-libgcrypt-1.8.5-r0
-libgmpxx-6.2.0-r0
-libgomp-9.3.0-r2
-libgpg-error-1.37-r0
-libgphobos-9.3.0-r2
-libintl-0.20.2-r0
+libgcc-10.2.1_pre1-r3
+libgcc-10.3.1_git20210424-r0
+libgcrypt-1.8.7-r0
+libgmpxx-6.2.1-r0
+libgomp-10.2.1_pre1-r3
+libgomp-10.3.1_git20210424-r0
+libgpg-error-1.41-r0
+libgphobos-10.2.1_pre1-r3
+libgphobos-10.3.1_git20210424-r0
+libintl-0.20.2-r2
 libisoburn-1.5.2-r0
 libisofs-1.5.2-r0
-libjpeg-turbo-2.0.5-r0
-libksba-1.4.0-r0
-libldap-2.4.50-r0
+libjpeg-turbo-2.1.0-r0
+libksba-1.5.0-r0
+libldap-2.4.57-r1
 libltdl-2.4.6-r7
-libmagic-5.38-r0
-libmnl-1.0.4-r0
-libmount-2.35.2-r0
-libnfsidmap-2.4.3-r1
-libnftnl-libs-1.1.6-r0
+libmagic-5.39-r0
+libmnl-1.0.4-r1
+libmount-2.36.1-r1
+libnfsidmap-2.5.2-r0
+libnftnl-libs-1.1.8-r0
 libnl3-3.5.0-r0
-libogg-1.3.4-r0
-libpcap-1.9.1-r2
+libpcap-1.10.0-r0
 libpng-1.6.37-r1
-libressl-dev-3.1.2-r0
-libressl3.1-libcrypto-3.1.2-r0
-libressl3.1-libssl-3.1.2-r0
-libressl3.1-libtls-3.1.2-r0
-libsasl-2.1.27-r6
-libseccomp-2.4.3-r0
-libseccomp-dev-2.4.3-r0
-libsecret-0.20.3-r0
-libsmartcols-2.35.2-r0
-libssl1.1-1.1.1g-r0
-libstdc++-9.3.0-r2
+libressl-dev-3.1.5-r0
+libressl3.1-libcrypto-3.1.5-r0
+libressl3.1-libssl-3.1.5-r0
+libressl3.1-libtls-3.1.5-r0
+libsasl-2.1.27-r10
+libseccomp-2.5.1-r1
+libseccomp-dev-2.5.1-r1
+libseccomp-static-2.5.1-r1
+libsecret-0.20.4-r0
+libsmartcols-2.36.1-r1
+libssl1.1-1.1.1k-r0
+libstdc++-10.2.1_pre1-r3
+libstdc++-10.3.1_git20210424-r0
 libtasn1-4.16.0-r1
-libtheora-1.1.1-r14
-libtirpc-1.2.6-r0
-libtirpc-conf-1.2.6-r0
-libtirpc-dev-1.2.6-r0
-libtirpc-nokrb-1.2.6-r0
+libtirpc-1.3.1-r0
+libtirpc-conf-1.3.1-r0
+libtirpc-dev-1.3.1-r0
+libtirpc-nokrb-1.3.1-r0
 libtls-standalone-2.9.1-r1
 libtool-2.4.6-r7
-libucontext-0.11-r0
+libucontext-1.0-r0
+libucontext-1.1-r0
 libunistring-0.9.10-r0
-libusb-1.0.23-r0
-libuuid-2.35.2-r0
-libuv-1.38.1-r0
+libusb-1.0.24-r1
+libuuid-2.36.1-r1
+libuv-1.40.0-r0
 libverto-0.3.1-r1
-libvorbis-1.3.6-r2
-libwbclient-4.12.7-r0
-libx11-1.6.12-r0
+libwbclient-4.13.7-r0
+libx11-1.7.0-r0
 libxau-1.0.9-r0
 libxcb-1.14-r1
-libxdamage-1.1.5-r0
 libxdmcp-1.1.3-r0
-libxext-1.3.4-r0
-libxfixes-5.0.3-r2
-libxft-2.3.3-r0
-libxkbcommon-0.10.0-r1
-libxml2-2.9.10-r5
-libxrender-0.9.10-r3
-libxshmfence-1.3-r0
-libxv-1.0.11-r2
-libxxf86vm-1.1.4-r2
-linux-headers-5.4.5-r1
-llvm10-10.0.0-r2
-llvm10-dev-10.0.0-r2
-llvm10-libs-10.0.0-r2
-llvm10-static-10.0.0-r2
-lsblk-2.35.2-r0
+libxkbcommon-1.0.3-r0
+libxml2-2.9.10-r6
+linux-headers-5.7.8-r0
+llvm10-10.0.1-r1
+llvm10-dev-10.0.1-r1
+llvm10-libs-10.0.1-r1
+llvm10-static-10.0.1-r1
+lsblk-2.36.1-r1
 lsscsi-0.31-r0
-lua5.3-libs-5.3.5-r6
-lvm2-libs-2.02.186-r1
+lua5.3-libs-5.3.6-r0
+lvm2-libs-2.02.187-r1
 lz4-libs-1.9.2-r0
 lzip-1.21-r0
 lzo-2.10-r2
-m4-1.4.18-r1
+m4-1.4.18-r2
 make-4.3-r0
-mcookie-2.35.2-r0
-mesa-20.0.7-r0
-mesa-egl-20.0.7-r0
-mesa-gbm-20.0.7-r0
-mesa-gl-20.0.7-r0
-mesa-glapi-20.0.7-r0
-mpc1-1.1.0-r1
-mpc1-dev-1.1.0-r1
-mpfr-dev-4.0.2-r4
-mpfr4-4.0.2-r4
-mtools-4.0.24-r0
-multipath-tools-0.8.4-r1
-multipath-tools-openrc-0.8.4-r1
-musl-1.1.24-r9
-musl-dev-1.1.24-r9
-musl-utils-1.1.24-r9
-ncurses-dev-6.2_p20200523-r0
-ncurses-libs-6.2_p20200523-r0
-ncurses-terminfo-base-6.2_p20200523-r0
-nettle-3.5.1-r1
-nfs-utils-2.4.3-r1
-nfs-utils-openrc-2.4.3-r1
-nghttp2-libs-1.41.0-r0
+mcookie-2.36.1-r1
+mesa-20.3.3-r0
+mesa-gbm-20.3.3-r0
+mpc1-1.2.0-r0
+mpc1-1.2.1-r0
+mpc1-dev-1.2.0-r0
+mpfr-dev-4.1.0-r0
+mpfr4-4.1.0-r0
+mtools-4.0.26-r0
+multipath-tools-0.8.5-r0
+multipath-tools-openrc-0.8.5-r0
+musl-1.2.2-r0
+musl-dev-1.2.2-r0
+musl-utils-1.2.2-r0
+ncurses-dev-6.2_p20210109-r0
+ncurses-libs-6.2_p20210109-r0
+ncurses-terminfo-base-6.2_p20210109-r0
+nettle-3.7.2-r0
+nfs-utils-2.5.2-r0
+nfs-utils-openrc-2.5.2-r0
+nghttp2-libs-1.42.0-r1
 npth-1.6-r0
-oniguruma-6.9.5-r1
-open-iscsi-2.1.0-r2
-open-iscsi-libs-2.1.0-r2
-open-iscsi-openrc-2.1.0-r2
+oniguruma-6.9.6-r0
+open-iscsi-2.1.3-r0
+open-iscsi-libs-2.1.3-r0
+open-iscsi-openrc-2.1.3-r0
 open-isns-lib-0.100-r0
-openntpd-6.2_p3-r3
-openrc-0.42.1-r11
-openresolv-3.10.0-r0
-openssh-client-8.3_p1-r0
-openssh-keygen-8.3_p1-r0
-openssh-server-8.3_p1-r0
-openssh-server-common-8.3_p1-r0
-openssl-1.1.1g-r0
-openssl-dev-1.1.1g-r0
-opus-1.3.1-r0
-orc-0.4.31-r2
-p11-kit-0.23.20-r5
-pango-1.44.7-r2
+openntpd-6.8_p1-r0
+openrc-0.42.1-r19
+openresolv-3.12.0-r0
+openssh-client-8.4_p1-r3
+openssh-keygen-8.4_p1-r3
+openssh-server-8.4_p1-r3
+openssh-server-common-8.4_p1-r3
+openssl-1.1.1k-r0
+openssl-dev-1.1.1k-r0
+p11-kit-0.23.22-r0
+partx-2.36.1-r1
 patch-2.7.6-r6
 pcre-8.44-r0
-pcre2-10.35-r0
-pcsc-lite-libs-1.8.26-r0
-perl-5.30.3-r0
-perl-error-0.17029-r0
-perl-git-2.26.2-r0
+pcre2-10.36-r0
+pcsc-lite-libs-1.9.0-r0
+perl-5.32.0-r0
+perl-error-0.17029-r1
+perl-git-2.30.2-r0
 pigz-2.4-r1
-pinentry-1.1.0-r2
+pinentry-1.1.1-r0
 pixman-0.40.0-r2
-pkgconf-1.7.2-r0
-popt-1.16-r7
-python2-2.7.18-r0
-python3-3.8.5-r0
-qemu-5.0.0-r2
-qemu-aarch64-5.0.0-r2
-qemu-arm-5.0.0-r2
-qemu-guest-agent-5.0.0-r2
-qemu-img-5.0.0-r2
-qemu-ppc64le-5.0.0-r2
-qemu-system-arm-5.0.0-r2
-qemu-system-s390x-5.0.0-r2
-qemu-system-x86_64-5.0.0-r2
-readline-8.0.4-r0
-rhash-libs-1.3.9-r1
+pkgconf-1.7.3-r0
+popt-1.18-r0
+python2-2.7.18-r1
+python3-3.8.8-r0
+qemu-5.2.0-r3
+qemu-aarch64-5.2.0-r3
+qemu-arm-5.2.0-r3
+qemu-guest-agent-5.2.0-r3
+qemu-img-5.2.0-r3
+qemu-ppc64le-5.2.0-r3
+qemu-system-arm-5.2.0-r3
+qemu-system-s390x-5.2.0-r3
+qemu-system-x86_64-5.2.0-r3
+readline-8.1.0-r0
+rhash-libs-1.4.1-r0
 rpcbind-1.2.5-r0
 rpcbind-openrc-1.2.5-r0
-rsync-3.1.3-r3
-rsync-openrc-3.1.3-r3
-samba-util-libs-4.12.7-r0
-scanelf-1.2.6-r0
+rsync-3.2.3-r1
+rsync-openrc-3.2.3-r1
+s6-ipcserver-2.10.0.0-r0
+samba-util-libs-4.13.7-r0
+scanelf-1.2.8-r0
 sed-4.8-r0
-setpriv-2.35.2-r0
-sfdisk-2.35.2-r0
+setpriv-2.36.1-r1
+sfdisk-2.36.1-r1
 sg3_utils-1.45-r0
-sgdisk-1.0.5-r0
+sgdisk-1.0.7-r0
+skalibs-2.10.0.0-r0
 slang-2.3.2-r0
 slang-dev-2.3.2-r0
 snappy-1.1.8-r2
-sntpc-0.9-r6
-socat-1.7.3.4-r0
-spice-server-0.14.3-r0
-sqlite-libs-3.32.1-r0
-squashfs-tools-4.4-r0
-ssl_client-1.31.1-r19
-swig-4.0.1-r0
+sntpc-0.9-r7
+sntpc-openrc-0.9-r7
+socat-1.7.4.1-r0
+sqlite-libs-3.34.1-r0
+squashfs-tools-4.4-r1
+ssl_client-1.32.1-r6
+swig-4.0.2-r0
 talloc-2.3.1-r0
-tar-1.32-r1
-tcl-8.6.10-r0
-tcpdump-4.9.3-r1
+tar-1.34-r0
+tcl-8.6.10-r1
+tcpdump-4.99.0-r0
 tevent-0.10.2-r0
 tini-0.19.0-r0
-tzdata-2020a-r0
-udev-init-scripts-33-r1
-udev-init-scripts-openrc-33-r1
-usbredir-0.8.0-r1
+tzdata-2021a-r0
+udev-init-scripts-34-r0
+udev-init-scripts-openrc-34-r0
 userspace-rcu-0.12.1-r0
-util-linux-2.35.2-r0
-util-linux-dev-2.35.2-r0
+util-linux-2.36.1-r1
+util-linux-dev-2.36.1-r1
+util-linux-openrc-2.36.1-r1
+utmps-0.1.0.0-r0
+utmps-openrc-0.1.0.0-r0
 vde2-libs-2.3.2-r12
-vim-8.2.0735-r0
+vim-8.2.2320-r0
 virglrenderer-0.8.2-r1
-wayland-libs-client-1.18.0-r4
-wayland-libs-egl-1.18.0-r4
-wayland-libs-server-1.18.0-r4
-wireguard-tools-1.0.20200510-r0
-wireguard-tools-wg-1.0.20200510-r0
-wireguard-tools-wg-quick-1.0.20200510-r0
+wayland-libs-server-1.18.0-r5
+wireguard-tools-1.0.20200827-r1
+wireguard-tools-wg-1.0.20200827-r1
+wireguard-tools-wg-quick-1.0.20200827-r1
 wireless-tools-30_pre9-r1
-wpa_supplicant-2.9-r5
-wpa_supplicant-openrc-2.9-r5
-xfsprogs-5.6.0-r1
-xfsprogs-extra-5.6.0-r1
+wpa_supplicant-2.9-r11
+wpa_supplicant-openrc-2.9-r11
+xfsprogs-5.10.0-r0
+xfsprogs-extra-5.10.0-r0
+xkeyboard-config-2.31-r0
 xorriso-1.5.2-r0
-xxd-8.2.0735-r0
+xxd-8.2.2320-r0
 xz-5.2.5-r0
 xz-dev-5.2.5-r0
 xz-libs-5.2.5-r0
-zfs-0.8.4-r0
-zfs-libs-0.8.4-r0
-zfs-openrc-0.8.4-r0
+zfs-2.0.1-r0
+zfs-libs-2.0.1-r0
+zfs-openrc-2.0.1-r0
 zlib-1.2.11-r3
 zlib-dev-1.2.11-r3
 zlib-static-1.2.11-r3
-zstd-libs-1.4.5-r0
+zstd-libs-1.4.5-r3
diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64
index ee7c0eec4..7fd06ba87 100644
--- a/tools/alpine/versions.x86_64
+++ b/tools/alpine/versions.x86_64
@@ -1,375 +1,370 @@
-# linuxkit/alpine:a3d78322152a8b341bdaecfe182a2689fdbdee53-amd64
+# linuxkit/alpine:0c069d0fd7defddb6e03925fcd4915407db0c9e1-amd64
 # automatically generated list of installed packages
-abuild-3.6.0-r0
-alpine-baselayout-3.2.0-r7
+abuild-3.7.0-r0
+alpine-baselayout-3.2.0-r8
 alpine-keys-2.2-r0
-alsa-lib-1.2.2-r0
-apk-tools-2.10.5-r1
+apk-tools-2.12.5-r0
 argon2-libs-20190702-r1
 argp-standalone-1.3-r4
 attr-2.4.48-r0
 attr-dev-2.4.48-r0
-audit-2.8.5-r0
-audit-libs-2.8.5-r0
-audit-openrc-2.8.5-r0
-autoconf-2.69-r2
-automake-1.16.2-r0
-bash-5.0.17-r0
+audit-2.8.5-r3
+audit-libs-2.8.5-r3
+audit-openrc-2.8.5-r3
+autoconf-2.69-r3
+automake-1.16.3-r0
+bash-5.1.0-r0
 bc-1.07.1-r1
-binutils-2.34-r1
-binutils-dev-2.34-r1
-bison-3.6.2-r0
-blkid-2.35.2-r0
-bridge-utils-1.6-r0
-brotli-libs-1.0.9-r1
+binutils-2.35.2-r1
+binutils-dev-2.35.2-r1
+bison-3.7.4-r0
+blkid-2.36.1-r1
+bridge-utils-1.7-r0
+brotli-libs-1.0.9-r3
 bsd-compat-headers-0.7.2-r3
-btrfs-progs-5.6.1-r0
-btrfs-progs-dev-5.6.1-r0
-btrfs-progs-libs-5.6.1-r0
+btrfs-progs-5.10-r0
+btrfs-progs-dev-5.10-r0
+btrfs-progs-libs-5.10-r0
 build-base-0.5-r2
-busybox-1.31.1-r19
+busybox-1.32.1-r6
 busybox-initscripts-3.2-r2
 bzip2-1.0.8-r1
-ca-certificates-20191127-r4
-ca-certificates-bundle-20191127-r4
-cairo-1.16.0-r2
-cdparanoia-libs-10.2-r8
-cdrkit-1.1.11-r2
-cfdisk-2.35.2-r0
-cifs-utils-6.10-r1
-clang-10.0.0-r2
-clang-dev-10.0.0-r2
-clang-extra-tools-10.0.0-r2
-clang-libs-10.0.0-r2
-clang-static-10.0.0-r2
-cmake-3.17.2-r0
-coreutils-8.32-r0
-cryptsetup-2.3.2-r1
-cryptsetup-libs-2.3.2-r1
-cryptsetup-openrc-2.3.2-r1
-curl-7.69.1-r1
-db-5.3.28-r1
-dbus-libs-1.12.18-r0
-device-mapper-2.02.186-r1
-device-mapper-event-libs-2.02.186-r1
-device-mapper-libs-2.02.186-r1
-device-mapper-udev-2.02.186-r1
-dhcpcd-8.1.6-r0
-dhcpcd-openrc-8.1.6-r0
+ca-certificates-20191127-r5
+ca-certificates-bundle-20191127-r5
+cdrkit-1.1.11-r3
+cfdisk-2.36.1-r1
+cifs-utils-6.12-r0
+clang-10.0.1-r0
+clang-dev-10.0.1-r0
+clang-extra-tools-10.0.1-r0
+clang-libs-10.0.1-r0
+clang-static-10.0.1-r0
+cmake-3.18.4-r1
+coreutils-8.32-r2
+cryptsetup-2.3.4-r1
+cryptsetup-libs-2.3.4-r1
+cryptsetup-openrc-2.3.4-r1
+curl-7.76.1-r0
+dbus-libs-1.12.20-r1
+device-mapper-2.02.187-r1
+device-mapper-event-libs-2.02.187-r1
+device-mapper-libs-2.02.187-r1
+device-mapper-udev-2.02.187-r1
+dhcpcd-8.1.6-r1
+dhcpcd-openrc-8.1.6-r1
 diffutils-3.7-r0
 dosfstools-4.1-r1
-dtc-1.6.0-r0
-e2fsprogs-1.45.6-r0
-e2fsprogs-dev-1.45.6-r0
-e2fsprogs-extra-1.45.6-r0
-e2fsprogs-libs-1.45.6-r0
-elfutils-dev-0.179-r0
-ethtool-5.6-r0
+dtc-1.6.0-r1
+e2fsprogs-1.45.7-r0
+e2fsprogs-dev-1.45.7-r0
+e2fsprogs-extra-1.45.7-r0
+e2fsprogs-libs-1.45.7-r0
+elfutils-dev-0.182-r0
+ethtool-5.10-r0
 eudev-3.2.9-r3
 eudev-libs-3.2.9-r3
 eudev-openrc-3.2.9-r3
-expat-2.2.9-r1
+expat-2.2.10-r1
 expect-5.45.4-r0
-fakeroot-1.24-r0
-file-5.38-r0
-findmnt-2.35.2-r0
-findutils-4.7.0-r0
+fakeroot-1.25.3-r3
+file-5.39-r0
+findmnt-2.36.1-r1
+findutils-4.8.0-r0
 flex-2.6.4-r2
 flex-dev-2.6.4-r2
 flex-libs-2.6.4-r2
-fontconfig-2.13.1-r2
 fortify-headers-1.1-r0
-freetype-2.10.2-r0
-fribidi-1.0.9-r0
 fts-1.2.7-r1
 fts-dev-1.2.7-r1
-g++-9.3.0-r2
-gc-8.0.4-r1
-gcc-9.3.0-r2
-gdbm-1.13-r1
-gettext-0.20.2-r0
-gettext-asprintf-0.20.2-r0
-gettext-dev-0.20.2-r0
-gettext-libs-0.20.2-r0
-git-2.26.2-r0
-git-perl-2.26.2-r0
-glib-2.64.6-r0
-gmp-6.2.0-r0
-gmp-dev-6.2.0-r0
-gnupg-2.2.23-r0
-gnutls-3.6.15-r0
-go-1.13.14-r0
-graphite2-1.3.14-r0
-grep-3.4-r0
-gst-plugins-base-1.16.2-r3
-gstreamer-1.16.2-r2
+g++-10.2.1_pre1-r3
+gc-8.0.4-r4
+gcc-10.2.1_pre1-r3
+gcc-10.3.1_git20210424-r0
+gdbm-1.19-r0
+gettext-0.20.2-r2
+gettext-asprintf-0.20.2-r2
+gettext-dev-0.20.2-r2
+gettext-libs-0.20.2-r2
+git-2.30.2-r0
+git-perl-2.30.2-r0
+glib-2.66.8-r0
+gmp-6.2.1-r0
+gmp-dev-6.2.1-r0
+gnupg-2.2.27-r0
+gnutls-3.7.1-r0
+go-1.16.3-r0
+grep-3.6-r0
 guile-2.0.14-r2
 guile-libs-2.0.14-r2
 gummiboot-48.1-r0
-harfbuzz-2.6.6-r0
-hexdump-2.35.2-r0
+hexdump-2.36.1-r1
 hvtools-4.11.9-r1
-installkernel-3.5-r0
-iperf3-3.7-r2
-iperf3-openrc-3.7-r2
-iproute2-5.6.0-r0
-iptables-1.8.4-r2
-iptables-openrc-1.8.4-r2
+ifupdown-ng-0.11.2-r0
+ifupdown-ng-ethtool-0.11.2-r0
+ifupdown-ng-iproute2-0.11.2-r0
+ifupdown-ng-wireguard-0.11.2-r0
+inih-52-r1
+installkernel-3.5-r1
+ip6tables-1.8.6-r0
+ip6tables-openrc-1.8.6-r0
+iperf3-3.9-r1
+iperf3-openrc-3.9-r1
+iproute2-5.10.0-r1
+iproute2-minimal-5.10.0-r1
+iproute2-ss-5.10.0-r1
+iproute2-tc-5.10.0-r1
+iptables-1.8.6-r0
+iptables-openrc-1.8.6-r0
 ipvsadm-1.31-r0
-isl-0.18-r0
+isl22-0.22-r0
 jq-1.6-r1
-json-c-0.14-r1
-keyutils-1.6.1-r1
-keyutils-libs-1.6.1-r1
-kmod-27-r0
-kmod-libs-27-r0
-kmod-openrc-27-r0
+json-c-0.15-r1
+keyutils-1.6.3-r0
+keyutils-libs-1.6.3-r0
+kmod-28-r0
+kmod-libs-28-r0
+kmod-openrc-28-r0
 krb5-conf-1.0-r2
-krb5-dev-1.18.2-r0
-krb5-libs-1.18.2-r0
-krb5-server-ldap-1.18.2-r0
+krb5-dev-1.18.3-r1
+krb5-libs-1.18.3-r1
+krb5-server-ldap-1.18.3-r1
 lddtree-1.26-r2
 libacl-2.2.53-r0
 libaio-0.3.112-r1
-libarchive-3.4.3-r1
-libarchive-tools-3.4.3-r1
-libassuan-2.5.3-r0
-libatomic-9.3.0-r2
+libarchive-3.5.1-r0
+libarchive-tools-3.5.1-r0
+libassuan-2.5.4-r0
+libatomic-10.2.1_pre1-r3
+libatomic-10.3.1_git20210424-r0
 libattr-2.4.48-r0
-libblkid-2.35.2-r0
+libblkid-2.36.1-r1
 libbsd-0.10.0-r0
 libburn-1.5.2-r0
 libbz2-1.0.8-r1
 libc-dev-0.7.2-r3
 libc-utils-0.7.2-r3
-libc6-compat-1.1.24-r9
-libcap-2.27-r0
-libcap-ng-0.7.10-r1
-libcap-ng-dev-0.7.10-r1
-libcom_err-1.45.6-r0
-libcrypto1.1-1.1.1g-r0
-libcurl-7.69.1-r1
-libdrm-2.4.102-r0
-libedit-20191231.3.1-r0
-libedit-dev-20191231.3.1-r0
-libelf-0.179-r0
-libepoxy-1.5.4-r0
-libevent-2.1.11-r1
-libfdisk-2.35.2-r0
-libfdt-1.6.0-r0
+libc6-compat-1.2.2-r0
+libcap-2.46-r0
+libcap-ng-0.8.2-r0
+libcap-ng-dev-0.8.2-r0
+libcom_err-1.45.7-r0
+libcrypto1.1-1.1.1k-r0
+libcurl-7.76.1-r0
+libdrm-2.4.104-r0
+libeconf-0.3.8-r0
+libedit-20191231.3.1-r1
+libedit-dev-20191231.3.1-r1
+libelf-0.182-r0
+libepoxy-1.5.5-r0
+libevent-2.1.12-r1
+libfdisk-2.36.1-r1
+libfdt-1.6.0-r1
 libffi-3.3-r2
-libgcc-9.3.0-r2
-libgcrypt-1.8.5-r0
-libgmpxx-6.2.0-r0
-libgomp-9.3.0-r2
-libgpg-error-1.37-r0
-libgphobos-9.3.0-r2
-libintl-0.20.2-r0
+libgcc-10.2.1_pre1-r3
+libgcc-10.3.1_git20210424-r0
+libgcrypt-1.8.7-r0
+libgmpxx-6.2.1-r0
+libgomp-10.2.1_pre1-r3
+libgomp-10.3.1_git20210424-r0
+libgpg-error-1.41-r0
+libgphobos-10.2.1_pre1-r3
+libgphobos-10.3.1_git20210424-r0
+libintl-0.20.2-r2
 libisoburn-1.5.2-r0
 libisofs-1.5.2-r0
-libjpeg-turbo-2.0.5-r0
-libksba-1.4.0-r0
-libldap-2.4.50-r0
+libjpeg-turbo-2.1.0-r0
+libksba-1.5.0-r0
+libldap-2.4.57-r1
 libltdl-2.4.6-r7
-libmagic-5.38-r0
-libmnl-1.0.4-r0
-libmount-2.35.2-r0
-libnfsidmap-2.4.3-r1
-libnftnl-libs-1.1.6-r0
+libmagic-5.39-r0
+libmnl-1.0.4-r1
+libmount-2.36.1-r1
+libnfsidmap-2.5.2-r0
+libnftnl-libs-1.1.8-r0
 libnl3-3.5.0-r0
-libogg-1.3.4-r0
-libpcap-1.9.1-r2
+libpcap-1.10.0-r0
 libpciaccess-0.16-r0
 libpng-1.6.37-r1
-libressl-dev-3.1.2-r0
-libressl3.1-libcrypto-3.1.2-r0
-libressl3.1-libssl-3.1.2-r0
-libressl3.1-libtls-3.1.2-r0
-libsasl-2.1.27-r6
-libseccomp-2.4.3-r0
-libseccomp-dev-2.4.3-r0
-libsecret-0.20.3-r0
-libsmartcols-2.35.2-r0
-libssl1.1-1.1.1g-r0
-libstdc++-9.3.0-r2
+libressl-dev-3.1.5-r0
+libressl3.1-libcrypto-3.1.5-r0
+libressl3.1-libssl-3.1.5-r0
+libressl3.1-libtls-3.1.5-r0
+libsasl-2.1.27-r10
+libseccomp-2.5.1-r1
+libseccomp-dev-2.5.1-r1
+libseccomp-static-2.5.1-r1
+libsecret-0.20.4-r0
+libsmartcols-2.36.1-r1
+libssl1.1-1.1.1k-r0
+libstdc++-10.2.1_pre1-r3
+libstdc++-10.3.1_git20210424-r0
 libtasn1-4.16.0-r1
-libtheora-1.1.1-r14
-libtirpc-1.2.6-r0
-libtirpc-conf-1.2.6-r0
-libtirpc-dev-1.2.6-r0
-libtirpc-nokrb-1.2.6-r0
+libtirpc-1.3.1-r0
+libtirpc-conf-1.3.1-r0
+libtirpc-dev-1.3.1-r0
+libtirpc-nokrb-1.3.1-r0
 libtls-standalone-2.9.1-r1
 libtool-2.4.6-r7
-libucontext-0.11-r0
-libucontext-dev-0.11-r0
+libucontext-1.0-r0
+libucontext-dev-1.0-r0
 libunistring-0.9.10-r0
-libunwind-1.4.0-r0
-libunwind-dev-1.4.0-r0
-libusb-1.0.23-r0
-libuuid-2.35.2-r0
-libuv-1.38.1-r0
+libunwind-1.5.0-r1
+libunwind-dev-1.5.0-r1
+libusb-1.0.24-r1
+libuuid-2.36.1-r1
+libuv-1.40.0-r0
 libverto-0.3.1-r1
-libvorbis-1.3.6-r2
-libwbclient-4.12.7-r0
-libx11-1.6.12-r0
+libwbclient-4.13.7-r0
+libx11-1.7.0-r0
 libxau-1.0.9-r0
 libxcb-1.14-r1
-libxdamage-1.1.5-r0
 libxdmcp-1.1.3-r0
-libxext-1.3.4-r0
-libxfixes-5.0.3-r2
-libxft-2.3.3-r0
-libxkbcommon-0.10.0-r1
-libxml2-2.9.10-r5
-libxrender-0.9.10-r3
-libxshmfence-1.3-r0
-libxv-1.0.11-r2
-libxxf86vm-1.1.4-r2
-linux-headers-5.4.5-r1
-llvm10-10.0.0-r2
-llvm10-dev-10.0.0-r2
-llvm10-libs-10.0.0-r2
-llvm10-static-10.0.0-r2
-lsblk-2.35.2-r0
+libxkbcommon-1.0.3-r0
+libxml2-2.9.10-r6
+linux-headers-5.7.8-r0
+llvm10-10.0.1-r1
+llvm10-dev-10.0.1-r1
+llvm10-libs-10.0.1-r1
+llvm10-static-10.0.1-r1
+lsblk-2.36.1-r1
 lsscsi-0.31-r0
-lua5.3-libs-5.3.5-r6
-luajit-5.1.20190925-r0
-luajit-dev-5.1.20190925-r0
-lvm2-libs-2.02.186-r1
+lua5.3-libs-5.3.6-r0
+luajit-2.2.0-r3
+luajit-dev-2.2.0-r3
+lvm2-libs-2.02.187-r1
 lz4-libs-1.9.2-r0
 lzip-1.21-r0
 lzo-2.10-r2
-m4-1.4.18-r1
+m4-1.4.18-r2
 make-4.3-r0
-mcookie-2.35.2-r0
-mesa-20.0.7-r0
-mesa-egl-20.0.7-r0
-mesa-gbm-20.0.7-r0
-mesa-gl-20.0.7-r0
-mesa-glapi-20.0.7-r0
-mkinitfs-3.4.5-r3
-mpc1-1.1.0-r1
-mpc1-dev-1.1.0-r1
-mpfr-dev-4.0.2-r4
-mpfr4-4.0.2-r4
-mtools-4.0.24-r0
-multipath-tools-0.8.4-r1
-multipath-tools-openrc-0.8.4-r1
-musl-1.1.24-r9
-musl-dev-1.1.24-r9
-musl-utils-1.1.24-r9
-ncurses-dev-6.2_p20200523-r0
-ncurses-libs-6.2_p20200523-r0
-ncurses-terminfo-base-6.2_p20200523-r0
-nettle-3.5.1-r1
-nfs-utils-2.4.3-r1
-nfs-utils-openrc-2.4.3-r1
-nghttp2-libs-1.41.0-r0
+mcookie-2.36.1-r1
+mesa-20.3.3-r0
+mesa-gbm-20.3.3-r0
+mkinitfs-3.5.0-r0
+mpc1-1.2.0-r0
+mpc1-1.2.1-r0
+mpc1-dev-1.2.0-r0
+mpfr-dev-4.1.0-r0
+mpfr4-4.1.0-r0
+mtools-4.0.26-r0
+multipath-tools-0.8.5-r0
+multipath-tools-openrc-0.8.5-r0
+musl-1.2.2-r0
+musl-dev-1.2.2-r0
+musl-utils-1.2.2-r0
+ncurses-dev-6.2_p20210109-r0
+ncurses-libs-6.2_p20210109-r0
+ncurses-terminfo-base-6.2_p20210109-r0
+nettle-3.7.2-r0
+nfs-utils-2.5.2-r0
+nfs-utils-openrc-2.5.2-r0
+nghttp2-libs-1.42.0-r1
 npth-1.6-r0
-oniguruma-6.9.5-r1
-open-iscsi-2.1.0-r2
-open-iscsi-libs-2.1.0-r2
-open-iscsi-openrc-2.1.0-r2
+oniguruma-6.9.6-r0
+open-iscsi-2.1.3-r0
+open-iscsi-libs-2.1.3-r0
+open-iscsi-openrc-2.1.3-r0
 open-isns-lib-0.100-r0
-open-vm-tools-11.1.0-r3
-open-vm-tools-openrc-11.1.0-r3
-openntpd-6.2_p3-r3
-openrc-0.42.1-r11
-openresolv-3.10.0-r0
-openssh-client-8.3_p1-r0
-openssh-keygen-8.3_p1-r0
-openssh-server-8.3_p1-r0
-openssh-server-common-8.3_p1-r0
-openssl-1.1.1g-r0
-openssl-dev-1.1.1g-r0
-opus-1.3.1-r0
-orc-0.4.31-r2
-ovmf-0.0.201908-r0
-p11-kit-0.23.20-r5
-pango-1.44.7-r2
+open-vm-tools-11.2.0-r0
+open-vm-tools-openrc-11.2.0-r0
+openntpd-6.8_p1-r0
+openrc-0.42.1-r19
+openresolv-3.12.0-r0
+openssh-client-8.4_p1-r3
+openssh-keygen-8.4_p1-r3
+openssh-server-8.4_p1-r3
+openssh-server-common-8.4_p1-r3
+openssl-1.1.1k-r0
+openssl-dev-1.1.1k-r0
+ovmf-0.0.201908-r1
+p11-kit-0.23.22-r0
+partx-2.36.1-r1
 patch-2.7.6-r6
 pcre-8.44-r0
-pcre2-10.35-r0
-pcsc-lite-libs-1.8.26-r0
-perl-5.30.3-r0
-perl-error-0.17029-r0
-perl-git-2.26.2-r0
+pcre2-10.36-r0
+pcsc-lite-libs-1.9.0-r0
+perl-5.32.0-r0
+perl-error-0.17029-r1
+perl-git-2.30.2-r0
 pigz-2.4-r1
-pinentry-1.1.0-r2
+pinentry-1.1.1-r0
 pixman-0.40.0-r2
-pkgconf-1.7.2-r0
-popt-1.16-r7
-python2-2.7.18-r0
-python3-3.8.5-r0
-qemu-5.0.0-r2
-qemu-aarch64-5.0.0-r2
-qemu-arm-5.0.0-r2
-qemu-guest-agent-5.0.0-r2
-qemu-img-5.0.0-r2
-qemu-ppc64le-5.0.0-r2
-qemu-system-arm-5.0.0-r2
-qemu-system-x86_64-5.0.0-r2
-readline-8.0.4-r0
-rhash-libs-1.3.9-r1
+pkgconf-1.7.3-r0
+popt-1.18-r0
+python2-2.7.18-r1
+python3-3.8.8-r0
+qemu-5.2.0-r3
+qemu-aarch64-5.2.0-r3
+qemu-arm-5.2.0-r3
+qemu-guest-agent-5.2.0-r3
+qemu-img-5.2.0-r3
+qemu-ppc64le-5.2.0-r3
+qemu-system-arm-5.2.0-r3
+qemu-system-x86_64-5.2.0-r3
+readline-8.1.0-r0
+rhash-libs-1.4.1-r0
 rpcbind-1.2.5-r0
 rpcbind-openrc-1.2.5-r0
-rsync-3.1.3-r3
-rsync-openrc-3.1.3-r3
-samba-util-libs-4.12.7-r0
-scanelf-1.2.6-r0
+rsync-3.2.3-r1
+rsync-openrc-3.2.3-r1
+s6-ipcserver-2.10.0.0-r0
+samba-util-libs-4.13.7-r0
+scanelf-1.2.8-r0
 sed-4.8-r0
-setpriv-2.35.2-r0
-sfdisk-2.35.2-r0
+setpriv-2.36.1-r1
+sfdisk-2.36.1-r1
 sg3_utils-1.45-r0
-sgdisk-1.0.5-r0
+sgdisk-1.0.7-r0
+skalibs-2.10.0.0-r0
 slang-2.3.2-r0
 slang-dev-2.3.2-r0
 snappy-1.1.8-r2
-sntpc-0.9-r6
-socat-1.7.3.4-r0
-spice-server-0.14.3-r0
-sqlite-libs-3.32.1-r0
-squashfs-tools-4.4-r0
-ssl_client-1.31.1-r19
-strace-5.6-r0
-swig-4.0.1-r0
+sntpc-0.9-r7
+sntpc-openrc-0.9-r7
+socat-1.7.4.1-r0
+sqlite-libs-3.34.1-r0
+squashfs-tools-4.4-r1
+ssl_client-1.32.1-r6
+strace-5.10-r0
+swig-4.0.2-r0
 syslinux-6.04_pre1-r6
 talloc-2.3.1-r0
-tar-1.32-r1
-tcl-8.6.10-r0
-tcpdump-4.9.3-r1
+tar-1.34-r0
+tcl-8.6.10-r1
+tcpdump-4.99.0-r0
 tevent-0.10.2-r0
 tini-0.19.0-r0
-tzdata-2020a-r0
-udev-init-scripts-33-r1
-udev-init-scripts-openrc-33-r1
-usbredir-0.8.0-r1
+tzdata-2021a-r0
+udev-init-scripts-34-r0
+udev-init-scripts-openrc-34-r0
 userspace-rcu-0.12.1-r0
-util-linux-2.35.2-r0
-util-linux-dev-2.35.2-r0
+util-linux-2.36.1-r1
+util-linux-dev-2.36.1-r1
+util-linux-openrc-2.36.1-r1
+utmps-0.1.0.0-r0
+utmps-openrc-0.1.0.0-r0
 vde2-libs-2.3.2-r12
-vim-8.2.0735-r0
+vim-8.2.2320-r0
 virglrenderer-0.8.2-r1
-wayland-libs-client-1.18.0-r4
-wayland-libs-egl-1.18.0-r4
-wayland-libs-server-1.18.0-r4
-wireguard-tools-1.0.20200510-r0
-wireguard-tools-wg-1.0.20200510-r0
-wireguard-tools-wg-quick-1.0.20200510-r0
+wayland-libs-server-1.18.0-r5
+wireguard-tools-1.0.20200827-r1
+wireguard-tools-wg-1.0.20200827-r1
+wireguard-tools-wg-quick-1.0.20200827-r1
 wireless-tools-30_pre9-r1
-wpa_supplicant-2.9-r5
-wpa_supplicant-openrc-2.9-r5
-xfsprogs-5.6.0-r1
-xfsprogs-extra-5.6.0-r1
+wpa_supplicant-2.9-r11
+wpa_supplicant-openrc-2.9-r11
+xfsprogs-5.10.0-r0
+xfsprogs-extra-5.10.0-r0
+xkeyboard-config-2.31-r0
 xorriso-1.5.2-r0
-xxd-8.2.0735-r0
+xxd-8.2.2320-r0
 xz-5.2.5-r0
 xz-dev-5.2.5-r0
 xz-libs-5.2.5-r0
-zfs-0.8.4-r0
-zfs-libs-0.8.4-r0
-zfs-openrc-0.8.4-r0
+zfs-2.0.1-r0
+zfs-libs-2.0.1-r0
+zfs-openrc-2.0.1-r0
 zlib-1.2.11-r3
 zlib-dev-1.2.11-r3
 zlib-static-1.2.11-r3
-zstd-libs-1.4.5-r0
+zstd-libs-1.4.5-r3